From 683765c7e5ab201cfb9618993178aaa9226cc4c9 Mon Sep 17 00:00:00 2001 From: Zu Qiang Date: Wed, 3 Apr 2024 13:16:10 +0000 Subject: [PATCH 001/587] CR0334 --- yang-models/_3gpp-common-qmcjob.yang | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/yang-models/_3gpp-common-qmcjob.yang b/yang-models/_3gpp-common-qmcjob.yang index bd46a0360..b923d6a0e 100644 --- a/yang-models/_3gpp-common-qmcjob.yang +++ b/yang-models/_3gpp-common-qmcjob.yang @@ -27,6 +27,7 @@ module _3gpp-common-qmcjob { Integration Reference Point (IRP); Information Service (IS)"; + revision 2024-04-04 { reference CR-0334; } revision 2023-09-18 { reference CR-0271 ; } revision 2023-02-14 { reference "CR-0234"; } revision 2022-11-04 { reference "CR-0215"; } @@ -149,6 +150,13 @@ module _3gpp-common-qmcjob { to the gNB. This parameter is optional and is valid for NR only."; } + leaf isMBSCommunicationService { + type boolean; + description "This indicates whether QoE measurement configuration + pertains to MBS communication service. + By default, QoE measurement configuration does not pertain to MBS + communication service."; + } } grouping QMCJobSubTree { -- GitLab From 8362e9892add9670fb39bbce026097f0ffd114a1 Mon Sep 17 00:00:00 2001 From: Zu Qiang Date: Wed, 3 Apr 2024 17:29:26 +0000 Subject: [PATCH 002/587] mBSCommunicationServiceType --- yang-models/_3gpp-common-qmcjob.yang | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/yang-models/_3gpp-common-qmcjob.yang b/yang-models/_3gpp-common-qmcjob.yang index b923d6a0e..e79cdfb2d 100644 --- a/yang-models/_3gpp-common-qmcjob.yang +++ b/yang-models/_3gpp-common-qmcjob.yang @@ -150,12 +150,13 @@ module _3gpp-common-qmcjob { to the gNB. This parameter is optional and is valid for NR only."; } - leaf isMBSCommunicationService { - type boolean; - description "This indicates whether QoE measurement configuration - pertains to MBS communication service. - By default, QoE measurement configuration does not pertain to MBS - communication service."; + leaf mBSCommunicationServiceType { + type enumeration { + enum broadcast; + enum multicast; + } + description "This attribute indicates which type of MBS communication + service the QoE measurement configuration pertains to."; } } -- GitLab From f270db289ba6c990b13ca19a46a643b559850980 Mon Sep 17 00:00:00 2001 From: Zu Qiang Date: Tue, 16 Apr 2024 11:26:32 +0000 Subject: [PATCH 003/587] Update file _3gpp-common-qmcjob.yang --- yang-models/_3gpp-common-qmcjob.yang | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/yang-models/_3gpp-common-qmcjob.yang b/yang-models/_3gpp-common-qmcjob.yang index e79cdfb2d..5d991ae15 100644 --- a/yang-models/_3gpp-common-qmcjob.yang +++ b/yang-models/_3gpp-common-qmcjob.yang @@ -152,8 +152,8 @@ module _3gpp-common-qmcjob { leaf mBSCommunicationServiceType { type enumeration { - enum broadcast; - enum multicast; + enum BROADCAST; + enum MULTICAST; } description "This attribute indicates which type of MBS communication service the QoE measurement configuration pertains to."; -- GitLab From 3392bbf90d0e1c3466d8aa160708f252e05782a9 Mon Sep 17 00:00:00 2001 From: "U-ERICSSON\\ETHBLL" Date: Thu, 4 Jul 2024 12:53:54 +0200 Subject: [PATCH 004/587] Add all Rel-18 updates for TS 28.111, 28.623, 28.541 to the REL-19 branch. As the TS documents do not yet have an Rel-19 version (but the Rel-19 Forge branch is already separated) all Rel-18 corrections should be automatically copied to the Rel-19 branch too. --- yang-models/_3gpp-5g-common-yang-types.yang | 17 +- yang-models/_3gpp-5gc-nrm-amffunction.yang | 21 +- yang-models/_3gpp-5gc-nrm-amfregion.yang | 5 +- yang-models/_3gpp-5gc-nrm-amfset.yang | 5 +- yang-models/_3gpp-5gc-nrm-neffunction.yang | 30 +- yang-models/_3gpp-5gc-nrm-nfprofile.yang | 9 +- yang-models/_3gpp-5gc-nrm-nwdaffunction.yang | 354 ++++++++- yang-models/_3gpp-5gc-nrm-pcffunction.yang | 9 +- yang-models/_3gpp-5gc-nrm-smffunction.yang | 5 +- yang-models/_3gpp-5gc-nrm-udmfunction.yang | 22 +- yang-models/_3gpp-5gc-nrm-upffunction.yang | 5 +- yang-models/_3gpp-common-files.yang | 15 +- yang-models/_3gpp-common-fm.yang | 72 +- .../_3gpp-common-managed-function.yang | 7 +- ..._3gpp-common-managementdatacollection.yang | 19 +- yang-models/_3gpp-common-measurements.yang | 21 +- .../_3gpp-common-subscription-control.yang | 58 +- yang-models/_3gpp-common-trace.yang | 650 +++++++++++---- yang-models/_3gpp-common-util.yang | 211 +++++ yang-models/_3gpp-common-yang-extensions.yang | 26 +- yang-models/_3gpp-common-yang-types.yang | 49 +- yang-models/_3gpp-nr-nrm-cco.yang | 210 +++++ .../_3gpp-nr-nrm-eutranfreqrelation.yang | 13 +- yang-models/_3gpp-nr-nrm-gnbcucpfunction.yang | 45 +- yang-models/_3gpp-nr-nrm-gnbcuupfunction.yang | 5 +- yang-models/_3gpp-nr-nrm-gnbdufunction.yang | 5 +- yang-models/_3gpp-nr-nrm-nrcelldu.yang | 5 +- yang-models/_3gpp-nr-nrm-nrfreqrelation.yang | 17 +- .../_3gpp-nr-nrm-nroperatorcelldu.yang | 5 +- yang-models/_3gpp-nr-nrm-ntnfunction.yang | 303 +++++++ yang-models/_3gpp-nr-nrm-operatordu.yang | 25 +- .../external-yams/ietf-inet-types.yang | 746 +++++++++++------- ...s@2013-07-15.yang => ietf-yang-types.yang} | 437 +++++++--- 33 files changed, 2733 insertions(+), 693 deletions(-) create mode 100644 yang-models/_3gpp-common-util.yang create mode 100644 yang-models/_3gpp-nr-nrm-cco.yang create mode 100644 yang-models/_3gpp-nr-nrm-ntnfunction.yang rename yang-models/external-yams/{ietf-yang-types@2013-07-15.yang => ietf-yang-types.yang} (52%) mode change 100755 => 100644 diff --git a/yang-models/_3gpp-5g-common-yang-types.yang b/yang-models/_3gpp-5g-common-yang-types.yang index 3e1870c6e..08b8fc721 100755 --- a/yang-models/_3gpp-5g-common-yang-types.yang +++ b/yang-models/_3gpp-5g-common-yang-types.yang @@ -11,16 +11,31 @@ module _3gpp-5g-common-yang-types { contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464"; description "The model defines common types for 5G networks and network slicing. - Copyright 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + Copyright 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved."; reference "3GPP TS 28.541"; + revision 2024-05-24 { reference CR-1273 ; } revision 2023-09-18 { reference CR-1043 ; } revision 2023-05-10 { reference CR-0916; } revision 2021-08-05 { reference S5-214053/CR-0518; } revision 2020-11-05 { reference CR-0412 ; } revision 2019-10-20 { reference "Initial version."; } + typedef NRTAC { + type string; + description "This holds the identity of the common Tracking Area Code + for the PLMNs. + + allowedValues: + a) It is the TAC or Extended-TAC. + b) A cell can only broadcast one TAC or Extended-TAC. See TS 36.300, + subclause 10.1.7 (PLMNID and TAC relation). + c) TAC is defined in subclause 19.4.2.3 of 3GPP TS 23.003 + and Extended-TAC is defined in subclause 9.3.1.29 of 3GPP TS 38.473. + d) For a 5G SA (Stand Alone), it has a non-null value."; + } + grouping SNssai { description "Single Network Slice Selection Assistance Information(S-NSSAI)"; diff --git a/yang-models/_3gpp-5gc-nrm-amffunction.yang b/yang-models/_3gpp-5gc-nrm-amffunction.yang index eb3a3e1ef..310e71835 100755 --- a/yang-models/_3gpp-5gc-nrm-amffunction.yang +++ b/yang-models/_3gpp-5gc-nrm-amffunction.yang @@ -13,10 +13,11 @@ module _3gpp-5gc-nrm-amffunction { organization "3gpp SA5"; contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464"; description "AMFFunction derived from basic ManagedFunction. - Copyright 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + Copyright 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved."; reference "3GPP TS 28.541 5G Network Resource Model (NRM)"; + revision 2024-04-04 { reference CR-1139; } revision 2023-09-18 { reference CR-1043 ; } revision 2022-01-07 { reference CR-0643; } revision 2020-11-06 { reference CR-0412 ; } @@ -224,6 +225,24 @@ module _3gpp-5gc-nrm-amffunction { uses satelliteBackhaulInfo; } + leaf-list mdtUserConsentReqList { + type enumeration { + enum M1; + enum M2; + enum M3; + enum M4; + enum M5; + enum M6; + enum M7; + enum M8; + enum M9; + enum MDT_UE_LOCATION; + } + description "represents a list of MDT measurement names that are + subject to user consent at MDT activation. + Any MDT measurement, whose name is not specified in this list, is not + subject to user consent at MDT activation."; + } } augment "/me3gpp:ManagedElement" { diff --git a/yang-models/_3gpp-5gc-nrm-amfregion.yang b/yang-models/_3gpp-5gc-nrm-amfregion.yang index a2afbe9d6..f44940dac 100755 --- a/yang-models/_3gpp-5gc-nrm-amfregion.yang +++ b/yang-models/_3gpp-5gc-nrm-amfregion.yang @@ -13,10 +13,11 @@ module _3gpp-5gc-nrm-amfregion { contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464"; description "This IOC represents the AMF Region which consists one or multiple AMF Sets. - Copyright 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + Copyright 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved."; reference "3GPP TS 28.541 5G Network Resource Model (NRM)"; + revision 2024-05-24 { reference CR-1273 ; } revision 2023-09-18 { reference CR-1043 ; } revision 2022-01-07 { reference CR-0643; } revision 2020-11-06 { reference CR-0412 ; } @@ -45,7 +46,7 @@ module _3gpp-5gc-nrm-amfregion { reference "TS 38.413 clause 9.3.3.10"; min-elements 1; config false; - type types3gpp:Tac; + type types5g3gpp:NRTAC; } list sNSSAIList { diff --git a/yang-models/_3gpp-5gc-nrm-amfset.yang b/yang-models/_3gpp-5gc-nrm-amfset.yang index 31f76519f..9473afee3 100755 --- a/yang-models/_3gpp-5gc-nrm-amfset.yang +++ b/yang-models/_3gpp-5gc-nrm-amfset.yang @@ -13,10 +13,11 @@ module _3gpp-5gc-nrm-amfset { contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464"; description "This IOC represents the AMF Set which consists of some AMFs that serve a given area and Network Slice. - Copyright 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + Copyright 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved."; reference "3GPP TS 28.541 5G Network Resource Model (NRM)"; + revision 2024-05-24 { reference CR-1273 ; } revision 2023-09-18 { reference CR-1043 ; } revision 2022-01-07 { reference CR-0643; } revision 2020-11-06 { reference CR-0412 ; } @@ -44,7 +45,7 @@ module _3gpp-5gc-nrm-amfset { reference "TS 38.413 clause 9.3.3.10"; min-elements 1; config false; - type types3gpp:Tac; + type types5g3gpp:NRTAC; } list sNSSAIList { diff --git a/yang-models/_3gpp-5gc-nrm-neffunction.yang b/yang-models/_3gpp-5gc-nrm-neffunction.yang index f2b6f26f9..fec93a992 100755 --- a/yang-models/_3gpp-5gc-nrm-neffunction.yang +++ b/yang-models/_3gpp-5gc-nrm-neffunction.yang @@ -17,10 +17,12 @@ module _3gpp-5gc-nrm-neffunction { contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464"; description "This IOC represents the NEF function in 5GC. For more information about the NEF, see 3GPP TS 23.501. - Copyright 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + Copyright 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved."; reference "3GPP TS 28.541"; + revision 2024-05-18 { reference CR-1273 ; } + revision 2024-04-12 { reference CR-1218 ; } revision 2023-09-18 { reference CR-1103 ; } revision 2023-09-18 { reference CR-1043 ; } revision 2023-04-26 { reference CR-0916; } @@ -161,7 +163,7 @@ module _3gpp-5gc-nrm-neffunction { yext3gpp:notNotifyable; key idx; leaf idx { type uint32 ; } - uses nfp3gpp:TaiRange; + uses nfp3gpp:TaiRangeGrp; } leaf nefId { @@ -246,6 +248,30 @@ module _3gpp-5gc-nrm-neffunction { - True: UAS NF functionality is supported by the NEF. - False (default): UAS NF functionality is not supported by the NEF"; } + + leaf multiMemAfSessQosInd { + type boolean; + default false; + description "This attribute indicates whether the NEF supports + Multi-member AF session with required QoS functionality: + + - TRUE: Multi-member AF session with required QoS functionality is + supported by the NEF + - FALSE (default): Multi-member AF session with required QoS + functionality is not supported by the NEF."; + } + + leaf memberUESelAssistInd { + type boolean; + default false; + description "This attribute indicates whether the NEF supports member + UE selection assistance functionality: + + - TRUE: member UE selection assistance functionality is supported by + the NEF + - FALSE (default): member UE selection assistance functionality is + not supported by the NEF."; + } } grouping NEFFunctionGrp { diff --git a/yang-models/_3gpp-5gc-nrm-nfprofile.yang b/yang-models/_3gpp-5gc-nrm-nfprofile.yang index 43f988955..15dc5e0a1 100755 --- a/yang-models/_3gpp-5gc-nrm-nfprofile.yang +++ b/yang-models/_3gpp-5gc-nrm-nfprofile.yang @@ -12,10 +12,11 @@ module _3gpp-5gc-nrm-nfprofile { organization "3gpp SA5"; contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464"; description "NF profile class. - Copyright 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + Copyright 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved."; reference "3GPP TS 29.510"; + revision 2024-04-12 { reference CR-1218 ; } revision 2023-11-18 { reference CR-1103 ; } revision 2023-09-18 { reference CR-1043 ; } revision 2023-02-14 { reference CR-0891; } @@ -338,7 +339,7 @@ module _3gpp-5gc-nrm-nfprofile { min-elements 1; key idx; leaf idx { type uint32; } - uses TaiRange; + uses TaiRangeGrp; } list backupInfoAmfFailure { @@ -409,7 +410,7 @@ module _3gpp-5gc-nrm-nfprofile { min-elements 1; key idx; leaf idx { type uint32; } - uses TaiRange; + uses TaiRangeGrp; } leaf pgwFqdn { @@ -1055,7 +1056,7 @@ module _3gpp-5gc-nrm-nfprofile { } } - grouping TaiRange { + grouping TaiRangeGrp { list plmnId { description "PLMN ID related to the TacRange."; min-elements 1; diff --git a/yang-models/_3gpp-5gc-nrm-nwdaffunction.yang b/yang-models/_3gpp-5gc-nrm-nwdaffunction.yang index 81e85cbfa..5fe7eb7ae 100755 --- a/yang-models/_3gpp-5gc-nrm-nwdaffunction.yang +++ b/yang-models/_3gpp-5gc-nrm-nwdaffunction.yang @@ -8,38 +8,288 @@ module _3gpp-5gc-nrm-nwdaffunction { import _3gpp-common-managed-element { prefix me3gpp; } import ietf-inet-types { prefix inet; } import _3gpp-common-yang-types { prefix types3gpp; } + import _3gpp-common-yang-extensions { prefix yext3gpp; } import _3gpp-5g-common-yang-types { prefix types5g3gpp; } import _3gpp-common-top { prefix top3gpp; } + import _3gpp-5gc-nrm-nfprofile { prefix nfp3gpp; } organization "3gpp SA5"; contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464"; description "This IOC represents the NWDAF function in 5GC. For more information about the NWDAF, see 3GPP TS 23.501. - Copyright 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + Copyright 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved."; reference "3GPP TS 28.541"; - revision 2023-09-18 { reference CR-1043 ; } + revision 2024-04-12 { reference CR-1218; } + revision 2023-09-18 { reference CR-1043; } revision 2023-04-26 { reference CR-0916; } - revision 2020-11-08 { reference CR-0412 ; } + revision 2020-11-08 { reference CR-0412; } revision 2019-10-25 { reference "S5-194457 S5-195427 S5-193518"; } revision 2019-05-15 {reference "initial revision"; } + + typedef NwdafEvent { + description "The detailed ENUM value for NwdafEvent see the + Table 5.1.6.3.4-1 in TS 29.520"; + type union { + type enumeration { + enum SLICE_LOAD_LEVEL; + enum NETWORK_PERFORMANCE; + enum NF_LOAD; + enum SERVICE_EXPERIENCE; + enum UE_MOBILITY; + enum UE_COMMUNICATION; + enum QOS_SUSTAINABILITY; + enum ABNORMAL_BEHAVIOUR; + enum USER_DATA_CONGESTION; + enum NSI_LOAD_LEVEL; + enum DN_PERFORMANCE; + enum DISPERSION; + enum RED_TRANS_EXP; + enum WLAN_PERFORMANCE; + enum SM_CONGESTION; + } + type string; + } + } + + grouping NwdafCapabilityGrp { + description "This data type represents the capability supported by the + NWDAF."; + reference "TS 29.510"; + + leaf analyticsAggregation { + type boolean ; + default false; + description "It indicates whether the NWDAF supports analytics + aggregation"; + } + + leaf analyticsMetadataProvisioning { + type boolean ; + default false; + description "It indicate whether the NWDAF supports analytics metadata + provisioning:"; + } + } + + grouping MlAnalyticsInfoGrp { + description "This data type represents ML Analytics Filter information + supported by the Nnwdaf_MLModelProvision service."; + reference "TS 29.510"; + + leaf-list mlAnalyticsIds { + type NwdafEvent; + ordered-by user; + description "This attribute represents the Analytic functionalities + (identified by nwdafEvent defined in TS 29.520 [85]) of the NWDAF + instance. MnS consumer can configure this attribute to specify + which Analytic functionalities (identified by nwdafEvent) can be + performed the NWDAF instance. If the value of this attribute is not + present, the NWDAF instance can perform any NWDAFEvents + + Analytics Id(s) supported by the Nnwdaf_MLModelProvision service, + if none are provided the NWDAF can serve any mlAnalyticsId."; + } + + list sNSSAIList { + min-elements 1; + description "List of S-NSSAIs the managed object is capable of + supporting."; + reference "3GPP TS 23.003"; + key "sd sst"; + uses types5g3gpp:SNssai; + } + + list trackingAreaList { + description "This attribute represents area of Interest of the ML model, + if none are provided the ML model for the analytics can apply to any + TAIs. + + If present, it represents the list of TAIs, it may contain one or + more non-3GPP access TAIs."; + key idx ; + leaf idx { type uint32; } + uses types3gpp:TaiGrp; + } + + leaf-list mlModelInterInfo { + type string { + pattern "[0-9]{6}"; + } + description "This attribute defines the list of NWDAF vendors that are + allowed to retrieve ML models from the NWDAF containing MTLF. The + absence of this attribute indicates that none of the NWDAF vendors + can retrieve the ML models. + + allowedValues: 6 decimal digits; if the SMI code has less than + 6 digits, it shall be padded with leading digits '0' to complete a + 6-digit string value."; + } + + leaf flCapabilityType { + type enumeration { + enum FL_SERVER { + description "NWDAF containing MTLF as Federated Learning Server"; + } + enum FL_CLIENT { + description "NWDAF containing MTLF as Federated Learning Client"; + } + enum FL_SERVER_AND_CLIENT { + description "NWDAF containing MTLF as Federated Learning Server and + Client."; + } + } + description "This attribute defines the federated learning capability + type supported by NWDAF containing MTLF."; + } + + list flTimeInterval { + key idx ; + leaf idx { type uint32; } + description "This attribute defines the time window at which the + indicated flCapabilityType supported by NWDAF MTLF is available. + This attribute shall be present only if flCapabilityType attribute + is present."; + uses types3gpp:TimeWindowGrp; + } + } + + grouping NwdafInfoGrp { + description "This data type represents specific data for the NWDAF."; + reference "TS 29.510"; + + leaf-list nwdafEvents { + type NwdafEvent; + ordered-by user; + description "This attribute represents the Analytic functionalities + (identified by nwdafEvent defined in TS 29.520) of the NWDAF instance. + MnS consumer can configure this attribute to specify which Analytic + functionalities (identified by nwdafEvent) can be performed the NWDAF + instance. If the value of this attribute is not present, the NWDAF + instance can perform any NWDAFEvents. + The detailed ENUM value for NwdafEvent see the Table 5.1.6.3.4-1 + in TS 29.520"; + } + + leaf-list eventIds { + type string ; + min-elements 1; + description "It represents the EventId(s) supported by the + Nnwdaf_AnalyticsInfo service, if none are provided the NWDAF can serve + any eventId. (see clause TS 29.520)"; + } + + list taiList { + description "The list of TAIs. "; + min-elements 1; + key idx ; + leaf idx { type uint32; } + uses types3gpp:TaiGrp; + } + + list taiRangeList { + min-elements 1; + key idx ; + leaf idx { type uint32; } + description "The range of TAIs."; + uses nfp3gpp:TaiRangeGrp; + } + + list nwdafCapability { + max-elements 1; + key idx ; + leaf idx { type uint32; } + description "This attribute indicates the capability of the NWDAF. + If not present, the NWDAF shall be regarded with no capability."; + uses NwdafCapabilityGrp; + } + + leaf analyticsDelay { + type int32 ; + units seconds; + description "It represents the supported Analytics Delay related to the + eventIds and nwdafEvents. + It is an unsigned integer identifying a period of time in units of + seconds.(see clause 5.2.2 TS 29.571)."; + } + + leaf-list servingNfTypeList { + type types3gpp:NfType; + min-elements 1; + description "It contains the list of NF type(s) from which the NWDAF NF + can collect data. The absence of this attribute indicates that the + NWDAF can collect data from any NF type."; + } + + leaf-list servingNfSetIdList { + type string ; + min-elements 1; + description "It contains the list of NF type(s) from which the NWDAF NF + can collect data. The absence of this attribute indicates that the + NWDAF can collect data from any NF type. (see clause 5.4.2 NfSetId + in TS 29.571)"; + } + + list mlAnalyticsList { + min-elements 1; + key idx ; + leaf idx { type uint32; } + description "It represents ML Analytics Filter information supported by + the Nnwdaf_MLModelProvision service."; + uses MlAnalyticsInfoGrp; + } + } + + grouping NetworkSliceInfoGrp { + description "Represents information of network slice when the NWDAF is + authorized to collect the management data of the network slice. "; + + list sNSSAI { + description "It represents the S-NSSAI the NetworkSlice managed object + is supporting. The S-NSSAI is defined in TS 23.003 "; + key idx; + min-elements 1; + max-elements 1; + + leaf idx { + type string; + } + uses types5g3gpp:SNssai; + } + + leaf-list cNSIId { + type string; + description "It represents NSI ID which is an identifier for identifying + the Core Network part of a Network Slice instance when multiple + Network Slice instances of the same Network Slice are deployed, + and there is a need to differentiate between them in the 5GC. + See NSI ID definition in clause 3.1 of TS 23.501 and + subclause 6.1.6.2.7 of TS 29.531."; + } + + leaf networkSliceRef { + type types3gpp:DistinguishedName; + mandatory true; + description "This holds a DN of the NetworkSlice managed object relating + to the NetworkSlice instance differentiated by sNSSAI and optional + cNSIId."; + } + } grouping NWDAFFunctionGrp { description "Represents the NWDAFFunction IOC"; uses mf3gpp:ManagedFunctionGrp; - list pLMNIdList { - description "List of at most six entries of PLMN Identifiers, but at - least one (the primary PLMN Id). - The PLMN Identifier is composed of a Mobile Country Code (MCC) and a - Mobile Network Code (MNC)."; + list pLMNInfoList { + description "It defines the PLMN(s) of a Network Function."; - min-elements 1; - max-elements 6; - key "mcc mnc"; + min-elements 1; + key "idx"; + leaf idx { type uint32; } uses types3gpp:PLMNId; + uses types5g3gpp:SNssai; } leaf sBIFQDN { @@ -47,18 +297,7 @@ module _3gpp-5gc-nrm-nwdaffunction { interface."; type inet:domain-name; } - - list sNSSAIList { - description "List of S-NSSAIs the managed object is capable of supporting. - (Single Network Slice Selection Assistance Information) - An S-NSSAI has an SST (Slice/Service type) and an optional SD - (Slice Differentiator) field."; - //optional support - reference "3GPP TS 23.003"; - key "sd sst"; - uses types5g3gpp:SNssai; - } - + list managedNFProfile { key idx; min-elements 1; @@ -75,12 +314,77 @@ module _3gpp-5gc-nrm-nwdaffunction { reference "3GPP TS 23.501"; uses types5g3gpp:CommModel; } + + list networkSliceInfoList { + key idx; + min-elements 1; + description "The attribute specifies a list of NetworkSliceInfo which + is defined as a datatype (see clause 5.3.95). It can be used by the + NWDAF to facilitate the data collection from OAM."; + leaf idx { + type string; + } + uses NetworkSliceInfoGrp; + yext3gpp:inVariant; + } + + list nwdafInfo { + min-elements 1; + max-elements 1; + key idx; + leaf idx { type uint32; } + description "It represents specific data for the NWDAF."; + uses NwdafInfoGrp; + } + + leaf administrativeState { + type types3gpp:BasicAdministrativeState ; + mandatory true; + description "This attribute determines whether the NWDAF is enabled or + disabled. MnS consumer can configure this attribute to activate or + de-activate the analytic functionalities (identified by nwdafEvent + defined in TS 29.520) of the NWDAF instance."; + } + + leaf nwdafLogicalFuncSupported { + type enumeration { + enum NWDAF_WITH_ANLF { + description "Indicates the NWDAF containing Analytics logical + function (AnLF)"; + } + enum NWDAF_WITH_MTLF { + description "Indicates the NWDAF containing Model Training logical + function (MTLF)."; + } + enum NWDAF_WITH_ANLF_MTLF { + description "Indicates the NWDAF containing both Analytics logical + function (AnLF) and Model Training logical function (MTLF)."; + } + } + config false; + description "It represents the logical functions supported by the NWDAF. + If not present, the NWDAF shall be regarded with no logical + decomposition, in that case the NWDAF only supports the analytics + services."; + } } augment "/me3gpp:ManagedElement" { list NWDAFFunction { - description "5G Core NWDAF Function"; - reference "3GPP TS 28.541"; + description "5G Core NWDAF Function. + For more information about the NWDAF, see TS 23.501. Several + attributes (including 'nwdafInfo', 'administrativeState' and + 'ManagedNFProfile.servingScope') are used to control the functionalities + (identified by nwdafEvent defined in TS 29.520) of the NWDAF instance. + + The attribute 'ManagedNFProfile.servingScope' is used to represent + specified certain geographical area(s) can be served by the NWDAF + instance. + + The attribute 'NwdafInfo.taiList' and 'NwdafInfo.taiRangeList' is used + to represent specified certain tracking area(s) can be served by the + NWDAF instance."; + reference "3GPP TS 28.541 3GPP TS 23.501"; key id; uses top3gpp:Top_Grp; container attributes { diff --git a/yang-models/_3gpp-5gc-nrm-pcffunction.yang b/yang-models/_3gpp-5gc-nrm-pcffunction.yang index b60f25f21..673c13acc 100755 --- a/yang-models/_3gpp-5gc-nrm-pcffunction.yang +++ b/yang-models/_3gpp-5gc-nrm-pcffunction.yang @@ -15,10 +15,11 @@ module _3gpp-5gc-nrm-pcffunction { contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464"; description "This IOC represents the PCF function in 5GC. For more information about the PCF, see 3GPP TS 23.501. - Copyright 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + Copyright 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved."; reference "3GPP TS 28.541"; + revision 2024-05-24 { reference CR-1273 ; } revision 2023-09-18 { reference CR-1043 ; } revision 2023-04-26 { reference CR-0916; } revision 2020-11-08 { reference CR-0412 ; } @@ -27,8 +28,8 @@ module _3gpp-5gc-nrm-pcffunction { revision 2019-10-25 { reference "S5-194457 S5-193518"; } revision 2019-05-22 { reference "initial revision"; } - grouping PCFFuntionGrp { - description "Represents the PCFFuntion IOC"; + grouping PCFFunctionGrp { + description "Represents the PCFFunction IOC"; uses mf3gpp:ManagedFunctionGrp; list pLMNIdList { @@ -94,7 +95,7 @@ module _3gpp-5gc-nrm-pcffunction { key id; uses top3gpp:Top_Grp; container attributes { - uses PCFFuntionGrp; + uses PCFFunctionGrp; } uses mf3gpp:ManagedFunctionContainedClasses; } diff --git a/yang-models/_3gpp-5gc-nrm-smffunction.yang b/yang-models/_3gpp-5gc-nrm-smffunction.yang index 8550fcc3d..ca37a43d4 100755 --- a/yang-models/_3gpp-5gc-nrm-smffunction.yang +++ b/yang-models/_3gpp-5gc-nrm-smffunction.yang @@ -13,10 +13,11 @@ module _3gpp-5gc-nrm-smffunction { organization "3gpp SA5"; contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464"; description "SMFFunction derived from basic ManagedFunction. - Copyright 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + Copyright 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved."; reference "3GPP TS 28.541"; + revision 2024-05-24 { reference CR-1273 ; } revision 2023-09-18 { reference CR-1043 ; } revision 2023-04-26 { reference CR-0916; } revision 2020-11-08 { reference CR-0412 ; } @@ -44,7 +45,7 @@ module _3gpp-5gc-nrm-smffunction { reference "TS 38.413 clause 9.3.3.10"; min-elements 1; config false; - type types3gpp:Tac; + type types5g3gpp:NRTAC; } leaf sBIFQDN { diff --git a/yang-models/_3gpp-5gc-nrm-udmfunction.yang b/yang-models/_3gpp-5gc-nrm-udmfunction.yang index b799b2cbb..319015d16 100755 --- a/yang-models/_3gpp-5gc-nrm-udmfunction.yang +++ b/yang-models/_3gpp-5gc-nrm-udmfunction.yang @@ -15,10 +15,11 @@ module _3gpp-5gc-nrm-udmfunction { contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464"; description "This IOC represents the UDM function in 5GC. For more information about the UDM, see 3GPP TS 23.501. - Copyright 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + Copyright 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved."; reference "3GPP TS 28.541"; + revision 2024-04-04 { reference CR-1139; } revision 2023-09-18 { reference CR-1043 ; } revision 2023-04-26 { reference CR-0916; } revision 2020-11-08 { reference CR-0412 ; } @@ -74,6 +75,25 @@ module _3gpp-5gc-nrm-udmfunction { reference "3GPP TS 23.501"; uses types5g3gpp:CommModel; } + + leaf-list mdtUserConsentReqList { + type enumeration { + enum M1; + enum M2; + enum M3; + enum M4; + enum M5; + enum M6; + enum M7; + enum M8; + enum M9; + enum MDT_UE_LOCATION; + } + description "represents a list of MDT measurement names that are + subject to user consent at MDT activation. + Any MDT measurement, whose name is not specified in this list, is not + subject to user consent at MDT activation."; + } } augment "/me3gpp:ManagedElement" { diff --git a/yang-models/_3gpp-5gc-nrm-upffunction.yang b/yang-models/_3gpp-5gc-nrm-upffunction.yang index ca74a06c7..0c4a89df4 100755 --- a/yang-models/_3gpp-5gc-nrm-upffunction.yang +++ b/yang-models/_3gpp-5gc-nrm-upffunction.yang @@ -12,10 +12,11 @@ module _3gpp-5gc-nrm-upffunction { organization "3GPP SA5"; contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464"; description "UPFFunction derived from basic ManagedFunction. - Copyright 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + Copyright 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved."; reference "3GPP TS 28.541 5G Network Resource Model (NRM)"; + revision 2024-05-24 { reference CR-1273 ; } revision 2023-09-18 { reference CR-1043 ; } revision 2023-04-26 { reference CR-0916; } revision 2020-11-08 { reference CR-0412 ; } @@ -41,7 +42,7 @@ module _3gpp-5gc-nrm-upffunction { reference "TS 38.413 clause 9.3.3.10"; min-elements 1; config false; - type types3gpp:Tac; + type types5g3gpp:NRTAC; } list sNSSAIList { diff --git a/yang-models/_3gpp-common-files.yang b/yang-models/_3gpp-common-files.yang index 22e573959..9317e769f 100644 --- a/yang-models/_3gpp-common-files.yang +++ b/yang-models/_3gpp-common-files.yang @@ -13,7 +13,7 @@ module _3gpp-common-files { contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464"; description "Defines the YANG mapping of File retrieval NRM fragment including the IOCs File and Files. - Copyright 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + Copyright 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved."; reference "3GPP TS 28.623 Generic Network Resource Model (NRM) @@ -24,7 +24,8 @@ module _3gpp-common-files { Generic Network Resource Model (NRM) Integration Reference Point (IRP); Information Service (IS)"; - + + revision 2024-05-11 { reference CR-0362 ; } revision 2023-09-18 { reference CR-0271 ; } revision 2022-09-28 { reference CR-0191; } @@ -207,10 +208,10 @@ module _3gpp-common-files { related to a job. The attribute '_linkToFiles' allows a MnS consumer to create simple - and targeted subscriptions for 'notifyFileReady', - 'notifyFilePreparationError' and 'notifyFileDeletion', or - 'notifyMOICreation', 'notifyMOIChanges', 'notifyFilePreparationError' - and 'notifyFileDeletion' related to 'File' instances created or deleted + and targeted subscriptions for 'notifyFileReady'and + 'notifyFilePreparationError', or + 'notifyMOICreation', 'notifyMOIChanges' and 'notifyFilePreparationError' + related to 'File' instances created or deleted under the 'Files' instance of a specific job. The subscription needs to scope simply objects one level below the 'Files' object. @@ -323,4 +324,4 @@ module _3gpp-common-files { } } } -} \ No newline at end of file +} diff --git a/yang-models/_3gpp-common-fm.yang b/yang-models/_3gpp-common-fm.yang index 219bb3c0c..223ea0033 100755 --- a/yang-models/_3gpp-common-fm.yang +++ b/yang-models/_3gpp-common-fm.yang @@ -12,15 +12,21 @@ module _3gpp-common-fm { contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464"; description "Defines a Fault Management model - Copyright 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + Copyright 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved."; reference "3GPP TS 28.111"; + revision 2024-05-12 { + description "The definition of the module was from TS 28.623 to TS 28.111"; + reference CR-0008 ; + } + revision 2024-03-06 { reference CR-0333 ; } + revision 2024-02-24 { reference CR-0346; } revision 2024-01-18 { description "The specification of the file is moved from 28.623 to 28.532"; reference "28.623 CR-0315"; } - revision 2023-09-18 { reference CR-0271 ; } + revision 2023-09-18 { reference CR-0271; } revision 2023-05-10 { reference CR-0250; } revision 2022-10-24 { reference CR-0196; } revision 2021-08-08 { reference "CR-0132"; } @@ -92,6 +98,36 @@ module _3gpp-common-fm { description "The possible alarm severities"; } + grouping AlarmCommentGrp { + leaf commentTime { + type yang:date-and-time; + config false; + mandatory true; + description "Date and Time the comment was created."; + } + + leaf commentUserId { + type string; + mandatory true; + description "It carries the identification of the user who made the + comment."; + } + + leaf commentSystemId { + type string; + mandatory true; + description "It carries the identification of the system ( + Management System) from which the comment is made. That system + supports the user that made the comment."; + } + + leaf commentText { + type string; + mandatory true; + description "It carries the textual comment."; + } + } + grouping AlarmRecordGrp { description "Contains alarm information of an alarmed object instance. A new record is created in the alarm list when an alarmed object @@ -345,6 +381,16 @@ module _3gpp-common-fm { yext3gpp:notNotifyable; } + list comments { + yext3gpp:inVariant; + yext3gpp:notNotifyable; + description "List of comments and data about the comments."; + key idx; + leaf idx { type uint32; } + + uses AlarmCommentGrp; + } + leaf ackTime { if-feature AcknowledgeByConsumer; type yang:date-and-time ; @@ -430,7 +476,7 @@ module _3gpp-common-fm { type types3gpp:DistinguishedName; } - leaf-list notificationId { + leaf-list notificationIds { type int32; min-elements 1; } @@ -441,7 +487,7 @@ module _3gpp-common-fm { description "Represents the AlarmList IOC."; leaf administrativeState { - type types3gpp:AdministrativeState ; + type types3gpp:BasicAdministrativeState ; default LOCKED; description "When set to UNLOCKED, the alarm list is updated. When the set to LOCKED, the existing alarm records are not @@ -478,6 +524,21 @@ module _3gpp-common-fm { yext3gpp:notNotifyable; uses AlarmRecordGrp; } + + leaf-list unreliableAlarmScope { + type types3gpp:DistinguishedName; + config false; + yext3gpp:notNotifyable; + description "Identifies, the part of the alarm scope that may not be + reliable. + + If this parameter is equal to the instance carried in systemDN, + then all AlarmRecord instances in the AlarmList may not be reliable. + + If this parameter is equal to some instance represented by + MonitoredEntity, then only AlarmRecord related to this instance and + its descendants may not be reliable."; + } } grouping FmSubtree { @@ -492,6 +553,7 @@ module _3gpp-common-fm { list AlarmList { key id; max-elements 1; + yext3gpp:only-system-created; description "The AlarmList represents the capability to store and manage alarm records. The management scope of an AlarmList is defined by all descendant objects of the base managed object, which is the object @@ -511,4 +573,4 @@ module _3gpp-common-fm { } } -} \ No newline at end of file +} diff --git a/yang-models/_3gpp-common-managed-function.yang b/yang-models/_3gpp-common-managed-function.yang index 11131766d..ea4390cc3 100755 --- a/yang-models/_3gpp-common-managed-function.yang +++ b/yang-models/_3gpp-common-managed-function.yang @@ -13,7 +13,7 @@ module _3gpp-common-managed-function { contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464"; description "The module defines a base class/grouping for major 3GPP functions. - Copyright 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + Copyright 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved."; reference "3GPP TS 28.622 @@ -24,7 +24,8 @@ module _3gpp-common-managed-function { 3GPP TS 28.620 Umbrella Information Model (UIM)"; - revision 2023-09-18 { reference CR-0271 ; } + revision 2024-02-24 { reference CR-0346; } + revision 2023-09-18 { reference CR-0271; } revision 2023-04-26 { reference CR-0250; } revision 2023-02-14 { reference "CR-0234"; } revision 2022-11-02 { reference "CR-0753"; } @@ -116,7 +117,7 @@ module _3gpp-common-managed-function { } leaf administrativeState { - type types3gpp:AdministrativeState; + type types3gpp:BasicAdministrativeState; mandatory true; description "Permission to use or prohibition against using the instance"; } diff --git a/yang-models/_3gpp-common-managementdatacollection.yang b/yang-models/_3gpp-common-managementdatacollection.yang index 7b5c30180..2a6ffea33 100644 --- a/yang-models/_3gpp-common-managementdatacollection.yang +++ b/yang-models/_3gpp-common-managementdatacollection.yang @@ -6,15 +6,13 @@ module _3gpp-common-managementdatacollection { import _3gpp-common-top { prefix top3gpp; } import _3gpp-common-yang-types {prefix types3gpp; } import _3gpp-common-yang-extensions {prefix yext3gpp; } - //import ietf-inet-types { prefix inet; } - import ietf-yang-types { prefix yang; } import _3gpp-common-subnetwork { prefix subnet3gpp; } organization "3GPP SA5"; contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464"; description "Handling management data collection - Copyright 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + Copyright 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved."; reference "3GPP TS 28.623 Generic Network Resource Model (NRM) @@ -26,6 +24,7 @@ module _3gpp-common-managementdatacollection { Integration Reference Point (IRP); Information Service (IS)"; + revision 2024-04-12 { reference CR-0346; } revision 2023-11-18 { reference CR-0299 ; } revision 2023-11-06 { reference "CR-0305"; } revision 2023-09-18 { reference CR-0271 ; } @@ -168,18 +167,6 @@ module _3gpp-common-managementdatacollection { description ""; } - grouping TimeWindowGrp { - leaf startTime { - type yang:date-and-time; - yext3gpp:inVariant; - } - leaf endTime { - type yang:date-and-time; - yext3gpp:inVariant; - } - } - - grouping ManagementDataCollectionGrp { choice managementData { @@ -264,7 +251,7 @@ module _3gpp-common-managementdatacollection { max-elements 1; description "Collection time window for which the management data should be reported."; - uses TimeWindowGrp; + uses types3gpp:TimeWindowGrp; } list reportingCtrl { diff --git a/yang-models/_3gpp-common-measurements.yang b/yang-models/_3gpp-common-measurements.yang index 6bb0d0796..e2cf97b8a 100755 --- a/yang-models/_3gpp-common-measurements.yang +++ b/yang-models/_3gpp-common-measurements.yang @@ -44,7 +44,7 @@ module _3gpp-common-measurements { Measurements can be contained under ManagedElement, SubNetwork, or any list representing a class inheriting from Subnetwork or ManagedFunction. Note: KPIs will only be supported under SubNetwork - Copyright 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + Copyright 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved."; reference "3GPP TS 28.623 Generic Network Resource Model (NRM) @@ -56,8 +56,10 @@ module _3gpp-common-measurements { Integration Reference Point (IRP); Information Service (IS)"; + revision 2024-05-06 { reference CR-0359; } + revision 2024-02-24 { reference CR-0346; } revision 2023-11-18 { reference "CR-0299 CR-0305"; } - revision 2023-09-18 { reference CR-0271 ; } + revision 2023-09-18 { reference CR-0271; } revision 2023-04-26 { reference CR-0250; } revision 2023-02-18 { reference "CR-0240"; } revision 2023-02-14 { reference "CR-0234"; } @@ -249,7 +251,7 @@ module _3gpp-common-measurements { leaf administrativeState { default UNLOCKED; - type types3gpp:AdministrativeState ; + type types3gpp:BasicAdministrativeState ; description "Enable or disables production of the metrics"; } @@ -323,6 +325,17 @@ module _3gpp-common-measurements { description "Link to a 'Files' object."; yext3gpp:inVariant; } + + choice conditiona-or-schedule { + leaf schedulerRef { + type types3gpp:DistinguishedName; + description "Pointer to a Scheduler object."; + } + leaf conditionMonitorRef { + type types3gpp:DistinguishedName; + description "Pointer to a ConditionMonitor object."; + } + } } @@ -333,7 +346,7 @@ module _3gpp-common-measurements { leaf administrativeState { default UNLOCKED; - type types3gpp:AdministrativeState ; + type types3gpp:BasicAdministrativeState ; description "Enables or disables the ThresholdMonitor."; } diff --git a/yang-models/_3gpp-common-subscription-control.yang b/yang-models/_3gpp-common-subscription-control.yang index ed049c654..b637e1ff5 100755 --- a/yang-models/_3gpp-common-subscription-control.yang +++ b/yang-models/_3gpp-common-subscription-control.yang @@ -18,6 +18,7 @@ module _3gpp-common-subscription-control { Solution Set (SS) definitions 3GPP TS 28.623"; + revision 2024-05-18 { reference CR-0359 ; } revision 2024-01-18 { reference "CR-0309 CR-0329" ; } revision 2023-09-18 { reference CR-0271 ; } revision 2023-08-10 { reference "CR0257 CR0260"; } @@ -26,23 +27,22 @@ module _3gpp-common-subscription-control { revision 2020-08-26 { reference "CR-0106"; } revision 2019-11-29 { reference "S5-197648 S5-197647 S5-197829 S5-197828"; } - grouping NtfSubscriptionControlGrp { - description "Attributes of a specific notification subscription"; - - leaf notificationRecipientAddress { - type string; - mandatory true; - } - - leaf-list notificationTypes { - type string; - description "Defines the types of notifications that are candidates - for being forwarded to the notification recipient. - If the notificationTypes attribute is not supported or not present - all candidate notifications types are forwarded to the notification; - discriminated by notificationFilter attribute."; - } + grouping ScopeGrp { + description "This <> allows to select data nodes in an object + tree whose root is identified by the so called base managed object + instance. The identification of the base object instance is not part of + this <> and needs to be specified by other means. The base + managed object instance is typically a managed object instance in an + object tree. + + The 'scopeType' and the 'scopeLevel' attributes allow to select managed + object instances. Attributes, attribute fields and attribute elements + cannot be selected. + The 'dataNodeSelector' attribute allows to select managed object + instances, attributes, attribute fields, attribute elements, or + attribute field elements. Its value contains a solution set specific + expression for specifying the data nodes to be selected."; choice scope { description "Describes which object instances are selected with respect to a base object instance."; @@ -91,6 +91,32 @@ module _3gpp-common-subscription-control { reference "RFC 8641 section 5."; } } + } + } + + grouping NtfSubscriptionControlGrp { + description "Attributes of a specific notification subscription"; + + leaf notificationRecipientAddress { + type string; + mandatory true; + } + + leaf-list notificationTypes { + type string; + description "Defines the types of notifications that are candidates + for being forwarded to the notification recipient. + If the notificationTypes attribute is not supported or not present + all candidate notifications types are forwarded to the notification; + discriminated by notificationFilter attribute."; + } + + list scope { + description "Scopes (selects) data nodes in an object tree."; + key idx; + max-elements 8; + leaf idx { type string; } + uses ScopeGrp; } leaf notificationFilter { diff --git a/yang-models/_3gpp-common-trace.yang b/yang-models/_3gpp-common-trace.yang index cd2a69cb7..af5327945 100755 --- a/yang-models/_3gpp-common-trace.yang +++ b/yang-models/_3gpp-common-trace.yang @@ -13,7 +13,7 @@ module _3gpp-common-trace { contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464"; description "Trace handling - Copyright 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + Copyright 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved."; reference "3GPP TS 28.623 Generic Network Resource Model (NRM) @@ -25,6 +25,9 @@ module _3gpp-common-trace { Integration Reference Point (IRP); Information Service (IS)" ; + revision 2024-05-12 { reference "CR-0401"; } + revision 2024-05-06 { reference CR-0359; } + revision 2024-04-06 { reference "CR-0342"; } revision 2024-01-29 { reference "CR-0316"; } revision 2023-11-06 { reference "CR-0290 CR-0294"; } revision 2023-11-03 { reference CR-0302 ; } @@ -248,32 +251,22 @@ module _3gpp-common-trace { mandatory true; description "Carrier Frequency"; } - - list nPNIdentityList { - description "list of NPN IDs of in NR. It is either a list of PNI-NPNs - identified by CAG ID with associated plmn-Identity or a list of SNPN - identified by Network ID with associated plmn-Identity"; - key idx; - min-elements 1; - uses NpnIdGrp; - leaf idx { type string; } - } } grouping TraceConfigGrp { - description "Defines the configuration parameters of TraceJob - which are specific for Trace or combined Trace and Immediate MDT. - The attribute listOfNeTypes specifies the network elements to be - traced. The optional attribute listOfInterfaces allows to specify - the individual interfaces of the network elements to be recorded. - The attribute traceDepth allows to configure the level of detail - of the information which shall be recorded. For trace the reporting - is event based, where the triggering event is configured with - attribute triggeringEvent. For each triggering event the first and - last message (start/stop triggering event) to record are specified."; - - list listOfInterfaces { + description "Defines the configuration parameters of TraceJob + which are specific for Trace or combined Trace and Immediate MDT. + The attribute listOfNeTypes specifies the network elements to be + traced. The optional attribute listOfInterfaces allows to specify + the individual interfaces of the network elements to be recorded. + The attribute traceDepth allows to configure the level of detail + of the information which shall be recorded. For trace the reporting + is event based, where the triggering event is configured with + attribute triggeringEvent. For each triggering event the first and + last message (start/stop triggering event) to record are specified."; + + list listOfInterfaces { key idx; description "Specifies the interfaces that need to be traced in the given @@ -621,6 +614,64 @@ module _3gpp-common-trace { semantic."; reference "Clause 5.3 of 3GPP TS 32.422"; } + + leaf triggeringEvents { + type enumeration { + enum MO_MT_CALLS; + enum MO_MT_SMS; + enum LU_IMSIattach_IMSIdetach; + enum HANDOVER; + enum SS; + enum PDPcontext; + enum RAU_GPRSattach_GPRSdetach; + enum MBMScontext; + enum CONTEXT; + enum SIPsession_StandaloneTransaction; + enum MBMSactivation; + enum UEinitiatedPDNconnectivityRequest; + enum ServiceRequest; + enum InitialAttach_TAU_Detach; + enum UEinitiatedPDNdisconnection; + enum BearerActivationModificationDeletion; + enum Handover; + enum PDNconnectionCreation; + enum PDNconnectionTermination; + enum Registration; + enum UEderegistration; + enum NetworkDeregistration; + enum UEMobilityFromEPC; + enum UEMobilityToEPC; + enum PDUsessionEstablishment; + enum PDUsessionModification; + enum PDUsessionRelease; + enum PDUsessionUPactivationDeactivation; + enum MobilityBtw3gppAndN3gppTo5GC; + enum MobilityFromEpc; + enum AMpolicy; + enum SMpolicy; + enum Authorization; + enum BDTpolicy; + enum N4Session; + enum UEauthentication; + enum EventExposure; + enum PFDmanagement; + enum ParameterProvision; + enum Trigger; + enum NFmanagement; + enum NFdiscovery; + enum NSSelection; + enum NSSAI; + enum SMservice; + enum UEcontext; + enum SubscriberData; + } + description "It specifies the triggering event parameter of the trace + session. The attribute is applicable only for Trace. In case this + attribute is not used, it carries a null semantic. + + See the clause 5.1 of 3GPP TS 32.422 for additional details on the + allowed values."; + } } grouping ImmediateMdtConfigGrp { @@ -702,7 +753,7 @@ module _3gpp-common-trace { logged according to RRM configuration."; leaf listOfMeasurements { - when 'jobType = "IMMEDIATE_MDT_ONLY"'; + when '../../../jobType = "IMMEDIATE_MDT_ONLY"'; type enumeration { enum M1; enum M2; @@ -726,7 +777,7 @@ module _3gpp-common-trace { } leaf reportingTrigger { - when 'jobType = "IMMEDIATE_MDT_ONLY"'; + when '../../../jobType = "IMMEDIATE_MDT_ONLY"'; type enumeration { enum PERIODICAL; enum A2_FOR_LTE; @@ -746,7 +797,7 @@ module _3gpp-common-trace { } leaf reportInterval { - when 'jobType = "IMMEDIATE_MDT_ONLY"' + when '../../../jobType = "IMMEDIATE_MDT_ONLY"' + ' and ../reportingTrigger = "PERIODICAL"'; type uint32 { range "120|240|250|480|500|640|1000|1024|2000|2048|3000|4000|" @@ -764,7 +815,7 @@ module _3gpp-common-trace { } leaf reportAmount { - when 'jobType = "IMMEDIATE_MDT_ONLY"' + when '../../../jobType = "IMMEDIATE_MDT_ONLY"' + ' and ../reportingTrigger = "PERIODICAL"'; type union { type uint32 { @@ -783,7 +834,7 @@ module _3gpp-common-trace { } leaf eventThreshold { - when 'jobType = "IMMEDIATE_MDT_ONLY"'; + when '../../../jobType = "IMMEDIATE_MDT_ONLY"'; type int64; description "Specifies the threshold which should trigger the reporting in case A2 event reporting in LTE or 1F/1l event in UMTS. The attribute @@ -793,9 +844,9 @@ module _3gpp-common-trace { reference "Clauses 5.10.7 and 5.10.7a of 3GPP TS 32.422"; } - leaf collectionPeriodRRMNR { - when 'jobType = "IMMEDIATE_MDT_ONLY"' - + ' or jobType = "IMMEDIATE_MDT_AND_TRACE"'; + leaf collectionPeriodRrmNr { + when '../../../jobType = "IMMEDIATE_MDT_ONLY"' + + ' or ../../../jobType = "IMMEDIATE_MDT_AND_TRACE"'; type uint32 { range "1024|2048|5120|10240|60000"; } @@ -807,24 +858,9 @@ module _3gpp-common-trace { reference "Clause 5.10.30 of 3GPP TS 32.422"; } - leaf collectionPeriodRRMLTE { - when 'jobType = "IMMEDIATE_MDT_ONLY"' - + ' or jobType = "IMMEDIATE_MDT_AND_TRACE"'; - type uint32 { - range "250|500|1000|2000|3000|4000|6000|8000|12000|16000|20000|" - +"24000|28000|32000|64000"; - } - units milliseconds; - description "Specifies the collection period for collecting RRM configured - measurement samples for M2, M3 in LTE. The attribute is applicable only - for Immediate MDT. In case this attribute is not used, it carries a - null semantic."; - reference "Clause 5.10.20 of 3GPP TS 32.422"; - } - - leaf collectionPeriodM6NR { - when 'jobType = "IMMEDIATE_MDT_ONLY"' - + ' or jobType = "IMMEDIATE_MDT_AND_TRACE"'; + leaf collectionPeriodM6Nr { + when '../../../jobType = "IMMEDIATE_MDT_ONLY"' + + ' or ../../../jobType = "IMMEDIATE_MDT_AND_TRACE"'; type enumeration { enum 120ms; enum 240ms; @@ -848,9 +884,9 @@ module _3gpp-common-trace { reference "clause 5.10.34 of TS 32.422"; } - leaf collectionPeriodM7NR { - when 'jobType = "IMMEDIATE_MDT_ONLY"' - + ' or jobType = "IMMEDIATE_MDT_AND_TRACE"'; + leaf collectionPeriodM7Nr { + when '../../../jobType = "IMMEDIATE_MDT_ONLY"' + + ' or ../../../jobType = "IMMEDIATE_MDT_AND_TRACE"'; type uint32 { range "1..60"; } @@ -861,9 +897,40 @@ module _3gpp-common-trace { reference "clause 5.10.35 of TS 32.422"; } - leaf collectionPeriodM6LTE { - when 'jobType = "IMMEDIATE_MDT_ONLY"' - + ' or jobType = "IMMEDIATE_MDT_AND_TRACE"'; + leaf collectionPeriodRrmLte { + when '../../../jobType = "IMMEDIATE_MDT_ONLY"' + + ' or ../../../jobType = "IMMEDIATE_MDT_AND_TRACE"'; + type uint32 { + range "250|500|1000|2000|3000|4000|6000|8000|12000|16000|20000|" + +"24000|28000|32000|64000"; + } + units milliseconds; + description "Specifies the collection period for collecting RRM configured + measurement samples for M2, M3 in LTE. The attribute is applicable only + for Immediate MDT. In case this attribute is not used, it carries a + null semantic."; + reference "Clause 5.10.20 of 3GPP TS 32.422"; + } + + leaf measurementPeriodLTE { + when '../../../jobType = "IMMEDIATE_MDT_ONLY"' + + ' or ../../../jobType = "IMMEDIATE_MDT_AND_TRACE"'; + type uint32 { + range "1024|1280|2048|2560|5120|" + +"10240|60000"; + } + units milliseconds; + mandatory true; + description "It specifies the measurement period for the Data Volume and + Scheduled IP throughput measurements for MDT taken by the eNB. + The attribute is applicable only for Immediate MDT. In case this + attribute is not used, it carries a null semantic."; + reference "Clause 5.10.23 of 3GPP TS 32.422"; + } + + leaf collectionPeriodM6Lte { + when '../../../jobType = "IMMEDIATE_MDT_ONLY"' + + ' or ../../../jobType = "IMMEDIATE_MDT_AND_TRACE"'; type uint32 { range "1024|2048|5120|10240"; } @@ -875,9 +942,9 @@ module _3gpp-common-trace { reference "Clause 5.10.32 of TS 32.422 "; } - leaf collectionPeriodM7LTE { - when 'jobType = "IMMEDIATE_MDT_ONLY"' - + ' or jobType = "IMMEDIATE_MDT_AND_TRACE"'; + leaf collectionPeriodM7Lte { + when '../../../jobType = "IMMEDIATE_MDT_ONLY"' + + ' or ../../../jobType = "IMMEDIATE_MDT_AND_TRACE"'; type uint16 { range 1..60 ; } @@ -888,9 +955,9 @@ module _3gpp-common-trace { reference "Clause 5.10.33 of TS 32.422 ."; } - leaf eventThresholdUphUMTS { - when 'jobType = "IMMEDIATE_MDT_ONLY"' - + ' or jobType = "IMMEDIATE_MDT_AND_TRACE"'; + leaf eventThresholdUphUmts { + when '../../../jobType = "IMMEDIATE_MDT_ONLY"' + + ' or ../../../jobType = "IMMEDIATE_MDT_AND_TRACE"'; type uint16 { range 0..31 ; } @@ -901,9 +968,9 @@ module _3gpp-common-trace { reference "5.10.39 of TS 32.422"; } - leaf collectionPeriodRRMUMTS { - when 'jobType = "IMMEDIATE_MDT_ONLY"' - + ' or jobType = "IMMEDIATE_MDT_AND_TRACE"'; + leaf collectionPeriodRrmUmts { + when '../../../jobType = "IMMEDIATE_MDT_ONLY"' + + ' or ../../../jobType = "IMMEDIATE_MDT_AND_TRACE"'; type uint32 { range "1024|1280|2048|2560|5120|" +"10240|60000"; @@ -916,25 +983,9 @@ module _3gpp-common-trace { reference "Clause 5.10.21 of 3GPP TS 32.422"; } - leaf measurementPeriodLTE { - when 'jobType = "IMMEDIATE_MDT_ONLY"' - + ' or jobType = "IMMEDIATE_MDT_AND_TRACE"'; - type uint32 { - range "1024|1280|2048|2560|5120|" - +"10240|60000"; - } - units milliseconds; - mandatory true; - description "It specifies the measurement period for the Data Volume and - Scheduled IP throughput measurements for MDT taken by the eNB. - The attribute is applicable only for Immediate MDT. In case this - attribute is not used, it carries a null semantic."; - reference "Clause 5.10.23 of 3GPP TS 32.422"; - } - - leaf measurementPeriodUMTS { - when 'jobType = "IMMEDIATE_MDT_ONLY"' - + 'or jobType = "IMMEDIATE_MDT_AND_TRACE"'; + leaf measurementPeriodUmts { + when '../../../jobType = "IMMEDIATE_MDT_ONLY"' + + 'or ../../../jobType = "IMMEDIATE_MDT_AND_TRACE"'; type uint32 { range "250|500|1000|2000|3000|4000|6000|8000|12000|16000|20000|" +"24000|28000|32000|64000"; @@ -949,8 +1000,8 @@ module _3gpp-common-trace { } leaf measurementQuantity { - when 'jobType = "IMMEDIATE_MDT_ONLY"' - + ' or jobType = "IMMEDIATE_MDT_AND_TRACE"'; + when '../../../jobType = "IMMEDIATE_MDT_ONLY"' + + ' or ../../../jobType = "IMMEDIATE_MDT_AND_TRACE"'; type enumeration { enum CPICH_ECNO; enum CPICH_RSCP; @@ -962,8 +1013,8 @@ module _3gpp-common-trace { } leaf beamLevelMeasurement { - when 'jobType = "IMMEDIATE_MDT_ONLY"' - + ' or jobType = "IMMEDIATE_MDT_AND_TRACE"'; + when '../../../jobType = "IMMEDIATE_MDT_ONLY"' + + ' or ../../../jobType = "IMMEDIATE_MDT_AND_TRACE"'; type boolean; default false; description "Indicates whether the NR M1 beam level measurements shall @@ -972,8 +1023,8 @@ module _3gpp-common-trace { } leaf positioningMethod { - when 'jobType = "IMMEDIATE_MDT_ONLY"' - + ' or jobType = "IMMEDIATE_MDT_AND_TRACE"'; + when '../../../jobType = "IMMEDIATE_MDT_ONLY"' + + ' or ../../../jobType = "IMMEDIATE_MDT_AND_TRACE"'; type enumeration { enum GNSS; enum E_CELL_ID; @@ -990,9 +1041,219 @@ module _3gpp-common-trace { leaf idx { type string; } uses ExcessPacketDelayThresholdsGrp; } + + leaf reportAmountM1LTE { + type enumeration { + enum 1; + enum 2; + enum 4; + enum 8; + enum 16; + enum 32; + enum 64; + enum INFINITY; + } + description "It specifies the number of measurement reports that shall be + taken for periodic reporting while the UE is in connected mode. + The attribute is applicable only for Immediate MDT and combined Trace + and Immediate MDT and when reportingTrigger is configured for periodical + measurements and applicable only for LTE. In case this attribute is not + used, it carries a null semantic. + See the clause 5.10.6 of TS 32.422 for additional details on the + allowed values."; + } + + leaf reportAmountM4LTE { + type enumeration { + enum 1; + enum 2; + enum 4; + enum 8; + enum 16; + enum 32; + enum 64; + enum INFINITY; + } + description "It specifies the number of measurement reports that shall be + taken for periodic reporting while the UE is in connected mode. + The attribute is applicable only for Immediate MDT and combined Trace + and Immediate MDT and when reportingTrigger is configured for periodical + measurements and applicable only for LTE. In case this attribute is not + used, it carries a null semantic. + See the clause 5.10.6 of TS 32.422 for additional details on the + allowed values."; + } + + leaf reportAmountM5LTE { + type enumeration { + enum 1; + enum 2; + enum 4; + enum 8; + enum 16; + enum 32; + enum 64; + enum INFINITY; + } + description "It specifies the number of measurement reports that shall be + taken for periodic reporting while the UE is in connected mode. + The attribute is applicable only for Immediate MDT and combined Trace + and Immediate MDT and when reportingTrigger is configured for periodical + measurements and applicable only for LTE. In case this attribute is not + used, it carries a null semantic. + See the clause 5.10.6 of TS 32.422 for additional details on the + allowed values."; + } + + leaf reportAmountM6LTE { + type enumeration { + enum 1; + enum 2; + enum 4; + enum 8; + enum 16; + enum 32; + enum 64; + enum INFINITY; + } + description "It specifies the number of measurement reports that shall be + taken for periodic reporting while the UE is in connected mode. + The attribute is applicable only for Immediate MDT and combined Trace + and Immediate MDT and when reportingTrigger is configured for periodical + measurements and applicable only for LTE. In case this attribute is not + used, it carries a null semantic. + See the clause 5.10.6 of TS 32.422 for additional details on the + allowed values."; + } + + leaf reportAmountM7LTE { + type enumeration { + enum 1; + enum 2; + enum 4; + enum 8; + enum 16; + enum 32; + enum 64; + enum INFINITY; + } + description "It specifies the number of measurement reports that shall be + taken for periodic reporting while the UE is in connected mode. + The attribute is applicable only for Immediate MDT and combined Trace + and Immediate MDT and when reportingTrigger is configured for periodical + measurements and applicable only for LTE. In case this attribute is not + used, it carries a null semantic. + See the clause 5.10.6 of TS 32.422 for additional details on the + allowed values."; + } + + leaf reportAmountM1NR { + type enumeration { + enum 1; + enum 2; + enum 4; + enum 8; + enum 16; + enum 32; + enum 64; + enum INFINITY; + } + description "It specifies the number of measurement reports that shall be + taken for periodic reporting while the UE is in connected mode. + The attribute is applicable only for Immediate MDT and combined Trace + and Immediate MDT and when reportingTrigger is configured for periodical + measurements and applicable only for NR. In case this attribute is not + used, it carries a null semantic. + See the clause 5.10.6 of TS 32.422 for additional details on the + allowed values."; + } + + leaf reportAmountM4NR { + type enumeration { + enum 1; + enum 2; + enum 4; + enum 8; + enum 16; + enum 32; + enum 64; + enum INFINITY; + } + description "It specifies the number of measurement reports that shall be + taken for periodic reporting while the UE is in connected mode. + The attribute is applicable only for Immediate MDT and combined Trace + and Immediate MDT and when reportingTrigger is configured for periodical + measurements and applicable only for NR. In case this attribute is not + used, it carries a null semantic. + See the clause 5.10.6 of TS 32.422 for additional details on the + allowed values."; + } + + leaf reportAmountM5NR { + type enumeration { + enum 1; + enum 2; + enum 4; + enum 8; + enum 16; + enum 32; + enum 64; + enum INFINITY; + } + description "It specifies the number of measurement reports that shall be + taken for periodic reporting while the UE is in connected mode. + The attribute is applicable only for Immediate MDT and combined Trace + and Immediate MDT and when reportingTrigger is configured for periodical + measurements and applicable only for NR. In case this attribute is not + used, it carries a null semantic. + See the clause 5.10.6 of TS 32.422 for additional details on the + allowed values."; + } + + leaf reportAmountM6NR { + type enumeration { + enum 1; + enum 2; + enum 4; + enum 8; + enum 16; + enum 32; + enum 64; + enum INFINITY; + } + description "It specifies the number of measurement reports that shall be + taken for periodic reporting while the UE is in connected mode. + The attribute is applicable only for Immediate MDT and combined Trace + and Immediate MDT and when reportingTrigger is configured for periodical + measurements and applicable only for NR. In case this attribute is not + used, it carries a null semantic. + See the clause 5.10.6 of TS 32.422 for additional details on the + allowed values."; + } + + leaf reportAmountM7NR { + type enumeration { + enum 1; + enum 2; + enum 4; + enum 8; + enum 16; + enum 32; + enum 64; + enum INFINITY; + } + description "It specifies the number of measurement reports that shall be + taken for periodic reporting while the UE is in connected mode. + The attribute is applicable only for Immediate MDT and combined Trace + and Immediate MDT and when reportingTrigger is configured for periodical + measurements and applicable only for NR. In case this attribute is not + used, it carries a null semantic. + See the clause 5.10.6 of TS 32.422 for additional details on the + allowed values."; + } } - grouping LoggedMdtGrp { + grouping LoggedMdtConfigGrp { description "This <> defines the configuration parameters of IOC TraceJob which are specific for Logged MDT or Logged MBSFN MDT. The optional attribute plmnList allows to specify the PLMNs where @@ -1019,22 +1280,16 @@ module _3gpp-common-trace { 'any cell selection' state to the 'camped normally' state (TS 38.331, TS 38.304)."; - leaf traceCollectionEntityIPAddress { - when '../traceReportingFormat = "FILE_BASED" or ' - +'jobType = "LOGGED_MDT_ONLY" or jobType = "LOGGED_MBSFN_MDT"'; - type union { - type inet:uri; - type inet:ip-address; - } - description "Specifies the address of the Trace Collection Entity when - the attribute traceReportingFormat is configured for the file-based - reporting. The attribute is applicable for both Trace and MDT."; - reference "Clause 5.9 of 3GPP TS 32.422"; + leaf traceCollectionEntityId { + type int64; + description "It specifies the TCE Id which is sent to the UE in + Logged MDT. See the clause 5.10.11 of 3GPP TS 32.422 for additional + details on the allowed values."; } leaf loggingDuration { - when 'jobType = "LOGGED_MDT_ONLY" or' - + ' jobType = "LOGGED_MBSFN_MDT"'; + when '../../../jobType = "LOGGED_MDT_ONLY" or' + + ' ../../../jobType = "LOGGED_MBSFN_MDT"'; type uint32 { range "600|1200|2400|3600|5400|7200"; } @@ -1047,8 +1302,8 @@ module _3gpp-common-trace { } leaf loggingInterval { - when 'jobType = "LOGGED_MDT_ONLY" or' - + ' jobType = "LOGGED_MBSFN_MDT"'; + when '../../../jobType = "LOGGED_MDT_ONLY" or' + + ' ../../../jobType = "LOGGED_MBSFN_MDT"'; type uint32 { range "0|320|640|1280|2560|5120|10240|20480|" +"30720|40960|61440"; @@ -1062,7 +1317,7 @@ module _3gpp-common-trace { } leaf reportType { - when 'jobType = "IMMEDIATE_MDT_ONLY"'; + when '../../../jobType = "IMMEDIATE_MDT_ONLY"'; type enumeration { enum PERIODICAL; enum EVENT_TRIGGERED; @@ -1072,7 +1327,7 @@ module _3gpp-common-trace { } leaf eventListForEventTriggeredMeasurement { - when 'jobType = "LOGGED_MDT_ONLY"'; + when '../../../jobType = "LOGGED_MDT_ONLY"'; type enumeration { enum OUT_OF_COVERAGE ; enum A2_EVENT ; @@ -1087,8 +1342,8 @@ module _3gpp-common-trace { } leaf eventThresholdL1 { - when 'jobType = "LOGGED_MDT_ONLY" or' - + ' jobType = "LOGGED_MBSFN_MDT"'; + when '../../../jobType = "LOGGED_MDT_ONLY" or' + + ' ../../../jobType = "LOGGED_MBSFN_MDT"'; type uint32 { range "0..127"; } @@ -1102,8 +1357,8 @@ module _3gpp-common-trace { } leaf hysteresisL1 { - when 'jobType = "LOGGED_MDT_ONLY" or ' - + 'jobType = "LOGGED_MBSFN_MDT"'; + when '../../../jobType = "LOGGED_MDT_ONLY" or ' + + '../../../jobType = "LOGGED_MBSFN_MDT"'; type uint32 { range "0..30"; } @@ -1116,9 +1371,9 @@ module _3gpp-common-trace { reference "clause 5.10.37 of TS 32.422"; } - leaf timeToTriggerL1 { - when 'jobType = "LOGGED_MDT_ONLY" or ' - + 'jobType = "LOGGED_MBSFN_MDT"'; + leaf timeToTriggerL1 { + when '../../../jobType = "LOGGED_MDT_ONLY" or ' + + '../../../jobType = "LOGGED_MBSFN_MDT"'; type int32 { range 0|40|64|80|100|128|160|256|320|480|512|640|1024|1280|2560|5120; } @@ -1133,7 +1388,7 @@ module _3gpp-common-trace { } list pLMNList { - when 'jobType = "LOGGED_MDT_ONLY"'; + when '../../../jobType = "LOGGED_MDT_ONLY"'; key "mcc mnc"; uses types3gpp:PLMNId; max-elements 16; @@ -1142,8 +1397,8 @@ module _3gpp-common-trace { reference "Clause 5.10.24 of 3GPP TS 32.422"; } - list areaConfigurationForNeighCell { - when 'jobType = "LOGGED_MDT_ONLY"'; + list areaConfigurationForNeighCells { + when '../../../jobType = "LOGGED_MDT_ONLY"'; key "idx"; leaf idx { type uint32 ; } description "It specifies the area for which UE is requested to perform @@ -1157,8 +1412,8 @@ module _3gpp-common-trace { uses AreaConfigGrp; } - list mBSFNAreaList { - when 'jobType = "LOGGED_MBSFN_MDT"'; + list mbsfnAreaList { + when '../../../jobType = "LOGGED_MBSFN_MDT"'; key "mbsfnAreaId earfcn"; max-elements 8; description "The MBSFN Area consists of a MBSFN Area ID and Carrier @@ -1168,6 +1423,16 @@ module _3gpp-common-trace { uses MbsfnAreaGrp; } + + list nPNIdentityList { + description "It defines which NPNs that can be served by the NR cell, + and which CAG IDs or NIDs can be supported by the NR cell for + corresponding PNI-NPN or SNPN."; + key idx; + max-elements 1; + uses NpnIdGrp; + leaf idx { type string;} + } } grouping MdtConfigGrp { @@ -1232,6 +1497,28 @@ module _3gpp-common-trace { the UE."; reference "Clause 5.10.29 of 3GPP TS 32.422"; } + + list immediateMdtConfig { + description "The set of parameters specific for Immediate MDT + configuration. + This attribute shall be present only if MDT is supported and the jobType + attribute is set to Immediate MDT or combined Trace and Immediate MDT"; + key idx; + max-elements 1; + leaf idx { type string; } + uses ImmediateMdtConfigGrp; + } + + list loggedMdtConfig { + description "The set of parameters specific for Logged MDT and Logged + MBSFN MDT configuration. + This attribute shall be present only if MDT is supported and the + jobType attribute is set to Logged MDT or Logged MBSFN MDT."; + key idx; + max-elements 1; + leaf idx { type string; } + uses LoggedMdtConfigGrp; + } } grouping UEMeasConfigGrp { @@ -1250,9 +1537,15 @@ module _3gpp-common-trace { measurements. The period is defined in milliseconds (ms)."; } - leaf-list nfTypeToMeasure { + leaf nfTypeToMeasure { type string; - description "It specifies the NF types to measure."; + mandatory true; + description "It indicates the type of NE to produce the 5GC UE level + measurements. + + allowedValues: The NF types represented by the measured object + classes as defined by f) of the 5GC UE level measurements specified + in TS 28.558."; } leaf-list objectInstances { @@ -1284,14 +1577,14 @@ module _3gpp-common-trace { } default TRACE_ONLY; description "Specifies the MDT mode and it specifies also whether the - TraceJob represents only MDT, Logged MBSFN MDT, Trace, or 5GC UE level measurement collection, or any combination + TraceJob represents only MDT, Logged MBSFN MDT, Trace, or 5GC UE + level measurement collection, or any combination of Trace, immediate MDT and 5GC UE level measurement collection. The attribute is applicable for Trace, MDT, RCEF and RLF reporting, and 5GC UE level measurement collection."; reference "Clause 5.9a of 3GPP TS 32.422 for additional details on the allowed values."; } - list pLMNTarget { key "mcc mnc"; @@ -1303,27 +1596,33 @@ module _3gpp-common-trace { uses types3gpp:PLMNId; } + leaf-list listOfTraceMetrics { + when '../jobType = "TRACE_ONLY"' + + ' or ../jobType = "IMMEDIATE_MDT_AND_TRACE"'; + type string; + description "Specifies the metrics to be reported."; + reference "Clause 10 of 3GPP TS 32.422"; + } + + leaf traceCollectionEntityIPAddress { + type inet:ip-address; + description "It specifies the address of the Trace Collection Entity + when the attribute traceReportingFormat is configured for the + file-based reporting. The attribute is applicable for both Trace and + MDT. + See the clause 5.9 of TS 32.422 for additional details on the allowed + values."; + } + leaf traceReportingConsumerUri { when '../traceReportingFormat = "STREAMING"'; type inet:uri; description "URI of the Streaming Trace data reporting MnS consumer - (a.k.a. streaming target). - This attribute shall be present if file based trace data reporting is - supported and traceReportingFormat set to 'file based' or when - jobType is set to Logged MDT or Logged MBSFN MDT."; + (a.k.a. streaming target)."; reference "Clause 5.9 of 3GPP TS 32.422"; } - leaf traceCollectionEntityId { - when '../jobType = "LOGGED_MDT_ONLY" or ' - + '../jobType = "LOGGED_MBSFN_MDT"'; - type uint32; - description "It specifies the TCE Id which is sent to the UE in - Logged MDT."; - reference "Clause 5.10.11 of 3GPP TS 32.422"; - } - - list traceReference { + list traceReference { key "idx"; min-elements 1; max-elements 1; @@ -1424,44 +1723,48 @@ module _3gpp-common-trace { reference "3GPP TS 32.422"; } - list traceConfig { - when '../jobType = "TRACE_ONLY"' - + ' or ../jobType = "IMMEDIATE_MDT_AND_TRACE"' - + ' or ../jobType = "TRACE_AND_5GC_UE_LEVEL_MEASUREMENTS"' - + ' or ../jobType = "TRACE_AND_IMMEDIATE_MDT_AND_5GC_UE_LEVEL_MEASUREMENTS"'; - key idx; - description "Trace config"; - max-elements 1; - uses TraceConfigGrp; - leaf idx { type string; } + list traceConfig { + when '../jobType = "TRACE_ONLY"' + + ' or ../jobType = "IMMEDIATE_MDT_AND_TRACE"' + + ' or ../jobType = "TRACE_AND_5GC_UE_LEVEL_MEASUREMENTS"' + + ' or ../jobType = + "TRACE_AND_IMMEDIATE_MDT_AND_5GC_UE_LEVEL_MEASUREMENTS"'; + key idx; + description "Trace config"; + max-elements 1; + uses TraceConfigGrp; + leaf idx { type string; } } - list mdtConfig { - when '../jobType = "IMMEDIATE_MDT_ONLY"' + list mdtConfig { + when '../jobType = "IMMEDIATE_MDT_ONLY"' + ' or ../jobType = "IMMEDIATE_MDT_AND_TRACE"' + ' or ../jobType = "RLF_REPORT_ONLY"' + ' or ../jobType = "RCEF_REPORT_ONLY"' + ' or ../jobType = "LOGGED_MBSFN_MDT"' + ' or ../jobType = "IMMEDIATE_MDT_AND_5GC_UE_LEVEL_MEASUREMENTS"' - + ' or ../jobType = "TRACE_AND_IMMEDIATE_MDT_AND_5GC_UE_LEVEL_MEASUREMENTS"'; - key idx; - description "MDT config"; - max-elements 1; - uses MdtConfigGrp; - leaf idx { type string; } - } - - list ueMeasConfig { - when '../jobType = "5GC_UE_LEVEL_MEASUREMENTS_ONLY"' - + ' or ../jobType = "TRACE_AND_5GC_UE_LEVEL_MEASUREMENTS"' - + ' or ../jobType = "IMMEDIATE_MDT_AND_5GC_UE_LEVEL_MEASUREMENTS"' - + ' or ../jobType = "TRACE_AND_IMMEDIATE_MDT_AND_5GC_UE_LEVEL_MEASUREMENTS"'; - key idx; - description "5GC UE level measurements config"; - max-elements 1; - uses UEMeasConfigGrp; - leaf idx { type string; } + + ' or ../jobType = + "TRACE_AND_IMMEDIATE_MDT_AND_5GC_UE_LEVEL_MEASUREMENTS"'; + key idx; + description "MDT config"; + max-elements 1; + uses MdtConfigGrp; + leaf idx { type string; } + } + + list ueMeasConfig { + when '../jobType = "5GC_UE_LEVEL_MEASUREMENTS_ONLY"' + + ' or ../jobType = "TRACE_AND_5GC_UE_LEVEL_MEASUREMENTS"' + + ' or ../jobType = "IMMEDIATE_MDT_AND_5GC_UE_LEVEL_MEASUREMENTS"' + + ' or ../jobType = + "TRACE_AND_IMMEDIATE_MDT_AND_5GC_UE_LEVEL_MEASUREMENTS"'; + key idx; + description "5GC UE level measurements config"; + max-elements 1; + uses UEMeasConfigGrp; + leaf idx { type string; } } + list nPNTarget { description "applicable only for NR and shall be present in case of NPN either a PNI-NPN or a SNPN) and for management-based activation when @@ -1533,12 +1836,13 @@ module _3gpp-common-trace { The attribute jobType specifies the kind of data to collect. In case of Trace only, the configuration parameters of attribute traceConfig shall be applied. In case of Immediate MDT only, Logged MDT only, RLF reports - only, RCEF reports only and Logged MBSFN MDT, the configuration parameters - of attribute mdtConfig or a subset of these shall be applied. In case of - UE measurements only, the configuration parameters of attribute ueMeasConfig - shall be applied. In case of any combination of Trace, Immediate MDT, - Trace and UE measurements, the configuration parameters of the corresponding - attributes traceConfig, mdtConfig and ueMeasConfig are applicable. + only, RCEF reports only and Logged MBSFN MDT, the configuration + parameters of attribute mdtConfig or a subset of these shall be + applied. In case of UE measurements only, the configuration parameters + of attribute ueMeasConfig shall be applied. In case of any combination + of Trace, Immediate MDT, Trace and UE measurements, the configuration + parameters of the corresponding attributes traceConfig, mdtConfig and + ueMeasConfig are applicable. Creation and deletion of TraceJob instances by MnS consumers is optional; when not supported, the TraceJob instances may be created diff --git a/yang-models/_3gpp-common-util.yang b/yang-models/_3gpp-common-util.yang new file mode 100644 index 000000000..6e58aa14f --- /dev/null +++ b/yang-models/_3gpp-common-util.yang @@ -0,0 +1,211 @@ +module _3gpp-common-util { + yang-version 1.1; + namespace urn:3gpp:sa5:_3gpp-common-util; + prefix "util3gpp"; + + import _3gpp-common-top { prefix top3gpp; } + import _3gpp-common-yang-types { prefix types3gpp ; } + 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"; + + description "Defines Utility IOCs: ConditionMonitor, Scheduler + Copyright 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + TTA, TTC). All rights reserved."; + reference "3GPP TS 28.623"; + + revision 2024-05-06 { reference CR-0359; } + + feature SchedulerUnderManagedElement { + description "Scheduler shall be contained under ManagedElement."; + } + + feature SchedulerUnderSubNetwork { + description "Scheduler shall be contained under SubNetwork."; + } + + grouping TimeIntervalGrp { + description "This data type defines a time interval within one day. + If the whole day shall be selected, intervalStart shall be set to + 00:00:00 and intervalEnd shall be set to 23:59:59."; + + leaf intervalStart { + type types3gpp:FullTime; + mandatory true; + description "It indicates the time (in 'full-time' format) when the + service shall be started. + Data type 'FullTime' defines the time as specified by 'full-time' + in RFC3339."; + } + + leaf intervalEnd { + type types3gpp:FullTime; + mandatory true; + description "It indicates the time (in 'full-time' format) when the + service shall be stopped. + 'FullTime' defines the time as specified by 'full-time' in RFC3339. + intervalEnd should use the same timezone as intervalStart and shall + be later then intervalStart"; + } + } + + grouping SchedulingTimeGrp { + description "This <> defines the scheduling time and allows to + configure one of four possible scheduling methods: + + - One time interval: The attribute timeWindow presents the active + scheduling time. A duration more than one day may be configured. + - Daily periodicity: Several active intervals per day can be configured + in attribute timeIntervals. The active scheduling times recur each day. + - Weekly periodicity: Several active intervals for one day can be + configured in attribute timeIntervals. The active scheduling times recur + on the days of the weeks configured by attribute daysOfWeek + - Monthly periodicity: Several active intervals for one day can be + configured in attribute timeIntervals. The active scheduling times + recur on the days of the months configured by attribute daysOfMonth."; + choice SchedulingTime { + mandatory true; + case One-time-interval { + uses types3gpp:TimeWindowGrp; + } + case periodic { + list timeIntervals { + description "List of intervals within one day for which the service + shall be active."; + key "intervalStart intervalEnd"; + min-elements 1; + uses TimeIntervalGrp; + } + leaf daysOfWeek { + must 'not(../daysOfMonth)'; + description "Shall be present in case of Weekly periodicity, + otherwise not"; + type types3gpp:DayOfWeek; + } + leaf daysOfMonth { + must 'not(../daysOfWeek)'; + description "Shall be present in case of Monthly periodicity, + otherwise not"; + type types3gpp:DaysOfMonth; + } + } + } + } + + grouping SchedulerGrp { + description "Represents the Scheduler IOC."; + + list schedulingTimes { + description "It defines the active scheduling times."; + min-elements 1; + key idx; + leaf idx { type uint32; } + uses SchedulingTimeGrp; + } + + leaf schedulerStatus { + type boolean; + mandatory true; + config false; + description "Switches between TRUE and FALSE depending upon whether the + configured time constraints are fulfilled or not."; + } + } + + grouping SchedulerSubtree { + list Scheduler { + description "This IOC defines a time scheduler. + It can be name-contained by SubNetwork or ManagedElement. + + The attribute schedulingTimes allows to configure one or several + active time intervals. The active intervals can be configured to occur + once or recurring periodically. + + The boolean attribute schedulerStatus switches between TRUE and FALSE + depending upon whether the configured time constraints are fulfilled + or not. This attribute makes the internal Scheduler status observable."; + key id; + uses top3gpp:Top_Grp; + container attributes { + uses SchedulerGrp; + } + } + } + + augment /me3gpp:ManagedElement { + if-feature SchedulerUnderManagedElement; + uses SchedulerSubtree; + } + augment /subnet3gpp:SubNetwork { + if-feature SchedulerUnderSubNetwork; + uses SchedulerSubtree; + } + +/////////////////////////////////////////////////////////////////////////////// + + feature ConditionMonitorUnderManagedElement { + description "ConditionMonitor shall be contained under ManagedElement."; + } + + feature ConditionMonitorUnderSubNetwork { + description "ConditionMonitor shall be contained under SubNetwork."; + } + + grouping ConditionMonitorGrp { + description "Represents the Scheduler IOC."; + + leaf condition { + type string { + length 1..max; + } + mandatory true; + description "Logical expression of one or several condition(s). + + A restricted XPath may be used. The definition of the exact syntax + is not ready yet. + + An empty string is not allowed."; + } + + leaf conditionStatus { + type boolean; + mandatory true; + config false; + description "Switches between TRUE and FALSE depending upon whether the + configured constraints are fulfilled or not."; + } + } + + grouping ConditionMonitorSubtree { + list ConditionMonitor { + description "This IOC defines one or several conditions and monitors + whether these conditions are satisfied. It can be name-contained by + SubNetwork or ManagedElement. + + The attribute condition allows to configure one or several conditions. + Possible conditions include but are not limited to scheduling + requirements or parameter settings e.g. evaluation if a configuration + parameter is above a certain threshold or has a certain values. + + The boolean attribute conditionStatus switches between TRUE and FALSE + depending upon whether the configured conditions are fulfilled or not. + This attribute makes the internal ConditionMonitor status observable."; + key id; + uses top3gpp:Top_Grp; + container attributes { + uses ConditionMonitorGrp; + } + } + } + + augment /me3gpp:ManagedElement { + if-feature ConditionMonitorUnderManagedElement; + uses ConditionMonitorSubtree; + } + augment /subnet3gpp:SubNetwork { + if-feature ConditionMonitorUnderSubNetwork; + uses ConditionMonitorSubtree; + } +} \ No newline at end of file diff --git a/yang-models/_3gpp-common-yang-extensions.yang b/yang-models/_3gpp-common-yang-extensions.yang index e07880128..dc9c8e5b5 100755 --- a/yang-models/_3gpp-common-yang-extensions.yang +++ b/yang-models/_3gpp-common-yang-extensions.yang @@ -9,8 +9,6 @@ module _3gpp-common-yang-extensions { description "The module defines YANG extensions needed 3GPP YANG modeling. - Copyright (c) 2019 3GPP. All rights reserved. - Extensions MUST be defined with the following structure in the description statement: - What is this statement. @@ -40,7 +38,7 @@ module _3gpp-common-yang-extensions { If support for an extension is missing the extension statement needs individual handling or it SHOULD be removed from the module using the extension e.g. with a deviation. - Copyright 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + Copyright 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved."; reference "3GPP TS 28.623 Generic Network Resource Model (NRM) @@ -48,10 +46,28 @@ module _3gpp-common-yang-extensions { Solution Set (SS) definitions 3GPP TS 28.623"; - revision 2023-09-18 { reference CR-0271 ; } - revision 2022-10-20 { reference CR-0196; } + revision 2024-04-05 { reference "CR-0332, 0333" ; } + revision 2023-09-17 { reference "CR-0270, 0271" ; } + revision 2022-10-31 { reference "CR-0195, 0196"; } revision 2019-06-23 { reference "Initial version"; } + extension only-system-created { + description + "Indicates that the MOI can only be created and deleted by the + MnS producer. + System created MOIs can have both read-only and read-write data + node children. Implementers shall add the extension to standard + models if they restrict creation/deletion of an IOC. + + The statement MUST only be a sub-statement of the list statement, + with the parent list statement representing an IOC. + + Zero or one only-system-created statement per parent statement is + allowed. No sub-statements are allowed. + + Adding this statement is an NBC change, removing it is BC."; + } + extension notNotifyable { description "Indicates that data change notifications shall not be sent diff --git a/yang-models/_3gpp-common-yang-types.yang b/yang-models/_3gpp-common-yang-types.yang index 6a7865341..3c8b9c7a4 100755 --- a/yang-models/_3gpp-common-yang-types.yang +++ b/yang-models/_3gpp-common-yang-types.yang @@ -12,10 +12,12 @@ module _3gpp-common-yang-types { description "The model defines a YANG mapping of the top level information classes used for management of 5G networks and network slicing. - Copyright 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + Copyright 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved."; reference "3GPP TS 28.623"; + revision 2024-05-18 { reference CR-0359; } + revision 2024-04-12 { reference CR-0346; } revision 2023-11-06 { reference CR-0305; } revision 2023-09-18 { reference CR-0271 ; } revision 2023-08-09 { reference CR-0266; } @@ -67,6 +69,51 @@ module _3gpp-common-yang-types { leaf name { type string; } leaf value { type string; } } + + typedef DayOfWeekT { + type enumeration { + enum Monday; + enum Tuesday; + enum Wednesday; + enum Thursday; + enum Friday; + enum Saturday; + enum Sunday; + } + } + + typedef DayOfWeek { + type enumeration { + enum MONDAY; + enum TUESDAY; + enum WEDNESDAY; + enum THURSADY; + enum FRIDAY; + enum SATURDAY; + enum SUNDAY; + } + } + + typedef DaysOfMonth { + type uint8 { + range 0..31; + } + } + + typedef FullTime { + type yang:time-with-zone-offset; + } + + grouping TimeWindowGrp { + leaf startTime { + type yang:date-and-time; + yext3gpp:inVariant; + } + leaf endTime { + type yang:date-and-time; + yext3gpp:inVariant; + } + } grouping ProcessMonitorGrp { description "Provides attributes to monitor the progress of processes diff --git a/yang-models/_3gpp-nr-nrm-cco.yang b/yang-models/_3gpp-nr-nrm-cco.yang new file mode 100644 index 000000000..97a154dfe --- /dev/null +++ b/yang-models/_3gpp-nr-nrm-cco.yang @@ -0,0 +1,210 @@ +module _3gpp-nr-nrm-cco { + yang-version 1.1; + + namespace urn:3gpp:sa5:_3gpp-nr-nrm-cco; + prefix cco3gpp; + + import _3gpp-common-top { prefix top3gpp; } + import _3gpp-common-subnetwork { prefix subnet3gpp; } + + organization "3gpp SA5"; + contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464"; + description "Implements support the C-SON function of Capacity and + Coverage optimization . + Copyright 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + TTA, TTC). All rights reserved."; + reference "3GPP TS 28.541"; + + revision 2024-05-24 { reference CR-1273 ; } + + grouping ParameterRangeGrp { + description "This data type represents the adjustment range for parameters."; + + leaf maxValue { + type int64; + mandatory true; + description "It indicates the maximum value of the parameter."; + } + + leaf minValue { + type int64; + mandatory true; + description "It indicates the minimum value of the parameter."; + } + } + + grouping CCOParametersGrp { + description "Represents the CCOParameters IOC"; + + list downlinkTransmitPowerRange { + description "It indicates adjustment range (including maximum value, + minimum value) of downlinkTransmitPower to optimize radio coverage."; + key minValue; + min-elements 1; + max-elements 1; + uses ParameterRangeGrp { + refine minValue { + must '. >= 0 and . <= 100'; + } + refine maxValue { + must '. >= 0 and . <= 100'; + } + } + } + + list antennaTiltRange { + description "It indicates adjustment range (including maximum value, + minimum value) of antennaTilt to optimize radio coverage. + units 0.1 degree"; + key minValue; + min-elements 1; + max-elements 1; + uses ParameterRangeGrp { + refine minValue { + must '. >= -900 and . <= 900'; + } + refine maxValue { + must '. >= -900 and . <= 900'; + } + } + } + + list antennaAzimuthRange { + description "It indicates adjustment range (including maximum value, + minimum value) of antennaAzimuth to optimize radio coverage. + units 0.1 degree"; + key minValue; + min-elements 1; + max-elements 1; + uses ParameterRangeGrp { + refine minValue { + must '. >= -1800 and . <= 1800'; + } + refine maxValue { + must '. >= -1800 and . <= 1800'; + } + } + } + + list digitalTiltRange { + description "It indicates adjustment range (including maximum value, + minimum value) of digitalTilt to optimize radio coverage. + units 0.1 degree"; + key minValue; + min-elements 1; + max-elements 1; + uses ParameterRangeGrp { + refine minValue { + must '. >= -900 and . <= 900'; + } + refine maxValue { + must '. >= -900 and . <= 900'; + } + } + } + + list digitalAzimuthRange { + description "It indicates adjustment range (including maximum value, + minimum value) of digitalAzimuth to optimize radio coverage. + units 0.1 degree"; + key minValue; + min-elements 1; + max-elements 1; + uses ParameterRangeGrp { + refine minValue { + must '. >= -1800 and . <= 1800'; + } + refine maxValue { + must '. >= -1800 and . <= 1800'; + } + } } + + leaf-list coverageShapeList { + type uint16; + ordered-by user; + description "It indicates the coverage shape of specific sites which + can be selected to optimize radio coverage."; + } + } + + grouping CCOWeakCoverageParametersGrp { + description "Represents the CCOWeakCoverageParameters IOC"; + uses CCOParametersGrp; + } + + grouping CCOPilotPollutionParametersGrp { + description "Represents the CCOPilotPollutionParameters IOC"; + uses CCOParametersGrp; + } + + grouping CCOOvershootCoverageParametersGrp { + description "Represents the CCOOvershootCoverageParameters IOC"; + uses CCOParametersGrp; + } + + grouping CCOFunctionGrp { + description "Represents the CCOFunction IOC"; + + leaf cCOControl { + description "This attribute determines whether the centralized + SON CCO Function is enabled or disabled."; + mandatory true; + type boolean; + } + } + + augment "/subnet3gpp:SubNetwork" { + list CCOFunction { + description "This IOC contains attributes to support the C-SON + function of Capacity and Coverage optimization + (See clause 7.2.3 in TS 28.313). + NOTE: in the case where multiple CCOFunction MOIs exist at different + levels of the containment tree, the CCOFunction MOI at the lower + level overrides the CCOFunction MOIs at higher level(s) of the same + containment tree."; + + key id; + max-elements 1; + uses top3gpp:Top_Grp; + container attributes { + uses CCOFunctionGrp; + } + + list CCOWeakCoverageParameters { + description "This IOC represents the properties of + CCOWeakCoverageParameters. CCOWeakCoverageParameters is one + realization of abstract CCOParameters IOC."; + key id; + max-elements 1; + uses top3gpp:Top_Grp; + container attributes { + uses CCOWeakCoverageParametersGrp; + } + } + + list CCOPilotPollutionParameters { + description "This IOC represents the properties of + CCOPilotPollutionParameters. CCOPilotPollutionParameters is one + realization of abstract CCOParameters IOC."; + key id; + max-elements 1; + uses top3gpp:Top_Grp; + container attributes { + uses CCOPilotPollutionParametersGrp; + } + } + + list CCOOvershootCoverageParameters { + description "This IOC represents the properties of + CCOOvershootCoverageParameters. CCOOvershootCoverageParameters is + one realization of abstract CCOParameters IOC."; + key id; + max-elements 1; + uses top3gpp:Top_Grp; + container attributes { + uses CCOOvershootCoverageParametersGrp; + } + } + } + } +} \ No newline at end of file diff --git a/yang-models/_3gpp-nr-nrm-eutranfreqrelation.yang b/yang-models/_3gpp-nr-nrm-eutranfreqrelation.yang index 72e635b76..0ebea1981 100755 --- a/yang-models/_3gpp-nr-nrm-eutranfreqrelation.yang +++ b/yang-models/_3gpp-nr-nrm-eutranfreqrelation.yang @@ -13,11 +13,12 @@ module _3gpp-nr-nrm-eutranfreqrelation { organization "3GPP SA5"; description "Defines the YANG mapping of the EUtranFreqRelation Information Object Class (IOC) that is part of the NR Network Resource Model (NRM). - Copyright 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + Copyright 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved."; reference "3GPP TS 28.541 5G Network Resource Model (NRM)"; - revision 2023-09-18 { reference CR-1043 ; } + revision 2024-02-24 { reference CR-1218; } + revision 2023-09-18 { reference CR-1043; } revision 2019-10-28 { reference S5-193518 ; } revision 2019-06-17 { description "Initial revision"; @@ -38,17 +39,17 @@ module _3gpp-nr-nrm-eutranfreqrelation { type types3gpp:QOffsetRange; } - leaf-list blackListEntry { + leaf-list blockListEntry { description "A list of Physical Cell Identities (PCIs) that are - blacklisted in E-UTRAN measurements."; + blocklisted in E-UTRAN measurements."; reference "3GPP TS 38.331"; min-elements 0; type uint16 { range "0..1007"; } } - leaf-list blackListEntryIdleMode { + leaf-list blockListEntryIdleMode { description "A list of Physical Cell Identities (PCIs) that are - blacklisted in SIB4 and SIB5."; + blocklisted in SIB4 and SIB5."; min-elements 0; type uint16 { range "0..1007"; } } diff --git a/yang-models/_3gpp-nr-nrm-gnbcucpfunction.yang b/yang-models/_3gpp-nr-nrm-gnbcucpfunction.yang index d7e206c64..7d8eabeec 100755 --- a/yang-models/_3gpp-nr-nrm-gnbcucpfunction.yang +++ b/yang-models/_3gpp-nr-nrm-gnbcucpfunction.yang @@ -19,13 +19,16 @@ module _3gpp-nr-nrm-gnbcucpfunction { TTA, TTC). All rights reserved."; reference "3GPP TS 28.541 5G Network Resource Model (NRM)"; - revision 2024-01-12 { reference CR-1138 ; } - revision 2023-09-18 { reference CR-1043 ; } + revision 2024-05-24 { reference CR-1273 ; } + revision 2024-04-04 { reference CR-1139; } + revision 2024-02-24 { reference CR-1218; } + revision 2024-01-12 { reference CR-1138; } + revision 2023-09-18 { reference CR-1043; } revision 2023-04-26 { reference CR-0916; } revision 2022-07-28 { reference "CR-0770"; } revision 2021-11-06 { reference "CR-0611" ; } revision 2021-11-05 { reference "CR-0609"; } - revision 2020-10-02 { reference CR-0384 ; } + revision 2020-10-02 { reference CR-0384; } revision 2020-08-06 { reference "CR-0333"; } revision 2020-08-03 { reference "CR-0321"; } revision 2020-06-03 { reference "CR-0286"; } @@ -90,27 +93,27 @@ module _3gpp-nr-nrm-gnbcucpfunction { uses types3gpp:PLMNId; } - leaf-list x2BlackList { + leaf-list x2BlockList { type string; description "List of nodes to which X2 connections are prohibited."; } - leaf-list x2WhiteList { + leaf-list x2AllowList { type string; description "List of nodes to which X2 connections are enforced."; } - leaf-list xnBlackList { + leaf-list xnBlockList { type string; description "List of nodes to which Xn connections are prohibited."; } - leaf-list xnWhiteList { + leaf-list xnAllowList { type string; description "List of nodes to which X2 connections are enforced."; } - leaf-list xnHOBlackList { + leaf-list xnHOBlockList { type string; description "List of nodes to which handovers over Xn are prohibited."; } @@ -121,7 +124,7 @@ module _3gpp-nr-nrm-gnbcucpfunction { supports (is associated to)."; } - leaf-list x2HOBlackList { + leaf-list x2HOBlockList { type string; description "List of nodes to which handovers over X2 are prohibited."; } @@ -153,6 +156,30 @@ module _3gpp-nr-nrm-gnbcucpfunction { uses QceIdMappingInfoGrp; leaf idx { type string; } } + + leaf-list mdtUserConsentReqList { + type enumeration { + enum M1; + enum M2; + enum M3; + enum M4; + enum M5; + enum M6; + enum M7; + enum M8; + enum M9; + enum MDT_UE_LOCATION; + } + description "represents a list of MDT measurement names that are + subject to user consent at MDT activation. + Any MDT measurement, whose name is not specified in this list, is not + subject to user consent at MDT activation."; + } + + leaf ephemerisInfoSetRef { + type types3gpp:DistinguishedName; + description "This is the DN of EphemerisInfoSet."; + } } grouping QceIdMappingInfoGrp { diff --git a/yang-models/_3gpp-nr-nrm-gnbcuupfunction.yang b/yang-models/_3gpp-nr-nrm-gnbcuupfunction.yang index a104c05a9..fed4880c9 100755 --- a/yang-models/_3gpp-nr-nrm-gnbcuupfunction.yang +++ b/yang-models/_3gpp-nr-nrm-gnbcuupfunction.yang @@ -15,10 +15,11 @@ module _3gpp-nr-nrm-gnbcuupfunction { contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464"; description "Defines the YANG mapping of the GNBCUUPFunction Information Object Class (IOC) that is part of the NR Network Resource Model (NRM). - Copyright 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + Copyright 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved."; reference "3GPP TS 28.541 5G Network Resource Model (NRM)"; + revision 2024-05-24 { reference CR-1273 ; } revision 2023-09-18 { reference CR-1043 ; } revision 2023-04-26 { reference CR-0916; } revision 2022-07-28 { reference "CR-0770"; } @@ -47,7 +48,7 @@ module _3gpp-nr-nrm-gnbcuupfunction { } leaf nRTAC { - type int64; + type types5g3gpp:NRTAC; description "Identity of the common Tracking Area Code for the PLMNs allowedValues: a) It is the TAC or Extended-TAC. diff --git a/yang-models/_3gpp-nr-nrm-gnbdufunction.yang b/yang-models/_3gpp-nr-nrm-gnbdufunction.yang index 06928d800..ca3c6f768 100755 --- a/yang-models/_3gpp-nr-nrm-gnbdufunction.yang +++ b/yang-models/_3gpp-nr-nrm-gnbdufunction.yang @@ -14,10 +14,11 @@ module _3gpp-nr-nrm-gnbdufunction { contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464"; description "Defines the YANG mapping of the GNBDUFunction Information Object Class (IOC) that is part of the NR Network Resource Model (NRM). - Copyright 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + Copyright 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved."; reference "3GPP TS 28.541 5G Network Resource Model (NRM)"; + revision 2024-02-24 { reference CR-1218; } revision 2023-09-18 { reference CR-1043 ; } revision 2023-04-26 { reference CR-0916; } revision 2022-11-02 { reference "CR-0753"; } @@ -183,7 +184,6 @@ module _3gpp-nr-nrm-gnbdufunction { information derived from the detected RIM-RS to OAM."; uses RimRSReportConfGrp; } - } leaf configurable5QISetRef { type types3gpp:DistinguishedName; @@ -195,6 +195,7 @@ module _3gpp-nr-nrm-gnbdufunction { type types3gpp:DistinguishedName; description "DN of the Dynamic5QISet that the GNBDUFunction supports (is associated to)."; } + } augment "/me3gpp:ManagedElement" { diff --git a/yang-models/_3gpp-nr-nrm-nrcelldu.yang b/yang-models/_3gpp-nr-nrm-nrcelldu.yang index cf4c5cbfb..da3e12195 100755 --- a/yang-models/_3gpp-nr-nrm-nrcelldu.yang +++ b/yang-models/_3gpp-nr-nrm-nrcelldu.yang @@ -15,10 +15,11 @@ module _3gpp-nr-nrm-nrcelldu { contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464"; description "Defines the YANG mapping of the NRCellDU Information Object Class (IOC) that is part of the NR Network Resource Model (NRM). - Copyright 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + Copyright 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved."; reference "3GPP TS 28.541 5G Network Resource Model (NRM)"; + revision 2024-05-24 { reference CR-1273 ; } revision 2023-09-18 { reference CR-1043 ; } revision 2022-07-28 { reference "CR-0770"; } revision 2022-06-29 { reference CR-0756 ; } @@ -155,7 +156,7 @@ module _3gpp-nr-nrm-nrcelldu { leaf nRTAC { description "The common 5GS Tracking Area Code for the PLMNs."; reference "3GPP TS 23.003, 3GPP TS 38.473"; - type types3gpp:Tac; + type types5g3gpp:NRTAC; } leaf arfcnDL { diff --git a/yang-models/_3gpp-nr-nrm-nrfreqrelation.yang b/yang-models/_3gpp-nr-nrm-nrfreqrelation.yang index b8f79d4c2..90705d9b9 100755 --- a/yang-models/_3gpp-nr-nrm-nrfreqrelation.yang +++ b/yang-models/_3gpp-nr-nrm-nrfreqrelation.yang @@ -12,14 +12,15 @@ module _3gpp-nr-nrm-nrfreqrelation { organization "3GPP SA5"; description "Defines the YANG mapping of the NRFreqRelation Information Object Class (IOC) that is part of the NR Network Resource Model (NRM). - Copyright 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + Copyright 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved."; reference "3GPP TS 28.541 5G Network Resource Model (NRM)"; - revision 2023-09-18 { reference CR-1043 ; } + revision 2024-02-24 { reference CR-1218; } + revision 2023-09-18 { reference CR-1043; } revision 2023-04-26 { reference CR-0916; } - revision 2020-04-23 { reference CR0281 ; } - revision 2019-10-28 { reference S5-193518 ; } + revision 2020-04-23 { reference CR-0281; } + revision 2019-10-28 { reference S5-193518; } revision 2019-06-17 { description "Initial revision"; } @@ -75,17 +76,17 @@ module _3gpp-nr-nrm-nrfreqrelation { } } - leaf-list blackListEntry { + leaf-list blockListEntry { description "A list of Physical Cell Identities (PCIs) that are - blacklisted in NR measurements."; + blocklisted in NR measurements."; reference "3GPP TS 38.331"; min-elements 0; type uint16 { range "0..1007"; } } - leaf-list blackListEntryIdleMode { + leaf-list blockListEntryIdleMode { description "A list of Physical Cell Identities (PCIs) that are - blacklisted in SIB4 and SIB5."; + blocklisted in SIB4 and SIB5."; min-elements 0; type uint16 { range "0..1007"; } } diff --git a/yang-models/_3gpp-nr-nrm-nroperatorcelldu.yang b/yang-models/_3gpp-nr-nrm-nroperatorcelldu.yang index 0c92ea37d..42afcf248 100755 --- a/yang-models/_3gpp-nr-nrm-nroperatorcelldu.yang +++ b/yang-models/_3gpp-nr-nrm-nroperatorcelldu.yang @@ -14,10 +14,11 @@ module _3gpp-nr-nrm-nroperatorcelldu { contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464"; description "Defines the YANG mapping of the OperatorDU Information Object Class (IOC) that is part of the NR Network Resource Model (NRM). - Copyright 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + Copyright 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved."; reference "3GPP TS 28.541 5G Network Resource Model (NRM)"; + revision 2024-05-24 { reference CR-1273 ; } revision 2023-09-18 { reference CR-1043 ; } revision 2021-10-01 { reference "Initial revision"; } @@ -57,7 +58,7 @@ module _3gpp-nr-nrm-nroperatorcelldu { leaf nRTAC { description "The common 5GS Tracking Area Code for the PLMNs."; reference "3GPP TS 23.003, 3GPP TS 38.473"; - type types3gpp:Tac; + type types5g3gpp:NRTAC; } leaf-list nRCellDURef { diff --git a/yang-models/_3gpp-nr-nrm-ntnfunction.yang b/yang-models/_3gpp-nr-nrm-ntnfunction.yang new file mode 100644 index 000000000..5abe98f62 --- /dev/null +++ b/yang-models/_3gpp-nr-nrm-ntnfunction.yang @@ -0,0 +1,303 @@ +module _3gpp-nr-nrm-ntnfunction { + yang-version 1.1; + + namespace urn:3gpp:sa5:_3gpp-nr-nrm-ntnfunction; + prefix ntn3gpp; + + import _3gpp-common-top { prefix top3gpp; } + import _3gpp-5g-common-yang-types { prefix types5g3gpp; } + import ietf-yang-types { prefix yang; } + 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"; + description "Implements support the C-SON function of Capacity and + Coverage optimization . + Copyright 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + TTA, TTC). All rights reserved."; + reference "3GPP TS 28.541"; + + revision 2024-05-24 { reference CR-1273 ; } + + feature NTNFunctionUnderSubNetwork { + description "The NTNFunction shall be contained under SubNetwork"; + } + + feature NTNFunctionUnderManagedElement { + description "The NTNFunction shall be contained under ManagedElement"; + } + + grouping PositionVelocityGrp { + description "This data type defines configuration parameters to support + satellite position and velocity state"; + + leaf positionX { + type uint32 { + range 0..604800; + } + config false; + default 0; + units meter; + description "X, Y, Z coordinate of satellite position state vector + in ECEF. Unit is meter. + Step of 1.3 m. Actual value = field value * 1.3."; + } + + leaf positionY { + type uint32 { + range 0..604800; + } + config false; + default 0; + units meter; + description "X, Y, Z coordinate of satellite position state vector + in ECEF. Unit is meter. + Step of 1.3 m. Actual value = field value * 1.3."; + } + + leaf positionZ { + type uint32 { + range 0..604800; + } + config false; + default 0; + units meter; + description "X, Y, Z coordinate of satellite position state vector + in ECEF. Unit is meter. + Step of 1.3 m. Actual value = field value * 1.3."; + } + + leaf velocityVX { + type int32 { + range -131072..131071; + } + config false; + default 0; + units meter/second; + description "X, Y, Z coordinate of satellite velocity state vector + in ECEF. + Step of 0.06 m/s. Actual value = field value * 0.06."; + } + + leaf velocityVY { + type int32 { + range -131072..131071; + } + config false; + default 0; + units meter/second; + description "X, Y, Z coordinate of satellite velocity state vector + in ECEF. + Step of 0.06 m/s. Actual value = field value * 0.06."; + } + + leaf velocityVZ { + type int32 { + range -131072..131071; + } + config false; + default 0; + units meter/second; + description "X, Y, Z coordinate of satellite velocity state vector + in ECEF. + Step of 0.06 m/s. Actual value = field value * 0.06."; + } + } + + grouping OrbitalGrp { + description "This data type defines configuration parameters of orbital + trajectory information to support satellite access."; + + leaf semiMajorAxis { + type uint64 { + range 0..8589934591; + } + config false; + default 0; + units meter; + description "Satellite orbital parameter: semi major axis alpha, + see NIMA TR 8350.2. + Step of 4.249 * 10**-3 m. + Actual value = 6500000 + field value * (4.249 * 10**-3)."; + } + + leaf eccentricity { + type int32 { + range -524288..524287; + } + config false; + default 0; + description "Satellite orbital parameter: eccentricity e, + see NIMA TR 8350.2. + Step 1.431 * 10**-8. + Actual value = field value * (1.431 * 10**-8)."; + } + + leaf periapsis { + type uint32 { + range 0..16777215; + } + config false; + default 0; + units radian; + description "Satellite orbital parameter: argument of periapsis omega, + see NIMA TR 8350.2. + Step of 2.341* 10**-8 rad. + Actual value = field value * (2.341* 10**-8)."; + } + + leaf longitude { + type uint32 { + range 0..2097151; + } + config false; + default 0; + units radian; + description "Satellite orbital parameter: longitude of ascending node + OMEGA, see NIMA TR 8350.2. + Step of 2.341* 10**-8 rad. + Actual value = field value * (2.341* 10**-8)."; + } + + leaf inclination { + type int32 { + range -524288..524287; + } + config false; + default 0; + units radian; + description "Satellite orbital parameter: inclination i, + see NIMA TR 8350.2. + Step of 2.341* 10**-8 rad. + Actual value = field value * (2.341* 10**-8)."; + } + + leaf meanAnomaly { + type uint32 { + range 0..16777215; + } + config false; + default 0; + units radian; + description "Satellite orbital parameter: Mean anomaly M at epoch time, + see NIMA TR 8350.2. + Step of 2.341* 10**-8 rad. + Actual value = field value * (2.341* 10**-8)."; + } + } + + grouping EphemerisGrp { + description "This data type represents the satellite ephemeris related + information. The ephemeris data format may be expressed either in + format of position and velocity state vector or in format of orbital + parameters."; + + leaf satelliteId { + type string { + pattern "00([01][0-9][0-9])|(2[0-4][0-9]|(25[0-5]))"; + } + config false; + description "This attribute indicates satellite Id.number. + It shall be formatted as a fixed 5-digit string, padding with + leading digits '0' to complete a 5-digit length. + allowedValues: 00000..00255"; + } + + leaf epochTime { + type yang:date-and-time; + config false; + description "It defines the ephemeris reference time."; + } + + choice positionVelocity-or-orbital { + list positionVelocity { + description "It indicates ephemeris is in format of NTN payload + position and velocity state vectors."; + max-elements 1; + config false; + uses PositionVelocityGrp; + } + + list orbital { + description "It indicates ephemeris is in orbital parameter ephemeris + format, as specified in NIMA TR 8350.2"; + max-elements 1; + config false; + uses OrbitalGrp; + } + } + } + + grouping EphemerisInfoSetGrp { + description "Represents the EphemerisInfoSet IOC"; + + list EphemerisInfos { + description "This is the list of Ephemeris related information."; + min-elements 1; + key idx; + leaf idx { type uint32; } + uses EphemerisGrp; + } + } + + grouping NTNFunctionGrp { + description "Represents the NTNFunction IOC"; + + list nTNpLMNInfoList { + description "It defines which PLMNs that can be served by the NR NTN cell, + and which S-NSSAIs can be supported by the NR NTN cell for + corresponding PLMN in case of network slicing feature is supported. + The pLMNId of the first entry of the list is the PLMNId used to + construct the nCGI for the NR cell."; + min-elements 1; + ordered-by user; + key idx; + leaf idx { type uint32; } + uses types5g3gpp:PLMNInfo; + } + + leaf-list nTNTAClist { + type types5g3gpp:NRTAC; + min-elements 1; + description "It is the list of Tracking Area Codes (either legacy TAC or + extended TAC) for NR NTN. + Legacy TAC and Extended TAC are defined in clause 9.3.3.10 of + TS 38.413."; + } + } + + grouping NTNFunctionSubtreeGrp { + list NTNFunction { + description "This IOC contains attributes to support the non-terrestrial + NR access."; + key id; + max-elements 1; + uses top3gpp:Top_Grp; + container attributes { + uses NTNFunctionGrp; + } + + list EphemerisInfoSet { + description "This IOC represents the satellite ephemeris information + describing the orbital trajectory information or coordinates for the + NTN vehicles."; + key id; + uses top3gpp:Top_Grp; + container attributes { + uses EphemerisInfoSetGrp; + } + } + } + } + + augment "/subnet3gpp:SubNetwork" { + if-feature NTNFunctionUnderSubNetwork; + uses NTNFunctionSubtreeGrp; + } + + augment "/me3gpp:ManagedElement" { + if-feature NTNFunctionUnderManagedElement; + uses NTNFunctionSubtreeGrp; + } +} \ No newline at end of file diff --git a/yang-models/_3gpp-nr-nrm-operatordu.yang b/yang-models/_3gpp-nr-nrm-operatordu.yang index 1c708e52b..98a702b77 100755 --- a/yang-models/_3gpp-nr-nrm-operatordu.yang +++ b/yang-models/_3gpp-nr-nrm-operatordu.yang @@ -12,10 +12,11 @@ module _3gpp-nr-nrm-operatordu { contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464"; description "Defines the YANG mapping of the OperatorDU Information Object Class (IOC) that is part of the NR Network Resource Model (NRM). - Copyright 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + Copyright 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved."; reference "3GPP TS 28.541 5G Network Resource Model (NRM)"; + revision 2024-02-24 { reference CR-1218; } revision 2023-11-14 { reference "CR1136"; } revision 2023-09-30 { reference "CR1048"; } revision 2023-09-18 { reference CR-1043 ; } @@ -24,14 +25,22 @@ module _3gpp-nr-nrm-operatordu { grouping OperatorDUGrp { description "Represents the OperatorDU IOC."; reference "3GPP TS 28.541"; - uses gnbdu3gpp:GNBDUFunctionGrp { - refine gNBId { - mandatory true; - } - refine gNBIdLength { - mandatory true; - } + + leaf gNBId { + type int64 { range "0..4294967295"; } + mandatory true; + description "Identifies a gNB within a PLMN. The gNB Identifier (gNB ID) + is part of the NR Cell Identifier (NCI) of the gNB cells."; + reference "gNB ID in 3GPP TS 38.300, Global gNB ID in 3GPP TS 38.413"; + } + + leaf gNBIdLength { + type int32 { range "22..32"; } + mandatory true; + description "Indicates the number of bits for encoding the gNB ID."; + reference "gNB ID in 3GPP TS 38.300, Global gNB ID in 3GPP TS 38.413"; } + leaf configurable5QISetRef { type types3gpp:DistinguishedName; description "DN of the Configurable5QISet that the OperatorDU diff --git a/yang-models/external-yams/ietf-inet-types.yang b/yang-models/external-yams/ietf-inet-types.yang index a69ac0579..8101ea4bc 100755 --- a/yang-models/external-yams/ietf-inet-types.yang +++ b/yang-models/external-yams/ietf-inet-types.yang @@ -1,159 +1,194 @@ module ietf-inet-types { - yang-version 1; + namespace "urn:ietf:params:xml:ns:yang:ietf-inet-types"; + prefix "inet"; - namespace - "urn:ietf:params:xml:ns:yang:ietf-inet-types"; + organization + "IETF Network Modeling (NETMOD) Working Group"; - prefix inet; - - organization - "IETF NETMOD (NETCONF Data Modeling Language) Working Group"; - - contact - "WG Web: + contact + "WG Web: WG List: - WG Chair: David Kessens - - - WG Chair: Juergen Schoenwaelder - - Editor: Juergen Schoenwaelder - "; + "; - description - "This module contains a collection of generally useful derived + description + "This module contains a collection of generally useful derived YANG data types for Internet addresses and related things. - Copyright (c) 2013 IETF Trust and the persons identified as + The key words 'MUST', 'MUST NOT', 'REQUIRED', 'SHALL', 'SHALL + NOT', 'SHOULD', 'SHOULD NOT', 'RECOMMENDED', 'NOT RECOMMENDED', + 'MAY', and 'OPTIONAL' in this document are to be interpreted as + described in BCP 14 (RFC 2119) (RFC 8174) when, and only when, + they appear in all capitals, as shown here. + + Copyright (c) 2022 IETF Trust and the persons identified as authors of the code. All rights reserved. Redistribution and use in source and binary forms, with or without modification, is permitted pursuant to, and subject - to the license terms contained in, the Simplified BSD License + to the license terms contained in, the Revised BSD License set forth in Section 4.c of the IETF Trust's Legal Provisions Relating to IETF Documents - (http://trustee.ietf.org/license-info). + (https://trustee.ietf.org/license-info). - This version of this YANG module is part of RFC 6991; see - the RFC itself for full legal notices."; + This version of this YANG module is part of RFC XXXX; + see the RFC itself for full legal notices."; - revision "2013-07-15" { - description - "This revision adds the following new data types: - - ip-address-no-zone - - ipv4-address-no-zone - - ipv6-address-no-zone"; - reference - "RFC 6991: Common YANG Data Types"; - - } - - revision "2010-09-24" { - description "Initial revision."; - reference - "RFC 6021: Common YANG Data Types"; - - } - - - typedef ip-version { - type enumeration { - enum "unknown" { - value 0; - description - "An unknown or unspecified version of the Internet + revision 2023-01-23 { + description + "This revision adds the following new data types: + - inet:ip-address-and-prefix + - inet:ipv4-address-and-prefix + - inet:ipv6-address-and-prefix + - inet:protocol-number + - inet:host-name + - inet:email-address + - inet:ip-address-link-local + - inet:ipv4-address-link-local + - inet:ipv6-address-link-local + The inet:host union was changed to use inet:host-name instead + of inet:domain-name. Several pattern statements have been + improved."; + reference + "RFC XXXX: Common YANG Data Types"; + } + + revision 2013-07-15 { + description + "This revision adds the following new data types: + - inet:ip-address-no-zone + - inet:ipv4-address-no-zone + - inet:ipv6-address-no-zone"; + reference + "RFC 6991: Common YANG Data Types"; + } + + revision 2010-09-24 { + description + "Initial revision."; + reference + "RFC 6021: Common YANG Data Types"; + } + + /*** collection of types related to protocol fields ***/ + + typedef ip-version { + type enumeration { + enum unknown { + value "0"; + description + "An unknown or unspecified version of the Internet protocol."; - } - enum "ipv4" { - value 1; - description - "The IPv4 protocol as defined in RFC 791."; - } - enum "ipv6" { - value 2; - description - "The IPv6 protocol as defined in RFC 2460."; - } } - description - "This value represents the version of the IP protocol. + enum ipv4 { + value "1"; + description + "The IPv4 protocol as defined in RFC 791."; + } + enum ipv6 { + value "2"; + description + "The IPv6 protocol as defined in RFC 8200."; + } + } + description + "This value represents the version of the IP protocol. In the value set and its semantics, this type is equivalent to the InetVersion textual convention of the SMIv2."; - reference - "RFC 791: Internet Protocol - RFC 2460: Internet Protocol, Version 6 (IPv6) Specification - RFC 4001: Textual Conventions for Internet Network Addresses"; - + reference + "RFC 791: Internet Protocol + RFC 8200: Internet Protocol, Version 6 (IPv6) Specification + RFC 4001: Textual Conventions for Internet Network Addresses"; + } + + typedef dscp { + type uint8 { + range "0..63"; } - - typedef dscp { - type uint8 { - range "0..63"; - } - description - "The dscp type represents a Differentiated Services Code Point + description + "The dscp type represents a Differentiated Services Code Point that may be used for marking packets in a traffic stream. + In the value set and its semantics, this type is equivalent to the Dscp textual convention of the SMIv2."; - reference - "RFC 3289: Management Information Base for the Differentiated - Services Architecture - RFC 2474: Definition of the Differentiated Services Field - (DS Field) in the IPv4 and IPv6 Headers - RFC 2780: IANA Allocation Guidelines For Values In - the Internet Protocol and Related Headers"; - + reference + "RFC 3289: Management Information Base for the Differentiated + Services Architecture + RFC 2474: Definition of the Differentiated Services Field + (DS Field) in the IPv4 and IPv6 Headers + RFC 2780: IANA Allocation Guidelines For Values In + the Internet Protocol and Related Headers"; + } + + typedef ipv6-flow-label { + type uint32 { + range "0..1048575"; } - - typedef ipv6-flow-label { - type uint32 { - range "0..1048575"; - } - description - "The ipv6-flow-label type represents the flow identifier or Flow - Label in an IPv6 packet header that may be used to + description + "The ipv6-flow-label type represents the flow identifier or + Flow Label in an IPv6 packet header that may be used to discriminate traffic flows. In the value set and its semantics, this type is equivalent to the IPv6FlowLabel textual convention of the SMIv2."; - reference - "RFC 3595: Textual Conventions for IPv6 Flow Label - RFC 2460: Internet Protocol, Version 6 (IPv6) Specification"; - + reference + "RFC 3595: Textual Conventions for IPv6 Flow Label + RFC 8200: Internet Protocol, Version 6 (IPv6) Specification"; + } + + typedef port-number { + type uint16 { + range "0..65535"; } - - typedef port-number { - type uint16 { - range "0..65535"; - } - description - "The port-number type represents a 16-bit port number of an + description + "The port-number type represents a 16-bit port number of an Internet transport-layer protocol such as UDP, TCP, DCCP, or - SCTP. Port numbers are assigned by IANA. A current list of - all assignments is available from . + SCTP. + + Port numbers are assigned by IANA. The current list of + all assignments is available from . Note that the port number value zero is reserved by IANA. In situations where the value zero does not make sense, it can be excluded by subtyping the port-number type. + In the value set and its semantics, this type is equivalent to the InetPortNumber textual convention of the SMIv2."; - reference - "RFC 768: User Datagram Protocol - RFC 793: Transmission Control Protocol - RFC 4960: Stream Control Transmission Protocol - RFC 4340: Datagram Congestion Control Protocol (DCCP) - RFC 4001: Textual Conventions for Internet Network Addresses"; - - } - - typedef as-number { - type uint32; - description - "The as-number type represents autonomous system numbers + reference + "RFC 768: User Datagram Protocol + RFC 9293: Transmission Control Protocol (TCP) + RFC 9260: Stream Control Transmission Protocol + RFC 4340: Datagram Congestion Control Protocol (DCCP) + RFC 4001: Textual Conventions for Internet Network Addresses"; + } + + typedef protocol-number { + type uint8; + description + "The protocol-number type represents an 8-bit Internet + protocol number, carried in the 'protocol' field of the + IPv4 header or in the 'next header' field of the IPv6 + header. If IPv6 extension headers are present, then the + protocol number type represents the upper layer protocol + number, i.e., the number of the last next header' field + of the IPv6 extension headers. + + Protocol numbers are assigned by IANA. The current list of + all assignments is available from ."; + reference + "RFC 791: Internet Protocol + RFC 8200: Internet Protocol, Version 6 (IPv6) Specification"; + } + + /*** collection of types related to autonomous systems ***/ + + typedef as-number { + type uint32; + description + "The as-number type represents autonomous system numbers which identify an Autonomous System (AS). An AS is a set of routers under a single technical administration, using an interior gateway protocol and common metrics to route @@ -171,40 +206,40 @@ module ietf-inet-types { In the value set and its semantics, this type is equivalent to the InetAutonomousSystemNumber textual convention of the SMIv2."; - reference - "RFC 1930: Guidelines for creation, selection, and registration - of an Autonomous System (AS) - RFC 4271: A Border Gateway Protocol 4 (BGP-4) - RFC 4001: Textual Conventions for Internet Network Addresses - RFC 6793: BGP Support for Four-Octet Autonomous System (AS) - Number Space"; - + reference + "RFC 1930: Guidelines for creation, selection, and registration + of an Autonomous System (AS) + RFC 4271: A Border Gateway Protocol 4 (BGP-4) + RFC 4001: Textual Conventions for Internet Network Addresses + RFC 6793: BGP Support for Four-Octet Autonomous System (AS) + Number Space"; + } + + /*** collection of types related to IP addresses and hostnames ***/ + + typedef ip-address { + type union { + type inet:ipv4-address; + type inet:ipv6-address; } - - typedef ip-address { - type union { - type ipv4-address; - type ipv6-address; - } - description - "The ip-address type represents an IP address and is IP + description + "The ip-address type represents an IP address and is IP version neutral. The format of the textual representation implies the IP version. This type supports scoped addresses by allowing zone identifiers in the address format."; - reference - "RFC 4007: IPv6 Scoped Address Architecture"; - + reference + "RFC 4007: IPv6 Scoped Address Architecture"; + } + + typedef ipv4-address { + type string { + pattern + '(([0-9]|[1-9][0-9]|1[0-9][0-9]|2[0-4][0-9]|25[0-5])\.){3}' + + '([0-9]|[1-9][0-9]|1[0-9][0-9]|2[0-4][0-9]|25[0-5])' + + '(%[A-Za-z0-9][A-Za-z0-9\-\._~/]*)?'; } - - typedef ipv4-address { - type string { - pattern - '(([0-9]|[1-9][0-9]|1[0-9][0-9]|2[0-4][0-9]|25[0-5])\.){3}' - + '([0-9]|[1-9][0-9]|1[0-9][0-9]|2[0-4][0-9]|25[0-5])' - + '(%[\p{N}\p{L}]+)?'; - } - description - "The ipv4-address type represents an IPv4 address in + description + "The ipv4-address type represents an IPv4 address in dotted-quad notation. The IPv4 address may include a zone index, separated by a % sign. @@ -216,23 +251,21 @@ module ietf-inet-types { The canonical format for the zone index is the numerical format"; - } + } - typedef ipv6-address { - type string { - pattern - '((:|[0-9a-fA-F]{0,4}):)([0-9a-fA-F]{0,4}:){0,5}' + typedef ipv6-address { + type string { + pattern '((:|[0-9a-fA-F]{0,4}):)([0-9a-fA-F]{0,4}:){0,5}' + '((([0-9a-fA-F]{0,4}:)?(:|[0-9a-fA-F]{0,4}))|' + '(((25[0-5]|2[0-4][0-9]|[01]?[0-9]?[0-9])\.){3}' + '(25[0-5]|2[0-4][0-9]|[01]?[0-9]?[0-9])))' - + '(%[\p{N}\p{L}]+)?'; - pattern - '(([^:]+:){6}(([^:]+:[^:]+)|(.*\..*)))|' + + '(%[A-Za-z0-9][A-Za-z0-9\-\._~/]*)?'; + pattern '(([^:]+:){6}(([^:]+:[^:]+)|(.*\..*)))|' + '((([^:]+:)*[^:]+)?::(([^:]+:)*[^:]+)?)' + '(%.+)?'; - } - description - "The ipv6-address type represents an IPv6 address in full, + } + description + "The ipv6-address type represents an IPv6 address in full, mixed, shortened, and shortened-mixed notation. The IPv6 address may include a zone index, separated by a % sign. @@ -242,82 +275,110 @@ module ietf-inet-types { interface. If the zone index is not present, the default zone of the device will be used. - - The canonical format of IPv6 addresses uses the textual representation defined in Section 4 of RFC 5952. The canonical format for the zone index is the numerical format as described in Section 11.2 of RFC 4007."; - reference - "RFC 4291: IP Version 6 Addressing Architecture - RFC 4007: IPv6 Scoped Address Architecture - RFC 5952: A Recommendation for IPv6 Address Text - Representation"; - + reference + "RFC 4291: IP Version 6 Addressing Architecture + RFC 4007: IPv6 Scoped Address Architecture + RFC 5952: A Recommendation for IPv6 Address Text + Representation"; + } + + typedef ip-address-no-zone { + type union { + type inet:ipv4-address-no-zone; + type inet:ipv6-address-no-zone; } - - typedef ip-address-no-zone { - type union { - type ipv4-address-no-zone; - type ipv6-address-no-zone; - } - description - "The ip-address-no-zone type represents an IP address and is + description + "The ip-address-no-zone type represents an IP address and is IP version neutral. The format of the textual representation implies the IP version. This type does not support scoped addresses since it does not allow zone identifiers in the address format."; - reference - "RFC 4007: IPv6 Scoped Address Architecture"; + reference + "RFC 4007: IPv6 Scoped Address Architecture"; + } + typedef ipv4-address-no-zone { + type inet:ipv4-address { + pattern '[0-9\.]*'; } - - typedef ipv4-address-no-zone { - type ipv4-address { - pattern '[0-9\.]*'; - } - description - "An IPv4 address without a zone index. This type, derived from - ipv4-address, may be used in situations where the zone is - known from the context and hence no zone index is needed."; + description + "An IPv4 address without a zone index. This type, derived from + ipv4-address, may be used in situations where the zone is known + from the context and hence no zone index is needed."; + } + + typedef ipv6-address-no-zone { + type inet:ipv6-address { + pattern '[0-9a-fA-F:\.]*'; } - - typedef ipv6-address-no-zone { - type ipv6-address { - pattern '[0-9a-fA-F:\.]*'; - } - description - "An IPv6 address without a zone index. This type, derived from - ipv6-address, may be used in situations where the zone is - known from the context and hence no zone index is needed."; - reference - "RFC 4291: IP Version 6 Addressing Architecture - RFC 4007: IPv6 Scoped Address Architecture - RFC 5952: A Recommendation for IPv6 Address Text - Representation"; - + description + "An IPv6 address without a zone index. This type, derived from + ipv6-address, may be used in situations where the zone is known + from the context and hence no zone index is needed."; + reference + "RFC 4291: IP Version 6 Addressing Architecture + RFC 4007: IPv6 Scoped Address Architecture + RFC 5952: A Recommendation for IPv6 Address Text + Representation"; + } + + typedef ip-address-link-local { + type union { + type inet:ipv4-address-link-local; + type inet:ipv6-address-link-local; } - - typedef ip-prefix { - type union { - type ipv4-prefix; - type ipv6-prefix; - } - description - "The ip-prefix type represents an IP prefix and is IP + description + "The ip-address-link-local type represents a link-local IP + address and is IP version neutral. The format of the textual + representation implies the IP version."; + } + + typedef ipv4-address-link-local { + type ipv4-address { + pattern '169\.254\..*'; + } + description + "A link-local IPv4 address in the prefix 169.254.0.0/16 as + defined in section 2.1. of RFC 3927."; + reference + "RFC 3927: Dynamic Configuration of IPv4 Link-Local Addresses"; + } + + typedef ipv6-address-link-local { + type ipv6-address { + pattern '[fF][eE]80:.*'; + } + description + "A link-local IPv6 address in the prefix fe80::/10 as defined + in section 2.5.6. of RFC 4291."; + reference + "RFC 4291: IP Version 6 Addressing Architecture"; + } + + typedef ip-prefix { + type union { + type inet:ipv4-prefix; + type inet:ipv6-prefix; + } + description + "The ip-prefix type represents an IP prefix and is IP version neutral. The format of the textual representations implies the IP version."; + } + + typedef ipv4-prefix { + type string { + pattern + '(([0-9]|[1-9][0-9]|1[0-9][0-9]|2[0-4][0-9]|25[0-5])\.){3}' + + '([0-9]|[1-9][0-9]|1[0-9][0-9]|2[0-4][0-9]|25[0-5])' + + '/(([0-9])|([1-2][0-9])|(3[0-2]))'; } - - typedef ipv4-prefix { - type string { - pattern - '(([0-9]|[1-9][0-9]|1[0-9][0-9]|2[0-4][0-9]|25[0-5])\.){3}' - + '([0-9]|[1-9][0-9]|1[0-9][0-9]|2[0-4][0-9]|25[0-5])' - + '/(([0-9])|([1-2][0-9])|(3[0-2]))'; - } - description - "The ipv4-prefix type represents an IPv4 address prefix. + description + "The ipv4-prefix type represents an IPv4 prefix. The prefix length is given by the number following the slash character and must be less than or equal to 32. @@ -327,24 +388,29 @@ module ietf-inet-types { The canonical format of an IPv4 prefix has all bits of the IPv4 address set to zero that are not part of the - IPv4 prefix."; - } - - typedef ipv6-prefix { - type string { - pattern - '((:|[0-9a-fA-F]{0,4}):)([0-9a-fA-F]{0,4}:){0,5}' + IPv4 prefix. + + The definition of ipv4-prefix does not require that bits, + which are not part of the prefix, are set to zero. However, + implementations have to return values in canonical format, + which requires non-prefix bits to be set to zero. This means + that 192.0.2.1/24 must be accepted as a valid value but it + will be converted into the canonical format 192.0.2.0/24."; + } + + typedef ipv6-prefix { + type string { + pattern '((:|[0-9a-fA-F]{0,4}):)([0-9a-fA-F]{0,4}:){0,5}' + '((([0-9a-fA-F]{0,4}:)?(:|[0-9a-fA-F]{0,4}))|' + '(((25[0-5]|2[0-4][0-9]|[01]?[0-9]?[0-9])\.){3}' + '(25[0-5]|2[0-4][0-9]|[01]?[0-9]?[0-9])))' + '(/(([0-9])|([0-9]{2})|(1[0-1][0-9])|(12[0-8])))'; - pattern - '(([^:]+:){6}(([^:]+:[^:]+)|(.*\..*)))|' + pattern '(([^:]+:){6}(([^:]+:[^:]+)|(.*\..*)))|' + '((([^:]+:)*[^:]+)?::(([^:]+:)*[^:]+)?)' + '(/.+)'; - } - description - "The ipv6-prefix type represents an IPv6 address prefix. + } + description + "The ipv6-prefix type represents an IPv6 prefix. The prefix length is given by the number following the slash character and must be less than or equal to 128. @@ -352,44 +418,104 @@ module ietf-inet-types { mask that has n contiguous 1-bits from the most significant bit (MSB) and all other bits set to 0. - The IPv6 address should have all bits that do not belong - to the prefix set to zero. - The canonical format of an IPv6 prefix has all bits of the IPv6 address set to zero that are not part of the IPv6 prefix. Furthermore, the IPv6 address is represented - as defined in Section 4 of RFC 5952."; - reference - "RFC 5952: A Recommendation for IPv6 Address Text - Representation"; + as defined in Section 4 of RFC 5952. + + The definition of ipv6-prefix does not require that bits, + which are not part of the prefix, are set to zero. However, + implementations have to return values in canonical format, + which requires non-prefix bits to be set to zero. This means + that 2001:db8::1/64 must be accepted as a valid value but it + will be converted into the canonical format 2001:db8::/64."; + reference + "RFC 5952: A Recommendation for IPv6 Address Text + Representation"; + } + + typedef ip-address-and-prefix { + type union { + type inet:ipv4-address-and-prefix; + type inet:ipv6-address-and-prefix; + } + description + "The ip-address-and-prefix type represents an IP address and + prefix and is IP version neutral. The format of the textual + representations implies the IP version."; + } + + typedef ipv4-address-and-prefix { + type string { + pattern + '(([0-9]|[1-9][0-9]|1[0-9][0-9]|2[0-4][0-9]|25[0-5])\.){3}' + + '([0-9]|[1-9][0-9]|1[0-9][0-9]|2[0-4][0-9]|25[0-5])' + + '/(([0-9])|([1-2][0-9])|(3[0-2]))'; + } + description + "The ipv4-address-and-prefix type represents an IPv4 + address and an associated ipv4 prefix. + The prefix length is given by the number following the + slash character and must be less than or equal to 32. + A prefix length value of n corresponds to an IP address + mask that has n contiguous 1-bits from the most + significant bit (MSB) and all other bits set to 0."; + } + + typedef ipv6-address-and-prefix { + type string { + pattern '((:|[0-9a-fA-F]{0,4}):)([0-9a-fA-F]{0,4}:){0,5}' + + '((([0-9a-fA-F]{0,4}:)?(:|[0-9a-fA-F]{0,4}))|' + + '(((25[0-5]|2[0-4][0-9]|[01]?[0-9]?[0-9])\.){3}' + + '(25[0-5]|2[0-4][0-9]|[01]?[0-9]?[0-9])))' + + '(/(([0-9])|([0-9]{2})|(1[0-1][0-9])|(12[0-8])))'; + pattern '(([^:]+:){6}(([^:]+:[^:]+)|(.*\..*)))|' + + '((([^:]+:)*[^:]+)?::(([^:]+:)*[^:]+)?)' + + '(/.+)'; } + description + "The ipv6-address-and-prefix type represents an IPv6 + address and an associated ipv4 prefix. + The prefix length is given by the number following the + slash character and must be less than or equal to 128. - typedef domain-name { - type string { - length "1..253"; - pattern - '((([a-zA-Z0-9_]([a-zA-Z0-9\-_]){0,61})?[a-zA-Z0-9]\.)*' - + '([a-zA-Z0-9_]([a-zA-Z0-9\-_]){0,61})?[a-zA-Z0-9]\.?)' - + '|\.'; - } - description - "The domain-name type represents a DNS domain name. The - name SHOULD be fully qualified whenever possible. + A prefix length value of n corresponds to an IP address + mask that has n contiguous 1-bits from the most + significant bit (MSB) and all other bits set to 0. + + The canonical format requires that the IPv6 address is + represented as defined in Section 4 of RFC 5952."; + reference + "RFC 5952: A Recommendation for IPv6 Address Text + Representation"; + } + + /*** collection of domain name and URI types ***/ + + typedef domain-name { + type string { + length "1..253"; + pattern + '((([a-zA-Z0-9_]([a-zA-Z0-9\-_]){0,61})?[a-zA-Z0-9]\.)*' + + '([a-zA-Z0-9_]([a-zA-Z0-9\-_]){0,61})?[a-zA-Z0-9]\.?)' + + '|\.'; + } + description + "The domain-name type represents a DNS domain name. The + name SHOULD be fully qualified whenever possible. This + type does not support wildcards (see RFC 4592) or + classless in-addr.arpa delegations (see RFC 2317). Internet domain names are only loosely specified. Section 3.5 of RFC 1034 recommends a syntax (modified in Section 2.1 of RFC 1123). The pattern above is intended to allow for current practice in domain name use, and some possible - future expansion. It is designed to hold various types of - domain names, including names used for A or AAAA records - (host names) and other records, such as SRV records. Note - that Internet host names have a stricter syntax (described - in RFC 952) than the DNS recommendations in RFCs 1034 and - 1123, and that systems that want to store host names in - schema nodes using the domain-name type are recommended to - adhere to this stricter standard to ensure interoperability. - + future expansion. Note that Internet host names have a + stricter syntax (described in RFC 952) than the DNS + recommendations in RFCs 1034 and 1123. Schema nodes + representing host names should use the host-name type + instead of the domain-type. The encoding of DNS names in the DNS protocol is limited to 255 characters. Since the encoding consists of labels prefixed by a length bytes and there is a trailing NULL @@ -408,33 +534,52 @@ module ietf-inet-types { Domain-name values use the US-ASCII encoding. Their canonical format uses lowercase US-ASCII characters. Internationalized domain names MUST be A-labels as per RFC 5890."; - reference - "RFC 952: DoD Internet Host Table Specification - RFC 1034: Domain Names - Concepts and Facilities - RFC 1123: Requirements for Internet Hosts -- Application - and Support - RFC 2782: A DNS RR for specifying the location of services - (DNS SRV) - RFC 5890: Internationalized Domain Names in Applications - (IDNA): Definitions and Document Framework"; - + reference + "RFC 952: DoD Internet Host Table Specification + RFC 1034: Domain Names - Concepts and Facilities + RFC 1123: Requirements for Internet Hosts -- Application + and Support + RFC 2317: Classless IN-ADDR.ARPA delegation + RFC 2782: A DNS RR for specifying the location of services + (DNS SRV) + RFC 4592: The Role of Wildcards in the Domain Name System + RFC 5890: Internationalized Domain Names in Applications + (IDNA): Definitions and Document Framework"; + } + + typedef host-name { + type domain-name { + length "2..max"; + pattern '[a-zA-Z0-9\-\.]+'; } - - typedef host { - type union { - type ip-address; - type domain-name; - } - description - "The host type represents either an IP address or a DNS - domain name."; + description + "The host-name type represents (fully qualified) host names. + Host names must be at least two characters long (see RFC 952) + and they are restricted to labels consisting of letters, digits + and hyphens separated by dots (see RFC1123 and RFC 952)."; + reference + "RFC 952: DoD Internet Host Table Specification + RFC 1123: Requirements for Internet Hosts -- Application + and Support"; + } + + typedef host { + type union { + type inet:ip-address; + type inet:host-name; } + description + "The host type represents either an IP address or a (fully + qualified) host name."; + } - typedef uri { - type string; - description - "The uri type represents a Uniform Resource Identifier - (URI) as defined by STD 66. + typedef uri { + type string { + pattern '[a-z][a-z0-9+.-]*:.*'; + } + description + "The uri type represents a Uniform Resource Identifier + (URI) as defined by the rule 'URI' in RFC 3986. Objects using the uri type MUST be in US-ASCII encoding, and MUST be normalized as described by RFC 3986 Sections @@ -459,14 +604,37 @@ module ietf-inet-types { In the value set and its semantics, this type is equivalent to the Uri SMIv2 textual convention defined in RFC 5017."; - reference - "RFC 3986: Uniform Resource Identifier (URI): Generic Syntax - RFC 3305: Report from the Joint W3C/IETF URI Planning Interest - Group: Uniform Resource Identifiers (URIs), URLs, - and Uniform Resource Names (URNs): Clarifications - and Recommendations - RFC 5017: MIB Textual Conventions for Uniform Resource - Identifiers (URIs)"; - + reference + "RFC 3986: Uniform Resource Identifier (URI): Generic Syntax + RFC 3305: Report from the Joint W3C/IETF URI Planning Interest + Group: Uniform Resource Identifiers (URIs), URLs, + and Uniform Resource Names (URNs): Clarifications + and Recommendations + RFC 5017: MIB Textual Conventions for Uniform Resource + Identifiers (URIs)"; + } + + typedef email-address { + type string { + pattern '(([a-zA-Z0-9!#$%&'+"'"+'*+/=?\^_`{|}~-]+' + + '(\.[a-zA-Z0-9!#$%&'+"'"+'*+/=?\^_`{|}~-]+)*)|' + + '("[a-zA-Z0-9!#$%&'+"'"+'()*+,./\[\]\^_`{|}~-]*"))' + + '@' + + '(([a-zA-Z0-9!#$%&'+"'"+'*+/=?\^_`{|}~-]+' + + '(\.[a-zA-Z0-9!#$%&'+"'"+'*+/=?\^_`{|}~-]+)*)|' + + '\[[a-zA-Z0-9!"#$%&'+"'"+'()*+,./:;<=>?@\^_`{|}~-]+\])'; } - } // module ietf-inet-types + description + "The email-address type represents an email address as + defined as addr-spec in RFC 5322 section 3.4.1 except + that obs-local-part, obs-domain and obs-qtext of the + quoted-string are not supported. + + The email-address type uses US-ASCII characters. The + canonical format of the domain part of an email-address + uses lowercase US-ASCII characters."; + reference + "RFC 5322: Internet Message Format"; + } + +} diff --git a/yang-models/external-yams/ietf-yang-types@2013-07-15.yang b/yang-models/external-yams/ietf-yang-types.yang old mode 100755 new mode 100644 similarity index 52% rename from yang-models/external-yams/ietf-yang-types@2013-07-15.yang rename to yang-models/external-yams/ietf-yang-types.yang index 371a091d1..39e390cba --- a/yang-models/external-yams/ietf-yang-types@2013-07-15.yang +++ b/yang-models/external-yams/ietf-yang-types.yang @@ -4,45 +4,68 @@ module ietf-yang-types { prefix "yang"; organization - "IETF NETMOD (NETCONF Data Modeling Language) Working Group"; + "IETF Network Modeling (NETMOD) Working Group"; contact - "WG Web: + "WG Web: WG List: - WG Chair: David Kessens - - - WG Chair: Juergen Schoenwaelder - - Editor: Juergen Schoenwaelder - "; + "; description "This module contains a collection of generally useful derived YANG data types. - Copyright (c) 2013 IETF Trust and the persons identified as + The key words 'MUST', 'MUST NOT', 'REQUIRED', 'SHALL', 'SHALL + NOT', 'SHOULD', 'SHOULD NOT', 'RECOMMENDED', 'NOT RECOMMENDED', + 'MAY', and 'OPTIONAL' in this document are to be interpreted as + described in BCP 14 (RFC 2119) (RFC 8174) when, and only when, + they appear in all capitals, as shown here. + + Copyright (c) 2022 IETF Trust and the persons identified as authors of the code. All rights reserved. Redistribution and use in source and binary forms, with or without modification, is permitted pursuant to, and subject - to the license terms contained in, the Simplified BSD License + to the license terms contained in, the Revised BSD License set forth in Section 4.c of the IETF Trust's Legal Provisions Relating to IETF Documents - (http://trustee.ietf.org/license-info). + (https://trustee.ietf.org/license-info). - This version of this YANG module is part of RFC 6991; see - the RFC itself for full legal notices."; + This version of this YANG module is part of RFC XXXX; + see the RFC itself for full legal notices."; + + revision 2023-01-23 { + description + "This revision adds the following new data types: + - yang:date-with-zone-offset + - yang:date-no-zone + - yang:time-with-zone-offset + - yang:time-no-zone + - yang:hours32 + - yang:minutes32 + - yang:seconds32 + - yang:centiseconds32 + - yang:milliseconds32 + - yang:microseconds32 + - yang:microseconds64 + - yang:nanoseconds32 + - yang:nanoseconds64 + - yang:language-tag + The yang-identifier definition has been aligned with YANG 1.1. + Several pattern statements have been improved."; + reference + "RFC XXXX: Common YANG Data Types"; + } revision 2013-07-15 { description "This revision adds the following new data types: - - yang-identifier - - hex-string - - uuid - - dotted-quad"; + - yang:yang-identifier + - yang:hex-string + - yang:uuid + - yang:dotted-quad"; reference "RFC 6991: Common YANG Data Types"; } @@ -70,7 +93,7 @@ module ietf-yang-types { value normally occur at re-initialization of the management system, and at other times as specified in the description of a schema node using this type. If such - other times can occur, for example, the creation of + other times can occur, for example, the instantiation of a schema node of type counter32 at times other than re-initialization, then a corresponding schema node should be defined, with an appropriate type, to indicate @@ -93,18 +116,17 @@ module ietf-yang-types { description "The zero-based-counter32 type represents a counter32 that has the defined 'initial' value zero. - - A schema node of this type will be set to zero (0) on creation - and will thereafter increase monotonically until it reaches - a maximum value of 2^32-1 (4294967295 decimal), when it - wraps around and starts increasing again from zero. + A schema node instance of this type will be set to zero (0) + on creation and will thereafter increase monotonically until + it reaches a maximum value of 2^32-1 (4294967295 decimal), + when it wraps around and starts increasing again from zero. Provided that an application discovers a new schema node - of this type within the minimum time to wrap, it can use the - 'initial' value as a delta. It is important for a management - station to be aware of this minimum time and the actual time - between polls, and to discard data if the actual time is too - long or there is no defined minimum time. + instance of this type within the minimum time to wrap, it + can use the 'initial' value as a delta. It is important for + a management station to be aware of this minimum time and the + actual time between polls, and to discard data if the actual + time is too long or there is no defined minimum time. In the value set and its semantics, this type is equivalent to the ZeroBasedCounter32 textual convention of the SMIv2."; @@ -127,7 +149,7 @@ module ietf-yang-types { value normally occur at re-initialization of the management system, and at other times as specified in the description of a schema node using this type. If such - other times can occur, for example, the creation of + other times can occur, for example, the instantiation of a schema node of type counter64 at times other than re-initialization, then a corresponding schema node should be defined, with an appropriate type, to indicate @@ -151,20 +173,18 @@ module ietf-yang-types { "The zero-based-counter64 type represents a counter64 that has the defined 'initial' value zero. - - - - A schema node of this type will be set to zero (0) on creation - and will thereafter increase monotonically until it reaches - a maximum value of 2^64-1 (18446744073709551615 decimal), - when it wraps around and starts increasing again from zero. + A schema node instance of this type will be set to zero (0) + on creation and will thereafter increase monotonically until + it reaches a maximum value of 2^64-1 (18446744073709551615 + decimal), when it wraps around and starts increasing again + from zero. Provided that an application discovers a new schema node - of this type within the minimum time to wrap, it can use the - 'initial' value as a delta. It is important for a management - station to be aware of this minimum time and the actual time - between polls, and to discard data if the actual time is too - long or there is no defined minimum time. + instance of this type within the minimum time to wrap, it + can use the 'initial' value as a delta. It is important for + a management station to be aware of this minimum time and the + actual time between polls, and to discard data if the actual + time is too long or there is no defined minimum time. In the value set and its semantics, this type is equivalent to the ZeroBasedCounter64 textual convention of the SMIv2."; @@ -224,8 +244,8 @@ module ietf-yang-types { typedef object-identifier { type string { - pattern '(([0-1](\.[1-3]?[0-9]))|(2\.(0|([1-9]\d*))))' - + '(\.(0|([1-9]\d*)))*'; + pattern '(([0-1](\.[1-3]?[0-9]))|(2\.(0|([1-9][0-9]*))))' + + '(\.(0|([1-9][0-9]*)))*'; } description "The object-identifier type represents administratively @@ -264,7 +284,7 @@ module ietf-yang-types { typedef object-identifier-128 { type object-identifier { - pattern '\d*(\.\d*){1,127}'; + pattern '[0-9]*(\.[0-9]*){1,127}'; } description "This type represents object-identifiers restricted to 128 @@ -277,33 +297,13 @@ module ietf-yang-types { (SMIv2)"; } - typedef yang-identifier { - type string { - length "1..max"; - pattern '[a-zA-Z_][a-zA-Z0-9\-_.]*'; - pattern '.|..|[^xX].*|.[^mM].*|..[^lL].*'; - } - description - "A YANG identifier string as defined by the 'identifier' - rule in Section 12 of RFC 6020. An identifier must - start with an alphabetic character or an underscore - followed by an arbitrary sequence of alphabetic or - numeric characters, underscores, hyphens, or dots. - - A YANG identifier MUST NOT start with any possible - combination of the lowercase or uppercase character - sequence 'xml'."; - reference - "RFC 6020: YANG - A Data Modeling Language for the Network - Configuration Protocol (NETCONF)"; - } - - /*** collection of types related to date and time***/ + /*** collection of types related to date and time ***/ typedef date-and-time { type string { - pattern '\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}(\.\d+)?' - + '(Z|[\+\-]\d{2}:\d{2})'; + pattern '[0-9]{4}-(1[0-2]|0[1-9])-(0[1-9]|[1-2][0-9]|3[0-1])' + + 'T(0[0-9]|1[0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](\.[0-9]+)?' + + '(Z|[\+\-]((1[0-3]|0[0-9]):([0-5][0-9])|14:00))?'; } description "The date-and-time type is a profile of the ISO 8601 @@ -312,18 +312,16 @@ module ietf-yang-types { date-time production in Section 5.6 of RFC 3339. The date-and-time type is compatible with the dateTime XML - schema type with the following notable exceptions: + schema dateTime type with the following notable exceptions: (a) The date-and-time type does not allow negative years. - (b) The date-and-time time-offset -00:00 indicates an unknown - time zone (see RFC 3339) while -00:00 and +00:00 and Z - all represent the same time zone in dateTime. - - (c) The canonical format (see below) of data-and-time values - differs from the canonical format used by the dateTime XML - schema type, which requires all times to be in UTC using - the time-offset 'Z'. + (b) The time-offset -00:00 indicates that the date-and-time + value is reported in UTC and that the local time zone + reference point is unknown. The time-offsets +00:00 and Z + both indicate that the date-and-time value is reported in + UTC and that the local time reference point is UTC (see RFC + 3339 section 4.3). This type is not equivalent to the DateAndTime textual convention of the SMIv2 since RFC 3339 uses a different @@ -339,11 +337,225 @@ module ietf-yang-types { (DST) time zone offset changes. The canonical format for date-and-time values with an unknown time zone (usually referring to the notion of local time) uses the time-offset - -00:00."; + -00:00, i.e., date-and-time values must be reported in UTC."; reference "RFC 3339: Date and Time on the Internet: Timestamps RFC 2579: Textual Conventions for SMIv2 - XSD-TYPES: XML Schema Part 2: Datatypes Second Edition"; + XSD-TYPES: XML Schema Definition Language (XSD) 1.1 + Part 2: Datatypes"; + } + + typedef date-with-zone-offset { + type string { + pattern '[0-9]{4}-(1[0-2]|0[1-9])-(0[1-9]|[1-2][0-9]|3[0-1])' + + '(Z|[\+\-]((1[0-3]|0[0-9]):([0-5][0-9])|14:00))?'; + } + description + "The date type represents a time-interval of the length + of a day, i.e., 24 hours. + + The date type is compatible with the XML schema date + type with the following notable exceptions: + (a) The date type does not allow negative years. + + (b) The time-offset -00:00 indicates that the date value is + reported in UTC and that the local time zone reference point + is unknown. The time-offsets +00:00 and Z both indicate that + the date value is reported in UTC and that the local time + reference point is UTC (see RFC 3339 section 4.3). + + The canonical format for date values with a known time + zone uses a numeric time zone offset that is calculated using + the device's configured known offset to UTC time. A change of + the device's offset to UTC time will cause date values + to change accordingly. Such changes might happen periodically + in case a server follows automatically daylight saving time + (DST) time zone offset changes. The canonical format for + date values with an unknown time zone (usually referring + to the notion of local time) uses the time-offset -00:00, + i.e., date values must be reported in UTC."; + reference + "RFC 3339: Date and Time on the Internet: Timestamps + XSD-TYPES: XML Schema Definition Language (XSD) 1.1 + Part 2: Datatypes"; + } + + typedef date-no-zone { + type date-with-zone-offset { + pattern '[0-9]{4}-(1[0-2]|0[1-9])-(0[1-9]|[1-2][0-9]|3[0-1])'; + } + description + "The date-no-zone type represents a date without the optional + time zone offset information."; + } + + typedef time-with-zone-offset { + type string { + pattern '(0[0-9]|1[0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](\.[0-9]+)?' + + '(Z|[\+\-]((1[0-3]|0[0-9]):([0-5][0-9])|14:00))?'; + } + description + "The time type represents an instance of time of zero-duration + that recurs every day. + + The time type is compatible with the XML schema time + type with the following notable exception: + + (a) The time-offset -00:00 indicates that the time value is + reported in UTC and that the local time zone reference point + is unknown. The time-offsets +00:00 and Z both indicate that + the time value is reported in UTC and that the local time + reference point is UTC (see RFC 3339 section 4.3). + + The canonical format for time values with a known time + zone uses a numeric time zone offset that is calculated using + the device's configured known offset to UTC time. A change of + the device's offset to UTC time will cause time values + to change accordingly. Such changes might happen periodically + in case a server follows automatically daylight saving time + (DST) time zone offset changes. The canonical format for + time values with an unknown time zone (usually referring + to the notion of local time) uses the time-offset -00:00, + i.e., time values must be reported in UTC."; + reference + "RFC 3339: Date and Time on the Internet: Timestamps + XSD-TYPES: XML Schema Definition Language (XSD) 1.1 + Part 2: Datatypes"; + } + + typedef time-no-zone { + type time-with-zone-offset { + pattern '(0[0-9]|1[0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](\.[0-9]+)?'; + } + description + "The time-no-zone type represents a time without the optional + time zone offset information."; + } + + typedef hours32 { + type int32; + units "hours"; + description + "A period of time, measured in units of hours. + + The maximum time period that can be expressed is in the + range [-89478485 days 08:00:00 to 89478485 days 07:00:00]. + + This type should be range restricted in situations + where only non-negative time periods are desirable, + (i.e., range '0..max')."; + } + + typedef minutes32 { + type int32; + units "minutes"; + description + "A period of time, measured in units of minutes. + + The maximum time period that can be expressed is in the + range [-1491308 days 2:08:00 to 1491308 days 2:07:00]. + + This type should be range restricted in situations + where only non-negative time periods are desirable, + (i.e., range '0..max')."; + } + + typedef seconds32 { + type int32; + units "seconds"; + description + "A period of time, measured in units of seconds. + + The maximum time period that can be expressed is in the + range [-24855 days 03:14:08 to 24855 days 03:14:07]. + + This type should be range restricted in situations + where only non-negative time periods are desirable, + (i.e., range '0..max')."; + } + + typedef centiseconds32 { + type int32; + units "centiseconds"; + description + "A period of time, measured in units of 10^-2 seconds. + + The maximum time period that can be expressed is in the + range [-248 days 13:13:56 to 248 days 13:13:56]. + + This type should be range restricted in situations + where only non-negative time periods are desirable, + (i.e., range '0..max')."; + } + + typedef milliseconds32 { + type int32; + units "milliseconds"; + description + "A period of time, measured in units of 10^-3 seconds. + + The maximum time period that can be expressed is in the + range [-24 days 20:31:23 to 24 days 20:31:23]. + + This type should be range restricted in situations + where only non-negative time periods are desirable, + (i.e., range '0..max')."; + } + + typedef microseconds32 { + type int32; + units "microseconds"; + description + "A period of time, measured in units of 10^-6 seconds. + + The maximum time period that can be expressed is in the + range [-00:35:47 to 00:35:47]. + + This type should be range restricted in situations + where only non-negative time periods are desirable, + (i.e., range '0..max')."; + } + + typedef microseconds64 { + type int64; + units "microseconds"; + description + "A period of time, measured in units of 10^-6 seconds. + + The maximum time period that can be expressed is in the + range [-106751991 days 04:00:54 to 106751991 days 04:00:54]. + + This type should be range restricted in situations + where only non-negative time periods are desirable, + (i.e., range '0..max')."; + } + + typedef nanoseconds32 { + type int32; + units "nanoseconds"; + description + "A period of time, measured in units of 10^-9 seconds. + + The maximum time period that can be expressed is in the + range [-00:00:02 to 00:00:02]. + + This type should be range restricted in situations + where only non-negative time periods are desirable, + (i.e., range '0..max')."; + } + + typedef nanoseconds64 { + type int64; + units "nanoseconds"; + description + "A period of time, measured in units of 10^-9 seconds. + + The maximum time period that can be expressed is in the + range [-106753 days 23:12:44 to 106752 days 0:47:16]. + + This type should be range restricted in situations + where only non-negative time periods are desirable, + (i.e., range '0..max')."; } typedef timeticks { @@ -366,14 +578,16 @@ module ietf-yang-types { type yang:timeticks; description "The timestamp type represents the value of an associated - timeticks schema node at which a specific occurrence + timeticks schema node instance at which a specific occurrence happened. The specific occurrence must be defined in the description of any schema node defined using this type. When the specific occurrence occurred prior to the last time the - associated timeticks attribute was zero, then the timestamp - value is zero. Note that this requires all timestamp values - to be reset to zero when the value of the associated timeticks - attribute reaches 497+ days and wraps around to zero. + associated timeticks schema node instance was zero, then the + timestamp value is zero. + + Note that this requires all timestamp values to be reset to + zero when the value of the associated timeticks schema node + instance reaches 497+ days and wraps around to zero. The associated timeticks schema node must be specified in the description of any schema node using this type. @@ -390,10 +604,6 @@ module ietf-yang-types { type string { pattern '([0-9a-fA-F]{2}(:[0-9a-fA-F]{2})*)?'; } - - - - description "Represents media- or physical-level addresses represented as a sequence octets, each octet represented by two hexadecimal @@ -477,4 +687,53 @@ module ietf-yang-types { notation, i.e., four octets written as decimal numbers and separated with the '.' (full stop) character."; } + + typedef language-tag { + type string; + description + "A language tag according to RFC 5646 (BCP 47). The + canonical representation uses lowercase characters. + + Values of this type must be well-formed language tags, + in conformance with the definition of well-formed tags + in BCP 47. Implementations MAY further limit the values + they accept to those permitted by a 'validating' + processor, as defined in BCP 47. + + The canonical representation of values of this type is + aligned with the SMIv2 LangTag textual convention for + language tags fitting the length constraints imposed + by the LangTag textual convention."; + reference + "RFC 5646: Tags for Identifying Languages + RFC 5131: A MIB Textual Convention for Language Tags"; + } + + /*** collection of YANG specific types ***/ + + typedef yang-identifier { + type string { + length "1..max"; + pattern '[a-zA-Z_][a-zA-Z0-9\-_.]*'; + } + description + "A YANG identifier string as defined by the 'identifier' + rule in Section 14 of RFC 7950. An identifier must + start with an alphabetic character or an underscore + followed by an arbitrary sequence of alphabetic or + numeric characters, underscores, hyphens, or dots. + + This definition conforms to YANG 1.1 defined in RFC + 7950. An earlier version of this definition did exclude + all identifiers starting with any possible combination + of the lowercase or uppercase character sequence 'xml', + as required by YANG 1 defined in RFC 6020. If this type + is used in a YANG 1 context, then this restriction still + applies."; + reference + "RFC 7950: The YANG 1.1 Data Modeling Language + RFC 6020: YANG - A Data Modeling Language for the + Network Configuration Protocol (NETCONF)"; + } + } -- GitLab From fdf40968ff6779a119ae588ce9a1195505d5a2a5 Mon Sep 17 00:00:00 2001 From: sunse Date: Fri, 5 Jul 2024 13:06:18 +0000 Subject: [PATCH 005/587] Merge Rel19 contest from SA5 154 and 155 based on SA#104 Rel18 baseline --- OpenAPI/TS28312_IntentExpectations.yaml | 2 +- OpenAPI/TS28541_5GcNrm.yaml | 222 +++++++++++++-- OpenAPI/TS28541_NrNrm.yaml | 12 + OpenAPI/TS28623_ComDefs.yaml | 8 + OpenAPI/TS28623_FileManagementNrm.yaml | 19 ++ OpenAPI/TS28623_GenericNrm.yaml | 187 ++----------- .../TS28623_ManagementDataCollectionNrm.yaml | 9 + OpenAPI/TS28623_MnSRegistryNrm.yaml | 17 +- OpenAPI/TS28623_PmControlNrm.yaml | 13 + .../TS28623_QoEMeasurementCollectionNrm.yaml | 14 + OpenAPI/TS28623_SubscriptionControlNrm.yaml | 13 + OpenAPI/TS28623_ThresholdMonitorNrm.yaml | 13 + OpenAPI/TS28623_TraceControlNrm.yaml | 259 +++++++++--------- 13 files changed, 478 insertions(+), 310 deletions(-) diff --git a/OpenAPI/TS28312_IntentExpectations.yaml b/OpenAPI/TS28312_IntentExpectations.yaml index 82031387f..3938719ef 100644 --- a/OpenAPI/TS28312_IntentExpectations.yaml +++ b/OpenAPI/TS28312_IntentExpectations.yaml @@ -969,7 +969,7 @@ components: contextValueRange: type: array items: - $ref: "TS28623_GenericNrm.yaml#/components/schemas/NFType" + $ref: "TS28541_5GcNrm.yaml#/components/schemas/NFType" NfInstanceLocationContext: description: >- This data type is the "ObjectContext" data type with specialisations for NfInstanceLocationContext diff --git a/OpenAPI/TS28541_5GcNrm.yaml b/OpenAPI/TS28541_5GcNrm.yaml index 44dc93e1c..fceea8893 100755 --- a/OpenAPI/TS28541_5GcNrm.yaml +++ b/OpenAPI/TS28541_5GcNrm.yaml @@ -63,7 +63,7 @@ components: type: string description: uuid of NF instance nFType: - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/NFType' + $ref: '#/components/schemas/NFType' nFStatus: $ref: '#/components/schemas/NFStatus' plmn: @@ -105,7 +105,7 @@ components: allowedNfTypes: type: array items: - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/NFType' + $ref: '#/components/schemas/NFType' allowedNssais: type: array items: @@ -215,10 +215,14 @@ components: ManagedNFProfile: type: object properties: + hniList: + type: array + items: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/Fqdn' nfInstanceID: type: string nfType: - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/NFType' + $ref: '#/components/schemas/NFType' heartbeatTimer: type: integer authzInfo: @@ -240,7 +244,7 @@ components: allowedNfTypes: type: array items: - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/NFType' + $ref: '#/components/schemas/NFType' allowedNfDomains: type: array items: @@ -1043,7 +1047,7 @@ components: servingNfTypeList: type: array items: - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/NFType' + $ref: '#/components/schemas/NFType' minItems: 1 mlAnalyticsList: type: array @@ -1516,7 +1520,7 @@ components: servingNfTypeList: type: array items: - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/NFType' + $ref: '#/components/schemas/NFType' minItems: 1 servingNfSetIdList: type: array @@ -1538,7 +1542,7 @@ components: servingNfTypeList: type: array items: - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/NFType' + $ref: '#/components/schemas/NFType' servingNfSetIdList: type: array items: @@ -2918,7 +2922,109 @@ components: type: object properties: nfType: - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/NFType' + $ref: '#/components/schemas/NFType' + SAP: + type: object + properties: + host: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/HostAddr' + port: + type: integer + NFServiceType: + type: string + enum: + - NAMF_COMMUNICATION + - NAMF_EVENTEXPOSURE + - NAMF_MT + - NAMF_LOCATION + - NSMF_PDUSESSION + - NSMF_EVENTEXPOSURE + - OTHERS + Operation: + type: object + properties: + name: + type: string + allowedNFTypes: + $ref: '#/components/schemas/NFType' + operationSemantics: + $ref: '#/components/schemas/OperationSemantics' + NFType: + type: string + description: ' NF name defined in TS 23.501 or TS 29.510' + enum: + - NRF + - UDM + - AMF + - SMF + - AUSF + - NEF + - PCF + - SMSF + - NSSF + - UDR + - LMF + - GMLC + - 5G_EIR + - SEPP + - UPF + - N3IWF + - AF + - UDSF + - DN + - BSF + - CHF + - NWDAF + - PCSCF + - CBCF + - HSS + - UCMF + - SOR_AF + - SPAF + - MME + - SCSAS + - SCEF + - SCP + - NSSAAF + - ICSCF + - SCSCF + - DRA + - IMS_AS + - AANF + - 5G_DDNMF + - NSACF + - MFAF + - EASDF + - DCCF + - MB_SMF + - TSCTSF + - ADRF + - GBA_BSF + - CEF + - MB_UPF + - NSWOF + - PKMF + - MNPF + - SMS_GMSC + - SMS_IWMSC + - MBSF + - MBSTF + - PANF + - TNGF + - W_AGF + - TWIF + - TSN_AF + + OperationSemantics: + type: string + enum: + - REQUEST_RESPONSE + - SUBSCRIBE_NOTIFY + RegistrationState: + type: string + enum: + - REGISTERED + - DEREGISTERED #-------- Definition of types for name-containments ------ SubNetwork-ncO-5GcNrm: @@ -3054,7 +3160,9 @@ components: $ref: 'TS28541_NrNrm.yaml#/components/schemas/MappedCellIdInfoList' mdtUserConsentReqList: $ref: 'TS28541_NrNrm.yaml#/components/schemas/MdtUserConsentReqList' + - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' + - $ref: '#/components/schemas/ManagedFunction5GC-nc0' - type: object properties: EP_N2: @@ -3158,7 +3266,9 @@ components: commModelList: $ref: '#/components/schemas/CommModelList' SmfInfo: - $ref: '#/components/schemas/SmfInfo' + type: array + items: + $ref: '#/components/schemas/SmfInfo' configurable5QISetRef: $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' dynamic5QISetRef: @@ -3168,6 +3278,7 @@ components: items: $ref: '#/components/schemas/dnaiSatelliteMapping' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' + - $ref: '#/components/schemas/ManagedFunction5GC-nc0' - type: object properties: EP_N4: @@ -3222,8 +3333,11 @@ components: supportedBMOList: $ref: '#/components/schemas/SupportedBMOList' upfInfo: - $ref: '#/components/schemas/UpfInfo' + type: array + items: + $ref: '#/components/schemas/UpfInfo' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' + - $ref: '#/components/schemas/ManagedFunction5GC-nc0' - type: object properties: EP_N3: @@ -3251,6 +3365,7 @@ components: commModelList: $ref: '#/components/schemas/CommModelList' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' + - $ref: '#/components/schemas/ManagedFunction5GC-nc0' - type: object properties: EP_N3: @@ -3278,7 +3393,9 @@ components: supportedBMOList: $ref: '#/components/schemas/SupportedBMOList' PcfInfo: - $ref: '#/components/schemas/PcfInfo' + type: array + items: + $ref: '#/components/schemas/PcfInfo' configurable5QISetRef: $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' dynamic5QISetRef: @@ -3286,6 +3403,7 @@ components: predefinedPccRuleSetRefs: $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' + - $ref: '#/components/schemas/ManagedFunction5GC-nc0' - type: object properties: EP_N5: @@ -3324,6 +3442,7 @@ components: ausfInfo: $ref: '#/components/schemas/AusfInfo' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' + - $ref: '#/components/schemas/ManagedFunction5GC-nc0' - type: object properties: EP_N12: @@ -3355,6 +3474,7 @@ components: udmInfo: $ref: '#/components/schemas/UdmInfo' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' + - $ref: '#/components/schemas/ManagedFunction5GC-nc0' - type: object properties: EP_N8: @@ -3388,6 +3508,7 @@ components: udrInfo: $ref: '#/components/schemas/UdrInfo' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' + - $ref: '#/components/schemas/ManagedFunction5GC-nc0' UdsfFunction-Single: allOf: - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' @@ -3407,6 +3528,7 @@ components: udsfInfo: $ref: '#/components/schemas/UdsfInfo' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' + - $ref: '#/components/schemas/ManagedFunction5GC-nc0' NrfFunction-Single: allOf: - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' @@ -3428,6 +3550,7 @@ components: nrfInfo: $ref: '#/components/schemas/NrfInfo' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' + - $ref: '#/components/schemas/ManagedFunction5GC-nc0' - type: object properties: EP_N27: @@ -3457,6 +3580,7 @@ components: commModelList: $ref: '#/components/schemas/CommModelList' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' + - $ref: '#/components/schemas/ManagedFunction5GC-nc0' - type: object properties: EP_N22: @@ -3486,6 +3610,7 @@ components: smsfInfo: $ref: '#/components/schemas/SmsfInfo' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' + - $ref: '#/components/schemas/ManagedFunction5GC-nc0' - type: object properties: EP_N20: @@ -3519,6 +3644,7 @@ components: mappedCellIdInfoList: $ref: 'TS28541_NrNrm.yaml#/components/schemas/MappedCellIdInfoList' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' + - $ref: '#/components/schemas/ManagedFunction5GC-nc0' - type: object properties: EP_NLS: @@ -3544,6 +3670,7 @@ components: commModelList: $ref: '#/components/schemas/CommModelList' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' + - $ref: '#/components/schemas/ManagedFunction5GC-nc0' - type: object properties: EP_N17: @@ -3569,6 +3696,7 @@ components: seppInfo: $ref: '#/components/schemas/SeppInfo' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' + - $ref: '#/components/schemas/ManagedFunction5GC-nc0' - type: object properties: EP_N32: @@ -3614,7 +3742,7 @@ components: AnLFFunction: $ref: '#/components/schemas/AnLFFunction-Single' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' - + - $ref: '#/components/schemas/ManagedFunction5GC-nc0' ScpFunction-Single: allOf: - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' @@ -3632,6 +3760,7 @@ components: scpInfo: $ref: '#/components/schemas/ScpInfo' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' + - $ref: '#/components/schemas/ManagedFunction5GC-nc0' - type: object properties: EP_SM13: @@ -3659,6 +3788,7 @@ components: nefInfo: $ref: '#/components/schemas/NefInfo' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' + - $ref: '#/components/schemas/ManagedFunction5GC-nc0' - type: object properties: EP_N33: @@ -3691,6 +3821,7 @@ components: nsacfInfo: $ref: '#/components/schemas/NsacfInfo' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' + - $ref: '#/components/schemas/ManagedFunction5GC-nc0' - type: object properties: EP_N60: @@ -3715,6 +3846,7 @@ components: commModelList: $ref: '#/components/schemas/CommModelList' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' + - $ref: '#/components/schemas/ManagedFunction5GC-nc0' - type: object properties: EP_Npc4: @@ -3747,6 +3879,7 @@ components: easdfInfo: $ref: '#/components/schemas/EasdfInfo' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' + - $ref: '#/components/schemas/ManagedFunction5GC-nc0' - type: object properties: EP_N88: @@ -3802,6 +3935,7 @@ components: amfIdentifier: $ref: '#/components/schemas/AmfIdentifier' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' + - $ref: '#/components/schemas/ManagedFunction5GC-nc0' ExternalNrfFunction-Single: allOf: - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' @@ -3815,6 +3949,7 @@ components: plmnIdList: $ref: 'TS28541_NrNrm.yaml#/components/schemas/PlmnIdList' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' + - $ref: '#/components/schemas/ManagedFunction5GC-nc0' ExternalNssfFunction-Single: allOf: - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' @@ -3828,6 +3963,7 @@ components: plmnIdList: $ref: 'TS28541_NrNrm.yaml#/components/schemas/PlmnIdList' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' + - $ref: '#/components/schemas/ManagedFunction5GC-nc0' ExternalSeppFunction-Single: allOf: - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' @@ -3845,7 +3981,7 @@ components: fqdn: $ref: 'TS28623_ComDefs.yaml#/components/schemas/Fqdn' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' - + - $ref: '#/components/schemas/ManagedFunction5GC-nc0' EP_N2-Single: allOf: - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' @@ -4610,6 +4746,7 @@ components: trustAfInfo: $ref: '#/components/schemas/TrustAfInfo' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' + - $ref: '#/components/schemas/ManagedFunction5GC-nc0' - type: object properties: EP_N5: @@ -4644,6 +4781,7 @@ components: nssafInfo: $ref: '#/components/schemas/NssaafInfo' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' + - $ref: '#/components/schemas/ManagedFunction5GC-nc0' EP_N58-Single: allOf: - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' @@ -4695,6 +4833,7 @@ components: dccfInfo: $ref: '#/components/schemas/DccfInfo' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' + - $ref: '#/components/schemas/ManagedFunction5GC-nc0' MfafFunction-Single: allOf: @@ -4717,6 +4856,7 @@ components: mfafInfo: $ref: '#/components/schemas/MfafInfo' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' + - $ref: '#/components/schemas/ManagedFunction5GC-nc0' ChfFunction-Single: allOf: @@ -4739,6 +4879,7 @@ components: chfInfo: $ref: '#/components/schemas/ChfInfo' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' + - $ref: '#/components/schemas/ManagedFunction5GC-nc0' - type: object properties: EP_N28: @@ -4901,6 +5042,7 @@ components: gmlcInfo: $ref: '#/components/schemas/GmlcInfo' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' + - $ref: '#/components/schemas/ManagedFunction5GC-nc0' - type: object properties: EP_NL2: @@ -4934,6 +5076,7 @@ components: tsctsfInfo: $ref: '#/components/schemas/TsctsfInfo' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' + - $ref: '#/components/schemas/ManagedFunction5GC-nc0' - type: object properties: EP_N84: @@ -5055,8 +5198,11 @@ components: commModelList: $ref: '#/components/schemas/CommModelList' bsfInfo: - $ref: '#/components/schemas/BsfInfo' + type: array + items: + $ref: '#/components/schemas/BsfInfo' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' + - $ref: '#/components/schemas/ManagedFunction5GC-nc0' MbSmfFunction-Single: allOf: @@ -5077,6 +5223,7 @@ components: mbSmfInfo: $ref: '#/components/schemas/MbSmfInfo' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' + - $ref: '#/components/schemas/ManagedFunction5GC-nc0' - type: object properties: EP_N11mb: @@ -5150,6 +5297,7 @@ components: mbUpfInfo: $ref: '#/components/schemas/MbUpfInfo' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' + - $ref: '#/components/schemas/ManagedFunction5GC-nc0' - type: object properties: EP_N3mb: @@ -5180,6 +5328,7 @@ components: mnpfInfo: $ref: '#/components/schemas/MnpfInfo' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' + - $ref: '#/components/schemas/ManagedFunction5GC-nc0' - type: object properties: EP_SM12: @@ -5301,9 +5450,46 @@ components: $ref: 'TS28541_NrNrm.yaml#/components/schemas/LocalAddress' remoteAddress: $ref: 'TS28541_NrNrm.yaml#/components/schemas/RemoteAddress' +#-------- Definition of abstract IOCs -------------------------------------------- + ManagedFunction5GC-nc0: + type: object + properties: + ManagedNFService: + $ref: '#/components/schemas/ManagedNFService-Multiple' +#-------- Definition of abstract IOCs -------------------------------------------- -#-------- Definition of JSON arrays for name-contained IOCs ---------------------- +#-------- Definition of 5GC common IOCs -------------------------------------------- + ManagedNFService-Single: + allOf: + - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' + - type: object + properties: + attributes: + type: object + properties: + userLabel: + type: string + nFServiceType: + $ref: '#/components/schemas/NFServiceType' + sAP: + $ref: '#/components/schemas/SAP' + operations: + type: array + items: + $ref: '#/components/schemas/Operation' + administrativeState: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/AdministrativeState' + operationalState: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/OperationalState' + usageState: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/UsageState' + registrationState: + $ref: '#/components/schemas/RegistrationState' + +#-------- Definition of 5GC common IOCs -------------------------------------------- + +#-------- Definition of JSON arrays for name-contained IOCs ---------------------- AmfFunction-Multiple: type: array items: @@ -5741,7 +5927,10 @@ components: type: array items: $ref: '#/components/schemas/MnpfFunction-Single' - + ManagedNFService-Multiple: + type: array + items: + $ref: '#/components/schemas/ManagedNFService-Single' #------------ Definitions in TS 28.541 for TS 28.532 ----------------------------- resources-5gcNrm: @@ -5766,6 +5955,7 @@ components: - $ref: '#/components/schemas/NefFunction-Single' - $ref: '#/components/schemas/NsacfFunction-Single' - $ref: '#/components/schemas/DDNMFFunction-Single' + - $ref: '#/components/schemas/ManagedNFService-Single' - $ref: '#/components/schemas/ExternalAmfFunction-Single' - $ref: '#/components/schemas/ExternalNrfFunction-Single' diff --git a/OpenAPI/TS28541_NrNrm.yaml b/OpenAPI/TS28541_NrNrm.yaml index 62e23de93..f9b0c46ff 100755 --- a/OpenAPI/TS28541_NrNrm.yaml +++ b/OpenAPI/TS28541_NrNrm.yaml @@ -628,26 +628,32 @@ components: properties: positionX: type: integer + default: 0 minimum: 0 maximum: 604800 positionY: type: integer + default: 0 minimum: 0 maximum: 604800 positionZ: type: integer + default: 0 minimum: 0 maximum: 604800 velocityVX: type: integer + default: 0 minimum: -131072 maximum: 131071 velocityVY: type: integer + default: 0 minimum: -131072 maximum: 131071 velocityVZ: type: integer + default: 0 minimum: -131072 maximum: 131071 @@ -656,26 +662,32 @@ components: properties: semiMajorAxis: type: integer + default: 0 minimum: 0 maximum: 8589934591 eccentricity: type: integer + default: 0 minimum: -524288 maximum: 524287 periapsis: type: integer + default: 0 minimum: 0 maximum: 16777215 longitude: type: integer + default: 0 minimum: 0 maximum: 2097151 inclination: type: integer + default: 0 minimum: -524288 maximum: 524287 meanAnomaly: type: integer + default: 0 minimum: 0 maximum: 16777215 diff --git a/OpenAPI/TS28623_ComDefs.yaml b/OpenAPI/TS28623_ComDefs.yaml index f5985b380..773ad5b51 100755 --- a/OpenAPI/TS28623_ComDefs.yaml +++ b/OpenAPI/TS28623_ComDefs.yaml @@ -143,6 +143,9 @@ components: Fqdn: type: string + pattern: '^([0-9A-Za-z]([-0-9A-Za-z]{0,61}[0-9A-Za-z])?\.)+[A-Za-z]{2,63}\.?$' + minLength: 4 + maxLength: 253 Ipv4Addr: type: string pattern: '^(([0-9]|[1-9][0-9]|1[0-9][0-9]|2[0-4][0-9]|25[0-5])\.){3}([0-9]|[1-9][0-9]|1[0-9][0-9]|2[0-4][0-9]|25[0-5])$' @@ -192,6 +195,11 @@ components: - LOCKED - UNLOCKED default: LOCKED + BasicAdministrativeState: + type: string + enum: + - LOCKED + - UNLOCKED OperationalState: type: string enum: diff --git a/OpenAPI/TS28623_FileManagementNrm.yaml b/OpenAPI/TS28623_FileManagementNrm.yaml index a0b20fe33..bd3881d20 100644 --- a/OpenAPI/TS28623_FileManagementNrm.yaml +++ b/OpenAPI/TS28623_FileManagementNrm.yaml @@ -12,6 +12,25 @@ externalDocs: paths: {} components: schemas: + + #-------- Definition of types for name-containments ------ + SubNetwork-ncO-FileManagementNrm: + type: object + properties: + FileDownloadJob: + $ref: '#/components/schemas/FileDownloadJob-Multiple' + Files: + $ref: '#/components/schemas/Files-Multiple' + ManagedElement-ncO-FileManagementNrm: + type: object + properties: + FileDownloadJob: + $ref: '#/components/schemas/FileDownloadJob-Multiple' + Files: + $ref: '#/components/schemas/Files-Multiple' + #-------Definition of generic IOCs ----------# + + #-------- Definition of types----------------------------------------------------- FileDownloadJobProcessMonitor: description: >- diff --git a/OpenAPI/TS28623_GenericNrm.yaml b/OpenAPI/TS28623_GenericNrm.yaml index 695a96fa4..9db6fa936 100755 --- a/OpenAPI/TS28623_GenericNrm.yaml +++ b/OpenAPI/TS28623_GenericNrm.yaml @@ -15,11 +15,7 @@ components: #-------- Definition of types----------------------------------------------------- - RegistrationState: - type: string - enum: - - REGISTERED - - DEREGISTERED + VnfParameter: type: object properties: @@ -51,103 +47,7 @@ components: type: string powerInterface: type: string - Operation: - type: object - properties: - name: - type: string - allowedNFTypes: - $ref: '#/components/schemas/NFType' - operationSemantics: - $ref: '#/components/schemas/OperationSemantics' - NFType: - type: string - description: ' NF name defined in TS 23.501 or TS 29.510' - enum: - - NRF - - UDM - - AMF - - SMF - - AUSF - - NEF - - PCF - - SMSF - - NSSF - - UDR - - LMF - - GMLC - - 5G_EIR - - SEPP - - UPF - - N3IWF - - AF - - UDSF - - DN - - BSF - - CHF - - NWDAF - - PCSCF - - CBCF - - HSS - - UCMF - - SOR_AF - - SPAF - - MME - - SCSAS - - SCEF - - SCP - - NSSAAF - - ICSCF - - SCSCF - - DRA - - IMS_AS - - AANF - - 5G_DDNMF - - NSACF - - MFAF - - EASDF - - DCCF - - MB_SMF - - TSCTSF - - ADRF - - GBA_BSF - - CEF - - MB_UPF - - NSWOF - - PKMF - - MNPF - - SMS_GMSC - - SMS_IWMSC - - MBSF - - MBSTF - - PANF - - TNGF - - W_AGF - - TWIF - - TSN_AF - OperationSemantics: - type: string - enum: - - REQUEST_RESPONSE - - SUBSCRIBE_NOTIFY - SAP: - type: object - properties: - host: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/HostAddr' - port: - type: integer - NFServiceType: - type: string - enum: - - Namf_Communication - - Namf_EventExposure - - Namf_MT - - Namf_Location - - Nsmf_PDUSession - - Nsmf_EventExposure - - Others TransportProtocol: anyOf: - type: string @@ -453,60 +353,30 @@ components: $ref: '#/components/schemas/MnsAgent-Multiple' MeContext: $ref: '#/components/schemas/MeContext-Multiple' - PerfMetricJob: - $ref: 'TS28623_PmControlNrm.yaml#/components/schemas/PerfMetricJob-Multiple' - ThresholdMonitor: - $ref: 'TS28623_ThresholdMonitorNrm.yaml#/components/schemas/ThresholdMonitor-Multiple' - TraceJob: - $ref: 'TS28623_TraceControlNrm.yaml#/components/schemas/TraceJob-Multiple' - ManagementDataCollection: - $ref: 'TS28623_ManagementDataCollectionNrm.yaml#/components/schemas/ManagementDataCollection-Multiple' - NtfSubscriptionControl: - $ref: 'TS28623_SubscriptionControlNrm.yaml#/components/schemas/NtfSubscriptionControl-Multiple' AlarmList: $ref: 'TS28111_FaultNrm.yaml#/components/schemas/AlarmList-Single' - FileDownloadJob: - $ref: 'TS28623_FileManagementNrm.yaml#/components/schemas/FileDownloadJob-Multiple' - Files: - $ref: 'TS28623_FileManagementNrm.yaml#/components/schemas/Files-Multiple' - MnsRegistry: - $ref: 'TS28623_MnSRegistryNrm.yaml#/components/schemas/MnsRegistry-Single' Scheduler: $ref: '#/components/schemas/Scheduler-Multiple' ConditionMonitor: $ref: '#/components/schemas/ConditionMonitor-Multiple' SupportedNotifications: $ref: '#/components/schemas/SupportedNotifications-Single' - QMCJobs: - $ref: 'TS28623_QoEMeasurementCollectionNrm.yaml#/components/schemas/QMCJob-Multiple' + ManagedElement-ncO: type: object properties: MnsAgent: $ref: '#/components/schemas/MnsAgent-Multiple' - PerfMetricJob: - $ref: 'TS28623_PmControlNrm.yaml#/components/schemas/PerfMetricJob-Multiple' - ThresholdMonitor: - $ref: 'TS28623_ThresholdMonitorNrm.yaml#/components/schemas/ThresholdMonitor-Multiple' - TraceJob: - $ref: 'TS28623_TraceControlNrm.yaml#/components/schemas/TraceJob-Multiple' - NtfSubscriptionControl: - $ref: 'TS28623_SubscriptionControlNrm.yaml#/components/schemas/NtfSubscriptionControl-Multiple' AlarmList: $ref: 'TS28111_FaultNrm.yaml#/components/schemas/AlarmList-Single' - FileDownloadJob: - $ref: 'TS28623_FileManagementNrm.yaml#/components/schemas/FileDownloadJob-Multiple' - Files: - $ref: 'TS28623_FileManagementNrm.yaml#/components/schemas/Files-Multiple' Scheduler: $ref: '#/components/schemas/Scheduler-Multiple' ConditionMonitor: $ref: '#/components/schemas/ConditionMonitor-Multiple' SupportedNotifications: $ref: '#/components/schemas/SupportedNotifications-Single' - QMCJobs: - $ref: 'TS28623_QoEMeasurementCollectionNrm.yaml#/components/schemas/QMCJob-Multiple' + #-------- Definition of abstract IOCs -------------------------------------------- @@ -552,8 +422,6 @@ components: $ref: 'TS28623_PmControlNrm.yaml#/components/schemas/PerfMetricJob-Multiple' ThresholdMonitor: $ref: 'TS28623_ThresholdMonitorNrm.yaml#/components/schemas/ThresholdMonitor-Multiple' - ManagedNFService: - $ref: '#/components/schemas/ManagedNFService-Multiple' TraceJob: $ref: 'TS28623_TraceControlNrm.yaml#/components/schemas/TraceJob-Multiple' @@ -575,32 +443,7 @@ components: nullable: true VsDataContainer: $ref: '#/components/schemas/VsDataContainer-Multiple' - ManagedNFService-Single: - allOf: - - $ref: '#/components/schemas/Top' - - type: object - properties: - attributes: - type: object - properties: - userLabel: - type: string - nFServiceType: - $ref: '#/components/schemas/NFServiceType' - sAP: - $ref: '#/components/schemas/SAP' - operations: - type: array - items: - $ref: '#/components/schemas/Operation' - administrativeState: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/AdministrativeState' - operationalState: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/OperationalState' - usageState: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/UsageState' - registrationState: - $ref: '#/components/schemas/RegistrationState' + ManagementNode-Single: allOf: - $ref: '#/components/schemas/Top' @@ -698,6 +541,16 @@ components: - $ref: '#/components/schemas/Top' - $ref: '#/components/schemas/SubNetwork-Attr' - $ref: '#/components/schemas/SubNetwork-ncO' + - $ref: '#/components/schemas/SubNetwork-Multiple' + - $ref: '#/components/schemas/ManagedElement-Multiple' + - $ref: 'TS28623_FileManagementNrm.yaml#/components/schemas/SubNetwork-ncO-FileManagementNrm' + - $ref: 'TS28623_PmControlNrm.yaml#/components/schemas/SubNetwork-ncO-PmControlNrm' + - $ref: 'TS28623_SubscriptionControlNrm.yaml#/components/schemas/SubNetwork-ncO-SubscriptionControlNrm' + - $ref: 'TS28623_ThresholdMonitorNrm.yaml#/components/schemas/SubNetwork-ncO-ThresholdMonitorNrm' + - $ref: 'TS28623_TraceControlNrm.yaml#/components/schemas/SubNetwork-ncO-TraceControlNrm' + - $ref: 'TS28623_QoEMeasurementCollectionNrm.yaml#/components/schemas/SubNetwork-ncO-QoEMeasurementCollectionNrm' + - $ref: 'TS28623_ManagementDataCollectionNrm.yaml#/components/schemas/SubNetwork-ncO-ManagementDataCollectionNrm' + - $ref: 'TS28623_MnSRegistryNrm.yaml#/components/schemas/SubNetwork-ncO-MnSRegistryNrm' - $ref: 'TS28104_MdaNrm.yaml#/components/schemas/SubNetwork-ncO-MdaNrm' - $ref: 'TS28105_AiMlNrm.yaml#/components/schemas/SubNetwork-ncO-AiMlNrm' - $ref: 'TS28312_IntentNrm.yaml#/components/schemas/SubNetwork-ncO-IntentNrm' @@ -708,12 +561,19 @@ components: - $ref: 'TS28541_NrNrm.yaml#/components/schemas/SubNetwork-ncO-NrNrm' - $ref: 'TS28541_5GcNrm.yaml#/components/schemas/SubNetwork-ncO-5GcNrm' - $ref: 'TS28318_DsoNrm.yaml#/components/schemas/SubNetwork-ncO-DsoNrm' + ManagedElement-Single: allOf: - $ref: '#/components/schemas/Top' - $ref: '#/components/schemas/ManagedElement-Attr' - $ref: '#/components/schemas/ManagedElement-ncO' + - $ref: 'TS28623_FileManagementNrm.yaml#/components/schemas/ManagedElement-ncO-FileManagementNrm' + - $ref: 'TS28623_PmControlNrm.yaml#/components/schemas/ManagedElement-PmControlNrm' + - $ref: 'TS28623_SubscriptionControlNrm.yaml#/components/schemas/ManagedElement-ncO-SubscriptionControlNrm' + - $ref: 'TS28623_ThresholdMonitorNrm.yaml#/components/schemas/ManagedElement-ncO-ThresholdMonitorNrm' + - $ref: 'TS28623_TraceControlNrm.yaml#/components/schemas/SubNetwork-ncO-TraceControlNrm' + - $ref: 'TS28623_QoEMeasurementCollectionNrm.yaml#/components/schemas/ManagedElement-ncO-QoEMeasurementCollectionNrm' - $ref: 'TS28104_MdaNrm.yaml#/components/schemas/ManagedElement-ncO-MdaNrm' - $ref: 'TS28105_AiMlNrm.yaml#/components/schemas/ManagedElement-ncO-AiMlNrm' - $ref: 'TS28536_CoslaNrm.yaml#/components/schemas/ManagedElement-ncO-CoslaNrm' @@ -737,10 +597,6 @@ components: type: array items: $ref: '#/components/schemas/VsDataContainer-Single' - ManagedNFService-Multiple: - type: array - items: - $ref: '#/components/schemas/ManagedNFService-Single' ManagementNode-Multiple: type: array items: @@ -780,7 +636,6 @@ components: - $ref: '#/components/schemas/ManagementNode-Single' - $ref: '#/components/schemas/MnsAgent-Single' - $ref: '#/components/schemas/MeContext-Single' - - $ref: '#/components/schemas/ManagedNFService-Single' - $ref: '#/components/schemas/Scheduler-Single' - $ref: '#/components/schemas/ConditionMonitor-Single' - $ref: '#/components/schemas/SupportedNotifications-Single' diff --git a/OpenAPI/TS28623_ManagementDataCollectionNrm.yaml b/OpenAPI/TS28623_ManagementDataCollectionNrm.yaml index 185272364..63710ca79 100644 --- a/OpenAPI/TS28623_ManagementDataCollectionNrm.yaml +++ b/OpenAPI/TS28623_ManagementDataCollectionNrm.yaml @@ -12,6 +12,15 @@ externalDocs: paths: {} components: schemas: + #-------- Definition of types for name-containments ------ + SubNetwork-ncO-ManagementDataCollectionNrm: + type: object + properties: + ManagementDataCollection: + $ref: '#/components/schemas/ManagementDataCollection-Multiple' + + #-------Definition of generic IOCs ----------# + #-------- Definition of types----------------------------------------------------- ManagementData: diff --git a/OpenAPI/TS28623_MnSRegistryNrm.yaml b/OpenAPI/TS28623_MnSRegistryNrm.yaml index a5a022a43..bb5d1a1a8 100644 --- a/OpenAPI/TS28623_MnSRegistryNrm.yaml +++ b/OpenAPI/TS28623_MnSRegistryNrm.yaml @@ -12,6 +12,15 @@ externalDocs: paths: {} components: schemas: + #-------- Definition of types for name-containments ------ + SubNetwork-ncO-MnSRegistryNrm: + type: object + properties: + MnsRegistry: + $ref: '#/components/schemas/MnsRegistry-Single' + + #-------Definition of generic IOCs ----------# + #-------- Definition of types----------------------------------------------------- #-------- Definition of concrete IOCs -------------------------------------------- @@ -33,10 +42,10 @@ components: mnsType: type: string enum: - - ProvMnS - - FaultSupervisionMnS - - StreamingDataReportingMnS - - FileDataReportingMnS + - PROV_MNS + - FAULT_SUPERVISION_MNS + - STREAMING_DATA_REPORTING_MNS + - FILE_DATA_REPORTING_MNS mnsVersion: type: string mnsAddress: diff --git a/OpenAPI/TS28623_PmControlNrm.yaml b/OpenAPI/TS28623_PmControlNrm.yaml index 23581d777..6db2ed41e 100644 --- a/OpenAPI/TS28623_PmControlNrm.yaml +++ b/OpenAPI/TS28623_PmControlNrm.yaml @@ -12,6 +12,19 @@ externalDocs: paths: {} components: schemas: + #-------- Definition of types for name-containments ------ + SubNetwork-ncO-PmControlNrm: + type: object + properties: + PerfMetricJob: + $ref: '#/components/schemas/PerfMetricJob-Multiple' + ManagedElement-PmControlNrm: + type: object + properties: + PerfMetricJob: + $ref: '#/components/schemas/PerfMetricJob-Multiple' + #-------Definition of generic IOCs ----------# + #-------- Definition of types----------------------------------------------------- diff --git a/OpenAPI/TS28623_QoEMeasurementCollectionNrm.yaml b/OpenAPI/TS28623_QoEMeasurementCollectionNrm.yaml index 0ec934f55..82c7939c3 100644 --- a/OpenAPI/TS28623_QoEMeasurementCollectionNrm.yaml +++ b/OpenAPI/TS28623_QoEMeasurementCollectionNrm.yaml @@ -12,6 +12,20 @@ externalDocs: paths: {} components: schemas: + #-------- Definition of types for name-containments ------ + SubNetwork-ncO-QoEMeasurementCollectionNrm: + type: object + properties: + QMCJobs: + $ref: '#/components/schemas/QMCJob-Multiple' + ManagedElement-ncO-QoEMeasurementCollectionNrm: + type: object + properties: + QMCJobs: + $ref: '#/components/schemas/QMCJob-Multiple' + #-------Definition of generic IOCs ----------# + + #-------- Definition of types----------------------------------------------------- #-------- Definition of concrete IOCs -------------------------------------------- diff --git a/OpenAPI/TS28623_SubscriptionControlNrm.yaml b/OpenAPI/TS28623_SubscriptionControlNrm.yaml index 5d4932626..4c283391b 100644 --- a/OpenAPI/TS28623_SubscriptionControlNrm.yaml +++ b/OpenAPI/TS28623_SubscriptionControlNrm.yaml @@ -12,6 +12,19 @@ externalDocs: paths: {} components: schemas: + #-------- Definition of types for name-containments ------ + SubNetwork-ncO-SubscriptionControlNrm: + type: object + properties: + NtfSubscriptionControl: + $ref: '#/components/schemas/NtfSubscriptionControl-Multiple' + ManagedElement-ncO-SubscriptionControlNrm: + type: object + properties: + NtfSubscriptionControl: + $ref: '#/components/schemas/NtfSubscriptionControl-Multiple' + #-------Definition of generic IOCs ----------# + #-------- Definition of types----------------------------------------------------- Scope: type: object diff --git a/OpenAPI/TS28623_ThresholdMonitorNrm.yaml b/OpenAPI/TS28623_ThresholdMonitorNrm.yaml index d4fd1aac1..711ce416c 100644 --- a/OpenAPI/TS28623_ThresholdMonitorNrm.yaml +++ b/OpenAPI/TS28623_ThresholdMonitorNrm.yaml @@ -12,6 +12,19 @@ externalDocs: paths: {} components: schemas: + #-------- Definition of types for name-containments ------ + SubNetwork-ncO-ThresholdMonitorNrm: + type: object + properties: + ThresholdMonitor: + $ref: '#/components/schemas/ThresholdMonitor-Multiple' + ManagedElement-ncO-ThresholdMonitorNrm: + type: object + properties: + ThresholdMonitor: + $ref: '#/components/schemas/ThresholdMonitor-Multiple' + #-------Definition of generic IOCs ----------# + #-------- Definition of types----------------------------------------------------- ThresholdInfo: type: object diff --git a/OpenAPI/TS28623_TraceControlNrm.yaml b/OpenAPI/TS28623_TraceControlNrm.yaml index 0d09284e0..481035422 100644 --- a/OpenAPI/TS28623_TraceControlNrm.yaml +++ b/OpenAPI/TS28623_TraceControlNrm.yaml @@ -12,6 +12,19 @@ externalDocs: paths: {} components: schemas: + #-------- Definition of types for name-containments ------ + SubNetwork-ncO-TraceControlNrm: + type: object + properties: + TraceJob: + $ref: '#/components/schemas/TraceJob-Multiple' + ManagedElement-ncO-TraceControlNrm: + type: object + properties: + TraceJob: + $ref: '#/components/schemas/TraceJob-Multiple' + #-------Definition of generic IOCs ----------# + #-------- Definition of types used in Trace control NRM fragment------------------ jobType-Type: @@ -40,8 +53,8 @@ components: type: string enum: - A - - Iu-CS - - Mc + - IU-CS + - MC - MAP-G - MAP-B - MAP-E @@ -54,33 +67,33 @@ components: items: type: string enum: - - Mc - - Nb-UP - - Iu-UP + - MC + - NB-UP + - IU-UP RNCInterfaces: type: array items: type: string enum: - - Iu-CS - - Iu-PS - - Iur - - Iub - - Uu + - IU-CS + - IU-PS + - IUR + - IUB + - UU SGSNInterfaces: type: array items: type: string enum: - - Gb - - Iu-PS - - Gn - - MAP-Gr - - MAP-Gd - - MAP-Gf - - Ge - - Gs - - S6d + - GB + - IU-PS + - GN + - MAP-GR + - MAP-GD + - MAP-GF + - GE + - GS + - S6D - S4 - S3 - S13 @@ -89,34 +102,34 @@ components: items: type: string enum: - - Gn - - Gi - - Gmb + - GN + - GI + - GMB S-CSCFInterfaces: type: array items: type: string enum: - - Mw - - Mg - - Mr - - Mi + - MW + - MG + - MR + - MI P-CSCFInterfaces: type: array items: type: string enum: - - Gm - - Mw + - GM + - MW I-CSCFInterfaces: type: array items: type: string enum: - - Cx - - Dx - - Mg - - Mw + - CX + - DX + - MG + - MW MRFCInterfaces: type: array items: @@ -129,42 +142,42 @@ components: items: type: string enum: - - Mg - - Mj - - Mn + - MG + - MJ + - MN IBCFInterfaces: type: array items: type: string enum: - - Ix - - Mx + - IX + - MX E-CSCFInterfaces: type: array items: type: string enum: - - Mw - - Ml - - Mm - - Mi/Mg + - MW + - ML + - MM + - MI/MG BGCFInterfaces: type: array items: type: string enum: - - Mi - - Mj - - Mk + - MI + - MJ + - MK ASInterfaces: type: array items: type: string enum: - - Dh - - Sh + - DH + - SH - ISC - - Ut + - UT HSSInterfaces: type: array items: @@ -172,12 +185,12 @@ components: enum: - MAP-C - MAP-D - - Gc - - Gr - - Cx - - S6d - - S6a - - Sh + - GC + - GR + - CX + - S6D + - S6A + - SH - N70 - N71 - NU1 @@ -188,13 +201,13 @@ components: enum: - MAP-F - S13 - - MAP-Gf + - MAP-GF BM-SCInterfaces: type: array items: type: string enum: - - Gmb + - GMB MMEInterfaces: type: array items: @@ -202,7 +215,7 @@ components: enum: - S1-MME - S3 - - S6a + - S6A - S10 - S11 - S13 @@ -215,20 +228,20 @@ components: - S5 - S8 - S11 - - Gxc + - GXC PDN_GWInterfaces: type: array items: type: string enum: - - S2a - - S2b - - S2c + - S2A + - S2B + - S2C - S5 - - S6b - - Gx + - S6B + - GX - S8 - - SGi + - SGI eNBInterfaces: type: array items: @@ -243,7 +256,7 @@ components: enum: - S1-MME - X2 - - Uu + - UU - F1-C - E1 AMFInterfaces: @@ -336,16 +349,16 @@ components: type: string enum: - NG-C - - Xn-C - - Uu + - XN-C + - UU gNB-CU-CPInterfaces: type: array items: type: string enum: - NG-C - - Xn-C - - Uu + - XN-C + - UU - F1-C - E1 - X2-C @@ -459,9 +472,9 @@ components: - UTRAN_CELL - E-UTRAN_CELL - NG-RAN_CELL - - eNB + - ENB - RNC - - gNB + - GNB - SUPI TargetIdValue: type: string @@ -480,7 +493,7 @@ components: enum: - MO_MT_CALLS - MO_MT_SMS - - LU_IMSIattach_IMSIdetach + - LU_IMSIATTACH_IMSIDETACH - HANDOVER - SS SGSN: @@ -488,10 +501,10 @@ components: items: type: string enum: - - PDPcontext + - PDPCONTEXT - MO_MT_SMS - - RAU_GPRSattach_GPRSdetach - - MBMScontext + - RAU_GPRSATTACH_GPRSDETACH + - MBMSCONTEXT MGW: type: array items: @@ -503,129 +516,129 @@ components: items: type: string enum: - - PDPcontext - - MBMScontext + - PDPCONTEXT + - MBMSCONTEXT IMS: type: array items: type: string enum: - - SIPsession_StandaloneTransaction + - SIPSESSION_STANDALONETRANSACTION BM_SC: type: array items: type: string enum: - - MBMSactivation + - MBMSACTIVATION MME: type: array items: type: string enum: - - UEinitiatedPDNconnectivityRequest - - ServiceRequest - - InitialAttach_TAU_Detach - - UEinitiatedPDNdisconnection - - BearerActivationModificationDeletion - - Handover + - UE_INITIATEDPDN_CONNECTIVITY_REQUEST + - SERVICE_REQUEST + - INITIALATTACH_TAU_DETACH + - UE_INITIATEDPDN_DISCONNECTION + - BEAR_ACTIVIATION_MODIFICATION_DELETION + - HANDOVER SGW: type: array items: type: string enum: - - PDNconnectionCreation - - PDNconnectionTermination - - BearerActivationModificationDeletion + - PDN_CONNECTION_CREATION + - PDN_CONNECTION_TERMINATION + - BEAR_ACTIVATION_MODIFICATION_DELETION PGW: type: array items: type: string enum: - - PDNconnectionCreation - - PDNconnectionTermination - - BearerActivationModificationDeletion + - PDN_CONNECTION_CREATION + - PDN_CONNECTION_TERMINATION + - BEAR_ACTIVATION_MODIFICATION_DELETION AMF: type: array items: type: string enum: - - Registration - - ServiceRequest - - Handover - - UEderegistration - - NetworkDeregistration - - UEMobilityFromEPC - - UEMobilityToEPC + - REGISTRATION + - SERVICE_REQUEST + - HANDOVER + - UE_DEREGISTRATION + - NETWORK_DEREGISTRATION + - UE_MOBILITY_FROM_EPC + - UE_MOBILITY_TO_EPC SMF: type: array items: type: string enum: - - PDUsessionEstablishment - - PDUsessionModification - - PDUsessionRelease - - PDUsessionUPactivationDeactivation - - MobilityBtw3gppAndN3gppTo5GC - - MobilityFromEpc + - PDU_SESSION_ESTABLISHMENT + - PDU_SESSION_MODIFICATION + - PDU_SESSIOON_RELEASE + - PDU_SESSION_UP_ACTIVATION_DEACTIVATION + - MOBILITY_BTW_3GPP_AND_N3GPP_TO_5GC + - MOBILITY_FROM_EPC PCF: type: array items: type: string enum: - - AMpolicy - - SMpolicy - - Authorization - - BDTpolicy + - AM_POLICY + - SM_POLICY + - AUTHORIZATION + - BDT_POLICY UPF: type: array items: type: string enum: - - N4Session + - N4SESSION AUSF: type: array items: type: string enum: - - UEauthentication + - UE_AUTHENTICATION NEF: type: array items: type: string enum: - - EventExposure - - PFDmanagement - - ParameterProvision - - Trigger + - EVENT_EXPOSURE + - PFD_MANAGEMENT + - PARAMETER_PROVISION + - TRIGGER NRF: type: array items: type: string enum: - - NFmanagement - - NFdiscovery + - NF_MANAGEMEENT + - NF_DISCOVERY NSSF: type: array items: type: string enum: - - NSSelection + - NS_SELECTION - NSSAI SMSF: type: array items: type: string enum: - - SMservice + - SMSERVICE UDM: type: array items: type: string enum: - - UEcontext - - SubscriberData - - UEauthentication - - EventExposure + - UE_CONTEXT + - SUBSCRIBER_DATA + - UE_AUTHENTICATION + - EVENT_EXPOSURE anonymizationOfMdtData-Type: description: Specifies level of MDT anonymization. For additional details see 3GPP TS 32.422 clause 5.10.12. @@ -943,9 +956,9 @@ components: description: See details in 3GPP TS 32.422 clause 5.10.15. type: string enum: - - CPICH_EcNo + - CPICH_ECNO - CPICH_RSCP - - PathLoss + - PATHLOSS eventThresholdUphUmts-Type: description: See details in 3GPP TS 32.422 clause 5.10.A. -- GitLab From a140fee6a581109d65fb5a0d0377599074ccc097 Mon Sep 17 00:00:00 2001 From: sunse Date: Fri, 5 Jul 2024 13:32:06 +0000 Subject: [PATCH 006/587] update versions --- OpenAPI/TS28541_5GcNrm.yaml | 2 +- OpenAPI/TS28541_NrNrm.yaml | 2 +- OpenAPI/TS28623_ComDefs.yaml | 2 +- OpenAPI/TS28623_FileManagementNrm.yaml | 2 +- OpenAPI/TS28623_GenericNrm.yaml | 2 +- OpenAPI/TS28623_ManagementDataCollectionNrm.yaml | 2 +- OpenAPI/TS28623_MnSRegistryNrm.yaml | 2 +- OpenAPI/TS28623_PmControlNrm.yaml | 2 +- OpenAPI/TS28623_QoEMeasurementCollectionNrm.yaml | 2 +- OpenAPI/TS28623_SubscriptionControlNrm.yaml | 2 +- OpenAPI/TS28623_ThresholdMonitorNrm.yaml | 2 +- OpenAPI/TS28623_TraceControlNrm.yaml | 2 +- 12 files changed, 12 insertions(+), 12 deletions(-) diff --git a/OpenAPI/TS28541_5GcNrm.yaml b/OpenAPI/TS28541_5GcNrm.yaml index fceea8893..b42e3c7f0 100755 --- a/OpenAPI/TS28541_5GcNrm.yaml +++ b/OpenAPI/TS28541_5GcNrm.yaml @@ -1,7 +1,7 @@ openapi: 3.0.1 info: title: 3GPP 5GC NRM - version: 18.8.0 + version: 19.0.0 description: >- OAS 3.0.1 specification of the 5GC NRM © 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). diff --git a/OpenAPI/TS28541_NrNrm.yaml b/OpenAPI/TS28541_NrNrm.yaml index f9b0c46ff..8012e4b33 100755 --- a/OpenAPI/TS28541_NrNrm.yaml +++ b/OpenAPI/TS28541_NrNrm.yaml @@ -1,7 +1,7 @@ openapi: 3.0.1 info: title: NR NRM - version: 18.8.0 + version: 19.0.0 description: >- OAS 3.0.1 specification of the NR NRM © 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). diff --git a/OpenAPI/TS28623_ComDefs.yaml b/OpenAPI/TS28623_ComDefs.yaml index 773ad5b51..50ad665b5 100755 --- a/OpenAPI/TS28623_ComDefs.yaml +++ b/OpenAPI/TS28623_ComDefs.yaml @@ -1,7 +1,7 @@ openapi: 3.0.1 info: title: Common Type Definitions - version: 18.7.0 + version: 19.0.0 description: >- OAS 3.0.1 specification of common type definitions in the Generic NRM © 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). diff --git a/OpenAPI/TS28623_FileManagementNrm.yaml b/OpenAPI/TS28623_FileManagementNrm.yaml index bd3881d20..9a2a45f33 100644 --- a/OpenAPI/TS28623_FileManagementNrm.yaml +++ b/OpenAPI/TS28623_FileManagementNrm.yaml @@ -1,7 +1,7 @@ openapi: 3.0.1 info: title: File Management NRM - version: 18.7.0 + version: 19.0.0 description: >- OAS 3.0.1 definition of the File Management NRM fragment © 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). diff --git a/OpenAPI/TS28623_GenericNrm.yaml b/OpenAPI/TS28623_GenericNrm.yaml index 9db6fa936..389d35d52 100755 --- a/OpenAPI/TS28623_GenericNrm.yaml +++ b/OpenAPI/TS28623_GenericNrm.yaml @@ -1,7 +1,7 @@ openapi: 3.0.1 info: title: Generic NRM - version: 18.7.0 + version: 19.0.0 description: >- OAS 3.0.1 definition of the Generic NRM © 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). diff --git a/OpenAPI/TS28623_ManagementDataCollectionNrm.yaml b/OpenAPI/TS28623_ManagementDataCollectionNrm.yaml index 63710ca79..9424693be 100644 --- a/OpenAPI/TS28623_ManagementDataCollectionNrm.yaml +++ b/OpenAPI/TS28623_ManagementDataCollectionNrm.yaml @@ -1,7 +1,7 @@ openapi: 3.0.1 info: title: Management Data Collection NRM - version: 18.6.0 + version: 19.0.0 description: >- OAS 3.0.1 definition of the Management Data Collection NRM fragment © 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). diff --git a/OpenAPI/TS28623_MnSRegistryNrm.yaml b/OpenAPI/TS28623_MnSRegistryNrm.yaml index bb5d1a1a8..cdfac7e17 100644 --- a/OpenAPI/TS28623_MnSRegistryNrm.yaml +++ b/OpenAPI/TS28623_MnSRegistryNrm.yaml @@ -1,7 +1,7 @@ openapi: 3.0.1 info: title: MnS Registry NRM - version: 18.6.0 + version: 19.0.0 description: >- OAS 3.0.1 definition of the MnS Registry NRM fragment © 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). diff --git a/OpenAPI/TS28623_PmControlNrm.yaml b/OpenAPI/TS28623_PmControlNrm.yaml index 6db2ed41e..720842e2d 100644 --- a/OpenAPI/TS28623_PmControlNrm.yaml +++ b/OpenAPI/TS28623_PmControlNrm.yaml @@ -1,7 +1,7 @@ openapi: 3.0.1 info: title: PM control NRM - version: 18.6.0 + version: 19.0.0 description: >- OAS 3.0.1 definition of the PM control NRM fragment © 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). diff --git a/OpenAPI/TS28623_QoEMeasurementCollectionNrm.yaml b/OpenAPI/TS28623_QoEMeasurementCollectionNrm.yaml index 82c7939c3..2869d78e7 100644 --- a/OpenAPI/TS28623_QoEMeasurementCollectionNrm.yaml +++ b/OpenAPI/TS28623_QoEMeasurementCollectionNrm.yaml @@ -1,7 +1,7 @@ openapi: 3.0.1 info: title: QoE Measurement Collection NRM - version: 18.7.0 + version: 19.0.0 description: >- OAS 3.0.1 definition of the QoE Measurement Collection NRM © 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). diff --git a/OpenAPI/TS28623_SubscriptionControlNrm.yaml b/OpenAPI/TS28623_SubscriptionControlNrm.yaml index 4c283391b..c91ffec53 100644 --- a/OpenAPI/TS28623_SubscriptionControlNrm.yaml +++ b/OpenAPI/TS28623_SubscriptionControlNrm.yaml @@ -1,7 +1,7 @@ openapi: 3.0.1 info: title: Subscription Control NRM - version: 18.7.0 + version: 19.0.0 description: >- OAS 3.0.1 definition of the Subscription Control NRM fragment © 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). diff --git a/OpenAPI/TS28623_ThresholdMonitorNrm.yaml b/OpenAPI/TS28623_ThresholdMonitorNrm.yaml index 711ce416c..84e95a94a 100644 --- a/OpenAPI/TS28623_ThresholdMonitorNrm.yaml +++ b/OpenAPI/TS28623_ThresholdMonitorNrm.yaml @@ -1,7 +1,7 @@ openapi: 3.0.1 info: title: Threshold Monitor NRM - version: 18.2.0 + version: 19.0.0 description: >- OAS 3.0.1 definition of the Threshold Monitor NRM fragment © 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). diff --git a/OpenAPI/TS28623_TraceControlNrm.yaml b/OpenAPI/TS28623_TraceControlNrm.yaml index 481035422..8274aceb6 100644 --- a/OpenAPI/TS28623_TraceControlNrm.yaml +++ b/OpenAPI/TS28623_TraceControlNrm.yaml @@ -1,7 +1,7 @@ openapi: 3.0.1 info: title: Trace Control NRM - version: 18.7.0 + version: 19.0.0 description: >- OAS 3.0.1 definition of the Trace Control NRM fragment © 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). -- GitLab From 7096611701f9ae87039d197599b79b78c24e2013 Mon Sep 17 00:00:00 2001 From: scottma Date: Thu, 18 Apr 2024 05:30:54 +0000 Subject: [PATCH 007/587] Update file _3gpp-common-trace.yang --- yang-models/_3gpp-common-trace.yang | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/yang-models/_3gpp-common-trace.yang b/yang-models/_3gpp-common-trace.yang index af5327945..276cdf0e4 100755 --- a/yang-models/_3gpp-common-trace.yang +++ b/yang-models/_3gpp-common-trace.yang @@ -1600,6 +1600,7 @@ module _3gpp-common-trace { when '../jobType = "TRACE_ONLY"' + ' or ../jobType = "IMMEDIATE_MDT_AND_TRACE"'; type string; +<<<<<<< HEAD description "Specifies the metrics to be reported."; reference "Clause 10 of 3GPP TS 32.422"; } @@ -1614,6 +1615,12 @@ module _3gpp-common-trace { values."; } +======= + description "Specifies the messages to be reported."; + reference "Clause 10 of 3GPP TS 32.422"; + } + +>>>>>>> d8efed85 (Update file _3gpp-common-trace.yang) leaf traceReportingConsumerUri { when '../traceReportingFormat = "STREAMING"'; type inet:uri; -- GitLab From 91a91b8d277346d890065eef7427217e27e995d9 Mon Sep 17 00:00:00 2001 From: scottma Date: Thu, 18 Apr 2024 05:50:20 +0000 Subject: [PATCH 008/587] Update file _3gpp-common-trace.yang --- yang-models/_3gpp-common-trace.yang | 51 +++++++++++++++++++++++++---- 1 file changed, 45 insertions(+), 6 deletions(-) diff --git a/yang-models/_3gpp-common-trace.yang b/yang-models/_3gpp-common-trace.yang index 276cdf0e4..e20da24dd 100755 --- a/yang-models/_3gpp-common-trace.yang +++ b/yang-models/_3gpp-common-trace.yang @@ -1600,7 +1600,6 @@ module _3gpp-common-trace { when '../jobType = "TRACE_ONLY"' + ' or ../jobType = "IMMEDIATE_MDT_AND_TRACE"'; type string; -<<<<<<< HEAD description "Specifies the metrics to be reported."; reference "Clause 10 of 3GPP TS 32.422"; } @@ -1615,12 +1614,7 @@ module _3gpp-common-trace { values."; } -======= - description "Specifies the messages to be reported."; - reference "Clause 10 of 3GPP TS 32.422"; - } ->>>>>>> d8efed85 (Update file _3gpp-common-trace.yang) leaf traceReportingConsumerUri { when '../traceReportingFormat = "STREAMING"'; type inet:uri; @@ -1730,6 +1724,7 @@ module _3gpp-common-trace { reference "3GPP TS 32.422"; } +<<<<<<< HEAD list traceConfig { when '../jobType = "TRACE_ONLY"' + ' or ../jobType = "IMMEDIATE_MDT_AND_TRACE"' @@ -1741,6 +1736,19 @@ module _3gpp-common-trace { max-elements 1; uses TraceConfigGrp; leaf idx { type string; } +======= + list traceConfig { + when '../jobType = "TRACE_ONLY"' + + ' or ../jobType = "IMMEDIATE_MDT_AND_TRACE"' + + ' or ../jobType = "TRACE_AND_5GC_UE_LEVEL_MEASUREMENTS"' + + ' or ../jobType = + "TRACE_AND_IMMEDIATE_MDT_AND_5GC_UE_LEVEL_MEASUREMENTS"'; + key idx; + description "Trace config"; + max-elements 1; + uses TraceConfigGrp; + leaf idx { type string; } +>>>>>>> 6c3b5477 (Update file _3gpp-common-trace.yang) } list mdtConfig { @@ -1752,6 +1760,7 @@ module _3gpp-common-trace { + ' or ../jobType = "IMMEDIATE_MDT_AND_5GC_UE_LEVEL_MEASUREMENTS"' + ' or ../jobType = "TRACE_AND_IMMEDIATE_MDT_AND_5GC_UE_LEVEL_MEASUREMENTS"'; +<<<<<<< HEAD key idx; description "MDT config"; max-elements 1; @@ -1770,6 +1779,26 @@ module _3gpp-common-trace { max-elements 1; uses UEMeasConfigGrp; leaf idx { type string; } +======= + key idx; + description "MDT config"; + max-elements 1; + uses MdtConfigGrp; + leaf idx { type string; } + } + + list ueMeasConfig { + when '../jobType = "5GC_UE_LEVEL_MEASUREMENTS_ONLY"' + + ' or ../jobType = "TRACE_AND_5GC_UE_LEVEL_MEASUREMENTS"' + + ' or ../jobType = "IMMEDIATE_MDT_AND_5GC_UE_LEVEL_MEASUREMENTS"' + + ' or ../jobType = + "TRACE_AND_IMMEDIATE_MDT_AND_5GC_UE_LEVEL_MEASUREMENTS"'; + key idx; + description "5GC UE level measurements config"; + max-elements 1; + uses UEMeasConfigGrp; + leaf idx { type string; } +>>>>>>> 6c3b5477 (Update file _3gpp-common-trace.yang) } list nPNTarget { @@ -1843,6 +1872,7 @@ module _3gpp-common-trace { The attribute jobType specifies the kind of data to collect. In case of Trace only, the configuration parameters of attribute traceConfig shall be applied. In case of Immediate MDT only, Logged MDT only, RLF reports +<<<<<<< HEAD only, RCEF reports only and Logged MBSFN MDT, the configuration parameters of attribute mdtConfig or a subset of these shall be applied. In case of UE measurements only, the configuration parameters @@ -1850,6 +1880,15 @@ module _3gpp-common-trace { of Trace, Immediate MDT, Trace and UE measurements, the configuration parameters of the corresponding attributes traceConfig, mdtConfig and ueMeasConfig are applicable. +======= + only, RCEF reports only and Logged MBSFN MDT, the configuration parameters + of attribute mdtConfig or a subset of these shall be applied. In case of + UE measurements only, the configuration parameters of attribute + ueMeasConfig shall be applied. In case of any combination of Trace, + Immediate MDT, Trace and UE measurements, the configuration parameters + of the corresponding attributes traceConfig, mdtConfig and ueMeasConfig + are applicable. +>>>>>>> 6c3b5477 (Update file _3gpp-common-trace.yang) Creation and deletion of TraceJob instances by MnS consumers is optional; when not supported, the TraceJob instances may be created -- GitLab From e079e8b7a3d5e8c6e60f6fdf8b1d3dc4491dcb77 Mon Sep 17 00:00:00 2001 From: scottma Date: Thu, 18 Apr 2024 05:56:36 +0000 Subject: [PATCH 009/587] Update file _3gpp-common-trace.yang --- yang-models/_3gpp-common-trace.yang | 45 ----------------------------- 1 file changed, 45 deletions(-) diff --git a/yang-models/_3gpp-common-trace.yang b/yang-models/_3gpp-common-trace.yang index e20da24dd..0953de0b6 100755 --- a/yang-models/_3gpp-common-trace.yang +++ b/yang-models/_3gpp-common-trace.yang @@ -1724,7 +1724,6 @@ module _3gpp-common-trace { reference "3GPP TS 32.422"; } -<<<<<<< HEAD list traceConfig { when '../jobType = "TRACE_ONLY"' + ' or ../jobType = "IMMEDIATE_MDT_AND_TRACE"' @@ -1736,19 +1735,6 @@ module _3gpp-common-trace { max-elements 1; uses TraceConfigGrp; leaf idx { type string; } -======= - list traceConfig { - when '../jobType = "TRACE_ONLY"' - + ' or ../jobType = "IMMEDIATE_MDT_AND_TRACE"' - + ' or ../jobType = "TRACE_AND_5GC_UE_LEVEL_MEASUREMENTS"' - + ' or ../jobType = - "TRACE_AND_IMMEDIATE_MDT_AND_5GC_UE_LEVEL_MEASUREMENTS"'; - key idx; - description "Trace config"; - max-elements 1; - uses TraceConfigGrp; - leaf idx { type string; } ->>>>>>> 6c3b5477 (Update file _3gpp-common-trace.yang) } list mdtConfig { @@ -1760,7 +1746,6 @@ module _3gpp-common-trace { + ' or ../jobType = "IMMEDIATE_MDT_AND_5GC_UE_LEVEL_MEASUREMENTS"' + ' or ../jobType = "TRACE_AND_IMMEDIATE_MDT_AND_5GC_UE_LEVEL_MEASUREMENTS"'; -<<<<<<< HEAD key idx; description "MDT config"; max-elements 1; @@ -1779,26 +1764,6 @@ module _3gpp-common-trace { max-elements 1; uses UEMeasConfigGrp; leaf idx { type string; } -======= - key idx; - description "MDT config"; - max-elements 1; - uses MdtConfigGrp; - leaf idx { type string; } - } - - list ueMeasConfig { - when '../jobType = "5GC_UE_LEVEL_MEASUREMENTS_ONLY"' - + ' or ../jobType = "TRACE_AND_5GC_UE_LEVEL_MEASUREMENTS"' - + ' or ../jobType = "IMMEDIATE_MDT_AND_5GC_UE_LEVEL_MEASUREMENTS"' - + ' or ../jobType = - "TRACE_AND_IMMEDIATE_MDT_AND_5GC_UE_LEVEL_MEASUREMENTS"'; - key idx; - description "5GC UE level measurements config"; - max-elements 1; - uses UEMeasConfigGrp; - leaf idx { type string; } ->>>>>>> 6c3b5477 (Update file _3gpp-common-trace.yang) } list nPNTarget { @@ -1872,7 +1837,6 @@ module _3gpp-common-trace { The attribute jobType specifies the kind of data to collect. In case of Trace only, the configuration parameters of attribute traceConfig shall be applied. In case of Immediate MDT only, Logged MDT only, RLF reports -<<<<<<< HEAD only, RCEF reports only and Logged MBSFN MDT, the configuration parameters of attribute mdtConfig or a subset of these shall be applied. In case of UE measurements only, the configuration parameters @@ -1880,15 +1844,6 @@ module _3gpp-common-trace { of Trace, Immediate MDT, Trace and UE measurements, the configuration parameters of the corresponding attributes traceConfig, mdtConfig and ueMeasConfig are applicable. -======= - only, RCEF reports only and Logged MBSFN MDT, the configuration parameters - of attribute mdtConfig or a subset of these shall be applied. In case of - UE measurements only, the configuration parameters of attribute - ueMeasConfig shall be applied. In case of any combination of Trace, - Immediate MDT, Trace and UE measurements, the configuration parameters - of the corresponding attributes traceConfig, mdtConfig and ueMeasConfig - are applicable. ->>>>>>> 6c3b5477 (Update file _3gpp-common-trace.yang) Creation and deletion of TraceJob instances by MnS consumers is optional; when not supported, the TraceJob instances may be created -- GitLab From 36b5c8020b13971eff2cca19a61ebfb15598943d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jose=20Antonio=20Ordo=C3=B1ez=20Lucena?= Date: Mon, 13 May 2024 17:10:36 +0000 Subject: [PATCH 010/587] Update _3gpp-common-files.yang, updating revision number, copyright year and removing "notifyFileDeletion" --- yang-models/_3gpp-common-files.yang | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/yang-models/_3gpp-common-files.yang b/yang-models/_3gpp-common-files.yang index 9317e769f..726292a70 100644 --- a/yang-models/_3gpp-common-files.yang +++ b/yang-models/_3gpp-common-files.yang @@ -24,7 +24,7 @@ module _3gpp-common-files { Generic Network Resource Model (NRM) Integration Reference Point (IRP); Information Service (IS)"; - + revision 2024-05-11 { reference CR-0362 ; } revision 2023-09-18 { reference CR-0271 ; } revision 2022-09-28 { reference CR-0191; } -- GitLab From 21ead7236f07b82a97d7c55e4579288fe0882c7b Mon Sep 17 00:00:00 2001 From: lengyelb Date: Mon, 13 May 2024 17:32:36 +0000 Subject: [PATCH 011/587] Revert "Update _3gpp-common-files.yang, updating revision number, copyright year and..." This reverts commit 2e0cdb1eedb194dcbe42d6e7c796fad1536c9b0e --- yang-models/_3gpp-common-files.yang | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/yang-models/_3gpp-common-files.yang b/yang-models/_3gpp-common-files.yang index 726292a70..8cd37b6d2 100644 --- a/yang-models/_3gpp-common-files.yang +++ b/yang-models/_3gpp-common-files.yang @@ -13,7 +13,7 @@ module _3gpp-common-files { contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464"; description "Defines the YANG mapping of File retrieval NRM fragment including the IOCs File and Files. - Copyright 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + Copyright 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved."; reference "3GPP TS 28.623 Generic Network Resource Model (NRM) @@ -324,4 +324,4 @@ module _3gpp-common-files { } } } -} +} \ No newline at end of file -- GitLab From c48913367d941b51e97368c5c2318f4adff04529 Mon Sep 17 00:00:00 2001 From: "U-ERICSSON\\ETHBLL" Date: Mon, 6 May 2024 18:44:37 +0200 Subject: [PATCH 012/587] Added Scheduler and ConditionMonitor --- yang-models/_3gpp-common-measurements.yang | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/yang-models/_3gpp-common-measurements.yang b/yang-models/_3gpp-common-measurements.yang index e2cf97b8a..8b68971dc 100755 --- a/yang-models/_3gpp-common-measurements.yang +++ b/yang-models/_3gpp-common-measurements.yang @@ -56,7 +56,11 @@ module _3gpp-common-measurements { Integration Reference Point (IRP); Information Service (IS)"; +<<<<<<< HEAD revision 2024-05-06 { reference CR-0359; } +======= + revision 2024-05-06 { reference CR-xxxx; } +>>>>>>> a8268644 (Added Scheduler and ConditionMonitor) revision 2024-02-24 { reference CR-0346; } revision 2023-11-18 { reference "CR-0299 CR-0305"; } revision 2023-09-18 { reference CR-0271; } -- GitLab From 575d68a535bd4a6bc31c21d4aef0f951f167b759 Mon Sep 17 00:00:00 2001 From: "U-ERICSSON\\ETHBLL" Date: Tue, 28 May 2024 03:47:37 +0900 Subject: [PATCH 013/587] Added correct revision statements with CR number. --- yang-models/_3gpp-common-measurements.yang | 4 ---- 1 file changed, 4 deletions(-) diff --git a/yang-models/_3gpp-common-measurements.yang b/yang-models/_3gpp-common-measurements.yang index 8b68971dc..e2cf97b8a 100755 --- a/yang-models/_3gpp-common-measurements.yang +++ b/yang-models/_3gpp-common-measurements.yang @@ -56,11 +56,7 @@ module _3gpp-common-measurements { Integration Reference Point (IRP); Information Service (IS)"; -<<<<<<< HEAD revision 2024-05-06 { reference CR-0359; } -======= - revision 2024-05-06 { reference CR-xxxx; } ->>>>>>> a8268644 (Added Scheduler and ConditionMonitor) revision 2024-02-24 { reference CR-0346; } revision 2023-11-18 { reference "CR-0299 CR-0305"; } revision 2023-09-18 { reference CR-0271; } -- GitLab From 5b8fc09db73be7369a381da7b449c61a369f8b34 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jose=20Antonio=20Ordo=C3=B1ez=20Lucena?= Date: Mon, 13 May 2024 16:15:40 +0000 Subject: [PATCH 014/587] Update _3gpp-common-files.yang to remove "notifyFileDeletion" notification --- yang-models/_3gpp-common-files.yang | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/yang-models/_3gpp-common-files.yang b/yang-models/_3gpp-common-files.yang index 8cd37b6d2..726292a70 100644 --- a/yang-models/_3gpp-common-files.yang +++ b/yang-models/_3gpp-common-files.yang @@ -13,7 +13,7 @@ module _3gpp-common-files { contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464"; description "Defines the YANG mapping of File retrieval NRM fragment including the IOCs File and Files. - Copyright 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + Copyright 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved."; reference "3GPP TS 28.623 Generic Network Resource Model (NRM) @@ -324,4 +324,4 @@ module _3gpp-common-files { } } } -} \ No newline at end of file +} -- GitLab From c6be77e3d388b4485a8b7cf6412e8e2f9dbfca11 Mon Sep 17 00:00:00 2001 From: sunse Date: Tue, 9 Apr 2024 12:59:32 +0000 Subject: [PATCH 015/587] adding File Management NRM. Update README.md --- OpenAPI/README.md | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/OpenAPI/README.md b/OpenAPI/README.md index 76505cbef..dd808586c 100644 --- a/OpenAPI/README.md +++ b/OpenAPI/README.md @@ -31,10 +31,14 @@ The links below will open the Swagger Editor/UI and auto-load the OpenAPI YAML f ([Editor](https://forge.3gpp.org/swagger/tools/loader.html?yaml=OpenAPI/TS28623_QoEMeasurementCollectionNrm.yaml)) ([UI](https://forge.3gpp.org/swagger/tools/loader.html?action=ui&yaml=OpenAPI/TS28623_QoEMeasurementCollectionNrm.yaml)) -* Subscription Control NRM NRM (TS 28.623) +* Subscription Control NRM (TS 28.623) ([Editor](https://forge.3gpp.org/swagger/tools/loader.html?yaml=OpenAPI/TS28623_SubscriptionControlNrm.yaml)) ([UI](https://forge.3gpp.org/swagger/tools/loader.html?action=ui&yaml=OpenAPI/TS28623_SubscriptionControlNrm.yaml)) +* File Management NRM (TS 28.623) +([Editor](https://forge.3gpp.org/swagger/tools/loader.html?yaml=OpenAPI/TS28623_FileManagementNrm.yaml)) +([UI](https://forge.3gpp.org/swagger/tools/loader.html?action=ui&yaml=OpenAPI/TS28623_FileManagementNrm.yaml)) + * Threshold Monitor NRM(TS 28.623) ([Editor](https://forge.3gpp.org/swagger/tools/loader.html?yaml=OpenAPI/TS28623_ThresholdMonitorNrm.yaml)) ([UI](https://forge.3gpp.org/swagger/tools/loader.html?action=ui&yaml=OpenAPI/TS28623_ThresholdMonitorNrm.yaml)) -- GitLab From 248fdd2240a818c84e0a57b9d94e316535d3ac4e Mon Sep 17 00:00:00 2001 From: ruiyue Date: Sat, 30 Mar 2024 06:52:57 +0000 Subject: [PATCH 016/587] Update TS28312_IntentNrm.yaml --- OpenAPI/TS28312_IntentNrm.yaml | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/OpenAPI/TS28312_IntentNrm.yaml b/OpenAPI/TS28312_IntentNrm.yaml index 130494e02..20e6b35b2 100644 --- a/OpenAPI/TS28312_IntentNrm.yaml +++ b/OpenAPI/TS28312_IntentNrm.yaml @@ -150,13 +150,12 @@ components: objectType: type: string enum: - - RAN_SubNetwork #value for Radio Network Expectation--# - - Edge_Service_Support #value for Edge Service Support Expectation--# - - 5GC_SubNetwork #value for 5GC Network Expectation--# + - RAN_SUBNETWORK #value for Radio Network Expectation--# + - EDGE_SERVICE_SUPPORT #value for Edge Service Support Expectation--# + - 5GC_SUBNETWORK #value for 5GC Network Expectation--# + - RadioService #value for Radio Service Expectation--# objectInstance: $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' - contextSelectivity: - $ref: "#/components/schemas/Selectivity" objectContexts: type: array items: @@ -227,7 +226,7 @@ components: enum: - DELIVER - ENSURE - description: It describes the characteristic of the intentExpectation and is the property that describes the types of intentExpectations. + description: It describes the characteristic of the intentExpectation and is the property that describes the types of intentExpectations. Vendor extensions are allowed Frequency: description: >- It desribes the RF reference frequency (i.e. Absolute Radio Frequency Channel Number) @@ -360,6 +359,9 @@ components: $ref: '#/components/schemas/FulfilmentInfo' targetAchievedValue: type: number + description: >- + It describes the value that has been achieved for the expectation target at the time at which + the report is generated. #-------Definition of the concrete TargetFulfilmentResult dataType----------------# #-------Definition of the generic IntentConflictReport dataType----------------# @@ -429,6 +431,7 @@ components: - RAN_SUBNETWORK - EDGE_SERVICE_SUPPORT - 5GC_SUBNETWORK + - RadioService description: It describes the expectation object type which can be supported by a specific intent handling function of MnS producer. supportedExpectationTargetNames: type: array -- GitLab From 613dcd879d8889860567a69204f89b4b4a04994b Mon Sep 17 00:00:00 2001 From: ruiyue Date: Sat, 30 Mar 2024 07:36:52 +0000 Subject: [PATCH 017/587] Update 2 files - /OpenAPI/TS28312_IntentNrm.yaml - /OpenAPI/TS28312_IntentExpectations.yaml --- OpenAPI/TS28312_IntentExpectations.yaml | 140 ++++++++++++++++-------- OpenAPI/TS28312_IntentNrm.yaml | 4 +- 2 files changed, 99 insertions(+), 45 deletions(-) diff --git a/OpenAPI/TS28312_IntentExpectations.yaml b/OpenAPI/TS28312_IntentExpectations.yaml index b48f7afaf..e9185eacd 100644 --- a/OpenAPI/TS28312_IntentExpectations.yaml +++ b/OpenAPI/TS28312_IntentExpectations.yaml @@ -243,7 +243,10 @@ components: #-------Definition of the Scenario specific ExpectationTarget dataType----------# WeakRSRPRatioTarget: description: >- - This data type is the "ExpectationTarget" data type with specialisations for WeakRSRPRatioTarget + This data type is the "ExpectationTarget" data type with specialisations for WeakRSRPRatioTarget. It describes + the downlink weak coverage ratio target for the RAN SubNetwork that the intent expectation is applied. + The numerator is the number of the cells with downlink weak RSRP, and the denominator is the total number + of cells of the RAN Subnetwork in the specified area. type: object properties: targetName: @@ -262,7 +265,9 @@ components: $ref: '#/components/schemas/WeakRSRPContext' WeakRSRPContext: description: >- - This data type is the "TargetContext" data type with specialisations for WeakRSRPContext + This data type is the "TargetContext" data type with specialisations for WeakRSRPContext. It describes the threshold + for downlink weak RSRP of the cells (see RSRP measurements in TS 28.552 [6]) of the RAN SubNetwork that the intent + expectation is applied. type: object properties: contextAttribute: @@ -277,7 +282,9 @@ components: type: number LowSINRRatioTarget: description: >- - This data type is the "ExpectationTarget" data type with specialisations for LowSINRatioTarget + This data type is the "ExpectationTarget" data type with specialisations for LowSINRatioTarget.It describes the low SINR + ratio target for the RAN SubNetwork that the intent expectation is applied. The numerator is the number of the cells with + low SINR, and the denominator is the total number of cells of the RAN Subnetwork in the specified area. type: object properties: targetName: @@ -296,7 +303,8 @@ components: $ref: '#/components/schemas/LowSINRContext' LowSINRContext: description: >- - This data type is the "TargetContext" data type with specialisations for LowSINRContext + This data type is the "TargetContext" data type with specialisations for LowSINRContext.It describes the threshold for + low SINR of the cells (see SINR measurements in TS 28.552 [6]) of the RAN SubNetwork that the intent expectation is applied. type: object properties: contextAttribute: @@ -311,7 +319,9 @@ components: type: integer AveULRANUEThptTarget: description: >- - This data type is the "ExpectationTarget" data type with specialisations for AveULRANUEThptTarget + This data type is the "ExpectationTarget" data type with specialisations for AveULRANUEThptTarget.It describes the average + UL RAN UE throughput target for RAN SubNetwork (see UL RAN UE throughput for a sub-network in TS 28.554[11]) that the intent + expectation is applied. type: object properties: targetName: @@ -326,7 +336,9 @@ components: type: integer AveDLRANUEThptTarget: description: >- - This data type is the "ExpectationTarget" data type with specialisations for AveDLRANUEThptTarget + This data type is the "ExpectationTarget" data type with specialisations for AveDLRANUEThptTarget.It describes the average + DL RAN UE throughput target for RAN SubNetwork (see DL RAN UE throughput for a sub-network in TS 28.554[11]) that the intent + expectation is applied. type: object properties: targetName: @@ -341,7 +353,10 @@ components: type: integer LowULRANUEThptRatioTarget: description: >- - This data type is the "ExpectationTarget" data type with specialisations for LowULRANUEThptRatioTarget + This data type is the "ExpectationTarget" data type with specialisations for LowULRANUEThptRatioTarget.It describes the low + UL RAN UE throughput ratio target for the RAN SubNetwork that the intent expectation is applied. The numerator is the number + of the cells with low UL RAN UE throughput, and the denominator is the total number of cells of the RAN Subnetwork in the + specified area. type: object properties: targetName: @@ -360,7 +375,9 @@ components: $ref: '#/components/schemas/LowULRANUEThptContext' LowULRANUEThptContext: description: >- - This data type is the "TargetContext" data type with specialisations for LowULRANUEThptContext + This data type is the "TargetContext" data type with specialisations for LowULRANUEThptContext.It describes the threshold + for the low UL RAN UE throughput cells (see average UL RAN UE throughput in gNB and distribution of UL UE throughput in gNB + in TS 28.552[6]) of the RAN SubNetwork that the intent expectation is applied. type: object properties: contextAttribute: @@ -375,7 +392,10 @@ components: type: number LowDLRANUEThptRatioTarget: description: >- - This data type is the "ExpectationTarget" data type with specialisations for LowDLRANUEThptRatioTarget + This data type is the "ExpectationTarget" data type with specialisations for LowDLRANUEThptRatioTarget. It describes + the low DL RAN UE throughput ratio target for the RAN SubNetwork that the intent expectation is applied.The numerator + is the number of the cells with low DL RAN UE throughput, and the denominator is the total number of cells of the + RAN Subnetwork in the specified area. type: object properties: targetName: @@ -394,7 +414,9 @@ components: $ref: '#/components/schemas/LowDLRANUEThptContext' LowDLRANUEThptContext: description: >- - This data type is the "TargetContext" data type with specialisations for LowDLRANUEThptContext + This data type is the "TargetContext" data type with specialisations for LowDLRANUEThptContext.It describes the threshold + for the low DL RAN UE throughput cells ((see average DL RAN UE throughput in gNB and distribution of DL UE throughput in gNB + in TS 28.552[6]) ) of the RAN SubNetwork that the intent expectation is applied. type: object properties: contextAttribute: @@ -409,7 +431,9 @@ components: type: number HighULPrbLoadRatioTarget: description: >- - This data type is the "ExpectationTarget" data type with specialisations for HighULPrbLoadRatioTarget + This data type is the "ExpectationTarget" data type with specialisations for HighULPrbLoadRatioTarget. It describes the high UL + PRB load ratio target (as percentage) for the RAN SubNetwork that the intent expectation is applied. The numerator is the number + of the cells with high UL PRB load, and the denominator is the total number of cells of the RAN Subnetwork in the specified area. type: object properties: targetName: @@ -428,7 +452,9 @@ components: $ref: '#/components/schemas/HighULPrbLoadContext' HighULPrbLoadContext: description: >- - This data type is the "TargetContext" data type with specialisations for HighULPrbLoadContext + This data type is the "TargetContext" data type with specialisations for HighULPrbLoadContext.It describes the threshold for high + uplink PRB load (i.e. UL Total PRB Usage in TS 28.552 [12] to represent the percentage of UL PRBs used) of the cells of the RAN + SubNetwork in the specified area that the intent expectation is applied. type: object properties: contextAttribute: @@ -445,7 +471,9 @@ components: maximum: 100 HighDLPrbLoadRatioTarget: description: >- - This data type is the "ExpectationTarget" data type with specialisations for HighDLPrbLoadRatioTarget + This data type is the "ExpectationTarget" data type with specialisations for HighDLPrbLoadRatioTarget.It describes the high DL PRB + load ratio target (as percentage) for the RAN SubNetwork that the intent expectation is applied. The numerator is the number of the + cells with high DL PRB load, and the denominator is the total number of cells of the RAN Subnetwork in the specified area. type: object properties: targetName: @@ -464,7 +492,9 @@ components: $ref: '#/components/schemas/HighDLPrbLoadContext' HighDLPrbLoadContext: description: >- - This data type is the "TargetContext" data type with specialisations for HighDLPrbLoadContext + This data type is the "TargetContext" data type with specialisations for HighDLPrbLoadContext.It describes the threshold for high downlink + PRB load (i.e. DL Total PRB Usage in TS 28.552 [12] to represent the percentage of DL PRBs used) of the cells of the RAN SubNetwork in the + specified area that the intent expectation is applied. type: object properties: contextAttribute: @@ -481,7 +511,9 @@ components: maximum: 100 AveULPrbLoadTarget: description: >- - This data type is the "ExpectationTarget" data type with specialisations for AveULPrbLoadTarget + This data type is the "ExpectationTarget" data type with specialisations for AveULPrbLoadTarget.It describes the average uplink PRB load target + (i.e. UL Total PRB Usage in TS 28.552 [12] to represent the percentage of UL PRBs used) of the cells of the RAN SubNetwork that the intent + expectation is applied. type: object properties: targetName: @@ -498,7 +530,9 @@ components: maximum: 100 AveDLPrbLoadTarget: description: >- - This data type is the "ExpectationTarget" data type with specialisations for AveDLPrbLoadTarget + This data type is the "ExpectationTarget" data type with specialisations for AveDLPrbLoadTarget.It describes the average dowlink PRB load + (i.e. DL Total PRB Usage in TS 28.552 [12] to represent the percentage of DL PRBs used) target for RAN SubNetwork that the intent expectation + is applied. type: object properties: targetName: @@ -515,7 +549,9 @@ components: maximum: 100 RANEnergyConsumptionTarget: description: >- - This data type is the "ExpectationTarget" data type with specialisations for RANEnergyConsumptionTarget + This data type is the "ExpectationTarget" data type with specialisations for RANEnergyConsumptionTarget.It describes the RAN energy consumption + target for RAN SubNetwork that the intent expectation is applied. The definition for RAN energy consumption see ECNG-RAN in clause 6.7.3.4.1 in + TS 28.554 [11]. type: object properties: targetName: @@ -530,7 +566,9 @@ components: type: integer RANEnergyEfficiencyTarget: description: >- - This data type is the "ExpectationTarget" data type with specialisations for RANEnergyEfficiencyTarget + This data type is the "ExpectationTarget" data type with specialisations for RANEnergyEfficiencyTarget.It describes the RAN energy efficiency target + for RAN SubNetwork that the intent expectation is applied. The unit of this target is bit/J. The definition for RAN energy efficiency target for RAN + SubNetwork see EEMN,DV in clause 6.7.1.1 in TS 28.554 [11]. type: object properties: targetName: @@ -545,7 +583,8 @@ components: type: integer DLThptPerUETarget: description: >- - This data type is the "ExpectationTarget" data type with specialisations for DLThptPerUETarget + This data type is the "ExpectationTarget" data type with specialisations for DLThptPerUETarget. It describes the DL throughput target by the per UE for the + Edge service supporting or Radio servicde that the intent expectation is applied. For details see dlThptPerUE defined in clause 6.3.1 of TS 28.541 [5]. type: object properties: targetName: @@ -557,10 +596,11 @@ components: enum: - IS_GREATER_THAN targetValueRange: - $ref: 'TS28541_SliceNrm.yaml#/components/schemas/XLThpt' + type: integer ULThptPerUETarget: description: >- - This data type is the "ExpectationTarget" data type with specialisations for ULThptPerUETarget + This data type is the "ExpectationTarget" data type with specialisations for ULThptPerUETarget.It describes the UL throughput target by the per UE for the Edge + service supporting or Radio service that the intent expectation is applied. For details see ulThptPerUE defined in clause 6.3.1 of TS 28.541 [5]. type: object properties: targetName: @@ -572,10 +612,11 @@ components: enum: - IS_GREATER_THAN targetValueRange: - $ref: 'TS28541_SliceNrm.yaml#/components/schemas/XLThpt' + type: integer DLLatencyTarget: description: >- - This data type is the "ExpectationTarget" data type with specialisations for DLLatencyTarget + This data type is the "ExpectationTarget" data type with specialisations for DLLatencyTarget.It describes the DL latency target for the Edge service supporting or Radio service + that the intent expectation is applied type: object properties: targetName: @@ -590,7 +631,8 @@ components: type: integer ULLatencyTarget: description: >- - This data type is the "ExpectationTarget" data type with specialisations for ULLatencyTarget + This data type is the "ExpectationTarget" data type with specialisations for ULLatencyTarget. It describes the UL latency target for the Edge service supporting or RadioService + that the intent expectation is applied. For details see attribute ulLatency defined in clause 6.3.1 of TS 28.541 [5] type: object properties: targetName: @@ -605,7 +647,8 @@ components: type: integer MaxNumberofUEsTarget: description: >- - This data type is the "ExpectationTarget" data type with specialisations for MaxNumberofUEsTarget + This data type is the "ExpectationTarget" data type with specialisations for MaxNumberofUEsTarget.It describes the the number of UEs for Edge service supporting + that the intent expectation is applied. For details see attribute maxNumberofUE defined in clause 6.3.1 of of TS 28.541 [5] type: object properties: targetName: @@ -620,7 +663,9 @@ components: type: integer ActivityFactorTarget: description: >- - This data type is the "ExpectationTarget" data type with specialisations for ActivityFactorTarget + This data type is the "ExpectationTarget" data type with specialisations for ActivityFactorTarget.It describes the percentage value of the amount of simultaneous + active UEs to the total number of UEs where active means the UEs are exchanging data with the Edge service supporting that the intent expectation is applied. + For details see activityFactor in clause 6.3.1 in TS 28.541 [5]. type: object properties: targetName: @@ -635,7 +680,8 @@ components: type: integer UESpeedTarget: description: >- - This data type is the "ExpectationTarget" data type with specialisations for UESpeedTarget + This data type is the "ExpectationTarget" data type with specialisations for UESpeedTarget.It describes the speed (in km/hour) supported for Edge service supporting + that the intent expectation is applied. For details see uESpeed in clause 6.3.1 in TS 28.541[5]. type: object properties: targetName: @@ -650,7 +696,8 @@ components: type: integer MaxNumberofPDUsessionsTarget: description: >- - This data type is the "ExpectationTarget" data type with specialisations for MaxNumberofPDUsessionsTarget + This data type is the "ExpectationTarget" data type with specialisations for MaxNumberofPDUsessionsTarget.It describes the maximum number of PDU sessions for 5GC + SubNetwork supporting that the intent expectation is applied. For details, see maxNumberofPDUsessions in clause 5.3.1.2 in TS 28.552 [12]. type: object properties: targetName: @@ -667,7 +714,8 @@ components: $ref: '#/components/schemas/5GSessionContext' 5GSessionContext: description: >- - This data type is the "TargetContext" data type with specialisations for 5GSessionContext + This data type is the "TargetContext" data type with specialisations for 5GSessionContext.It describes the maximum supported 5G PDU session of the 5GC SubNetwork + related to the intent expectation. type: object properties: contextAttribute: @@ -682,7 +730,8 @@ components: type: integer MaxNumberofRegisteredsubscribersTarget: description: >- - This data type is the "ExpectationTarget" data type with specialisations for MaxNumberofRegisteredsubscribersTarget + This data type is the "ExpectationTarget" data type with specialisations for MaxNumberofRegisteredsubscribersTarget.It describes the maximum number of Registered + subscribers for 5GC SubNetwork supporting that the intent expectation is applied. For details, see maxNumberofRegisteredsubscribers in clause 5.6.2 in TS 28.552 [12]. type: object properties: targetName: @@ -697,7 +746,8 @@ components: type: integer IncomingDataTarget: description: >- - This data type is the "ExpectationTarget" data type with specialisations for IncomingDataTarget + This data type is the "ExpectationTarget" data type with specialisations for IncomingDataTarget.It describes the maximum incoming data packets for 5GC SubNetwork + related to the intent expectation. For details, see N6 incoming link usage measurement in clause 5.4.2.1 in TS 28.552 [12]. type: object properties: targetName: @@ -712,7 +762,8 @@ components: type: integer OutgoingDataTarget: description: >- - This data type is the "ExpectationTarget" data type with specialisations for OutgoingDataTarget + This data type is the "ExpectationTarget" data type with specialisations for OutgoingDataTarget.It describes the maximum outgoing data packets for 5GC SubNetwork + related to the intent expectation. For details, see N6 outgoing link usage measurement in clause 5.4.2.2 in TS 28.552 [12]. type: object properties: targetName: @@ -731,7 +782,8 @@ components: #-------Definition of the concrete ObjectTarget dataType----------------# CoverageAreaPolygonContext: description: >- - This data type is the "ObjectContext" data type with specialisations for CoverageAreaPolygonContext + This data type is the "ObjectContext" data type with specialisations for CoverageAreaPolygonContext.It describes the coverage areas for the RAN SubNetwork that the + intent expectation is applied in the form of polygon. type: object properties: contextAttribute: @@ -746,7 +798,8 @@ components: $ref: 'TS28623_ComDefs.yaml#/components/schemas/GeoArea' CoverageTACContext: description: >- - This data type is the "ObjectContext" data type with specialisations for CoverageTACContext + This data type is the "ObjectContext" data type with specialisations for CoverageTACContext.It describes the coverage areas for the RAN SubNetwork that the intent + expectation is applied in the form of TAC. type: object properties: contextAttribute: @@ -780,9 +833,8 @@ components: $ref: 'TS28623_ComDefs.yaml#/components/schemas/PlmnId' DlFrequencyContext: description: >- - This data type is the "Context" data type with specialisations for Object context "DLFrequencyContext". - It describes the downlink frequency information (RF reference frequencies and/ or the - frequency operating band) supported by the RAN SubNetwork that the intent expectation is applied. + This data type is the "Context" data type with specialisations for Object context "DLFrequencyContext". It describes the downlink frequency information (RF reference + frequencies and/ or the frequency operating band) supported by the RAN SubNetwork that the intent expectation is applied. type: object properties: contextAttribute: @@ -799,9 +851,8 @@ components: $ref: 'TS28312_IntentNrm.yaml#/components/schemas/Frequency' UlFrequencyContext: description: >- - This data type is the "Context" data type with specialisations for Object context "ULFrequencyContext". - It describes the uplink frequency information (RF reference frequencies and/ or the frequency - operating band) supported by the RAN SubNetwork that the intent expectation is applied. + This data type is the "Context" data type with specialisations for Object context "ULFrequencyContext".It describes the uplink frequency information (RF reference + frequencies and/ or the frequency operating band) supported by the RAN SubNetwork that the intent expectation is applied. type: object properties: contextAttribute: @@ -818,7 +869,8 @@ components: $ref: 'TS28312_IntentNrm.yaml#/components/schemas/Frequency' RATContext: description: >- - This data type is the "ObjectContext" data type with specialisations for RATContext + This data type is the "ObjectContext" data type with specialisations for RATContext.It describes the RAT supported by the RAN SubNetwork that the intent expectation + is applied. type: object properties: contextAttribute: @@ -992,7 +1044,8 @@ components: TargetAssuranceTimeContext: description: >- - This data type is the "Expectation Context" data type with specialisations for TargetAssuranceTimeContext + This data type is the "Expectation Context" data type with specialisations for TargetAssuranceTimeContext.It describes the timeWindows + (including startTime, endTime) when the targets in the Intent Expectation need to be assured. type: object properties: contextAttribute: @@ -1068,7 +1121,8 @@ components: $ref: "TS28541_SliceNrm.yaml#/components/schemas/SharingLevel" ServiceTypeContext: description: >- - This data type is the "ExpectationContext" data type with specialisations for ServiceTypeContext + This data type is the "ExpectationContext" data type with specialisations for ServiceTypeContext.It describes + the service type for the Radio Service that the intent expectation is applied. For details see sST in clause 6.4.1 in TS 28.541 [5] type: object properties: contextAttribute: diff --git a/OpenAPI/TS28312_IntentNrm.yaml b/OpenAPI/TS28312_IntentNrm.yaml index 20e6b35b2..5c5e2a302 100644 --- a/OpenAPI/TS28312_IntentNrm.yaml +++ b/OpenAPI/TS28312_IntentNrm.yaml @@ -153,7 +153,7 @@ components: - RAN_SUBNETWORK #value for Radio Network Expectation--# - EDGE_SERVICE_SUPPORT #value for Edge Service Support Expectation--# - 5GC_SUBNETWORK #value for 5GC Network Expectation--# - - RadioService #value for Radio Service Expectation--# + - Radio_Service #value for Radio Service Expectation--# objectInstance: $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' objectContexts: @@ -431,7 +431,7 @@ components: - RAN_SUBNETWORK - EDGE_SERVICE_SUPPORT - 5GC_SUBNETWORK - - RadioService + - Radio_Service description: It describes the expectation object type which can be supported by a specific intent handling function of MnS producer. supportedExpectationTargetNames: type: array -- GitLab From 2108f7e3ec83a40792421edcd28fb1d022fb4171 Mon Sep 17 00:00:00 2001 From: ruiyue Date: Sat, 30 Mar 2024 07:54:40 +0000 Subject: [PATCH 018/587] Update file TS28312_IntentExpectations.yaml --- OpenAPI/TS28312_IntentExpectations.yaml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/OpenAPI/TS28312_IntentExpectations.yaml b/OpenAPI/TS28312_IntentExpectations.yaml index e9185eacd..a7f4755fe 100644 --- a/OpenAPI/TS28312_IntentExpectations.yaml +++ b/OpenAPI/TS28312_IntentExpectations.yaml @@ -584,7 +584,7 @@ components: DLThptPerUETarget: description: >- This data type is the "ExpectationTarget" data type with specialisations for DLThptPerUETarget. It describes the DL throughput target by the per UE for the - Edge service supporting or Radio servicde that the intent expectation is applied. For details see dlThptPerUE defined in clause 6.3.1 of TS 28.541 [5]. + edge service supporting or radio servicde that the intent expectation is applied. For details see dlThptPerUE defined in clause 6.3.1 of TS 28.541 [5]. type: object properties: targetName: @@ -599,8 +599,8 @@ components: type: integer ULThptPerUETarget: description: >- - This data type is the "ExpectationTarget" data type with specialisations for ULThptPerUETarget.It describes the UL throughput target by the per UE for the Edge - service supporting or Radio service that the intent expectation is applied. For details see ulThptPerUE defined in clause 6.3.1 of TS 28.541 [5]. + This data type is the "ExpectationTarget" data type with specialisations for ULThptPerUETarget.It describes the UL throughput target by the per UE for the edge + service supporting or radio service that the intent expectation is applied. For details see ulThptPerUE defined in clause 6.3.1 of TS 28.541 [5]. type: object properties: targetName: @@ -615,7 +615,7 @@ components: type: integer DLLatencyTarget: description: >- - This data type is the "ExpectationTarget" data type with specialisations for DLLatencyTarget.It describes the DL latency target for the Edge service supporting or Radio service + This data type is the "ExpectationTarget" data type with specialisations for DLLatencyTarget.It describes the DL latency target for the edge service supporting or radio service that the intent expectation is applied type: object properties: @@ -631,7 +631,7 @@ components: type: integer ULLatencyTarget: description: >- - This data type is the "ExpectationTarget" data type with specialisations for ULLatencyTarget. It describes the UL latency target for the Edge service supporting or RadioService + This data type is the "ExpectationTarget" data type with specialisations for ULLatencyTarget. It describes the UL latency target for the edge service supporting or radioService that the intent expectation is applied. For details see attribute ulLatency defined in clause 6.3.1 of TS 28.541 [5] type: object properties: @@ -647,7 +647,7 @@ components: type: integer MaxNumberofUEsTarget: description: >- - This data type is the "ExpectationTarget" data type with specialisations for MaxNumberofUEsTarget.It describes the the number of UEs for Edge service supporting + This data type is the "ExpectationTarget" data type with specialisations for MaxNumberofUEsTarget.It describes the the number of UEs for edge service supporting that the intent expectation is applied. For details see attribute maxNumberofUE defined in clause 6.3.1 of of TS 28.541 [5] type: object properties: @@ -664,7 +664,7 @@ components: ActivityFactorTarget: description: >- This data type is the "ExpectationTarget" data type with specialisations for ActivityFactorTarget.It describes the percentage value of the amount of simultaneous - active UEs to the total number of UEs where active means the UEs are exchanging data with the Edge service supporting that the intent expectation is applied. + active UEs to the total number of UEs where active means the UEs are exchanging data with the edge service supporting that the intent expectation is applied. For details see activityFactor in clause 6.3.1 in TS 28.541 [5]. type: object properties: @@ -680,7 +680,7 @@ components: type: integer UESpeedTarget: description: >- - This data type is the "ExpectationTarget" data type with specialisations for UESpeedTarget.It describes the speed (in km/hour) supported for Edge service supporting + This data type is the "ExpectationTarget" data type with specialisations for UESpeedTarget.It describes the speed (in km/hour) supported for edge service supporting that the intent expectation is applied. For details see uESpeed in clause 6.3.1 in TS 28.541[5]. type: object properties: -- GitLab From f1e7a358c01d31f3c04c54debf1c55aba309a4ac Mon Sep 17 00:00:00 2001 From: ruiyue Date: Thu, 18 Apr 2024 01:02:42 +0000 Subject: [PATCH 019/587] Update TS28312_IntentExpectations.yaml --- OpenAPI/TS28312_IntentExpectations.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/OpenAPI/TS28312_IntentExpectations.yaml b/OpenAPI/TS28312_IntentExpectations.yaml index a7f4755fe..b8c44996d 100644 --- a/OpenAPI/TS28312_IntentExpectations.yaml +++ b/OpenAPI/TS28312_IntentExpectations.yaml @@ -596,7 +596,7 @@ components: enum: - IS_GREATER_THAN targetValueRange: - type: integer + $ref: 'TS28541_SliceNrm.yaml#/components/schemas/XLThpt' ULThptPerUETarget: description: >- This data type is the "ExpectationTarget" data type with specialisations for ULThptPerUETarget.It describes the UL throughput target by the per UE for the edge @@ -612,7 +612,7 @@ components: enum: - IS_GREATER_THAN targetValueRange: - type: integer + $ref: 'TS28541_SliceNrm.yaml#/components/schemas/XLThpt' DLLatencyTarget: description: >- This data type is the "ExpectationTarget" data type with specialisations for DLLatencyTarget.It describes the DL latency target for the edge service supporting or radio service -- GitLab From a0dcdef8ab9c634c2a09fd42c6fb6c60d850823b Mon Sep 17 00:00:00 2001 From: ruiyue Date: Sat, 30 Mar 2024 08:39:00 +0000 Subject: [PATCH 020/587] Update 2 files - /OpenAPI/TS28111_FaultNrm.yaml - /OpenAPI/TS28532_ProvMnS.yaml --- OpenAPI/TS28111_FaultNrm.yaml | 7 +++++++ OpenAPI/TS28532_ProvMnS.yaml | 3 ++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/OpenAPI/TS28111_FaultNrm.yaml b/OpenAPI/TS28111_FaultNrm.yaml index f4ed7ce77..273225981 100644 --- a/OpenAPI/TS28111_FaultNrm.yaml +++ b/OpenAPI/TS28111_FaultNrm.yaml @@ -549,3 +549,10 @@ components: type: object additionalProperties: $ref: '#/components/schemas/Comment' + + #----- Definitions in TS 28.111for TS 28.532 --------------------------# + resources-faultNrm: + oneOf: + - $ref: '#/components/schemas/AlarmList-Single' + + #----- Definitions in TS 28.111 for TS 28.532 --------------------------# \ No newline at end of file diff --git a/OpenAPI/TS28532_ProvMnS.yaml b/OpenAPI/TS28532_ProvMnS.yaml index 27e027547..47d91a826 100755 --- a/OpenAPI/TS28532_ProvMnS.yaml +++ b/OpenAPI/TS28532_ProvMnS.yaml @@ -432,7 +432,8 @@ components: - $ref: 'TS28623_FileManagementNrm.yaml#/components/schemas/resources-fileMgmtNrm' - $ref: 'TS28623_ManagementDataCollectionNrm.yaml#/components/schemas/resources-mgmtDataCollectionNrm' - $ref: 'TS28623_MnSRegistryNrm.yaml#/components/schemas/resources-mnSRegistryNrm' - - $ref: 'TS28623_PmControlNrm.yaml#/components/schemas/resources-pmControlNrm' + - $ref: 'TS28623_PmControlNrm.yaml#/components/schemas/resources-pmControlNrm' + - $ref: 'TS28623_PmControlNrm.yaml#/components/schemas/resources-faultNrm' - $ref: 'TS28623_QoEMeasurementCollectionNrm.yaml#/components/schemas/resources-qoEMeasuremetCollectionNrm' - $ref: 'TS28623_SubscriptionControlNrm.yaml#/components/schemas/resources-subscriptionControlNrm' - $ref: 'TS28623_ThresholdMonitorNrm.yaml#/components/schemas/resources-thresholdMonitorNrm' -- GitLab From 4a92f80cfb2736828c75230dfca0f864f64704b8 Mon Sep 17 00:00:00 2001 From: ruiyue Date: Sat, 30 Mar 2024 08:42:11 +0000 Subject: [PATCH 021/587] Update file TS28532_ProvMnS.yaml --- OpenAPI/TS28532_ProvMnS.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OpenAPI/TS28532_ProvMnS.yaml b/OpenAPI/TS28532_ProvMnS.yaml index 47d91a826..766475b39 100755 --- a/OpenAPI/TS28532_ProvMnS.yaml +++ b/OpenAPI/TS28532_ProvMnS.yaml @@ -433,7 +433,7 @@ components: - $ref: 'TS28623_ManagementDataCollectionNrm.yaml#/components/schemas/resources-mgmtDataCollectionNrm' - $ref: 'TS28623_MnSRegistryNrm.yaml#/components/schemas/resources-mnSRegistryNrm' - $ref: 'TS28623_PmControlNrm.yaml#/components/schemas/resources-pmControlNrm' - - $ref: 'TS28623_PmControlNrm.yaml#/components/schemas/resources-faultNrm' + - $ref: 'TS28111_FaultNrm.yaml#/components/schemas/resources-faultNrm' - $ref: 'TS28623_QoEMeasurementCollectionNrm.yaml#/components/schemas/resources-qoEMeasuremetCollectionNrm' - $ref: 'TS28623_SubscriptionControlNrm.yaml#/components/schemas/resources-subscriptionControlNrm' - $ref: 'TS28623_ThresholdMonitorNrm.yaml#/components/schemas/resources-thresholdMonitorNrm' -- GitLab From df6e11a3b6e6be4545536ce11bec0389ae16e6b2 Mon Sep 17 00:00:00 2001 From: ruiyue Date: Sat, 30 Mar 2024 08:49:51 +0000 Subject: [PATCH 022/587] Update file TS28111_FaultNrm.yaml --- OpenAPI/TS28111_FaultNrm.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OpenAPI/TS28111_FaultNrm.yaml b/OpenAPI/TS28111_FaultNrm.yaml index 273225981..c82b1b97a 100644 --- a/OpenAPI/TS28111_FaultNrm.yaml +++ b/OpenAPI/TS28111_FaultNrm.yaml @@ -550,7 +550,7 @@ components: additionalProperties: $ref: '#/components/schemas/Comment' - #----- Definitions in TS 28.111for TS 28.532 --------------------------# + #----- Definitions in TS 28.111 for TS 28.532 --------------------------# resources-faultNrm: oneOf: - $ref: '#/components/schemas/AlarmList-Single' -- GitLab From 34e4ab8da26267ffafdaf3720a9dd4d1042310d0 Mon Sep 17 00:00:00 2001 From: ruiyue Date: Mon, 1 Apr 2024 01:04:39 +0000 Subject: [PATCH 023/587] Update file TS28532_ProvMnS.yaml --- OpenAPI/TS28532_ProvMnS.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/OpenAPI/TS28532_ProvMnS.yaml b/OpenAPI/TS28532_ProvMnS.yaml index 766475b39..fcf3ef389 100755 --- a/OpenAPI/TS28532_ProvMnS.yaml +++ b/OpenAPI/TS28532_ProvMnS.yaml @@ -439,6 +439,7 @@ components: - $ref: 'TS28623_ThresholdMonitorNrm.yaml#/components/schemas/resources-thresholdMonitorNrm' - $ref: 'TS28623_TraceControlNrm.yaml#/components/schemas/resources-traceControlNrm' - $ref: 'TS28319_MsacNrm.yaml#/components/schemas/resources-msacNrm' + - $ref: 'TS28318_DsoNrm.yaml#/components/schemas/resources-DSORecovery' Scope: type: object properties: -- GitLab From af63e5c4944d63f0560514edc1f3c84bedb9ba0e Mon Sep 17 00:00:00 2001 From: shumim Date: Thu, 25 Apr 2024 05:15:18 +0000 Subject: [PATCH 024/587] add TRP info for LMF --- OpenAPI/TS28541_5GcNrm.yaml | 36 ++++++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) diff --git a/OpenAPI/TS28541_5GcNrm.yaml b/OpenAPI/TS28541_5GcNrm.yaml index 9379ea467..bfded1ea9 100755 --- a/OpenAPI/TS28541_5GcNrm.yaml +++ b/OpenAPI/TS28541_5GcNrm.yaml @@ -1352,6 +1352,38 @@ components: - NG_ENB - type: string + TrpMappingInfo: + type: object + properties: + satelliteId: + type: string + pattern: '^[0-9]{5}$' + trpIds: + type: array + items: + type: integer + minimum: 1 + maximum: 65535 + + TrpInfo: + description: The mapping relationship between TRP IDs, gNB ID and Satellite ID. + type: object + properties: + gNBId: + type: integer + minimum: 0 + maximum: 4294967295 + trpMappingInfoList: + type: array + items: + $ref: '#/components/schemas/TrpMappingInfo' + minItems: 1 + + TrpInfoList: + type: array + items: + $ref: '#/components/schemas/TrpInfo' + LmfInfo: description: Information of an LMF NF Instance type: object @@ -3494,6 +3526,10 @@ components: $ref: '#/components/schemas/CommModelList' lmfInfo: $ref: '#/components/schemas/LmfInfo' + ephemerisInfos: + $ref: 'TS28541_NrNrm.yaml#/components/schemas/EphemerisInfos' + trpInfoList: + $ref: '#/components/schemas/TrpInfoList' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' - type: object properties: -- GitLab From b5aebd154ac1f5b1914e3b89b2203b58c37561e4 Mon Sep 17 00:00:00 2001 From: Pengxiang Xie Date: Thu, 25 Apr 2024 06:37:58 +0000 Subject: [PATCH 025/587] TS28.541_Rel18_CR1175_add_missing_attributes_of_ManagedNFProfile --- OpenAPI/TS28541_5GcNrm.yaml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/OpenAPI/TS28541_5GcNrm.yaml b/OpenAPI/TS28541_5GcNrm.yaml index bfded1ea9..2053089df 100755 --- a/OpenAPI/TS28541_5GcNrm.yaml +++ b/OpenAPI/TS28541_5GcNrm.yaml @@ -229,6 +229,10 @@ components: type: array items: $ref: 'TS28623_ComDefs.yaml#/components/schemas/PlmnId' + sNPNList: + type: array + items: + $ref: '#/components/schemas/SnpnId' allowedSNPNs: type: array items: -- GitLab From 478d193deaa4e4006bf7cf81f3e6b32b868bd5f4 Mon Sep 17 00:00:00 2001 From: sunse Date: Mon, 1 Apr 2024 14:24:03 +0000 Subject: [PATCH 026/587] Schema_definition_Issues_for_SubNetwork_of_OpenAPI_SS_TS28318_Rel18 --- OpenAPI/TS28318_DsoNrm.yaml | 33 ++++++++++----------------------- OpenAPI/TS28623_GenericNrm.yaml | 1 + 2 files changed, 11 insertions(+), 23 deletions(-) diff --git a/OpenAPI/TS28318_DsoNrm.yaml b/OpenAPI/TS28318_DsoNrm.yaml index 25c311611..5fab07886 100644 --- a/OpenAPI/TS28318_DsoNrm.yaml +++ b/OpenAPI/TS28318_DsoNrm.yaml @@ -30,25 +30,17 @@ components: - type: object properties: SubNetwork: - $ref: '#/components/schemas/SubNetwork-Multiple' + type: array + items: + $ref: '#/components/schemas/SubNetwork-ncO-DsoNrm' - SubNetwork-Single: - allOf: - - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' - - type: object - properties: - attributes: - allOf: - - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/SubNetwork-Attr' - - type: object - properties: - Subnetwork: - $ref: '#/components/schemas/SubNetwork-Multiple' - OutageAndRecoveryInfo: - $ref: '#/components/schemas/OutageAndRecoveryInfo-Multiple' - DsoThresholdMonitor: - $ref: '#/components/schemas/DsoThresholdMonitor-Multiple' - - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/SubNetwork-ncO' + SubNetwork-ncO-DsoNrm: + type: object + properties: + OutageAndRecoveryInfo: + $ref: '#/components/schemas/OutageAndRecoveryInfo-Multiple' + DsoThresholdMonitor: + $ref: '#/components/schemas/DsoThresholdMonitor-Multiple' OutageAndRecoveryInfo-Single: allOf: @@ -87,10 +79,6 @@ components: #-------- Definition of JSON arrays for name-contained IOCs ---------------------- - SubNetwork-Multiple: - type: array - items: - $ref: '#/components/schemas/SubNetwork-Single' OutageAndRecoveryInfo-Multiple: type: array items: @@ -105,6 +93,5 @@ components: resources-DSORecovery: oneOf: - $ref: '#/components/schemas/MnS' - - $ref: '#/components/schemas/SubNetwork-Single' - $ref: '#/components/schemas/OutageAndRecoveryInfo-Single' - $ref: '#/components/schemas/DsoThresholdMonitor-Single' diff --git a/OpenAPI/TS28623_GenericNrm.yaml b/OpenAPI/TS28623_GenericNrm.yaml index 3d72b9232..843a9cbcf 100755 --- a/OpenAPI/TS28623_GenericNrm.yaml +++ b/OpenAPI/TS28623_GenericNrm.yaml @@ -699,6 +699,7 @@ components: - $ref: 'TS28541_SliceNrm.yaml#/components/schemas/SubNetwork-ncO-SliceNrm' - $ref: 'TS28541_NrNrm.yaml#/components/schemas/SubNetwork-ncO-NrNrm' - $ref: 'TS28541_5GcNrm.yaml#/components/schemas/SubNetwork-ncO-5GcNrm' + - $ref: 'TS28318_DsoNrm.yaml#/components/schemas/SubNetwork-ncO-DsoNrm' ManagedElement-Single: allOf: -- GitLab From 53482dec9f24473c7cc6a6d19ea0f3de527db94c Mon Sep 17 00:00:00 2001 From: sunse Date: Sun, 7 Apr 2024 02:04:27 +0000 Subject: [PATCH 027/587] 28.532_Rel18_CR0328_corrections_to_remove reference to TS28532_FaultMnS.yaml --- OpenAPI/TS28532_FaultMnS.yaml | 1058 --------------------------------- OpenAPI/TS28532_ProvMnS.yaml | 2 +- 2 files changed, 1 insertion(+), 1059 deletions(-) delete mode 100755 OpenAPI/TS28532_FaultMnS.yaml diff --git a/OpenAPI/TS28532_FaultMnS.yaml b/OpenAPI/TS28532_FaultMnS.yaml deleted file mode 100755 index 3c5631aae..000000000 --- a/OpenAPI/TS28532_FaultMnS.yaml +++ /dev/null @@ -1,1058 +0,0 @@ -openapi: 3.0.1 -info: - title: Fault Supervision MnS - version: 18.1.0 - description: >- - OAS 3.0.1 definition of the Fault Supervision MnS - © 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). - All rights reserved. -externalDocs: - description: 3GPP TS 28.532; Generic management services - url: http://www.3gpp.org/ftp/Specs/archive/28_series/28.532/ -servers: - - url: '{MnSRoot}/FaultSupervisionMnS/{MnSversion}' - variables: - MnSRoot: - description: See subclause 4.4.3 of TS 32.158 - default: http://example.com/3GPPManagement - MnSversion: - description: Version number of the OpenAPI definition - default: XXX -paths: - /alarms: - get: - summary: Retrieve multiple alarms - description: >- - Retrieves the alarms identified by alarmAckState, baseObjectInstance - and filter. - parameters: - - name: alarmAckState - in: query - required: false - schema: - $ref: '#/components/schemas/AlarmAckState' - - name: baseObjectInstance - in: query - required: false - schema: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' - - name: filter - in: query - required: false - schema: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/Filter' - responses: - '200': - description: >- - Success case ("200 OK"). - Returns the alarms identified in the request. The alarmId is the key - of the map. - content: - application/json: - schema: - type: object - additionalProperties: - type: object - allOf: - - type: object - properties: - lastNotificationHeader: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/NotificationHeader' - - $ref: '#/components/schemas/AlarmRecord' - - type: object - properties: - comments: - $ref: '#/components/schemas/Comments' - default: - description: Response in case of error. - content: - application/json: - schema: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/ErrorResponse' - patch: - summary: 'Clear, acknowledge or unacknowledge multiple alarms' - description: >- - Clears, acknowledges or unacknowledges multiple alarms using patch. Depending - on which action is to be performed, different merge patch documents need - to be used. - requestBody: - description: >- - Patch documents for acknowledging and unacknowledging, or clearing multiple - alarms. The keys in the map are the alarmIds to be patched. - content: - application/merge-patch+json: - schema: - oneOf: - - type: object - additionalProperties: - $ref: '#/components/schemas/MergePatchAcknowledgeAlarm' - - type: object - additionalProperties: - $ref: '#/components/schemas/MergePatchClearAlarm' - responses: - '204': - description: >- - Success case ("204 No content"). - The response message body is empty. - default: - description: Response in case of error. - content: - application/json: - schema: - type: array - items: - $ref: '#/components/schemas/FailedAlarm' - /alarms/alarmCount: - get: - summary: Get the alarm count per perceived severity - parameters: - - name: alarmAckState - in: query - required: false - schema: - $ref: '#/components/schemas/AlarmAckState' - - name: filter - in: query - required: false - schema: - type: string - responses: - '200': - description: >- - Success case ("200 OK"). - The alarm count per perceived severity is returned. - content: - application/json: - schema: - $ref: '#/components/schemas/AlarmCount' - default: - description: Response in case of error. The error case needs rework. - content: - application/json: - schema: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/ErrorResponse' - /alarms/{alarmId}: - patch: - summary: 'Clear, acknowledge or unacknowledge a single alarm' - description: >- - Clears, acknowledges or unacknowldeges a single alarm by patching the alarm - information. A conditional acknowledge request based on the perceived - severity is not supported. - parameters: - - name: alarmId - in: path - description: Identifies the alarm to be patched. - required: true - schema: - type: string - requestBody: - required: true - content: - application/merge-patch+json: - schema: - oneOf: - - $ref: '#/components/schemas/MergePatchAcknowledgeAlarm' - - $ref: '#/components/schemas/MergePatchClearAlarm' - responses: - '204': - description: >- - Success case (204 No content). - The response message body is absent. - default: - description: Response in case of error. - content: - application/json: - schema: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/ErrorResponse' - /alarms/{alarmId}/comments: - post: - summary: Add a comment to a single alarm - description: >- - Adds a comment to an alarm identified by alarmId. The id of the new comment - is allocated by the producer. - parameters: - - name: alarmId - in: path - description: Identifies the alarm to which the comment shall be added. - required: true - schema: - type: string - requestBody: - required: true - content: - application/json: - schema: - $ref: '#/components/schemas/Comment' - responses: - '201': - description: >- - Success case (201 Created). - The representation of the newly created comment resource shall be returned. - content: - application/json: - schema: - $ref: '#/components/schemas/Comment' - headers: - Location: - description: URI of the newly created comment resource. - required: true - schema: - type: string - default: - description: Error case. - content: - application/json: - schema: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/ErrorResponse' - - /subscriptions: - post: - summary: Create a subscription - description: >- - To create a subscription the representation of the subscription is - POSTed on the /subscriptions collection resource. - requestBody: - required: true - content: - application/json: - schema: - $ref: '#/components/schemas/Subscription' - responses: - '201': - description: >- - Success case ("201 Created"). - The representation of the newly created subscription resource shall - be returned. - content: - application/json: - schema: - $ref: '#/components/schemas/Subscription' - headers: - Location: - description: URI of the newly created subscription resource - required: true - schema: - type: string - default: - description: Error case. - content: - application/json: - schema: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/ErrorResponse' - callbacks: - notifyNewAlarm: - '{request.body#/consumerReference}': - post: - requestBody: - required: true - content: - application/json: - schema: - oneOf: - - $ref: '#/components/schemas/NotifyNewAlarm' - - $ref: '#/components/schemas/NotifyNewSecAlarm' - responses: - '204': - description: >- - Success case ("204 No Content"). - The notification is successfully delivered. The response message - body is absent. - default: - description: Error case. - content: - application/json: - schema: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/ErrorResponse' - notifyClearedAlarm: - '{request.body#/consumerReference}': - post: - requestBody: - required: true - content: - application/json: - schema: - $ref: '#/components/schemas/NotifyClearedAlarm' - responses: - '204': - description: >- - Success case ("204 No Content"). - The notification is successfully delivered. The response message - body is absent. - default: - description: Error case. - content: - application/json: - schema: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/ErrorResponse' - notifyChangedAlarm: - '{request.body#/consumerReference}': - post: - requestBody: - required: true - content: - application/json: - schema: - $ref: '#/components/schemas/NotifyChangedAlarm' - responses: - '204': - description: >- - Success case ("204 No Content"). - The notification is successfully delivered. The response message - body is absent. - default: - description: Error case. - content: - application/json: - schema: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/ErrorResponse' - notifyChangedAlarmGeneral: - '{request.body#/consumerReference}': - post: - requestBody: - required: true - content: - application/json: - schema: - oneOf: - - $ref: '#/components/schemas/NotifyChangedAlarmGeneral' - - $ref: '#/components/schemas/NotifyChangedSecAlarmGeneral' - responses: - '204': - description: >- - Success case ("204 No Content"). - The notification is successfully delivered. The response message - body is absent. - default: - description: Error case. - content: - application/json: - schema: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/ErrorResponse' - notifyCorrelatedNotificationChanged: - '{request.body#/consumerReference}': - post: - requestBody: - required: true - content: - application/json: - schema: - $ref: '#/components/schemas/NotifyCorrelatedNotificationChanged' - responses: - '204': - description: >- - Success case ("204 No Content"). - The notification is successfully delivered. The response message - body is absent. - default: - description: Error case. - content: - application/json: - schema: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/ErrorResponse' - notifyAckStateChanged: - '{request.body#/consumerReference}': - post: - requestBody: - required: true - content: - application/json: - schema: - $ref: '#/components/schemas/NotifyAckStateChanged' - responses: - '204': - description: >- - Success case ("204 No Content"). - The notification is successfully delivered. The response message - body is absent. - default: - description: Error case. - content: - application/json: - schema: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/ErrorResponse' - notifyComments: - '{request.body#/consumerReference}': - post: - requestBody: - required: true - content: - application/json: - schema: - $ref: '#/components/schemas/NotifyComments' - responses: - '204': - description: >- - Success case ("204 No Content"). - The notification is successfully delivered. The response message - body is absent. - default: - description: Error case. - content: - application/json: - schema: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/ErrorResponse' - notifyPotentialFaultyAlarmList: - '{request.body#/consumerReference}': - post: - requestBody: - required: true - content: - application/json: - schema: - $ref: '#/components/schemas/NotifyPotentialFaultyAlarmList' - responses: - '204': - description: >- - Success case ("204 No Content"). - The notification is successfully delivered. The response message - body is absent. - default: - description: Error case. - content: - application/json: - schema: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/ErrorResponse' - notifyAlarmListRebuilt: - '{request.body#/consumerReference}': - post: - requestBody: - required: true - content: - application/json: - schema: - $ref: '#/components/schemas/NotifyAlarmListRebuilt' - responses: - '204': - description: >- - Success case ("204 No Content"). - The notification is successfully delivered. The response message - body is absent. - default: - description: Error case. - content: - application/json: - schema: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/ErrorResponse' - /subscriptions/{subscriptionId}: - delete: - summary: Delete a subscription - description: >- - The subscription is deleted by deleting the corresponding subscription - resource. The resource to be deleted is identified with the path - component of the URI. - parameters: - - name: subscriptionId - in: path - description: Identifies the subscription to be deleted. - required: true - schema: - type: string - responses: - '204': - description: >- - Success case ("204 No Content"). - The subscription resource has been deleted. The response message body - is absent. - default: - description: Error case. - content: - application/json: - schema: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/ErrorResponse' - -components: - schemas: - - #---- Definition of AlarmRecord ----------------------------------------------------# - - AlarmId: - type: string - AlarmType: - type: string - enum: - - COMMUNICATIONS_ALARM - - QUALITY_OF_SERVICE_ALARM - - PROCESSING_ERROR_ALARM - - EQUIPMENT_ALARM - - ENVIRONMENTAL_ALARM - - INTEGRITY_VIOLATION - - OPERATIONAL_VIOLATION - - PHYSICAL_VIOLATION - - SECURITY_SERVICE_OR_MECHANISM_VIOLATION - - TIME_DOMAIN_VIOLATION - ProbableCause: - description: >- - The value of the probable cause may be a specific standardized string, or any - vendor provided string. Probable cause strings are not standardized in the - present document. They may be added in a future version. Up to then the - mapping of the generic probable cause strings "PROBABLE_CAUSE_001" to - "PROBABLE_CAUSE_005" is vendor specific. - The value of the probable cause may also be an integer. The mapping of integer - values to probable causes is vendor specific. - oneOf: - - anyOf: - - type: string - enum: - - PROBABLE_CAUSE_001 - - PROBABLE_CAUSE_002 - - PROBABLE_CAUSE_003 - - PROBABLE_CAUSE_004 - - PROBABLE_CAUSE_005 - - type: string - - type: integer - SpecificProblem: - oneOf: - - type: string - - type: integer - PerceivedSeverity: - type: string - enum: - - INDETERMINATE - - CRITICAL - - MAJOR - - MINOR - - WARNING - - CLEARED - TrendIndication: - type: string - enum: - - MORE_SEVERE - - NO_CHANGE - - LESS_SEVERE - ThresholdHysteresis: - type: object - required: - - high - properties: - high: - oneOf: - - type: integer - - $ref: 'TS28623_ComDefs.yaml#/components/schemas/Float' - low: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/Float' - ThresholdLevelInd: - oneOf: - - type: object - properties: - up: - $ref: '#/components/schemas/ThresholdHysteresis' - - type: object - properties: - down: - $ref: '#/components/schemas/ThresholdHysteresis' - ThresholdInfo: - type: object - properties: - observedMeasurement: - type: string - observedValue: - type: number - thresholdLevel: - $ref: '#/components/schemas/ThresholdLevelInd' - armTime: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTime' - required: - - observedMeasurement - - observedValue - CorrelatedNotification: - type: object - properties: - sourceObjectInstance: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' - notificationIds: - type: array - items: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/NotificationId' - required: - - sourceObjectInstance - - notificationIds - CorrelatedNotifications: - type: array - items: - $ref: '#/components/schemas/CorrelatedNotification' - AckState: - type: string - enum: - - ACKNOWLEDGED - - UNACKNOWLEDGED - - AlarmRecord: - description: >- - The alarmId is not a property of an alarm record. It is used as key - in the map of alarm records instead. - type: object - properties: - # alarmId: - # $ref: '#/components/schemas/AlarmId' - objectInstance: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' - notificationId: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/NotificationId' - alarmRaisedTime: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTime' - alarmChangedTime: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTime' - alarmClearedTime: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTime' - alarmType: - $ref: '#/components/schemas/AlarmType' - probableCause: - $ref: '#/components/schemas/ProbableCause' - specificProblem: - $ref: '#/components/schemas/SpecificProblem' - perceivedSeverity: - $ref: '#/components/schemas/PerceivedSeverity' - backedUpStatus: - type: boolean - backUpObject: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' - trendIndication: - $ref: '#/components/schemas/TrendIndication' - thresholdinfo: - $ref: '#/components/schemas/ThresholdInfo' - correlatedNotifications: - $ref: '#/components/schemas/CorrelatedNotifications' - stateChangeDefinition: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/AttributeValueChangeSet' - monitoredAttributes: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/AttributeNameValuePairSet' - proposedRepairActions: - type: string - additionalText: - type: string - additionalInformation: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/AttributeNameValuePairSet' - - rootCauseIndicator: - type: boolean - - ackTime: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTime' - ackUserId: - type: string - ackSystemId: - type: string - ackState: - $ref: '#/components/schemas/AckState' - - clearUserId: - type: string - clearSystemId: - type: string - serviceUser: - type: string - serviceProvider: - type: string - securityAlarmDetector: - type: string - - #---- Definition of alarm notifications --------------------------------------------# - - AlarmNotificationTypes: - type: string - enum: - - notifyNewAlarm - - notifyChangedAlarm - - notifyChangedAlarmGeneral - - notifyAckStateChanged - - notifyCorrelatedNotificationChanged - - notifyComments - - notifyClearedAlarm - - notifyAlarmListRebuilt - - notifyPotentialFaultyAlarmList - AlarmListAlignmentRequirement: - type: string - enum: - - ALIGNMENT_REQUIRED - - ALIGNMENT_NOT_REQUIRED - - NotifyNewAlarm: - allOf: - - $ref: 'TS28623_ComDefs.yaml#/components/schemas/NotificationHeader' - - type: object - required: - - alarmId - - alarmType - - probableCause - - perceivedSeverity - properties: - alarmId: - $ref: '#/components/schemas/AlarmId' - alarmType: - $ref: '#/components/schemas/AlarmType' - probableCause: - $ref: '#/components/schemas/ProbableCause' - specificProblem: - $ref: '#/components/schemas/SpecificProblem' - perceivedSeverity: - $ref: '#/components/schemas/PerceivedSeverity' - backedUpStatus: - type: boolean - backUpObject: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' - trendIndication: - $ref: '#/components/schemas/TrendIndication' - thresholdInfo: - $ref: '#/components/schemas/ThresholdInfo' - correlatedNotifications: - $ref: '#/components/schemas/CorrelatedNotifications' - stateChangeDefinition: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/AttributeValueChangeSet' - monitoredAttributes: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/AttributeNameValuePairSet' - proposedRepairActions: - type: string - additionalText: - type: string - additionalInformation: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/AttributeNameValuePairSet' - rootCauseIndicator: - type: boolean - NotifyNewSecAlarm: - allOf: - - $ref: 'TS28623_ComDefs.yaml#/components/schemas/NotificationHeader' - - type: object - required: - - alarmId - - alarmType - - probableCause - - perceivedSeverity - - serviceUser - - serviceProvider - - securityAlarmDetector - properties: - alarmId: - $ref: '#/components/schemas/AlarmId' - alarmType: - $ref: '#/components/schemas/AlarmType' - probableCause: - $ref: '#/components/schemas/ProbableCause' - perceivedSeverity: - $ref: '#/components/schemas/PerceivedSeverity' - correlatedNotifications: - $ref: '#/components/schemas/CorrelatedNotifications' - additionalText: - type: string - additionalInformation: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/AttributeNameValuePairSet' - rootCauseIndicator: - type: boolean - serviceUser: - type: string - serviceProvider: - type: string - securityAlarmDetector: - type: string - NotifyClearedAlarm: - allOf: - - $ref: 'TS28623_ComDefs.yaml#/components/schemas/NotificationHeader' - - type: object - required: - - alarmId - - alarmType - - probableCause - - perceivedSeverity - properties: - alarmId: - $ref: '#/components/schemas/AlarmId' - alarmType: - $ref: '#/components/schemas/AlarmType' - probableCause: - $ref: '#/components/schemas/ProbableCause' - perceivedSeverity: - $ref: '#/components/schemas/PerceivedSeverity' - correlatedNotifications: - $ref: '#/components/schemas/CorrelatedNotifications' - clearUserId: - type: string - clearSystemId: - type: string - NotifyChangedAlarm: - allOf: - - $ref: 'TS28623_ComDefs.yaml#/components/schemas/NotificationHeader' - - type: object - required: - - alarmId - - alarmType - - probableCause - - perceivedSeverity - properties: - alarmId: - $ref: '#/components/schemas/AlarmId' - alarmType: - $ref: '#/components/schemas/AlarmType' - probableCause: - $ref: '#/components/schemas/ProbableCause' - perceivedSeverity: - $ref: '#/components/schemas/PerceivedSeverity' - NotifyChangedAlarmGeneral: - allOf: - - $ref: 'TS28623_ComDefs.yaml#/components/schemas/NotificationHeader' - - type: object - required: - - alarmId - - alarmType - - probableCause - properties: - alarmId: - $ref: '#/components/schemas/AlarmId' - alarmType: - $ref: '#/components/schemas/AlarmType' - probableCause: - $ref: '#/components/schemas/ProbableCause' - specificProblem: - $ref: '#/components/schemas/SpecificProblem' - perceivedSeverity: - $ref: '#/components/schemas/PerceivedSeverity' - correlatedNotifications: - $ref: '#/components/schemas/CorrelatedNotifications' - backedUpStatus: - type: boolean - backUpObject: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' - trendIndication: - $ref: '#/components/schemas/TrendIndication' - thresholdInfo: - $ref: '#/components/schemas/ThresholdInfo' - stateChangeDefinition: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/AttributeValueChangeSet' - monitoredAttributes: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/AttributeNameValuePairSet' - proposedRepairActions: - type: string - additionalText: - type: string - additionalInformation: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/AttributeNameValuePairSet' - rootCauseIndicator: - type: boolean - changedAlarmAttributes: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/AttributeNameValuePairSet' - NotifyChangedSecAlarmGeneral: - allOf: - - $ref: 'TS28623_ComDefs.yaml#/components/schemas/NotificationHeader' - - type: object - required: - - alarmId - - alarmType - - probableCause - - serviceUser - - serviceProvider - - securityAlarmDetector - properties: - alarmId: - $ref: '#/components/schemas/AlarmId' - alarmType: - $ref: '#/components/schemas/AlarmType' - probableCause: - $ref: '#/components/schemas/ProbableCause' - perceivedSeverity: - $ref: '#/components/schemas/PerceivedSeverity' - correlatedNotifications: - $ref: '#/components/schemas/CorrelatedNotifications' - additionalText: - type: string - additionalInformation: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/AttributeNameValuePairSet' - rootCauseIndicator: - type: boolean - serviceUser: - type: string - serviceProvider: - type: string - securityAlarmDetector: - type: string - changedAlarmAttributes: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/AttributeNameValuePairSet' - NotifyCorrelatedNotificationChanged: - allOf: - - $ref: 'TS28623_ComDefs.yaml#/components/schemas/NotificationHeader' - - type: object - required: - - alarmId - - correlatedNotifications - properties: - alarmId: - $ref: '#/components/schemas/AlarmId' - correlatedNotifications: - $ref: '#/components/schemas/CorrelatedNotifications' - rootCauseIndicator: - type: boolean - NotifyAckStateChanged: - allOf: - - $ref: 'TS28623_ComDefs.yaml#/components/schemas/NotificationHeader' - - type: object - required: - - alarmId - - alarmType - - probableCause - - perceivedSeverity - - ackState - - ackUserId - properties: - alarmId: - $ref: '#/components/schemas/AlarmId' - alarmType: - $ref: '#/components/schemas/AlarmType' - probableCause: - $ref: '#/components/schemas/ProbableCause' - perceivedSeverity: - $ref: '#/components/schemas/PerceivedSeverity' - ackState: - $ref: '#/components/schemas/AckState' - ackUserId: - type: string - ackSystemId: - type: string - NotifyComments: - allOf: - - $ref: 'TS28623_ComDefs.yaml#/components/schemas/NotificationHeader' - - type: object - required: - - alarmId - - alarmType - - probableCause - - perceivedSeverity - - comments - properties: - alarmId: - $ref: '#/components/schemas/AlarmId' - alarmType: - $ref: '#/components/schemas/AlarmType' - probableCause: - $ref: '#/components/schemas/ProbableCause' - perceivedSeverity: - $ref: '#/components/schemas/PerceivedSeverity' - comments: - $ref: '#/components/schemas/Comments' - NotifyPotentialFaultyAlarmList: - allOf: - - $ref: 'TS28623_ComDefs.yaml#/components/schemas/NotificationHeader' - - type: object - required: - - reason - properties: - reason: - type: string - NotifyAlarmListRebuilt: - allOf: - - $ref: 'TS28623_ComDefs.yaml#/components/schemas/NotificationHeader' - - type: object - required: - - reason - properties: - reason: - type: string - alarmListAlignmentRequirement: - $ref: '#/components/schemas/AlarmListAlignmentRequirement' - - #---- Definition of query parameters -----------------------------------------------# - - AlarmAckState: - type: string - enum: - - ALL_ALARMS - - ALL_ACTIVE_ALARMS - - ALL_ACTIVE_AND_ACKNOWLEDGED_ALARMS - - ALL_ACTIVE_AND_UNACKNOWLEDGED_ALARMS - - ALL_CLEARED_AND_UNACKNOWLEDGED_ALARMS - - ALL_UNACKNOWLEDGED_ALARMS - - #---- Definition of patch documents ------------------------------------------------# - - MergePatchAcknowledgeAlarm: - description: >- - Patch document acknowledging or unacknowledging a single alarm. For - acknowledging an alarm the value of ackState is ACKNOWLEDGED, for unacknowledging - an alarm the value of ackState is UNACKNOWLEDGED. - type: object - required: - - ackUserId - - ackState - properties: - ackUserId: - type: string - ackSystemId: - type: string - ackState: - $ref: '#/components/schemas/AckState' - MergePatchClearAlarm: - description: Patch document for clearing a single alarm - type: object - required: - - clearUserId - - perceivedSeverity - properties: - clearUserId: - type: string - clearSystemId: - type: string - perceivedSeverity: - type: string - enum: - - CLEARED - - #---- Definition of method responses -----------------------------------------------# - - FailedAlarm: - type: object - required: - - alarmId - - failureReason - properties: - alarmId: - $ref: '#/components/schemas/AlarmId' - failureReason: - type: string - - #---- Definition of resources ------------------------------------------------------# - - AlarmCount: - type: object - required: - - criticalCount - - majorCount - - minorCount - - warningCount - - indeterminateCount - - clearedCount - properties: - criticalCount: - type: integer - majorCount: - type: integer - minorCount: - type: integer - warningCount: - type: integer - indeterminateCount: - type: integer - clearedCount: - type: integer - Comment: - type: object - properties: - commentTime: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTime' - commentUserId: - type: string - commentSystemId: - type: string - commentText: - type: string - Comments: - description: >- - Collection of comments. The comment identifiers are allocated by the - MnS producer and used as key in the map. - type: object - additionalProperties: - $ref: '#/components/schemas/Comment' - Subscription: - type: object - properties: - consumerReference: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/Uri' - timeTick: - type: integer - filter: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/Filter' diff --git a/OpenAPI/TS28532_ProvMnS.yaml b/OpenAPI/TS28532_ProvMnS.yaml index fcf3ef389..cf4315a1e 100755 --- a/OpenAPI/TS28532_ProvMnS.yaml +++ b/OpenAPI/TS28532_ProvMnS.yaml @@ -539,7 +539,7 @@ components: - specificProblem properties: specificProblem: - $ref: 'TS28532_FaultMnS.yaml#/components/schemas/SpecificProblem' + $ref: 'TS28111_FaultNrm.yaml#/components/schemas/SpecificProblem' additionalText: type: string additionalInformation: -- GitLab From fe4999e46172456026c7d72990b0a2ae06334e9e Mon Sep 17 00:00:00 2001 From: sunse Date: Sun, 7 Apr 2024 09:01:01 +0000 Subject: [PATCH 028/587] 28105 Rel18 CR0126 AIMLInferenceEmulationFunction missing in SubNetwork/ManagedElement nCo, Update TS28105_AiMlNrm.yaml --- OpenAPI/TS28105_AiMlNrm.yaml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/OpenAPI/TS28105_AiMlNrm.yaml b/OpenAPI/TS28105_AiMlNrm.yaml index b96ae1f9c..0076200e3 100644 --- a/OpenAPI/TS28105_AiMlNrm.yaml +++ b/OpenAPI/TS28105_AiMlNrm.yaml @@ -161,7 +161,9 @@ components: MLUpdateFunction: $ref: '#/components/schemas/MLUpdateFunction-Multiple' AIMLInferenceFunction: - $ref: '#/components/schemas/AIMLInferenceFunction-Multiple' + $ref: '#/components/schemas/AIMLInferenceFunction-Multiple' + AIMLInferenceEmulationFunction: + $ref: '#/components/schemas/AIMLInferenceEmulationFunction-Multiple' ManagedElement-ncO-AiMlNrm: type: object @@ -176,6 +178,8 @@ components: $ref: '#/components/schemas/MLUpdateFunction-Multiple' AIMLInferenceFunction: $ref: '#/components/schemas/AIMLInferenceFunction-Multiple' + AIMLInferenceEmulationFunction: + $ref: '#/components/schemas/AIMLInferenceEmulationFunction-Multiple' #-------- Definition of concrete IOCs -------------------------------------------- -- GitLab From 5bbafd83debbe2ae5a1a600a4911037287ee0816 Mon Sep 17 00:00:00 2001 From: sunse Date: Sun, 7 Apr 2024 02:00:09 +0000 Subject: [PATCH 029/587] 28.623_Rel18_CR0340_correction_to_OpenAPI_stage_3 Update TS28623_ComDefs.yaml --- OpenAPI/TS28623_ComDefs.yaml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/OpenAPI/TS28623_ComDefs.yaml b/OpenAPI/TS28623_ComDefs.yaml index c4e866243..7f3b394e6 100755 --- a/OpenAPI/TS28623_ComDefs.yaml +++ b/OpenAPI/TS28623_ComDefs.yaml @@ -125,7 +125,9 @@ components: type: integer AreaOfInterest: oneOf: - - $ref: '#/components/schemas/GeoAreaToCellMapping' + - type: array + items: + $ref: '#/components/schemas/GeoAreaToCellMapping' - type: array items: $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Tai' @@ -197,7 +199,7 @@ components: UsageState: type: string enum: - - IDEL + - IDLE - ACTIVE - BUSY AvailabilityStatus: -- GitLab From c4ba6b0243238e87128efe5932712a7e20d0a6b6 Mon Sep 17 00:00:00 2001 From: shumim Date: Thu, 25 Apr 2024 12:50:30 +0000 Subject: [PATCH 030/587] Ts28.541 rel18 cr1214 adding mapped cell --- OpenAPI/TS28541_5GcNrm.yaml | 6 +++++- OpenAPI/TS28541_NrNrm.yaml | 13 +++++++++++++ 2 files changed, 18 insertions(+), 1 deletion(-) diff --git a/OpenAPI/TS28541_5GcNrm.yaml b/OpenAPI/TS28541_5GcNrm.yaml index 2053089df..825a03d62 100755 --- a/OpenAPI/TS28541_5GcNrm.yaml +++ b/OpenAPI/TS28541_5GcNrm.yaml @@ -3071,7 +3071,9 @@ components: sliceExpiryInfo: $ref: '#/components/schemas/SliceExpiryInfo' SatelliteBackhaulInfoList: - $ref: '#/components/schemas/SatelliteBackhaulInfo' + $ref: '#/components/schemas/SatelliteBackhaulInfo' + mappedCellIdInfoList: + $ref: 'TS28541_NrNrm.yaml#/components/schemas/MappedCellIdInfoList' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' - type: object properties: @@ -3534,6 +3536,8 @@ components: $ref: 'TS28541_NrNrm.yaml#/components/schemas/EphemerisInfos' trpInfoList: $ref: '#/components/schemas/TrpInfoList' + mappedCellIdInfoList: + $ref: 'TS28541_NrNrm.yaml#/components/schemas/MappedCellIdInfoList' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' - type: object properties: diff --git a/OpenAPI/TS28541_NrNrm.yaml b/OpenAPI/TS28541_NrNrm.yaml index 9cfcb39b7..d7a5617a9 100755 --- a/OpenAPI/TS28541_NrNrm.yaml +++ b/OpenAPI/TS28541_NrNrm.yaml @@ -694,6 +694,17 @@ components: minimum: 0 maximum: 16777215 + MappedCellIdInfo: + type: object + properties: + ntnGeoArea: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/GeoArea' + mappedCellId: + $ref: 'TS28541_5GcNrm.yaml#/components/schemas/Ncgi' + MappedCellIdInfoList: + type: array + items: + $ref: '#/components/schemas/MappedCellIdInfo' #-------- Definition of types for name-containments ------ SubNetwork-ncO-NrNrm: type: object @@ -949,6 +960,8 @@ components: type: boolean dDAPSHOControl: type: boolean + mappedCellIdInfoList: + $ref: '#/components/schemas/MappedCellIdInfoList' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' - type: object properties: -- GitLab From fa536912783e340c70bd9b48ad9c18b814bc627d Mon Sep 17 00:00:00 2001 From: lengyelb Date: Fri, 3 May 2024 08:50:43 +0000 Subject: [PATCH 031/587] Rel18_28.111_specificProblem_in_NotifyNewSecAlarm into Integration_Rel18_SA5_154_YAML --- OpenAPI/TS28111_FaultNrm.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/OpenAPI/TS28111_FaultNrm.yaml b/OpenAPI/TS28111_FaultNrm.yaml index c82b1b97a..e5c492096 100644 --- a/OpenAPI/TS28111_FaultNrm.yaml +++ b/OpenAPI/TS28111_FaultNrm.yaml @@ -312,6 +312,8 @@ components: $ref: '#/components/schemas/AlarmType' probableCause: $ref: '#/components/schemas/ProbableCause' + specificProblem: + $ref: '#/components/schemas/SpecificProblem' perceivedSeverity: $ref: '#/components/schemas/PerceivedSeverity' correlatedNotifications: -- GitLab From a21e582e6635647fe47d24637e5a529c58381c86 Mon Sep 17 00:00:00 2001 From: scottma Date: Fri, 3 May 2024 13:47:01 +0000 Subject: [PATCH 032/587] 28.623 Rel-18 CR0344 Add trace message attribute yaml --- OpenAPI/TS28623_TraceControlNrm.yaml | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/OpenAPI/TS28623_TraceControlNrm.yaml b/OpenAPI/TS28623_TraceControlNrm.yaml index fb231f448..8edb3d55d 100644 --- a/OpenAPI/TS28623_TraceControlNrm.yaml +++ b/OpenAPI/TS28623_TraceControlNrm.yaml @@ -403,6 +403,13 @@ components: - mcc - mnc + listOfTraceMetrics: + description: The trace messages to be reported. See 3GPP TS 32.422 clause 10 for additional details. + type: array + items: + type: string + + traceDepth-Type: description: Specifies how detailed information should be recorded in the Network Element. The Trace Depth is a paremeter for Trace Session level, i.e., the Trace Depth is the same for all of the NEs to be traced in the same Trace Session. See 3GPP TS 32.422 clause 5.3 for additional details. type: string @@ -1448,6 +1455,8 @@ components: $ref: '#/components/schemas/plmnTarget-Type' nPNTarget: $ref: 'TS28623_GenericNrm.yaml#/components/schemas/NpnId-Type' + listOfTraceMetrics: + type: array traceReportingConsumerUri: $ref: 'TS28623_ComDefs.yaml#/components/schemas/Uri' traceCollectionEntityIpAddress: -- GitLab From 56279a2a75381bc8d97823df85e79037a670dce5 Mon Sep 17 00:00:00 2001 From: shixixi Date: Tue, 14 May 2024 10:30:03 +0000 Subject: [PATCH 033/587] Update TS28105_AiMlNrm.yaml --- OpenAPI/TS28105_AiMlNrm.yaml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/OpenAPI/TS28105_AiMlNrm.yaml b/OpenAPI/TS28105_AiMlNrm.yaml index 0076200e3..d4c273d45 100644 --- a/OpenAPI/TS28105_AiMlNrm.yaml +++ b/OpenAPI/TS28105_AiMlNrm.yaml @@ -117,6 +117,10 @@ components: AvailMLCapabilityReport: type: object properties: + availMLCapabilityReportID: + type: array + items: + type: string mLCapabilityVersionId: type: array items: -- GitLab From 7f6a6f47b31fd6e728dcf67c82eb18c8f3f82115 Mon Sep 17 00:00:00 2001 From: shixixi Date: Tue, 14 May 2024 11:44:43 +0000 Subject: [PATCH 034/587] Update TS28105_AiMlNrm.yaml --- OpenAPI/TS28105_AiMlNrm.yaml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/OpenAPI/TS28105_AiMlNrm.yaml b/OpenAPI/TS28105_AiMlNrm.yaml index d4c273d45..0076200e3 100644 --- a/OpenAPI/TS28105_AiMlNrm.yaml +++ b/OpenAPI/TS28105_AiMlNrm.yaml @@ -117,10 +117,6 @@ components: AvailMLCapabilityReport: type: object properties: - availMLCapabilityReportID: - type: array - items: - type: string mLCapabilityVersionId: type: array items: -- GitLab From 2a7318fb509ed9ae452c22f55b96b148a11f0042 Mon Sep 17 00:00:00 2001 From: sunse Date: Fri, 31 May 2024 01:55:56 +0000 Subject: [PATCH 035/587] Rel18 (TS28.536 CR0076, TS28.538 CR0077, TS28.541 CR1247, TS28.623 CR0354, TS28.318 CR0004) introducing NrmRoot and removing MnS root --- OpenAPI/TS28318_DsoNrm.yaml | 10 ---------- OpenAPI/TS28536_CoslaNrm.yaml | 16 ---------------- OpenAPI/TS28538_EdgeNrm.yaml | 9 --------- OpenAPI/TS28541_5GcNrm.yaml | 16 ---------------- OpenAPI/TS28541_NrNrm.yaml | 17 ----------------- OpenAPI/TS28541_SliceNrm.yaml | 17 +---------------- OpenAPI/TS28623_GenericNrm.yaml | 19 ++++++++++++++++--- 7 files changed, 17 insertions(+), 87 deletions(-) diff --git a/OpenAPI/TS28318_DsoNrm.yaml b/OpenAPI/TS28318_DsoNrm.yaml index 5fab07886..ef0513472 100644 --- a/OpenAPI/TS28318_DsoNrm.yaml +++ b/OpenAPI/TS28318_DsoNrm.yaml @@ -25,15 +25,6 @@ components: #-------- Definition of concrete IOCs -------------------------------------------- - MnS: - oneOf: - - type: object - properties: - SubNetwork: - type: array - items: - $ref: '#/components/schemas/SubNetwork-ncO-DsoNrm' - SubNetwork-ncO-DsoNrm: type: object properties: @@ -92,6 +83,5 @@ components: resources-DSORecovery: oneOf: - - $ref: '#/components/schemas/MnS' - $ref: '#/components/schemas/OutageAndRecoveryInfo-Single' - $ref: '#/components/schemas/DsoThresholdMonitor-Single' diff --git a/OpenAPI/TS28536_CoslaNrm.yaml b/OpenAPI/TS28536_CoslaNrm.yaml index 99a1b50c0..98f547535 100755 --- a/OpenAPI/TS28536_CoslaNrm.yaml +++ b/OpenAPI/TS28536_CoslaNrm.yaml @@ -140,21 +140,6 @@ components: $ref: '#/components/schemas/AssuranceClosedControlLoop-Multiple' #-------- Definition of concrete IOCs -------------------------------------------- - MnS: - oneOf: - - type: object - properties: - SubNetwork: - type: array - items: - $ref: '#/components/schemas/SubNetwork-ncO-CoslaNrm' - - type: object - properties: - ManagedElement: - type: array - items: - $ref: '#/components/schemas/ManagedElement-ncO-CoslaNrm' - AssuranceClosedControlLoop-Single: allOf: - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' @@ -226,7 +211,6 @@ components: resources-coslaNrm: oneOf: - - $ref: '#/components/schemas/MnS' - $ref: '#/components/schemas/AssuranceClosedControlLoop-Single' - $ref: '#/components/schemas/AssuranceGoal-Single' - $ref: '#/components/schemas/AssuranceReport-Single' diff --git a/OpenAPI/TS28538_EdgeNrm.yaml b/OpenAPI/TS28538_EdgeNrm.yaml index 6745e3fa8..43f7cbefb 100644 --- a/OpenAPI/TS28538_EdgeNrm.yaml +++ b/OpenAPI/TS28538_EdgeNrm.yaml @@ -158,14 +158,6 @@ components: $ref: '#/components/schemas/EdgeDataNetwork-Multiple' #-------- Definition of concrete IOCs -------------------------------------------- - MnS: - oneOf: - - type: object - properties: - SubNetwork: - type: array - items: - $ref: '#/components/schemas/SubNetwork-ncO-EdgeNrm' EdgeDataNetwork-Single: allOf: @@ -415,7 +407,6 @@ components: resources-edgeNrm: oneOf: - - $ref: '#/components/schemas/MnS' - $ref: '#/components/schemas/EASFunction-Single' - $ref: '#/components/schemas/ECSFunction-Single' - $ref: '#/components/schemas/EESFunction-Single' diff --git a/OpenAPI/TS28541_5GcNrm.yaml b/OpenAPI/TS28541_5GcNrm.yaml index 825a03d62..689a50c84 100755 --- a/OpenAPI/TS28541_5GcNrm.yaml +++ b/OpenAPI/TS28541_5GcNrm.yaml @@ -3021,21 +3021,6 @@ components: $ref: '#/components/schemas/MnpfFunction-Multiple' #-------- Definition of concrete IOCs -------------------------------------------- - MnS: - oneOf: - - type: object - properties: - SubNetwork: - type: array - items: - $ref: '#/components/schemas/SubNetwork-ncO-5GcNrm' - - type: object - properties: - ManagedElement: - type: array - items: - $ref: '#/components/schemas/ManagedElement-ncO-5GcNrm' - AmfFunction-Single: allOf: - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' @@ -5767,7 +5752,6 @@ components: resources-5gcNrm: oneOf: - - $ref: '#/components/schemas/MnS' - $ref: '#/components/schemas/AmfFunction-Single' - $ref: '#/components/schemas/SmfFunction-Single' - $ref: '#/components/schemas/UpfFunction-Single' diff --git a/OpenAPI/TS28541_NrNrm.yaml b/OpenAPI/TS28541_NrNrm.yaml index d7a5617a9..2e447e03e 100755 --- a/OpenAPI/TS28541_NrNrm.yaml +++ b/OpenAPI/TS28541_NrNrm.yaml @@ -784,21 +784,6 @@ components: #-------- Definition of concrete IOCs -------------------------------------------- - MnS: - oneOf: - - type: object - properties: - SubNetwork: - type: array - items: - $ref: '#/components/schemas/SubNetwork-ncO-NrNrm' - - type: object - properties: - ManagedElement: - type: array - items: - $ref: '#/components/schemas/ManagedElement-ncO-NrNrm' - GnbDuFunction-Single: allOf: - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' @@ -2189,8 +2174,6 @@ components: resources-nrNrm: oneOf: - - $ref: '#/components/schemas/MnS' - - $ref: '#/components/schemas/GnbDuFunction-Single' - $ref: '#/components/schemas/GnbCuUpFunction-Single' - $ref: '#/components/schemas/GnbCuCpFunction-Single' diff --git a/OpenAPI/TS28541_SliceNrm.yaml b/OpenAPI/TS28541_SliceNrm.yaml index d64929f39..c1a64bfd8 100755 --- a/OpenAPI/TS28541_SliceNrm.yaml +++ b/OpenAPI/TS28541_SliceNrm.yaml @@ -826,19 +826,6 @@ components: #------------ Definition of concrete IOCs ---------------------------------------- - MnS: - oneOf: - - type: object - properties: - SubNetwork: - type: array - items: - $ref: '#/components/schemas/SubNetwork-ncO-SliceNrm' -# - type: object -# properties: -# ManagedElement: -# $ref: '#/components/schemas/ManagedElement-Multiple' - NetworkSlice-Single: allOf: - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' @@ -1082,9 +1069,7 @@ components: #------------ Definitions in TS 28.541 for TS 28.532 ----------------------------- resources-sliceNrm: - oneOf: - - $ref: '#/components/schemas/MnS' - + oneOf: - $ref: '#/components/schemas/NetworkSlice-Single' - $ref: '#/components/schemas/NetworkSliceSubnet-Single' - $ref: '#/components/schemas/EP_Transport-Single' diff --git a/OpenAPI/TS28623_GenericNrm.yaml b/OpenAPI/TS28623_GenericNrm.yaml index 843a9cbcf..16385e044 100755 --- a/OpenAPI/TS28623_GenericNrm.yaml +++ b/OpenAPI/TS28623_GenericNrm.yaml @@ -437,6 +437,10 @@ components: SubNetwork-ncO: type: object properties: + SubNetwork: + $ref: '#/components/schemas/SubNetwork-Multiple' + ManagedElement: + $ref: '#/components/schemas/ManagedElement-Multiple' ManagementNode: $ref: '#/components/schemas/ManagementNode-Multiple' MnsAgent: @@ -688,8 +692,6 @@ components: - $ref: '#/components/schemas/Top' - $ref: '#/components/schemas/SubNetwork-Attr' - $ref: '#/components/schemas/SubNetwork-ncO' - - $ref: '#/components/schemas/SubNetwork-Multiple' - - $ref: '#/components/schemas/ManagedElement-Multiple' - $ref: 'TS28104_MdaNrm.yaml#/components/schemas/SubNetwork-ncO-MdaNrm' - $ref: 'TS28105_AiMlNrm.yaml#/components/schemas/SubNetwork-ncO-AiMlNrm' - $ref: 'TS28312_IntentNrm.yaml#/components/schemas/SubNetwork-ncO-IntentNrm' @@ -712,6 +714,17 @@ components: - $ref: 'TS28541_NrNrm.yaml#/components/schemas/ManagedElement-ncO-NrNrm' - $ref: 'TS28541_5GcNrm.yaml#/components/schemas/ManagedElement-ncO-5GcNrm' + NrmRoot: + oneOf: + - type: object + properties: + SubNetwork: + $ref: '#/components/schemas/SubNetwork-Multiple' + - type: object + properties: + ManagedElement: + $ref: '#/components/schemas/ManagedElement-Multiple' + #-------- Definition of YAML arrays for name-contained IOCs ---------------------- VsDataContainer-Multiple: @@ -756,7 +769,7 @@ components: resources-genericNrm: oneOf: - + - $ref: '#/components/schemas/NrmRoot' - $ref: '#/components/schemas/VsDataContainer-Single' - $ref: '#/components/schemas/ManagementNode-Single' - $ref: '#/components/schemas/MnsAgent-Single' -- GitLab From 5c358fef7e442f8998d901ea4a7e99a904decb9e Mon Sep 17 00:00:00 2001 From: sunse Date: Fri, 31 May 2024 02:11:07 +0000 Subject: [PATCH 036/587] Rel18 TS 28.541 CR1251 correction_to_use_data_type_as_a_dataType Update TS28541_NrNrm.yaml --- OpenAPI/TS28541_NrNrm.yaml | 82 ++++++++++++++++++++------------------ 1 file changed, 44 insertions(+), 38 deletions(-) diff --git a/OpenAPI/TS28541_NrNrm.yaml b/OpenAPI/TS28541_NrNrm.yaml index 2e447e03e..6a93d8d72 100755 --- a/OpenAPI/TS28541_NrNrm.yaml +++ b/OpenAPI/TS28541_NrNrm.yaml @@ -137,75 +137,81 @@ components: type: integer backhaulAddress: $ref: '#/components/schemas/BackhaulAddress' - IntraRatEsActivationOriginalCellLoadParameters: + LoadTimeThreshold: type: object properties: loadThreshold: type: integer timeDuration: type: integer + IntraRatEsActivationOriginalCellLoadParameters: + $ref: '#/components/schemas/LoadTimeThreshold' IntraRatEsActivationCandidateCellsLoadParameters: - type: object - properties: - loadThreshold: - type: integer - timeDuration: - type: integer + $ref: '#/components/schemas/LoadTimeThreshold' IntraRatEsDeactivationCandidateCellsLoadParameters: - type: object - properties: - loadThreshold: - type: integer - timeDuration: - type: integer + $ref: '#/components/schemas/LoadTimeThreshold' EsNotAllowedTimePeriod: type: object properties: - startTimeandendTime: + startTime: type: string - periodOfDay: + description: >- + Time of day is in HH:MM or H:MM 24-hour format per UTC time zone. + Examples, 20:15:00, 20:15:00-08:00 (for 8 hours behind UTC). + endTime: type: string - daysOfWeekList: - type: string - listoftimeperiods: + description: >- + Time of day is in HH:MM or H:MM 24-hour format per UTC time zone. + Examples, 20:15:00, 20:15:00-08:00 (for 8 hours behind UTC). + daysOfWeek: type: string + enum: + - MONDAY + - TUESDAY + - WEDNESDAY + - THURSDAY + - FRIDAY + - SATURDAY + - SUNDAY InterRatEsActivationOriginalCellParameters: - type: object - properties: - loadThreshold: - type: integer - timeDuration: - type: integer + $ref: '#/components/schemas/LoadTimeThreshold' InterRatEsActivationCandidateCellParameters: - type: object - properties: - loadThreshold: - type: integer - timeDuration: - type: integer + $ref: '#/components/schemas/LoadTimeThreshold' InterRatEsDeactivationCandidateCellParameters: - type: object - properties: - loadThreshold: - type: integer - timeDuration: - type: integer + $ref: '#/components/schemas/LoadTimeThreshold' UeAccProbabilityDist: + type: array + items: + $ref: '#/components/schemas/UeAccProbability' + UeAccProbability: type: object properties: targetProbability: type: integer - numberofpreamblessent: + minimum: 0 + maximum: 100 + numberOfPreamblesSent: type: integer + minimum: 0 + maximum: 200 UeAccDelayProbabilityDist: + type: array + items: + $ref: '#/components/schemas/UeAccDelayProbability' + + UeAccDelayProbability: type: object properties: targetProbability: type: integer - accessdelay: + minimum: 0 + maximum: 100 + accessDelay: type: integer + minimum: 10 + maximum: 560 NRPciList: type: array -- GitLab From 2f144c77002eb5534a1a58981298273e2f078464 Mon Sep 17 00:00:00 2001 From: sunse Date: Fri, 31 May 2024 02:18:00 +0000 Subject: [PATCH 037/587] TS28.541_Rel18_CR1244_Remove_duplicate_definition_of_NpnId, Update TS28541_NrNrm.yaml --- OpenAPI/TS28541_NrNrm.yaml | 28 ++-------------------------- 1 file changed, 2 insertions(+), 26 deletions(-) diff --git a/OpenAPI/TS28541_NrNrm.yaml b/OpenAPI/TS28541_NrNrm.yaml index 6a93d8d72..da5bef8f4 100755 --- a/OpenAPI/TS28541_NrNrm.yaml +++ b/OpenAPI/TS28541_NrNrm.yaml @@ -64,35 +64,11 @@ components: PlmnInfoList: type: array items: - $ref: '#/components/schemas/PlmnInfo' - cagId: - type: string - nid: - type: string - NpnIdentity: - type: object - oneOf: - - required: [ plmnId, cagidList ] - - required: [ plmnId, nidList ] - properties: - plmnId: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/PlmnId' - cagidList: - type: array - items: - $ref: '#/components/schemas/cagId' - minItems: 1 - maxItems: 12 - nidList: - type: array - items: - $ref: '#/components/schemas/nid' - minItems: 1 - maxItems: 12 + $ref: '#/components/schemas/PlmnInfo' NpnIdentityList: type: array items: - $ref: '#/components/schemas/NpnIdentity' + $ref: 'TS28623_GenericNrm.yaml#/components/schemas/NpnId-Type' GGnbId: type: string pattern: '^[0-9]{3}[0-9]{2,3}-(22|23|24|25|26|27|28|29|30|31|32)-[0-9]{1,10}' -- GitLab From fc7e51ca8173cd31e365a17a119aba88ad09fe18 Mon Sep 17 00:00:00 2001 From: sunse Date: Mon, 13 May 2024 06:03:18 +0000 Subject: [PATCH 038/587] adding OpenAPI SS for MCE ID to Update TS28541_NrNrm.yaml --- OpenAPI/TS28541_NrNrm.yaml | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/OpenAPI/TS28541_NrNrm.yaml b/OpenAPI/TS28541_NrNrm.yaml index da5bef8f4..0b9e4c484 100755 --- a/OpenAPI/TS28541_NrNrm.yaml +++ b/OpenAPI/TS28541_NrNrm.yaml @@ -687,6 +687,22 @@ components: type: array items: $ref: '#/components/schemas/MappedCellIdInfo' + QceIdMappingInfo: + type: object + properties: + qoECollectionEntityAddress: + oneOf: + - $ref: 'TS28623_ComDefs.yaml#/components/schemas/Ipv4Addr' + - $ref: 'TS28623_ComDefs.yaml#/components/schemas/Ipv6Addr' + qoECollectionEntityIdentity: + type: string + pLMNTarget: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/PlmnId' + QceIdMappingInfoList: + type: array + items: + $ref: '#/components/schemas/QceIdMappingInfo' + #-------- Definition of types for name-containments ------ SubNetwork-ncO-NrNrm: type: object @@ -929,6 +945,8 @@ components: type: boolean mappedCellIdInfoList: $ref: '#/components/schemas/MappedCellIdInfoList' + qceIdMappingInfoList: + $ref: '#/components/schemas/QceIdMappingInfoList' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' - type: object properties: -- GitLab From 2fc7888de27b7b370b39bd8aba8bcf155a39b6e8 Mon Sep 17 00:00:00 2001 From: ruiyue Date: Fri, 10 May 2024 03:39:24 +0000 Subject: [PATCH 039/587] Update file TS28312_IntentNrm.yaml --- OpenAPI/TS28312_IntentNrm.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/OpenAPI/TS28312_IntentNrm.yaml b/OpenAPI/TS28312_IntentNrm.yaml index 5c5e2a302..0d5404e3f 100644 --- a/OpenAPI/TS28312_IntentNrm.yaml +++ b/OpenAPI/TS28312_IntentNrm.yaml @@ -191,6 +191,7 @@ components: enum: - FULFILLED - NOT_FULFILLED + default: NOT_FULFILLED description: It describes the current status of the intent fulfilment result. NotFulfilledState: type: string @@ -202,6 +203,7 @@ components: - SUSPENDED - TERMINATED - FULFILMENTFAILED + default: ACKNOWLEDGED description: It describes the current progress of or the reason for not achieving fulfilment for the intent, intentExpectation or expectationTarget. An attribute which is used when FulfilmentInfo is implemented for IntentFulfilmentInfo -- GitLab From 7143e95dc1c2d9a2cf4c6f0e36bbe97ecc5fbb08 Mon Sep 17 00:00:00 2001 From: ruiyue Date: Wed, 15 May 2024 10:02:36 +0000 Subject: [PATCH 040/587] Upload New File --- OpenAPI/TS28531_NSProvMnS.yaml | 82 ++++++++++++++++++++++++++++++++++ 1 file changed, 82 insertions(+) create mode 100644 OpenAPI/TS28531_NSProvMnS.yaml diff --git a/OpenAPI/TS28531_NSProvMnS.yaml b/OpenAPI/TS28531_NSProvMnS.yaml new file mode 100644 index 000000000..0c1f80de2 --- /dev/null +++ b/OpenAPI/TS28531_NSProvMnS.yaml @@ -0,0 +1,82 @@ +openapi: 3.0.1 +info: + title: Network Slice Provisioning MnS + version: 18.5.0 + description: >- + OAS 3.0.1 definition of the Network Slice Provisioning MnS + © 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). + All rights reserved. +externalDocs: + description: 3GPP TS 28.531; Provisioning + url: http://www.3gpp.org/ftp/Specs/archive/28_series/28.531/ +servers: + - url: '{MnSRoot}/NSProvMnS/{MnSVersion}' + variables: + MnSRoot: + description: See clause 4.4.2 of TS 32.158 + default: http://example.com/3GPPManagement + MnSVersion: + description: Version number of the OpenAPI definition + default: XXX +paths: + /ServiceProfiles: + post: + summary: Create a ServiceProfile + description: To create a ServiceProfile resource to represent network slice related requirements. + requestBody: + required: true + content: + application/json: + schema: + $ref: '#/components/schemas/ServiceProfile-Type' + responses: + '201': + description: Success case ("201 Created"). The representation of the newly created ServiceProfile resource shall be returned. + content: + application/json: + schema: + $ref: '#/components/schemas/ServiceProfileId-Type' + default: + description: Error case. + content: + application/json: + schema: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/ErrorResponseDefault' + + /ServiceProfiles/{ServiceProfileId}: + delete: + summary: Delete a ServiceProfile + description: To delete a ServiceProfile resource to represent network slice related requirements. + parameters: + - name: ServiceProfileId + in: path + description: Identifies an individual ServiceProfille. + required: true + schema: + $ref: '#/components/schemas/ServiceProfileId-Type' + - name: networkSliceDN + in: query + description: Identifies the DN of NetworkSlice MOI uniquely identifying the network slice instance + required: true + schema: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' + responses: + '204': + description: >- + Success case ("204 No Content"). + The ServiceProfile resource has been deleted. The response message body is absent. + default: + description: Error case. + content: + application/json: + schema: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/ErrorResponseDefault' +components: + schemas: + uri-Type: + description: Resource URI + type: string + ServiceProfileId-Type: + $ref: '#/components/schemas/uri-Type' + ServiceProfile-Type: + $ref: 'TS28541_SliceNrm.yaml#/components/schemas/ServiceProfile' \ No newline at end of file -- GitLab From 5e72c02ad6dc12db931e1c47c00b2c1242edcae8 Mon Sep 17 00:00:00 2001 From: ruiyue Date: Wed, 15 May 2024 10:02:57 +0000 Subject: [PATCH 041/587] Upload New File --- TS28531_NSSProvMnS.yaml | 82 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 82 insertions(+) create mode 100644 TS28531_NSSProvMnS.yaml diff --git a/TS28531_NSSProvMnS.yaml b/TS28531_NSSProvMnS.yaml new file mode 100644 index 000000000..7fb2fc8d6 --- /dev/null +++ b/TS28531_NSSProvMnS.yaml @@ -0,0 +1,82 @@ +openapi: 3.0.1 +info: + title: Network Slice Subnet Provisioning MnS + version: 18.5.0 + description: >- + OAS 3.0.1 definition of the Network Slice Suubnet Provisioning MnS + © 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). + All rights reserved. +externalDocs: + description: 3GPP TS 28.531; Provisioning + url: http://www.3gpp.org/ftp/Specs/archive/28_series/28.531/ +servers: + - url: '{MnSRoot}/NSSProvMnS/{MnSVersion}' + variables: + MnSRoot: + description: See clause 4.4.2 of TS 32.158 + default: http://example.com/3GPPManagement + MnSVersion: + description: Version number of the OpenAPI definition + default: XXX +paths: + /SliceProfiles: + post: + summary: Create a SliceProfile + description: To create a SliceeProfile resource to represent network slice subnet related requirements. + requestBody: + required: true + content: + application/json: + schema: + $ref: '#/components/schemas/ServiceProfileId-Type' + responses: + '201': + description: Success case ("201 Created"). The representation of the newly created SliceProfile resource shall be returned. + content: + application/json: + schema: + $ref: '#/components/schemas/SliceProfileId-Type' + default: + description: Error case. + content: + application/json: + schema: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/ErrorResponseDefault' + + /SliceProfiles/{SliceProfileId}: + delete: + summary: Delete a SliceProfile + description: To delete a SliceProfile resource to represent network slice suubnet related requirements. + parameters: + - name: SliceProfileId + in: path + description: Identifies an individual SliceProfille. + required: true + schema: + $ref: '#/components/schemas/SliceProfileId-Type' + - name: networkSliceSubnetDN + in: query + description: Identifies the DN of NetworkSliceSubnet MOI uniquely identifying the network slice subnet instance + required: true + schema: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' + responses: + '204': + description: >- + Success case ("204 No Content"). + The ServiceProfile resource has been deleted. The response message body is absent. + default: + description: Error case. + content: + application/json: + schema: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/ErrorResponseDefault' +components: + schemas: + uri-Type: + description: Resource URI + type: string + SliceProfileId-Type: + $ref: '#/components/schemas/uri-Type' + ServiceProfileId-Type: + $ref: 'TS28541_SliceNrm.yaml#/components/schemas/SliceProfile' \ No newline at end of file -- GitLab From 1900dd38513ab416e9f1eeca36aa822bb43c80a0 Mon Sep 17 00:00:00 2001 From: ruiyue Date: Fri, 10 May 2024 08:30:20 +0000 Subject: [PATCH 042/587] Update 4 files - /OpenAPI/TS28623_FileManagementNrm.yaml - /OpenAPI/TS28623_SubscriptionControlNrm.yaml - /OpenAPI/TS28623_ComDefs.yaml - /OpenAPI/TS28623_TraceControlNrm.yaml --- OpenAPI/TS28623_ComDefs.yaml | 2 ++ OpenAPI/TS28623_FileManagementNrm.yaml | 1 + OpenAPI/TS28623_SubscriptionControlNrm.yaml | 2 ++ OpenAPI/TS28623_TraceControlNrm.yaml | 5 ++++- 4 files changed, 9 insertions(+), 1 deletion(-) diff --git a/OpenAPI/TS28623_ComDefs.yaml b/OpenAPI/TS28623_ComDefs.yaml index 7f3b394e6..f668cc0af 100755 --- a/OpenAPI/TS28623_ComDefs.yaml +++ b/OpenAPI/TS28623_ComDefs.yaml @@ -191,11 +191,13 @@ components: enum: - LOCKED - UNLOCKED + default: LOCKED OperationalState: type: string enum: - ENABLED - DISABLED + default: DISABLED UsageState: type: string enum: diff --git a/OpenAPI/TS28623_FileManagementNrm.yaml b/OpenAPI/TS28623_FileManagementNrm.yaml index 6cdfde23e..d117152d6 100644 --- a/OpenAPI/TS28623_FileManagementNrm.yaml +++ b/OpenAPI/TS28623_FileManagementNrm.yaml @@ -77,6 +77,7 @@ components: enum: - TRUE - FALSE + default: FALSE jobMonitor: $ref: '#/components/schemas/FileDownloadJobProcessMonitor' Files-Single: diff --git a/OpenAPI/TS28623_SubscriptionControlNrm.yaml b/OpenAPI/TS28623_SubscriptionControlNrm.yaml index 750d31833..c9ad4a37c 100644 --- a/OpenAPI/TS28623_SubscriptionControlNrm.yaml +++ b/OpenAPI/TS28623_SubscriptionControlNrm.yaml @@ -58,8 +58,10 @@ components: heartbeatNtfPeriod: type: integer minimum: 0 + default: 0 triggerHeartbeatNtf: type: boolean + default: FALSE #-------- Definition of YAML arrays for name-contained IOCs ---------------------- NtfSubscriptionControl-Multiple: diff --git a/OpenAPI/TS28623_TraceControlNrm.yaml b/OpenAPI/TS28623_TraceControlNrm.yaml index 8edb3d55d..483aedc2c 100644 --- a/OpenAPI/TS28623_TraceControlNrm.yaml +++ b/OpenAPI/TS28623_TraceControlNrm.yaml @@ -29,7 +29,7 @@ components: - TRACE_AND_5GC_UE_LEVEL_MEASUREMENTS - IMMEDIATE_MDT_AND_5GC_UE_LEVEL_MEASUREMENTS - TRACE_AND_IMMEDIATE_MDT_AND_5GC_UE_LEVEL_MEASUREMENTS - + default: TRACE_ONLY listOfInterfaces-Type: description: The interfaces to be recorded in the Network Element. See 3GPP TS 32.422 clause 5.5 for additional details. type: object @@ -420,6 +420,7 @@ components: - VENDORMINIMUM - VENDORMEDIUM - VENDORMAXIMUM + default: MAXIMUM traceReference-Type: type: object @@ -442,6 +443,7 @@ components: enum: - FILE-BASED - STREAMING + default: FILE-BASED traceTarget-Type: type: object @@ -631,6 +633,7 @@ components: enum: - NO_IDENTITY - TAC_OF_IMEI + default: NO_IDENTITY beamLevelMeasurement-Type: description: Determines whether beam level measurements shall be included in case of immediate MDT M1 measurement in NR. For additional details see 3GPP TS 32.422 clause 5.10.40. -- GitLab From 532c50ce6a8881d3991672a46e6e1dd6a47d5ad2 Mon Sep 17 00:00:00 2001 From: ruiyue Date: Fri, 31 May 2024 06:31:10 +0000 Subject: [PATCH 043/587] Move NSSProvMnS yaml file to openAPI file --- TS28531_NSSProvMnS.yaml => OpenAPI/TS28531_NSSProvMnS.yaml | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename TS28531_NSSProvMnS.yaml => OpenAPI/TS28531_NSSProvMnS.yaml (100%) diff --git a/TS28531_NSSProvMnS.yaml b/OpenAPI/TS28531_NSSProvMnS.yaml similarity index 100% rename from TS28531_NSSProvMnS.yaml rename to OpenAPI/TS28531_NSSProvMnS.yaml -- GitLab From 5a899d51654538322e7eeef40e80d322f3fbdcfe Mon Sep 17 00:00:00 2001 From: ruiyue Date: Mon, 3 Jun 2024 00:25:33 +0000 Subject: [PATCH 044/587] Update README file to include new files for slicing provisioning --- OpenAPI/README.md | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/OpenAPI/README.md b/OpenAPI/README.md index dd808586c..c0e969a34 100644 --- a/OpenAPI/README.md +++ b/OpenAPI/README.md @@ -134,6 +134,14 @@ The links below will open the Swagger Editor/UI and auto-load the OpenAPI YAML f ([Editor](https://forge.3gpp.org/swagger/tools/loader.html?yaml=OpenAPI/TS28532_StreamingDataMnS.yaml)) ([UI](https://forge.3gpp.org/swagger/tools/loader.html?action=ui&yaml=OpenAPI/TS28532_StreamingDataMnS.yaml)) +* Network Slice Provisioning MnS (TS 28.531) +([Editor](https://forge.3gpp.org/swagger/tools/loader.html?yaml=OpenAPI/TS28531_NSProvMnS.yaml)) +([UI](https://forge.3gpp.org/swagger/tools/loader.html?action=ui&yaml=OpenAPI/TS28531_NSProvMnS.yaml)) + +* Network Slice Subnet Provisioning MnS (TS 28.531) +([Editor](https://forge.3gpp.org/swagger/tools/loader.html?yaml=OpenAPI/TS28531_NSSProvMnS.yaml)) +([UI](https://forge.3gpp.org/swagger/tools/loader.html?action=ui&yaml=OpenAPI/TS28531_NSSProvMnS.yaml)) + ## Tools * [Frontend](https://forge.3gpp.org/swagger/tools/GitlabOpenAPIFrontend.htm) to invoke the Swagger Editor, Swagger UI, or to parse OpenAPI files with APIDevTools Swagger Parser/Validator, or to search for APIs referencing a data structure -- GitLab From 6a36c94fb87cfa2a4adc231ba66bd8b904b45c05 Mon Sep 17 00:00:00 2001 From: Shitao Li Date: Fri, 17 May 2024 07:03:49 +0000 Subject: [PATCH 045/587] Update TS28541_5GcNrm.yaml --- OpenAPI/TS28541_5GcNrm.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/OpenAPI/TS28541_5GcNrm.yaml b/OpenAPI/TS28541_5GcNrm.yaml index 689a50c84..14b0bef8e 100755 --- a/OpenAPI/TS28541_5GcNrm.yaml +++ b/OpenAPI/TS28541_5GcNrm.yaml @@ -3288,6 +3288,8 @@ components: $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' dynamic5QISetRef: $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' + predefinedPccRuleSetRef: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' - type: object properties: -- GitLab From 9dd8bf9c241aca7aafd76425866b82e6a92c6b19 Mon Sep 17 00:00:00 2001 From: Shitao Li Date: Thu, 30 May 2024 05:57:46 +0000 Subject: [PATCH 046/587] Update TS28541_5GcNrm.yaml --- OpenAPI/TS28541_5GcNrm.yaml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/OpenAPI/TS28541_5GcNrm.yaml b/OpenAPI/TS28541_5GcNrm.yaml index 14b0bef8e..9c3e7dfe2 100755 --- a/OpenAPI/TS28541_5GcNrm.yaml +++ b/OpenAPI/TS28541_5GcNrm.yaml @@ -3288,7 +3288,7 @@ components: $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' dynamic5QISetRef: $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' - predefinedPccRuleSetRef: + predefinedPccRuleSetRefs: $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' - type: object @@ -3307,8 +3307,6 @@ components: $ref: '#/components/schemas/EP_Rx-Multiple' EP_N84: $ref: '#/components/schemas/EP_N84-Multiple' - PredefinedPccRuleSet: - $ref: '#/components/schemas/PredefinedPccRuleSet-Single' AusfFunction-Single: allOf: -- GitLab From f510dfbe95c2d1ba4e02d972f238b6451faf8f34 Mon Sep 17 00:00:00 2001 From: chenxiu Date: Tue, 14 May 2024 09:16:24 +0000 Subject: [PATCH 047/587] Correct undefined dataType of attribute properties --- OpenAPI/TS28541_SliceNrm.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/OpenAPI/TS28541_SliceNrm.yaml b/OpenAPI/TS28541_SliceNrm.yaml index c1a64bfd8..2fe0726fd 100755 --- a/OpenAPI/TS28541_SliceNrm.yaml +++ b/OpenAPI/TS28541_SliceNrm.yaml @@ -765,7 +765,7 @@ components: RequestedReservationExpiration: description: >- An attribute which specifies MnS consuner's requirements for the validity period of the resource reservation. - type: string + $ref: 'TS28623_ComDefs.yaml#/components/schemas/TimeWindow' ResourceReservationStatus: description: >- An attribute which specifies the resource reservation result for the feasibility check job. @@ -777,7 +777,7 @@ components: ReservationExpiration: description: >- An attribute which specifies the actual validity period of the resource reservation.. - type: string + $ref: 'TS28623_ComDefs.yaml#/components/schemas/TimeWindow' ReservationFailureReason: description: >- An attribute that specifies the additional reason information if the reservation is failed. -- GitLab From f8b4b3ac3f1e971621054a88a0d2d63ff56262c4 Mon Sep 17 00:00:00 2001 From: chenxiu Date: Mon, 3 Jun 2024 01:57:36 +0000 Subject: [PATCH 048/587] TS28.623_Rel18_CR0353_Change_NpnId_from_dataType_to_choice --- OpenAPI/TS28623_GenericNrm.yaml | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/OpenAPI/TS28623_GenericNrm.yaml b/OpenAPI/TS28623_GenericNrm.yaml index 16385e044..24855fc4b 100755 --- a/OpenAPI/TS28623_GenericNrm.yaml +++ b/OpenAPI/TS28623_GenericNrm.yaml @@ -331,7 +331,6 @@ components: maximum: 31 NpnId-Type: type: object - description: This describes the PLMN id, CAG ID list or the NID of the SNPN within the PLMN. properties: plmnId: $ref: 'TS28623_ComDefs.yaml#/components/schemas/PlmnId' @@ -339,10 +338,17 @@ components: type: array items: type: string + minItems: 1 + maxItems: 256 nIDList: type: array items: $ref: 'TS28623_ComDefs.yaml#/components/schemas/Nid' + minItems: 1 + maxItems: 16 + oneOf: + - required: [plmnId, cAGIdList] + - required: [plmnId, nIDList] #-------- Definition of abstract IOC Top ----------------------------------------- -- GitLab From 71edf50ed02a4a187a273027d81bc033df647361 Mon Sep 17 00:00:00 2001 From: scottma Date: Mon, 13 May 2024 20:51:02 +0000 Subject: [PATCH 049/587] Update TS28623_TraceControlNrm.yaml --- OpenAPI/TS28623_TraceControlNrm.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OpenAPI/TS28623_TraceControlNrm.yaml b/OpenAPI/TS28623_TraceControlNrm.yaml index 483aedc2c..d3b8c8277 100644 --- a/OpenAPI/TS28623_TraceControlNrm.yaml +++ b/OpenAPI/TS28623_TraceControlNrm.yaml @@ -404,7 +404,7 @@ components: - mnc listOfTraceMetrics: - description: The trace messages to be reported. See 3GPP TS 32.422 clause 10 for additional details. + description: The trace metrics to be reported. See 3GPP TS 32.422 clause 10 for additional details. type: array items: type: string -- GitLab From d033d164f4d12df323404e2f817fe4516a827c78 Mon Sep 17 00:00:00 2001 From: shixixi Date: Thu, 30 May 2024 07:35:55 +0000 Subject: [PATCH 050/587] Update TS28541_NrNrm.yaml --- OpenAPI/TS28541_NrNrm.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/OpenAPI/TS28541_NrNrm.yaml b/OpenAPI/TS28541_NrNrm.yaml index 0b9e4c484..1a5f3ce37 100755 --- a/OpenAPI/TS28541_NrNrm.yaml +++ b/OpenAPI/TS28541_NrNrm.yaml @@ -460,9 +460,9 @@ components: enum: - ENABLE - DISABLE - RIMRSScrambleTimerMultiplier: + rIMRSScrambleTimerMultiplier: type: integer - RIMRSScrambleTimerOffset: + rIMRSScrambleTimerOffset: type: integer TimeDomainPara: -- GitLab From 3b1a174830f51ec81ecb5570c1d9c4bd0f823888 Mon Sep 17 00:00:00 2001 From: shixixi Date: Mon, 3 Jun 2024 05:09:51 +0000 Subject: [PATCH 051/587] TS_28.541_Rel-18_CR1257_Add_missing_definition_of_RIM_related_parameters --- OpenAPI/TS28541_NrNrm.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/OpenAPI/TS28541_NrNrm.yaml b/OpenAPI/TS28541_NrNrm.yaml index 1a5f3ce37..8da60c34e 100755 --- a/OpenAPI/TS28541_NrNrm.yaml +++ b/OpenAPI/TS28541_NrNrm.yaml @@ -435,6 +435,9 @@ components: type: integer rimRSCommonCarrierReferencePoint: type: integer + minimum: 0 + maximum: 3279165 + rimRSStartingFrequencyOffsetIdList: type: array items: -- GitLab From 184e0a84cbf2ee8e14a579741f73d23a826539e1 Mon Sep 17 00:00:00 2001 From: shixixi Date: Tue, 14 May 2024 12:14:00 +0000 Subject: [PATCH 052/587] Update TS28104_MdaNrm.yaml --- OpenAPI/TS28104_MdaNrm.yaml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/OpenAPI/TS28104_MdaNrm.yaml b/OpenAPI/TS28104_MdaNrm.yaml index 9759ac7d1..474d1cb2f 100644 --- a/OpenAPI/TS28104_MdaNrm.yaml +++ b/OpenAPI/TS28104_MdaNrm.yaml @@ -138,6 +138,10 @@ components: properties: supportedMDACapabilities: $ref: '#/components/schemas/MDATypes' + mlModelRef: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' + aIMLInferenceFunctionRef: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' - type: object properties: -- GitLab From c91f1fded8d14634fcf51ee442b50ba763c9ada2 Mon Sep 17 00:00:00 2001 From: shixixi Date: Wed, 15 May 2024 01:40:37 +0000 Subject: [PATCH 053/587] Update TS28541_NrNrm.yaml --- OpenAPI/TS28541_NrNrm.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/OpenAPI/TS28541_NrNrm.yaml b/OpenAPI/TS28541_NrNrm.yaml index 8da60c34e..7b1412779 100755 --- a/OpenAPI/TS28541_NrNrm.yaml +++ b/OpenAPI/TS28541_NrNrm.yaml @@ -1515,7 +1515,7 @@ components: enum: - IS_NOT_ENERGY_SAVING - IS_ENERGY_SAVING - mLEntityRef: + mLModelRef: $ref: "#'TS28623_ComDefs.yaml#/components/schemas/Dn'" aIMLInferenceFunctionRef: $ref: "#'TS28623_ComDefs.yaml#/components/schemas/Dn'" @@ -1552,7 +1552,7 @@ components: $ref: '#/components/schemas/MinimumTimeBetweenHoTriggerChange' tstoreUEcntxt: $ref: '#/components/schemas/TstoreUEcntxt' - mLEntityRef: + mLModelRef: $ref: "#'TS28623_ComDefs.yaml#/components/schemas/Dn'" aIMLInferenceFunctionRef: $ref: "#'TS28623_ComDefs.yaml#/components/schemas/Dn'" @@ -1570,7 +1570,7 @@ components: $ref: '#/components/schemas/MaximumDeviationHoTrigger' minimumTimeBetweenHoTriggerChange: $ref: '#/components/schemas/MinimumTimeBetweenHoTriggerChange' - mLEntityRef: + mLModelRef: $ref: "#'TS28623_ComDefs.yaml#/components/schemas/Dn'" aIMLInferenceFunctionRef: $ref: "#'TS28623_ComDefs.yaml#/components/schemas/Dn'" -- GitLab From dfde807aedfc46934cfa26489a2d8821f0598fa7 Mon Sep 17 00:00:00 2001 From: shixixi Date: Thu, 30 May 2024 09:28:55 +0000 Subject: [PATCH 054/587] Update TS28541_NrNrm.yaml --- OpenAPI/TS28541_NrNrm.yaml | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/OpenAPI/TS28541_NrNrm.yaml b/OpenAPI/TS28541_NrNrm.yaml index 7b1412779..17a7a9b02 100755 --- a/OpenAPI/TS28541_NrNrm.yaml +++ b/OpenAPI/TS28541_NrNrm.yaml @@ -1515,10 +1515,10 @@ components: enum: - IS_NOT_ENERGY_SAVING - IS_ENERGY_SAVING - mLModelRef: - $ref: "#'TS28623_ComDefs.yaml#/components/schemas/Dn'" - aIMLInferenceFunctionRef: - $ref: "#'TS28623_ComDefs.yaml#/components/schemas/Dn'" + mLModelRefList: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList' + aIMLInferenceFunctionRefList: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList' DRACHOptimizationFunction-Single: allOf: - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' @@ -1552,10 +1552,10 @@ components: $ref: '#/components/schemas/MinimumTimeBetweenHoTriggerChange' tstoreUEcntxt: $ref: '#/components/schemas/TstoreUEcntxt' - mLModelRef: - $ref: "#'TS28623_ComDefs.yaml#/components/schemas/Dn'" - aIMLInferenceFunctionRef: - $ref: "#'TS28623_ComDefs.yaml#/components/schemas/Dn'" + mLModelRefList: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList' + aIMLInferenceFunctionRefList: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList' DLBOFunction-Single: allOf: - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' @@ -1570,10 +1570,10 @@ components: $ref: '#/components/schemas/MaximumDeviationHoTrigger' minimumTimeBetweenHoTriggerChange: $ref: '#/components/schemas/MinimumTimeBetweenHoTriggerChange' - mLModelRef: - $ref: "#'TS28623_ComDefs.yaml#/components/schemas/Dn'" - aIMLInferenceFunctionRef: - $ref: "#'TS28623_ComDefs.yaml#/components/schemas/Dn'" + mLModelRefList: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList' + aIMLInferenceFunctionRefList: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList' DPCIConfigurationFunction-Single: allOf: - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' -- GitLab From 0c99d494efffb2257dc6817302bb296faa260171 Mon Sep 17 00:00:00 2001 From: allwang Date: Fri, 17 May 2024 13:22:03 +0000 Subject: [PATCH 055/587] Rename attributes of 5GC UE measurements to make clear that these are core measurements in comparison to radio measurements (MDT) --- OpenAPI/TS28623_TraceControlNrm.yaml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/OpenAPI/TS28623_TraceControlNrm.yaml b/OpenAPI/TS28623_TraceControlNrm.yaml index d3b8c8277..0441c2f4d 100644 --- a/OpenAPI/TS28623_TraceControlNrm.yaml +++ b/OpenAPI/TS28623_TraceControlNrm.yaml @@ -1378,13 +1378,13 @@ components: loggedMDTConfig: $ref: '#/components/schemas/loggedMDTConfig-Type' - UEMeasConfig-Type: + UECoreMeasConfig-Type: description: UE level measurements configuration parameters for 5G system. See details in 3GPP TS 28.622 clause 4.3.x. type: object properties: - ueMeasurements: + ueCoreMeasurements: type: string - ueMeasGranularityPeriod: + ueCoreMeasGranularityPeriod: type: integer nfTypeToMeasure: type: string @@ -1476,8 +1476,8 @@ components: $ref: '#/components/schemas/traceConfig-Type' mdtConfig: $ref: '#/components/schemas/mdtConfig-Type' - ueMeasConfig: - $ref: '#/components/schemas/UEMeasConfig-Type' + ueCoreMeasConfig: + $ref: '#/components/schemas/UECoreMeasConfig-Type' #-------- end of Definition of types used in Trace control NRM fragment ---------- -- GitLab From 1be2a4105a01675acc2ff20cb38ffd9b69d5bf89 Mon Sep 17 00:00:00 2001 From: swaminathan1 Date: Wed, 15 May 2024 05:20:01 +0000 Subject: [PATCH 056/587] Alignment of QMC job attributes with Stage 2 --- OpenAPI/TS28623_QoEMeasurementCollectionNrm.yaml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/OpenAPI/TS28623_QoEMeasurementCollectionNrm.yaml b/OpenAPI/TS28623_QoEMeasurementCollectionNrm.yaml index 27c4f7d1e..257965e40 100644 --- a/OpenAPI/TS28623_QoEMeasurementCollectionNrm.yaml +++ b/OpenAPI/TS28623_QoEMeasurementCollectionNrm.yaml @@ -60,6 +60,11 @@ components: - PLAYOUTDELAYFORMEDIA_STARTUP minItems: 0 maxItems: 2 + mBSCommunicationServiceType: + type: string + enum: + - BROADCAST + - MULTICAST #-------- Definition of YAML arrays for name-contained IOCs ---------------------- -- GitLab From 676311ed81916fac5b74545c59d9ef20bcf636e0 Mon Sep 17 00:00:00 2001 From: swaminathan1 Date: Fri, 7 Jun 2024 04:13:26 +0000 Subject: [PATCH 057/587] Rel18 Ts28.541 CR1264 add mdt user consent req list to yaml --- OpenAPI/TS28541_5GcNrm.yaml | 2 ++ OpenAPI/TS28541_NrNrm.yaml | 19 ++++++++++++++++++- 2 files changed, 20 insertions(+), 1 deletion(-) diff --git a/OpenAPI/TS28541_5GcNrm.yaml b/OpenAPI/TS28541_5GcNrm.yaml index 9c3e7dfe2..cd4f282ca 100755 --- a/OpenAPI/TS28541_5GcNrm.yaml +++ b/OpenAPI/TS28541_5GcNrm.yaml @@ -3059,6 +3059,8 @@ components: $ref: '#/components/schemas/SatelliteBackhaulInfo' mappedCellIdInfoList: $ref: 'TS28541_NrNrm.yaml#/components/schemas/MappedCellIdInfoList' + mdtUserConsentReqList: + $ref: 'TS28541_NrNrm.yaml#/components/schemas/MdtUserConsentReqList' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' - type: object properties: diff --git a/OpenAPI/TS28541_NrNrm.yaml b/OpenAPI/TS28541_NrNrm.yaml index 17a7a9b02..6aa050293 100755 --- a/OpenAPI/TS28541_NrNrm.yaml +++ b/OpenAPI/TS28541_NrNrm.yaml @@ -704,7 +704,22 @@ components: QceIdMappingInfoList: type: array items: - $ref: '#/components/schemas/QceIdMappingInfo' + $ref: '#/components/schemas/QceIdMappingInfo' + MdtUserConsentReqList: + type: array + items: + type: string + enum: + - M1 + - M2 + - M3 + - M4 + - M5 + - M6 + - M7 + - M8 + - M9 + - MDT_UE_LOCATION #-------- Definition of types for name-containments ------ SubNetwork-ncO-NrNrm: @@ -950,6 +965,8 @@ components: $ref: '#/components/schemas/MappedCellIdInfoList' qceIdMappingInfoList: $ref: '#/components/schemas/QceIdMappingInfoList' + mdtUserConsentReqList: + $ref: '#/components/schemas/MdtUserConsentReqList' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' - type: object properties: -- GitLab From 0a11bfd36243a55f082de242bcc2829e63c3d9d4 Mon Sep 17 00:00:00 2001 From: sunse Date: Fri, 7 Jun 2024 04:17:33 +0000 Subject: [PATCH 058/587] Rel18 TS28.105 CR0147 align the stage 2 to update the stage 3 --- OpenAPI/TS28105_AiMlNrm.yaml | 181 ++++++++++++++++++----------------- 1 file changed, 94 insertions(+), 87 deletions(-) diff --git a/OpenAPI/TS28105_AiMlNrm.yaml b/OpenAPI/TS28105_AiMlNrm.yaml index 0076200e3..abb19044c 100644 --- a/OpenAPI/TS28105_AiMlNrm.yaml +++ b/OpenAPI/TS28105_AiMlNrm.yaml @@ -18,7 +18,7 @@ components: MLContext: type: object properties: - inferenceEntityRef: + inferenceModelRef: $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList' dataProviderRef: $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList' @@ -71,6 +71,9 @@ components: type: array items: $ref: 'TS28623_ThresholdMonitorNrm.yaml#/components/schemas/ThresholdInfo' + managedActivationScope: + $ref: '#/components/schemas/ManagedActivationScope' + SupportedPerfIndicator: type: object @@ -106,7 +109,7 @@ components: MLCapabilityInfo: type: object properties: - inferenceType: + aIMLInferenceName: type: string capabilityName: type: string @@ -117,6 +120,8 @@ components: AvailMLCapabilityReport: type: object properties: + availMLCapabilityReportID: + type: string mLCapabilityVersionId: type: array items: @@ -125,7 +130,7 @@ components: type: array items: $ref: '#/components/schemas/ModelPerformance' - mLEntityRef: + mLModelRef: $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList' InferenceOutput: @@ -135,7 +140,7 @@ components: type: array items: type: string - inferenceType: + aIMLInferenceName: type: string inferenceOutputTime: type: array @@ -156,8 +161,8 @@ components: $ref: '#/components/schemas/MLTrainingFunction-Multiple' MLTestingFunction: $ref: '#/components/schemas/MLTestingFunction-Multiple' - MLEntityRepository: - $ref: '#/components/schemas/MLEntityRepository-Multiple' + MLModelRepository: + $ref: '#/components/schemas/MLModelRepository-Multiple' MLUpdateFunction: $ref: '#/components/schemas/MLUpdateFunction-Multiple' AIMLInferenceFunction: @@ -172,8 +177,8 @@ components: $ref: '#/components/schemas/MLTrainingFunction-Multiple' MLTestingFunction: $ref: '#/components/schemas/MLTestingFunction-Multiple' - MLEntityRepository: - $ref: '#/components/schemas/MLEntityRepository-Multiple' + MLModelRepository: + $ref: '#/components/schemas/MLModelRepository-Multiple' MLUpdateFunction: $ref: '#/components/schemas/MLUpdateFunction-Multiple' AIMLInferenceFunction: @@ -193,7 +198,7 @@ components: - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-Attr' - type: object properties: - mLEntityRepositoryRef: + mLModelRepositoryRef: $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' - type: object @@ -206,6 +211,10 @@ components: $ref: '#/components/schemas/MLTrainingReport-Multiple' ThresholdMonitors: $ref: 'TS28623_ThresholdMonitorNrm.yaml#/components/schemas/ThresholdMonitor-Multiple' + MLTestingRequest: + $ref: '#/components/schemas/MLTestingRequest-Multiple' + MLTestingReport: + $ref: '#/components/schemas/MLTestingReport-Multiple' MLTrainingRequest-Single: allOf: @@ -216,7 +225,7 @@ components: allOf: - type: object properties: - inferenceType: + aIMLInferenceName: type: string candidateTrainingDataSource: type: array @@ -238,9 +247,9 @@ components: type: boolean suspendRequest: type: boolean - mLEntityToTrainRef: + mLModelRef: $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' - mLEntityCoordinationGroupToTrainRef: + mLModelCoordinationGroupRef: $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' MLTrainingProcess-Single: @@ -267,12 +276,14 @@ components: type: boolean suspendProcess: type: boolean - trainingRequestRef: + trainingRequestRef: ## Figure 7.3a.1.1.1-1 has no such pointer $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList' trainingReportRef: $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' - mLEntityRef: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList' + mLModelGeneratedRef: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' + mLModelRef: ## Figure 7.3a.1.1.1-1 is 1-0..1 mapping, hence should be single + $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' MLTrainingReport-Single: allOf: @@ -283,17 +294,11 @@ components: allOf: - type: object properties: - areConsumerTrainingDataUsed: - type: string - enum: - - ALL - - PARTIALLY - - NONE usedConsumerTrainingData: type: array items: type: string - modelconfidenceIndication: + modelConfidenceIndication: type: integer modelPerformanceTraining: type: array @@ -313,11 +318,11 @@ components: $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' lastTrainingRef: $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' - mLEnityGeneratedRef: + mLModelGeneratedRef: $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' - mLEntityCoordinationGroupGeneratedRef: + mLModelCoordinationGroupGeneratedRef: $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' - mLEntityRef: + mLModelRef: $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList' MLTestingFunction-Single: @@ -329,8 +334,8 @@ components: allOf: - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-Attr' - type: object - properties: - mLEntityRef: + properties: ##FIXME pointer to MLModelCoordinationGroup missing + mLModelRef: $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' - type: object @@ -348,6 +353,9 @@ components: attributes: allOf: - type: object + oneOf: + - required: [ requestStatus, mLModelToTestRef ] + - required: [ requestStatus, mLModelCoordinationGroupToTestRef ] properties: requestStatus: $ref: '#/components/schemas/RequestStatus' @@ -355,9 +363,9 @@ components: type: boolean suspendRequest: type: boolean - mLEntityToTestRef: + mLModelRef: $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' - mLEntityCoordinationGroupToTestRef: + mLModelCoordinationGroupRef: $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' MLTestingReport-Single: @@ -378,7 +386,7 @@ components: testingRequestRef: $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' - MLEntityLoadingRequest-Single: + MLModelLoadingRequest-Single: allOf: - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' - type: object @@ -393,10 +401,10 @@ components: type: boolean suspendRequest: type: boolean - mLEntityToLoadRef: + mLModelToLoadRef: $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' - MLEntityLoadingPolicy-Single: + MLModelLoadingPolicy-Single: allOf: - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' - type: object @@ -405,14 +413,14 @@ components: allOf: - type: object properties: - inferenceType: + aIMLInferenceName: type: string policyForLoading: $ref: '#/components/schemas/AIMLManagementPolicy' - mLEntityRef: + mLModelRef: $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList' - MLEntityLoadingProcess-Single: + MLModelLoadingProcess-Single: allOf: - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' - type: object @@ -427,16 +435,14 @@ components: type: boolean suspendProcess: type: boolean - resumeProcess: - type: boolean - MLEntityLoadingRequestRef: + mLModelLoadingRequestRef: $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' - MLEntityLoadingPolicyRef: + mLModelLoadingPolicyRef: $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' - LoadedMLEntityRef: + loadedMLModelRef: $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' - MLEntity-Single: + MLModel-Single: allOf: - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' - type: object @@ -444,11 +450,11 @@ components: attributes: type: object properties: - mLEntityId: + mLModelId: type: string - inferenceType: + aIMLInferenceName: type: string - mLEntityVersion: + mLModelVersion: type: string expectedRunTimeContext: $ref: '#/components/schemas/MLContext' @@ -464,27 +470,20 @@ components: $ref: '#/components/schemas/MLCapabilityInfo' retrainingEventsMonitorRef: $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' - sourceTrainedMLEntityRef: + sourceTrainedMLModelRef: $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' - MLEntityRepository-Single: + MLModelRepository-Single: allOf: - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' - type: object properties: - attributes: - type: object - properties: - mLEntityRef: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList' - - type: object - properties: - MLEntity: - $ref: '#/components/schemas/MLEntity-Multiple' - MLEntityCoordinationGroup: - $ref: '#/components/schemas/MLEntityCoordinationGroup-Multiple' + MLModel: + $ref: '#/components/schemas/MLModel-Multiple' + MLModelCoordinationGroup: + $ref: '#/components/schemas/MLModelCoordinationGroup-Multiple' - MLEntityCoordinationGroup-Single: + MLModelCoordinationGroup-Single: allOf: - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' - type: object @@ -492,7 +491,7 @@ components: attributes: type: object properties: - memberMLEntityRefList: + memberMLModelRefList: $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList' ## 7.3a.4.1 IOC @@ -508,7 +507,7 @@ components: properties: availMLCapabilityReport: $ref: '#/components/schemas/AvailMLCapabilityReport' - mLEntityRef: + mLModelRef: $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' - type: object @@ -548,7 +547,7 @@ components: type: boolean mLUpdateProcessRef: $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' - mLEntityRef: + mLModelRef: $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList' MLUpdateProcess-Single: @@ -561,7 +560,7 @@ components: properties: progressStatus: $ref: '#/components/schemas/ProcessMonitor' - mLEntityRef: + mLModelRef: $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList' mLUpdateRequestRef: $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList' @@ -578,7 +577,7 @@ components: properties: updatedMLCapability: $ref: '#/components/schemas/AvailMLCapabilityReport' - mLEntityRef: + mLModelRef: $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList' mLUpdateProcessRef: $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' @@ -599,16 +598,24 @@ components: - ACTIVATED - DEACTIVATED managedActivationScope: - $ref: '#/components/schemas/ManagedActivationScope' + $ref: '#/components/schemas/AIMLManagementPolicy' usedByFunctionRefList: $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList' - mLEntityRef: # FIXME S5-240805,S5-240917 both define here + mLModelRef: $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' - type: object properties: AIMLInferenceReport: $ref: '#/components/schemas/AIMLInferenceReport-Multiple' + MLModelLoadingRequest: + $ref: '#/components/schemas/MLModelLoadingRequest-Multiple' + MLModelLoadingProcess: + $ref: '#/components/schemas/MLModelLoadingProcess-Multiple' + MLModelLoadingPolicy: + $ref: '#/components/schemas/MLModelLoadingPolicy-Multiple' + MLModel: + $ref: '#/components/schemas/MLModel-Multiple' AIMLInferenceReport-Single: allOf: @@ -619,12 +626,12 @@ components: allOf: - type: object properties: - inferenceOutputs: #stage 2: attribute table name as: aimlInferenceOutputs FIXME + inferenceOutputs: type: array items: $ref: '#/components/schemas/InferenceOutput' minItems: 1 - mLEntityRef: + mLModelRef: $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList' AIMLInferenceEmulationFunction-Single: @@ -637,8 +644,8 @@ components: - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-Attr' - type: object properties: - AIMLInferenceEmulationReportRefs: # FIXME stage 2 of IOC AIMLInferenceEmulationReport missing - $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList' + AIMLInferenceEmulationReport: + $ref: '#/components/schemas/AIMLInferenceReport-Multiple' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' #-------- Definition of JSON arrays for name-contained IOCs ---------------------- @@ -659,18 +666,18 @@ components: type: array items: $ref: '#/components/schemas/MLTrainingReport-Single' - MLEntity-Multiple: + MLModel-Multiple: type: array items: - $ref: '#/components/schemas/MLEntity-Single' - MLEntityRepository-Multiple: + $ref: '#/components/schemas/MLModel-Single' + MLModelRepository-Multiple: type: array items: - $ref: '#/components/schemas/MLEntityRepository-Single' - MLEntityCoordinationGroup-Multiple: + $ref: '#/components/schemas/MLModelRepository-Single' + MLModelCoordinationGroup-Multiple: type: array items: - $ref: '#/components/schemas/MLEntityCoordinationGroup-Single' + $ref: '#/components/schemas/MLModelCoordinationGroup-Single' MLTestingFunction-Multiple: type: array items: @@ -683,18 +690,18 @@ components: type: array items: $ref: '#/components/schemas/MLTestingRequest-Single' - MLEntityLoadingRequest-Multiple: + MLModelLoadingRequest-Multiple: type: array items: - $ref: '#/components/schemas/MLEntityLoadingRequest-Single' - MLEntityLoadingProcess-Multiple: + $ref: '#/components/schemas/MLModelLoadingRequest-Single' + MLModelLoadingProcess-Multiple: type: array items: - $ref: '#/components/schemas/MLEntityLoadingProcess-Single' - MLEntityLoadingPolicy-Multiple: + $ref: '#/components/schemas/MLModelLoadingProcess-Single' + MLModelLoadingPolicy-Multiple: type: array items: - $ref: '#/components/schemas/MLEntityLoadingPolicy-Single' + $ref: '#/components/schemas/MLModelLoadingPolicy-Single' MLUpdateFunction-Multiple: type: array items: @@ -731,15 +738,15 @@ components: - $ref: '#/components/schemas/MLTrainingRequest-Single' - $ref: '#/components/schemas/MLTrainingProcess-Single' - $ref: '#/components/schemas/MLTrainingReport-Single' - - $ref: '#/components/schemas/MLEntity-Single' - - $ref: '#/components/schemas/MLEntityRepository-Single' - - $ref: '#/components/schemas/MLEntityCoordinationGroup-Single' + - $ref: '#/components/schemas/MLModel-Single' + - $ref: '#/components/schemas/MLModelRepository-Single' + - $ref: '#/components/schemas/MLModelCoordinationGroup-Single' - $ref: '#/components/schemas/MLTestingFunction-Single' - $ref: '#/components/schemas/MLTestingRequest-Single' - $ref: '#/components/schemas/MLTestingReport-Single' - - $ref: '#/components/schemas/MLEntityLoadingRequest-Single' - - $ref: '#/components/schemas/MLEntityLoadingProcess-Single' - - $ref: '#/components/schemas/MLEntityLoadingPolicy-Single' + - $ref: '#/components/schemas/MLModelLoadingRequest-Single' + - $ref: '#/components/schemas/MLModelLoadingProcess-Single' + - $ref: '#/components/schemas/MLModelLoadingPolicy-Single' - $ref: '#/components/schemas/MLUpdateFunction-Single' - $ref: '#/components/schemas/MLUpdateRequest-Single' -- GitLab From 4acc9722a824f1bb14901597eabe97744e90d0bb Mon Sep 17 00:00:00 2001 From: rosabolzek Date: Fri, 7 Jun 2024 04:28:20 +0000 Subject: [PATCH 059/587] Rel18 TS28105 CR0098 rename inferenceType to aIMLInferenceName --- OpenAPI/TS28105_AiMlNrm.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OpenAPI/TS28105_AiMlNrm.yaml b/OpenAPI/TS28105_AiMlNrm.yaml index abb19044c..c789da1a5 100644 --- a/OpenAPI/TS28105_AiMlNrm.yaml +++ b/OpenAPI/TS28105_AiMlNrm.yaml @@ -114,7 +114,7 @@ components: capabilityName: type: string mLCapabilityParameters: - description: A map (list of key-value pairs) for an inferenceType and capabilityName + description: A map (list of key-value pairs) for an aIMLInferenceName and capabilityName $ref: 'TS28623_ComDefs.yaml#/components/schemas/AttributeNameValuePairSet' AvailMLCapabilityReport: -- GitLab From 7fe0d9d8ae570c0e81857eb19c16fbf964ac40b9 Mon Sep 17 00:00:00 2001 From: ayani Date: Fri, 7 Jun 2024 07:44:52 +0000 Subject: [PATCH 060/587] Rel18_TS_28.111_CR0008_Add_missing_attribute_unreliableAlarmScope_YAML --- OpenAPI/TS28111_FaultNrm.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/OpenAPI/TS28111_FaultNrm.yaml b/OpenAPI/TS28111_FaultNrm.yaml index e5c492096..7a525d13f 100644 --- a/OpenAPI/TS28111_FaultNrm.yaml +++ b/OpenAPI/TS28111_FaultNrm.yaml @@ -229,6 +229,8 @@ components: type: object additionalProperties: $ref: '#/components/schemas/AlarmRecord' + unreliableAlarmScope: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' #---- Definition of alarm notifications --------------------------------------------# -- GitLab From b2aecfba069d0acd1535f0458e26cbcfe09f003a Mon Sep 17 00:00:00 2001 From: mcdonnelleo Date: Fri, 7 Jun 2024 08:44:46 +0000 Subject: [PATCH 061/587] TS 28.105 Rel 18 CR0146 correct terminationConditions attribute --- OpenAPI/TS28105_AiMlNrm.yaml | 5 ----- 1 file changed, 5 deletions(-) diff --git a/OpenAPI/TS28105_AiMlNrm.yaml b/OpenAPI/TS28105_AiMlNrm.yaml index c789da1a5..0bca02795 100644 --- a/OpenAPI/TS28105_AiMlNrm.yaml +++ b/OpenAPI/TS28105_AiMlNrm.yaml @@ -265,11 +265,6 @@ components: type: integer terminationConditions: type: string - enum: - - UPDATED_IN_INFERENCE_FUNCTION - - INFERENCE FUNCTION_TERMINATED - - INFERENCE FUNCTION_UPGRADED - - INFERENCE_CONTEXT_CHANGED progressStatus: $ref: '#/components/schemas/ProcessMonitor' cancelProcess: -- GitLab From 64840bc368d37c4756666c8fc27d6db44c3ccf58 Mon Sep 17 00:00:00 2001 From: Pengxiang Xie Date: Fri, 7 Jun 2024 10:05:32 +0000 Subject: [PATCH 062/587] TS28.541_Rel18_CR1225_correction_for_allowedSNPNs --- OpenAPI/TS28541_5GcNrm.yaml | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/OpenAPI/TS28541_5GcNrm.yaml b/OpenAPI/TS28541_5GcNrm.yaml index cd4f282ca..7174ea213 100755 --- a/OpenAPI/TS28541_5GcNrm.yaml +++ b/OpenAPI/TS28541_5GcNrm.yaml @@ -236,7 +236,7 @@ components: allowedSNPNs: type: array items: - $ref: '#/components/schemas/SnpnInfo' + $ref: '#/components/schemas/SnpnId' allowedNfTypes: type: array items: @@ -676,13 +676,6 @@ components: $ref: 'TS28623_ComDefs.yaml#/components/schemas/Mnc' nid: type: string - SnpnInfo: - type: object - properties: - snpnId: - $ref: '#/components/schemas/SnpnId' - snssai: - $ref: 'TS28541_NrNrm.yaml#/components/schemas/Snssai' TaiList: type: array items: -- GitLab From 6fc26e6524c5de0a47b6393dddebfb7736ae1372 Mon Sep 17 00:00:00 2001 From: sunse Date: Fri, 7 Jun 2024 14:58:48 +0000 Subject: [PATCH 063/587] S5-242809d1 approved in email approval. Hence change for d2 is removed. Update TS28105_AiMlNrm.yaml --- OpenAPI/TS28105_AiMlNrm.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/OpenAPI/TS28105_AiMlNrm.yaml b/OpenAPI/TS28105_AiMlNrm.yaml index 0bca02795..31732d52f 100644 --- a/OpenAPI/TS28105_AiMlNrm.yaml +++ b/OpenAPI/TS28105_AiMlNrm.yaml @@ -358,9 +358,9 @@ components: type: boolean suspendRequest: type: boolean - mLModelRef: + mLModelToTestRef: $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' - mLModelCoordinationGroupRef: + mLModelCoordinationGroupToTestRef: $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' MLTestingReport-Single: -- GitLab From 6b79f6a9f034e293afa942b090f9cba8fe3a41ee Mon Sep 17 00:00:00 2001 From: gautamd Date: Thu, 4 Apr 2024 10:35:38 +0000 Subject: [PATCH 064/587] Update TS28538_EdgeNrm.yaml --- OpenAPI/TS28538_EdgeNrm.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/OpenAPI/TS28538_EdgeNrm.yaml b/OpenAPI/TS28538_EdgeNrm.yaml index 43f7cbefb..47fa776dd 100644 --- a/OpenAPI/TS28538_EdgeNrm.yaml +++ b/OpenAPI/TS28538_EdgeNrm.yaml @@ -339,7 +339,7 @@ components: properties: participatingOPiD: type: string - originatingOPiD: + leadingOPiD: type: string OperatorEdgeFederation-Single: allOf: @@ -350,7 +350,7 @@ components: type: string FederationExpiry: $ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTime' - originatedOPiD: + leadingOPiD: type: string avaibleEDNList: $ref: '#/components/schemas/AvailableEDNList' -- GitLab From 0991c2a95c8d1bb86c99acaff6701d48d21dbcc3 Mon Sep 17 00:00:00 2001 From: gautamd Date: Thu, 4 Apr 2024 11:30:32 +0000 Subject: [PATCH 065/587] Update TS28538_EdgeNrm.yaml --- OpenAPI/TS28538_EdgeNrm.yaml | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/OpenAPI/TS28538_EdgeNrm.yaml b/OpenAPI/TS28538_EdgeNrm.yaml index 47fa776dd..89b72da7c 100644 --- a/OpenAPI/TS28538_EdgeNrm.yaml +++ b/OpenAPI/TS28538_EdgeNrm.yaml @@ -147,6 +147,18 @@ components: properties: resourceQuota: $ref: '#/components/schemas/VirtualResource' + FederatedECSInfo: + type: object + properties: + federateECSIdentifier: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' + federatedECSProfile: + type: integer + servedEASList: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' + servedEESList: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' + #-------- Definition of types for name-containments ------ SubNetwork-ncO-EdgeNrm: @@ -281,6 +293,8 @@ components: $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList' softwareImageInfo: $ref: '#/components/schemas/SoftwareImageInfo' + sharedECSInfo: + $ref: '#/components/schemas/FederatedECSInfo' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' EASRequirements-Single: @@ -341,6 +355,9 @@ components: type: string leadingOPiD: type: string + federatedECSInfo: + $ref: '#/components/schemas/FederatedECSInfo' + OperatorEdgeFederation-Single: allOf: - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' -- GitLab From 5df84f8d5ca2da09d44fa876d4fe088ffd13ca47 Mon Sep 17 00:00:00 2001 From: rosabolzek Date: Tue, 11 Jun 2024 06:20:37 +0000 Subject: [PATCH 066/587] TS28.541_Rel18_CR1274_Add_missing_AIML_support_for_AnLFFunction --- OpenAPI/TS28541_5GcNrm.yaml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/OpenAPI/TS28541_5GcNrm.yaml b/OpenAPI/TS28541_5GcNrm.yaml index 7174ea213..3169f557d 100755 --- a/OpenAPI/TS28541_5GcNrm.yaml +++ b/OpenAPI/TS28541_5GcNrm.yaml @@ -5259,7 +5259,10 @@ components: enum: - ACTIVATED - DEACTIVATED - + mLModelRef: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList' + aIMLInferenceFunctionRef: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList' EP_SM12-Single: allOf: - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' -- GitLab From 8d223a9558e66715970487fe8f560c65c7f1c217 Mon Sep 17 00:00:00 2001 From: sunse Date: Tue, 11 Jun 2024 12:24:38 +0000 Subject: [PATCH 067/587] SA5#154 and 155 contents --- OpenAPI/TS28104_MdaNrm.yaml | 2 +- OpenAPI/TS28105_AiMlNrm.yaml | 2 +- OpenAPI/TS28312_IntentExpectations.yaml | 2 +- OpenAPI/TS28312_IntentNrm.yaml | 2 +- OpenAPI/TS28318_DsoNrm.yaml | 2 +- OpenAPI/TS28531_NSProvMnS.yaml | 2 +- OpenAPI/TS28531_NSSProvMnS.yaml | 2 +- OpenAPI/TS28532_ProvMnS.yaml | 2 +- OpenAPI/TS28538_EdgeNrm.yaml | 2 +- OpenAPI/TS28541_5GcNrm.yaml | 2 +- OpenAPI/TS28541_NrNrm.yaml | 2 +- OpenAPI/TS28541_SliceNrm.yaml | 2 +- OpenAPI/TS28623_ComDefs.yaml | 2 +- OpenAPI/TS28623_FileManagementNrm.yaml | 2 +- OpenAPI/TS28623_GenericNrm.yaml | 2 +- OpenAPI/TS28623_QoEMeasurementCollectionNrm.yaml | 2 +- OpenAPI/TS28623_SubscriptionControlNrm.yaml | 4 ++-- OpenAPI/TS28623_TraceControlNrm.yaml | 4 ++-- 18 files changed, 20 insertions(+), 20 deletions(-) diff --git a/OpenAPI/TS28104_MdaNrm.yaml b/OpenAPI/TS28104_MdaNrm.yaml index 474d1cb2f..c229cc7d8 100644 --- a/OpenAPI/TS28104_MdaNrm.yaml +++ b/OpenAPI/TS28104_MdaNrm.yaml @@ -1,7 +1,7 @@ openapi: 3.0.1 info: title: MDA NRM - version: 18.3.0 + version: 18.4.0 description: >- OAS 3.0.1 specification of the MDA NRM © 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). diff --git a/OpenAPI/TS28105_AiMlNrm.yaml b/OpenAPI/TS28105_AiMlNrm.yaml index 31732d52f..7566d90a2 100644 --- a/OpenAPI/TS28105_AiMlNrm.yaml +++ b/OpenAPI/TS28105_AiMlNrm.yaml @@ -1,7 +1,7 @@ openapi: 3.0.1 info: title: AI/ML NRM - version: 18.3.0 + version: 18.4.0 description: >- OAS 3.0.1 specification of the AI/ML NRM © 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). diff --git a/OpenAPI/TS28312_IntentExpectations.yaml b/OpenAPI/TS28312_IntentExpectations.yaml index b8c44996d..82031387f 100644 --- a/OpenAPI/TS28312_IntentExpectations.yaml +++ b/OpenAPI/TS28312_IntentExpectations.yaml @@ -1,7 +1,7 @@ openapi: 3.0.1 info: title: Scenario specific Intent Expectations - version: 18.3.0 + version: 18.4.0 description: >- OAS 3.0.1 definition of scenario specific Intent Expectations © 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). diff --git a/OpenAPI/TS28312_IntentNrm.yaml b/OpenAPI/TS28312_IntentNrm.yaml index 0d5404e3f..dc5c4d4e4 100644 --- a/OpenAPI/TS28312_IntentNrm.yaml +++ b/OpenAPI/TS28312_IntentNrm.yaml @@ -1,7 +1,7 @@ openapi: 3.0.1 info: title: Intent NRM - version: 18.3.0 + version: 18.4.0 description: >- OAS 3.0.1 definition of the Intent NRM © 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). diff --git a/OpenAPI/TS28318_DsoNrm.yaml b/OpenAPI/TS28318_DsoNrm.yaml index ef0513472..7246dca06 100644 --- a/OpenAPI/TS28318_DsoNrm.yaml +++ b/OpenAPI/TS28318_DsoNrm.yaml @@ -1,7 +1,7 @@ openapi: 3.0.1 info: title: 3GPP NRM - version: 18.5.0 + version: 18.1.0 description: >- OAS 3.0.1 specification of the OutageAndRecoveryInfo NRM © 2024, 3GPP Organizational OutageAndRecoveryInfo Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). diff --git a/OpenAPI/TS28531_NSProvMnS.yaml b/OpenAPI/TS28531_NSProvMnS.yaml index 0c1f80de2..fa0c11ffd 100644 --- a/OpenAPI/TS28531_NSProvMnS.yaml +++ b/OpenAPI/TS28531_NSProvMnS.yaml @@ -1,7 +1,7 @@ openapi: 3.0.1 info: title: Network Slice Provisioning MnS - version: 18.5.0 + version: 18.6.0 description: >- OAS 3.0.1 definition of the Network Slice Provisioning MnS © 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). diff --git a/OpenAPI/TS28531_NSSProvMnS.yaml b/OpenAPI/TS28531_NSSProvMnS.yaml index 7fb2fc8d6..69f9ec738 100644 --- a/OpenAPI/TS28531_NSSProvMnS.yaml +++ b/OpenAPI/TS28531_NSSProvMnS.yaml @@ -1,7 +1,7 @@ openapi: 3.0.1 info: title: Network Slice Subnet Provisioning MnS - version: 18.5.0 + version: 18.6.0 description: >- OAS 3.0.1 definition of the Network Slice Suubnet Provisioning MnS © 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). diff --git a/OpenAPI/TS28532_ProvMnS.yaml b/OpenAPI/TS28532_ProvMnS.yaml index cf4315a1e..116dfc4b7 100755 --- a/OpenAPI/TS28532_ProvMnS.yaml +++ b/OpenAPI/TS28532_ProvMnS.yaml @@ -1,7 +1,7 @@ openapi: 3.0.1 info: title: Provisioning MnS - version: 18.2.0 + version: 18.3.0 description: >- OAS 3.0.1 definition of the Provisioning MnS © 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). diff --git a/OpenAPI/TS28538_EdgeNrm.yaml b/OpenAPI/TS28538_EdgeNrm.yaml index 89b72da7c..0848b77d4 100644 --- a/OpenAPI/TS28538_EdgeNrm.yaml +++ b/OpenAPI/TS28538_EdgeNrm.yaml @@ -1,7 +1,7 @@ openapi: 3.0.1 info: title: 3GPP Edge NRM - version: 18.6.0 + version: 18.7.0 description: >- OAS 3.0.1 specification of the Edge NRM © 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). diff --git a/OpenAPI/TS28541_5GcNrm.yaml b/OpenAPI/TS28541_5GcNrm.yaml index 3169f557d..dfcb2a051 100755 --- a/OpenAPI/TS28541_5GcNrm.yaml +++ b/OpenAPI/TS28541_5GcNrm.yaml @@ -1,7 +1,7 @@ openapi: 3.0.1 info: title: 3GPP 5GC NRM - version: 18.7.0 + version: 18.8.0 description: >- OAS 3.0.1 specification of the 5GC NRM © 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). diff --git a/OpenAPI/TS28541_NrNrm.yaml b/OpenAPI/TS28541_NrNrm.yaml index 6aa050293..62e23de93 100755 --- a/OpenAPI/TS28541_NrNrm.yaml +++ b/OpenAPI/TS28541_NrNrm.yaml @@ -1,7 +1,7 @@ openapi: 3.0.1 info: title: NR NRM - version: 18.7.0 + version: 18.8.0 description: >- OAS 3.0.1 specification of the NR NRM © 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). diff --git a/OpenAPI/TS28541_SliceNrm.yaml b/OpenAPI/TS28541_SliceNrm.yaml index 2fe0726fd..121dc8f67 100755 --- a/OpenAPI/TS28541_SliceNrm.yaml +++ b/OpenAPI/TS28541_SliceNrm.yaml @@ -1,7 +1,7 @@ openapi: 3.0.1 info: title: Slice NRM - version: 18.7.0 + version: 18.8.0 description: >- OAS 3.0.1 specification of the Slice NRM @ 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). diff --git a/OpenAPI/TS28623_ComDefs.yaml b/OpenAPI/TS28623_ComDefs.yaml index f668cc0af..f5985b380 100755 --- a/OpenAPI/TS28623_ComDefs.yaml +++ b/OpenAPI/TS28623_ComDefs.yaml @@ -1,7 +1,7 @@ openapi: 3.0.1 info: title: Common Type Definitions - version: 18.6.0 + version: 18.7.0 description: >- OAS 3.0.1 specification of common type definitions in the Generic NRM © 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). diff --git a/OpenAPI/TS28623_FileManagementNrm.yaml b/OpenAPI/TS28623_FileManagementNrm.yaml index d117152d6..a0b20fe33 100644 --- a/OpenAPI/TS28623_FileManagementNrm.yaml +++ b/OpenAPI/TS28623_FileManagementNrm.yaml @@ -1,7 +1,7 @@ openapi: 3.0.1 info: title: File Management NRM - version: 18.6.0 + version: 18.7.0 description: >- OAS 3.0.1 definition of the File Management NRM fragment © 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). diff --git a/OpenAPI/TS28623_GenericNrm.yaml b/OpenAPI/TS28623_GenericNrm.yaml index 24855fc4b..695a96fa4 100755 --- a/OpenAPI/TS28623_GenericNrm.yaml +++ b/OpenAPI/TS28623_GenericNrm.yaml @@ -1,7 +1,7 @@ openapi: 3.0.1 info: title: Generic NRM - version: 18.6.0 + version: 18.7.0 description: >- OAS 3.0.1 definition of the Generic NRM © 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). diff --git a/OpenAPI/TS28623_QoEMeasurementCollectionNrm.yaml b/OpenAPI/TS28623_QoEMeasurementCollectionNrm.yaml index 257965e40..0ec934f55 100644 --- a/OpenAPI/TS28623_QoEMeasurementCollectionNrm.yaml +++ b/OpenAPI/TS28623_QoEMeasurementCollectionNrm.yaml @@ -1,7 +1,7 @@ openapi: 3.0.1 info: title: QoE Measurement Collection NRM - version: 18.6.0 + version: 18.7.0 description: >- OAS 3.0.1 definition of the QoE Measurement Collection NRM © 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). diff --git a/OpenAPI/TS28623_SubscriptionControlNrm.yaml b/OpenAPI/TS28623_SubscriptionControlNrm.yaml index c9ad4a37c..5d4932626 100644 --- a/OpenAPI/TS28623_SubscriptionControlNrm.yaml +++ b/OpenAPI/TS28623_SubscriptionControlNrm.yaml @@ -1,10 +1,10 @@ openapi: 3.0.1 info: title: Subscription Control NRM - version: 18.2.0 + version: 18.7.0 description: >- OAS 3.0.1 definition of the Subscription Control NRM fragment - © 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). + © 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved. externalDocs: description: 3GPP TS 28.623; Generic NRM, Subscription Control NRM diff --git a/OpenAPI/TS28623_TraceControlNrm.yaml b/OpenAPI/TS28623_TraceControlNrm.yaml index 0441c2f4d..0d09284e0 100644 --- a/OpenAPI/TS28623_TraceControlNrm.yaml +++ b/OpenAPI/TS28623_TraceControlNrm.yaml @@ -1,10 +1,10 @@ openapi: 3.0.1 info: title: Trace Control NRM - version: 18.6.0 + version: 18.7.0 description: >- OAS 3.0.1 definition of the Trace Control NRM fragment - © 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). + © 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved. externalDocs: description: 3GPP TS 28.623; Generic NRM,Trace Control NRM -- GitLab From 22c0eda8e3d9cf1a05aae6aa50bfd335455e077f Mon Sep 17 00:00:00 2001 From: sunse Date: Tue, 11 Jun 2024 13:22:54 +0000 Subject: [PATCH 068/587] update version --- OpenAPI/TS28536_CoslaNrm.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/OpenAPI/TS28536_CoslaNrm.yaml b/OpenAPI/TS28536_CoslaNrm.yaml index 98f547535..a81e08261 100755 --- a/OpenAPI/TS28536_CoslaNrm.yaml +++ b/OpenAPI/TS28536_CoslaNrm.yaml @@ -2,14 +2,14 @@ openapi: 3.0.1 info: title: coslaNrm - version: 17.4.0 + version: 18.1.0 description: >- OAS 3.0.1 specification of the Cosla NRM © 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved. externalDocs: - description: 3GPP TS 28.536 V17.3.0; Cosla NRM + description: 3GPP TS 28.536; Cosla NRM url: http://www.3gpp.org/ftp/Specs/archive/28_series/28.536/ paths: {} -- GitLab From cd26898d3f404b3c61421f318fe9c59f20de1b21 Mon Sep 17 00:00:00 2001 From: sunse Date: Sun, 23 Jun 2024 03:56:49 +0000 Subject: [PATCH 069/587] in SA#104,28.541 CR1274R1 was noted, hence the change is removed. Update TS28541_5GcNrm.yaml --- OpenAPI/TS28541_5GcNrm.yaml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/OpenAPI/TS28541_5GcNrm.yaml b/OpenAPI/TS28541_5GcNrm.yaml index dfcb2a051..44dc93e1c 100755 --- a/OpenAPI/TS28541_5GcNrm.yaml +++ b/OpenAPI/TS28541_5GcNrm.yaml @@ -5259,10 +5259,6 @@ components: enum: - ACTIVATED - DEACTIVATED - mLModelRef: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList' - aIMLInferenceFunctionRef: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList' EP_SM12-Single: allOf: - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' -- GitLab From 6024b183bcf1359b7ff3b37fc6149398762dc6a3 Mon Sep 17 00:00:00 2001 From: sunse Date: Fri, 5 Jul 2024 13:06:18 +0000 Subject: [PATCH 070/587] Merge Rel19 contest from SA5 154 and 155 based on SA#104 Rel18 baseline --- OpenAPI/TS28312_IntentExpectations.yaml | 2 +- OpenAPI/TS28541_5GcNrm.yaml | 222 +++++++++++++-- OpenAPI/TS28541_NrNrm.yaml | 12 + OpenAPI/TS28623_ComDefs.yaml | 8 + OpenAPI/TS28623_FileManagementNrm.yaml | 19 ++ OpenAPI/TS28623_GenericNrm.yaml | 187 ++----------- .../TS28623_ManagementDataCollectionNrm.yaml | 9 + OpenAPI/TS28623_MnSRegistryNrm.yaml | 17 +- OpenAPI/TS28623_PmControlNrm.yaml | 13 + .../TS28623_QoEMeasurementCollectionNrm.yaml | 14 + OpenAPI/TS28623_SubscriptionControlNrm.yaml | 13 + OpenAPI/TS28623_ThresholdMonitorNrm.yaml | 13 + OpenAPI/TS28623_TraceControlNrm.yaml | 259 +++++++++--------- 13 files changed, 478 insertions(+), 310 deletions(-) diff --git a/OpenAPI/TS28312_IntentExpectations.yaml b/OpenAPI/TS28312_IntentExpectations.yaml index 82031387f..3938719ef 100644 --- a/OpenAPI/TS28312_IntentExpectations.yaml +++ b/OpenAPI/TS28312_IntentExpectations.yaml @@ -969,7 +969,7 @@ components: contextValueRange: type: array items: - $ref: "TS28623_GenericNrm.yaml#/components/schemas/NFType" + $ref: "TS28541_5GcNrm.yaml#/components/schemas/NFType" NfInstanceLocationContext: description: >- This data type is the "ObjectContext" data type with specialisations for NfInstanceLocationContext diff --git a/OpenAPI/TS28541_5GcNrm.yaml b/OpenAPI/TS28541_5GcNrm.yaml index 44dc93e1c..fceea8893 100755 --- a/OpenAPI/TS28541_5GcNrm.yaml +++ b/OpenAPI/TS28541_5GcNrm.yaml @@ -63,7 +63,7 @@ components: type: string description: uuid of NF instance nFType: - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/NFType' + $ref: '#/components/schemas/NFType' nFStatus: $ref: '#/components/schemas/NFStatus' plmn: @@ -105,7 +105,7 @@ components: allowedNfTypes: type: array items: - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/NFType' + $ref: '#/components/schemas/NFType' allowedNssais: type: array items: @@ -215,10 +215,14 @@ components: ManagedNFProfile: type: object properties: + hniList: + type: array + items: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/Fqdn' nfInstanceID: type: string nfType: - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/NFType' + $ref: '#/components/schemas/NFType' heartbeatTimer: type: integer authzInfo: @@ -240,7 +244,7 @@ components: allowedNfTypes: type: array items: - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/NFType' + $ref: '#/components/schemas/NFType' allowedNfDomains: type: array items: @@ -1043,7 +1047,7 @@ components: servingNfTypeList: type: array items: - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/NFType' + $ref: '#/components/schemas/NFType' minItems: 1 mlAnalyticsList: type: array @@ -1516,7 +1520,7 @@ components: servingNfTypeList: type: array items: - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/NFType' + $ref: '#/components/schemas/NFType' minItems: 1 servingNfSetIdList: type: array @@ -1538,7 +1542,7 @@ components: servingNfTypeList: type: array items: - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/NFType' + $ref: '#/components/schemas/NFType' servingNfSetIdList: type: array items: @@ -2918,7 +2922,109 @@ components: type: object properties: nfType: - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/NFType' + $ref: '#/components/schemas/NFType' + SAP: + type: object + properties: + host: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/HostAddr' + port: + type: integer + NFServiceType: + type: string + enum: + - NAMF_COMMUNICATION + - NAMF_EVENTEXPOSURE + - NAMF_MT + - NAMF_LOCATION + - NSMF_PDUSESSION + - NSMF_EVENTEXPOSURE + - OTHERS + Operation: + type: object + properties: + name: + type: string + allowedNFTypes: + $ref: '#/components/schemas/NFType' + operationSemantics: + $ref: '#/components/schemas/OperationSemantics' + NFType: + type: string + description: ' NF name defined in TS 23.501 or TS 29.510' + enum: + - NRF + - UDM + - AMF + - SMF + - AUSF + - NEF + - PCF + - SMSF + - NSSF + - UDR + - LMF + - GMLC + - 5G_EIR + - SEPP + - UPF + - N3IWF + - AF + - UDSF + - DN + - BSF + - CHF + - NWDAF + - PCSCF + - CBCF + - HSS + - UCMF + - SOR_AF + - SPAF + - MME + - SCSAS + - SCEF + - SCP + - NSSAAF + - ICSCF + - SCSCF + - DRA + - IMS_AS + - AANF + - 5G_DDNMF + - NSACF + - MFAF + - EASDF + - DCCF + - MB_SMF + - TSCTSF + - ADRF + - GBA_BSF + - CEF + - MB_UPF + - NSWOF + - PKMF + - MNPF + - SMS_GMSC + - SMS_IWMSC + - MBSF + - MBSTF + - PANF + - TNGF + - W_AGF + - TWIF + - TSN_AF + + OperationSemantics: + type: string + enum: + - REQUEST_RESPONSE + - SUBSCRIBE_NOTIFY + RegistrationState: + type: string + enum: + - REGISTERED + - DEREGISTERED #-------- Definition of types for name-containments ------ SubNetwork-ncO-5GcNrm: @@ -3054,7 +3160,9 @@ components: $ref: 'TS28541_NrNrm.yaml#/components/schemas/MappedCellIdInfoList' mdtUserConsentReqList: $ref: 'TS28541_NrNrm.yaml#/components/schemas/MdtUserConsentReqList' + - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' + - $ref: '#/components/schemas/ManagedFunction5GC-nc0' - type: object properties: EP_N2: @@ -3158,7 +3266,9 @@ components: commModelList: $ref: '#/components/schemas/CommModelList' SmfInfo: - $ref: '#/components/schemas/SmfInfo' + type: array + items: + $ref: '#/components/schemas/SmfInfo' configurable5QISetRef: $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' dynamic5QISetRef: @@ -3168,6 +3278,7 @@ components: items: $ref: '#/components/schemas/dnaiSatelliteMapping' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' + - $ref: '#/components/schemas/ManagedFunction5GC-nc0' - type: object properties: EP_N4: @@ -3222,8 +3333,11 @@ components: supportedBMOList: $ref: '#/components/schemas/SupportedBMOList' upfInfo: - $ref: '#/components/schemas/UpfInfo' + type: array + items: + $ref: '#/components/schemas/UpfInfo' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' + - $ref: '#/components/schemas/ManagedFunction5GC-nc0' - type: object properties: EP_N3: @@ -3251,6 +3365,7 @@ components: commModelList: $ref: '#/components/schemas/CommModelList' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' + - $ref: '#/components/schemas/ManagedFunction5GC-nc0' - type: object properties: EP_N3: @@ -3278,7 +3393,9 @@ components: supportedBMOList: $ref: '#/components/schemas/SupportedBMOList' PcfInfo: - $ref: '#/components/schemas/PcfInfo' + type: array + items: + $ref: '#/components/schemas/PcfInfo' configurable5QISetRef: $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' dynamic5QISetRef: @@ -3286,6 +3403,7 @@ components: predefinedPccRuleSetRefs: $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' + - $ref: '#/components/schemas/ManagedFunction5GC-nc0' - type: object properties: EP_N5: @@ -3324,6 +3442,7 @@ components: ausfInfo: $ref: '#/components/schemas/AusfInfo' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' + - $ref: '#/components/schemas/ManagedFunction5GC-nc0' - type: object properties: EP_N12: @@ -3355,6 +3474,7 @@ components: udmInfo: $ref: '#/components/schemas/UdmInfo' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' + - $ref: '#/components/schemas/ManagedFunction5GC-nc0' - type: object properties: EP_N8: @@ -3388,6 +3508,7 @@ components: udrInfo: $ref: '#/components/schemas/UdrInfo' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' + - $ref: '#/components/schemas/ManagedFunction5GC-nc0' UdsfFunction-Single: allOf: - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' @@ -3407,6 +3528,7 @@ components: udsfInfo: $ref: '#/components/schemas/UdsfInfo' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' + - $ref: '#/components/schemas/ManagedFunction5GC-nc0' NrfFunction-Single: allOf: - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' @@ -3428,6 +3550,7 @@ components: nrfInfo: $ref: '#/components/schemas/NrfInfo' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' + - $ref: '#/components/schemas/ManagedFunction5GC-nc0' - type: object properties: EP_N27: @@ -3457,6 +3580,7 @@ components: commModelList: $ref: '#/components/schemas/CommModelList' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' + - $ref: '#/components/schemas/ManagedFunction5GC-nc0' - type: object properties: EP_N22: @@ -3486,6 +3610,7 @@ components: smsfInfo: $ref: '#/components/schemas/SmsfInfo' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' + - $ref: '#/components/schemas/ManagedFunction5GC-nc0' - type: object properties: EP_N20: @@ -3519,6 +3644,7 @@ components: mappedCellIdInfoList: $ref: 'TS28541_NrNrm.yaml#/components/schemas/MappedCellIdInfoList' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' + - $ref: '#/components/schemas/ManagedFunction5GC-nc0' - type: object properties: EP_NLS: @@ -3544,6 +3670,7 @@ components: commModelList: $ref: '#/components/schemas/CommModelList' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' + - $ref: '#/components/schemas/ManagedFunction5GC-nc0' - type: object properties: EP_N17: @@ -3569,6 +3696,7 @@ components: seppInfo: $ref: '#/components/schemas/SeppInfo' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' + - $ref: '#/components/schemas/ManagedFunction5GC-nc0' - type: object properties: EP_N32: @@ -3614,7 +3742,7 @@ components: AnLFFunction: $ref: '#/components/schemas/AnLFFunction-Single' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' - + - $ref: '#/components/schemas/ManagedFunction5GC-nc0' ScpFunction-Single: allOf: - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' @@ -3632,6 +3760,7 @@ components: scpInfo: $ref: '#/components/schemas/ScpInfo' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' + - $ref: '#/components/schemas/ManagedFunction5GC-nc0' - type: object properties: EP_SM13: @@ -3659,6 +3788,7 @@ components: nefInfo: $ref: '#/components/schemas/NefInfo' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' + - $ref: '#/components/schemas/ManagedFunction5GC-nc0' - type: object properties: EP_N33: @@ -3691,6 +3821,7 @@ components: nsacfInfo: $ref: '#/components/schemas/NsacfInfo' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' + - $ref: '#/components/schemas/ManagedFunction5GC-nc0' - type: object properties: EP_N60: @@ -3715,6 +3846,7 @@ components: commModelList: $ref: '#/components/schemas/CommModelList' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' + - $ref: '#/components/schemas/ManagedFunction5GC-nc0' - type: object properties: EP_Npc4: @@ -3747,6 +3879,7 @@ components: easdfInfo: $ref: '#/components/schemas/EasdfInfo' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' + - $ref: '#/components/schemas/ManagedFunction5GC-nc0' - type: object properties: EP_N88: @@ -3802,6 +3935,7 @@ components: amfIdentifier: $ref: '#/components/schemas/AmfIdentifier' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' + - $ref: '#/components/schemas/ManagedFunction5GC-nc0' ExternalNrfFunction-Single: allOf: - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' @@ -3815,6 +3949,7 @@ components: plmnIdList: $ref: 'TS28541_NrNrm.yaml#/components/schemas/PlmnIdList' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' + - $ref: '#/components/schemas/ManagedFunction5GC-nc0' ExternalNssfFunction-Single: allOf: - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' @@ -3828,6 +3963,7 @@ components: plmnIdList: $ref: 'TS28541_NrNrm.yaml#/components/schemas/PlmnIdList' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' + - $ref: '#/components/schemas/ManagedFunction5GC-nc0' ExternalSeppFunction-Single: allOf: - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' @@ -3845,7 +3981,7 @@ components: fqdn: $ref: 'TS28623_ComDefs.yaml#/components/schemas/Fqdn' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' - + - $ref: '#/components/schemas/ManagedFunction5GC-nc0' EP_N2-Single: allOf: - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' @@ -4610,6 +4746,7 @@ components: trustAfInfo: $ref: '#/components/schemas/TrustAfInfo' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' + - $ref: '#/components/schemas/ManagedFunction5GC-nc0' - type: object properties: EP_N5: @@ -4644,6 +4781,7 @@ components: nssafInfo: $ref: '#/components/schemas/NssaafInfo' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' + - $ref: '#/components/schemas/ManagedFunction5GC-nc0' EP_N58-Single: allOf: - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' @@ -4695,6 +4833,7 @@ components: dccfInfo: $ref: '#/components/schemas/DccfInfo' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' + - $ref: '#/components/schemas/ManagedFunction5GC-nc0' MfafFunction-Single: allOf: @@ -4717,6 +4856,7 @@ components: mfafInfo: $ref: '#/components/schemas/MfafInfo' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' + - $ref: '#/components/schemas/ManagedFunction5GC-nc0' ChfFunction-Single: allOf: @@ -4739,6 +4879,7 @@ components: chfInfo: $ref: '#/components/schemas/ChfInfo' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' + - $ref: '#/components/schemas/ManagedFunction5GC-nc0' - type: object properties: EP_N28: @@ -4901,6 +5042,7 @@ components: gmlcInfo: $ref: '#/components/schemas/GmlcInfo' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' + - $ref: '#/components/schemas/ManagedFunction5GC-nc0' - type: object properties: EP_NL2: @@ -4934,6 +5076,7 @@ components: tsctsfInfo: $ref: '#/components/schemas/TsctsfInfo' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' + - $ref: '#/components/schemas/ManagedFunction5GC-nc0' - type: object properties: EP_N84: @@ -5055,8 +5198,11 @@ components: commModelList: $ref: '#/components/schemas/CommModelList' bsfInfo: - $ref: '#/components/schemas/BsfInfo' + type: array + items: + $ref: '#/components/schemas/BsfInfo' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' + - $ref: '#/components/schemas/ManagedFunction5GC-nc0' MbSmfFunction-Single: allOf: @@ -5077,6 +5223,7 @@ components: mbSmfInfo: $ref: '#/components/schemas/MbSmfInfo' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' + - $ref: '#/components/schemas/ManagedFunction5GC-nc0' - type: object properties: EP_N11mb: @@ -5150,6 +5297,7 @@ components: mbUpfInfo: $ref: '#/components/schemas/MbUpfInfo' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' + - $ref: '#/components/schemas/ManagedFunction5GC-nc0' - type: object properties: EP_N3mb: @@ -5180,6 +5328,7 @@ components: mnpfInfo: $ref: '#/components/schemas/MnpfInfo' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' + - $ref: '#/components/schemas/ManagedFunction5GC-nc0' - type: object properties: EP_SM12: @@ -5301,9 +5450,46 @@ components: $ref: 'TS28541_NrNrm.yaml#/components/schemas/LocalAddress' remoteAddress: $ref: 'TS28541_NrNrm.yaml#/components/schemas/RemoteAddress' +#-------- Definition of abstract IOCs -------------------------------------------- + ManagedFunction5GC-nc0: + type: object + properties: + ManagedNFService: + $ref: '#/components/schemas/ManagedNFService-Multiple' +#-------- Definition of abstract IOCs -------------------------------------------- -#-------- Definition of JSON arrays for name-contained IOCs ---------------------- +#-------- Definition of 5GC common IOCs -------------------------------------------- + ManagedNFService-Single: + allOf: + - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' + - type: object + properties: + attributes: + type: object + properties: + userLabel: + type: string + nFServiceType: + $ref: '#/components/schemas/NFServiceType' + sAP: + $ref: '#/components/schemas/SAP' + operations: + type: array + items: + $ref: '#/components/schemas/Operation' + administrativeState: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/AdministrativeState' + operationalState: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/OperationalState' + usageState: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/UsageState' + registrationState: + $ref: '#/components/schemas/RegistrationState' + +#-------- Definition of 5GC common IOCs -------------------------------------------- + +#-------- Definition of JSON arrays for name-contained IOCs ---------------------- AmfFunction-Multiple: type: array items: @@ -5741,7 +5927,10 @@ components: type: array items: $ref: '#/components/schemas/MnpfFunction-Single' - + ManagedNFService-Multiple: + type: array + items: + $ref: '#/components/schemas/ManagedNFService-Single' #------------ Definitions in TS 28.541 for TS 28.532 ----------------------------- resources-5gcNrm: @@ -5766,6 +5955,7 @@ components: - $ref: '#/components/schemas/NefFunction-Single' - $ref: '#/components/schemas/NsacfFunction-Single' - $ref: '#/components/schemas/DDNMFFunction-Single' + - $ref: '#/components/schemas/ManagedNFService-Single' - $ref: '#/components/schemas/ExternalAmfFunction-Single' - $ref: '#/components/schemas/ExternalNrfFunction-Single' diff --git a/OpenAPI/TS28541_NrNrm.yaml b/OpenAPI/TS28541_NrNrm.yaml index 62e23de93..f9b0c46ff 100755 --- a/OpenAPI/TS28541_NrNrm.yaml +++ b/OpenAPI/TS28541_NrNrm.yaml @@ -628,26 +628,32 @@ components: properties: positionX: type: integer + default: 0 minimum: 0 maximum: 604800 positionY: type: integer + default: 0 minimum: 0 maximum: 604800 positionZ: type: integer + default: 0 minimum: 0 maximum: 604800 velocityVX: type: integer + default: 0 minimum: -131072 maximum: 131071 velocityVY: type: integer + default: 0 minimum: -131072 maximum: 131071 velocityVZ: type: integer + default: 0 minimum: -131072 maximum: 131071 @@ -656,26 +662,32 @@ components: properties: semiMajorAxis: type: integer + default: 0 minimum: 0 maximum: 8589934591 eccentricity: type: integer + default: 0 minimum: -524288 maximum: 524287 periapsis: type: integer + default: 0 minimum: 0 maximum: 16777215 longitude: type: integer + default: 0 minimum: 0 maximum: 2097151 inclination: type: integer + default: 0 minimum: -524288 maximum: 524287 meanAnomaly: type: integer + default: 0 minimum: 0 maximum: 16777215 diff --git a/OpenAPI/TS28623_ComDefs.yaml b/OpenAPI/TS28623_ComDefs.yaml index f5985b380..773ad5b51 100755 --- a/OpenAPI/TS28623_ComDefs.yaml +++ b/OpenAPI/TS28623_ComDefs.yaml @@ -143,6 +143,9 @@ components: Fqdn: type: string + pattern: '^([0-9A-Za-z]([-0-9A-Za-z]{0,61}[0-9A-Za-z])?\.)+[A-Za-z]{2,63}\.?$' + minLength: 4 + maxLength: 253 Ipv4Addr: type: string pattern: '^(([0-9]|[1-9][0-9]|1[0-9][0-9]|2[0-4][0-9]|25[0-5])\.){3}([0-9]|[1-9][0-9]|1[0-9][0-9]|2[0-4][0-9]|25[0-5])$' @@ -192,6 +195,11 @@ components: - LOCKED - UNLOCKED default: LOCKED + BasicAdministrativeState: + type: string + enum: + - LOCKED + - UNLOCKED OperationalState: type: string enum: diff --git a/OpenAPI/TS28623_FileManagementNrm.yaml b/OpenAPI/TS28623_FileManagementNrm.yaml index a0b20fe33..bd3881d20 100644 --- a/OpenAPI/TS28623_FileManagementNrm.yaml +++ b/OpenAPI/TS28623_FileManagementNrm.yaml @@ -12,6 +12,25 @@ externalDocs: paths: {} components: schemas: + + #-------- Definition of types for name-containments ------ + SubNetwork-ncO-FileManagementNrm: + type: object + properties: + FileDownloadJob: + $ref: '#/components/schemas/FileDownloadJob-Multiple' + Files: + $ref: '#/components/schemas/Files-Multiple' + ManagedElement-ncO-FileManagementNrm: + type: object + properties: + FileDownloadJob: + $ref: '#/components/schemas/FileDownloadJob-Multiple' + Files: + $ref: '#/components/schemas/Files-Multiple' + #-------Definition of generic IOCs ----------# + + #-------- Definition of types----------------------------------------------------- FileDownloadJobProcessMonitor: description: >- diff --git a/OpenAPI/TS28623_GenericNrm.yaml b/OpenAPI/TS28623_GenericNrm.yaml index 695a96fa4..9db6fa936 100755 --- a/OpenAPI/TS28623_GenericNrm.yaml +++ b/OpenAPI/TS28623_GenericNrm.yaml @@ -15,11 +15,7 @@ components: #-------- Definition of types----------------------------------------------------- - RegistrationState: - type: string - enum: - - REGISTERED - - DEREGISTERED + VnfParameter: type: object properties: @@ -51,103 +47,7 @@ components: type: string powerInterface: type: string - Operation: - type: object - properties: - name: - type: string - allowedNFTypes: - $ref: '#/components/schemas/NFType' - operationSemantics: - $ref: '#/components/schemas/OperationSemantics' - NFType: - type: string - description: ' NF name defined in TS 23.501 or TS 29.510' - enum: - - NRF - - UDM - - AMF - - SMF - - AUSF - - NEF - - PCF - - SMSF - - NSSF - - UDR - - LMF - - GMLC - - 5G_EIR - - SEPP - - UPF - - N3IWF - - AF - - UDSF - - DN - - BSF - - CHF - - NWDAF - - PCSCF - - CBCF - - HSS - - UCMF - - SOR_AF - - SPAF - - MME - - SCSAS - - SCEF - - SCP - - NSSAAF - - ICSCF - - SCSCF - - DRA - - IMS_AS - - AANF - - 5G_DDNMF - - NSACF - - MFAF - - EASDF - - DCCF - - MB_SMF - - TSCTSF - - ADRF - - GBA_BSF - - CEF - - MB_UPF - - NSWOF - - PKMF - - MNPF - - SMS_GMSC - - SMS_IWMSC - - MBSF - - MBSTF - - PANF - - TNGF - - W_AGF - - TWIF - - TSN_AF - OperationSemantics: - type: string - enum: - - REQUEST_RESPONSE - - SUBSCRIBE_NOTIFY - SAP: - type: object - properties: - host: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/HostAddr' - port: - type: integer - NFServiceType: - type: string - enum: - - Namf_Communication - - Namf_EventExposure - - Namf_MT - - Namf_Location - - Nsmf_PDUSession - - Nsmf_EventExposure - - Others TransportProtocol: anyOf: - type: string @@ -453,60 +353,30 @@ components: $ref: '#/components/schemas/MnsAgent-Multiple' MeContext: $ref: '#/components/schemas/MeContext-Multiple' - PerfMetricJob: - $ref: 'TS28623_PmControlNrm.yaml#/components/schemas/PerfMetricJob-Multiple' - ThresholdMonitor: - $ref: 'TS28623_ThresholdMonitorNrm.yaml#/components/schemas/ThresholdMonitor-Multiple' - TraceJob: - $ref: 'TS28623_TraceControlNrm.yaml#/components/schemas/TraceJob-Multiple' - ManagementDataCollection: - $ref: 'TS28623_ManagementDataCollectionNrm.yaml#/components/schemas/ManagementDataCollection-Multiple' - NtfSubscriptionControl: - $ref: 'TS28623_SubscriptionControlNrm.yaml#/components/schemas/NtfSubscriptionControl-Multiple' AlarmList: $ref: 'TS28111_FaultNrm.yaml#/components/schemas/AlarmList-Single' - FileDownloadJob: - $ref: 'TS28623_FileManagementNrm.yaml#/components/schemas/FileDownloadJob-Multiple' - Files: - $ref: 'TS28623_FileManagementNrm.yaml#/components/schemas/Files-Multiple' - MnsRegistry: - $ref: 'TS28623_MnSRegistryNrm.yaml#/components/schemas/MnsRegistry-Single' Scheduler: $ref: '#/components/schemas/Scheduler-Multiple' ConditionMonitor: $ref: '#/components/schemas/ConditionMonitor-Multiple' SupportedNotifications: $ref: '#/components/schemas/SupportedNotifications-Single' - QMCJobs: - $ref: 'TS28623_QoEMeasurementCollectionNrm.yaml#/components/schemas/QMCJob-Multiple' + ManagedElement-ncO: type: object properties: MnsAgent: $ref: '#/components/schemas/MnsAgent-Multiple' - PerfMetricJob: - $ref: 'TS28623_PmControlNrm.yaml#/components/schemas/PerfMetricJob-Multiple' - ThresholdMonitor: - $ref: 'TS28623_ThresholdMonitorNrm.yaml#/components/schemas/ThresholdMonitor-Multiple' - TraceJob: - $ref: 'TS28623_TraceControlNrm.yaml#/components/schemas/TraceJob-Multiple' - NtfSubscriptionControl: - $ref: 'TS28623_SubscriptionControlNrm.yaml#/components/schemas/NtfSubscriptionControl-Multiple' AlarmList: $ref: 'TS28111_FaultNrm.yaml#/components/schemas/AlarmList-Single' - FileDownloadJob: - $ref: 'TS28623_FileManagementNrm.yaml#/components/schemas/FileDownloadJob-Multiple' - Files: - $ref: 'TS28623_FileManagementNrm.yaml#/components/schemas/Files-Multiple' Scheduler: $ref: '#/components/schemas/Scheduler-Multiple' ConditionMonitor: $ref: '#/components/schemas/ConditionMonitor-Multiple' SupportedNotifications: $ref: '#/components/schemas/SupportedNotifications-Single' - QMCJobs: - $ref: 'TS28623_QoEMeasurementCollectionNrm.yaml#/components/schemas/QMCJob-Multiple' + #-------- Definition of abstract IOCs -------------------------------------------- @@ -552,8 +422,6 @@ components: $ref: 'TS28623_PmControlNrm.yaml#/components/schemas/PerfMetricJob-Multiple' ThresholdMonitor: $ref: 'TS28623_ThresholdMonitorNrm.yaml#/components/schemas/ThresholdMonitor-Multiple' - ManagedNFService: - $ref: '#/components/schemas/ManagedNFService-Multiple' TraceJob: $ref: 'TS28623_TraceControlNrm.yaml#/components/schemas/TraceJob-Multiple' @@ -575,32 +443,7 @@ components: nullable: true VsDataContainer: $ref: '#/components/schemas/VsDataContainer-Multiple' - ManagedNFService-Single: - allOf: - - $ref: '#/components/schemas/Top' - - type: object - properties: - attributes: - type: object - properties: - userLabel: - type: string - nFServiceType: - $ref: '#/components/schemas/NFServiceType' - sAP: - $ref: '#/components/schemas/SAP' - operations: - type: array - items: - $ref: '#/components/schemas/Operation' - administrativeState: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/AdministrativeState' - operationalState: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/OperationalState' - usageState: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/UsageState' - registrationState: - $ref: '#/components/schemas/RegistrationState' + ManagementNode-Single: allOf: - $ref: '#/components/schemas/Top' @@ -698,6 +541,16 @@ components: - $ref: '#/components/schemas/Top' - $ref: '#/components/schemas/SubNetwork-Attr' - $ref: '#/components/schemas/SubNetwork-ncO' + - $ref: '#/components/schemas/SubNetwork-Multiple' + - $ref: '#/components/schemas/ManagedElement-Multiple' + - $ref: 'TS28623_FileManagementNrm.yaml#/components/schemas/SubNetwork-ncO-FileManagementNrm' + - $ref: 'TS28623_PmControlNrm.yaml#/components/schemas/SubNetwork-ncO-PmControlNrm' + - $ref: 'TS28623_SubscriptionControlNrm.yaml#/components/schemas/SubNetwork-ncO-SubscriptionControlNrm' + - $ref: 'TS28623_ThresholdMonitorNrm.yaml#/components/schemas/SubNetwork-ncO-ThresholdMonitorNrm' + - $ref: 'TS28623_TraceControlNrm.yaml#/components/schemas/SubNetwork-ncO-TraceControlNrm' + - $ref: 'TS28623_QoEMeasurementCollectionNrm.yaml#/components/schemas/SubNetwork-ncO-QoEMeasurementCollectionNrm' + - $ref: 'TS28623_ManagementDataCollectionNrm.yaml#/components/schemas/SubNetwork-ncO-ManagementDataCollectionNrm' + - $ref: 'TS28623_MnSRegistryNrm.yaml#/components/schemas/SubNetwork-ncO-MnSRegistryNrm' - $ref: 'TS28104_MdaNrm.yaml#/components/schemas/SubNetwork-ncO-MdaNrm' - $ref: 'TS28105_AiMlNrm.yaml#/components/schemas/SubNetwork-ncO-AiMlNrm' - $ref: 'TS28312_IntentNrm.yaml#/components/schemas/SubNetwork-ncO-IntentNrm' @@ -708,12 +561,19 @@ components: - $ref: 'TS28541_NrNrm.yaml#/components/schemas/SubNetwork-ncO-NrNrm' - $ref: 'TS28541_5GcNrm.yaml#/components/schemas/SubNetwork-ncO-5GcNrm' - $ref: 'TS28318_DsoNrm.yaml#/components/schemas/SubNetwork-ncO-DsoNrm' + ManagedElement-Single: allOf: - $ref: '#/components/schemas/Top' - $ref: '#/components/schemas/ManagedElement-Attr' - $ref: '#/components/schemas/ManagedElement-ncO' + - $ref: 'TS28623_FileManagementNrm.yaml#/components/schemas/ManagedElement-ncO-FileManagementNrm' + - $ref: 'TS28623_PmControlNrm.yaml#/components/schemas/ManagedElement-PmControlNrm' + - $ref: 'TS28623_SubscriptionControlNrm.yaml#/components/schemas/ManagedElement-ncO-SubscriptionControlNrm' + - $ref: 'TS28623_ThresholdMonitorNrm.yaml#/components/schemas/ManagedElement-ncO-ThresholdMonitorNrm' + - $ref: 'TS28623_TraceControlNrm.yaml#/components/schemas/SubNetwork-ncO-TraceControlNrm' + - $ref: 'TS28623_QoEMeasurementCollectionNrm.yaml#/components/schemas/ManagedElement-ncO-QoEMeasurementCollectionNrm' - $ref: 'TS28104_MdaNrm.yaml#/components/schemas/ManagedElement-ncO-MdaNrm' - $ref: 'TS28105_AiMlNrm.yaml#/components/schemas/ManagedElement-ncO-AiMlNrm' - $ref: 'TS28536_CoslaNrm.yaml#/components/schemas/ManagedElement-ncO-CoslaNrm' @@ -737,10 +597,6 @@ components: type: array items: $ref: '#/components/schemas/VsDataContainer-Single' - ManagedNFService-Multiple: - type: array - items: - $ref: '#/components/schemas/ManagedNFService-Single' ManagementNode-Multiple: type: array items: @@ -780,7 +636,6 @@ components: - $ref: '#/components/schemas/ManagementNode-Single' - $ref: '#/components/schemas/MnsAgent-Single' - $ref: '#/components/schemas/MeContext-Single' - - $ref: '#/components/schemas/ManagedNFService-Single' - $ref: '#/components/schemas/Scheduler-Single' - $ref: '#/components/schemas/ConditionMonitor-Single' - $ref: '#/components/schemas/SupportedNotifications-Single' diff --git a/OpenAPI/TS28623_ManagementDataCollectionNrm.yaml b/OpenAPI/TS28623_ManagementDataCollectionNrm.yaml index 185272364..63710ca79 100644 --- a/OpenAPI/TS28623_ManagementDataCollectionNrm.yaml +++ b/OpenAPI/TS28623_ManagementDataCollectionNrm.yaml @@ -12,6 +12,15 @@ externalDocs: paths: {} components: schemas: + #-------- Definition of types for name-containments ------ + SubNetwork-ncO-ManagementDataCollectionNrm: + type: object + properties: + ManagementDataCollection: + $ref: '#/components/schemas/ManagementDataCollection-Multiple' + + #-------Definition of generic IOCs ----------# + #-------- Definition of types----------------------------------------------------- ManagementData: diff --git a/OpenAPI/TS28623_MnSRegistryNrm.yaml b/OpenAPI/TS28623_MnSRegistryNrm.yaml index a5a022a43..bb5d1a1a8 100644 --- a/OpenAPI/TS28623_MnSRegistryNrm.yaml +++ b/OpenAPI/TS28623_MnSRegistryNrm.yaml @@ -12,6 +12,15 @@ externalDocs: paths: {} components: schemas: + #-------- Definition of types for name-containments ------ + SubNetwork-ncO-MnSRegistryNrm: + type: object + properties: + MnsRegistry: + $ref: '#/components/schemas/MnsRegistry-Single' + + #-------Definition of generic IOCs ----------# + #-------- Definition of types----------------------------------------------------- #-------- Definition of concrete IOCs -------------------------------------------- @@ -33,10 +42,10 @@ components: mnsType: type: string enum: - - ProvMnS - - FaultSupervisionMnS - - StreamingDataReportingMnS - - FileDataReportingMnS + - PROV_MNS + - FAULT_SUPERVISION_MNS + - STREAMING_DATA_REPORTING_MNS + - FILE_DATA_REPORTING_MNS mnsVersion: type: string mnsAddress: diff --git a/OpenAPI/TS28623_PmControlNrm.yaml b/OpenAPI/TS28623_PmControlNrm.yaml index 23581d777..6db2ed41e 100644 --- a/OpenAPI/TS28623_PmControlNrm.yaml +++ b/OpenAPI/TS28623_PmControlNrm.yaml @@ -12,6 +12,19 @@ externalDocs: paths: {} components: schemas: + #-------- Definition of types for name-containments ------ + SubNetwork-ncO-PmControlNrm: + type: object + properties: + PerfMetricJob: + $ref: '#/components/schemas/PerfMetricJob-Multiple' + ManagedElement-PmControlNrm: + type: object + properties: + PerfMetricJob: + $ref: '#/components/schemas/PerfMetricJob-Multiple' + #-------Definition of generic IOCs ----------# + #-------- Definition of types----------------------------------------------------- diff --git a/OpenAPI/TS28623_QoEMeasurementCollectionNrm.yaml b/OpenAPI/TS28623_QoEMeasurementCollectionNrm.yaml index 0ec934f55..82c7939c3 100644 --- a/OpenAPI/TS28623_QoEMeasurementCollectionNrm.yaml +++ b/OpenAPI/TS28623_QoEMeasurementCollectionNrm.yaml @@ -12,6 +12,20 @@ externalDocs: paths: {} components: schemas: + #-------- Definition of types for name-containments ------ + SubNetwork-ncO-QoEMeasurementCollectionNrm: + type: object + properties: + QMCJobs: + $ref: '#/components/schemas/QMCJob-Multiple' + ManagedElement-ncO-QoEMeasurementCollectionNrm: + type: object + properties: + QMCJobs: + $ref: '#/components/schemas/QMCJob-Multiple' + #-------Definition of generic IOCs ----------# + + #-------- Definition of types----------------------------------------------------- #-------- Definition of concrete IOCs -------------------------------------------- diff --git a/OpenAPI/TS28623_SubscriptionControlNrm.yaml b/OpenAPI/TS28623_SubscriptionControlNrm.yaml index 5d4932626..4c283391b 100644 --- a/OpenAPI/TS28623_SubscriptionControlNrm.yaml +++ b/OpenAPI/TS28623_SubscriptionControlNrm.yaml @@ -12,6 +12,19 @@ externalDocs: paths: {} components: schemas: + #-------- Definition of types for name-containments ------ + SubNetwork-ncO-SubscriptionControlNrm: + type: object + properties: + NtfSubscriptionControl: + $ref: '#/components/schemas/NtfSubscriptionControl-Multiple' + ManagedElement-ncO-SubscriptionControlNrm: + type: object + properties: + NtfSubscriptionControl: + $ref: '#/components/schemas/NtfSubscriptionControl-Multiple' + #-------Definition of generic IOCs ----------# + #-------- Definition of types----------------------------------------------------- Scope: type: object diff --git a/OpenAPI/TS28623_ThresholdMonitorNrm.yaml b/OpenAPI/TS28623_ThresholdMonitorNrm.yaml index d4fd1aac1..711ce416c 100644 --- a/OpenAPI/TS28623_ThresholdMonitorNrm.yaml +++ b/OpenAPI/TS28623_ThresholdMonitorNrm.yaml @@ -12,6 +12,19 @@ externalDocs: paths: {} components: schemas: + #-------- Definition of types for name-containments ------ + SubNetwork-ncO-ThresholdMonitorNrm: + type: object + properties: + ThresholdMonitor: + $ref: '#/components/schemas/ThresholdMonitor-Multiple' + ManagedElement-ncO-ThresholdMonitorNrm: + type: object + properties: + ThresholdMonitor: + $ref: '#/components/schemas/ThresholdMonitor-Multiple' + #-------Definition of generic IOCs ----------# + #-------- Definition of types----------------------------------------------------- ThresholdInfo: type: object diff --git a/OpenAPI/TS28623_TraceControlNrm.yaml b/OpenAPI/TS28623_TraceControlNrm.yaml index 0d09284e0..481035422 100644 --- a/OpenAPI/TS28623_TraceControlNrm.yaml +++ b/OpenAPI/TS28623_TraceControlNrm.yaml @@ -12,6 +12,19 @@ externalDocs: paths: {} components: schemas: + #-------- Definition of types for name-containments ------ + SubNetwork-ncO-TraceControlNrm: + type: object + properties: + TraceJob: + $ref: '#/components/schemas/TraceJob-Multiple' + ManagedElement-ncO-TraceControlNrm: + type: object + properties: + TraceJob: + $ref: '#/components/schemas/TraceJob-Multiple' + #-------Definition of generic IOCs ----------# + #-------- Definition of types used in Trace control NRM fragment------------------ jobType-Type: @@ -40,8 +53,8 @@ components: type: string enum: - A - - Iu-CS - - Mc + - IU-CS + - MC - MAP-G - MAP-B - MAP-E @@ -54,33 +67,33 @@ components: items: type: string enum: - - Mc - - Nb-UP - - Iu-UP + - MC + - NB-UP + - IU-UP RNCInterfaces: type: array items: type: string enum: - - Iu-CS - - Iu-PS - - Iur - - Iub - - Uu + - IU-CS + - IU-PS + - IUR + - IUB + - UU SGSNInterfaces: type: array items: type: string enum: - - Gb - - Iu-PS - - Gn - - MAP-Gr - - MAP-Gd - - MAP-Gf - - Ge - - Gs - - S6d + - GB + - IU-PS + - GN + - MAP-GR + - MAP-GD + - MAP-GF + - GE + - GS + - S6D - S4 - S3 - S13 @@ -89,34 +102,34 @@ components: items: type: string enum: - - Gn - - Gi - - Gmb + - GN + - GI + - GMB S-CSCFInterfaces: type: array items: type: string enum: - - Mw - - Mg - - Mr - - Mi + - MW + - MG + - MR + - MI P-CSCFInterfaces: type: array items: type: string enum: - - Gm - - Mw + - GM + - MW I-CSCFInterfaces: type: array items: type: string enum: - - Cx - - Dx - - Mg - - Mw + - CX + - DX + - MG + - MW MRFCInterfaces: type: array items: @@ -129,42 +142,42 @@ components: items: type: string enum: - - Mg - - Mj - - Mn + - MG + - MJ + - MN IBCFInterfaces: type: array items: type: string enum: - - Ix - - Mx + - IX + - MX E-CSCFInterfaces: type: array items: type: string enum: - - Mw - - Ml - - Mm - - Mi/Mg + - MW + - ML + - MM + - MI/MG BGCFInterfaces: type: array items: type: string enum: - - Mi - - Mj - - Mk + - MI + - MJ + - MK ASInterfaces: type: array items: type: string enum: - - Dh - - Sh + - DH + - SH - ISC - - Ut + - UT HSSInterfaces: type: array items: @@ -172,12 +185,12 @@ components: enum: - MAP-C - MAP-D - - Gc - - Gr - - Cx - - S6d - - S6a - - Sh + - GC + - GR + - CX + - S6D + - S6A + - SH - N70 - N71 - NU1 @@ -188,13 +201,13 @@ components: enum: - MAP-F - S13 - - MAP-Gf + - MAP-GF BM-SCInterfaces: type: array items: type: string enum: - - Gmb + - GMB MMEInterfaces: type: array items: @@ -202,7 +215,7 @@ components: enum: - S1-MME - S3 - - S6a + - S6A - S10 - S11 - S13 @@ -215,20 +228,20 @@ components: - S5 - S8 - S11 - - Gxc + - GXC PDN_GWInterfaces: type: array items: type: string enum: - - S2a - - S2b - - S2c + - S2A + - S2B + - S2C - S5 - - S6b - - Gx + - S6B + - GX - S8 - - SGi + - SGI eNBInterfaces: type: array items: @@ -243,7 +256,7 @@ components: enum: - S1-MME - X2 - - Uu + - UU - F1-C - E1 AMFInterfaces: @@ -336,16 +349,16 @@ components: type: string enum: - NG-C - - Xn-C - - Uu + - XN-C + - UU gNB-CU-CPInterfaces: type: array items: type: string enum: - NG-C - - Xn-C - - Uu + - XN-C + - UU - F1-C - E1 - X2-C @@ -459,9 +472,9 @@ components: - UTRAN_CELL - E-UTRAN_CELL - NG-RAN_CELL - - eNB + - ENB - RNC - - gNB + - GNB - SUPI TargetIdValue: type: string @@ -480,7 +493,7 @@ components: enum: - MO_MT_CALLS - MO_MT_SMS - - LU_IMSIattach_IMSIdetach + - LU_IMSIATTACH_IMSIDETACH - HANDOVER - SS SGSN: @@ -488,10 +501,10 @@ components: items: type: string enum: - - PDPcontext + - PDPCONTEXT - MO_MT_SMS - - RAU_GPRSattach_GPRSdetach - - MBMScontext + - RAU_GPRSATTACH_GPRSDETACH + - MBMSCONTEXT MGW: type: array items: @@ -503,129 +516,129 @@ components: items: type: string enum: - - PDPcontext - - MBMScontext + - PDPCONTEXT + - MBMSCONTEXT IMS: type: array items: type: string enum: - - SIPsession_StandaloneTransaction + - SIPSESSION_STANDALONETRANSACTION BM_SC: type: array items: type: string enum: - - MBMSactivation + - MBMSACTIVATION MME: type: array items: type: string enum: - - UEinitiatedPDNconnectivityRequest - - ServiceRequest - - InitialAttach_TAU_Detach - - UEinitiatedPDNdisconnection - - BearerActivationModificationDeletion - - Handover + - UE_INITIATEDPDN_CONNECTIVITY_REQUEST + - SERVICE_REQUEST + - INITIALATTACH_TAU_DETACH + - UE_INITIATEDPDN_DISCONNECTION + - BEAR_ACTIVIATION_MODIFICATION_DELETION + - HANDOVER SGW: type: array items: type: string enum: - - PDNconnectionCreation - - PDNconnectionTermination - - BearerActivationModificationDeletion + - PDN_CONNECTION_CREATION + - PDN_CONNECTION_TERMINATION + - BEAR_ACTIVATION_MODIFICATION_DELETION PGW: type: array items: type: string enum: - - PDNconnectionCreation - - PDNconnectionTermination - - BearerActivationModificationDeletion + - PDN_CONNECTION_CREATION + - PDN_CONNECTION_TERMINATION + - BEAR_ACTIVATION_MODIFICATION_DELETION AMF: type: array items: type: string enum: - - Registration - - ServiceRequest - - Handover - - UEderegistration - - NetworkDeregistration - - UEMobilityFromEPC - - UEMobilityToEPC + - REGISTRATION + - SERVICE_REQUEST + - HANDOVER + - UE_DEREGISTRATION + - NETWORK_DEREGISTRATION + - UE_MOBILITY_FROM_EPC + - UE_MOBILITY_TO_EPC SMF: type: array items: type: string enum: - - PDUsessionEstablishment - - PDUsessionModification - - PDUsessionRelease - - PDUsessionUPactivationDeactivation - - MobilityBtw3gppAndN3gppTo5GC - - MobilityFromEpc + - PDU_SESSION_ESTABLISHMENT + - PDU_SESSION_MODIFICATION + - PDU_SESSIOON_RELEASE + - PDU_SESSION_UP_ACTIVATION_DEACTIVATION + - MOBILITY_BTW_3GPP_AND_N3GPP_TO_5GC + - MOBILITY_FROM_EPC PCF: type: array items: type: string enum: - - AMpolicy - - SMpolicy - - Authorization - - BDTpolicy + - AM_POLICY + - SM_POLICY + - AUTHORIZATION + - BDT_POLICY UPF: type: array items: type: string enum: - - N4Session + - N4SESSION AUSF: type: array items: type: string enum: - - UEauthentication + - UE_AUTHENTICATION NEF: type: array items: type: string enum: - - EventExposure - - PFDmanagement - - ParameterProvision - - Trigger + - EVENT_EXPOSURE + - PFD_MANAGEMENT + - PARAMETER_PROVISION + - TRIGGER NRF: type: array items: type: string enum: - - NFmanagement - - NFdiscovery + - NF_MANAGEMEENT + - NF_DISCOVERY NSSF: type: array items: type: string enum: - - NSSelection + - NS_SELECTION - NSSAI SMSF: type: array items: type: string enum: - - SMservice + - SMSERVICE UDM: type: array items: type: string enum: - - UEcontext - - SubscriberData - - UEauthentication - - EventExposure + - UE_CONTEXT + - SUBSCRIBER_DATA + - UE_AUTHENTICATION + - EVENT_EXPOSURE anonymizationOfMdtData-Type: description: Specifies level of MDT anonymization. For additional details see 3GPP TS 32.422 clause 5.10.12. @@ -943,9 +956,9 @@ components: description: See details in 3GPP TS 32.422 clause 5.10.15. type: string enum: - - CPICH_EcNo + - CPICH_ECNO - CPICH_RSCP - - PathLoss + - PATHLOSS eventThresholdUphUmts-Type: description: See details in 3GPP TS 32.422 clause 5.10.A. -- GitLab From 23f40ae94480ba13afc0d5dfad7f3d3d8c36afe7 Mon Sep 17 00:00:00 2001 From: sunse Date: Fri, 5 Jul 2024 13:32:06 +0000 Subject: [PATCH 071/587] update versions --- OpenAPI/TS28541_5GcNrm.yaml | 2 +- OpenAPI/TS28541_NrNrm.yaml | 2 +- OpenAPI/TS28623_ComDefs.yaml | 2 +- OpenAPI/TS28623_FileManagementNrm.yaml | 2 +- OpenAPI/TS28623_GenericNrm.yaml | 2 +- OpenAPI/TS28623_ManagementDataCollectionNrm.yaml | 2 +- OpenAPI/TS28623_MnSRegistryNrm.yaml | 2 +- OpenAPI/TS28623_PmControlNrm.yaml | 2 +- OpenAPI/TS28623_QoEMeasurementCollectionNrm.yaml | 2 +- OpenAPI/TS28623_SubscriptionControlNrm.yaml | 2 +- OpenAPI/TS28623_ThresholdMonitorNrm.yaml | 2 +- OpenAPI/TS28623_TraceControlNrm.yaml | 2 +- 12 files changed, 12 insertions(+), 12 deletions(-) diff --git a/OpenAPI/TS28541_5GcNrm.yaml b/OpenAPI/TS28541_5GcNrm.yaml index fceea8893..b42e3c7f0 100755 --- a/OpenAPI/TS28541_5GcNrm.yaml +++ b/OpenAPI/TS28541_5GcNrm.yaml @@ -1,7 +1,7 @@ openapi: 3.0.1 info: title: 3GPP 5GC NRM - version: 18.8.0 + version: 19.0.0 description: >- OAS 3.0.1 specification of the 5GC NRM © 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). diff --git a/OpenAPI/TS28541_NrNrm.yaml b/OpenAPI/TS28541_NrNrm.yaml index f9b0c46ff..8012e4b33 100755 --- a/OpenAPI/TS28541_NrNrm.yaml +++ b/OpenAPI/TS28541_NrNrm.yaml @@ -1,7 +1,7 @@ openapi: 3.0.1 info: title: NR NRM - version: 18.8.0 + version: 19.0.0 description: >- OAS 3.0.1 specification of the NR NRM © 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). diff --git a/OpenAPI/TS28623_ComDefs.yaml b/OpenAPI/TS28623_ComDefs.yaml index 773ad5b51..50ad665b5 100755 --- a/OpenAPI/TS28623_ComDefs.yaml +++ b/OpenAPI/TS28623_ComDefs.yaml @@ -1,7 +1,7 @@ openapi: 3.0.1 info: title: Common Type Definitions - version: 18.7.0 + version: 19.0.0 description: >- OAS 3.0.1 specification of common type definitions in the Generic NRM © 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). diff --git a/OpenAPI/TS28623_FileManagementNrm.yaml b/OpenAPI/TS28623_FileManagementNrm.yaml index bd3881d20..9a2a45f33 100644 --- a/OpenAPI/TS28623_FileManagementNrm.yaml +++ b/OpenAPI/TS28623_FileManagementNrm.yaml @@ -1,7 +1,7 @@ openapi: 3.0.1 info: title: File Management NRM - version: 18.7.0 + version: 19.0.0 description: >- OAS 3.0.1 definition of the File Management NRM fragment © 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). diff --git a/OpenAPI/TS28623_GenericNrm.yaml b/OpenAPI/TS28623_GenericNrm.yaml index 9db6fa936..389d35d52 100755 --- a/OpenAPI/TS28623_GenericNrm.yaml +++ b/OpenAPI/TS28623_GenericNrm.yaml @@ -1,7 +1,7 @@ openapi: 3.0.1 info: title: Generic NRM - version: 18.7.0 + version: 19.0.0 description: >- OAS 3.0.1 definition of the Generic NRM © 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). diff --git a/OpenAPI/TS28623_ManagementDataCollectionNrm.yaml b/OpenAPI/TS28623_ManagementDataCollectionNrm.yaml index 63710ca79..9424693be 100644 --- a/OpenAPI/TS28623_ManagementDataCollectionNrm.yaml +++ b/OpenAPI/TS28623_ManagementDataCollectionNrm.yaml @@ -1,7 +1,7 @@ openapi: 3.0.1 info: title: Management Data Collection NRM - version: 18.6.0 + version: 19.0.0 description: >- OAS 3.0.1 definition of the Management Data Collection NRM fragment © 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). diff --git a/OpenAPI/TS28623_MnSRegistryNrm.yaml b/OpenAPI/TS28623_MnSRegistryNrm.yaml index bb5d1a1a8..cdfac7e17 100644 --- a/OpenAPI/TS28623_MnSRegistryNrm.yaml +++ b/OpenAPI/TS28623_MnSRegistryNrm.yaml @@ -1,7 +1,7 @@ openapi: 3.0.1 info: title: MnS Registry NRM - version: 18.6.0 + version: 19.0.0 description: >- OAS 3.0.1 definition of the MnS Registry NRM fragment © 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). diff --git a/OpenAPI/TS28623_PmControlNrm.yaml b/OpenAPI/TS28623_PmControlNrm.yaml index 6db2ed41e..720842e2d 100644 --- a/OpenAPI/TS28623_PmControlNrm.yaml +++ b/OpenAPI/TS28623_PmControlNrm.yaml @@ -1,7 +1,7 @@ openapi: 3.0.1 info: title: PM control NRM - version: 18.6.0 + version: 19.0.0 description: >- OAS 3.0.1 definition of the PM control NRM fragment © 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). diff --git a/OpenAPI/TS28623_QoEMeasurementCollectionNrm.yaml b/OpenAPI/TS28623_QoEMeasurementCollectionNrm.yaml index 82c7939c3..2869d78e7 100644 --- a/OpenAPI/TS28623_QoEMeasurementCollectionNrm.yaml +++ b/OpenAPI/TS28623_QoEMeasurementCollectionNrm.yaml @@ -1,7 +1,7 @@ openapi: 3.0.1 info: title: QoE Measurement Collection NRM - version: 18.7.0 + version: 19.0.0 description: >- OAS 3.0.1 definition of the QoE Measurement Collection NRM © 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). diff --git a/OpenAPI/TS28623_SubscriptionControlNrm.yaml b/OpenAPI/TS28623_SubscriptionControlNrm.yaml index 4c283391b..c91ffec53 100644 --- a/OpenAPI/TS28623_SubscriptionControlNrm.yaml +++ b/OpenAPI/TS28623_SubscriptionControlNrm.yaml @@ -1,7 +1,7 @@ openapi: 3.0.1 info: title: Subscription Control NRM - version: 18.7.0 + version: 19.0.0 description: >- OAS 3.0.1 definition of the Subscription Control NRM fragment © 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). diff --git a/OpenAPI/TS28623_ThresholdMonitorNrm.yaml b/OpenAPI/TS28623_ThresholdMonitorNrm.yaml index 711ce416c..84e95a94a 100644 --- a/OpenAPI/TS28623_ThresholdMonitorNrm.yaml +++ b/OpenAPI/TS28623_ThresholdMonitorNrm.yaml @@ -1,7 +1,7 @@ openapi: 3.0.1 info: title: Threshold Monitor NRM - version: 18.2.0 + version: 19.0.0 description: >- OAS 3.0.1 definition of the Threshold Monitor NRM fragment © 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). diff --git a/OpenAPI/TS28623_TraceControlNrm.yaml b/OpenAPI/TS28623_TraceControlNrm.yaml index 481035422..8274aceb6 100644 --- a/OpenAPI/TS28623_TraceControlNrm.yaml +++ b/OpenAPI/TS28623_TraceControlNrm.yaml @@ -1,7 +1,7 @@ openapi: 3.0.1 info: title: Trace Control NRM - version: 18.7.0 + version: 19.0.0 description: >- OAS 3.0.1 definition of the Trace Control NRM fragment © 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). -- GitLab From b9ab0171ef83d64e461d5a923d5b84f2b9e45797 Mon Sep 17 00:00:00 2001 From: sunse Date: Fri, 23 Aug 2024 10:48:11 +0000 Subject: [PATCH 072/587] TS28.623 Rel19 CR0389 correction to duplicate Scope definition and misalignment --- OpenAPI/TS28623_GenericNrm.yaml | 17 ------------- OpenAPI/TS28623_SubscriptionControlNrm.yaml | 27 ++++++++++++--------- 2 files changed, 16 insertions(+), 28 deletions(-) diff --git a/OpenAPI/TS28623_GenericNrm.yaml b/OpenAPI/TS28623_GenericNrm.yaml index 389d35d52..272fa9fd3 100755 --- a/OpenAPI/TS28623_GenericNrm.yaml +++ b/OpenAPI/TS28623_GenericNrm.yaml @@ -101,23 +101,6 @@ components: properties: streamTarget: $ref: 'TS28623_ComDefs.yaml#/components/schemas/Uri' - Scope: - oneOf: - - type: object - properties: - scopeType: - type: string - enum: - - BASE_ONLY - - BASE_ALL - - BASE_NTH_LEVEL - - BASE_SUBTREE - scopeLevel: - type: integer - - type: object - properties: - dataNodeSelector: - type: string ProcessMonitor: description: >- This data type is the "ProcessMonitor" data type without specialisations. diff --git a/OpenAPI/TS28623_SubscriptionControlNrm.yaml b/OpenAPI/TS28623_SubscriptionControlNrm.yaml index c91ffec53..8ab7afaea 100644 --- a/OpenAPI/TS28623_SubscriptionControlNrm.yaml +++ b/OpenAPI/TS28623_SubscriptionControlNrm.yaml @@ -27,17 +27,22 @@ components: #-------- Definition of types----------------------------------------------------- Scope: - type: object - properties: - scopeType: - type: string - enum: - - BASE_ONLY - - BASE_ALL - - BASE_NTH_LEVEL - - BASE_SUBTREE - scopeLevel: - type: integer + oneOf: + - type: object + properties: + scopeType: + type: string + enum: + - BASE_ONLY + - BASE_ALL + - BASE_NTH_LEVEL + - BASE_SUBTREE + scopeLevel: + type: integer + - type: object + properties: + dataNodeSelector: + type: string #-------- Definition of concrete IOCs -------------------------------------------- NtfSubscriptionControl-Single: -- GitLab From 0b15b649a5bf997304b983fd723e24136908f8d5 Mon Sep 17 00:00:00 2001 From: sunse Date: Wed, 7 Aug 2024 09:47:22 +0000 Subject: [PATCH 073/587] TS28.541 Rel19 CR1300 correction to NFProfile_used_in_NRFFunction --- OpenAPI/TS28541_5GcNrm.yaml | 30 +++++++++++++++++++----------- 1 file changed, 19 insertions(+), 11 deletions(-) diff --git a/OpenAPI/TS28541_5GcNrm.yaml b/OpenAPI/TS28541_5GcNrm.yaml index b42e3c7f0..3fde5ecf4 100755 --- a/OpenAPI/TS28541_5GcNrm.yaml +++ b/OpenAPI/TS28541_5GcNrm.yaml @@ -59,17 +59,21 @@ components: type: object description: 'NF profile stored in NRF, defined in TS 29.510' properties: - nFInstanceId: + nfInstanceId: type: string description: uuid of NF instance - nFType: + nfType: $ref: '#/components/schemas/NFType' - nFStatus: + nfStatus: $ref: '#/components/schemas/NFStatus' plmn: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/PlmnId' + type: array + items: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/PlmnId' sNssais: - $ref: 'TS28541_NrNrm.yaml#/components/schemas/Snssai' + type: array + items: + $ref: 'TS28541_NrNrm.yaml#/components/schemas/Snssai' fqdn: $ref: 'TS28623_ComDefs.yaml#/components/schemas/Fqdn' interPlmnFqdn: @@ -86,8 +90,10 @@ components: type: string serviceName: type: string - version: - type: string + versions: + type: array + items: + type: string schema: type: string fqdn: @@ -98,10 +104,12 @@ components: type: array items: $ref: '#/components/schemas/IpEndPoint' - apiPrfix: + apiPrefix: type: string allowedPlmns: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/PlmnId' + type: array + items: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/PlmnId' allowedNfTypes: type: array items: @@ -4774,8 +4782,8 @@ components: type: string cNSIIdList: $ref: '#/components/schemas/CNSIIdList' - nFProfileList: - $ref: '#/components/schemas/NFProfileList' + managedNFProfile: + $ref: '#/components/schemas/ManagedNFProfile' commModelList: $ref: '#/components/schemas/CommModelList' nssafInfo: -- GitLab From 1b7cc61c26470800e59a0782965dacf0d6952622 Mon Sep 17 00:00:00 2001 From: sunse Date: Fri, 23 Aug 2024 11:54:30 +0000 Subject: [PATCH 074/587] TR28.541 Rel19 CR1302 correction to attribute definintion to InterfaceUpfInfoItem_and_IpInterface --- OpenAPI/TS28541_5GcNrm.yaml | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/OpenAPI/TS28541_5GcNrm.yaml b/OpenAPI/TS28541_5GcNrm.yaml index 3fde5ecf4..70e59d659 100755 --- a/OpenAPI/TS28541_5GcNrm.yaml +++ b/OpenAPI/TS28541_5GcNrm.yaml @@ -799,12 +799,10 @@ components: type: array items: $ref: 'TS28623_ComDefs.yaml#/components/schemas/Ipv4Addr' - minItems: 1 ipv6EndpointAddresses: type: array items: $ref: 'TS28623_ComDefs.yaml#/components/schemas/Ipv6Addr' - minItems: 1 fqdn: $ref: 'TS28623_ComDefs.yaml#/components/schemas/Fqdn' networkInstance: @@ -824,9 +822,13 @@ components: type: object properties: ipv4EndpointAddresses: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/Ipv4Addr' + type: array + items: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/Ipv4Addr' ipv6EndpointAddresses: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/Ipv6Addr' + type: array + items: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/Ipv6Addr' fqdn: $ref: 'TS28623_ComDefs.yaml#/components/schemas/Fqdn' -- GitLab From 0581b8407f68fd4f7dbe3e2d541d47d6b2180b1d Mon Sep 17 00:00:00 2001 From: swaminathan1 Date: Wed, 7 Aug 2024 15:24:50 +0000 Subject: [PATCH 075/587] tAdd missing trace interfaces --- OpenAPI/TS28623_TraceControlNrm.yaml | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/OpenAPI/TS28623_TraceControlNrm.yaml b/OpenAPI/TS28623_TraceControlNrm.yaml index 8274aceb6..34d0a1768 100644 --- a/OpenAPI/TS28623_TraceControlNrm.yaml +++ b/OpenAPI/TS28623_TraceControlNrm.yaml @@ -274,6 +274,8 @@ components: - N20 - N22 - N26 + - N41 + - N42 AUSFInterfaces: type: array items: @@ -310,6 +312,7 @@ components: - N5 - N7 - N15 + - N28 SMFInterfaces: type: array items: @@ -320,6 +323,10 @@ components: - N10 - N11 - S5-C + - N16 + - N16a + - N38 + - N40 SMSFInterfaces: type: array items: @@ -569,6 +576,7 @@ components: - NETWORK_DEREGISTRATION - UE_MOBILITY_FROM_EPC - UE_MOBILITY_TO_EPC + - CONVERGED_CHARGING_SERVICE SMF: type: array items: @@ -580,6 +588,9 @@ components: - PDU_SESSION_UP_ACTIVATION_DEACTIVATION - MOBILITY_BTW_3GPP_AND_N3GPP_TO_5GC - MOBILITY_FROM_EPC + - MOBILITY_BTW_ISMF_OR_VSMF + - CONVERGED_CHARGING_SERVICE + - OFFLINE_ONLY_CHARGING PCF: type: array items: @@ -589,6 +600,7 @@ components: - SM_POLICY - AUTHORIZATION - BDT_POLICY + - SPENDING_LIMIT_CONTROL UPF: type: array items: -- GitLab From 91310876264808bc244be65868c8915a6f7e0121 Mon Sep 17 00:00:00 2001 From: ruiyue Date: Thu, 8 Aug 2024 09:00:19 +0000 Subject: [PATCH 076/587] Update file TS28541_NrNrm.yaml --- OpenAPI/TS28541_NrNrm.yaml | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/OpenAPI/TS28541_NrNrm.yaml b/OpenAPI/TS28541_NrNrm.yaml index 8012e4b33..6beabfa52 100755 --- a/OpenAPI/TS28541_NrNrm.yaml +++ b/OpenAPI/TS28541_NrNrm.yaml @@ -1008,6 +1008,10 @@ components: $ref: 'TS28541_5GcNrm.yaml#/components/schemas/Configurable5QISet-Multiple' Dynamic5QISet: $ref: 'TS28541_5GcNrm.yaml#/components/schemas/Dynamic5QISet-Multiple' + NRNetwork: + $ref: '#/components/schemas/NRNetwork-Single' + EUtranNetwork: + $ref: '#/components/schemas/EUtraNetwork-Single' NrCellCu-Single: allOf: @@ -1717,6 +1721,16 @@ components: $ref: '#/components/schemas/EP_F1C-Multiple' EP_F1U: $ref: '#/components/schemas/EP_F1U-Multiple' + NRNetwork-Single: + allOf: + - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' + - type: object + properties: + NRFrequency: + $ref: '#/components/schemas/NRFrequency-Multiple' + ExternalGnbCuCpFunction: + $ref: '#/components/schemas/ExternalGnbCuCpFunction-Multiple' + ExternalGnbCuUpFunction-Single: allOf: - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' @@ -1787,6 +1801,16 @@ components: nRFrequencyRef: $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' + EUtraNetwork-Single: + allOf: + - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' + - type: object + properties: + EUtranFrequency: + $ref: '#/components/schemas/EUtranFrequency-Multiple' + ExternalENBFunction: + $ref: '#/components/schemas/ExternalENBFunction-Multiple' + ExternalENBFunction-Single: allOf: - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' @@ -2215,6 +2239,9 @@ components: - $ref: '#/components/schemas/NrCellDu-Single' - $ref: '#/components/schemas/NrOperatorCellDu-Single' + - $ref: '#/components/schemas/NRNetwork-Single' + - $ref: '#/components/schemas/EUtraNetwork-Single' + - $ref: '#/components/schemas/NRFrequency-Single' - $ref: '#/components/schemas/EUtranFrequency-Single' -- GitLab From d63948fdf2c8cf6d7328fe0bcfae254ad9efc353 Mon Sep 17 00:00:00 2001 From: ruiyue Date: Wed, 7 Aug 2024 01:08:39 +0000 Subject: [PATCH 077/587] Update 2 files - /OpenAPI/TS28623_ComDefs.yaml - /OpenAPI/TS28623_GenericNrm.yaml --- OpenAPI/TS28623_ComDefs.yaml | 5 +++++ OpenAPI/TS28623_GenericNrm.yaml | 11 +++++++++-- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/OpenAPI/TS28623_ComDefs.yaml b/OpenAPI/TS28623_ComDefs.yaml index 50ad665b5..cfed2525f 100755 --- a/OpenAPI/TS28623_ComDefs.yaml +++ b/OpenAPI/TS28623_ComDefs.yaml @@ -48,7 +48,12 @@ components: maximum: 180 Dn: + description: this datatype used for attribute which can be writable type: string + DnRo: + description: this datatype used for attribute which is readonly + type: string + readOnly: string DnList: type: array items: diff --git a/OpenAPI/TS28623_GenericNrm.yaml b/OpenAPI/TS28623_GenericNrm.yaml index 272fa9fd3..2e5ba4215 100755 --- a/OpenAPI/TS28623_GenericNrm.yaml +++ b/OpenAPI/TS28623_GenericNrm.yaml @@ -61,11 +61,13 @@ components: type: array items: type: string + readOnly: true granularityPeriods: type: array items: type: integer minimum: 1 + readOnly: true reportingMethods: type: array items: @@ -73,12 +75,14 @@ components: enum: - FILE_BASED_LOC_SET_BY_PRODUCER - FILE_BASED_LOC_SET_BY_CONSUMER - - STREAM_BASED + - STREAM_BASED + readOnly: true reportingPeriods: type: array items: type: integer minimum: 1 + readOnly: true ReportingCtrl: oneOf: - type: object @@ -308,10 +312,12 @@ components: $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList' vendorName: type: string + readOnly: true userDefinedState: type: string swVersion: type: string + readOnly: true priorityLabel: type: integer supportedPerfMetricGroups: @@ -322,6 +328,7 @@ components: type: array items: type: string + readOnly: true SubNetwork-ncO: type: object @@ -458,7 +465,7 @@ components: type: object properties: systemDN: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnRo' MeContext-Single: allOf: - $ref: '#/components/schemas/Top' -- GitLab From 10059ccf0c862085034769810052ca3d61efc757 Mon Sep 17 00:00:00 2001 From: ruiyue Date: Wed, 7 Aug 2024 01:11:59 +0000 Subject: [PATCH 078/587] Update file TS28623_ComDefs.yaml --- OpenAPI/TS28623_ComDefs.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OpenAPI/TS28623_ComDefs.yaml b/OpenAPI/TS28623_ComDefs.yaml index cfed2525f..d9ad38422 100755 --- a/OpenAPI/TS28623_ComDefs.yaml +++ b/OpenAPI/TS28623_ComDefs.yaml @@ -53,7 +53,7 @@ components: DnRo: description: this datatype used for attribute which is readonly type: string - readOnly: string + readOnly: true DnList: type: array items: -- GitLab From 110e5ee1a8277e9f52464231e8fd839dcf8b003b Mon Sep 17 00:00:00 2001 From: ruiyue Date: Wed, 7 Aug 2024 01:18:10 +0000 Subject: [PATCH 079/587] Update file TS28623_GenericNrm.yaml --- OpenAPI/TS28623_GenericNrm.yaml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/OpenAPI/TS28623_GenericNrm.yaml b/OpenAPI/TS28623_GenericNrm.yaml index 2e5ba4215..4a51bce4e 100755 --- a/OpenAPI/TS28623_GenericNrm.yaml +++ b/OpenAPI/TS28623_GenericNrm.yaml @@ -285,6 +285,7 @@ components: type: array items: $ref: 'TS28623_ComDefs.yaml#/components/schemas/Mcc' + readOnly: true priorityLabel: type: integer supportedPerfMetricGroups: @@ -448,12 +449,15 @@ components: $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList' vendorName: type: string + readOnly: true userDefinedState: type: string locationName: type: string + readOnly: true swVersion: type: string + readOnly: true MnsAgent: $ref: '#/components/schemas/MnsAgent-Multiple' MnsAgent-Single: @@ -476,6 +480,7 @@ components: properties: dnPrefix: type: string + readOnly: true Scheduler-Single: allOf: - $ref: '#/components/schemas/Top' -- GitLab From 4774279b8604ce1040c67e0ad8c409f37494f1d4 Mon Sep 17 00:00:00 2001 From: ruiyue Date: Wed, 7 Aug 2024 01:35:27 +0000 Subject: [PATCH 080/587] Update 3 files - /OpenAPI/TS28623_GenericNrm.yaml - /OpenAPI/TS28623_ComDefs.yaml - /OpenAPI/TS28623_MnSRegistryNrm.yaml --- OpenAPI/TS28623_ComDefs.yaml | 8 +++++++- OpenAPI/TS28623_GenericNrm.yaml | 4 ++++ OpenAPI/TS28623_MnSRegistryNrm.yaml | 6 +++++- 3 files changed, 16 insertions(+), 2 deletions(-) diff --git a/OpenAPI/TS28623_ComDefs.yaml b/OpenAPI/TS28623_ComDefs.yaml index d9ad38422..909c0fa02 100755 --- a/OpenAPI/TS28623_ComDefs.yaml +++ b/OpenAPI/TS28623_ComDefs.yaml @@ -184,7 +184,12 @@ components: - $ref: '#/components/schemas/IpAddr' - $ref: '#/components/schemas/Fqdn' Uri: + description: This datatype is used for writable attribute type: string + UriRo: + type: string + description: This datatype is used for readOnly attribute + readOnly: true TimeInterval: type: object @@ -210,7 +215,8 @@ components: enum: - ENABLED - DISABLED - default: DISABLED + default: DISABLED + readOnly: true UsageState: type: string enum: diff --git a/OpenAPI/TS28623_GenericNrm.yaml b/OpenAPI/TS28623_GenericNrm.yaml index 4a51bce4e..d74ec769d 100755 --- a/OpenAPI/TS28623_GenericNrm.yaml +++ b/OpenAPI/TS28623_GenericNrm.yaml @@ -288,6 +288,7 @@ components: readOnly: true priorityLabel: type: integer + readOnly: true supportedPerfMetricGroups: type: array items: @@ -401,6 +402,7 @@ components: type: string farEndEntity: type: string + readOnly: true supportedPerfMetricGroups: type: array items: @@ -428,8 +430,10 @@ components: properties: vsDataType: type: string + readOnly: true vsDataFormatVersion: type: string + readOnly: true vsData: nullable: true VsDataContainer: diff --git a/OpenAPI/TS28623_MnSRegistryNrm.yaml b/OpenAPI/TS28623_MnSRegistryNrm.yaml index cdfac7e17..74e62e6af 100644 --- a/OpenAPI/TS28623_MnSRegistryNrm.yaml +++ b/OpenAPI/TS28623_MnSRegistryNrm.yaml @@ -39,8 +39,10 @@ components: properties: mnsLabel: type: string + readOnly: true mnsType: type: string + readOnly: true enum: - PROV_MNS - FAULT_SUPERVISION_MNS @@ -48,9 +50,10 @@ components: - FILE_DATA_REPORTING_MNS mnsVersion: type: string + readOnly: true mnsAddress: description: Resource URI as defined in the relevant Technical Specification - $ref: 'TS28623_ComDefs.yaml#/components/schemas/Uri' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/UriRo' mnsScope: description: >- List of the managed object instances that can be accessed using the MnS. @@ -60,6 +63,7 @@ components: type: array items: $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' + ReadOnly: true #-------- Definition of YAML arrays for name-contained IOCs ---------------------- -- GitLab From 3d8463e16344cc39496f743c26d5b37082ab39d6 Mon Sep 17 00:00:00 2001 From: ruiyue Date: Wed, 7 Aug 2024 01:40:37 +0000 Subject: [PATCH 081/587] Update file TS28623_MnSRegistryNrm.yaml --- OpenAPI/TS28623_MnSRegistryNrm.yaml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/OpenAPI/TS28623_MnSRegistryNrm.yaml b/OpenAPI/TS28623_MnSRegistryNrm.yaml index 74e62e6af..c72b9055f 100644 --- a/OpenAPI/TS28623_MnSRegistryNrm.yaml +++ b/OpenAPI/TS28623_MnSRegistryNrm.yaml @@ -62,8 +62,7 @@ components: entities within the SubNetwork. type: array items: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' - ReadOnly: true + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnRo' #-------- Definition of YAML arrays for name-contained IOCs ---------------------- -- GitLab From 5f3e39fc32bcfae07029cffc34f48f6a4cdb123e Mon Sep 17 00:00:00 2001 From: ruiyue Date: Wed, 7 Aug 2024 01:50:46 +0000 Subject: [PATCH 082/587] Update 3 files - /OpenAPI/TS28623_ComDefs.yaml - /OpenAPI/TS28623_GenericNrm.yaml - /OpenAPI/TS28623_FileManagementNrm.yaml --- OpenAPI/TS28623_ComDefs.yaml | 9 +++++++-- OpenAPI/TS28623_FileManagementNrm.yaml | 28 +++++++++++++++++++------- OpenAPI/TS28623_GenericNrm.yaml | 9 +++++++-- 3 files changed, 35 insertions(+), 11 deletions(-) diff --git a/OpenAPI/TS28623_ComDefs.yaml b/OpenAPI/TS28623_ComDefs.yaml index 909c0fa02..7bdbd94fd 100755 --- a/OpenAPI/TS28623_ComDefs.yaml +++ b/OpenAPI/TS28623_ComDefs.yaml @@ -17,8 +17,13 @@ components: type: number format: float DateTime: + description: This datatype is used for writable attribute + type: string + format: date-time + DateTimeRo: This datatype is used for readOnly attribute type: string format: date-time + readOnly: true FullTime: type: string description: format (e.g., full-time) is from RFC 3339 @@ -48,10 +53,10 @@ components: maximum: 180 Dn: - description: this datatype used for attribute which can be writable + description: This datatype is used for writable attribute type: string DnRo: - description: this datatype used for attribute which is readonly + description: This datatype is used for readOnly attribute type: string readOnly: true DnList: diff --git a/OpenAPI/TS28623_FileManagementNrm.yaml b/OpenAPI/TS28623_FileManagementNrm.yaml index 9a2a45f33..e8710115c 100644 --- a/OpenAPI/TS28623_FileManagementNrm.yaml +++ b/OpenAPI/TS28623_FileManagementNrm.yaml @@ -40,8 +40,10 @@ components: properties: jobId: type: string + readOnly: true status: type: string + readOnly: true enum: - NOT_STARTED - RUNNING @@ -51,13 +53,16 @@ components: - CANCELLED progressPercentage: type: integer + readOnly: true minimum: 0 maximum: 100 progressStateInfo: + readOnly: true type: string resultStateInfo: oneOf: - type: string + readOnly: true enum: - NULL - UNKNOWN @@ -69,10 +74,11 @@ components: - TIMER_EXPIRED - OTHER - type: string + readOnly: true startTime: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTime' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTimeRo' endTime: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTime' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTimeRo' timer: type: integer @@ -109,10 +115,12 @@ components: properties: numberOfFiles: type: integer + readOnly: true jobRef: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnRo' jobId: type: string + readOnly: true File: $ref: '#/components/schemas/File-Multiple' File-Single: @@ -124,13 +132,16 @@ components: type: object properties: fileLocation: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/Uri' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/UriRo' fileCompression: type: string + readOnly: true fileSize: type: integer + readOnly: true fileDataType: type: string + readOnly: true enum: - PERFORMANCE - TRACE @@ -138,16 +149,19 @@ components: - PROPRIETARY fileFormat: type: string + readOnly: true fileReadyTime: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTime' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTimeRo' fileExpirationTime: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTime' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTimeRo' fileContent: type: string + readOnly: true jobRef: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnRo' jobId: type: string + readOnly: true diff --git a/OpenAPI/TS28623_GenericNrm.yaml b/OpenAPI/TS28623_GenericNrm.yaml index d74ec769d..1b065a87e 100755 --- a/OpenAPI/TS28623_GenericNrm.yaml +++ b/OpenAPI/TS28623_GenericNrm.yaml @@ -112,8 +112,10 @@ components: properties: jobId: type: string + readOnly: true status: type: string + readOnly: true enum: - NOT_STARTED - RUNNING @@ -124,16 +126,19 @@ components: - CANCELLED progressPercentage: type: integer + readOnly: true minimum: 0 maximum: 100 progressStateInfo: type: string + readOnly: true resultStateInfo: type: string + readOnly: true startTime: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTime' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTimeRo' endTime: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTime' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTimeRo' timer: type: integer AreaScope: -- GitLab From cdee92356d4c918031367e5e432805da9fb03033 Mon Sep 17 00:00:00 2001 From: ruiyue Date: Wed, 7 Aug 2024 01:54:14 +0000 Subject: [PATCH 083/587] Update file TS28623_ComDefs.yaml --- OpenAPI/TS28623_ComDefs.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/OpenAPI/TS28623_ComDefs.yaml b/OpenAPI/TS28623_ComDefs.yaml index 7bdbd94fd..342512c3c 100755 --- a/OpenAPI/TS28623_ComDefs.yaml +++ b/OpenAPI/TS28623_ComDefs.yaml @@ -20,7 +20,8 @@ components: description: This datatype is used for writable attribute type: string format: date-time - DateTimeRo: This datatype is used for readOnly attribute + DateTimeRo: + description: This datatype is used for readOnly attribute type: string format: date-time readOnly: true -- GitLab From 981d1bf418890b147b8330b9fd77451bae21d183 Mon Sep 17 00:00:00 2001 From: ruiyue Date: Wed, 7 Aug 2024 02:14:11 +0000 Subject: [PATCH 084/587] Update 2 files - /OpenAPI/TS28623_QoEMeasurementCollectionNrm.yaml - /OpenAPI/TS28623_GenericNrm.yaml --- OpenAPI/TS28623_GenericNrm.yaml | 3 +++ OpenAPI/TS28623_QoEMeasurementCollectionNrm.yaml | 1 + 2 files changed, 4 insertions(+) diff --git a/OpenAPI/TS28623_GenericNrm.yaml b/OpenAPI/TS28623_GenericNrm.yaml index 1b065a87e..7b99d3661 100755 --- a/OpenAPI/TS28623_GenericNrm.yaml +++ b/OpenAPI/TS28623_GenericNrm.yaml @@ -505,6 +505,7 @@ components: minItems: 1 schedulerStatus: type: boolean + readOnly: true ConditionMonitor-Single: allOf: - $ref: '#/components/schemas/Top' @@ -517,6 +518,7 @@ components: type: string conditionStatus: type: boolean + readOnly: true SupportedNotifications-Single: allOf: @@ -538,6 +540,7 @@ components: - HTTP - HTTP_VES_ENCAPS minItems: 1 + readOnly: true SubNetwork-Single: diff --git a/OpenAPI/TS28623_QoEMeasurementCollectionNrm.yaml b/OpenAPI/TS28623_QoEMeasurementCollectionNrm.yaml index 2869d78e7..913858221 100644 --- a/OpenAPI/TS28623_QoEMeasurementCollectionNrm.yaml +++ b/OpenAPI/TS28623_QoEMeasurementCollectionNrm.yaml @@ -76,6 +76,7 @@ components: maxItems: 2 mBSCommunicationServiceType: type: string + readOnly: true enum: - BROADCAST - MULTICAST -- GitLab From f6a0b30372640065ddbb9d132c97a40267b14d13 Mon Sep 17 00:00:00 2001 From: ruiyue Date: Wed, 7 Aug 2024 07:03:01 +0000 Subject: [PATCH 085/587] Update 2 files - /OpenAPI/TS28623_ComDefs.yaml - /OpenAPI/TS28541_NrNrm.yaml --- OpenAPI/TS28541_NrNrm.yaml | 43 ++++++++++++++++++++++-------------- OpenAPI/TS28623_ComDefs.yaml | 6 +++++ 2 files changed, 33 insertions(+), 16 deletions(-) diff --git a/OpenAPI/TS28541_NrNrm.yaml b/OpenAPI/TS28541_NrNrm.yaml index 6beabfa52..ccd41125e 100755 --- a/OpenAPI/TS28541_NrNrm.yaml +++ b/OpenAPI/TS28541_NrNrm.yaml @@ -34,6 +34,7 @@ components: type: integer minimum: 0 maximum: 68719476735 + readOnly: true Sst: type: integer @@ -234,6 +235,7 @@ components: - IDLE - INACTIVE - ACTIVE + readOnly: true CyclicPrefix: type: string enum: @@ -835,7 +837,7 @@ components: configurable5QISetRef: $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' dynamic5QISetRef: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnRo' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' - type: object properties: @@ -882,7 +884,7 @@ components: $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' dynamic5QISetRef: description: This attribute is condition optional. The condition is NG-RAN Multi-Operator Core Network (NG-RAN MOCN) network sharing with operator specific 5QI is supported. - $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnRo' NrOperatorCellDu: $ref: '#/components/schemas/NrOperatorCellDu-Multiple' GnbCuUpFunction-Single: @@ -906,7 +908,7 @@ components: configurable5QISetRef: $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' dynamic5QISetRef: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnRo' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' - type: object properties: @@ -966,9 +968,9 @@ components: configurable5QISetRef: $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' dynamic5QISetRef: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnRo' ephemerisInfoSetRef: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnRo' dCHOControl: type: boolean dDAPSHOControl: @@ -1028,7 +1030,7 @@ components: plmnInfoList: $ref: '#/components/schemas/PlmnInfoList' nRFrequencyRef: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnRo' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' - type: object properties: @@ -1191,6 +1193,7 @@ components: type: integer minimum: 1 maximum: 256 + readOnly: true EUtranFrequency-Single: allOf: - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' @@ -1290,24 +1293,30 @@ components: properties: beamIndex: type: integer + readOnly: true beamType: type: string + readOnly: true enum: - - SSB_BEAM + - SSB_BEAM beamAzimuth: type: integer + readOnly: true minimum: -1800 maximum: 1800 beamTilt: type: integer + readOnly: true minimum: -900 maximum: 900 beamHorizWidth: type: integer + readOnly: true minimum: 0 maximum: 3599 beamVertWidth: type: integer + readOnly: true minimum: 0 maximum: 1800 RRMPolicyRatio-Single: @@ -1540,18 +1549,20 @@ components: $ref: "#/components/schemas/InterRatEsDeactivationCandidateCellParameters" isProbingCapable: type: string + readOnly: true enum: - YES - NO energySavingState: type: string + readOnly: true enum: - IS_NOT_ENERGY_SAVING - IS_ENERGY_SAVING mLModelRefList: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnListRo' aIMLInferenceFunctionRefList: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnListRo' DRACHOptimizationFunction-Single: allOf: - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' @@ -1586,9 +1597,9 @@ components: tstoreUEcntxt: $ref: '#/components/schemas/TstoreUEcntxt' mLModelRefList: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnListRo' aIMLInferenceFunctionRefList: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnListRo' DLBOFunction-Single: allOf: - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' @@ -1604,9 +1615,9 @@ components: minimumTimeBetweenHoTriggerChange: $ref: '#/components/schemas/MinimumTimeBetweenHoTriggerChange' mLModelRefList: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnListRo' aIMLInferenceFunctionRefList: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnListRo' DPCIConfigurationFunction-Single: allOf: - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' @@ -1698,7 +1709,7 @@ components: setType: $ref: '#/components/schemas/RSSetType' nRCellDURefs: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnListRo' ExternalGnbDuFunction-Single: allOf: @@ -1941,7 +1952,7 @@ components: remoteAddress: $ref: '#/components/schemas/RemoteAddress' epTransportRefs: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnListRo' EP_NgU-Single: allOf: @@ -1958,7 +1969,7 @@ components: remoteAddress: $ref: '#/components/schemas/RemoteAddress' epTransportRefs: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnListRo' EP_X2U-Single: allOf: diff --git a/OpenAPI/TS28623_ComDefs.yaml b/OpenAPI/TS28623_ComDefs.yaml index 342512c3c..786e3a391 100755 --- a/OpenAPI/TS28623_ComDefs.yaml +++ b/OpenAPI/TS28623_ComDefs.yaml @@ -61,9 +61,15 @@ components: type: string readOnly: true DnList: + description: This datatype is used for writable attribute type: array items: $ref: '#/components/schemas/Dn' + DnListRo: + description: This datatype is used for readOnly attribute + type: array + items: + $ref: '#/components/schemas/DnRo' Mcc: type: string -- GitLab From 053838aa8bd857c3d2779f8ca424913aa4f4cbff Mon Sep 17 00:00:00 2001 From: ruiyue Date: Wed, 7 Aug 2024 07:07:08 +0000 Subject: [PATCH 086/587] Update file TS28541_NrNrm.yaml --- OpenAPI/TS28541_NrNrm.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OpenAPI/TS28541_NrNrm.yaml b/OpenAPI/TS28541_NrNrm.yaml index ccd41125e..d1a08c250 100755 --- a/OpenAPI/TS28541_NrNrm.yaml +++ b/OpenAPI/TS28541_NrNrm.yaml @@ -1293,7 +1293,7 @@ components: properties: beamIndex: type: integer - readOnly: true + readOnly: true beamType: type: string readOnly: true -- GitLab From feb86056b8d646cabc5f501a11540021bb01fcd9 Mon Sep 17 00:00:00 2001 From: ruiyue Date: Wed, 7 Aug 2024 08:25:07 +0000 Subject: [PATCH 087/587] Update 3 files - /OpenAPI/TS28623_GenericNrm.yaml - /OpenAPI/TS28623_ComDefs.yaml - /OpenAPI/TS28541_5GcNrm.yaml --- OpenAPI/TS28541_5GcNrm.yaml | 225 ++++++++++++++++++++++++++++---- OpenAPI/TS28623_ComDefs.yaml | 31 +++++ OpenAPI/TS28623_GenericNrm.yaml | 18 +++ 3 files changed, 250 insertions(+), 24 deletions(-) diff --git a/OpenAPI/TS28541_5GcNrm.yaml b/OpenAPI/TS28541_5GcNrm.yaml index 70e59d659..c48c3b2ae 100755 --- a/OpenAPI/TS28541_5GcNrm.yaml +++ b/OpenAPI/TS28541_5GcNrm.yaml @@ -125,12 +125,22 @@ components: - REGISTERED - SUSPENDED CNSIIdList: + description: This datatype is used for writable attribute type: array items: $ref: '#/components/schemas/CNSIId' + CNSIIdListRo: + description: This datatype is used for readOnly attribute + type: array + items: + $ref: '#/components/schemas/CNSIIdRo' CNSIId: type: string - description: CNSI Id is defined in TS 29.531, only for Core Network + description: CNSI Id is defined in TS 29.531, only for Core Network. This datatype is used for writable attribute + CNSIIdRo: + type: string + description: CNSI Id is defined in TS 29.531, only for Core Network. This datatype is used for readOnly attribute + readOnly: true EnergySavingControl: type: string description: any of enumerated value @@ -139,6 +149,7 @@ components: - TO_BE_NOT_ENERGYSAVING EnergySavingState: type: string + readOnly: true description: any of enumerated value enum: - IS_NOT_ENERGYSAVING @@ -158,6 +169,7 @@ components: properties: nFSrvGroupId: type: string + readOnly: true supiRanges: type: array items: @@ -196,6 +208,7 @@ components: - P_NSSCD NotificationType: type: string + readOnly: true enum: - N1_MESSAGES - N2_INFORMATION @@ -212,14 +225,19 @@ components: $ref: '#/components/schemas/NotificationType' callbackURI: type: string + readOnly: true n1MessageClass: type: boolean + readOnly: true n2InformationClass: type: boolean + readOnly: true versions: type: string + readOnly: true binding: type: string + readOnly: true ManagedNFProfile: type: object properties: @@ -229,8 +247,9 @@ components: $ref: 'TS28623_ComDefs.yaml#/components/schemas/Fqdn' nfInstanceID: type: string + readOnly: true nfType: - $ref: '#/components/schemas/NFType' + $ref: '#/components/schemas/NFTypeRo' heartbeatTimer: type: integer authzInfo: @@ -275,20 +294,23 @@ components: type: string lcHSupportInd: type: boolean + readOnly: true olcHSupportInd: type: boolean + readOnly: true nfSetRecoveryTimeList: type: array items: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTime' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTimeRo' scpDomains: type: array items: type: string recoveryTime: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTime' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTimeRo' nfServicePersistence: type: boolean + readOnly: true nfProfileChangesSupportInd: type: boolean defaultNotificationSubscriptions: @@ -299,12 +321,13 @@ components: serviceSetRecoveryTimeList: type: array items: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTime' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTimeRo' minItems: 1 vendorId: $ref: '#/components/schemas/VendorId' SEPPType: type: string + readOnly: true description: any of enumerated value enum: - CSEPP @@ -562,6 +585,7 @@ components: type: integer eACMode: type: string + readOnly: true enum: - INACTIVE - ACTIVE @@ -571,15 +595,18 @@ components: type: integer numberofUEs: type: integer + readOnly: true uEIdList: type: array items: type: string + readOnly: true maxNumberofPDUSessions: type: integer NRTACRange: type: object + description: This datatype is used for writable attribute properties: nRTACstart: type: string @@ -587,9 +614,22 @@ components: type: string nRTACpattern: type: string + NRTACRangeRo: + type: object + description: This datatype is used for readOnly attribute + properties: + nRTACstart: + type: string + readOnly: true + nRTACend: + type: string + nRTACpattern: + type: string + readOnly: true TaiRange: type: object + description: This datatype is used for writable attribute properties: plmnId: $ref: 'TS28623_ComDefs.yaml#/components/schemas/PlmnId' @@ -597,7 +637,17 @@ components: type: array items: $ref: '#/components/schemas/NRTACRange' - + TaiRangeRo: + type: object + description: This datatype is used for readOnly attribute + properties: + plmnId: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/PlmnIdRo' + nRTACRangelist: + type: array + items: + $ref: '#/components/schemas/NRTACRangeRo' + GUAMInfo: type: object properties: @@ -659,22 +709,25 @@ components: properties: 5GCNFType: type: string + readOnly: true enum: - PCF - NEF - SCEF 5GCNFIpAddress: type: string + readOnly: true 5GCNFRef: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnRo' UPFConnectionInfo: type: object properties: uPFIpAddress: type: string + readOnly: true uPFRef: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnRo' SnssaiList: type: array items: @@ -689,9 +742,15 @@ components: nid: type: string TaiList: + description: This datatype is used for writable attribute + type: array + items: + $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Tai' + TaiListRo: + description: This datatype is used for readOnly attribute type: array items: - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Tai' + $ref: 'TS28623_GenericNrm.yaml#/components/schemas/TaiRo' SupiRange: type: object properties: @@ -1144,13 +1203,15 @@ components: items: type: string minItems: 1 + readOnly: true afIds: type: array items: type: string minItems: 1 + readOnly: true AfEvent: - description: Represents Application Events. + description: Represents Application Events.This datatype is used for writable attribute anyOf: - type: string enum: @@ -1171,6 +1232,30 @@ components: description: > This string provides forward-compatibility with future extensions to the enumeration but is not used to encode content defined in the present version of this API. + AfEventRo: + description: Represents Application Events. This datatype is used for readOnly attribute + anyOf: + - type: string + readOnly: true + enum: + - SVC_EXPERIENCE + - UE_MOBILITY + - UE_COMM + - EXCEPTIONS + - USER_DATA_CONGESTION + - PERF_DATA + - DISPERSION + - COLLECTIVE_BEHAVIOUR + - MS_QOE_METRICS + - MS_CONSUMPTION + - MS_NET_ASSIST_INVOCATION + - MS_DYN_POLICY_INVOCATION + - MS_ACCESS_ACTIVITY + - type: string + readOnly: true + description: > + This string provides forward-compatibility with future extensions to the enumeration but + is not used to encode content defined in the present version of this API. AfEventExposureData: description: AF Event Exposure data managed by a given NEF Instance type: object @@ -1180,18 +1265,20 @@ components: afEvents: type: array items: - $ref: '#/components/schemas/AfEvent' + $ref: '#/components/schemas/AfEventRo' minItems: 1 afIds: type: array items: type: string minItems: 1 + readOnly: true appIds: type: array items: type: string minItems: 1 + readOnly: true UnTrustAfInfo: description: Information of a untrusted AF Instance type: object @@ -1735,8 +1822,10 @@ components: iwkEpsInd: type: boolean default: false + readOnly: true sxaInd: type: boolean + readOnly: true pduSessionTypes: type: array items: @@ -1747,6 +1836,7 @@ components: ueIpAddrInd: type: boolean default: false + readOnly: trusted taiList: type: array items: @@ -1773,6 +1863,7 @@ components: redundantGtpu: type: boolean default: false + readOnly: true ipups: type: boolean default: false @@ -1781,6 +1872,7 @@ components: default: false supportedPfcpFeatures: type: string + readOnly: true # upfEvents: # type: array # items: @@ -1815,9 +1907,11 @@ components: v2xSupportInd: type: boolean default: false + readOnly: true proseSupportInd: type: boolean default: false + readOnly: true proseCapability: $ref: '#/components/schemas/ProseCapability' v2xCapability: @@ -1825,11 +1919,13 @@ components: a2xSupportInd: type: boolean default: false + readOnly: true a2xCapability: $ref: '#/components/schemas/A2xCapability' rangingSlPosSupportInd: type: boolean - default: false + default: false + readOnly: true A2xCapability: description: Information of the supported A2X Capability by the PCF @@ -1869,11 +1965,11 @@ components: type: string minItems: 1 taiList: - $ref: '#/components/schemas/TaiList' + $ref: '#/components/schemas/TaiListRo' taiRangeList: type: array items: - $ref: '#/components/schemas/TaiRange' + $ref: '#/components/schemas/TaiRangeRo' minItems: 1 dnaiList: type: array @@ -2878,7 +2974,7 @@ components: pLMNInfo: $ref: 'TS28541_NrNrm.yaml#/components/schemas/PlmnInfo' expiryTime: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTime' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTimeRo' PcscfInfo: description: Information of a P-CSCF NF Instance type: object @@ -2942,6 +3038,7 @@ components: type: integer NFServiceType: type: string + readOnly: true enum: - NAMF_COMMUNICATION - NAMF_EVENTEXPOSURE @@ -2955,13 +3052,80 @@ components: properties: name: type: string + readOnly: true allowedNFTypes: $ref: '#/components/schemas/NFType' operationSemantics: $ref: '#/components/schemas/OperationSemantics' NFType: type: string - description: ' NF name defined in TS 23.501 or TS 29.510' + description: ' NF name defined in TS 23.501 or TS 29.510'.This datatype is used for writable attribute + enum: + - NRF + - UDM + - AMF + - SMF + - AUSF + - NEF + - PCF + - SMSF + - NSSF + - UDR + - LMF + - GMLC + - 5G_EIR + - SEPP + - UPF + - N3IWF + - AF + - UDSF + - DN + - BSF + - CHF + - NWDAF + - PCSCF + - CBCF + - HSS + - UCMF + - SOR_AF + - SPAF + - MME + - SCSAS + - SCEF + - SCP + - NSSAAF + - ICSCF + - SCSCF + - DRA + - IMS_AS + - AANF + - 5G_DDNMF + - NSACF + - MFAF + - EASDF + - DCCF + - MB_SMF + - TSCTSF + - ADRF + - GBA_BSF + - CEF + - MB_UPF + - NSWOF + - PKMF + - MNPF + - SMS_GMSC + - SMS_IWMSC + - MBSF + - MBSTF + - PANF + - TNGF + - W_AGF + - TWIF + - TSN_AF + NFTypeRo: + type: string + readOnly: true + description: ' NF name defined in TS 23.501 or TS 29.510'. This datatype is used for readOnly attribute enum: - NRF - UDM @@ -3027,11 +3191,13 @@ components: OperationSemantics: type: string + readOnly: true enum: - REQUEST_RESPONSE - SUBSCRIBE_NOTIFY RegistrationState: type: string + readOnly: true enum: - REGISTERED - DEREGISTERED @@ -3151,7 +3317,7 @@ components: weightFactor: $ref: '#/components/schemas/WeightFactor' cNSIIdList: - $ref: '#/components/schemas/CNSIIdList' + $ref: '#/components/schemas/CNSIIdListRo' amfSetRef: $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' managedNFProfile: @@ -3270,7 +3436,7 @@ components: sBIFqdn: type: string cNSIIdList: - $ref: '#/components/schemas/CNSIIdList' + $ref: '#/components/schemas/CNSIIdListRo' managedNFProfile: $ref: '#/components/schemas/ManagedNFProfile' commModelList: @@ -3282,7 +3448,7 @@ components: configurable5QISetRef: $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' dynamic5QISetRef: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnRo' dnaiSatelliteMappingList: type: array items: @@ -3409,7 +3575,7 @@ components: configurable5QISetRef: $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' dynamic5QISetRef: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnRo' predefinedPccRuleSetRefs: $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' @@ -3696,11 +3862,12 @@ components: - type: object properties: plmnId: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/PlmnId' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/PlmnIdRo' sEPPType: $ref: '#/components/schemas/SEPPType' sEPPId: type: integer + readOnly: true fqdn: $ref: 'TS28623_ComDefs.yaml#/components/schemas/Fqdn' seppInfo: @@ -3739,6 +3906,7 @@ components: $ref: '#/components/schemas/NwdafInfo' nwdafLogicalFuncSupported: type: string + readOnly: true enum: - NWDAF_WITH_ANLF - NWDAF_WITH_MTLF @@ -3795,6 +3963,7 @@ components: $ref: '#/components/schemas/CapabilityList' isCAPIFSup: type: boolean + readOnly: true nefInfo: $ref: '#/components/schemas/NefInfo' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' @@ -3985,11 +4154,12 @@ components: - type: object properties: plmnId: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/PlmnId' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/PlmnIdRo' sEPPId: type: integer + readOnly: true fqdn: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/Fqdn' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/FqdnRo' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' - $ref: '#/components/schemas/ManagedFunction5GC-nc0' EP_N2-Single: @@ -4021,7 +4191,7 @@ components: remoteAddress: $ref: 'TS28541_NrNrm.yaml#/components/schemas/RemoteAddress' epTransportRefs: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnListRo' EP_N4-Single: allOf: - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' @@ -4675,10 +4845,13 @@ components: maximum: 255 isEventTriggeredGtpUPathMonitoringSupported: type: boolean + readOnly: true isPeriodicGtpUMonitoringSupported: type: boolean + readOnly: true isImmediateGtpUMonitoringSupported: type: boolean + readOnly: true gtpUPathDelayThresholds: $ref: '#/components/schemas/GtpUPathDelayThresholdsType' gtpUPathMinimumWaitTime: @@ -4712,10 +4885,13 @@ components: maximum: 255 isEventTriggeredQFMonitoringSupported: type: boolean + readOnly: true isPeriodicQFMonitoringSupported: type: boolean + readOnly: true isSessionReleasedQFMonitoringSupported: type: boolean + readOnly: true qFPacketDelayThresholds: $ref: '#/components/schemas/QFPacketDelayThresholdsType' qFMinimumWaitTime: @@ -5415,6 +5591,7 @@ components: properties: activationStatus: type: string + readonly: true enum: - ACTIVATED - DEACTIVATED diff --git a/OpenAPI/TS28623_ComDefs.yaml b/OpenAPI/TS28623_ComDefs.yaml index 786e3a391..61cbc2305 100755 --- a/OpenAPI/TS28623_ComDefs.yaml +++ b/OpenAPI/TS28623_ComDefs.yaml @@ -72,21 +72,42 @@ components: $ref: '#/components/schemas/DnRo' Mcc: + description: This datatype is used for writable attribut type: string pattern: '^[0-9]{3}$' + MccRo: + description: This datatype is used for readOnly attribute + type: string + pattern: '^[0-9]{3}$' + readOnly: Mnc: + description: This datatype is used for writable attribut + type: string + pattern: '^[0-9]{2,3}$' + MncRo: + description: This datatype is used for readOnly attribute type: string pattern: '^[0-9]{2,3}$' + readOnly: true Nid: type: string pattern: '^[A-Fa-f0-9]{11}$' PlmnId: + description: This datatype is used for writable attribute type: object properties: mcc: $ref: '#/components/schemas/Mcc' mnc: $ref: '#/components/schemas/Mnc' + PlmnIdRo: + description: This datatype is used for readOnly attribute + type: object + properties: + mcc: + $ref: '#/components/schemas/MccRo' + mnc: + $ref: '#/components/schemas/MncRo' Tac: type: string pattern: '(^[A-Fa-f0-9]{4}$)|(^[A-Fa-f0-9]{6}$)' @@ -160,9 +181,18 @@ components: Fqdn: type: string + description: This datatype is used for writable attribute + pattern: '^([0-9A-Za-z]([-0-9A-Za-z]{0,61}[0-9A-Za-z])?\.)+[A-Za-z]{2,63}\.?$' + minLength: 4 + maxLength: 253 + FqdnRo: + type: string + description: This datatype is used for readOnly attribute pattern: '^([0-9A-Za-z]([-0-9A-Za-z]{0,61}[0-9A-Za-z])?\.)+[A-Za-z]{2,63}\.?$' minLength: 4 maxLength: 253 + readOnly: true + Ipv4Addr: type: string pattern: '^(([0-9]|[1-9][0-9]|1[0-9][0-9]|2[0-4][0-9]|25[0-5])\.){3}([0-9]|[1-9][0-9]|1[0-9][0-9]|2[0-4][0-9]|25[0-5])$' @@ -231,6 +261,7 @@ components: readOnly: true UsageState: type: string + readOnly: true enum: - IDLE - ACTIVE diff --git a/OpenAPI/TS28623_GenericNrm.yaml b/OpenAPI/TS28623_GenericNrm.yaml index 7b99d3661..f50d2ff19 100755 --- a/OpenAPI/TS28623_GenericNrm.yaml +++ b/OpenAPI/TS28623_GenericNrm.yaml @@ -161,6 +161,7 @@ components: Tai: type: object + description: This datatype is used for writable attribute properties: mcc: $ref: 'TS28623_ComDefs.yaml#/components/schemas/Mcc' @@ -168,9 +169,26 @@ components: $ref: 'TS28623_ComDefs.yaml#/components/schemas/Mnc' tac: $ref: '#/components/schemas/Tac' + TaiRo: + type: object + description: This datatype is used for readOnly attribute + properties: + mcc: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/MccRo' + mnc: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/MncRo' + tac: + $ref: '#/components/schemas/Tac' + Tac: type: string + description: This datatype is used for writable attribute + pattern: '(^[A-Fa-f0-9]{4}$)|(^[A-Fa-f0-9]{6}$)' + TacRo: + type: string + description: This datatype is used for readOnly attribute pattern: '(^[A-Fa-f0-9]{4}$)|(^[A-Fa-f0-9]{6}$)' + readOnly: true EutraCellId: type: string pattern: '^[A-Fa-f0-9]{7}$' -- GitLab From 3bdc0b628503df39b95045c80cc5a9d2a7cd8433 Mon Sep 17 00:00:00 2001 From: ruiyue Date: Wed, 7 Aug 2024 08:28:55 +0000 Subject: [PATCH 088/587] Update file TS28541_5GcNrm.yaml --- OpenAPI/TS28541_5GcNrm.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OpenAPI/TS28541_5GcNrm.yaml b/OpenAPI/TS28541_5GcNrm.yaml index c48c3b2ae..09e7bba67 100755 --- a/OpenAPI/TS28541_5GcNrm.yaml +++ b/OpenAPI/TS28541_5GcNrm.yaml @@ -3038,7 +3038,6 @@ components: type: integer NFServiceType: type: string - readOnly: true enum: - NAMF_COMMUNICATION - NAMF_EVENTEXPOSURE @@ -3047,6 +3046,7 @@ components: - NSMF_PDUSESSION - NSMF_EVENTEXPOSURE - OTHERS + readOnly: true Operation: type: object properties: -- GitLab From c61534cc9d629cf40332024ff17ea696800ae220 Mon Sep 17 00:00:00 2001 From: ruiyue Date: Wed, 7 Aug 2024 08:32:22 +0000 Subject: [PATCH 089/587] Update file TS28541_5GcNrm.yaml --- OpenAPI/TS28541_5GcNrm.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/OpenAPI/TS28541_5GcNrm.yaml b/OpenAPI/TS28541_5GcNrm.yaml index 09e7bba67..84dbeb7f9 100755 --- a/OpenAPI/TS28541_5GcNrm.yaml +++ b/OpenAPI/TS28541_5GcNrm.yaml @@ -3058,8 +3058,8 @@ components: operationSemantics: $ref: '#/components/schemas/OperationSemantics' NFType: + description: ' NF name defined in TS 23.501 or TS 29.510'.This datatype is used for writable attribute type: string - description: ' NF name defined in TS 23.501 or TS 29.510'.This datatype is used for writable attribute enum: - NRF - UDM @@ -3123,9 +3123,8 @@ components: - TWIF - TSN_AF NFTypeRo: + description: ' NF name defined in TS 23.501 or TS 29.510'. This datatype is used for readOnly attribute type: string - readOnly: true - description: ' NF name defined in TS 23.501 or TS 29.510'. This datatype is used for readOnly attribute enum: - NRF - UDM @@ -3188,6 +3187,7 @@ components: - W_AGF - TWIF - TSN_AF + readOnly: true OperationSemantics: type: string -- GitLab From 692c44e3ac330b70d73e15beda44408c8c360271 Mon Sep 17 00:00:00 2001 From: ruiyue Date: Wed, 7 Aug 2024 08:36:33 +0000 Subject: [PATCH 090/587] Update file TS28541_5GcNrm.yaml --- OpenAPI/TS28541_5GcNrm.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/OpenAPI/TS28541_5GcNrm.yaml b/OpenAPI/TS28541_5GcNrm.yaml index 84dbeb7f9..19fef90fb 100755 --- a/OpenAPI/TS28541_5GcNrm.yaml +++ b/OpenAPI/TS28541_5GcNrm.yaml @@ -3058,7 +3058,7 @@ components: operationSemantics: $ref: '#/components/schemas/OperationSemantics' NFType: - description: ' NF name defined in TS 23.501 or TS 29.510'.This datatype is used for writable attribute + description: NF name defined in TS 23.501 or TS 29.510'.This datatype is used for writable attribute type: string enum: - NRF @@ -3123,7 +3123,7 @@ components: - TWIF - TSN_AF NFTypeRo: - description: ' NF name defined in TS 23.501 or TS 29.510'. This datatype is used for readOnly attribute + description: NF name defined in TS 23.501 or TS 29.510'. This datatype is used for readOnly attribute type: string enum: - NRF -- GitLab From d1f8da79c0495ce39cac233aa967acb94e44993d Mon Sep 17 00:00:00 2001 From: ruiyue Date: Wed, 7 Aug 2024 08:40:41 +0000 Subject: [PATCH 091/587] Update file TS28541_5GcNrm.yaml --- OpenAPI/TS28541_5GcNrm.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/OpenAPI/TS28541_5GcNrm.yaml b/OpenAPI/TS28541_5GcNrm.yaml index 19fef90fb..20bfd9ebf 100755 --- a/OpenAPI/TS28541_5GcNrm.yaml +++ b/OpenAPI/TS28541_5GcNrm.yaml @@ -1836,7 +1836,7 @@ components: ueIpAddrInd: type: boolean default: false - readOnly: trusted + readOnly: true taiList: type: array items: @@ -5591,10 +5591,10 @@ components: properties: activationStatus: type: string - readonly: true enum: - ACTIVATED - DEACTIVATED + readonly: true EP_SM12-Single: allOf: - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' -- GitLab From 74ef65a4b2a2e5fa7bb313a3c052edfb79886607 Mon Sep 17 00:00:00 2001 From: ruiyue Date: Wed, 7 Aug 2024 09:16:58 +0000 Subject: [PATCH 092/587] Update file TS28541_5GcNrm.yaml --- OpenAPI/TS28541_5GcNrm.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OpenAPI/TS28541_5GcNrm.yaml b/OpenAPI/TS28541_5GcNrm.yaml index 20bfd9ebf..0706fa635 100755 --- a/OpenAPI/TS28541_5GcNrm.yaml +++ b/OpenAPI/TS28541_5GcNrm.yaml @@ -5594,7 +5594,7 @@ components: enum: - ACTIVATED - DEACTIVATED - readonly: true + readOnly: true EP_SM12-Single: allOf: - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' -- GitLab From 67ed0893204c48de4eb8b25b4433ef64b5f70c76 Mon Sep 17 00:00:00 2001 From: ruiyue Date: Wed, 7 Aug 2024 09:24:38 +0000 Subject: [PATCH 093/587] Update file TS28623_ComDefs.yaml --- OpenAPI/TS28623_ComDefs.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OpenAPI/TS28623_ComDefs.yaml b/OpenAPI/TS28623_ComDefs.yaml index 61cbc2305..c847561f6 100755 --- a/OpenAPI/TS28623_ComDefs.yaml +++ b/OpenAPI/TS28623_ComDefs.yaml @@ -79,7 +79,7 @@ components: description: This datatype is used for readOnly attribute type: string pattern: '^[0-9]{3}$' - readOnly: + readOnly: true Mnc: description: This datatype is used for writable attribut type: string -- GitLab From 1f9df32331b20fdb328f2933b7804f53e123371d Mon Sep 17 00:00:00 2001 From: ruiyue Date: Wed, 7 Aug 2024 09:49:08 +0000 Subject: [PATCH 094/587] Update 3 files - /OpenAPI/TS28623_ComDefs.yaml - /OpenAPI/TS28541_SliceNrm.yaml - /OpenAPI/TS28541_NrNrm.yaml --- OpenAPI/TS28541_NrNrm.yaml | 8 +++++++- OpenAPI/TS28541_SliceNrm.yaml | 29 ++++++++++++++++++-------- OpenAPI/TS28623_ComDefs.yaml | 38 +++++++++++++++++++++++++++++++++++ 3 files changed, 66 insertions(+), 9 deletions(-) diff --git a/OpenAPI/TS28541_NrNrm.yaml b/OpenAPI/TS28541_NrNrm.yaml index d1a08c250..ecaf86e17 100755 --- a/OpenAPI/TS28541_NrNrm.yaml +++ b/OpenAPI/TS28541_NrNrm.yaml @@ -97,9 +97,15 @@ components: items: $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Tac' TaiList: + description: This datatype is used for writable attribute type: array items: - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Tai' + $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Tai' + TaiListRo: + description: This datatype is used for readOnly attribute + type: array + items: + $ref: 'TS28623_GenericNrm.yaml#/components/schemas/TaiRo' BackhaulAddress: type: object properties: diff --git a/OpenAPI/TS28541_SliceNrm.yaml b/OpenAPI/TS28541_SliceNrm.yaml index 121dc8f67..b6ef8a0c2 100755 --- a/OpenAPI/TS28541_SliceNrm.yaml +++ b/OpenAPI/TS28541_SliceNrm.yaml @@ -69,14 +69,17 @@ components: enum: - CHARACTER - SCALABILITY + readOnly: true Tagging: type: array + readOnly: true items: type: string enum: - PERFORMANCE - FUNCTION - OPERATION + readOnly: true Exposure: type: string enum: @@ -96,6 +99,7 @@ components: enum: - NOT_SUPPORTED - SUPPORTED + readOnly: true DelayTolerance: type: object properties: @@ -127,9 +131,9 @@ components: servAttrCom: $ref: '#/components/schemas/ServAttrCom' guaThpt: - $ref: '#/components/schemas/Float' + $ref: '#/components/schemas/FloatRo' maxThpt: - $ref: '#/components/schemas/Float' + $ref: '#/components/schemas/FloatRo' MaxPktSize: type: object properties: @@ -144,6 +148,7 @@ components: $ref: '#/components/schemas/ServAttrCom' nOofPDUSessions: type: integer + readOnly: true KPIMonitoring: type: object properties: @@ -153,6 +158,7 @@ components: type: array items: type: string + readOnly: true NBIoT: type: object properties: @@ -210,13 +216,16 @@ components: $ref: '#/components/schemas/ServAttrCom' density: type: integer + readOnly: true NsInfo: type: object properties: nsInstanceId: type: string + readOnly: true nsName: type: string + readOnly: true description: type: string EmbbEEPerfReq: @@ -273,12 +282,14 @@ components: properties: secFunId: type: string + readOnly: true secFunType: type: string secRules: type: array items: type: string + readOnly: true N6Protection: type: object properties: @@ -578,6 +589,7 @@ components: properties: serviceProfileId: type: string + readOnly: true plmnInfoList: $ref: 'TS28541_NrNrm.yaml#/components/schemas/PlmnInfoList' maxNumberofUEs: @@ -674,6 +686,7 @@ components: properties: sliceProfileId: type: string + readOnly: true plmnInfoList: $ref: 'TS28541_NrNrm.yaml#/components/schemas/PlmnInfoList' cNSliceSubnetProfile: @@ -836,7 +849,7 @@ components: - type: object properties: networkSliceSubnetRef: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnRo' operationalState: $ref: 'TS28623_ComDefs.yaml#/components/schemas/OperationalState' administrativeState: @@ -844,7 +857,7 @@ components: serviceProfileList: $ref: '#/components/schemas/ServiceProfileList' networkSliceControllerRef: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnListRo' isolationProfileRef: $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' @@ -858,9 +871,9 @@ components: - type: object properties: managedFunctionRefList: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnListRo' networkSliceSubnetRefList: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnListRo' operationalState: $ref: 'TS28623_ComDefs.yaml#/components/schemas/OperationalState' administrativeState: @@ -880,7 +893,7 @@ components: - RAN_SLICESUBNET - CN_SLICESUBNET networkSliceSubnetControllerRef: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnListRo' isolationProfileRef: $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' @@ -893,7 +906,7 @@ components: type: object properties: ipAddress: - $ref: '#/components/schemas/IpAddress' + $ref: '#/components/schemas/IpAddressRo' localLogicalInterfaceInfo: $ref: '#/components/schemas/LogicalInterfaceInfo' qosProfile: diff --git a/OpenAPI/TS28623_ComDefs.yaml b/OpenAPI/TS28623_ComDefs.yaml index c847561f6..9e5239e0e 100755 --- a/OpenAPI/TS28623_ComDefs.yaml +++ b/OpenAPI/TS28623_ComDefs.yaml @@ -14,8 +14,14 @@ components: schemas: Float: + description: This datatype is used for writable attribute + type: number + format: float + FloatRo: + description: This datatype is used for readOnly attribute type: number format: float + readOnly: true DateTime: description: This datatype is used for writable attribute type: string @@ -194,26 +200,58 @@ components: readOnly: true Ipv4Addr: + description: This datatype is used for writable attribute type: string pattern: '^(([0-9]|[1-9][0-9]|1[0-9][0-9]|2[0-4][0-9]|25[0-5])\.){3}([0-9]|[1-9][0-9]|1[0-9][0-9]|2[0-4][0-9]|25[0-5])$' example: '198.51.100.1' + Ipv4AddrRo: + description: This datatype is used for readOnly attribute + type: string + pattern: '^(([0-9]|[1-9][0-9]|1[0-9][0-9]|2[0-4][0-9]|25[0-5])\.){3}([0-9]|[1-9][0-9]|1[0-9][0-9]|2[0-4][0-9]|25[0-5])$' + example: '198.51.100.1' + readOnly: true Ipv6Addr: + description: This datatype is used for writable attribute type: string allOf: - pattern: '^((:|(0?|([1-9a-f][0-9a-f]{0,3}))):)((0?|([1-9a-f][0-9a-f]{0,3})):){0,6}(:|(0?|([1-9a-f][0-9a-f]{0,3})))$' - pattern: '^((([^:]+:){7}([^:]+))|((([^:]+:)*[^:]+)?::(([^:]+:)*[^:]+)?))$' example: '2001:db8:85a3::8a2e:370:7334' + Ipv6AddrRo: + description: This datatype is used for readOnly attribute + type: string + allOf: + - pattern: '^((:|(0?|([1-9a-f][0-9a-f]{0,3}))):)((0?|([1-9a-f][0-9a-f]{0,3})):){0,6}(:|(0?|([1-9a-f][0-9a-f]{0,3})))$' + - pattern: '^((([^:]+:){7}([^:]+))|((([^:]+:)*[^:]+)?::(([^:]+:)*[^:]+)?))$' + example: '2001:db8:85a3::8a2e:370:7334' + readOnly: true Ipv6Prefix: + description: This datatype is used for writable attribute + type: string + allOf: + - pattern: '^((:|(0?|([1-9a-f][0-9a-f]{0,3}))):)((0?|([1-9a-f][0-9a-f]{0,3})):){0,6}(:|(0?|([1-9a-f][0-9a-f]{0,3})))(\/(([0-9])|([0-9]{2})|(1[0-1][0-9])|(12[0-8])))$' + - pattern: '^((([^:]+:){7}([^:]+))|((([^:]+:)*[^:]+)?::(([^:]+:)*[^:]+)?))(\/.+)$' + example: '2001:db8:abcd:12::0/64' + Ipv6PrefixRo: + description: This datatype is used for readOnly attribute type: string allOf: - pattern: '^((:|(0?|([1-9a-f][0-9a-f]{0,3}))):)((0?|([1-9a-f][0-9a-f]{0,3})):){0,6}(:|(0?|([1-9a-f][0-9a-f]{0,3})))(\/(([0-9])|([0-9]{2})|(1[0-1][0-9])|(12[0-8])))$' - pattern: '^((([^:]+:){7}([^:]+))|((([^:]+:)*[^:]+)?::(([^:]+:)*[^:]+)?))(\/.+)$' example: '2001:db8:abcd:12::0/64' + readOnly: true IpAddr: + description: This datatype is used for writable attribute oneOf: - $ref: '#/components/schemas/Ipv4Addr' - $ref: '#/components/schemas/Ipv6Addr' - $ref: '#/components/schemas/Ipv6Prefix' + IpAddrRo: + description: This datatype is used for readOnly attribute + oneOf: + - $ref: '#/components/schemas/Ipv4AddrRo' + - $ref: '#/components/schemas/Ipv6AddrRo' + - $ref: '#/components/schemas/Ipv6PrefixRo' HostAddr: # This definition will be deprecated, when all occurances of HostAddr # are replaced by Host. -- GitLab From 19a84b1465c73dd5ea41fae2f098c4ce6489bf04 Mon Sep 17 00:00:00 2001 From: ruiyue Date: Wed, 7 Aug 2024 09:54:51 +0000 Subject: [PATCH 095/587] Update file TS28541_SliceNrm.yaml --- OpenAPI/TS28541_SliceNrm.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/OpenAPI/TS28541_SliceNrm.yaml b/OpenAPI/TS28541_SliceNrm.yaml index b6ef8a0c2..509b2a50b 100755 --- a/OpenAPI/TS28541_SliceNrm.yaml +++ b/OpenAPI/TS28541_SliceNrm.yaml @@ -131,9 +131,9 @@ components: servAttrCom: $ref: '#/components/schemas/ServAttrCom' guaThpt: - $ref: '#/components/schemas/FloatRo' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/FloatRo' maxThpt: - $ref: '#/components/schemas/FloatRo' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/FloatRo' MaxPktSize: type: object properties: -- GitLab From 5791455da08d331e92f1c94d4b646fc876f2a2a5 Mon Sep 17 00:00:00 2001 From: ruiyue Date: Wed, 7 Aug 2024 09:58:29 +0000 Subject: [PATCH 096/587] Update file TS28541_SliceNrm.yaml --- OpenAPI/TS28541_SliceNrm.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OpenAPI/TS28541_SliceNrm.yaml b/OpenAPI/TS28541_SliceNrm.yaml index 509b2a50b..100c4f299 100755 --- a/OpenAPI/TS28541_SliceNrm.yaml +++ b/OpenAPI/TS28541_SliceNrm.yaml @@ -906,7 +906,7 @@ components: type: object properties: ipAddress: - $ref: '#/components/schemas/IpAddressRo' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/IpAddressRo' localLogicalInterfaceInfo: $ref: '#/components/schemas/LogicalInterfaceInfo' qosProfile: -- GitLab From 9d0033a515141736a48071e27a41ec3dcb791980 Mon Sep 17 00:00:00 2001 From: ruiyue Date: Wed, 7 Aug 2024 10:02:59 +0000 Subject: [PATCH 097/587] Update file TS28541_SliceNrm.yaml --- OpenAPI/TS28541_SliceNrm.yaml | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/OpenAPI/TS28541_SliceNrm.yaml b/OpenAPI/TS28541_SliceNrm.yaml index 100c4f299..b9904bccd 100755 --- a/OpenAPI/TS28541_SliceNrm.yaml +++ b/OpenAPI/TS28541_SliceNrm.yaml @@ -695,11 +695,6 @@ components: $ref: '#/components/schemas/RANSliceSubnetProfile' topSliceSubnetProfile: $ref: '#/components/schemas/TopSliceSubnetProfile' - - IpAddress: - oneOf: - - $ref: 'TS28623_ComDefs.yaml#/components/schemas/Ipv4Addr' - - $ref: 'TS28623_ComDefs.yaml#/components/schemas/Ipv6Addr' LogicalInterfaceInfo: type: object @@ -906,7 +901,7 @@ components: type: object properties: ipAddress: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/IpAddressRo' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/IpAddrRo' localLogicalInterfaceInfo: $ref: '#/components/schemas/LogicalInterfaceInfo' qosProfile: -- GitLab From 98fa8c16a5405eb90928bbbf7d3a43d553e42f14 Mon Sep 17 00:00:00 2001 From: ruiyue Date: Wed, 7 Aug 2024 10:20:58 +0000 Subject: [PATCH 098/587] Update 2 files - /OpenAPI/TS28623_ComDefs.yaml - /OpenAPI/TS28541_SliceNrm.yaml --- OpenAPI/TS28541_SliceNrm.yaml | 22 ++++++++++++++++------ OpenAPI/TS28623_ComDefs.yaml | 19 +++++++++++++++++++ 2 files changed, 35 insertions(+), 6 deletions(-) diff --git a/OpenAPI/TS28541_SliceNrm.yaml b/OpenAPI/TS28541_SliceNrm.yaml index b9904bccd..73169dcb5 100755 --- a/OpenAPI/TS28541_SliceNrm.yaml +++ b/OpenAPI/TS28541_SliceNrm.yaml @@ -31,6 +31,7 @@ components: - NOT_SUPPORTED - BETWEEN_BS_AND_UE - BETWEEN_BS_AND_UE_AND_UE_AND_UE + readOnly: true PositioningAvailability: type: array items: @@ -42,6 +43,7 @@ components: - AECID - HYBRID_POSITIONING - NET_RTK + readOnly: true PredictionFrequency: type: string enum: @@ -754,10 +756,12 @@ components: enum: - FEASIBLE - INFEASIBLE + readOnly: true InFeasibleReason: description: >- An attribute that specifies the additional reason information if the feasibility check result is infeasible.The detailed ENUM value is FFS. type: string + readOnly: true RecommendationRequest: description: >- An attribute represents MnS consumer's request for recommended network slice related requirements. @@ -766,6 +770,7 @@ components: description: >- An attribute that specifies the recommended network slicing related requirements (i.e. ServiceProfile and SliceProfile information) which can be supported by the MnS producer.. type: string + readOnly: true ResourceReservation: description: >- An attribute represents MnS consumer's requirements for resource reservation. @@ -782,14 +787,16 @@ components: - RESERVED - UNRESERVED - USED + readOnly: true ReservationExpiration: description: >- An attribute which specifies the actual validity period of the resource reservation.. - $ref: 'TS28623_ComDefs.yaml#/components/schemas/TimeWindow' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/TimeWindowRo' ReservationFailureReason: description: >- An attribute that specifies the additional reason information if the reservation is failed. type: string + readOnly: true ResourceIsolationRule: type: object @@ -923,14 +930,16 @@ components: properties: dLlatency: type: integer + readonly: true uLlatency: type: integer + readOnly: true dLThptPerSliceSubnet: $ref: '#/components/schemas/XLThpt' uLThptPerSliceSubnet: $ref: '#/components/schemas/XLThpt' coverageAreaTAList: - $ref: 'TS28541_NrNrm.yaml#/components/schemas/TaiList' + $ref: 'TS28541_5GcNrm.yaml#/components/schemas/TaiListRo' FeasibilityCheckAndReservationJob-Single: allOf: - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' @@ -979,6 +988,7 @@ components: $ref: '#/components/schemas/ServiceProfile' serviceProfileId: type: string + readOnly: true operationalState: $ref: 'TS28623_ComDefs.yaml#/components/schemas/OperationalState' administrativeState: @@ -988,7 +998,7 @@ components: processMonitor: $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ProcessMonitor' networkSliceRef: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnRo' NetworkSliceSubnetController-Single: allOf: @@ -1011,7 +1021,7 @@ components: processMonitor: $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ProcessMonitor' networkSliceSubnetRef: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnRo' IsolationProfile-Single: allOf: @@ -1029,9 +1039,9 @@ components: items: $ref: '#/components/schemas/ResourceIsolationRule' networkSliceRefList: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnListRo' networkSliceSubnetRefList: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnListRo' #-------- Definition of JSON arrays for name-contained IOCs ---------------------- diff --git a/OpenAPI/TS28623_ComDefs.yaml b/OpenAPI/TS28623_ComDefs.yaml index 9e5239e0e..0c6a08d44 100755 --- a/OpenAPI/TS28623_ComDefs.yaml +++ b/OpenAPI/TS28623_ComDefs.yaml @@ -126,6 +126,7 @@ components: type: string pattern: '^[A-Fa-f0-9]{9}$' TimeWindow: + description: This datatype is used for writable attribute oneOf: - type: object properties: @@ -141,6 +142,23 @@ components: properties: endTime: $ref: '#/components/schemas/DateTime' + TimeWindowRo: + description: This datatype is used for readOnly attribute + oneOf: + - type: object + properties: + startTime: + $ref: '#/components/schemas/DateTimeRo' + endTime: + $ref: '#/components/schemas/DateTimeRo' + - type: object + properties: + startTime: + $ref: '#/components/schemas/DateTimeRo' + - type: object + properties: + endTime: + $ref: '#/components/schemas/DateTimeRo' GeoCoordinate: type: object properties: @@ -316,6 +334,7 @@ components: - DEGRADED - NOT_INSTALLED - LOG_FULL + readOnly: true AttributeNameValuePairSet: description: >- -- GitLab From db2aaecfbaef24be2ccd63b19427289ed2534166 Mon Sep 17 00:00:00 2001 From: ruiyue Date: Wed, 7 Aug 2024 10:28:40 +0000 Subject: [PATCH 099/587] Update file TS28541_SliceNrm.yaml --- OpenAPI/TS28541_SliceNrm.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OpenAPI/TS28541_SliceNrm.yaml b/OpenAPI/TS28541_SliceNrm.yaml index 73169dcb5..29747c96b 100755 --- a/OpenAPI/TS28541_SliceNrm.yaml +++ b/OpenAPI/TS28541_SliceNrm.yaml @@ -930,7 +930,7 @@ components: properties: dLlatency: type: integer - readonly: true + readOnly: true uLlatency: type: integer readOnly: true -- GitLab From 261e1b693dfb1463e0cf5b6b58dec2cf19ba82ef Mon Sep 17 00:00:00 2001 From: ruiyue Date: Wed, 7 Aug 2024 10:38:50 +0000 Subject: [PATCH 100/587] Update file TS28541_SliceNrm.yaml --- OpenAPI/TS28541_SliceNrm.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/OpenAPI/TS28541_SliceNrm.yaml b/OpenAPI/TS28541_SliceNrm.yaml index 29747c96b..4f60d8c2a 100755 --- a/OpenAPI/TS28541_SliceNrm.yaml +++ b/OpenAPI/TS28541_SliceNrm.yaml @@ -797,7 +797,6 @@ components: An attribute that specifies the additional reason information if the reservation is failed. type: string readOnly: true - ResourceIsolationRule: type: object properties: -- GitLab From 049bcff7ceb6258d8e70af4a05432a071fc322f2 Mon Sep 17 00:00:00 2001 From: ruiyue Date: Wed, 7 Aug 2024 13:08:42 +0000 Subject: [PATCH 101/587] Update file TS28623_GenericNrm.yaml --- OpenAPI/TS28623_GenericNrm.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OpenAPI/TS28623_GenericNrm.yaml b/OpenAPI/TS28623_GenericNrm.yaml index f50d2ff19..5f25d59dd 100755 --- a/OpenAPI/TS28623_GenericNrm.yaml +++ b/OpenAPI/TS28623_GenericNrm.yaml @@ -138,7 +138,7 @@ components: startTime: $ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTimeRo' endTime: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTimeRo' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTimeR' timer: type: integer AreaScope: -- GitLab From 1a70d6f42b0ff8ba3f1aed5ef5a716003b3280d1 Mon Sep 17 00:00:00 2001 From: ruiyue Date: Wed, 7 Aug 2024 13:13:37 +0000 Subject: [PATCH 102/587] Update file TS28623_GenericNrm.yaml --- OpenAPI/TS28623_GenericNrm.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OpenAPI/TS28623_GenericNrm.yaml b/OpenAPI/TS28623_GenericNrm.yaml index 5f25d59dd..f50d2ff19 100755 --- a/OpenAPI/TS28623_GenericNrm.yaml +++ b/OpenAPI/TS28623_GenericNrm.yaml @@ -138,7 +138,7 @@ components: startTime: $ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTimeRo' endTime: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTimeR' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTimeRo' timer: type: integer AreaScope: -- GitLab From 5583316c39cd5c8ead0c3ab26d51e00b3b6ae276 Mon Sep 17 00:00:00 2001 From: ruiyue Date: Wed, 7 Aug 2024 13:18:54 +0000 Subject: [PATCH 103/587] Update file TS28623_GenericNrm.yaml --- OpenAPI/TS28623_GenericNrm.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/OpenAPI/TS28623_GenericNrm.yaml b/OpenAPI/TS28623_GenericNrm.yaml index f50d2ff19..25d490071 100755 --- a/OpenAPI/TS28623_GenericNrm.yaml +++ b/OpenAPI/TS28623_GenericNrm.yaml @@ -115,7 +115,6 @@ components: readOnly: true status: type: string - readOnly: true enum: - NOT_STARTED - RUNNING @@ -124,11 +123,12 @@ components: - PARTIALLY_FAILED - CANCELLING - CANCELLED + readOnly: true progressPercentage: type: integer - readOnly: true minimum: 0 maximum: 100 + readOnly: true progressStateInfo: type: string readOnly: true @@ -178,7 +178,7 @@ components: mnc: $ref: 'TS28623_ComDefs.yaml#/components/schemas/MncRo' tac: - $ref: '#/components/schemas/Tac' + $ref: '#/components/schemas/TacRo' Tac: type: string -- GitLab From edc77f760cf21064ae72c1eeaee19037d237eb68 Mon Sep 17 00:00:00 2001 From: ruiyue Date: Wed, 7 Aug 2024 13:41:55 +0000 Subject: [PATCH 104/587] Update 2 files - /OpenAPI/TS28623_ComDefs.yaml - /OpenAPI/TS28541_SliceNrm.yaml --- OpenAPI/TS28541_SliceNrm.yaml | 2 +- OpenAPI/TS28623_ComDefs.yaml | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/OpenAPI/TS28541_SliceNrm.yaml b/OpenAPI/TS28541_SliceNrm.yaml index 4f60d8c2a..c7614f85f 100755 --- a/OpenAPI/TS28541_SliceNrm.yaml +++ b/OpenAPI/TS28541_SliceNrm.yaml @@ -791,7 +791,7 @@ components: ReservationExpiration: description: >- An attribute which specifies the actual validity period of the resource reservation.. - $ref: 'TS28623_ComDefs.yaml#/components/schemas/TimeWindowRo' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/TimeWindow' ReservationFailureReason: description: >- An attribute that specifies the additional reason information if the reservation is failed. diff --git a/OpenAPI/TS28623_ComDefs.yaml b/OpenAPI/TS28623_ComDefs.yaml index 0c6a08d44..144501d85 100755 --- a/OpenAPI/TS28623_ComDefs.yaml +++ b/OpenAPI/TS28623_ComDefs.yaml @@ -126,7 +126,6 @@ components: type: string pattern: '^[A-Fa-f0-9]{9}$' TimeWindow: - description: This datatype is used for writable attribute oneOf: - type: object properties: @@ -142,8 +141,8 @@ components: properties: endTime: $ref: '#/components/schemas/DateTime' + description: This datatype is used for writable attribute TimeWindowRo: - description: This datatype is used for readOnly attribute oneOf: - type: object properties: @@ -158,7 +157,8 @@ components: - type: object properties: endTime: - $ref: '#/components/schemas/DateTimeRo' + $ref: '#/components/schemas/DateTimeRo' + description: This datatype is used for readOnly attribute GeoCoordinate: type: object properties: -- GitLab From bc9a9f8afb11201952d31719eefc2e82a2f5cc51 Mon Sep 17 00:00:00 2001 From: ruiyue Date: Wed, 7 Aug 2024 13:46:35 +0000 Subject: [PATCH 105/587] Update 2 files - /OpenAPI/TS28541_SliceNrm.yaml - /OpenAPI/TS28623_ComDefs.yaml --- OpenAPI/TS28541_SliceNrm.yaml | 2 +- OpenAPI/TS28623_ComDefs.yaml | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/OpenAPI/TS28541_SliceNrm.yaml b/OpenAPI/TS28541_SliceNrm.yaml index c7614f85f..4f60d8c2a 100755 --- a/OpenAPI/TS28541_SliceNrm.yaml +++ b/OpenAPI/TS28541_SliceNrm.yaml @@ -791,7 +791,7 @@ components: ReservationExpiration: description: >- An attribute which specifies the actual validity period of the resource reservation.. - $ref: 'TS28623_ComDefs.yaml#/components/schemas/TimeWindow' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/TimeWindowRo' ReservationFailureReason: description: >- An attribute that specifies the additional reason information if the reservation is failed. diff --git a/OpenAPI/TS28623_ComDefs.yaml b/OpenAPI/TS28623_ComDefs.yaml index 144501d85..b8a5bcb64 100755 --- a/OpenAPI/TS28623_ComDefs.yaml +++ b/OpenAPI/TS28623_ComDefs.yaml @@ -142,7 +142,7 @@ components: endTime: $ref: '#/components/schemas/DateTime' description: This datatype is used for writable attribute - TimeWindowRo: + TimeWindow: oneOf: - type: object properties: @@ -158,6 +158,7 @@ components: properties: endTime: $ref: '#/components/schemas/DateTimeRo' + description: This datatype is used for writable attribute description: This datatype is used for readOnly attribute GeoCoordinate: type: object -- GitLab From f924cfd613ce3109b9716c1007b5dccb5bc8c0ae Mon Sep 17 00:00:00 2001 From: ruiyue Date: Wed, 7 Aug 2024 13:51:22 +0000 Subject: [PATCH 106/587] Update file TS28623_ComDefs.yaml --- OpenAPI/TS28623_ComDefs.yaml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/OpenAPI/TS28623_ComDefs.yaml b/OpenAPI/TS28623_ComDefs.yaml index b8a5bcb64..0368693e3 100755 --- a/OpenAPI/TS28623_ComDefs.yaml +++ b/OpenAPI/TS28623_ComDefs.yaml @@ -142,7 +142,7 @@ components: endTime: $ref: '#/components/schemas/DateTime' description: This datatype is used for writable attribute - TimeWindow: + TimeWindowRo: oneOf: - type: object properties: @@ -157,8 +157,7 @@ components: - type: object properties: endTime: - $ref: '#/components/schemas/DateTimeRo' - description: This datatype is used for writable attribute + $ref: '#/components/schemas/DateTimeRo' description: This datatype is used for readOnly attribute GeoCoordinate: type: object -- GitLab From 22b7cc56a49b2ccefd874f68d138f3c5464cc372 Mon Sep 17 00:00:00 2001 From: ruiyue Date: Wed, 7 Aug 2024 13:59:04 +0000 Subject: [PATCH 107/587] Update file TS28623_ComDefs.yaml --- OpenAPI/TS28623_ComDefs.yaml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/OpenAPI/TS28623_ComDefs.yaml b/OpenAPI/TS28623_ComDefs.yaml index 0368693e3..7c5668d86 100755 --- a/OpenAPI/TS28623_ComDefs.yaml +++ b/OpenAPI/TS28623_ComDefs.yaml @@ -126,6 +126,7 @@ components: type: string pattern: '^[A-Fa-f0-9]{9}$' TimeWindow: + description: This datatype is used for writable attribute oneOf: - type: object properties: @@ -140,9 +141,9 @@ components: - type: object properties: endTime: - $ref: '#/components/schemas/DateTime' - description: This datatype is used for writable attribute + $ref: '#/components/schemas/DateTime' TimeWindowRo: + description: This datatype is used for readOnly attribute oneOf: - type: object properties: @@ -157,8 +158,7 @@ components: - type: object properties: endTime: - $ref: '#/components/schemas/DateTimeRo' - description: This datatype is used for readOnly attribute + $ref: '#/components/schemas/DateTimeRo' GeoCoordinate: type: object properties: -- GitLab From 9e21f7ce29d761517c71e31cf5237b027ce4a0c0 Mon Sep 17 00:00:00 2001 From: ruiyue Date: Wed, 7 Aug 2024 14:02:03 +0000 Subject: [PATCH 108/587] Update file TS28541_SliceNrm.yaml --- OpenAPI/TS28541_SliceNrm.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OpenAPI/TS28541_SliceNrm.yaml b/OpenAPI/TS28541_SliceNrm.yaml index 4f60d8c2a..c7614f85f 100755 --- a/OpenAPI/TS28541_SliceNrm.yaml +++ b/OpenAPI/TS28541_SliceNrm.yaml @@ -791,7 +791,7 @@ components: ReservationExpiration: description: >- An attribute which specifies the actual validity period of the resource reservation.. - $ref: 'TS28623_ComDefs.yaml#/components/schemas/TimeWindowRo' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/TimeWindow' ReservationFailureReason: description: >- An attribute that specifies the additional reason information if the reservation is failed. -- GitLab From 37275534f3164019a9e6adfd7552bfc8de852140 Mon Sep 17 00:00:00 2001 From: ruiyue Date: Wed, 7 Aug 2024 14:17:44 +0000 Subject: [PATCH 109/587] Update 2 files - /OpenAPI/TS28541_SliceNrm.yaml - /OpenAPI/TS28623_ComDefs.yaml --- OpenAPI/TS28541_SliceNrm.yaml | 2 +- OpenAPI/TS28623_ComDefs.yaml | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/OpenAPI/TS28541_SliceNrm.yaml b/OpenAPI/TS28541_SliceNrm.yaml index c7614f85f..4f60d8c2a 100755 --- a/OpenAPI/TS28541_SliceNrm.yaml +++ b/OpenAPI/TS28541_SliceNrm.yaml @@ -791,7 +791,7 @@ components: ReservationExpiration: description: >- An attribute which specifies the actual validity period of the resource reservation.. - $ref: 'TS28623_ComDefs.yaml#/components/schemas/TimeWindow' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/TimeWindowRo' ReservationFailureReason: description: >- An attribute that specifies the additional reason information if the reservation is failed. diff --git a/OpenAPI/TS28623_ComDefs.yaml b/OpenAPI/TS28623_ComDefs.yaml index 7c5668d86..41eaaf579 100755 --- a/OpenAPI/TS28623_ComDefs.yaml +++ b/OpenAPI/TS28623_ComDefs.yaml @@ -143,7 +143,6 @@ components: endTime: $ref: '#/components/schemas/DateTime' TimeWindowRo: - description: This datatype is used for readOnly attribute oneOf: - type: object properties: @@ -158,7 +157,7 @@ components: - type: object properties: endTime: - $ref: '#/components/schemas/DateTimeRo' + $ref: '#/components/schemas/DateTimeRo' GeoCoordinate: type: object properties: -- GitLab From 3e02047c06205774aec3dac25544ed3dc71db412 Mon Sep 17 00:00:00 2001 From: ruiyue Date: Wed, 7 Aug 2024 14:24:45 +0000 Subject: [PATCH 110/587] Update file TS28623_ComDefs.yaml --- OpenAPI/TS28623_ComDefs.yaml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/OpenAPI/TS28623_ComDefs.yaml b/OpenAPI/TS28623_ComDefs.yaml index 41eaaf579..acd119183 100755 --- a/OpenAPI/TS28623_ComDefs.yaml +++ b/OpenAPI/TS28623_ComDefs.yaml @@ -147,17 +147,17 @@ components: - type: object properties: startTime: - $ref: '#/components/schemas/DateTimeRo' + $ref: '#/components/schemas/DateTime' endTime: - $ref: '#/components/schemas/DateTimeRo' + $ref: '#/components/schemas/DateTime' - type: object properties: startTime: - $ref: '#/components/schemas/DateTimeRo' + $ref: '#/components/schemas/DateTime' - type: object properties: endTime: - $ref: '#/components/schemas/DateTimeRo' + $ref: '#/components/schemas/DateTime' GeoCoordinate: type: object properties: -- GitLab From 81bdff5b90576de7f126fe2291adb99c63182009 Mon Sep 17 00:00:00 2001 From: ruiyue Date: Wed, 7 Aug 2024 14:31:43 +0000 Subject: [PATCH 111/587] Update file TS28623_ComDefs.yaml --- OpenAPI/TS28623_ComDefs.yaml | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/OpenAPI/TS28623_ComDefs.yaml b/OpenAPI/TS28623_ComDefs.yaml index acd119183..c30fe1828 100755 --- a/OpenAPI/TS28623_ComDefs.yaml +++ b/OpenAPI/TS28623_ComDefs.yaml @@ -141,23 +141,25 @@ components: - type: object properties: endTime: - $ref: '#/components/schemas/DateTime' + $ref: '#/components/schemas/DateTime' + TimeWindowRo: + description: This datatype is used for readOnly attribute oneOf: - type: object properties: startTime: - $ref: '#/components/schemas/DateTime' + $ref: '#/components/schemas/DateTimeRo' endTime: - $ref: '#/components/schemas/DateTime' + $ref: '#/components/schemas/DateTimeRo' - type: object properties: startTime: - $ref: '#/components/schemas/DateTime' + $ref: '#/components/schemas/DateTimeRo' - type: object properties: endTime: - $ref: '#/components/schemas/DateTime' + $ref: '#/components/schemas/DateTimeRo' GeoCoordinate: type: object properties: -- GitLab From 8915388511d3caa2fa22e5bd67e41aae8b91973c Mon Sep 17 00:00:00 2001 From: ruiyue Date: Wed, 7 Aug 2024 14:35:19 +0000 Subject: [PATCH 112/587] Update 2 files - /OpenAPI/TS28623_ComDefs.yaml - /OpenAPI/TS28541_SliceNrm.yaml --- OpenAPI/TS28541_SliceNrm.yaml | 2 +- OpenAPI/TS28623_ComDefs.yaml | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/OpenAPI/TS28541_SliceNrm.yaml b/OpenAPI/TS28541_SliceNrm.yaml index 4f60d8c2a..8b409eb34 100755 --- a/OpenAPI/TS28541_SliceNrm.yaml +++ b/OpenAPI/TS28541_SliceNrm.yaml @@ -791,7 +791,7 @@ components: ReservationExpiration: description: >- An attribute which specifies the actual validity period of the resource reservation.. - $ref: 'TS28623_ComDefs.yaml#/components/schemas/TimeWindowRo' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/TimeWindowRoTest' ReservationFailureReason: description: >- An attribute that specifies the additional reason information if the reservation is failed. diff --git a/OpenAPI/TS28623_ComDefs.yaml b/OpenAPI/TS28623_ComDefs.yaml index c30fe1828..8c9f6cafc 100755 --- a/OpenAPI/TS28623_ComDefs.yaml +++ b/OpenAPI/TS28623_ComDefs.yaml @@ -143,7 +143,7 @@ components: endTime: $ref: '#/components/schemas/DateTime' - TimeWindowRo: + TimeWindowRoTest: description: This datatype is used for readOnly attribute oneOf: - type: object @@ -159,7 +159,8 @@ components: - type: object properties: endTime: - $ref: '#/components/schemas/DateTimeRo' + $ref: '#/components/schemas/DateTimeRo' + GeoCoordinate: type: object properties: -- GitLab From 78fb2fc2e31d92f976def1187381e6d151e37745 Mon Sep 17 00:00:00 2001 From: ruiyue Date: Wed, 7 Aug 2024 14:40:04 +0000 Subject: [PATCH 113/587] Update 2 files - /OpenAPI/TS28623_ComDefs.yaml - /OpenAPI/TS28541_SliceNrm.yaml --- OpenAPI/TS28541_SliceNrm.yaml | 4 ++-- OpenAPI/TS28623_ComDefs.yaml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/OpenAPI/TS28541_SliceNrm.yaml b/OpenAPI/TS28541_SliceNrm.yaml index 8b409eb34..17e732ad3 100755 --- a/OpenAPI/TS28541_SliceNrm.yaml +++ b/OpenAPI/TS28541_SliceNrm.yaml @@ -778,7 +778,7 @@ components: RequestedReservationExpiration: description: >- An attribute which specifies MnS consuner's requirements for the validity period of the resource reservation. - $ref: 'TS28623_ComDefs.yaml#/components/schemas/TimeWindow' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/TimeWindowRo' ResourceReservationStatus: description: >- An attribute which specifies the resource reservation result for the feasibility check job. @@ -791,7 +791,7 @@ components: ReservationExpiration: description: >- An attribute which specifies the actual validity period of the resource reservation.. - $ref: 'TS28623_ComDefs.yaml#/components/schemas/TimeWindowRoTest' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/TimeWindow' ReservationFailureReason: description: >- An attribute that specifies the additional reason information if the reservation is failed. diff --git a/OpenAPI/TS28623_ComDefs.yaml b/OpenAPI/TS28623_ComDefs.yaml index 8c9f6cafc..a83b826d0 100755 --- a/OpenAPI/TS28623_ComDefs.yaml +++ b/OpenAPI/TS28623_ComDefs.yaml @@ -143,7 +143,7 @@ components: endTime: $ref: '#/components/schemas/DateTime' - TimeWindowRoTest: + TimeWindow: description: This datatype is used for readOnly attribute oneOf: - type: object -- GitLab From fd606c7e0c56224a7f4059ef44b4e6f8fe093f59 Mon Sep 17 00:00:00 2001 From: ruiyue Date: Wed, 7 Aug 2024 14:44:49 +0000 Subject: [PATCH 114/587] Update file TS28623_ComDefs.yaml --- OpenAPI/TS28623_ComDefs.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OpenAPI/TS28623_ComDefs.yaml b/OpenAPI/TS28623_ComDefs.yaml index a83b826d0..f64a4f71d 100755 --- a/OpenAPI/TS28623_ComDefs.yaml +++ b/OpenAPI/TS28623_ComDefs.yaml @@ -143,7 +143,7 @@ components: endTime: $ref: '#/components/schemas/DateTime' - TimeWindow: + TimeWindowRo: description: This datatype is used for readOnly attribute oneOf: - type: object -- GitLab From 6b782fb714c6d35b6f08ba50ecdaf2aafcfc7a2a Mon Sep 17 00:00:00 2001 From: ruiyue Date: Wed, 7 Aug 2024 14:48:39 +0000 Subject: [PATCH 115/587] Update 2 files - /OpenAPI/TS28541_SliceNrm.yaml - /OpenAPI/TS28623_ComDefs.yaml --- OpenAPI/TS28541_SliceNrm.yaml | 4 ++-- OpenAPI/TS28623_ComDefs.yaml | 26 +++++++++++++------------- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/OpenAPI/TS28541_SliceNrm.yaml b/OpenAPI/TS28541_SliceNrm.yaml index 17e732ad3..4f60d8c2a 100755 --- a/OpenAPI/TS28541_SliceNrm.yaml +++ b/OpenAPI/TS28541_SliceNrm.yaml @@ -778,7 +778,7 @@ components: RequestedReservationExpiration: description: >- An attribute which specifies MnS consuner's requirements for the validity period of the resource reservation. - $ref: 'TS28623_ComDefs.yaml#/components/schemas/TimeWindowRo' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/TimeWindow' ResourceReservationStatus: description: >- An attribute which specifies the resource reservation result for the feasibility check job. @@ -791,7 +791,7 @@ components: ReservationExpiration: description: >- An attribute which specifies the actual validity period of the resource reservation.. - $ref: 'TS28623_ComDefs.yaml#/components/schemas/TimeWindow' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/TimeWindowRo' ReservationFailureReason: description: >- An attribute that specifies the additional reason information if the reservation is failed. diff --git a/OpenAPI/TS28623_ComDefs.yaml b/OpenAPI/TS28623_ComDefs.yaml index f64a4f71d..6cb40cc6c 100755 --- a/OpenAPI/TS28623_ComDefs.yaml +++ b/OpenAPI/TS28623_ComDefs.yaml @@ -125,41 +125,41 @@ components: NrCellId: type: string pattern: '^[A-Fa-f0-9]{9}$' - TimeWindow: - description: This datatype is used for writable attribute + TimeWindowRo: + description: This datatype is used for readOnly attribute oneOf: - type: object properties: startTime: - $ref: '#/components/schemas/DateTime' + $ref: '#/components/schemas/DateTimeRo' endTime: - $ref: '#/components/schemas/DateTime' + $ref: '#/components/schemas/DateTimeRo' - type: object properties: startTime: - $ref: '#/components/schemas/DateTime' + $ref: '#/components/schemas/DateTimeRo' - type: object properties: endTime: - $ref: '#/components/schemas/DateTime' - - TimeWindowRo: - description: This datatype is used for readOnly attribute + $ref: '#/components/schemas/DateTimeRo' + + TimeWindow: + description: This datatype is used for writable attribute oneOf: - type: object properties: startTime: - $ref: '#/components/schemas/DateTimeRo' + $ref: '#/components/schemas/DateTime' endTime: - $ref: '#/components/schemas/DateTimeRo' + $ref: '#/components/schemas/DateTime' - type: object properties: startTime: - $ref: '#/components/schemas/DateTimeRo' + $ref: '#/components/schemas/DateTime' - type: object properties: endTime: - $ref: '#/components/schemas/DateTimeRo' + $ref: '#/components/schemas/DateTime' GeoCoordinate: type: object -- GitLab From 4e021f53a7c29bebd291e7a001c869ca55185d91 Mon Sep 17 00:00:00 2001 From: ruiyue Date: Wed, 7 Aug 2024 14:52:49 +0000 Subject: [PATCH 116/587] Update file TS28623_ComDefs.yaml --- OpenAPI/TS28623_ComDefs.yaml | 23 ++++++++++------------- 1 file changed, 10 insertions(+), 13 deletions(-) diff --git a/OpenAPI/TS28623_ComDefs.yaml b/OpenAPI/TS28623_ComDefs.yaml index 6cb40cc6c..9da2e0aa3 100755 --- a/OpenAPI/TS28623_ComDefs.yaml +++ b/OpenAPI/TS28623_ComDefs.yaml @@ -125,41 +125,38 @@ components: NrCellId: type: string pattern: '^[A-Fa-f0-9]{9}$' - TimeWindowRo: - description: This datatype is used for readOnly attribute + TimeWindow: oneOf: - type: object properties: startTime: - $ref: '#/components/schemas/DateTimeRo' + $ref: '#/components/schemas/DateTime' endTime: - $ref: '#/components/schemas/DateTimeRo' + $ref: '#/components/schemas/DateTime' - type: object properties: startTime: - $ref: '#/components/schemas/DateTimeRo' + $ref: '#/components/schemas/DateTime' - type: object properties: endTime: - $ref: '#/components/schemas/DateTimeRo' - - TimeWindow: - description: This datatype is used for writable attribute + $ref: '#/components/schemas/DateTime' + TimeWindowRo: oneOf: - type: object properties: startTime: - $ref: '#/components/schemas/DateTime' + $ref: '#/components/schemas/DateTimeRo' endTime: - $ref: '#/components/schemas/DateTime' + $ref: '#/components/schemas/DateTimeRo' - type: object properties: startTime: - $ref: '#/components/schemas/DateTime' + $ref: '#/components/schemas/DateTimeRo' - type: object properties: endTime: - $ref: '#/components/schemas/DateTime' + $ref: '#/components/schemas/DateTimeRo' GeoCoordinate: type: object -- GitLab From 32d0f95909ed494f0e041b503abd1651f636e23b Mon Sep 17 00:00:00 2001 From: ruiyue Date: Wed, 7 Aug 2024 14:56:58 +0000 Subject: [PATCH 117/587] Update file TS28541_SliceNrm.yaml --- OpenAPI/TS28541_SliceNrm.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OpenAPI/TS28541_SliceNrm.yaml b/OpenAPI/TS28541_SliceNrm.yaml index 4f60d8c2a..c7614f85f 100755 --- a/OpenAPI/TS28541_SliceNrm.yaml +++ b/OpenAPI/TS28541_SliceNrm.yaml @@ -791,7 +791,7 @@ components: ReservationExpiration: description: >- An attribute which specifies the actual validity period of the resource reservation.. - $ref: 'TS28623_ComDefs.yaml#/components/schemas/TimeWindowRo' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/TimeWindow' ReservationFailureReason: description: >- An attribute that specifies the additional reason information if the reservation is failed. -- GitLab From 6f1a86537e0dd1ce19b6edf0de7f62e7390d5165 Mon Sep 17 00:00:00 2001 From: ruiyue Date: Wed, 7 Aug 2024 15:00:29 +0000 Subject: [PATCH 118/587] Update file TS28623_ComDefs.yaml --- OpenAPI/TS28623_ComDefs.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/OpenAPI/TS28623_ComDefs.yaml b/OpenAPI/TS28623_ComDefs.yaml index 9da2e0aa3..c3fde26d1 100755 --- a/OpenAPI/TS28623_ComDefs.yaml +++ b/OpenAPI/TS28623_ComDefs.yaml @@ -125,7 +125,7 @@ components: NrCellId: type: string pattern: '^[A-Fa-f0-9]{9}$' - TimeWindow: + TimeWindowRo: oneOf: - type: object properties: @@ -141,7 +141,7 @@ components: properties: endTime: $ref: '#/components/schemas/DateTime' - TimeWindowRo: + TimeWindow: oneOf: - type: object properties: -- GitLab From 6cd802a5576a0cb79dfb2e8bce3ff2e8f1b0249e Mon Sep 17 00:00:00 2001 From: ruiyue Date: Wed, 7 Aug 2024 15:03:46 +0000 Subject: [PATCH 119/587] Update file TS28541_SliceNrm.yaml --- OpenAPI/TS28541_SliceNrm.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OpenAPI/TS28541_SliceNrm.yaml b/OpenAPI/TS28541_SliceNrm.yaml index c7614f85f..d906788d4 100755 --- a/OpenAPI/TS28541_SliceNrm.yaml +++ b/OpenAPI/TS28541_SliceNrm.yaml @@ -791,7 +791,7 @@ components: ReservationExpiration: description: >- An attribute which specifies the actual validity period of the resource reservation.. - $ref: 'TS28623_ComDefs.yaml#/components/schemas/TimeWindow' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/TimeWindoRo' ReservationFailureReason: description: >- An attribute that specifies the additional reason information if the reservation is failed. -- GitLab From 4dfc74cb1b926396805a3f654c33800bd369803b Mon Sep 17 00:00:00 2001 From: ruiyue Date: Wed, 7 Aug 2024 15:07:57 +0000 Subject: [PATCH 120/587] Update file TS28541_SliceNrm.yaml --- OpenAPI/TS28541_SliceNrm.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OpenAPI/TS28541_SliceNrm.yaml b/OpenAPI/TS28541_SliceNrm.yaml index d906788d4..4f60d8c2a 100755 --- a/OpenAPI/TS28541_SliceNrm.yaml +++ b/OpenAPI/TS28541_SliceNrm.yaml @@ -791,7 +791,7 @@ components: ReservationExpiration: description: >- An attribute which specifies the actual validity period of the resource reservation.. - $ref: 'TS28623_ComDefs.yaml#/components/schemas/TimeWindoRo' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/TimeWindowRo' ReservationFailureReason: description: >- An attribute that specifies the additional reason information if the reservation is failed. -- GitLab From d85d29deb67a74a478931b1aa5c4697076b0398b Mon Sep 17 00:00:00 2001 From: ruiyue Date: Wed, 7 Aug 2024 15:13:37 +0000 Subject: [PATCH 121/587] Update 2 files - /OpenAPI/TS28623_ComDefs.yaml - /OpenAPI/TS28541_SliceNrm.yaml --- OpenAPI/TS28541_SliceNrm.yaml | 2 +- OpenAPI/TS28623_ComDefs.yaml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/OpenAPI/TS28541_SliceNrm.yaml b/OpenAPI/TS28541_SliceNrm.yaml index 4f60d8c2a..eb505866e 100755 --- a/OpenAPI/TS28541_SliceNrm.yaml +++ b/OpenAPI/TS28541_SliceNrm.yaml @@ -791,7 +791,7 @@ components: ReservationExpiration: description: >- An attribute which specifies the actual validity period of the resource reservation.. - $ref: 'TS28623_ComDefs.yaml#/components/schemas/TimeWindowRo' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/TimeWindowR' ReservationFailureReason: description: >- An attribute that specifies the additional reason information if the reservation is failed. diff --git a/OpenAPI/TS28623_ComDefs.yaml b/OpenAPI/TS28623_ComDefs.yaml index c3fde26d1..843255a4a 100755 --- a/OpenAPI/TS28623_ComDefs.yaml +++ b/OpenAPI/TS28623_ComDefs.yaml @@ -125,7 +125,7 @@ components: NrCellId: type: string pattern: '^[A-Fa-f0-9]{9}$' - TimeWindowRo: + TimeWindow: oneOf: - type: object properties: @@ -141,7 +141,7 @@ components: properties: endTime: $ref: '#/components/schemas/DateTime' - TimeWindow: + TimeWindowR: oneOf: - type: object properties: -- GitLab From 767f42b045eb4d856e5f6208f59641b3b43e4766 Mon Sep 17 00:00:00 2001 From: ruiyue Date: Wed, 7 Aug 2024 15:18:08 +0000 Subject: [PATCH 122/587] Update 2 files - /OpenAPI/TS28541_SliceNrm.yaml - /OpenAPI/TS28623_ComDefs.yaml --- OpenAPI/TS28541_SliceNrm.yaml | 2 +- OpenAPI/TS28623_ComDefs.yaml | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/OpenAPI/TS28541_SliceNrm.yaml b/OpenAPI/TS28541_SliceNrm.yaml index eb505866e..c7614f85f 100755 --- a/OpenAPI/TS28541_SliceNrm.yaml +++ b/OpenAPI/TS28541_SliceNrm.yaml @@ -791,7 +791,7 @@ components: ReservationExpiration: description: >- An attribute which specifies the actual validity period of the resource reservation.. - $ref: 'TS28623_ComDefs.yaml#/components/schemas/TimeWindowR' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/TimeWindow' ReservationFailureReason: description: >- An attribute that specifies the additional reason information if the reservation is failed. diff --git a/OpenAPI/TS28623_ComDefs.yaml b/OpenAPI/TS28623_ComDefs.yaml index 843255a4a..38143d496 100755 --- a/OpenAPI/TS28623_ComDefs.yaml +++ b/OpenAPI/TS28623_ComDefs.yaml @@ -126,6 +126,7 @@ components: type: string pattern: '^[A-Fa-f0-9]{9}$' TimeWindow: + description: This datatype is used for writable attribute oneOf: - type: object properties: @@ -141,7 +142,8 @@ components: properties: endTime: $ref: '#/components/schemas/DateTime' - TimeWindowR: + TimeWindowRo: + description: This datatype is used for readOnly attribute oneOf: - type: object properties: -- GitLab From 1fc1e71c075682ba352e1e4ff35ee47a99000851 Mon Sep 17 00:00:00 2001 From: ruiyue Date: Thu, 8 Aug 2024 00:18:43 +0000 Subject: [PATCH 123/587] Update 2 files - /OpenAPI/TS28623_ComDefs.yaml - /OpenAPI/TS28541_SliceNrm.yaml --- OpenAPI/TS28541_SliceNrm.yaml | 2 +- OpenAPI/TS28623_ComDefs.yaml | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/OpenAPI/TS28541_SliceNrm.yaml b/OpenAPI/TS28541_SliceNrm.yaml index c7614f85f..4f60d8c2a 100755 --- a/OpenAPI/TS28541_SliceNrm.yaml +++ b/OpenAPI/TS28541_SliceNrm.yaml @@ -791,7 +791,7 @@ components: ReservationExpiration: description: >- An attribute which specifies the actual validity period of the resource reservation.. - $ref: 'TS28623_ComDefs.yaml#/components/schemas/TimeWindow' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/TimeWindowRo' ReservationFailureReason: description: >- An attribute that specifies the additional reason information if the reservation is failed. diff --git a/OpenAPI/TS28623_ComDefs.yaml b/OpenAPI/TS28623_ComDefs.yaml index 38143d496..91dd741b4 100755 --- a/OpenAPI/TS28623_ComDefs.yaml +++ b/OpenAPI/TS28623_ComDefs.yaml @@ -142,6 +142,7 @@ components: properties: endTime: $ref: '#/components/schemas/DateTime' + TimeWindowRo: description: This datatype is used for readOnly attribute oneOf: -- GitLab From 53ca0a69c2cc1fbad086e1337b56113940766de3 Mon Sep 17 00:00:00 2001 From: ruiyue Date: Thu, 8 Aug 2024 00:21:47 +0000 Subject: [PATCH 124/587] Update file TS28623_ComDefs.yaml --- OpenAPI/TS28623_ComDefs.yaml | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/OpenAPI/TS28623_ComDefs.yaml b/OpenAPI/TS28623_ComDefs.yaml index 91dd741b4..30a9dbe97 100755 --- a/OpenAPI/TS28623_ComDefs.yaml +++ b/OpenAPI/TS28623_ComDefs.yaml @@ -152,14 +152,7 @@ components: $ref: '#/components/schemas/DateTimeRo' endTime: $ref: '#/components/schemas/DateTimeRo' - - type: object - properties: - startTime: - $ref: '#/components/schemas/DateTimeRo' - - type: object - properties: - endTime: - $ref: '#/components/schemas/DateTimeRo' + GeoCoordinate: type: object -- GitLab From 4548bc561bf7882692fa707125af26446e718d8b Mon Sep 17 00:00:00 2001 From: ruiyue Date: Thu, 8 Aug 2024 00:24:48 +0000 Subject: [PATCH 125/587] Update file TS28623_ComDefs.yaml --- OpenAPI/TS28623_ComDefs.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/OpenAPI/TS28623_ComDefs.yaml b/OpenAPI/TS28623_ComDefs.yaml index 30a9dbe97..be33b1726 100755 --- a/OpenAPI/TS28623_ComDefs.yaml +++ b/OpenAPI/TS28623_ComDefs.yaml @@ -150,10 +150,11 @@ components: properties: startTime: $ref: '#/components/schemas/DateTimeRo' + - type: object + properties: endTime: $ref: '#/components/schemas/DateTimeRo' - GeoCoordinate: type: object properties: -- GitLab From 87cdb08716a5e0475b47de6f6dd867a5fe1f0dd9 Mon Sep 17 00:00:00 2001 From: ruiyue Date: Thu, 8 Aug 2024 00:31:14 +0000 Subject: [PATCH 126/587] Update 2 files - /OpenAPI/TS28623_ComDefs.yaml - /OpenAPI/TS28541_SliceNrm.yaml --- OpenAPI/TS28541_SliceNrm.yaml | 2 +- OpenAPI/TS28623_ComDefs.yaml | 14 +++++++++----- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/OpenAPI/TS28541_SliceNrm.yaml b/OpenAPI/TS28541_SliceNrm.yaml index 4f60d8c2a..1d20dfd8d 100755 --- a/OpenAPI/TS28541_SliceNrm.yaml +++ b/OpenAPI/TS28541_SliceNrm.yaml @@ -791,7 +791,7 @@ components: ReservationExpiration: description: >- An attribute which specifies the actual validity period of the resource reservation.. - $ref: 'TS28623_ComDefs.yaml#/components/schemas/TimeWindowRo' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/ABC' ReservationFailureReason: description: >- An attribute that specifies the additional reason information if the reservation is failed. diff --git a/OpenAPI/TS28623_ComDefs.yaml b/OpenAPI/TS28623_ComDefs.yaml index be33b1726..9f63b4d44 100755 --- a/OpenAPI/TS28623_ComDefs.yaml +++ b/OpenAPI/TS28623_ComDefs.yaml @@ -141,11 +141,16 @@ components: - type: object properties: endTime: - $ref: '#/components/schemas/DateTime' - - TimeWindowRo: + $ref: '#/components/schemas/DateTime' + ABC: description: This datatype is used for readOnly attribute - oneOf: + oneOf: + - type: object + properties: + startTime: + $ref: '#/components/schemas/DateTimeRo' + endTime: + $ref: '#/components/schemas/DateTimeRo' - type: object properties: startTime: @@ -154,7 +159,6 @@ components: properties: endTime: $ref: '#/components/schemas/DateTimeRo' - GeoCoordinate: type: object properties: -- GitLab From 5fffb76eb57c824872dd883bbdbdf3c3e72fe18b Mon Sep 17 00:00:00 2001 From: ruiyue Date: Thu, 8 Aug 2024 00:35:33 +0000 Subject: [PATCH 127/587] Update 2 files - /OpenAPI/TS28623_ComDefs.yaml - /OpenAPI/TS28541_SliceNrm.yaml --- OpenAPI/TS28541_SliceNrm.yaml | 20 ++++++++++++++++++-- OpenAPI/TS28623_ComDefs.yaml | 2 +- 2 files changed, 19 insertions(+), 3 deletions(-) diff --git a/OpenAPI/TS28541_SliceNrm.yaml b/OpenAPI/TS28541_SliceNrm.yaml index 1d20dfd8d..f55e86fce 100755 --- a/OpenAPI/TS28541_SliceNrm.yaml +++ b/OpenAPI/TS28541_SliceNrm.yaml @@ -14,7 +14,23 @@ components: schemas: #------------ Type definitions --------------------------------------------------- - + TimeWindowRo: + description: This datatype is used for readOnly attribute + oneOf: + - type: object + properties: + startTime: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTimeRo' + endTime: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTimeRo' + - type: object + properties: + startTime: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTimeRo' + - type: object + properties: + endTime: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTimeRo' Float: type: number format: float @@ -791,7 +807,7 @@ components: ReservationExpiration: description: >- An attribute which specifies the actual validity period of the resource reservation.. - $ref: 'TS28623_ComDefs.yaml#/components/schemas/ABC' + $ref: '#/components/schemas/TimeWindowRo' ReservationFailureReason: description: >- An attribute that specifies the additional reason information if the reservation is failed. diff --git a/OpenAPI/TS28623_ComDefs.yaml b/OpenAPI/TS28623_ComDefs.yaml index 9f63b4d44..e433cbd97 100755 --- a/OpenAPI/TS28623_ComDefs.yaml +++ b/OpenAPI/TS28623_ComDefs.yaml @@ -142,7 +142,7 @@ components: properties: endTime: $ref: '#/components/schemas/DateTime' - ABC: + TimeWindowRo: description: This datatype is used for readOnly attribute oneOf: - type: object -- GitLab From 77308cb84461afc883a591be14d008329493a8e7 Mon Sep 17 00:00:00 2001 From: ruiyue Date: Thu, 8 Aug 2024 00:41:03 +0000 Subject: [PATCH 128/587] Update 2 files - /OpenAPI/TS28541_SliceNrm.yaml - /OpenAPI/TS28623_ComDefs.yaml --- OpenAPI/TS28541_SliceNrm.yaml | 20 ++------------------ OpenAPI/TS28623_ComDefs.yaml | 29 +++++++++++++++-------------- 2 files changed, 17 insertions(+), 32 deletions(-) diff --git a/OpenAPI/TS28541_SliceNrm.yaml b/OpenAPI/TS28541_SliceNrm.yaml index f55e86fce..4f60d8c2a 100755 --- a/OpenAPI/TS28541_SliceNrm.yaml +++ b/OpenAPI/TS28541_SliceNrm.yaml @@ -14,23 +14,7 @@ components: schemas: #------------ Type definitions --------------------------------------------------- - TimeWindowRo: - description: This datatype is used for readOnly attribute - oneOf: - - type: object - properties: - startTime: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTimeRo' - endTime: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTimeRo' - - type: object - properties: - startTime: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTimeRo' - - type: object - properties: - endTime: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTimeRo' + Float: type: number format: float @@ -807,7 +791,7 @@ components: ReservationExpiration: description: >- An attribute which specifies the actual validity period of the resource reservation.. - $ref: '#/components/schemas/TimeWindowRo' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/TimeWindowRo' ReservationFailureReason: description: >- An attribute that specifies the additional reason information if the reservation is failed. diff --git a/OpenAPI/TS28623_ComDefs.yaml b/OpenAPI/TS28623_ComDefs.yaml index e433cbd97..1b5333cfa 100755 --- a/OpenAPI/TS28623_ComDefs.yaml +++ b/OpenAPI/TS28623_ComDefs.yaml @@ -125,40 +125,41 @@ components: NrCellId: type: string pattern: '^[A-Fa-f0-9]{9}$' - TimeWindow: - description: This datatype is used for writable attribute - oneOf: + TimeWindowRo: + description: This datatype is used for readOnly attribute + oneOf: - type: object properties: startTime: - $ref: '#/components/schemas/DateTime' + $ref: '#/components/schemas/DateTimeRo' endTime: - $ref: '#/components/schemas/DateTime' + $ref: '#/components/schemas/DateTimeRo' - type: object properties: startTime: - $ref: '#/components/schemas/DateTime' + $ref: '#/components/schemas/DateTimeRo' - type: object properties: endTime: - $ref: '#/components/schemas/DateTime' - TimeWindowRo: - description: This datatype is used for readOnly attribute - oneOf: + $ref: '#/components/schemas/DateTimeRo' + TimeWindow: + description: This datatype is used for writable attribute + oneOf: - type: object properties: startTime: - $ref: '#/components/schemas/DateTimeRo' + $ref: '#/components/schemas/DateTime' endTime: - $ref: '#/components/schemas/DateTimeRo' + $ref: '#/components/schemas/DateTime' - type: object properties: startTime: - $ref: '#/components/schemas/DateTimeRo' + $ref: '#/components/schemas/DateTime' - type: object properties: endTime: - $ref: '#/components/schemas/DateTimeRo' + $ref: '#/components/schemas/DateTime' + GeoCoordinate: type: object properties: -- GitLab From c39f7361b62f7d8e8d805458dc27add6ad41355d Mon Sep 17 00:00:00 2001 From: ruiyue Date: Thu, 8 Aug 2024 00:43:56 +0000 Subject: [PATCH 129/587] Update 2 files - /OpenAPI/TS28623_ComDefs.yaml - /OpenAPI/TS28541_SliceNrm.yaml --- OpenAPI/TS28541_SliceNrm.yaml | 2 +- OpenAPI/TS28623_ComDefs.yaml | 31 +++++++++++++++---------------- 2 files changed, 16 insertions(+), 17 deletions(-) diff --git a/OpenAPI/TS28541_SliceNrm.yaml b/OpenAPI/TS28541_SliceNrm.yaml index 4f60d8c2a..c7614f85f 100755 --- a/OpenAPI/TS28541_SliceNrm.yaml +++ b/OpenAPI/TS28541_SliceNrm.yaml @@ -791,7 +791,7 @@ components: ReservationExpiration: description: >- An attribute which specifies the actual validity period of the resource reservation.. - $ref: 'TS28623_ComDefs.yaml#/components/schemas/TimeWindowRo' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/TimeWindow' ReservationFailureReason: description: >- An attribute that specifies the additional reason information if the reservation is failed. diff --git a/OpenAPI/TS28623_ComDefs.yaml b/OpenAPI/TS28623_ComDefs.yaml index 1b5333cfa..a4f2ba33f 100755 --- a/OpenAPI/TS28623_ComDefs.yaml +++ b/OpenAPI/TS28623_ComDefs.yaml @@ -124,42 +124,41 @@ components: pattern: '^[A-Fa-f0-9]{7}$' NrCellId: type: string - pattern: '^[A-Fa-f0-9]{9}$' - TimeWindowRo: - description: This datatype is used for readOnly attribute - oneOf: + pattern: '^[A-Fa-f0-9]{9}$' + TimeWindow: + description: This datatype is used for writable attribute + oneOf: - type: object properties: startTime: - $ref: '#/components/schemas/DateTimeRo' + $ref: '#/components/schemas/DateTime' endTime: - $ref: '#/components/schemas/DateTimeRo' + $ref: '#/components/schemas/DateTime' - type: object properties: startTime: - $ref: '#/components/schemas/DateTimeRo' + $ref: '#/components/schemas/DateTime' - type: object properties: endTime: - $ref: '#/components/schemas/DateTimeRo' - TimeWindow: - description: This datatype is used for writable attribute - oneOf: + $ref: '#/components/schemas/DateTime' + TimeWindowRo: + description: This datatype is used for readOnly attribute + oneOf: - type: object properties: startTime: - $ref: '#/components/schemas/DateTime' + $ref: '#/components/schemas/DateTimeRo' endTime: - $ref: '#/components/schemas/DateTime' + $ref: '#/components/schemas/DateTimeRo' - type: object properties: startTime: - $ref: '#/components/schemas/DateTime' + $ref: '#/components/schemas/DateTimeRo' - type: object properties: endTime: - $ref: '#/components/schemas/DateTime' - + $ref: '#/components/schemas/DateTimeRo' GeoCoordinate: type: object properties: -- GitLab From 9100f1bd35260ba19a414223b7ebde3c00c32a02 Mon Sep 17 00:00:00 2001 From: ruiyue Date: Wed, 21 Aug 2024 21:01:28 +0000 Subject: [PATCH 130/587] Update 2 files - /OpenAPI/TS28623_GenericNrm.yaml - /OpenAPI/TS28541_5GcNrm.yaml --- OpenAPI/TS28541_5GcNrm.yaml | 2 +- OpenAPI/TS28623_GenericNrm.yaml | 18 +----------------- 2 files changed, 2 insertions(+), 18 deletions(-) diff --git a/OpenAPI/TS28541_5GcNrm.yaml b/OpenAPI/TS28541_5GcNrm.yaml index 0706fa635..ac72bf08c 100755 --- a/OpenAPI/TS28541_5GcNrm.yaml +++ b/OpenAPI/TS28541_5GcNrm.yaml @@ -750,7 +750,7 @@ components: description: This datatype is used for readOnly attribute type: array items: - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/TaiRo' + $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Tai' SupiRange: type: object properties: diff --git a/OpenAPI/TS28623_GenericNrm.yaml b/OpenAPI/TS28623_GenericNrm.yaml index 25d490071..baa657178 100755 --- a/OpenAPI/TS28623_GenericNrm.yaml +++ b/OpenAPI/TS28623_GenericNrm.yaml @@ -169,26 +169,10 @@ components: $ref: 'TS28623_ComDefs.yaml#/components/schemas/Mnc' tac: $ref: '#/components/schemas/Tac' - TaiRo: - type: object - description: This datatype is used for readOnly attribute - properties: - mcc: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/MccRo' - mnc: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/MncRo' - tac: - $ref: '#/components/schemas/TacRo' - Tac: type: string description: This datatype is used for writable attribute - pattern: '(^[A-Fa-f0-9]{4}$)|(^[A-Fa-f0-9]{6}$)' - TacRo: - type: string - description: This datatype is used for readOnly attribute - pattern: '(^[A-Fa-f0-9]{4}$)|(^[A-Fa-f0-9]{6}$)' - readOnly: true + pattern: '(^[A-Fa-f0-9]{4}$)|(^[A-Fa-f0-9]{6}$)' EutraCellId: type: string pattern: '^[A-Fa-f0-9]{7}$' -- GitLab From 49fd9d3b5f3d2c89d1afa72f1e0fdd7157648150 Mon Sep 17 00:00:00 2001 From: ruiyue Date: Wed, 21 Aug 2024 21:06:20 +0000 Subject: [PATCH 131/587] Update 2 files - /OpenAPI/TS28541_NrNrm.yaml - /OpenAPI/TS28541_5GcNrm.yaml --- OpenAPI/TS28541_5GcNrm.yaml | 9 ++------- OpenAPI/TS28541_NrNrm.yaml | 7 +------ 2 files changed, 3 insertions(+), 13 deletions(-) diff --git a/OpenAPI/TS28541_5GcNrm.yaml b/OpenAPI/TS28541_5GcNrm.yaml index ac72bf08c..d66b5a1ae 100755 --- a/OpenAPI/TS28541_5GcNrm.yaml +++ b/OpenAPI/TS28541_5GcNrm.yaml @@ -745,12 +745,7 @@ components: description: This datatype is used for writable attribute type: array items: - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Tai' - TaiListRo: - description: This datatype is used for readOnly attribute - type: array - items: - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Tai' + $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Tai' SupiRange: type: object properties: @@ -1965,7 +1960,7 @@ components: type: string minItems: 1 taiList: - $ref: '#/components/schemas/TaiListRo' + $ref: '#/components/schemas/TaiList' taiRangeList: type: array items: diff --git a/OpenAPI/TS28541_NrNrm.yaml b/OpenAPI/TS28541_NrNrm.yaml index ecaf86e17..f02271676 100755 --- a/OpenAPI/TS28541_NrNrm.yaml +++ b/OpenAPI/TS28541_NrNrm.yaml @@ -100,12 +100,7 @@ components: description: This datatype is used for writable attribute type: array items: - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Tai' - TaiListRo: - description: This datatype is used for readOnly attribute - type: array - items: - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/TaiRo' + $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Tai' BackhaulAddress: type: object properties: -- GitLab From 73875b8c5110b08ab8632429b3644cebd94857d1 Mon Sep 17 00:00:00 2001 From: ruiyue Date: Wed, 21 Aug 2024 21:10:53 +0000 Subject: [PATCH 132/587] Update file TS28541_SliceNrm.yaml --- OpenAPI/TS28541_SliceNrm.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OpenAPI/TS28541_SliceNrm.yaml b/OpenAPI/TS28541_SliceNrm.yaml index c7614f85f..11f8a7c28 100755 --- a/OpenAPI/TS28541_SliceNrm.yaml +++ b/OpenAPI/TS28541_SliceNrm.yaml @@ -938,7 +938,7 @@ components: uLThptPerSliceSubnet: $ref: '#/components/schemas/XLThpt' coverageAreaTAList: - $ref: 'TS28541_5GcNrm.yaml#/components/schemas/TaiListRo' + $ref: 'TS28541_5GcNrm.yaml#/components/schemas/TaiList' FeasibilityCheckAndReservationJob-Single: allOf: - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' -- GitLab From 727da3d6b09d5de57a46d7a564d90b28501ef863 Mon Sep 17 00:00:00 2001 From: ruiyue Date: Wed, 21 Aug 2024 21:18:11 +0000 Subject: [PATCH 133/587] Update file TS28541_5GcNrm.yaml --- OpenAPI/TS28541_5GcNrm.yaml | 131 ++---------------------------------- 1 file changed, 7 insertions(+), 124 deletions(-) diff --git a/OpenAPI/TS28541_5GcNrm.yaml b/OpenAPI/TS28541_5GcNrm.yaml index d66b5a1ae..3ba59ca6e 100755 --- a/OpenAPI/TS28541_5GcNrm.yaml +++ b/OpenAPI/TS28541_5GcNrm.yaml @@ -128,12 +128,7 @@ components: description: This datatype is used for writable attribute type: array items: - $ref: '#/components/schemas/CNSIId' - CNSIIdListRo: - description: This datatype is used for readOnly attribute - type: array - items: - $ref: '#/components/schemas/CNSIIdRo' + $ref: '#/components/schemas/CNSIId' CNSIId: type: string description: CNSI Id is defined in TS 29.531, only for Core Network. This datatype is used for writable attribute @@ -249,7 +244,7 @@ components: type: string readOnly: true nfType: - $ref: '#/components/schemas/NFTypeRo' + $ref: '#/components/schemas/NFType' heartbeatTimer: type: integer authzInfo: @@ -614,19 +609,7 @@ components: type: string nRTACpattern: type: string - NRTACRangeRo: - type: object - description: This datatype is used for readOnly attribute - properties: - nRTACstart: - type: string - readOnly: true - nRTACend: - type: string - nRTACpattern: - type: string - readOnly: true - + TaiRange: type: object description: This datatype is used for writable attribute @@ -637,16 +620,6 @@ components: type: array items: $ref: '#/components/schemas/NRTACRange' - TaiRangeRo: - type: object - description: This datatype is used for readOnly attribute - properties: - plmnId: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/PlmnIdRo' - nRTACRangelist: - type: array - items: - $ref: '#/components/schemas/NRTACRangeRo' GUAMInfo: type: object @@ -1226,31 +1199,7 @@ components: - type: string description: > This string provides forward-compatibility with future extensions to the enumeration but - is not used to encode content defined in the present version of this API. - AfEventRo: - description: Represents Application Events. This datatype is used for readOnly attribute - anyOf: - - type: string - readOnly: true - enum: - - SVC_EXPERIENCE - - UE_MOBILITY - - UE_COMM - - EXCEPTIONS - - USER_DATA_CONGESTION - - PERF_DATA - - DISPERSION - - COLLECTIVE_BEHAVIOUR - - MS_QOE_METRICS - - MS_CONSUMPTION - - MS_NET_ASSIST_INVOCATION - - MS_DYN_POLICY_INVOCATION - - MS_ACCESS_ACTIVITY - - type: string - readOnly: true - description: > - This string provides forward-compatibility with future extensions to the enumeration but - is not used to encode content defined in the present version of this API. + is not used to encode content defined in the present version of this API. AfEventExposureData: description: AF Event Exposure data managed by a given NEF Instance type: object @@ -1260,7 +1209,7 @@ components: afEvents: type: array items: - $ref: '#/components/schemas/AfEventRo' + $ref: '#/components/schemas/AfEvent' minItems: 1 afIds: type: array @@ -3117,72 +3066,6 @@ components: - W_AGF - TWIF - TSN_AF - NFTypeRo: - description: NF name defined in TS 23.501 or TS 29.510'. This datatype is used for readOnly attribute - type: string - enum: - - NRF - - UDM - - AMF - - SMF - - AUSF - - NEF - - PCF - - SMSF - - NSSF - - UDR - - LMF - - GMLC - - 5G_EIR - - SEPP - - UPF - - N3IWF - - AF - - UDSF - - DN - - BSF - - CHF - - NWDAF - - PCSCF - - CBCF - - HSS - - UCMF - - SOR_AF - - SPAF - - MME - - SCSAS - - SCEF - - SCP - - NSSAAF - - ICSCF - - SCSCF - - DRA - - IMS_AS - - AANF - - 5G_DDNMF - - NSACF - - MFAF - - EASDF - - DCCF - - MB_SMF - - TSCTSF - - ADRF - - GBA_BSF - - CEF - - MB_UPF - - NSWOF - - PKMF - - MNPF - - SMS_GMSC - - SMS_IWMSC - - MBSF - - MBSTF - - PANF - - TNGF - - W_AGF - - TWIF - - TSN_AF - readOnly: true OperationSemantics: type: string @@ -3312,7 +3195,7 @@ components: weightFactor: $ref: '#/components/schemas/WeightFactor' cNSIIdList: - $ref: '#/components/schemas/CNSIIdListRo' + $ref: '#/components/schemas/CNSIIdList' amfSetRef: $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' managedNFProfile: @@ -3431,7 +3314,7 @@ components: sBIFqdn: type: string cNSIIdList: - $ref: '#/components/schemas/CNSIIdListRo' + $ref: '#/components/schemas/CNSIIdList' managedNFProfile: $ref: '#/components/schemas/ManagedNFProfile' commModelList: -- GitLab From 83564b0d81deee2735ee83f3ad3cb36ad36be73d Mon Sep 17 00:00:00 2001 From: ruiyue Date: Wed, 21 Aug 2024 21:21:35 +0000 Subject: [PATCH 134/587] Update file TS28541_5GcNrm.yaml --- OpenAPI/TS28541_5GcNrm.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OpenAPI/TS28541_5GcNrm.yaml b/OpenAPI/TS28541_5GcNrm.yaml index 3ba59ca6e..f6da73ef5 100755 --- a/OpenAPI/TS28541_5GcNrm.yaml +++ b/OpenAPI/TS28541_5GcNrm.yaml @@ -1913,7 +1913,7 @@ components: taiRangeList: type: array items: - $ref: '#/components/schemas/TaiRangeRo' + $ref: '#/components/schemas/TaiRange' minItems: 1 dnaiList: type: array -- GitLab From 0fb015440511f73f62d098c13033b82119f6dc9e Mon Sep 17 00:00:00 2001 From: ruiyue Date: Wed, 21 Aug 2024 21:30:54 +0000 Subject: [PATCH 135/587] Update 3 files - /OpenAPI/TS28541_5GcNrm.yaml - /OpenAPI/TS28541_NrNrm.yaml - /OpenAPI/TS28623_GenericNrm.yaml --- OpenAPI/TS28541_5GcNrm.yaml | 11 ++--------- OpenAPI/TS28541_NrNrm.yaml | 1 - OpenAPI/TS28623_GenericNrm.yaml | 4 +--- 3 files changed, 3 insertions(+), 13 deletions(-) diff --git a/OpenAPI/TS28541_5GcNrm.yaml b/OpenAPI/TS28541_5GcNrm.yaml index f6da73ef5..547da06db 100755 --- a/OpenAPI/TS28541_5GcNrm.yaml +++ b/OpenAPI/TS28541_5GcNrm.yaml @@ -131,11 +131,7 @@ components: $ref: '#/components/schemas/CNSIId' CNSIId: type: string - description: CNSI Id is defined in TS 29.531, only for Core Network. This datatype is used for writable attribute - CNSIIdRo: - type: string - description: CNSI Id is defined in TS 29.531, only for Core Network. This datatype is used for readOnly attribute - readOnly: true + description: CNSI Id is defined in TS 29.531, only for Core Network. EnergySavingControl: type: string description: any of enumerated value @@ -601,7 +597,6 @@ components: NRTACRange: type: object - description: This datatype is used for writable attribute properties: nRTACstart: type: string @@ -612,7 +607,6 @@ components: TaiRange: type: object - description: This datatype is used for writable attribute properties: plmnId: $ref: 'TS28623_ComDefs.yaml#/components/schemas/PlmnId' @@ -715,7 +709,6 @@ components: nid: type: string TaiList: - description: This datatype is used for writable attribute type: array items: $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Tai' @@ -1179,7 +1172,7 @@ components: minItems: 1 readOnly: true AfEvent: - description: Represents Application Events.This datatype is used for writable attribute + description: Represents Application Events. anyOf: - type: string enum: diff --git a/OpenAPI/TS28541_NrNrm.yaml b/OpenAPI/TS28541_NrNrm.yaml index f02271676..10fe7cd2d 100755 --- a/OpenAPI/TS28541_NrNrm.yaml +++ b/OpenAPI/TS28541_NrNrm.yaml @@ -97,7 +97,6 @@ components: items: $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Tac' TaiList: - description: This datatype is used for writable attribute type: array items: $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Tai' diff --git a/OpenAPI/TS28623_GenericNrm.yaml b/OpenAPI/TS28623_GenericNrm.yaml index baa657178..bb5a2d861 100755 --- a/OpenAPI/TS28623_GenericNrm.yaml +++ b/OpenAPI/TS28623_GenericNrm.yaml @@ -161,7 +161,6 @@ components: Tai: type: object - description: This datatype is used for writable attribute properties: mcc: $ref: 'TS28623_ComDefs.yaml#/components/schemas/Mcc' @@ -170,8 +169,7 @@ components: tac: $ref: '#/components/schemas/Tac' Tac: - type: string - description: This datatype is used for writable attribute + type: string pattern: '(^[A-Fa-f0-9]{4}$)|(^[A-Fa-f0-9]{6}$)' EutraCellId: type: string -- GitLab From a9f4be7267db1fbed09726c5d54860e5a2428d9d Mon Sep 17 00:00:00 2001 From: ruiyue Date: Wed, 21 Aug 2024 21:38:05 +0000 Subject: [PATCH 136/587] Update file TS28541_5GcNrm.yaml --- OpenAPI/TS28541_5GcNrm.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/OpenAPI/TS28541_5GcNrm.yaml b/OpenAPI/TS28541_5GcNrm.yaml index 547da06db..c76ca2d7e 100755 --- a/OpenAPI/TS28541_5GcNrm.yaml +++ b/OpenAPI/TS28541_5GcNrm.yaml @@ -125,7 +125,6 @@ components: - REGISTERED - SUSPENDED CNSIIdList: - description: This datatype is used for writable attribute type: array items: $ref: '#/components/schemas/CNSIId' -- GitLab From 129d28ee1e2e62b580e7698d10526442a8091705 Mon Sep 17 00:00:00 2001 From: ruiyue Date: Thu, 8 Aug 2024 12:29:10 +0000 Subject: [PATCH 137/587] Update file TS28541_NrNrm.yaml --- OpenAPI/TS28541_NrNrm.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/OpenAPI/TS28541_NrNrm.yaml b/OpenAPI/TS28541_NrNrm.yaml index 10fe7cd2d..38cc9d650 100755 --- a/OpenAPI/TS28541_NrNrm.yaml +++ b/OpenAPI/TS28541_NrNrm.yaml @@ -1120,9 +1120,9 @@ components: description: "Condition is BWP sets are supported" $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList' rimRSMonitoringStartTime: - type: string + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTime' rimRSMonitoringStopTime: - type: string + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTime' rimRSMonitoringWindowDuration: type: integer rimRSMonitoringWindowStartingOffset: -- GitLab From 8985c6c8bce20ad68980ee7ccabd38954db6feb0 Mon Sep 17 00:00:00 2001 From: Shitao Li Date: Thu, 8 Aug 2024 09:06:18 +0000 Subject: [PATCH 138/587] Update TS28541_5GcNrm.yaml --- OpenAPI/TS28541_5GcNrm.yaml | 66 ++++++++++++++++++++++++++++++++++++- 1 file changed, 65 insertions(+), 1 deletion(-) diff --git a/OpenAPI/TS28541_5GcNrm.yaml b/OpenAPI/TS28541_5GcNrm.yaml index c76ca2d7e..1807093be 100755 --- a/OpenAPI/TS28541_5GcNrm.yaml +++ b/OpenAPI/TS28541_5GcNrm.yaml @@ -3695,6 +3695,12 @@ components: properties: EP_NLS: $ref: '#/components/schemas/EP_NLS-Multiple' + EP_NL8: + $ref: '#/components/schemas/EP_NL8-Multiple' + EP_NL7: + $ref: '#/components/schemas/EP_NL7-Multiple' + EP_NL10: + $ref: '#/components/schemas/EP_NL10-Multiple' NgeirFunction-Single: allOf: - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' @@ -4523,6 +4529,34 @@ components: $ref: 'TS28541_NrNrm.yaml#/components/schemas/LocalAddress' remoteAddress: $ref: 'TS28541_NrNrm.yaml#/components/schemas/RemoteAddress' + EP_NL7-Single: + allOf: + - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' + - type: object + properties: + attributes: + allOf: + - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/EP_RP-Attr' + - type: object + properties: + localAddress: + $ref: 'TS28541_NrNrm.yaml#/components/schemas/LocalAddress' + remoteAddress: + $ref: 'TS28541_NrNrm.yaml#/components/schemas/RemoteAddress' + EP_NL8-Single: + allOf: + - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' + - type: object + properties: + attributes: + allOf: + - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/EP_RP-Attr' + - type: object + properties: + localAddress: + $ref: 'TS28541_NrNrm.yaml#/components/schemas/LocalAddress' + remoteAddress: + $ref: 'TS28541_NrNrm.yaml#/components/schemas/RemoteAddress' EP_NL9-Single: allOf: - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' @@ -4537,7 +4571,20 @@ components: $ref: 'TS28541_NrNrm.yaml#/components/schemas/LocalAddress' remoteAddress: $ref: 'TS28541_NrNrm.yaml#/components/schemas/RemoteAddress' - + EP_NL10-Single: + allOf: + - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' + - type: object + properties: + attributes: + allOf: + - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/EP_RP-Attr' + - type: object + properties: + localAddress: + $ref: 'TS28541_NrNrm.yaml#/components/schemas/LocalAddress' + remoteAddress: + $ref: 'TS28541_NrNrm.yaml#/components/schemas/RemoteAddress' EP_N60-Single: allOf: - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' @@ -5111,6 +5158,8 @@ components: $ref: '#/components/schemas/EP_NL6-Multiple' EP_NL9: $ref: '#/components/schemas/EP_NL9-Multiple' + EP_NL10: + $ref: '#/components/schemas/EP_NL10-Multiple' TsctsfFunction-Single: allOf: - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' @@ -5812,10 +5861,22 @@ components: type: array items: $ref: '#/components/schemas/EP_NL6-Single' + EP_NL7-Multiple: + type: array + items: + $ref: '#/components/schemas/EP_NL7-Single' + EP_NL8-Multiple: + type: array + items: + $ref: '#/components/schemas/EP_NL8-Single' EP_NL9-Multiple: type: array items: $ref: '#/components/schemas/EP_NL9-Single' + EP_NL10-Multiple: + type: array + items: + $ref: '#/components/schemas/EP_NL10-Single' EP_N60-Multiple: type: array items: @@ -6090,7 +6151,10 @@ components: - $ref: '#/components/schemas/EP_NL3-Single' - $ref: '#/components/schemas/EP_NL5-Single' - $ref: '#/components/schemas/EP_NL6-Single' + - $ref: '#/components/schemas/EP_NL7-Single' + - $ref: '#/components/schemas/EP_NL8-Single' - $ref: '#/components/schemas/EP_NL9-Single' + - $ref: '#/components/schemas/EP_NL10-Single' - $ref: '#/components/schemas/EP_N11mb-Single' - $ref: '#/components/schemas/EP_N16mb-Single' - $ref: '#/components/schemas/EP_Nmb1-Single' -- GitLab From b1defc60c263ae6c947861835bb59231daeb74a4 Mon Sep 17 00:00:00 2001 From: ruiyue Date: Tue, 27 Aug 2024 03:36:51 +0000 Subject: [PATCH 139/587] Code Moderatpr manually merge the MR !1269 --- OpenAPI/TS28541_5GcNrm.yaml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/OpenAPI/TS28541_5GcNrm.yaml b/OpenAPI/TS28541_5GcNrm.yaml index 1807093be..bbe388bd3 100755 --- a/OpenAPI/TS28541_5GcNrm.yaml +++ b/OpenAPI/TS28541_5GcNrm.yaml @@ -3231,8 +3231,8 @@ components: $ref: '#/components/schemas/EP_N22-Multiple' EP_N26: $ref: '#/components/schemas/EP_N26-Multiple' - EP_NLS: - $ref: '#/components/schemas/EP_NLS-Multiple' + EP_NL1: + $ref: '#/components/schemas/EP_NL1-Multiple' EP_NL2: $ref: '#/components/schemas/EP_NL2-Multiple' EP_N58: @@ -3693,8 +3693,8 @@ components: - $ref: '#/components/schemas/ManagedFunction5GC-nc0' - type: object properties: - EP_NLS: - $ref: '#/components/schemas/EP_NLS-Multiple' + EP_NL1: + $ref: '#/components/schemas/EP_NL1-Multiple' EP_NL8: $ref: '#/components/schemas/EP_NL8-Multiple' EP_NL7: @@ -4459,7 +4459,7 @@ components: $ref: 'TS28541_NrNrm.yaml#/components/schemas/LocalAddress' remoteAddress: $ref: 'TS28541_NrNrm.yaml#/components/schemas/RemoteAddress' - EP_NLS-Single: + EP_NL1-Single: allOf: - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' - type: object @@ -5841,10 +5841,10 @@ components: type: array items: $ref: '#/components/schemas/EP_MAP_SMSC-Single' - EP_NLS-Multiple: + EP_NL1-Multiple: type: array items: - $ref: '#/components/schemas/EP_NLS-Single' + $ref: '#/components/schemas/EP_NL1-Single' EP_NL2-Multiple: type: array items: @@ -6146,7 +6146,7 @@ components: - $ref: '#/components/schemas/EP_S5U-Single' - $ref: '#/components/schemas/EP_Rx-Single' - $ref: '#/components/schemas/EP_MAP_SMSC-Single' - - $ref: '#/components/schemas/EP_NLS-Single' + - $ref: '#/components/schemas/EP_NL1-Single' - $ref: '#/components/schemas/EP_NL2-Single' - $ref: '#/components/schemas/EP_NL3-Single' - $ref: '#/components/schemas/EP_NL5-Single' -- GitLab From e15c9a6ffc92cb1156b9c8fbac32d6f6a9aa6af3 Mon Sep 17 00:00:00 2001 From: ruiyue Date: Thu, 8 Aug 2024 14:04:34 +0000 Subject: [PATCH 140/587] Update file TS28541_NrNrm.yaml --- OpenAPI/TS28541_NrNrm.yaml | 20 ++++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) diff --git a/OpenAPI/TS28541_NrNrm.yaml b/OpenAPI/TS28541_NrNrm.yaml index 38cc9d650..a9fd69012 100755 --- a/OpenAPI/TS28541_NrNrm.yaml +++ b/OpenAPI/TS28541_NrNrm.yaml @@ -312,16 +312,22 @@ components: properties: rsrpOffsetSSB: type: integer + default: 0 rsrqOffsetSSB: type: integer + default: 0 sinrOffsetSSB: type: integer + default: 0 rsrpOffsetCSI-RS: type: integer + default: 0 rsrqOffsetCSI-RS: type: integer + default: 0 sinrOffsetCSI-RS: type: integer + default: 0 QOffsetRange: type: integer enum: @@ -373,6 +379,7 @@ components: $ref: '#/components/schemas/QOffsetRange' QOffsetFreq: type: number + default: 0 TReselectionNRSf: type: integer enum: @@ -464,7 +471,8 @@ components: type: string enum: - ENABLE - - DISABLE + - DISABLE + default: DISABLE rIMRSScrambleTimerMultiplier: type: integer rIMRSScrambleTimerOffset: @@ -525,12 +533,14 @@ components: type: string enum: - ENABLE - - DISABLE + - DISABLE + default: DISABLE enablenearfarIndicationRS2: type: string enum: - ENABLE - - DISABLE + - DISABLE + default: DISABLE RimRSReportInfo: type: object @@ -554,7 +564,8 @@ components: type: string enum: - ENABLE - - DISABLE + - DISABLE + default: DISABLE reportInterval: type: integer nrofRIMRSReportInfo: @@ -1467,6 +1478,7 @@ components: type: integer cellReselectionPriority: type: integer + default: 0 cellReselectionSubPriority: type: number minimum: 0.2 -- GitLab From 0e908f1f8ef41f4609e2107a5c15968dc07eb381 Mon Sep 17 00:00:00 2001 From: zhaoxxian Date: Wed, 7 Aug 2024 09:27:33 +0000 Subject: [PATCH 141/587] Update file TS28541_5GcNrm.yaml --- OpenAPI/TS28541_5GcNrm.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OpenAPI/TS28541_5GcNrm.yaml b/OpenAPI/TS28541_5GcNrm.yaml index bbe388bd3..367000323 100755 --- a/OpenAPI/TS28541_5GcNrm.yaml +++ b/OpenAPI/TS28541_5GcNrm.yaml @@ -2374,7 +2374,7 @@ components: blockedDur: $ref: '#/components/schemas/TimeDuration' blockedSlice: - type: string + $ref: 'TS28541_NrNrm.yaml#/components/schemas/Snssai' TimeDuration: description: location for which the PLMN access restrictions are to be applied in case of NTN type: object -- GitLab From 4f749eb91e1a9743c7ba40e333d4d76100331ebf Mon Sep 17 00:00:00 2001 From: Pengxiang Xie Date: Fri, 9 Aug 2024 09:55:16 +0000 Subject: [PATCH 142/587] Update TS28541_5GcNrm.yaml --- OpenAPI/TS28541_5GcNrm.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/OpenAPI/TS28541_5GcNrm.yaml b/OpenAPI/TS28541_5GcNrm.yaml index 367000323..e60e394a3 100755 --- a/OpenAPI/TS28541_5GcNrm.yaml +++ b/OpenAPI/TS28541_5GcNrm.yaml @@ -235,6 +235,8 @@ components: type: array items: $ref: 'TS28623_ComDefs.yaml#/components/schemas/Fqdn' + interPlmnFqdn: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/Fqdn' nfInstanceID: type: string readOnly: true @@ -3182,8 +3184,6 @@ components: $ref: '#/components/schemas/AmfIdentifier' sBIFqdn: type: string - interPlmnFQDN: - type: string weightFactor: $ref: '#/components/schemas/WeightFactor' cNSIIdList: -- GitLab From 2bc3e30f696e7529188167316924c5f5e562e96d Mon Sep 17 00:00:00 2001 From: rosabolzek Date: Thu, 8 Aug 2024 08:18:13 +0000 Subject: [PATCH 143/587] Update TS28623_GenericNrm.yaml Rel19_CR_TS_28.623_Correction_to_AreaScope_stage3_YAML --- OpenAPI/TS28623_GenericNrm.yaml | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/OpenAPI/TS28623_GenericNrm.yaml b/OpenAPI/TS28623_GenericNrm.yaml index bb5a2d861..bfc73a91c 100755 --- a/OpenAPI/TS28623_GenericNrm.yaml +++ b/OpenAPI/TS28623_GenericNrm.yaml @@ -142,23 +142,23 @@ components: timer: type: integer AreaScope: - oneOf: - - type: array - items: - $ref: '#/components/schemas/EutraCellId' - - type: array - items: - $ref: '#/components/schemas/NrCellId' - - type: array - items: - $ref: '#/components/schemas/Tac' - - type: array - items: - $ref: '#/components/schemas/Tai' + allOf: - type: array items: $ref: '#/components/schemas/NpnId-Type' - + -oneOf: + - type: array + items: + $ref: '#/components/schemas/EutraCellId' + - type: array + items: + $ref: '#/components/schemas/NrCellId' + - type: array + items: + $ref: '#/components/schemas/Tac' + - type: array + items: + $ref: '#/components/schemas/Tai' Tai: type: object properties: -- GitLab From 53b59f5f7aa2b04320ad98d25f112715d25e13c1 Mon Sep 17 00:00:00 2001 From: rosabolzek Date: Thu, 8 Aug 2024 08:30:26 +0000 Subject: [PATCH 144/587] Update TS28623_GenericNrm.yaml Rel19_CR_TS_28.623_Correction_to_AreaScope_stage3_YAML --- OpenAPI/TS28623_GenericNrm.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OpenAPI/TS28623_GenericNrm.yaml b/OpenAPI/TS28623_GenericNrm.yaml index bfc73a91c..8d660d78b 100755 --- a/OpenAPI/TS28623_GenericNrm.yaml +++ b/OpenAPI/TS28623_GenericNrm.yaml @@ -146,7 +146,7 @@ components: - type: array items: $ref: '#/components/schemas/NpnId-Type' - -oneOf: + - oneOf: - type: array items: $ref: '#/components/schemas/EutraCellId' -- GitLab From 4e27e37a402813ea1164418551fcfd1bef6394f5 Mon Sep 17 00:00:00 2001 From: allwang Date: Fri, 9 Aug 2024 20:55:52 +0000 Subject: [PATCH 145/587] Update TS28623_TraceControlNrm.yaml --- OpenAPI/TS28623_TraceControlNrm.yaml | 30 ++++++++++------------------ 1 file changed, 10 insertions(+), 20 deletions(-) diff --git a/OpenAPI/TS28623_TraceControlNrm.yaml b/OpenAPI/TS28623_TraceControlNrm.yaml index 34d0a1768..6d7f55405 100644 --- a/OpenAPI/TS28623_TraceControlNrm.yaml +++ b/OpenAPI/TS28623_TraceControlNrm.yaml @@ -419,16 +419,12 @@ components: $ref: 'TS28623_ComDefs.yaml#/components/schemas/Mcc' mnc: $ref: 'TS28623_ComDefs.yaml#/components/schemas/Mnc' - required: - - mcc - - mnc listOfTraceMetrics: description: The trace metrics to be reported. See 3GPP TS 32.422 clause 10 for additional details. type: array items: type: string - traceDepth-Type: description: Specifies how detailed information should be recorded in the Network Element. The Trace Depth is a paremeter for Trace Session level, i.e., the Trace Depth is the same for all of the NEs to be traced in the same Trace Session. See 3GPP TS 32.422 clause 5.3 for additional details. @@ -452,10 +448,6 @@ components: $ref: 'TS28623_ComDefs.yaml#/components/schemas/Mnc' traceId: type: string - required: - - mcc - - mnc - - traceId traceReportingFormat-Type: type: string @@ -485,13 +477,10 @@ components: - SUPI TargetIdValue: type: string - required: - - TargetIdType - - TargetIdValue triggeringEvents-Type: type: object - description: Specifies when to start a Trace Recording Session and which message shall be recorded first, when to stop a Trace Recording Session and which message shall be recorded last respectively. See 3GPP TS 32.422 clause 5.1 for additional detials. + description: Specifies when to start a Trace Recording Session and which message shall be recorded first, when to stop a Trace Recording Session and which message shall be recorded last respectively. See 3GPP TS 32.422 clause 5.1 for additional details. properties: MSC_SERVER: type: array @@ -750,7 +739,7 @@ components: - A2_EVENT eventThreshold-Type: - description: See details in 3GPP TS 32.422 clause 5.10.7, 5.10.7a, 5.10.13 and 5.10.14. + description: See details in 3GPP TS 32.422 clause 5.10.7 (LTE/NR Event A2 RSRP, RSRQ, SINR), 5.10.13 (UMTS Event 1f) and 5.10.14 (UMTS Event 1i). type: object properties: EventThresholdRSRP: @@ -769,6 +758,10 @@ components: - type: integer minimum: 0 maximum: 127 + EventThresholdSINR: + type: integer + minimum: 0 + maximum: 127 EventThreshold1F: type: object properties: @@ -897,7 +890,7 @@ components: - INFINITY eventThresholdL1-Type: - description: See details in 3GPP TS 32.422 clause 5.10.X. + description: See details in 3GPP TS 32.422 clause 5.10.36. type: object properties: RSRP: @@ -910,13 +903,13 @@ components: maximum: 127 hysteresisL1-Type: - description: See details in 3GPP TS 32.422 clause 5.10.Y. + description: See details in 3GPP TS 32.422 clause 5.10.37. type: integer minimum: 0 maximum: 30 timeToTriggerL1-Type: - description: See details in 3GPP TS 32.422 clause 5.10.Z. + description: See details in 3GPP TS 32.422 clause 5.10.38. type: string enum: - 0ms @@ -973,7 +966,7 @@ components: - PATHLOSS eventThresholdUphUmts-Type: - description: See details in 3GPP TS 32.422 clause 5.10.A. + description: See details in 3GPP TS 32.422 clause 5.10.39. type: integer minimum: 0 maximum: 31 @@ -988,9 +981,6 @@ components: $ref: 'TS28623_ComDefs.yaml#/components/schemas/Mcc' mnc: $ref: 'TS28623_ComDefs.yaml#/components/schemas/Mnc' - required: - - mcc - - mnc maxItems: 16 positioningMethod-Type: -- GitLab From 98ec2a2d99a74f83238e57c4dac96a12ac73feec Mon Sep 17 00:00:00 2001 From: allwang Date: Wed, 7 Aug 2024 12:16:14 +0000 Subject: [PATCH 146/587] Update TS28623_TraceControlNrm.yaml --- OpenAPI/TS28623_TraceControlNrm.yaml | 60 ++++++++++++++-------------- 1 file changed, 30 insertions(+), 30 deletions(-) diff --git a/OpenAPI/TS28623_TraceControlNrm.yaml b/OpenAPI/TS28623_TraceControlNrm.yaml index 34d0a1768..cfc3fa3bf 100644 --- a/OpenAPI/TS28623_TraceControlNrm.yaml +++ b/OpenAPI/TS28623_TraceControlNrm.yaml @@ -664,7 +664,7 @@ components: description: Determines whether beam level measurements shall be included in case of immediate MDT M1 measurement in NR. For additional details see 3GPP TS 32.422 clause 5.10.40. type: boolean - collectionPeriodRrmLte-Type: + collectionPeriodRRMLTE-Type: description: See details in 3GPP TS 32.422 clause 5.10.20. type: string enum: @@ -679,7 +679,7 @@ components: - 10240ms - 60000ms - collectionPeriodM6Lte-Type: + collectionPeriodM6LTE-Type: description: See details in 3GPP TS 32.422 clause 5.10.32. type: string enum: @@ -688,13 +688,13 @@ components: - 5120ms - 10240ms - collectionPeriodM7Lte-Type: + collectionPeriodM7LTE-Type: description: See details in 3GPP TS 32.422 clause 5.10.33. type: integer minimum: 1 maximum: 60 - collectionPeriodRrmUmts-Type: + collectionPeriodRRMUMTS-Type: description: See details in 3GPP TS 32.422 clause 5.10.21. type: string enum: @@ -707,7 +707,7 @@ components: - 4000ms - 6000ms - collectionPeriodRrmNr-Type: + collectionPeriodRRMNR-Type: description: See details in 3GPP TS 32.422 clause 5.10.30. type: string enum: @@ -717,7 +717,7 @@ components: - 10240ms - 60000ms - collectionPeriodM6Nr-Type: + collectionPeriodM6NR-Type: description: See details in 3GPP TS 32.422 clause 5.10.34. type: string enum: @@ -736,7 +736,7 @@ components: - 12min - 30min - collectionPeriodM7Nr-Type: + collectionPeriodM7NR-Type: description: See details in 3GPP TS 32.422 clause 5.10.35. type: integer minimum: 1 @@ -936,7 +936,7 @@ components: - 2560ms - 5120ms - measurementPeriodLte-Type: + measurementPeriodLTE-Type: description: See details in 3GPP TS 32.422 clause 5.10.23. type: string enum: @@ -946,7 +946,7 @@ components: - 10240ms - 1min - measurementPeriodUmts-Type: + measurementPeriodUMTS-Type: description: See details in 3GPP TS 32.422 clause 5.10.22. type: string enum: @@ -972,7 +972,7 @@ components: - CPICH_RSCP - PATHLOSS - eventThresholdUphUmts-Type: + eventThresholdUphUMTS-Type: description: See details in 3GPP TS 32.422 clause 5.10.A. type: integer minimum: 0 @@ -1324,26 +1324,26 @@ components: $ref: '#/components/schemas/reportInterval-Type' eventThreshold: $ref: '#/components/schemas/eventThreshold-Type' - collectionPeriodRrmLte: - $ref: '#/components/schemas/collectionPeriodRrmLte-Type' - collectionPeriodM6Lte: - $ref: '#/components/schemas/collectionPeriodM6Lte-Type' - collectionPeriodM7Lte: - $ref: '#/components/schemas/collectionPeriodM7Lte-Type' - collectionPeriodRrmUmts: - $ref: '#/components/schemas/collectionPeriodRrmUmts-Type' - collectionPeriodRrmNr: - $ref: '#/components/schemas/collectionPeriodRrmNr-Type' - collectionPeriodM6Nr: - $ref: '#/components/schemas/collectionPeriodM6Nr-Type' - collectionPeriodM7Nr: - $ref: '#/components/schemas/collectionPeriodM7Nr-Type' - eventThresholdUphUmts: - $ref: '#/components/schemas/eventThresholdUphUmts-Type' - measurementPeriodUmts: - $ref: '#/components/schemas/measurementPeriodUmts-Type' - measurementPeriodLte: - $ref: '#/components/schemas/measurementPeriodLte-Type' + collectionPeriodRRMLTE: + $ref: '#/components/schemas/collectionPeriodRRMLTE-Type' + collectionPeriodM6LTE: + $ref: '#/components/schemas/collectionPeriodM6LTE-Type' + collectionPeriodM7LTE: + $ref: '#/components/schemas/collectionPeriodM7LTE-Type' + collectionPeriodRRMUMTS: + $ref: '#/components/schemas/collectionPeriodRRMUMTS-Type' + collectionPeriodRRMNR: + $ref: '#/components/schemas/collectionPeriodRRMNR-Type' + collectionPeriodM6NR: + $ref: '#/components/schemas/collectionPeriodM6NR-Type' + collectionPeriodM7NR: + $ref: '#/components/schemas/collectionPeriodM7NR-Type' + eventThresholdUphUMTS: + $ref: '#/components/schemas/eventThresholdUphUMTS-Type' + measurementPeriodUMTS: + $ref: '#/components/schemas/measurementPeriodUMTS-Type' + measurementPeriodLTE: + $ref: '#/components/schemas/measurementPeriodLTE-Type' measurementQuantity: $ref: '#/components/schemas/measurementQuantity-Type' beamLevelMeasurement: -- GitLab From 833332061ace64d6a0a40be1182c96e0d214630d Mon Sep 17 00:00:00 2001 From: gautamd Date: Tue, 6 Aug 2024 08:41:09 +0000 Subject: [PATCH 147/587] Update TS28538_EdgeNrm.yaml --- OpenAPI/TS28538_EdgeNrm.yaml | 38 ++++++++++++++++++++++++++++++++++-- 1 file changed, 36 insertions(+), 2 deletions(-) diff --git a/OpenAPI/TS28538_EdgeNrm.yaml b/OpenAPI/TS28538_EdgeNrm.yaml index 0848b77d4..2d4d40ee5 100644 --- a/OpenAPI/TS28538_EdgeNrm.yaml +++ b/OpenAPI/TS28538_EdgeNrm.yaml @@ -158,7 +158,20 @@ components: $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' servedEESList: $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' - + BundleRequirements: + type: object + properties: + coordinatedEASDiscovery: + type: boolean + coordinatedACR: + type: boolean + eDNAffinity: + type: string + description: any of enumrated value + enum: + - STRONG + - WEAK + - PREFERRED #-------- Definition of types for name-containments ------ SubNetwork-ncO-EdgeNrm: @@ -168,6 +181,8 @@ components: $ref: '#/components/schemas/ECSFunction-Multiple' EdgeDataNetwork: $ref: '#/components/schemas/EdgeDataNetwork-Multiple' + EASBundle: + $ref: '#/components/schemas/EASBundle-Multiple' #-------- Definition of concrete IOCs -------------------------------------------- @@ -382,7 +397,21 @@ components: $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList' edgeDataNetworkRef: $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList' - + EASDundle-Single: + allOf: + - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' + - type: object + properties: + bundleIdentifier: + type: string + bundledEASIdentifier: + type: string + bundleType: + type: string + mainEASIdentifier: + type: string + bunbleRequirements: + $ref: '#/components/schemas/BundleRequirements' #-------- Definition of JSON arrays for name-contained IOCs ---------------------- @@ -418,6 +447,10 @@ components: type: array items: $ref: '#/components/schemas/OperatorEdgeDataNetwork-Single' + EASBundle-Multiple: + type: array + items: + $ref: '#/components/schemas/EASBundle-Single' #--------------------------------- Definition ------------------------------------ @@ -434,3 +467,4 @@ components: - $ref: '#/components/schemas/OperatorEdgeFederation-Single' - $ref: '#/components/schemas/OperatorEdgeDataNetwork-Single' - $ref: '#/components/schemas/EASResourceReservationJob-Single' + - $ref: '#/components/schemas/EASBundle-Single' -- GitLab From 8210867a1a5e208796c7f79e7e28ae07d3843d85 Mon Sep 17 00:00:00 2001 From: gautamd Date: Tue, 6 Aug 2024 08:55:47 +0000 Subject: [PATCH 148/587] Update TS28538_EdgeNrm.yaml --- OpenAPI/TS28538_EdgeNrm.yaml | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/OpenAPI/TS28538_EdgeNrm.yaml b/OpenAPI/TS28538_EdgeNrm.yaml index 2d4d40ee5..0efb48c0f 100644 --- a/OpenAPI/TS28538_EdgeNrm.yaml +++ b/OpenAPI/TS28538_EdgeNrm.yaml @@ -397,7 +397,7 @@ components: $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList' edgeDataNetworkRef: $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList' - EASDundle-Single: + EASBundle-Single: allOf: - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' - type: object @@ -410,7 +410,7 @@ components: type: string mainEASIdentifier: type: string - bunbleRequirements: + bundleRequirements: $ref: '#/components/schemas/BundleRequirements' #-------- Definition of JSON arrays for name-contained IOCs ---------------------- @@ -450,9 +450,7 @@ components: EASBundle-Multiple: type: array items: - $ref: '#/components/schemas/EASBundle-Single' - - + $ref: '#/components/schemas/EASBundle-Single' #--------------------------------- Definition ------------------------------------ resources-edgeNrm: -- GitLab From bc12d6782696e7852bba7eaba6c8a73ef76be6e7 Mon Sep 17 00:00:00 2001 From: gautamd Date: Thu, 8 Aug 2024 05:32:57 +0000 Subject: [PATCH 149/587] Update TS28538_EdgeNrm.yaml --- OpenAPI/TS28538_EdgeNrm.yaml | 30 ++++++++++++------------------ 1 file changed, 12 insertions(+), 18 deletions(-) diff --git a/OpenAPI/TS28538_EdgeNrm.yaml b/OpenAPI/TS28538_EdgeNrm.yaml index 0efb48c0f..eaec572d8 100644 --- a/OpenAPI/TS28538_EdgeNrm.yaml +++ b/OpenAPI/TS28538_EdgeNrm.yaml @@ -158,21 +158,6 @@ components: $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' servedEESList: $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' - BundleRequirements: - type: object - properties: - coordinatedEASDiscovery: - type: boolean - coordinatedACR: - type: boolean - eDNAffinity: - type: string - description: any of enumrated value - enum: - - STRONG - - WEAK - - PREFERRED - #-------- Definition of types for name-containments ------ SubNetwork-ncO-EdgeNrm: type: object @@ -410,8 +395,17 @@ components: type: string mainEASIdentifier: type: string - bundleRequirements: - $ref: '#/components/schemas/BundleRequirements' + coordinatedEASDiscovery: + type: boolean + coordinatedACR: + type: boolean + eDNAffinity: + type: string + description: any of enumrated value + enum: + - STRONG + - WEAK + - PREFERRED #-------- Definition of JSON arrays for name-contained IOCs ---------------------- @@ -457,7 +451,7 @@ components: oneOf: - $ref: '#/components/schemas/EASFunction-Single' - $ref: '#/components/schemas/ECSFunction-Single' - - $ref: '#/components/schemas/EESFunction-Single' + - $ref: '#/components/schemas/EESFunction-Single' - $ref: '#/components/schemas/EdgeDataNetwork-Single' - $ref: '#/components/schemas/EASRequirements-Single' - $ref: '#/components/schemas/EASProfile-Single' -- GitLab From b9af565a9bbc5325c4bd71e571f020f190617b48 Mon Sep 17 00:00:00 2001 From: allwang Date: Fri, 9 Aug 2024 18:01:22 +0000 Subject: [PATCH 150/587] Update TS28623_TraceControlNrm.yaml --- OpenAPI/TS28623_TraceControlNrm.yaml | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/OpenAPI/TS28623_TraceControlNrm.yaml b/OpenAPI/TS28623_TraceControlNrm.yaml index 8aaefea74..52716c90a 100644 --- a/OpenAPI/TS28623_TraceControlNrm.yaml +++ b/OpenAPI/TS28623_TraceControlNrm.yaml @@ -1227,7 +1227,7 @@ components: traceCollectionEntityId-Type: description: See details in 3GPP TS 32.422 clause 5.10.11. Only TCE Id value may be sent over the air to the UE being configured for Logged MDT. - type: integer + type: string excessPacketDelayThreshold-Type: description: Excess Packet Delay Threshold for NR MDT. See details in 3GPP TS 32.422 clause 4.1.1 and 4.1.2. @@ -1362,6 +1362,7 @@ components: type: array items: $ref: '#/components/schemas/MbsfnArea' + maxItems: 8 reportType: $ref: '#/components/schemas/reportType-Type' plmnList: @@ -1369,7 +1370,10 @@ components: eventListForEventTriggeredMeasurement: $ref: '#/components/schemas/eventListForEventTriggeredMeasurement-Type' areaConfigurationForNeighCell: - $ref: '#/components/schemas/AreaConfig' + type: array + items: + $ref: '#/components/schemas/AreaConfig' + maxItems: 32 nPNIdentityList: type: array items: -- GitLab From ae90e3effd34b57f8490cb0366c4d05cfb8d3254 Mon Sep 17 00:00:00 2001 From: allwang Date: Wed, 21 Aug 2024 06:50:13 +0000 Subject: [PATCH 151/587] Update TS28623_TraceControlNrm.yaml --- OpenAPI/TS28623_TraceControlNrm.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OpenAPI/TS28623_TraceControlNrm.yaml b/OpenAPI/TS28623_TraceControlNrm.yaml index 52716c90a..7bf654397 100644 --- a/OpenAPI/TS28623_TraceControlNrm.yaml +++ b/OpenAPI/TS28623_TraceControlNrm.yaml @@ -1227,7 +1227,7 @@ components: traceCollectionEntityId-Type: description: See details in 3GPP TS 32.422 clause 5.10.11. Only TCE Id value may be sent over the air to the UE being configured for Logged MDT. - type: string + type: integer excessPacketDelayThreshold-Type: description: Excess Packet Delay Threshold for NR MDT. See details in 3GPP TS 32.422 clause 4.1.1 and 4.1.2. -- GitLab From 7f3b79ce8518ea81b2bea505c29481194c6e9ae2 Mon Sep 17 00:00:00 2001 From: ayani Date: Fri, 26 Jul 2024 10:24:08 +0000 Subject: [PATCH 152/587] Update file TS28538_EdgeNrm.yaml --- OpenAPI/TS28538_EdgeNrm.yaml | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/OpenAPI/TS28538_EdgeNrm.yaml b/OpenAPI/TS28538_EdgeNrm.yaml index eaec572d8..d854dc396 100644 --- a/OpenAPI/TS28538_EdgeNrm.yaml +++ b/OpenAPI/TS28538_EdgeNrm.yaml @@ -88,6 +88,15 @@ components: type: string swImageRef: type: string + RegistrationInfo: + type: object + properties: + registrationExpiry: + type: string + registrationID: + type: string + secCredential: + type: string Duration: type: object properties: @@ -205,6 +214,8 @@ components: type: array items: type: string + registrationInfo: + $ref: '#/components/schemas/RegistrationInfo' eASRequirementsRef: $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' eASAddress: @@ -270,7 +281,9 @@ components: serviceContinuitySupport: type: boolean eASFunctionRef: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList' + registrationInfo: + $ref: '#/components/schemas/RegistrationInfo' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' ECSFunction-Single: -- GitLab From 09f2101e50e3f9bac163e73158c2e968e101a72f Mon Sep 17 00:00:00 2001 From: ayani Date: Wed, 7 Aug 2024 12:50:03 +0000 Subject: [PATCH 153/587] Update file TS28538_EdgeNrm.yaml --- OpenAPI/TS28538_EdgeNrm.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/OpenAPI/TS28538_EdgeNrm.yaml b/OpenAPI/TS28538_EdgeNrm.yaml index d854dc396..568e80f7d 100644 --- a/OpenAPI/TS28538_EdgeNrm.yaml +++ b/OpenAPI/TS28538_EdgeNrm.yaml @@ -93,10 +93,13 @@ components: properties: registrationExpiry: type: string + readOnly: true registrationID: type: string + readOnly: true secCredential: type: string + readOnly: true Duration: type: object properties: -- GitLab From f955ccabe8e81960a99ef03a91ba1cfff542eb92 Mon Sep 17 00:00:00 2001 From: rosabolzek Date: Thu, 22 Aug 2024 11:17:04 +0000 Subject: [PATCH 154/587] TS_28.538_Rel19_Correction_of_RegistrationInfo --- OpenAPI/TS28538_EdgeNrm.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/OpenAPI/TS28538_EdgeNrm.yaml b/OpenAPI/TS28538_EdgeNrm.yaml index 568e80f7d..5d3f6dc12 100644 --- a/OpenAPI/TS28538_EdgeNrm.yaml +++ b/OpenAPI/TS28538_EdgeNrm.yaml @@ -99,7 +99,6 @@ components: readOnly: true secCredential: type: string - readOnly: true Duration: type: object properties: -- GitLab From dcb15343e448c7cb71330cb6515c990b2d5ef53f Mon Sep 17 00:00:00 2001 From: ruiyue Date: Wed, 4 Sep 2024 03:13:50 +0000 Subject: [PATCH 155/587] Code Moderator udpate openAPI version --- OpenAPI/TS28538_EdgeNrm.yaml | 2 +- OpenAPI/TS28541_5GcNrm.yaml | 2 +- OpenAPI/TS28541_NrNrm.yaml | 2 +- OpenAPI/TS28541_SliceNrm.yaml | 2 +- OpenAPI/TS28623_ComDefs.yaml | 2 +- OpenAPI/TS28623_FileManagementNrm.yaml | 2 +- OpenAPI/TS28623_GenericNrm.yaml | 2 +- OpenAPI/TS28623_MnSRegistryNrm.yaml | 2 +- OpenAPI/TS28623_QoEMeasurementCollectionNrm.yaml | 2 +- OpenAPI/TS28623_SubscriptionControlNrm.yaml | 2 +- OpenAPI/TS28623_TraceControlNrm.yaml | 2 +- 11 files changed, 11 insertions(+), 11 deletions(-) diff --git a/OpenAPI/TS28538_EdgeNrm.yaml b/OpenAPI/TS28538_EdgeNrm.yaml index 5d3f6dc12..83f86744d 100644 --- a/OpenAPI/TS28538_EdgeNrm.yaml +++ b/OpenAPI/TS28538_EdgeNrm.yaml @@ -1,7 +1,7 @@ openapi: 3.0.1 info: title: 3GPP Edge NRM - version: 18.7.0 + version: 19.0.0 description: >- OAS 3.0.1 specification of the Edge NRM © 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). diff --git a/OpenAPI/TS28541_5GcNrm.yaml b/OpenAPI/TS28541_5GcNrm.yaml index e60e394a3..5fe4522ff 100755 --- a/OpenAPI/TS28541_5GcNrm.yaml +++ b/OpenAPI/TS28541_5GcNrm.yaml @@ -1,7 +1,7 @@ openapi: 3.0.1 info: title: 3GPP 5GC NRM - version: 19.0.0 + version: 19.1.0 description: >- OAS 3.0.1 specification of the 5GC NRM © 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). diff --git a/OpenAPI/TS28541_NrNrm.yaml b/OpenAPI/TS28541_NrNrm.yaml index a9fd69012..3aea8f9c8 100755 --- a/OpenAPI/TS28541_NrNrm.yaml +++ b/OpenAPI/TS28541_NrNrm.yaml @@ -1,7 +1,7 @@ openapi: 3.0.1 info: title: NR NRM - version: 19.0.0 + version: 19.1.0 description: >- OAS 3.0.1 specification of the NR NRM © 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). diff --git a/OpenAPI/TS28541_SliceNrm.yaml b/OpenAPI/TS28541_SliceNrm.yaml index 11f8a7c28..1dc47d0e4 100755 --- a/OpenAPI/TS28541_SliceNrm.yaml +++ b/OpenAPI/TS28541_SliceNrm.yaml @@ -1,7 +1,7 @@ openapi: 3.0.1 info: title: Slice NRM - version: 18.8.0 + version: 19.0.0 description: >- OAS 3.0.1 specification of the Slice NRM @ 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). diff --git a/OpenAPI/TS28623_ComDefs.yaml b/OpenAPI/TS28623_ComDefs.yaml index a4f2ba33f..ff303617c 100755 --- a/OpenAPI/TS28623_ComDefs.yaml +++ b/OpenAPI/TS28623_ComDefs.yaml @@ -1,7 +1,7 @@ openapi: 3.0.1 info: title: Common Type Definitions - version: 19.0.0 + version: 19.1.0 description: >- OAS 3.0.1 specification of common type definitions in the Generic NRM © 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). diff --git a/OpenAPI/TS28623_FileManagementNrm.yaml b/OpenAPI/TS28623_FileManagementNrm.yaml index e8710115c..305ba783a 100644 --- a/OpenAPI/TS28623_FileManagementNrm.yaml +++ b/OpenAPI/TS28623_FileManagementNrm.yaml @@ -1,7 +1,7 @@ openapi: 3.0.1 info: title: File Management NRM - version: 19.0.0 + version: 19.1.0 description: >- OAS 3.0.1 definition of the File Management NRM fragment © 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). diff --git a/OpenAPI/TS28623_GenericNrm.yaml b/OpenAPI/TS28623_GenericNrm.yaml index 8d660d78b..1346cf3a9 100755 --- a/OpenAPI/TS28623_GenericNrm.yaml +++ b/OpenAPI/TS28623_GenericNrm.yaml @@ -1,7 +1,7 @@ openapi: 3.0.1 info: title: Generic NRM - version: 19.0.0 + version: 19.1.0 description: >- OAS 3.0.1 definition of the Generic NRM © 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). diff --git a/OpenAPI/TS28623_MnSRegistryNrm.yaml b/OpenAPI/TS28623_MnSRegistryNrm.yaml index c72b9055f..153a45cc9 100644 --- a/OpenAPI/TS28623_MnSRegistryNrm.yaml +++ b/OpenAPI/TS28623_MnSRegistryNrm.yaml @@ -1,7 +1,7 @@ openapi: 3.0.1 info: title: MnS Registry NRM - version: 19.0.0 + version: 19.1.0 description: >- OAS 3.0.1 definition of the MnS Registry NRM fragment © 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). diff --git a/OpenAPI/TS28623_QoEMeasurementCollectionNrm.yaml b/OpenAPI/TS28623_QoEMeasurementCollectionNrm.yaml index 913858221..c7811203e 100644 --- a/OpenAPI/TS28623_QoEMeasurementCollectionNrm.yaml +++ b/OpenAPI/TS28623_QoEMeasurementCollectionNrm.yaml @@ -1,7 +1,7 @@ openapi: 3.0.1 info: title: QoE Measurement Collection NRM - version: 19.0.0 + version: 19.1.0 description: >- OAS 3.0.1 definition of the QoE Measurement Collection NRM © 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). diff --git a/OpenAPI/TS28623_SubscriptionControlNrm.yaml b/OpenAPI/TS28623_SubscriptionControlNrm.yaml index 8ab7afaea..f077c875d 100644 --- a/OpenAPI/TS28623_SubscriptionControlNrm.yaml +++ b/OpenAPI/TS28623_SubscriptionControlNrm.yaml @@ -1,7 +1,7 @@ openapi: 3.0.1 info: title: Subscription Control NRM - version: 19.0.0 + version: 19.1.0 description: >- OAS 3.0.1 definition of the Subscription Control NRM fragment © 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). diff --git a/OpenAPI/TS28623_TraceControlNrm.yaml b/OpenAPI/TS28623_TraceControlNrm.yaml index 7bf654397..f2d85e495 100644 --- a/OpenAPI/TS28623_TraceControlNrm.yaml +++ b/OpenAPI/TS28623_TraceControlNrm.yaml @@ -1,7 +1,7 @@ openapi: 3.0.1 info: title: Trace Control NRM - version: 19.0.0 + version: 19.1.0 description: >- OAS 3.0.1 definition of the Trace Control NRM fragment © 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). -- GitLab From c976ce01a6f0926395e53341198f4653b3a1ebc6 Mon Sep 17 00:00:00 2001 From: ruiyue Date: Wed, 4 Sep 2024 06:02:40 +0000 Subject: [PATCH 156/587] Update with latest R18 version --- OpenAPI/TS28312_IntentNrm.yaml | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/OpenAPI/TS28312_IntentNrm.yaml b/OpenAPI/TS28312_IntentNrm.yaml index dc5c4d4e4..3d018cb18 100644 --- a/OpenAPI/TS28312_IntentNrm.yaml +++ b/OpenAPI/TS28312_IntentNrm.yaml @@ -1,7 +1,7 @@ openapi: 3.0.1 info: title: Intent NRM - version: 18.4.0 + version: 18.5.0 description: >- OAS 3.0.1 definition of the Intent NRM © 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). @@ -64,10 +64,7 @@ components: maximum: 100 description: It expresses the priority of the stated intent within a MnS consumer. intentPreemptionCapability: - type: string - enum: - - TRUE - - FALSE + type: boolean observationPeriod: type: integer description: >- -- GitLab From 6e87c7fc7e2b3c4abaf82711cdaedb335c2dd9b5 Mon Sep 17 00:00:00 2001 From: ruiyue Date: Mon, 16 Sep 2024 11:49:17 +0000 Subject: [PATCH 157/587] Update with the latest R18 version --- OpenAPI/TS28104_MdaNrm.yaml | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/OpenAPI/TS28104_MdaNrm.yaml b/OpenAPI/TS28104_MdaNrm.yaml index c229cc7d8..4290465aa 100644 --- a/OpenAPI/TS28104_MdaNrm.yaml +++ b/OpenAPI/TS28104_MdaNrm.yaml @@ -1,7 +1,7 @@ openapi: 3.0.1 info: title: MDA NRM - version: 18.4.0 + version: 18.5.0 description: >- OAS 3.0.1 specification of the MDA NRM © 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). @@ -107,6 +107,7 @@ components: format: float minimum: 0 + #-------- Definition of types for name-containments ------ SubNetwork-ncO-MdaNrm: type: object @@ -138,15 +139,17 @@ components: properties: supportedMDACapabilities: $ref: '#/components/schemas/MDATypes' - mlModelRef: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' - aIMLInferenceFunctionRef: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' + mLModelRefList: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList' + aIMLInferenceFunctionRefList: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' - type: object properties: MDARequest: $ref: '#/components/schemas/MDARequest-Multiple' + MDAReport: + $ref: '#/components/schemas/MDAReport-Multiple' MDARequest-Single: allOf: -- GitLab From 6b39e25f51f1d4e29f360a233c725b8d43965999 Mon Sep 17 00:00:00 2001 From: ruiyue Date: Mon, 16 Sep 2024 11:51:55 +0000 Subject: [PATCH 158/587] Update with the latest R18 version --- OpenAPI/TS28105_AiMlNrm.yaml | 31 ++++++++++++++++++------------- 1 file changed, 18 insertions(+), 13 deletions(-) diff --git a/OpenAPI/TS28105_AiMlNrm.yaml b/OpenAPI/TS28105_AiMlNrm.yaml index 7566d90a2..4bdb73a0e 100644 --- a/OpenAPI/TS28105_AiMlNrm.yaml +++ b/OpenAPI/TS28105_AiMlNrm.yaml @@ -1,7 +1,7 @@ openapi: 3.0.1 info: title: AI/ML NRM - version: 18.4.0 + version: 18.5.0 description: >- OAS 3.0.1 specification of the AI/ML NRM © 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). @@ -348,9 +348,6 @@ components: attributes: allOf: - type: object - oneOf: - - required: [ requestStatus, mLModelToTestRef ] - - required: [ requestStatus, mLModelCoordinationGroupToTestRef ] properties: requestStatus: $ref: '#/components/schemas/RequestStatus' @@ -358,9 +355,9 @@ components: type: boolean suspendRequest: type: boolean - mLModelToTestRef: + mLModelRef: $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' - mLModelCoordinationGroupToTestRef: + mLModelCoordinationGroupRef: $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' MLTestingReport-Single: @@ -467,6 +464,10 @@ components: $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' sourceTrainedMLModelRef: $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' + aIMLInferenceReportRefList: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList' + usedByFunctionRefList: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList' MLModelRepository-Single: allOf: @@ -542,7 +543,7 @@ components: type: boolean mLUpdateProcessRef: $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' - mLModelRef: + mLModelRefList: $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList' MLUpdateProcess-Single: @@ -555,9 +556,13 @@ components: properties: progressStatus: $ref: '#/components/schemas/ProcessMonitor' - mLModelRef: + cancelProcess: + type: boolean + suspendProcess: + type: boolean + mLModelRefList: $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList' - mLUpdateRequestRef: + mLUpdateRequestRefList: $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList' mLUpdateReportRef: $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' @@ -572,7 +577,7 @@ components: properties: updatedMLCapability: $ref: '#/components/schemas/AvailMLCapabilityReport' - mLModelRef: + mLModelRefList: $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList' mLUpdateProcessRef: $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' @@ -596,7 +601,7 @@ components: $ref: '#/components/schemas/AIMLManagementPolicy' usedByFunctionRefList: $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList' - mLModelRef: + mLModelRefList: $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' - type: object @@ -626,7 +631,7 @@ components: items: $ref: '#/components/schemas/InferenceOutput' minItems: 1 - mLModelRef: + mLModelRefList: $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList' AIMLInferenceEmulationFunction-Single: @@ -639,7 +644,7 @@ components: - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-Attr' - type: object properties: - AIMLInferenceEmulationReport: + AIMLInferenceReport: $ref: '#/components/schemas/AIMLInferenceReport-Multiple' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' -- GitLab From b273caeb2582cbcc43ebe93b807b4392ec18e52b Mon Sep 17 00:00:00 2001 From: ruiyue Date: Mon, 16 Sep 2024 11:55:53 +0000 Subject: [PATCH 159/587] Update with the latest R18 version --- OpenAPI/TS28536_CoslaNrm.yaml | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/OpenAPI/TS28536_CoslaNrm.yaml b/OpenAPI/TS28536_CoslaNrm.yaml index a81e08261..54d2c5898 100755 --- a/OpenAPI/TS28536_CoslaNrm.yaml +++ b/OpenAPI/TS28536_CoslaNrm.yaml @@ -2,7 +2,7 @@ openapi: 3.0.1 info: title: coslaNrm - version: 18.1.0 + version: 18.2.0 description: >- OAS 3.0.1 specification of the Cosla NRM © 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). @@ -156,12 +156,14 @@ components: $ref: '#/components/schemas/ControlLoopLifeCyclePhase' aCCLDisallowedList: $ref: '#/components/schemas/ACCLDisallowedAttributes' + networkSliceRef: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' + networkSliceSubnetRef: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' + AssuranceReport: + $ref: '#/components/schemas/AssuranceReport-Single' AssuranceGoal: $ref: '#/components/schemas/AssuranceGoal-Multiple' - networkSliceRef: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' - networkSliceSubnetRef: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' AssuranceGoal-Single: allOf: -- GitLab From bc7e7446279fd6ffcb55f3950069fc16b203600d Mon Sep 17 00:00:00 2001 From: rosabolzek Date: Fri, 9 Aug 2024 05:00:57 +0000 Subject: [PATCH 160/587] Update _3gpp-5gc-nrm-nwdaffunction.yang Correct description of attribute networkSliceInfoList in NWDAFFunctionGrp --- yang-models/_3gpp-5gc-nrm-nwdaffunction.yang | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/yang-models/_3gpp-5gc-nrm-nwdaffunction.yang b/yang-models/_3gpp-5gc-nrm-nwdaffunction.yang index 5fe7eb7ae..b713afc3b 100755 --- a/yang-models/_3gpp-5gc-nrm-nwdaffunction.yang +++ b/yang-models/_3gpp-5gc-nrm-nwdaffunction.yang @@ -319,8 +319,8 @@ module _3gpp-5gc-nrm-nwdaffunction { key idx; min-elements 1; description "The attribute specifies a list of NetworkSliceInfo which - is defined as a datatype (see clause 5.3.95). It can be used by the - NWDAF to facilitate the data collection from OAM."; + is defined as a datatype (see clause 5.3.95). It is used by an authorized consumer, e.g. + NWDAF, to facilitate the data collection from OAM."; leaf idx { type string; } @@ -393,4 +393,4 @@ module _3gpp-5gc-nrm-nwdaffunction { uses mf3gpp:ManagedFunctionContainedClasses; } } -} \ No newline at end of file +} -- GitLab From 86e2fc9188d486bfa45bdf9b3dde41be9f9e3ffb Mon Sep 17 00:00:00 2001 From: rosabolzek Date: Fri, 9 Aug 2024 08:16:57 +0000 Subject: [PATCH 161/587] Update _3gpp-5gc-nrm-nwdaffunction.yang correct description of networkSliceInfoList for NWDAFFunctionGrp --- yang-models/_3gpp-5gc-nrm-nwdaffunction.yang | 1 + 1 file changed, 1 insertion(+) diff --git a/yang-models/_3gpp-5gc-nrm-nwdaffunction.yang b/yang-models/_3gpp-5gc-nrm-nwdaffunction.yang index b713afc3b..c417b91ad 100755 --- a/yang-models/_3gpp-5gc-nrm-nwdaffunction.yang +++ b/yang-models/_3gpp-5gc-nrm-nwdaffunction.yang @@ -21,6 +21,7 @@ module _3gpp-5gc-nrm-nwdaffunction { TTA, TTC). All rights reserved."; reference "3GPP TS 28.541"; + revision 2024-08-07 { reference CR-1329; } revision 2024-04-12 { reference CR-1218; } revision 2023-09-18 { reference CR-1043; } revision 2023-04-26 { reference CR-0916; } -- GitLab From 8e727dfe4a6406fc8f05e3f61074d9546d43e20e Mon Sep 17 00:00:00 2001 From: rosabolzek Date: Fri, 9 Aug 2024 08:56:20 +0000 Subject: [PATCH 162/587] Update _3gpp-5gc-nrm-nwdaffunction.yang correct line 323 size --- yang-models/_3gpp-5gc-nrm-nwdaffunction.yang | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/yang-models/_3gpp-5gc-nrm-nwdaffunction.yang b/yang-models/_3gpp-5gc-nrm-nwdaffunction.yang index c417b91ad..d5a6cdb4e 100755 --- a/yang-models/_3gpp-5gc-nrm-nwdaffunction.yang +++ b/yang-models/_3gpp-5gc-nrm-nwdaffunction.yang @@ -320,8 +320,9 @@ module _3gpp-5gc-nrm-nwdaffunction { key idx; min-elements 1; description "The attribute specifies a list of NetworkSliceInfo which - is defined as a datatype (see clause 5.3.95). It is used by an authorized consumer, e.g. - NWDAF, to facilitate the data collection from OAM."; + is defined as a datatype (see clause 5.3.95). It is used by an + authorized consumer, e.g. NWDAF, to facilitate the data collection + from OAM."; leaf idx { type string; } -- GitLab From 0cda52d54786db3c53ff00066bddc3853b3ab476 Mon Sep 17 00:00:00 2001 From: rosabolzek Date: Fri, 9 Aug 2024 16:41:25 +0000 Subject: [PATCH 163/587] Update _3gpp-5gc-nrm-nwdaffunction.yang --- yang-models/_3gpp-5gc-nrm-nwdaffunction.yang | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/yang-models/_3gpp-5gc-nrm-nwdaffunction.yang b/yang-models/_3gpp-5gc-nrm-nwdaffunction.yang index d5a6cdb4e..33033562c 100755 --- a/yang-models/_3gpp-5gc-nrm-nwdaffunction.yang +++ b/yang-models/_3gpp-5gc-nrm-nwdaffunction.yang @@ -280,7 +280,8 @@ module _3gpp-5gc-nrm-nwdaffunction { } grouping NWDAFFunctionGrp { - description "Represents the NWDAFFunction IOC"; + description "The NWDAFFunction IOC includes attributes inherited from + ManagedFunction IOC(defined in TS 28.622)and the following attributes:"; uses mf3gpp:ManagedFunctionGrp; list pLMNInfoList { @@ -323,7 +324,7 @@ module _3gpp-5gc-nrm-nwdaffunction { is defined as a datatype (see clause 5.3.95). It is used by an authorized consumer, e.g. NWDAF, to facilitate the data collection from OAM."; - leaf idx { + leaf idx { type string; } uses NetworkSliceInfoGrp; -- GitLab From 1253c988374916a9bd7d5c2c080a133ec041514e Mon Sep 17 00:00:00 2001 From: "U-ERICSSON\\ETHBLL" Date: Mon, 22 Jul 2024 15:31:39 +0200 Subject: [PATCH 164/587] Add MeContect IOC --- yang-models/_3gpp-common-mecontext.yang | 83 +++++++++++++++++++++++++ 1 file changed, 83 insertions(+) create mode 100644 yang-models/_3gpp-common-mecontext.yang diff --git a/yang-models/_3gpp-common-mecontext.yang b/yang-models/_3gpp-common-mecontext.yang new file mode 100644 index 000000000..37a5e6d44 --- /dev/null +++ b/yang-models/_3gpp-common-mecontext.yang @@ -0,0 +1,83 @@ +module _3gpp-common-mecontext { + yang-version 1.1; + namespace "urn:3gpp:sa5:_3gpp-common-mecontext"; + prefix "mectx3gpp"; + + import _3gpp-common-yang-types { prefix types3gpp; } + import _3gpp-common-top { prefix top3gpp; } + import _3gpp-common-subnetwork { prefix subnet3gpp; } + import ietf-yang-schema-mount { prefix yangmnt; } + + organization "3GPP SA5"; + contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464"; + + description "Defines basic MeContext which will be augmented by other IOCs + Copyright 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + TTA, TTC). All rights reserved."; + reference "3GPP TS 28.623 + Generic Network Resource Model (NRM) + Integration Reference Point (IRP); + Solution Set (SS) definitions + + 3GPP TS 28.622 + Generic Network Resource Model (NRM) + Integration Reference Point (IRP); + Information Service (IS)"; + + revision 2024-07-15 { reference CR-xxxx; } + + grouping MeContextGrp { + description "Represents the MeContext IOC."; + + leaf dnPrefix { + type types3gpp:DistinguishedName; + config false; + description "It carries the DN Prefix information or no information. + The instance of MeContext is the local root instance of the MIB. + Otherwise the attribute shall be absent or carry no information."; + reference "Annex C of 32.300 "; + } + } + + augment "/subnet3gpp:SubNetwork" { + list Mecontext { + description "This IOC is introduced for naming purposes. It may support + creation of unique DNs in scenarios when some MEs have the same RDNs due + to the fact that they have been manufacturer pre-configured. + + If some MEs have the same RDNs (for the above mentioned reason) and they + are contained in the same SubNetwork instance, some measure shall be + taken in order to assure the global uniqueness of DNs for all IOC + instances under those MEs. One way could be to set different dnPrefix + for those NEs, but that would require either that: + + a) all LDNs or DNs are locally modified using the new dnPrefix for the + upper portion of the DNs, or + b) a mapping (translation) of the old LDNs or DNs to the new DNs every + time they are used externally, e.g. in alarm notifications. + + As both the two alternatives above may involve unacceptable drawbacks + (as the old RDNs for the MEs then would have to be changed or mapped to + new values), using MeContext offers a new alternative to resolve the DN + creation. Using MeContext as part of the naming tree (and thus the DN) + means that the dnPrefix, including a unique MeContext for each ME, may + be directly concatenated with the LDNs, without any need to change or + map the existing ME RDNs to new values. + + MeContext have 0..N instances. It may exist even if no SubNetwork exists. + Every instance of MeContext contains exactly one ManagedElement during + steady-state operations."; + + key id; + uses top3gpp:Top_Grp; + container attributes { + uses MeContextGrp; + } + + yangmnt:mount-point children-of-MeContext { + description "Mountpoint for ManagedElement"; + reference "RFC8528 YANG Schema Mount"; + } + } + } +} \ No newline at end of file -- GitLab From 783696d2e2760f0e804919a2adb68e935dabdf65 Mon Sep 17 00:00:00 2001 From: "U-ERICSSON\\ETHBLL" Date: Wed, 7 Aug 2024 11:05:41 +0200 Subject: [PATCH 165/587] Added CR numbers; the file is common for r17,18,19 --- yang-models/_3gpp-common-mecontext.yang | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/yang-models/_3gpp-common-mecontext.yang b/yang-models/_3gpp-common-mecontext.yang index 37a5e6d44..ed183f1a7 100644 --- a/yang-models/_3gpp-common-mecontext.yang +++ b/yang-models/_3gpp-common-mecontext.yang @@ -24,14 +24,13 @@ module _3gpp-common-mecontext { Integration Reference Point (IRP); Information Service (IS)"; - revision 2024-07-15 { reference CR-xxxx; } + revision 2024-07-17 { reference "CR-0381 CR-0382 CR-0383"; } grouping MeContextGrp { description "Represents the MeContext IOC."; leaf dnPrefix { type types3gpp:DistinguishedName; - config false; description "It carries the DN Prefix information or no information. The instance of MeContext is the local root instance of the MIB. Otherwise the attribute shall be absent or carry no information."; -- GitLab From 3ba14deae74d39ef36f7fc98f70527900e1a3e68 Mon Sep 17 00:00:00 2001 From: "U-ERICSSON\\ETHBLL" Date: Wed, 21 Aug 2024 14:57:34 +0200 Subject: [PATCH 166/587] Updates to follow stage2 --- yang-models/_3gpp-common-trace.yang | 81 ++++++++++++------- yang-models/_3gpp-common-util.yang | 3 +- yang-models/_3gpp-common-yang-types.yang | 25 +++++- .../_3gpp-nr-nrm-danrmanagementfunction.yang | 36 +++++---- 4 files changed, 95 insertions(+), 50 deletions(-) diff --git a/yang-models/_3gpp-common-trace.yang b/yang-models/_3gpp-common-trace.yang index 0953de0b6..c15b69798 100755 --- a/yang-models/_3gpp-common-trace.yang +++ b/yang-models/_3gpp-common-trace.yang @@ -25,6 +25,7 @@ module _3gpp-common-trace { Integration Reference Point (IRP); Information Service (IS)" ; + revision 2024-08-13 { reference CR-0387; } revision 2024-05-12 { reference "CR-0401"; } revision 2024-05-06 { reference CR-0359; } revision 2024-04-06 { reference "CR-0342"; } @@ -690,15 +691,15 @@ module _3gpp-common-trace { -reportingTrigger: conditional for M1 in LTE or NR and M1/M2 in UMTS, -eventThreshold: conditional for A2 event reporting or A2 event triggered periodic reporting, - -collectionPeriodRrmNR: conditional for M4 and M5 in NR, + -collectionPeriodRRMNR: conditional for M4 and M5 in NR, -collectionPeriodM6NR: conditional for M6 in NR, -collectionPeriodM7NR: conditional for M7 in NR, - -collectionPeriodRrmLte (conditional for M3 in LTE), + -collectionPeriodRRMLTE (conditional for M3 in LTE), -measurementPeriodLTE (conditional for M4 and M5 in LTE), - -collectionPeriodM6Lte (conditional for M6 in LTE), - -collectionPeriodM7Lte (conditional for M7 in LTE), - -collectionPeriodRrmUmts (conditional for M4 and M5 in UMTS), - -measurementPeriodUmts (conditional for M6 and M7 in UMTS), + -collectionPeriodM6LTE (conditional for M6 in LTE), + -collectionPeriodM7LTE (conditional for M7 in LTE), + -collectionPeriodRRMUMTS (conditional for M4 and M5 in UMTS), + -measurementPeriodUMTS (conditional for M6 and M7 in UMTS), -measurementQuantity (conditional for 1F event reporting), -beamLevelMeasurement (conditional for M1 in NR), -excessPacketDelayThresholds (conditional for M6 UL measurement in NR). @@ -736,8 +737,8 @@ module _3gpp-common-trace { configuration, see TS 38.321, TS 36.321 and TS 38.331, TS 36.331. For measurement M4 in UMTS, reporting is either according to RRM configuration, see TS 25.321 and TS 25.331 or periodic or event - triggered periodic using parameter collectionPeriodRrmUmts and - eventThresholdUphUmts. + triggered periodic using parameter collectionPeriodRRMUMTS and + eventThresholdUphUMTS. - For measurement M3 in UMTS, the reporting is done upon availability, see TS 37.320. @@ -745,10 +746,10 @@ module _3gpp-common-trace { - For measurements M4, M5, M6 and M7 in NR, for measurements M3, M4, M5, M6 and M7 in LTE and for measurements M5, M6 and M7 in UMTS periodical reporting is applied. The configurable parameter - is the interval between two measurements (collectionPeriodRrmNr, - collectionPeriodM6NR, collectionPeriodM7Nr, collectionPeriodRrmLte, - measurementPeriodLte, collectionPeriodM6Lte, collectionPeriodM7Lte, - collectionPeriodRrmUmts, measurementPeriodUmts). If no collection + is the interval between two measurements (collectionPeriodRRMNR, + collectionPeriodM6NR, collectionPeriodM7NR, collectionPeriodRRMLTE, + measurementPeriodLte, collectionPeriodM6LTE, collectionPeriodM7LTE, + collectionPeriodRRMUMTS, measurementPeriodUMTS). If no collection period is configured for M5 in UMTS, all available measurements are logged according to RRM configuration."; @@ -844,7 +845,7 @@ module _3gpp-common-trace { reference "Clauses 5.10.7 and 5.10.7a of 3GPP TS 32.422"; } - leaf collectionPeriodRrmNr { + leaf collectionPeriodRRMNR { when '../../../jobType = "IMMEDIATE_MDT_ONLY"' + ' or ../../../jobType = "IMMEDIATE_MDT_AND_TRACE"'; type uint32 { @@ -858,7 +859,7 @@ module _3gpp-common-trace { reference "Clause 5.10.30 of 3GPP TS 32.422"; } - leaf collectionPeriodM6Nr { + leaf collectionPeriodM6NR { when '../../../jobType = "IMMEDIATE_MDT_ONLY"' + ' or ../../../jobType = "IMMEDIATE_MDT_AND_TRACE"'; type enumeration { @@ -884,7 +885,7 @@ module _3gpp-common-trace { reference "clause 5.10.34 of TS 32.422"; } - leaf collectionPeriodM7Nr { + leaf collectionPeriodM7NR { when '../../../jobType = "IMMEDIATE_MDT_ONLY"' + ' or ../../../jobType = "IMMEDIATE_MDT_AND_TRACE"'; type uint32 { @@ -897,7 +898,7 @@ module _3gpp-common-trace { reference "clause 5.10.35 of TS 32.422"; } - leaf collectionPeriodRrmLte { + leaf collectionPeriodRRMLTE { when '../../../jobType = "IMMEDIATE_MDT_ONLY"' + ' or ../../../jobType = "IMMEDIATE_MDT_AND_TRACE"'; type uint32 { @@ -928,7 +929,7 @@ module _3gpp-common-trace { reference "Clause 5.10.23 of 3GPP TS 32.422"; } - leaf collectionPeriodM6Lte { + leaf collectionPeriodM6LTE { when '../../../jobType = "IMMEDIATE_MDT_ONLY"' + ' or ../../../jobType = "IMMEDIATE_MDT_AND_TRACE"'; type uint32 { @@ -942,7 +943,7 @@ module _3gpp-common-trace { reference "Clause 5.10.32 of TS 32.422 "; } - leaf collectionPeriodM7Lte { + leaf collectionPeriodM7LTE { when '../../../jobType = "IMMEDIATE_MDT_ONLY"' + ' or ../../../jobType = "IMMEDIATE_MDT_AND_TRACE"'; type uint16 { @@ -955,7 +956,7 @@ module _3gpp-common-trace { reference "Clause 5.10.33 of TS 32.422 ."; } - leaf eventThresholdUphUmts { + leaf eventThresholdUphUMTS { when '../../../jobType = "IMMEDIATE_MDT_ONLY"' + ' or ../../../jobType = "IMMEDIATE_MDT_AND_TRACE"'; type uint16 { @@ -968,7 +969,7 @@ module _3gpp-common-trace { reference "5.10.39 of TS 32.422"; } - leaf collectionPeriodRrmUmts { + leaf collectionPeriodRRMUMTS { when '../../../jobType = "IMMEDIATE_MDT_ONLY"' + ' or ../../../jobType = "IMMEDIATE_MDT_AND_TRACE"'; type uint32 { @@ -983,7 +984,7 @@ module _3gpp-common-trace { reference "Clause 5.10.21 of 3GPP TS 32.422"; } - leaf measurementPeriodUmts { + leaf measurementPeriodUMTS { when '../../../jobType = "IMMEDIATE_MDT_ONLY"' + 'or ../../../jobType = "IMMEDIATE_MDT_AND_TRACE"'; type uint32 { @@ -1521,18 +1522,36 @@ module _3gpp-common-trace { } } - grouping UEMeasConfigGrp { - description "Represents the UEMeasConfig dataType. + grouping UECoreMeasConfigGrp { + description "Represents the ueCoreMeasConfig dataType. This <> defines the aconfiguration parameters of IOC TraceJob which are specific for UE level measurements collection."; - leaf-list ueMeasurements { + leaf-list ueCoreMeasurements { type string; - description "It specifies the List of UE level measurements."; - } + min-elements 1; + description "List of 5GC UE level measurements identified by name. - leaf ueMeasGranularityPeriod { + The list may include 5GC UE level measurements defined in TS 28.558, + or vendor specific measurements. + + For 5GC UE level measurements defined in TS 28.558, the name is + constructed as follows: + - 'family.measurementName.subcounter' for measurement type with + specified subcounter + - 'family.measurementName.ALL' for measurement type with all supported + subcounters + - 'family.measurementName' for measurement type without subcounters + - 'family' for measurement family, including all measurement types and + the associated subcounters under this family. + For non-3GPP specified 5GC UE level measurements the name is defined + elsewhere."; + } + + leaf ueCoreMeasGranularityPeriod { type uint32; + mandatory true; + units milliseconds; description "It specifies the Granularity period used to produce UE level measurements. The period is defined in milliseconds (ms)."; } @@ -1753,7 +1772,7 @@ module _3gpp-common-trace { leaf idx { type string; } } - list ueMeasConfig { + list ueCoreMeasConfig { when '../jobType = "5GC_UE_LEVEL_MEASUREMENTS_ONLY"' + ' or ../jobType = "TRACE_AND_5GC_UE_LEVEL_MEASUREMENTS"' + ' or ../jobType = "IMMEDIATE_MDT_AND_5GC_UE_LEVEL_MEASUREMENTS"' @@ -1762,7 +1781,7 @@ module _3gpp-common-trace { key idx; description "5GC UE level measurements config"; max-elements 1; - uses UEMeasConfigGrp; + uses UECoreMeasConfigGrp; leaf idx { type string; } } @@ -1840,10 +1859,10 @@ module _3gpp-common-trace { only, RCEF reports only and Logged MBSFN MDT, the configuration parameters of attribute mdtConfig or a subset of these shall be applied. In case of UE measurements only, the configuration parameters - of attribute ueMeasConfig shall be applied. In case of any combination + of attribute ueCoreMeasConfig shall be applied. In case of any combination of Trace, Immediate MDT, Trace and UE measurements, the configuration parameters of the corresponding attributes traceConfig, mdtConfig and - ueMeasConfig are applicable. + ueCoreMeasConfig are applicable. Creation and deletion of TraceJob instances by MnS consumers is optional; when not supported, the TraceJob instances may be created diff --git a/yang-models/_3gpp-common-util.yang b/yang-models/_3gpp-common-util.yang index 6e58aa14f..078e9a439 100644 --- a/yang-models/_3gpp-common-util.yang +++ b/yang-models/_3gpp-common-util.yang @@ -16,6 +16,7 @@ module _3gpp-common-util { TTA, TTC). All rights reserved."; reference "3GPP TS 28.623"; + revision 2024-08-13 { reference CR-0387; } revision 2024-05-06 { reference CR-0359; } feature SchedulerUnderManagedElement { @@ -88,7 +89,7 @@ module _3gpp-common-util { must 'not(../daysOfWeek)'; description "Shall be present in case of Monthly periodicity, otherwise not"; - type types3gpp:DaysOfMonth; + type types3gpp:DateMonthDay; } } } diff --git a/yang-models/_3gpp-common-yang-types.yang b/yang-models/_3gpp-common-yang-types.yang index 3c8b9c7a4..25d9a5b5b 100755 --- a/yang-models/_3gpp-common-yang-types.yang +++ b/yang-models/_3gpp-common-yang-types.yang @@ -16,6 +16,7 @@ module _3gpp-common-yang-types { TTA, TTC). All rights reserved."; reference "3GPP TS 28.623"; + revision 2024-08-13 { reference CR-0387; } revision 2024-05-18 { reference CR-0359; } revision 2024-04-12 { reference CR-0346; } revision 2023-11-06 { reference CR-0305; } @@ -94,7 +95,13 @@ module _3gpp-common-yang-types { } } - typedef DaysOfMonth { + typedef DateMonth { + type uint8 { + range 0..12; + } + } + + typedef DateMonthDay { type uint8 { range 0..31; } @@ -103,6 +110,22 @@ module _3gpp-common-yang-types { typedef FullTime { type yang:time-with-zone-offset; } + + grouping DayInYearGrp { + description "This <> represents a day in a year."; + + leaf month { + description "It indicates the month in a year."; + type DateMonth; + mandatory true; + } + + leaf monthDay { + description "It indicates the day in a month."; + type DateMonthDay; + mandatory true; + } + } grouping TimeWindowGrp { leaf startTime { diff --git a/yang-models/_3gpp-nr-nrm-danrmanagementfunction.yang b/yang-models/_3gpp-nr-nrm-danrmanagementfunction.yang index d0afa896a..3260d3646 100755 --- a/yang-models/_3gpp-nr-nrm-danrmanagementfunction.yang +++ b/yang-models/_3gpp-nr-nrm-danrmanagementfunction.yang @@ -3,45 +3,47 @@ module _3gpp-nr-nrm-danrmanagementfunction { namespace "urn:3gpp:sa5:_3gpp-nr-nrm-danrmanagementfunction"; prefix "danrmanagementfunction3gpp"; - import _3gpp-common-top { prefix top3gpp; } import _3gpp-nr-nrm-gnbcucpfunction { prefix gnbcucp3gpp; } import _3gpp-common-managed-element { prefix me3gpp; } - - organization "3GPP SA5"; contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464"; - description "Defines the YANG mapping of the DANRManagementFunction Information Object Class - (IOC) that is part of the NR Network Resource Model (NRM). - Copyright 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + description "Defines the YANG mapping of the DANRManagementFunction IOC + that is part of the NR Network Resource Model (NRM). + Copyright 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved."; reference "3GPP TS 28.541 5G Network Resource Model (NRM)"; + revision 2024-08-19 { reference CR-1314 ; } revision 2023-09-18 { reference CR-1043 ; } revision 2020-05-08 { reference S5-203316; } - grouping DANRManagementFunctionGrp { description "Represents the DANRManagementFunction IOC."; - reference "3GPP TS 28.541"; - uses top3gpp:Top_Grp; leaf intrasystemANRManagementSwitch { - description "This attribute determines whether the intra-system ANR function is activated or deactivated."; - type boolean; + description "This attribute determines whether the intra-system ANR + function is activated or deactivated."; + type boolean; } leaf intersystemANRManagementSwitch { - description "This attribute determines whether the inter-system ANR function is activated or deactivated."; - type boolean; + description "This attribute determines whether the inter-system ANR + function is activated or deactivated."; + type boolean; } - - } augment "/me3gpp:ManagedElement/gnbcucp3gpp:GNBCUCPFunction" { - if-feature gnbcucp3gpp:DANRManagementFunction; - uses DANRManagementFunctionGrp; + list DANRManagementFunction { + description "This IOC contains attributes to support the D-SON function + of ANR Management (See clause 6.4.1.3 in TS 28.313 ."; + key id; + uses top3gpp:Top_Grp; + container attributes { + uses DANRManagementFunctionGrp; + } + } } } \ No newline at end of file -- GitLab From 55d3017a55a7aeddc668b9b3583e31a7e6bca142 Mon Sep 17 00:00:00 2001 From: "U-ERICSSON\\ETHBLL" Date: Wed, 21 Aug 2024 16:15:48 +0200 Subject: [PATCH 167/587] yang stage2-3 ubdated B --- yang-models/_3gpp-common-trace.yang | 8 ++++---- yang-models/_3gpp-nr-nrm-bwpset.yang | 5 +++-- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/yang-models/_3gpp-common-trace.yang b/yang-models/_3gpp-common-trace.yang index c15b69798..d8426ac39 100755 --- a/yang-models/_3gpp-common-trace.yang +++ b/yang-models/_3gpp-common-trace.yang @@ -1537,12 +1537,12 @@ module _3gpp-common-trace { For 5GC UE level measurements defined in TS 28.558, the name is constructed as follows: - - 'family.measurementName.subcounter' for measurement type with + - 'family.measurementName.subcounter' for measurement type with specified subcounter - - 'family.measurementName.ALL' for measurement type with all supported + - 'family.measurementName.ALL' for measurement type with all supported subcounters - - 'family.measurementName' for measurement type without subcounters - - 'family' for measurement family, including all measurement types and + - 'family.measurementName' for measurement type without subcounters + - 'family' for measurement family, including all measurement types and the associated subcounters under this family. For non-3GPP specified 5GC UE level measurements the name is defined elsewhere."; diff --git a/yang-models/_3gpp-nr-nrm-bwpset.yang b/yang-models/_3gpp-nr-nrm-bwpset.yang index 8b92fa083..cba0ca407 100644 --- a/yang-models/_3gpp-nr-nrm-bwpset.yang +++ b/yang-models/_3gpp-nr-nrm-bwpset.yang @@ -12,10 +12,11 @@ module _3gpp-nr-nrm-bwpset { contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464"; description "Defines the YANG mapping of the BWPSet Information Object Class (IOC) that is part of the NR Network Resource Model (NRM). - Copyright 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + Copyright 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved."; reference "3GPP TS 28.541 5G Network Resource Model (NRM)"; + revision 2024-08-19 { reference CR-1314 ; } revision 2023-09-18 { reference CR-1043 ; } revision 2022-06-29 { reference CR-0756 ; } @@ -26,7 +27,7 @@ module _3gpp-nr-nrm-bwpset { } augment "/me3gpp:ManagedElement/gnbdu3gpp:GNBDUFunction" { - list BWPList { + list BWPLSett { description "Represents a bandwidth part (BWP) set."; key id; uses top3gpp:Top_Grp; -- GitLab From 75fd3032e18344c33acf902ea07557995ac7064c Mon Sep 17 00:00:00 2001 From: "U-ERICSSON\\ETHBLL" Date: Wed, 21 Aug 2024 17:08:33 +0200 Subject: [PATCH 168/587] renamed EP_NLG into EP_NL2 following stage 2 --- yang-models/_3gpp-5gc-nrm-ep.yang | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/yang-models/_3gpp-5gc-nrm-ep.yang b/yang-models/_3gpp-5gc-nrm-ep.yang index 803d3b134..73854e5d4 100755 --- a/yang-models/_3gpp-5gc-nrm-ep.yang +++ b/yang-models/_3gpp-5gc-nrm-ep.yang @@ -28,10 +28,11 @@ module _3gpp-5gc-nrm-ep { description "Defines the YANG mapping of the 5GC related endpoint Information Object Classes (IOCs) that are part of the 5G Core Network Resource Model. - Copyright 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + Copyright 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved."; reference "3GPP TS 28.541"; + revision 2024-08-19 { reference CR-1314 ; } revision 2023-09-18 { reference CR-1043 ; } revision 2019-11-18 { description "Ericsson refactoring."; @@ -179,7 +180,7 @@ module _3gpp-5gc-nrm-ep { uses eprp3gpp:EP_Common; } - grouping EP_NLGGrp { + grouping EP_NL2Grp { uses eprp3gpp:EP_Common; } @@ -312,12 +313,12 @@ module _3gpp-5gc-nrm-ep { } } - list EP_NLG { - description "Represents the EP_NLG IOC."; + list EP_NL2 { + description "Represents the EP_NL2 IOC."; key id; uses top3gpp:Top_Grp; container attributes { - uses EP_NLGGrp; + uses EP_NL2Grp; } } } -- GitLab From 742c34e40ac5d90188b5fa7dd03d1f197811c00b Mon Sep 17 00:00:00 2001 From: "U-ERICSSON\\ETHBLL" Date: Mon, 16 Sep 2024 16:29:53 +0200 Subject: [PATCH 169/587] Local rebase and commit of MR1296 28.623_Rel19_Update_ConditionMonitor_for_YANG into Integration_Rel19_SA5_156_YANG_CR0393 --- yang-models/_3gpp-common-util.yang | 25 ++++++++++++++++++------- 1 file changed, 18 insertions(+), 7 deletions(-) diff --git a/yang-models/_3gpp-common-util.yang b/yang-models/_3gpp-common-util.yang index 078e9a439..040b1f501 100644 --- a/yang-models/_3gpp-common-util.yang +++ b/yang-models/_3gpp-common-util.yang @@ -3,6 +3,7 @@ module _3gpp-common-util { namespace urn:3gpp:sa5:_3gpp-common-util; prefix "util3gpp"; + import ietf-yang-types { prefix yang ; } import _3gpp-common-top { prefix top3gpp; } import _3gpp-common-yang-types { prefix types3gpp ; } import _3gpp-common-managed-element { prefix me3gpp ; } @@ -16,7 +17,8 @@ module _3gpp-common-util { TTA, TTC). All rights reserved."; reference "3GPP TS 28.623"; - revision 2024-08-13 { reference CR-0387; } + revision 2024-08-13 { reference CR-0387; } + revision 2024-07-30 { reference "CR-0392 CR-0393"; } revision 2024-05-06 { reference CR-0359; } feature SchedulerUnderManagedElement { @@ -158,14 +160,22 @@ module _3gpp-common-util { description "Represents the Scheduler IOC."; leaf condition { - type string { + type yang:xpath1.0 { length 1..max; } mandatory true; - description "Logical expression of one or several condition(s). - - A restricted XPath may be used. The definition of the exact syntax - is not ready yet. + description "A logical condition containing an XPath expression. + The leaf contains an XPath 1.0 string with the following restrictions + - The accessible tree is the full Network Resource Model + - The root node is the list representing the top level MOI + (E.g. ManagedElement) + - In the accessible tree, all leafs and leaf-lists with default values + in use exist + - The data tree has no concept of document order except when 'ordered-by + user' is declared. + - The set of variable bindings is empty. + - The function library is the core function library defined in XPATH + - Namespaces should be ignored when evaluating the expression An empty string is not allowed."; } @@ -174,7 +184,8 @@ module _3gpp-common-util { type boolean; mandatory true; config false; - description "Switches between TRUE and FALSE depending upon whether the + description "The boolean result of the condition. + Switches between TRUE and FALSE depending upon whether the configured constraints are fulfilled or not."; } } -- GitLab From 0a61ee9bd4200fb8b35b18e27193c5b9f4633ae0 Mon Sep 17 00:00:00 2001 From: "U-ERICSSON\\ETHBLL" Date: Mon, 16 Sep 2024 16:48:45 +0200 Subject: [PATCH 170/587] Local rebase and commit of MR1324 28.623 Rel-19 CR0405 Trace new RRC reports CR0405 --- yang-models/_3gpp-common-trace.yang | 23 ++++++++++++++++++++--- 1 file changed, 20 insertions(+), 3 deletions(-) diff --git a/yang-models/_3gpp-common-trace.yang b/yang-models/_3gpp-common-trace.yang index d8426ac39..3fb24618c 100755 --- a/yang-models/_3gpp-common-trace.yang +++ b/yang-models/_3gpp-common-trace.yang @@ -26,6 +26,7 @@ module _3gpp-common-trace { Information Service (IS)" ; revision 2024-08-13 { reference CR-0387; } + revision 2024-08-07 { reference "CR-0405"; } revision 2024-05-12 { reference "CR-0401"; } revision 2024-05-06 { reference CR-0359; } revision 2024-04-06 { reference "CR-0342"; } @@ -1593,18 +1594,34 @@ module _3gpp-common-trace { enum TRACE_AND_5GC_UE_LEVEL_MEASUREMENTS; enum IMMEDIATE_MDT_AND_5GC_UE_LEVEL_MEASUREMENTS; enum TRACE_AND_IMMEDIATE_MDT_AND_5GC_UE_LEVEL_MEASUREMENTS; + enum RRC_REPORT; } default TRACE_ONLY; description "Specifies the MDT mode and it specifies also whether the TraceJob represents only MDT, Logged MBSFN MDT, Trace, or 5GC UE level measurement collection, or any combination - of Trace, immediate MDT and 5GC UE level measurement collection. - The attribute is applicable for Trace, MDT, RCEF and + of Trace, immediate MDT and 5GC UE level measurement collection or RRC + reporting. + The attribute is applicable for Trace, MDT, RCEF, RRC and RLF reporting, and 5GC UE level measurement collection."; reference "Clause 5.9a of 3GPP TS 32.422 for additional details on the allowed values."; } - + leaf-list rrcReportType { + type enumeration { + enum RLF_REPORT; + enum RCEF_REPORT; + enum SHR; + enum SPR; + enum MHI; + enum RA_REPORT; + enum UHI_REPORT; + } + description "Specifies the RRC reports requested. "; + reference "Clause 5.X of 3GPP TS 32.422 for additional details on the + allowed values."; + } + list pLMNTarget { key "mcc mnc"; description "Specifies which PLMN that the subscriber of the session to -- GitLab From ae0c54cf0b8130ab65027780de728e32b6b8687b Mon Sep 17 00:00:00 2001 From: "U-ERICSSON\\ETHBLL" Date: Mon, 16 Sep 2024 17:02:58 +0200 Subject: [PATCH 171/587] Local rebase and commit of MR1281 Rel19_CR0421_TS_28.623_Correction_to_AreaScope_stage3_YANG --- yang-models/_3gpp-common-trace.yang | 23 ++++++----------------- 1 file changed, 6 insertions(+), 17 deletions(-) diff --git a/yang-models/_3gpp-common-trace.yang b/yang-models/_3gpp-common-trace.yang index 3fb24618c..8b418365e 100755 --- a/yang-models/_3gpp-common-trace.yang +++ b/yang-models/_3gpp-common-trace.yang @@ -26,7 +26,7 @@ module _3gpp-common-trace { Information Service (IS)" ; revision 2024-08-13 { reference CR-0387; } - revision 2024-08-07 { reference "CR-0405"; } + revision 2024-08-07 { reference "CR-0405 CR-0421"; } revision 2024-05-12 { reference "CR-0401"; } revision 2024-05-06 { reference CR-0359; } revision 2024-04-06 { reference "CR-0342"; } @@ -107,20 +107,9 @@ module _3gpp-common-trace { grouping AreaScopeGrp { description "Represents the AreaScope dataType. - This <> defines the area scope of MDT. - The Area Scope parameter in LTE and NR is either: - - list of Cells, identified by E-UTRAN-CGI or NG-RAN CGI. - Maximum 32 CGI can be defined. - - list of Tracking Area, identified by TAC. - Maximum of 8 TAC can be defined. - - list of Tracking Area Identity, identified by TAC with - associated plmn-Identity perTAC-List containing the - PLMN identity for each TAC. Maximum of 8 TAI can be defined. - The Area Scope parameter in NR can also contain: - - list of NPN-IDs in NR. It is either a list of PNI-NPNs - identified by CAG ID with associated plmn-Identity or a - list of SNPNs identified by Network ID with associated - plmn-Identity ."; + This <> defines the area scope of MDT and QoE. + The Area Scope for MDT is specified in clause 5.10.2 of TS 32.422. + The Area Scope for QoE is specified in clause 5.4 of TS 28.405."; choice AreaScopeChoice { leaf-list eutraCellIdList { @@ -130,11 +119,11 @@ module _3gpp-common-trace { description "List of E-UTRAN cells identified by E-UTRAN-CGI"; } - leaf-list utraCellIdList { + leaf-list nrCellIdList { type string; min-elements 1; max-elements 32; - description "List of UTRAN cells identified by UTRAN CGI"; + description "List of NR cells identified by NG-RAN CGI"; } leaf-list tacList { -- GitLab From e65f022a1c661f2769e9cf4f65408b6b37aec33f Mon Sep 17 00:00:00 2001 From: "U-ERICSSON\\ETHBLL" Date: Mon, 16 Sep 2024 17:18:19 +0200 Subject: [PATCH 172/587] Local rebase and commit of MR1226 Rel19 cr0379 28.623 correction on mdt configuration in mrdc CR0379 --- yang-models/_3gpp-common-trace.yang | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/yang-models/_3gpp-common-trace.yang b/yang-models/_3gpp-common-trace.yang index 8b418365e..282b9ab13 100755 --- a/yang-models/_3gpp-common-trace.yang +++ b/yang-models/_3gpp-common-trace.yang @@ -26,7 +26,7 @@ module _3gpp-common-trace { Information Service (IS)" ; revision 2024-08-13 { reference CR-0387; } - revision 2024-08-07 { reference "CR-0405 CR-0421"; } + revision 2024-08-07 { reference "CR-0405 CR-0421 CR-0379"; } revision 2024-05-12 { reference "CR-0401"; } revision 2024-05-06 { reference CR-0359; } revision 2024-04-06 { reference "CR-0342"; } @@ -1510,6 +1510,15 @@ module _3gpp-common-trace { leaf idx { type string; } uses LoggedMdtConfigGrp; } + + leaf mNOnly { + type boolean; + default false; + description "Specifies whether the MDT configuration is for MN + only or not. The value FALSE means the MDT configuration is for + both MN and SN. The value TRUE means the MDT configuration is + for MN only."; + } } grouping UECoreMeasConfigGrp { -- GitLab From 49edb8418ffcb0080ebe9c6f2470e185f184af9c Mon Sep 17 00:00:00 2001 From: "U-ERICSSON\\ETHBLL" Date: Mon, 16 Sep 2024 18:04:43 +0200 Subject: [PATCH 173/587] Local rebase and commit of MR1214 Rel_19 TS28.623 CR 0377 Rename attributes for 5GC UE level measurement --- yang-models/_3gpp-common-trace.yang | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/yang-models/_3gpp-common-trace.yang b/yang-models/_3gpp-common-trace.yang index 282b9ab13..30a4db45b 100755 --- a/yang-models/_3gpp-common-trace.yang +++ b/yang-models/_3gpp-common-trace.yang @@ -25,7 +25,7 @@ module _3gpp-common-trace { Integration Reference Point (IRP); Information Service (IS)" ; - revision 2024-08-13 { reference CR-0387; } + revision 2024-08-13 { reference "CR-0387 CR-0377"; } revision 2024-08-07 { reference "CR-0405 CR-0421 CR-0379"; } revision 2024-05-12 { reference "CR-0401"; } revision 2024-05-06 { reference CR-0359; } @@ -1522,7 +1522,7 @@ module _3gpp-common-trace { } grouping UECoreMeasConfigGrp { - description "Represents the ueCoreMeasConfig dataType. + description "Represents the UECoreMeasConfig dataType. This <> defines the aconfiguration parameters of IOC TraceJob which are specific for UE level measurements collection."; @@ -1551,7 +1551,7 @@ module _3gpp-common-trace { type uint32; mandatory true; units milliseconds; - description "It specifies the Granularity period used to produce UE level + description "It specifies the Granularity period used to produce 5GC UE level measurements. The period is defined in milliseconds (ms)."; } -- GitLab From 724d5edb82bec2eb893822e6d9f7d992e350b764 Mon Sep 17 00:00:00 2001 From: scottma Date: Thu, 22 Aug 2024 07:24:08 +0000 Subject: [PATCH 174/587] Add new file --- yang-models/_3gpp-nr-nrm-ecmappingrule.yang | 54 +++++++++++++++++++++ 1 file changed, 54 insertions(+) create mode 100644 yang-models/_3gpp-nr-nrm-ecmappingrule.yang diff --git a/yang-models/_3gpp-nr-nrm-ecmappingrule.yang b/yang-models/_3gpp-nr-nrm-ecmappingrule.yang new file mode 100644 index 000000000..15cca562b --- /dev/null +++ b/yang-models/_3gpp-nr-nrm-ecmappingrule.yang @@ -0,0 +1,54 @@ +module _3gpp-nr-nrm-ecmappingrule { + yang-version 1.1; + namespace urn:3gpp:sa5:_3gpp-nr-nrm-ecmappingrule; + prefix ecmap3gpp; + + 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 unified mapping rule input to support + Energy Cost Index Mapping when Energy Cost Reporting. + Copyright 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + TTA, TTC). All rights reserved."; + reference "3GPP TS 28.541"; + + revision 2024-08-21 { reference CR-1337 ; } + + grouping NGRANECMappingRuleGrp { + description "Represents the NGRANECMappingRule IOC."; + leaf eCMRInputMinValue { + type uint8; + description "The minimum value of to be applied + for mapping from this attribute to the energy cost."; + } + + leaf eCMRInputMaxValue { + type uint8; + description "The maximum value of to be applied + for mapping from this attribute to the energy cost."; + } + + leaf eCTimeInterval { + type uint8; + description "Time interval (in seconds) that + should be applied for collecting values of mapping + rule attribute to be used for computing the energy cost."; + units seconds; + } + } + + grouping NGRANECMappingRuleSubtree { + description "Helps augmenting NGRANECMappingRule into multiple places."; + list NGRANECMappingRule { + key id; + uses top3gpp:Top_Grp; + min-elements 1; + max-elements 1; + leaf idx { type uint32; } + container attributes { + uses NGRANECMappingRuleGrp; + } + } + } +} -- GitLab From b06cc65e6b4fd2aa81f2c9b4fc371c1ec00a444c Mon Sep 17 00:00:00 2001 From: scottma Date: Thu, 22 Aug 2024 07:26:47 +0000 Subject: [PATCH 175/587] Update _3gpp-common-subnetwork.yang --- yang-models/_3gpp-common-subnetwork.yang | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/yang-models/_3gpp-common-subnetwork.yang b/yang-models/_3gpp-common-subnetwork.yang index d6d5f7010..d3e1bea68 100755 --- a/yang-models/_3gpp-common-subnetwork.yang +++ b/yang-models/_3gpp-common-subnetwork.yang @@ -13,6 +13,7 @@ module _3gpp-common-subnetwork { import _3gpp-common-files { prefix files3gpp; } import _3gpp-5gc-nrm-configurable5qiset { prefix fiveqi3gpp; } import _3gpp-5gc-nrm-ecmconnectioninfo { prefix econn3gpp ; } + import _3gpp-nr-nrm-ecmappingrule { prefix ecmap3gpp ; } organization "3GPP SA5"; contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464"; @@ -33,6 +34,7 @@ module _3gpp-common-subnetwork { 3GPP TS 28.620 Umbrella Information Model (UIM)"; + revision 2024-01-30 { reference CR-1337 ; } revision 2024-01-30 { reference CR-0328 ; } revision 2023-11-14 { reference CR-0305 ; } revision 2023-09-18 { reference CR-0271 ; } @@ -61,6 +63,10 @@ module _3gpp-common-subnetwork { reference "Initial revision"; } + feature ECMappingRuleUnderSubNetwork { + description "ECMappingRule shall be contained under SubNetwork."; + } + feature EcmConnectionInfoUnderSubNetwork { description "The EcmConnectionInfo shall be contained under Subnetwork"; @@ -264,6 +270,11 @@ module _3gpp-common-subnetwork { if-feature EcmConnectionInfoUnderSubNetwork; } + uses ecmap3gpp:NGRANECMappingRuleSubtree { + if-feature EcmConnectionInfoUnderSubNetwork; + } + + yangmnt:mount-point children-of-SubNetwork { description "Mountpoint for ManagedElement"; reference "RFC8528 YANG Schema Mount"; @@ -271,4 +282,4 @@ module _3gpp-common-subnetwork { // augment external parts here } -} \ No newline at end of file +} -- GitLab From da5c85f5991f4568a73734167d832d93936ecb3a Mon Sep 17 00:00:00 2001 From: scottma Date: Thu, 22 Aug 2024 07:28:46 +0000 Subject: [PATCH 176/587] Update _3gpp-common-managed-element.yang --- yang-models/_3gpp-common-managed-element.yang | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/yang-models/_3gpp-common-managed-element.yang b/yang-models/_3gpp-common-managed-element.yang index 233aa6f4a..ad54b08b5 100755 --- a/yang-models/_3gpp-common-managed-element.yang +++ b/yang-models/_3gpp-common-managed-element.yang @@ -12,6 +12,7 @@ module _3gpp-common-managed-element { import _3gpp-common-files { prefix files3gpp; } import _3gpp-5gc-nrm-configurable5qiset { prefix fiveqi3gpp; } import _3gpp-5gc-nrm-ecmconnectioninfo { prefix econn3gpp ; } + import _3gpp-nr-nrm-ecmappingrule { prefix ecmap3gpp ; } organization "3GPP SA5"; contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464"; @@ -33,6 +34,7 @@ module _3gpp-common-managed-element { 3GPP TS 28.620 Umbrella Information Model (UIM)"; + revision 2024-08-21 { reference CR-1337 ; } revision 2024-01-30 { reference CR-0328 ; } revision 2023-11-14 { reference CR-0305 ; } revision 2023-09-18 { reference CR-0271 ; } @@ -49,6 +51,10 @@ module _3gpp-common-managed-element { revision 2019-06-17 { reference " S5-203316"; } revision 2019-05-08 { reference "Initial revision"; } + feature ECMappingRuleUnderManagedElement { + description "ECMappingRule shall be contained under ManagedElement."; + } + feature EcmConnectionInfoUnderManagedElement { description "The EcmConnectionInfo shall be contained under ManagedElement"; @@ -304,5 +310,10 @@ module _3gpp-common-managed-element { uses econn3gpp:EcmConnectionInfoSubtree { if-feature EcmConnectionInfoUnderManagedElement; } + + uses ecmap3gpp:NGRANECMappingRuleSubtree { + if-feature EcmConnectionInfoUnderManagedElement; + } + } } -- GitLab From 8dcd4b3e783aa403a405ea0b9a77f43f0a9ff848 Mon Sep 17 00:00:00 2001 From: scottma Date: Thu, 22 Aug 2024 07:31:07 +0000 Subject: [PATCH 177/587] Update _3gpp-nr-nrm-gnbcucpfunction.yang --- yang-models/_3gpp-nr-nrm-gnbcucpfunction.yang | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/yang-models/_3gpp-nr-nrm-gnbcucpfunction.yang b/yang-models/_3gpp-nr-nrm-gnbcucpfunction.yang index 7d8eabeec..5fb2475ec 100755 --- a/yang-models/_3gpp-nr-nrm-gnbcucpfunction.yang +++ b/yang-models/_3gpp-nr-nrm-gnbcucpfunction.yang @@ -19,6 +19,7 @@ module _3gpp-nr-nrm-gnbcucpfunction { TTA, TTC). All rights reserved."; reference "3GPP TS 28.541 5G Network Resource Model (NRM)"; + revision 2024-08-21 { reference CR-1337 ; } revision 2024-05-24 { reference CR-1273 ; } revision 2024-04-04 { reference CR-1139; } revision 2024-02-24 { reference CR-1218; } @@ -180,6 +181,13 @@ module _3gpp-nr-nrm-gnbcucpfunction { type types3gpp:DistinguishedName; description "This is the DN of EphemerisInfoSet."; } + + leaf nRECMappingRuleRef { + type types3gpp:DistinguishedName; + description "DN of a NRECMappingRule."; + } + + } grouping QceIdMappingInfoGrp { @@ -223,4 +231,4 @@ module _3gpp-nr-nrm-gnbcucpfunction { } } } -} \ No newline at end of file +} -- GitLab From ecfd096930f64384ec1571ed2bcf5c414667b1e1 Mon Sep 17 00:00:00 2001 From: scottma Date: Thu, 22 Aug 2024 14:41:08 +0000 Subject: [PATCH 178/587] Update _3gpp-nr-nrm-ecmappingrule.yang --- yang-models/_3gpp-nr-nrm-ecmappingrule.yang | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/yang-models/_3gpp-nr-nrm-ecmappingrule.yang b/yang-models/_3gpp-nr-nrm-ecmappingrule.yang index 15cca562b..71a6e89aa 100644 --- a/yang-models/_3gpp-nr-nrm-ecmappingrule.yang +++ b/yang-models/_3gpp-nr-nrm-ecmappingrule.yang @@ -15,8 +15,8 @@ module _3gpp-nr-nrm-ecmappingrule { revision 2024-08-21 { reference CR-1337 ; } - grouping NGRANECMappingRuleGrp { - description "Represents the NGRANECMappingRule IOC."; + grouping NRECMappingRuleGrp { + description "Represents the NRECMappingRule IOC."; leaf eCMRInputMinValue { type uint8; description "The minimum value of to be applied @@ -38,16 +38,16 @@ module _3gpp-nr-nrm-ecmappingrule { } } - grouping NGRANECMappingRuleSubtree { - description "Helps augmenting NGRANECMappingRule into multiple places."; - list NGRANECMappingRule { + grouping NRECMappingRuleSubtree { + description "Helps augmenting NRECMappingRule into multiple places."; + list NRECMappingRule { key id; uses top3gpp:Top_Grp; min-elements 1; max-elements 1; leaf idx { type uint32; } container attributes { - uses NGRANECMappingRuleGrp; + uses NRECMappingRuleGrp; } } } -- GitLab From fbcc4274b91b3a4e977f94ffd0b4daea1f00c786 Mon Sep 17 00:00:00 2001 From: scottma Date: Thu, 22 Aug 2024 14:41:29 +0000 Subject: [PATCH 179/587] Update _3gpp-common-managed-element.yang --- yang-models/_3gpp-common-managed-element.yang | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/yang-models/_3gpp-common-managed-element.yang b/yang-models/_3gpp-common-managed-element.yang index ad54b08b5..67e6a6e15 100755 --- a/yang-models/_3gpp-common-managed-element.yang +++ b/yang-models/_3gpp-common-managed-element.yang @@ -311,7 +311,7 @@ module _3gpp-common-managed-element { if-feature EcmConnectionInfoUnderManagedElement; } - uses ecmap3gpp:NGRANECMappingRuleSubtree { + uses ecmap3gpp:NRECMappingRuleSubtree { if-feature EcmConnectionInfoUnderManagedElement; } -- GitLab From aa305d17c6ed6f6dc130f32bde9cd828f3e659dd Mon Sep 17 00:00:00 2001 From: scottma Date: Thu, 22 Aug 2024 14:41:52 +0000 Subject: [PATCH 180/587] Update _3gpp-common-subnetwork.yang --- yang-models/_3gpp-common-subnetwork.yang | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/yang-models/_3gpp-common-subnetwork.yang b/yang-models/_3gpp-common-subnetwork.yang index d3e1bea68..ddd472941 100755 --- a/yang-models/_3gpp-common-subnetwork.yang +++ b/yang-models/_3gpp-common-subnetwork.yang @@ -270,7 +270,7 @@ module _3gpp-common-subnetwork { if-feature EcmConnectionInfoUnderSubNetwork; } - uses ecmap3gpp:NGRANECMappingRuleSubtree { + uses ecmap3gpp:NRECMappingRuleSubtree { if-feature EcmConnectionInfoUnderSubNetwork; } -- GitLab From 62772f678b0f655628c3cfc4ba43a64ab7888bc1 Mon Sep 17 00:00:00 2001 From: scottma Date: Fri, 23 Aug 2024 06:11:28 +0000 Subject: [PATCH 181/587] Revert "Update _3gpp-common-managed-element.yang" This reverts commit ba2aaf70017a3ca4ae2b1e824ebe641b5bdd4930 --- yang-models/_3gpp-common-managed-element.yang | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/yang-models/_3gpp-common-managed-element.yang b/yang-models/_3gpp-common-managed-element.yang index 67e6a6e15..ad54b08b5 100755 --- a/yang-models/_3gpp-common-managed-element.yang +++ b/yang-models/_3gpp-common-managed-element.yang @@ -311,7 +311,7 @@ module _3gpp-common-managed-element { if-feature EcmConnectionInfoUnderManagedElement; } - uses ecmap3gpp:NRECMappingRuleSubtree { + uses ecmap3gpp:NGRANECMappingRuleSubtree { if-feature EcmConnectionInfoUnderManagedElement; } -- GitLab From f48461ee882e312944131b93130c4bd6befab29b Mon Sep 17 00:00:00 2001 From: scottma Date: Fri, 23 Aug 2024 06:15:34 +0000 Subject: [PATCH 182/587] Update _3gpp-common-managed-element.yang --- yang-models/_3gpp-common-managed-element.yang | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/yang-models/_3gpp-common-managed-element.yang b/yang-models/_3gpp-common-managed-element.yang index ad54b08b5..81a6c1e80 100755 --- a/yang-models/_3gpp-common-managed-element.yang +++ b/yang-models/_3gpp-common-managed-element.yang @@ -312,7 +312,7 @@ module _3gpp-common-managed-element { } uses ecmap3gpp:NGRANECMappingRuleSubtree { - if-feature EcmConnectionInfoUnderManagedElement; + if-feature ECMappingRuleUnderManagedElement; } } -- GitLab From 35a705ffec36499b3d108f8e52c9cc5727446d86 Mon Sep 17 00:00:00 2001 From: scottma Date: Fri, 23 Aug 2024 06:18:55 +0000 Subject: [PATCH 183/587] Update _3gpp-common-managed-element.yang --- yang-models/_3gpp-common-managed-element.yang | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/yang-models/_3gpp-common-managed-element.yang b/yang-models/_3gpp-common-managed-element.yang index 81a6c1e80..705d01a29 100755 --- a/yang-models/_3gpp-common-managed-element.yang +++ b/yang-models/_3gpp-common-managed-element.yang @@ -311,7 +311,7 @@ module _3gpp-common-managed-element { if-feature EcmConnectionInfoUnderManagedElement; } - uses ecmap3gpp:NGRANECMappingRuleSubtree { + uses ecmap3gpp:NRECMappingRuleSubtree { if-feature ECMappingRuleUnderManagedElement; } -- GitLab From 5371581d5724f3303a82d0b55f58469958176b2b Mon Sep 17 00:00:00 2001 From: scottma Date: Fri, 23 Aug 2024 08:59:46 +0000 Subject: [PATCH 184/587] Update _3gpp-nr-nrm-ecmappingrule.yang --- yang-models/_3gpp-nr-nrm-ecmappingrule.yang | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/yang-models/_3gpp-nr-nrm-ecmappingrule.yang b/yang-models/_3gpp-nr-nrm-ecmappingrule.yang index 71a6e89aa..ac5fbfe30 100644 --- a/yang-models/_3gpp-nr-nrm-ecmappingrule.yang +++ b/yang-models/_3gpp-nr-nrm-ecmappingrule.yang @@ -16,7 +16,9 @@ module _3gpp-nr-nrm-ecmappingrule { revision 2024-08-21 { reference CR-1337 ; } grouping NRECMappingRuleGrp { - description "Represents the NRECMappingRule IOC."; + description "Represents the unified mapping rule to support Energy Cost Mapping + when Energy Cost Reporting is supported. Can be name-contained by SubNetwork + or ManagedElement. It applies to all ManagedEntity contained by the parent."; leaf eCMRInputMinValue { type uint8; description "The minimum value of to be applied -- GitLab From 41d612c470c6cad4e8ea27e5b9334412eaee08a2 Mon Sep 17 00:00:00 2001 From: scottma Date: Fri, 23 Aug 2024 09:01:09 +0000 Subject: [PATCH 185/587] Update _3gpp-nr-nrm-gnbcucpfunction.yang --- yang-models/_3gpp-nr-nrm-gnbcucpfunction.yang | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/yang-models/_3gpp-nr-nrm-gnbcucpfunction.yang b/yang-models/_3gpp-nr-nrm-gnbcucpfunction.yang index 5fb2475ec..ad0875a56 100755 --- a/yang-models/_3gpp-nr-nrm-gnbcucpfunction.yang +++ b/yang-models/_3gpp-nr-nrm-gnbcucpfunction.yang @@ -184,7 +184,8 @@ module _3gpp-nr-nrm-gnbcucpfunction { leaf nRECMappingRuleRef { type types3gpp:DistinguishedName; - description "DN of a NRECMappingRule."; + description "DN of a NRECMappingRule. An empty value indicates the + NRECMappingRule contained by parent, e.g. ManagedElement, applies."; } -- GitLab From 1eed2b8e3ff0da6ccf4815a96c2063ade554c89b Mon Sep 17 00:00:00 2001 From: scottma Date: Fri, 23 Aug 2024 10:01:02 +0000 Subject: [PATCH 186/587] Update _3gpp-nr-nrm-gnbcucpfunction.yang --- yang-models/_3gpp-nr-nrm-gnbcucpfunction.yang | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/yang-models/_3gpp-nr-nrm-gnbcucpfunction.yang b/yang-models/_3gpp-nr-nrm-gnbcucpfunction.yang index ad0875a56..896327a78 100755 --- a/yang-models/_3gpp-nr-nrm-gnbcucpfunction.yang +++ b/yang-models/_3gpp-nr-nrm-gnbcucpfunction.yang @@ -185,10 +185,9 @@ module _3gpp-nr-nrm-gnbcucpfunction { leaf nRECMappingRuleRef { type types3gpp:DistinguishedName; description "DN of a NRECMappingRule. An empty value indicates the - NRECMappingRule contained by parent, e.g. ManagedElement, applies."; + NRECMappingRule contained by parent, e.g. ManagedElement or + SubNetwork, applies."; } - - } grouping QceIdMappingInfoGrp { -- GitLab From a7e99a639f0d27063f5e1d70be4fd08451be878b Mon Sep 17 00:00:00 2001 From: "U-ERICSSON\\ETHBLL" Date: Mon, 16 Sep 2024 18:39:37 +0200 Subject: [PATCH 187/587] Local rebase and commit of MR1334 28.541_Rel19_CR1352_NRM_for_managing_PM_for_LTM --- yang-models/_3gpp-nr-nrm-gnbcucpfunction.yang | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/yang-models/_3gpp-nr-nrm-gnbcucpfunction.yang b/yang-models/_3gpp-nr-nrm-gnbcucpfunction.yang index 896327a78..839cb879c 100755 --- a/yang-models/_3gpp-nr-nrm-gnbcucpfunction.yang +++ b/yang-models/_3gpp-nr-nrm-gnbcucpfunction.yang @@ -19,7 +19,7 @@ module _3gpp-nr-nrm-gnbcucpfunction { TTA, TTC). All rights reserved."; reference "3GPP TS 28.541 5G Network Resource Model (NRM)"; - revision 2024-08-21 { reference CR-1337 ; } + revision 2024-08-19 { reference "CR-1337 CR-1352"; } revision 2024-05-24 { reference CR-1273 ; } revision 2024-04-04 { reference CR-1139; } revision 2024-02-24 { reference CR-1218; } @@ -142,6 +142,12 @@ module _3gpp-nr-nrm-gnbcucpfunction { enabled or disabled."; } + leaf dLTMCellSwitchControl { + type boolean; + description "This attribute determines whether the distributed SON + function LTM Cell Switch is enabled or disabled."; + } + leaf dDAPSHOControl { type boolean; description "This attribute determines whether the DAPS handover function -- GitLab From 47a619f6f554e45c4b48a75a0d845ec9889eb8f4 Mon Sep 17 00:00:00 2001 From: rosabolzek Date: Fri, 9 Aug 2024 15:05:25 +0000 Subject: [PATCH 188/587] Update _3gpp-5gc-nrm-anlffunction.yang add support for mLModelRefList and aIMLInferenceFunctionRefList --- yang-models/_3gpp-5gc-nrm-anlffunction.yang | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/yang-models/_3gpp-5gc-nrm-anlffunction.yang b/yang-models/_3gpp-5gc-nrm-anlffunction.yang index 85673a4c7..672af83ff 100644 --- a/yang-models/_3gpp-5gc-nrm-anlffunction.yang +++ b/yang-models/_3gpp-5gc-nrm-anlffunction.yang @@ -7,6 +7,7 @@ module _3gpp-5gc-nrm-anlffunction { import _3gpp-common-managed-element { prefix me3gpp; } import _3gpp-common-top { prefix top3gpp; } import _3gpp-5gc-nrm-nwdaffunction { prefix nwdaf3gpp; } + import _3gpp-common-yang-types { prefix types3gpp; } organization "3gpp SA5"; contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464"; @@ -16,6 +17,7 @@ module _3gpp-5gc-nrm-anlffunction { TTA, TTC). All rights reserved."; reference "3GPP TS 28.541"; + revision 2024-08-07 { reference 1331; } revision 2023-11-03 { reference "initial revision"; } grouping AnLFFunctionGrp { @@ -29,6 +31,16 @@ module _3gpp-5gc-nrm-anlffunction { config false; description "It indicates the activation status of the AnLF"; } + leaf-list mLModelRefList { + type types3gpp:DistinguishedName; + description "This attribute holds a DN list of MLModel ¨ + (See TS 28.105 [105])."; + } + leaf-list aIMLInferenceFunctionRefList { + type types3gpp:DistinguishedName; + description "This attribute holds a DN list of AIMLInferenceFunction + (See TS 28.105 [105]) ."; + } } augment "/me3gpp:ManagedElement/nwdaf3gpp:NWDAFFunction" { -- GitLab From 10f2a5e86731012ab3ef871dbcdeebab9811f12c Mon Sep 17 00:00:00 2001 From: rosabolzek Date: Fri, 9 Aug 2024 15:10:07 +0000 Subject: [PATCH 189/587] Update _3gpp-nr-nrm-desmanagementfunction.yang mLModelRefList and aIMLInferenceFunctionRefList support --- .../_3gpp-nr-nrm-desmanagementfunction.yang | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/yang-models/_3gpp-nr-nrm-desmanagementfunction.yang b/yang-models/_3gpp-nr-nrm-desmanagementfunction.yang index c1201b7fb..c7f49bfc8 100755 --- a/yang-models/_3gpp-nr-nrm-desmanagementfunction.yang +++ b/yang-models/_3gpp-nr-nrm-desmanagementfunction.yang @@ -9,6 +9,7 @@ module _3gpp-nr-nrm-desmanagementfunction { import _3gpp-nr-nrm-nrcellcu { prefix nrcellcu3gpp; } import _3gpp-common-subnetwork { prefix subnet3gpp; } import _3gpp-5g-common-yang-types { prefix type5g3gpp; } + import _3gpp-common-yang-types { prefix types3gpp; } organization "3GPP SA5"; contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464"; @@ -19,6 +20,7 @@ module _3gpp-nr-nrm-desmanagementfunction { TTA, TTC). All rights reserved."; reference "3GPP TS 28.541 5G Network Resource Model (NRM)"; + revision 2024-08-07 { reference CR-1331; } revision 2023-09-18 { reference CR-1043 ; } revision 2021-08-05 { reference S5-214053/CR-0518; } revision 2020-05-08 { reference S5-203316; } @@ -139,7 +141,17 @@ module _3gpp-nr-nrm-desmanagementfunction { enum yes; enum no; } - } + } + leaf-list mLModelRefList { + type types3gpp:DistinguishedName; + description "This attribute holds a DN list of MLModel ¨ + (See TS 28.105 [105])."; + } + leaf-list aIMLInferenceFunctionRefList { + type types3gpp:DistinguishedName; + description "This attribute holds a DN list of AIMLInferenceFunction + (See TS 28.105 [105]) ."; + } } grouping EsNotAllowedTimePeriodGrp { @@ -200,4 +212,4 @@ module _3gpp-nr-nrm-desmanagementfunction { if-feature subnet3gpp:DESManagementFunction; uses DESManagementFunctionSubtree; } -} \ No newline at end of file +} -- GitLab From 7d884a28d460f8f784b3f61c77536456f3fff1c3 Mon Sep 17 00:00:00 2001 From: rosabolzek Date: Fri, 9 Aug 2024 15:17:16 +0000 Subject: [PATCH 190/587] Update _3gpp-nr-nrm-dlbofunction.yang mLModelRefList and aIMLInferenceFunctionRefList support --- yang-models/_3gpp-nr-nrm-dlbofunction.yang | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/yang-models/_3gpp-nr-nrm-dlbofunction.yang b/yang-models/_3gpp-nr-nrm-dlbofunction.yang index 6ae29fa50..3844abac7 100644 --- a/yang-models/_3gpp-nr-nrm-dlbofunction.yang +++ b/yang-models/_3gpp-nr-nrm-dlbofunction.yang @@ -8,6 +8,7 @@ module _3gpp-nr-nrm-dlbofunction { import _3gpp-nr-nrm-gnbcucpfunction { prefix gnbcucp3gpp; } import _3gpp-common-managed-element { prefix me3gpp; } import _3gpp-nr-nrm-nrcellcu { prefix nrcellcu3gpp; } + import _3gpp-common-yang-types { prefix types3gpp; } organization "3GPP SA5"; contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464"; @@ -18,6 +19,7 @@ module _3gpp-nr-nrm-dlbofunction { TTA, TTC). All rights reserved."; reference "3GPP TS 28.541 5G Network Resource Model (NRM)"; + revision 2024-08-07 { reference CR-1331; } revision 2023-09-18 { reference CR-1043 ; } revision 2022-03-25 { reference "CR-0683"; } revision 2021-10-22 { reference "CR-0577"; } @@ -68,7 +70,16 @@ module _3gpp-nr-nrm-dlbofunction { type int32 { range "0..604800"; } units "1"; } - + leaf-list mLModelRefList { + type types3gpp:DistinguishedName; + description "This attribute holds a DN list of MLModel ¨ + (See TS 28.105 [105])."; + } + leaf-list aIMLInferenceFunctionRefList { + type types3gpp:DistinguishedName; + description "This attribute holds a DN list of AIMLInferenceFunction + (See TS 28.105 [105]) ."; + } } grouping DLBOFunctionSubtree { @@ -84,7 +95,7 @@ module _3gpp-nr-nrm-dlbofunction { uses top3gpp:Top_Grp; container attributes { uses DLBOFunctionGrp; - } + } } } @@ -101,4 +112,4 @@ module _3gpp-nr-nrm-dlbofunction { if-feature DLBOUnderSubNetwork; uses DLBOFunctionSubtree; } -} \ No newline at end of file +} -- GitLab From 15a0acdfebb3a93d632835f24c67f464781f6ec6 Mon Sep 17 00:00:00 2001 From: rosabolzek Date: Fri, 9 Aug 2024 15:23:14 +0000 Subject: [PATCH 191/587] Update _3gpp-nr-nrm-dmrofunction.yang mLModelRefList and aIMLInferenceFunctionRefList support --- yang-models/_3gpp-nr-nrm-dmrofunction.yang | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/yang-models/_3gpp-nr-nrm-dmrofunction.yang b/yang-models/_3gpp-nr-nrm-dmrofunction.yang index ea6ef52b7..785a555a5 100755 --- a/yang-models/_3gpp-nr-nrm-dmrofunction.yang +++ b/yang-models/_3gpp-nr-nrm-dmrofunction.yang @@ -8,6 +8,7 @@ module _3gpp-nr-nrm-dmrofunction { import _3gpp-nr-nrm-gnbcucpfunction { prefix gnbcucp3gpp; } import _3gpp-common-managed-element { prefix me3gpp; } import _3gpp-nr-nrm-nrcellcu { prefix nrcellcu3gpp; } + import _3gpp-common-yang-types { prefix types3gpp; } organization "3GPP SA5"; contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464"; @@ -18,6 +19,7 @@ module _3gpp-nr-nrm-dmrofunction { TTA, TTC). All rights reserved."; reference "3GPP TS 28.541 5G Network Resource Model (NRM)"; + revision 2024-08-07 { reference CR-1331; } revision 2023-09-18 { reference CR-1043 ; } revision 2022-01-07 { reference CR-0633; } revision 2021-08-05 { reference S5-214053/CR-0518; } @@ -64,6 +66,16 @@ module _3gpp-nr-nrm-dmrofunction { description "This attribute determines whether the MRO function is enabled or disabled."; type boolean; + } + leaf-list mLModelRefList { + type types3gpp:DistinguishedName; + description "This attribute holds a DN list of MLModel ¨ + (See TS 28.105 [105])."; + } + leaf-list aIMLInferenceFunctionRefList { + type types3gpp:DistinguishedName; + description "This attribute holds a DN list of AIMLInferenceFunction + (See TS 28.105 [105]) ."; } } @@ -101,4 +113,4 @@ module _3gpp-nr-nrm-dmrofunction { if-feature subnet3gpp:DMROFunction; uses DMROFunctionSubtree; } -} \ No newline at end of file +} -- GitLab From 74e62cb6c15179f46d35c5fb2002e20f299e235d Mon Sep 17 00:00:00 2001 From: rosabolzek Date: Fri, 9 Aug 2024 15:48:30 +0000 Subject: [PATCH 192/587] Update _3gpp-5gc-nrm-anlffunction.yang --- yang-models/_3gpp-5gc-nrm-anlffunction.yang | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/yang-models/_3gpp-5gc-nrm-anlffunction.yang b/yang-models/_3gpp-5gc-nrm-anlffunction.yang index 672af83ff..c9ecda627 100644 --- a/yang-models/_3gpp-5gc-nrm-anlffunction.yang +++ b/yang-models/_3gpp-5gc-nrm-anlffunction.yang @@ -17,7 +17,7 @@ module _3gpp-5gc-nrm-anlffunction { TTA, TTC). All rights reserved."; reference "3GPP TS 28.541"; - revision 2024-08-07 { reference 1331; } + revision 2024-08-07 { reference CR 1331; } revision 2023-11-03 { reference "initial revision"; } grouping AnLFFunctionGrp { @@ -34,12 +34,14 @@ module _3gpp-5gc-nrm-anlffunction { leaf-list mLModelRefList { type types3gpp:DistinguishedName; description "This attribute holds a DN list of MLModel ¨ - (See TS 28.105 [105])."; + (See TS 28.105)."; + config false; } leaf-list aIMLInferenceFunctionRefList { type types3gpp:DistinguishedName; description "This attribute holds a DN list of AIMLInferenceFunction - (See TS 28.105 [105]) ."; + (See TS 28.105) ."; + config false; } } -- GitLab From 99abbe9902f2cb958835f588f365ddcf36f8158d Mon Sep 17 00:00:00 2001 From: rosabolzek Date: Fri, 9 Aug 2024 15:55:46 +0000 Subject: [PATCH 193/587] Update _3gpp-5gc-nrm-anlffunction.yang --- yang-models/_3gpp-5gc-nrm-anlffunction.yang | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/yang-models/_3gpp-5gc-nrm-anlffunction.yang b/yang-models/_3gpp-5gc-nrm-anlffunction.yang index c9ecda627..534141149 100644 --- a/yang-models/_3gpp-5gc-nrm-anlffunction.yang +++ b/yang-models/_3gpp-5gc-nrm-anlffunction.yang @@ -17,7 +17,7 @@ module _3gpp-5gc-nrm-anlffunction { TTA, TTC). All rights reserved."; reference "3GPP TS 28.541"; - revision 2024-08-07 { reference CR 1331; } + revision 2024-08-07 { reference CR-1331; } revision 2023-11-03 { reference "initial revision"; } grouping AnLFFunctionGrp { @@ -34,13 +34,13 @@ module _3gpp-5gc-nrm-anlffunction { leaf-list mLModelRefList { type types3gpp:DistinguishedName; description "This attribute holds a DN list of MLModel ¨ - (See TS 28.105)."; + (See TS 28.105)."; config false; } leaf-list aIMLInferenceFunctionRefList { type types3gpp:DistinguishedName; description "This attribute holds a DN list of AIMLInferenceFunction - (See TS 28.105) ."; + (See TS 28.105) ."; config false; } } -- GitLab From e7079c4f69806193f6edcb6e59bd02271b2f3ae9 Mon Sep 17 00:00:00 2001 From: rosabolzek Date: Fri, 9 Aug 2024 16:00:01 +0000 Subject: [PATCH 194/587] Update _3gpp-nr-nrm-desmanagementfunction.yang --- yang-models/_3gpp-nr-nrm-desmanagementfunction.yang | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/yang-models/_3gpp-nr-nrm-desmanagementfunction.yang b/yang-models/_3gpp-nr-nrm-desmanagementfunction.yang index c7f49bfc8..98a623d0c 100755 --- a/yang-models/_3gpp-nr-nrm-desmanagementfunction.yang +++ b/yang-models/_3gpp-nr-nrm-desmanagementfunction.yang @@ -145,12 +145,14 @@ module _3gpp-nr-nrm-desmanagementfunction { leaf-list mLModelRefList { type types3gpp:DistinguishedName; description "This attribute holds a DN list of MLModel ¨ - (See TS 28.105 [105])."; + (See TS 28.105])."; + config false; } leaf-list aIMLInferenceFunctionRefList { type types3gpp:DistinguishedName; description "This attribute holds a DN list of AIMLInferenceFunction - (See TS 28.105 [105]) ."; + (See TS 28.105) ."; + config false; } } -- GitLab From e0292c8875cafb3555d14d4fa489324b72d3d446 Mon Sep 17 00:00:00 2001 From: rosabolzek Date: Fri, 9 Aug 2024 16:04:16 +0000 Subject: [PATCH 195/587] Update _3gpp-nr-nrm-dlbofunction.yang --- yang-models/_3gpp-nr-nrm-dlbofunction.yang | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/yang-models/_3gpp-nr-nrm-dlbofunction.yang b/yang-models/_3gpp-nr-nrm-dlbofunction.yang index 3844abac7..698a88c76 100644 --- a/yang-models/_3gpp-nr-nrm-dlbofunction.yang +++ b/yang-models/_3gpp-nr-nrm-dlbofunction.yang @@ -73,12 +73,14 @@ module _3gpp-nr-nrm-dlbofunction { leaf-list mLModelRefList { type types3gpp:DistinguishedName; description "This attribute holds a DN list of MLModel ¨ - (See TS 28.105 [105])."; + (See TS 28.105)."; + config false; } leaf-list aIMLInferenceFunctionRefList { type types3gpp:DistinguishedName; description "This attribute holds a DN list of AIMLInferenceFunction - (See TS 28.105 [105]) ."; + (See TS 28.105) ."; + config false; } } -- GitLab From db4445f234a4dab612ccdd466925e0a9f0a5fd66 Mon Sep 17 00:00:00 2001 From: rosabolzek Date: Fri, 9 Aug 2024 16:08:35 +0000 Subject: [PATCH 196/587] Update _3gpp-nr-nrm-dmrofunction.yang --- yang-models/_3gpp-nr-nrm-dmrofunction.yang | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/yang-models/_3gpp-nr-nrm-dmrofunction.yang b/yang-models/_3gpp-nr-nrm-dmrofunction.yang index 785a555a5..2d485a937 100755 --- a/yang-models/_3gpp-nr-nrm-dmrofunction.yang +++ b/yang-models/_3gpp-nr-nrm-dmrofunction.yang @@ -70,12 +70,14 @@ module _3gpp-nr-nrm-dmrofunction { leaf-list mLModelRefList { type types3gpp:DistinguishedName; description "This attribute holds a DN list of MLModel ¨ - (See TS 28.105 [105])."; + (See TS 28.105)."; + config false; } leaf-list aIMLInferenceFunctionRefList { type types3gpp:DistinguishedName; description "This attribute holds a DN list of AIMLInferenceFunction - (See TS 28.105 [105]) ."; + (See TS 28.105) ."; + config false; } } -- GitLab From fe129a677d5c8a774de16269187b505ff315de0c Mon Sep 17 00:00:00 2001 From: rosabolzek Date: Fri, 9 Aug 2024 16:15:10 +0000 Subject: [PATCH 197/587] Update _3gpp-5gc-nrm-anlffunction.yang correct copyright --- yang-models/_3gpp-5gc-nrm-anlffunction.yang | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/yang-models/_3gpp-5gc-nrm-anlffunction.yang b/yang-models/_3gpp-5gc-nrm-anlffunction.yang index 534141149..3bb52fcdd 100644 --- a/yang-models/_3gpp-5gc-nrm-anlffunction.yang +++ b/yang-models/_3gpp-5gc-nrm-anlffunction.yang @@ -13,7 +13,7 @@ module _3gpp-5gc-nrm-anlffunction { contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464"; description "This IOC represents the AnLF function in 5GC. For more information about the AnLF, see 3GPP TS 23.288. - Copyright 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + Copyright 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved."; reference "3GPP TS 28.541"; -- GitLab From b232d6a8847c2775cff0ee33067d136d2a9ab6c9 Mon Sep 17 00:00:00 2001 From: rosabolzek Date: Fri, 9 Aug 2024 16:15:56 +0000 Subject: [PATCH 198/587] Update _3gpp-nr-nrm-desmanagementfunction.yang correct copyright --- yang-models/_3gpp-nr-nrm-desmanagementfunction.yang | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/yang-models/_3gpp-nr-nrm-desmanagementfunction.yang b/yang-models/_3gpp-nr-nrm-desmanagementfunction.yang index 98a623d0c..2e1e5bbaa 100755 --- a/yang-models/_3gpp-nr-nrm-desmanagementfunction.yang +++ b/yang-models/_3gpp-nr-nrm-desmanagementfunction.yang @@ -16,7 +16,7 @@ module _3gpp-nr-nrm-desmanagementfunction { description "Defines the YANG mapping of the DESManagementFunction Information Object Class (IOC) that is part of the NR Network Resource Model (NRM). - Copyright 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + Copyright 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved."; reference "3GPP TS 28.541 5G Network Resource Model (NRM)"; -- GitLab From 7ba0bc20a2d4fa2fd57df14ba8773445453e4b10 Mon Sep 17 00:00:00 2001 From: rosabolzek Date: Fri, 9 Aug 2024 16:16:23 +0000 Subject: [PATCH 199/587] Update _3gpp-nr-nrm-dlbofunction.yang correct copyright --- yang-models/_3gpp-nr-nrm-dlbofunction.yang | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/yang-models/_3gpp-nr-nrm-dlbofunction.yang b/yang-models/_3gpp-nr-nrm-dlbofunction.yang index 698a88c76..9a3781a45 100644 --- a/yang-models/_3gpp-nr-nrm-dlbofunction.yang +++ b/yang-models/_3gpp-nr-nrm-dlbofunction.yang @@ -15,7 +15,7 @@ module _3gpp-nr-nrm-dlbofunction { description "Defines the YANG mapping of the DLBOFunction Information Object Class (IOC) that is part of the NR Network Resource Model (NRM). - Copyright 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + Copyright 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved."; reference "3GPP TS 28.541 5G Network Resource Model (NRM)"; -- GitLab From daf5e54e55c6a3ddeed97fc3e148b925c0ddd17b Mon Sep 17 00:00:00 2001 From: rosabolzek Date: Fri, 9 Aug 2024 16:16:51 +0000 Subject: [PATCH 200/587] Update _3gpp-nr-nrm-dmrofunction.yang correct copyright --- yang-models/_3gpp-nr-nrm-dmrofunction.yang | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/yang-models/_3gpp-nr-nrm-dmrofunction.yang b/yang-models/_3gpp-nr-nrm-dmrofunction.yang index 2d485a937..9c1937e1d 100755 --- a/yang-models/_3gpp-nr-nrm-dmrofunction.yang +++ b/yang-models/_3gpp-nr-nrm-dmrofunction.yang @@ -15,7 +15,7 @@ module _3gpp-nr-nrm-dmrofunction { description "Defines the YANG mapping of the DMROFunction Information Object Class (IOC) that is part of the NR Network Resource Model (NRM). - Copyright 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + Copyright 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved."; reference "3GPP TS 28.541 5G Network Resource Model (NRM)"; -- GitLab From 4839b33244ddf096751e8b558b5efc959f24d93f Mon Sep 17 00:00:00 2001 From: ligan Date: Tue, 1 Oct 2024 15:37:10 +0000 Subject: [PATCH 201/587] TS28.623_Rel19_CR0438_Correct _wrong _CR _number_ in _managed _element _YANG_ file --- yang-models/_3gpp-common-managed-element.yang | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/yang-models/_3gpp-common-managed-element.yang b/yang-models/_3gpp-common-managed-element.yang index 705d01a29..53ae58e70 100755 --- a/yang-models/_3gpp-common-managed-element.yang +++ b/yang-models/_3gpp-common-managed-element.yang @@ -34,7 +34,7 @@ module _3gpp-common-managed-element { 3GPP TS 28.620 Umbrella Information Model (UIM)"; - revision 2024-08-21 { reference CR-1337 ; } + revision 2024-10-01 { reference CR-0438 ; } revision 2024-01-30 { reference CR-0328 ; } revision 2023-11-14 { reference CR-0305 ; } revision 2023-09-18 { reference CR-0271 ; } -- GitLab From 31773c715b99780b7423ac6d42b670174c0e1294 Mon Sep 17 00:00:00 2001 From: ligan Date: Fri, 4 Oct 2024 00:26:19 +0000 Subject: [PATCH 202/587] TS28.623_Rel19_CR0438_Correct _wrong _CR_ number_ in_ managed_ element _YANG _file --- yang-models/_3gpp-common-managed-element.yang | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/yang-models/_3gpp-common-managed-element.yang b/yang-models/_3gpp-common-managed-element.yang index 53ae58e70..49309f2f4 100755 --- a/yang-models/_3gpp-common-managed-element.yang +++ b/yang-models/_3gpp-common-managed-element.yang @@ -34,7 +34,7 @@ module _3gpp-common-managed-element { 3GPP TS 28.620 Umbrella Information Model (UIM)"; - revision 2024-10-01 { reference CR-0438 ; } + revision 2024-10-01 { reference "CR-0437","CR-0438" ; } revision 2024-01-30 { reference CR-0328 ; } revision 2023-11-14 { reference CR-0305 ; } revision 2023-09-18 { reference CR-0271 ; } -- GitLab From 4b7d250ee34bfbdcce77d2ad2436697f96842dbf Mon Sep 17 00:00:00 2001 From: ligan Date: Fri, 4 Oct 2024 09:37:08 +0000 Subject: [PATCH 203/587] TS28.623_Rel18_CR0438_Correct _wrong _CR _number_ in _managed_ element _YANG_ file --- yang-models/_3gpp-common-managed-element.yang | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/yang-models/_3gpp-common-managed-element.yang b/yang-models/_3gpp-common-managed-element.yang index 49309f2f4..852218598 100755 --- a/yang-models/_3gpp-common-managed-element.yang +++ b/yang-models/_3gpp-common-managed-element.yang @@ -34,7 +34,7 @@ module _3gpp-common-managed-element { 3GPP TS 28.620 Umbrella Information Model (UIM)"; - revision 2024-10-01 { reference "CR-0437","CR-0438" ; } + revision 2024-10-01 { reference "CR-0437,CR-0438" ; } revision 2024-01-30 { reference CR-0328 ; } revision 2023-11-14 { reference CR-0305 ; } revision 2023-09-18 { reference CR-0271 ; } -- GitLab From 7511263bb6880ec4cc8ac196ef442e131143a5fc Mon Sep 17 00:00:00 2001 From: elmdahlp Date: Fri, 4 Oct 2024 11:35:53 +0000 Subject: [PATCH 204/587] Update _3gpp-common-trace.yang according to CR S5-245709. --- yang-models/_3gpp-common-trace.yang | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/yang-models/_3gpp-common-trace.yang b/yang-models/_3gpp-common-trace.yang index 30a4db45b..3c06daf17 100755 --- a/yang-models/_3gpp-common-trace.yang +++ b/yang-models/_3gpp-common-trace.yang @@ -25,6 +25,7 @@ module _3gpp-common-trace { Integration Reference Point (IRP); Information Service (IS)" ; + revision 2024-10-01 { reference "CR-0457"; } revision 2024-08-13 { reference "CR-0387 CR-0377"; } revision 2024-08-07 { reference "CR-0405 CR-0421 CR-0379"; } revision 2024-05-12 { reference "CR-0401"; } @@ -1613,10 +1614,9 @@ module _3gpp-common-trace { enum SPR; enum MHI; enum RA_REPORT; - enum UHI_REPORT; - } + } description "Specifies the RRC reports requested. "; - reference "Clause 5.X of 3GPP TS 32.422 for additional details on the + reference "Clause 5.14 of 3GPP TS 32.422 for additional details on the allowed values."; } -- GitLab From e9193a4b836db952db27462ba88b4b1d1a9c44ac Mon Sep 17 00:00:00 2001 From: elmdahlp Date: Fri, 4 Oct 2024 13:46:15 +0000 Subject: [PATCH 205/587] Update _3gpp-common-trace.yang, correcting indentation. --- yang-models/_3gpp-common-trace.yang | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/yang-models/_3gpp-common-trace.yang b/yang-models/_3gpp-common-trace.yang index 3c06daf17..0f6c9c52a 100755 --- a/yang-models/_3gpp-common-trace.yang +++ b/yang-models/_3gpp-common-trace.yang @@ -1614,7 +1614,7 @@ module _3gpp-common-trace { enum SPR; enum MHI; enum RA_REPORT; - } + } description "Specifies the RRC reports requested. "; reference "Clause 5.14 of 3GPP TS 32.422 for additional details on the allowed values."; -- GitLab From ef76e242deb283d178e3ef08d72aaa37f372e3d2 Mon Sep 17 00:00:00 2001 From: elmdahlp Date: Fri, 4 Oct 2024 13:50:57 +0000 Subject: [PATCH 206/587] Update _3gpp-common-trace.yang with even better indentation. --- yang-models/_3gpp-common-trace.yang | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/yang-models/_3gpp-common-trace.yang b/yang-models/_3gpp-common-trace.yang index 0f6c9c52a..e3d6a800f 100755 --- a/yang-models/_3gpp-common-trace.yang +++ b/yang-models/_3gpp-common-trace.yang @@ -1614,7 +1614,7 @@ module _3gpp-common-trace { enum SPR; enum MHI; enum RA_REPORT; - } + } description "Specifies the RRC reports requested. "; reference "Clause 5.14 of 3GPP TS 32.422 for additional details on the allowed values."; -- GitLab From 03f38a5daf83253aaeb0e11084efb09d30211125 Mon Sep 17 00:00:00 2001 From: "U-ERICSSON\\ETHBLL" Date: Mon, 4 Nov 2024 11:19:41 +0100 Subject: [PATCH 207/587] updated AMFFunction --- yang-models/_3gpp-5g-common-yang-types.yang | 42 ++- yang-models/_3gpp-5gc-nrm-amffunction.yang | 388 ++++++++++++++++++-- 2 files changed, 406 insertions(+), 24 deletions(-) diff --git a/yang-models/_3gpp-5g-common-yang-types.yang b/yang-models/_3gpp-5g-common-yang-types.yang index 08b8fc721..75786fb27 100755 --- a/yang-models/_3gpp-5g-common-yang-types.yang +++ b/yang-models/_3gpp-5g-common-yang-types.yang @@ -3,7 +3,6 @@ module _3gpp-5g-common-yang-types { namespace "urn:3gpp:sa5:_3gpp-5g-common-yang-types"; prefix "types5g3gpp"; - import ietf-yang-types { prefix yang; } import _3gpp-common-yang-types { prefix types3gpp; } @@ -15,6 +14,7 @@ module _3gpp-5g-common-yang-types { TTA, TTC). All rights reserved."; reference "3GPP TS 28.541"; + revision 2024-10-06 { reference CR-1389; } revision 2024-05-24 { reference CR-1273 ; } revision 2023-09-18 { reference CR-1043 ; } revision 2023-05-10 { reference CR-0916; } @@ -22,6 +22,46 @@ module _3gpp-5g-common-yang-types { revision 2020-11-05 { reference CR-0412 ; } revision 2019-10-20 { reference "Initial version."; } + grouping NcgiGrp { + description "Represents the Ncgi datatype"; + + list plmnId { + description "This attribute represents a PLMN Identity."; + min-elements 1; + max-elements 1; + key "idx"; + leaf idx { type uint32 ; } + uses types3gpp:PLMNId ; + } + + leaf nrCellId { + type string; + mandatory true; + description "This attribute represents NR Cell Identity. + It's a 36-bit string identifying an NR Cell Id as specified in + clause 9.3.1.7 of TS 38.413, in hexadecimal representation. Each + character in the string shall take a value of + '0' to '9', 'a' to 'f' or 'A' to 'F' and shall represent 4 bits. + The most significant character representing the 4 most significant + bits of the Cell Id shall appear first in the string, and the + character representing the 4 least significant bit of the + Cell Id shall appear last in the string. + + Pattern: '^[A-Fa-f0-9]{9}$' + + Example: + An NR Cell Id 0x225BD6007 shall be encoded as '225BD6007'."; + } + + leaf nId { + type string; + mandatory true; + description "Network Identity; Shall be present if PlmnIdNid identifies + an SNPN (see clauses 5.30.2.3, 5.30.2.9, 6.3.4, and 6.3.8 in + 3GPP TS 23.501."; + } + } + typedef NRTAC { type string; description "This holds the identity of the common Tracking Area Code diff --git a/yang-models/_3gpp-5gc-nrm-amffunction.yang b/yang-models/_3gpp-5gc-nrm-amffunction.yang index 310e71835..f350abaec 100755 --- a/yang-models/_3gpp-5gc-nrm-amffunction.yang +++ b/yang-models/_3gpp-5gc-nrm-amffunction.yang @@ -8,7 +8,10 @@ module _3gpp-5gc-nrm-amffunction { import _3gpp-common-yang-types { prefix types3gpp; } import _3gpp-5g-common-yang-types { prefix types5g3gpp; } import ietf-inet-types { prefix inet; } + import ietf-yang-types { prefix yang; } import _3gpp-common-top { prefix top3gpp; } + import _3gpp-nr-nrm-gnbcuupfunction { prefix gnbcuup3gpp ;} + import _3gpp-5gc-nrm-nfprofile { prefix nfp3gpp; } organization "3gpp SA5"; contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464"; @@ -17,16 +20,16 @@ module _3gpp-5gc-nrm-amffunction { TTA, TTC). All rights reserved."; reference "3GPP TS 28.541 5G Network Resource Model (NRM)"; + revision 2024-10-06 { reference CR-1389; } revision 2024-04-04 { reference CR-1139; } revision 2023-09-18 { reference CR-1043 ; } revision 2022-01-07 { reference CR-0643; } revision 2020-11-06 { reference CR-0412 ; } revision 2019-10-25 { reference "S5-194457 S5-193518"; } - revision 2019-05-31 { reference "Ericsson refactoring."; } revision 2018-08-07 { reference "Initial revision"; } - grouping GlobalRanNodeIDGrp{ + grouping NTNGlobalRanNodeIDGrp{ list pLMNId { description "The PLMN Identifier is composed of @@ -116,14 +119,13 @@ module _3gpp-5gc-nrm-amffunction { } } - grouping satelliteBackhaulInfo{ + grouping SatelliteBackhaulInfoGrp{ description "Defines information related to satellite backhaul category and corresponding information of gNB."; reference "3GPP TS 23.501"; - list GlobalRanNodeID{ + list nTNGlobalRanNodeID{ description "Unique identifier of an NG-RAN node."; - uses GlobalRanNodeIDGrp; min-elements 1; max-elements 1; leaf GlobalRanNodeIDValue{ @@ -131,6 +133,7 @@ module _3gpp-5gc-nrm-amffunction { description "this relies on the choice of GlobalRanNodeID"; } key "GlobalRanNodeIDValue"; + uses NTNGlobalRanNodeIDGrp; } leaf satelliteBackhaulCategory{ @@ -160,20 +163,309 @@ module _3gpp-5gc-nrm-amffunction { } } + grouping GUAMInfoGrp { + description "Represents the GUAMInfo datatype."; + + list pLMNId { + description "This attribute represents a PLMN Identity."; + min-elements 1; + max-elements 1; + key "idx"; + leaf idx { type uint32 ; } + uses types3gpp:PLMNId ; + } + + leaf aMFIdentifier { + type int64; + description "The AMFI is constructed from an AMF Region ID, an + AMF Set ID and an AMF Pointer. The AMF Region ID identifies the region, + the AMF Set ID uniquely identifies the AMF Set within the AMF Region, + and the AMF Pointer uniquely identifies the AMF within the AMF Set. + (Ref. 3GPP TS 23.003)"; + } + } + + grouping N2InterfaceAmfInfoGrp { + description "Represents the N2InterfaceAmfInfo datatype."; + + leaf-list ipv4EndpointAddress { + type inet:ipv4-address; + min-elements 1; + description "This attribute represents available AMF endpoint + IPv4 address(es) for N2."; + } + + leaf-list ipv6EndpointAddress { + type inet:ipv6-address; + min-elements 1; + description "This attribute represents available AMF endpoint + IPv6 address(es) for N2."; + } + + leaf amfName { + type inet:host-name; + description "This attribute represents AMF Name FQDN as defined in + clause 28.3.2.5 of TS 23.003."; + } + } + + grouping BlockedLocationInfoGrp { + description "Repreasents the datatype BlockedLocationInfo"; + + list blockedLocation { + description "This provides the geographical location at which the PLMN + are not allowed in case of NTN."; + min-elements 1; + max-elements 1; + key "mnc mcc"; + uses types3gpp:PLMNId ; + } + + list blockedDurWindow { + description "This provides the time durations for which the PLMN are + not allowed at a given location in case of NTN"; + key idx; + leaf idx { type uint32 ; } + uses types3gpp:TimeWindowGrp; + } + + list blockedSlice { + description "This provides the slice for which the access is + not allowed at a given location in case of NTN. "; + max-elements 1; + key idx; + unique "sst sd"; + leaf idx { type uint32; } + uses types5g3gpp:SNssai; + } + } + + grouping NTNPLMNRestrictionsInfoGrp { + description "Represents the datatype NTNPLMNRestrictionsInfo"; + + list pLMNId { + description "This attribute represents a PLMN Identity."; + min-elements 1; + max-elements 1; + key "mnc mcc"; + uses types3gpp:PLMNId ; + } + + list blockedLocationInfoList { + description "This defines the information related with the location + for which the access restrictions are to be applied in case of NTN."; + key "idx"; + leaf idx { type uint32 ; } + uses BlockedLocationInfoGrp; + } + } + + grouping NtnLocationInfoGrp { + description "Represents the NtnLocationInfo datatype."; + + list location { + description "This defines the Location (geographical area) under + consideration to which the satellite coverage info belongs"; + key idx; + leaf idx { type uint32 ; } + uses types3gpp:GeoAreaGrp; + } + + list availabilityWindows { + description "This attribute defines the list of time windows at which + the satellite coverage will be available for this location. + Either availabilityWindows or nonAvailabilityWindows shall be present."; + key idx; + leaf idx { type uint32 ; } + uses types3gpp:TimeWindowGrp; + } + + list nonAvailabilityWindows { + description "This attribute defines the list of time windows at which + the satellite coverage will not be available for this location. + Either availabilityWindows or nonAvailabilityWindows shall be present."; + key idx; + leaf idx { type uint32 ; } + uses types3gpp:TimeWindowGrp; + } + } + + grouping SatelliteCoverageInfoGrp { + description "Represents the datatype SatelliteCoverageInfo"; + + leaf nRSatelliteRATtype { + type enumeration { + enum NRLEO; + enum NRMEO; + enum NRGEO; + enum NROTHERSAT; + } + description "This attribute defines the RAT Type for NR satellite + access."; + } + + list locationInfo { + description "This attribute defines the information about location and + corresponding time windows for which the satellite coverage will be + available or unavailable."; + key idx; + leaf idx { type uint32 ; } + uses NtnLocationInfoGrp; + } + } + + grouping SliceExpiryInfoGrp { + description "Represents the datatype SliceExpiryInfo"; + + list pLMNInfo { + min-elements 1; // ??? + config false; + description "It defines the PLMN(s) of a Network Function. "; + key idx; + leaf idx { type uint32 ; } + uses types5g3gpp:PLMNInfo; + } + + leaf expiryTime { + type yang:date-and-time; + config false; + description "This attribute provides information about the time at + which the slice is scheduled to be expired as it is not required + anymore. + This attribute will be set based on the sliceAvailability coming as + part of ServiceProfile."; + } + } + + grouping MappedCellIdInfoGrp { + description "Represents the datatype MappedCellIdInfo"; + + list ntnGeoArea { + description "This attribute indicates a specific geographical location + mapped to Mapped Cell ID(s)."; + min-elements 1; + max-elements 1; + key "idx"; + leaf idx { type uint32 ; } + uses types3gpp:GeoAreaGrp; + } + + list mappedCellId { + description "This attribute is in format of NCGI to indicate a fixed + geographical area (See subclause 16.14.5 in TS 38.300"; + min-elements 1; + max-elements 1; + key "idx"; + leaf idx { type uint32 ; } + uses types5g3gpp:NcgiGrp; + } + } + + grouping AmfInfoGrp { + description "Represents the data type AmfInfo."; + + leaf amfRegionId { + type int64; + mandatory true; + description "It represents the AMF Region ID, which identifies the + region. AllowedValues: defined in subclause 2.10.1 of 3GPP TS 23.003 "; + } + + leaf amfSetId { + type int64; + mandatory true; + description "It represents the AMF Set ID, which is uniquely identifies + the AMF Set within the AMF Region. + allowedValues: defined in subclause 2.10.1 of 3GPP TS 23.003"; + } + + list taiList { + min-elements 1; + description "The list of TAIs."; + key "idx"; + leaf idx { type uint32 ; } + uses gnbcuup3gpp:TAIGrp; + } + + list taiRangeList { + min-elements 1; + description "The range of TAIs."; + key "idx"; + leaf idx { type uint32 ; } + uses nfp3gpp:TaiRangeGrp; + } + + list gUAMIdList { + description "List of supported Globally Unique AMF Ids (GUAMIs)."; + config false; + min-elements 1; + key "idx"; + leaf idx { type uint32 ; } + uses GUAMInfoGrp; + } + + list backupInfoAmfFailure { + description "List of GUAMIs for which the AMF acts as a backup for AMF + failure."; + min-elements 1; + key "idx"; + leaf idx { type uint32 ; } + uses GUAMInfoGrp; + } + + list backupInfoAmfRemoval { + description "List of GUAMIs for which the AMF acts as a backup for + planned AMF removal."; + min-elements 1; + key "idx"; + leaf idx { type uint32 ; } + uses GUAMInfoGrp; + } + + list n2InterfaceAmfInfo { + description "This attribute represents the N2 interface information of + the AMF. "; + max-elements 1; + key "idx"; + leaf idx { type uint32 ; } + uses N2InterfaceAmfInfoGrp; + } + + leaf amfOnboardingCapability { + type boolean; + default false; + description "This attribute indicates the AMF supports SNPN Onboarding + capability. This is used for the case of Onboarding of UEs for SNPNs + (see TS 23.501, clause 5.30.2.10). + - FALSE: AMF does not support SNPN Onboarding; + - TRUE: AMF supports SNPN Onboarding."; + } + + leaf highLatencyCom { + type boolean; + description "This attribute indicates whether the AMF supports High + Latency communication (e.g. for NR RedCap UE). This is used for CP NF + to discover AMF supporting High Latency communication (see TS 23.501, + clause 6.3.5). + - FALSE: AMF does not support High Latency communication e.g. for + NR RedCap UE; + - TRUE: AMF supports High Latency communication e.g. for NR RedCap UE;"; + } + } + grouping AMFFunctionGrp { description "Represents the AMFFunction IOC"; uses mf3gpp:ManagedFunctionGrp; - list pLMNIdList { + list pLMNInfoList { min-elements 1; - description "A list of PLMN identifiers (Mobile Country Code and Mobile - Network Code)."; - key "mcc mnc"; - uses types3gpp:PLMNId; + description "It defines the PLMN(s) of a Network Function. "; + key idx; + leaf idx { type uint32 ; } + uses types5g3gpp:PLMNInfo; } container aMFIdentifier { - //presence true; description "An AMF identifier, comprising an AMF Region ID, an AMF Set ID and an AMF Pointer."; uses types3gpp:AmfIdentifier; @@ -185,15 +477,14 @@ module _3gpp-5gc-nrm-amffunction { type inet:domain-name; } - list sNSSAIList { - min-elements 1; - description "List of S-NSSAIs the managed object is capable of supporting. - (Single Network Slice Selection Assistance Information) - An S-NSSAI has an SST (Slice/Service type) and an optional SD - (Slice Differentiator) field."; - reference "3GPP TS 23.003"; - key "sd sst"; - uses types5g3gpp:SNssai; + leaf-list cNSIIdList { + type string; + description "It is a set of NSI ID. NSI ID is an identifier for + identifying the Core Network part of a Network Slice instance when + multiple Network Slice instances of the same Network Slice are deployed, + and there is a need to differentiate between them in the 5GC. + See NSI ID definition in clause 3.1 of TS 23.501 and + subclause 6.1.6.2.7 of TS 29.531"; } list managedNFProfile { @@ -213,6 +504,39 @@ module _3gpp-5gc-nrm-amffunction { uses types5g3gpp:CommModel; } + list amfInfo { + max-elements 1; + description "This attribute represents information of an AMF + NF Instance."; + key "idx"; + leaf idx { type uint32 ; } + uses AmfInfoGrp; + } + + list nTNPLMNRestrictionsList { + description "This attribute defines the location restrictions per PLMN + that relates to non-terrestrial network access."; + key "idx"; + leaf idx { type uint32 ; } + uses NTNPLMNRestrictionsInfoGrp; + } + + list satelliteCoverageInfoList { + description "This attribute defines the information related to NR + Satellite RAT type and corresponding information of satellite coverage"; + key "idx"; + leaf idx { type uint32 ; } + uses SatelliteCoverageInfoGrp; + } + + list sliceExpiryInfo { + description "This provides information related to a network slice + validity."; + key "idx"; + leaf idx { type uint32 ; } + uses SliceExpiryInfoGrp; + } + list satelliteBackhaulInfoList{ description "Specifies a list of satellite backhaul information. It can be used by NF and NF services."; @@ -222,7 +546,7 @@ module _3gpp-5gc-nrm-amffunction { } key "GlobalRanNodeIDValue"; min-elements 1; - uses satelliteBackhaulInfo; + uses SatelliteBackhaulInfoGrp; } leaf-list mdtUserConsentReqList { @@ -243,12 +567,30 @@ module _3gpp-5gc-nrm-amffunction { Any MDT measurement, whose name is not specified in this list, is not subject to user consent at MDT activation."; } + + list mappedCellIdInfoList { + description "It provides the list of mapping between GEO area and + Mapped Cell ID."; + key "idx"; + leaf idx { type uint32 ; } + uses MappedCellIdInfoGrp; + } + + leaf aMFSetRef { + type types3gpp:DistinguishedName; + description "This is the DN of AMFSet"; + } } augment "/me3gpp:ManagedElement" { list AMFFunction { - description "5G Core AMF Function"; - reference "3GPP TS 28.541"; + description "This IOC represents the AMF functionality in 5GC. + For more information about the AMF, see 3GPP TS 23.501. + + The attribute sliceExpiryInfo is used when the validity information of + a network slice need to be configured. The attribute + sliceExpiryInfo.pLMNInfo indicates the network slice to which the + validity information applies."; key id; uses top3gpp:Top_Grp; container attributes { -- GitLab From d18e94b7893a127a09395d36e1aa778b19ba40eb Mon Sep 17 00:00:00 2001 From: "U-ERICSSON\\ETHBLL" Date: Mon, 4 Nov 2024 11:30:22 +0100 Subject: [PATCH 208/587] Revert "updated AMFFunction" This reverts commit 03f38a5daf83253aaeb0e11084efb09d30211125. --- yang-models/_3gpp-5g-common-yang-types.yang | 42 +-- yang-models/_3gpp-5gc-nrm-amffunction.yang | 388 ++------------------ 2 files changed, 24 insertions(+), 406 deletions(-) diff --git a/yang-models/_3gpp-5g-common-yang-types.yang b/yang-models/_3gpp-5g-common-yang-types.yang index 75786fb27..08b8fc721 100755 --- a/yang-models/_3gpp-5g-common-yang-types.yang +++ b/yang-models/_3gpp-5g-common-yang-types.yang @@ -3,6 +3,7 @@ module _3gpp-5g-common-yang-types { namespace "urn:3gpp:sa5:_3gpp-5g-common-yang-types"; prefix "types5g3gpp"; + import ietf-yang-types { prefix yang; } import _3gpp-common-yang-types { prefix types3gpp; } @@ -14,7 +15,6 @@ module _3gpp-5g-common-yang-types { TTA, TTC). All rights reserved."; reference "3GPP TS 28.541"; - revision 2024-10-06 { reference CR-1389; } revision 2024-05-24 { reference CR-1273 ; } revision 2023-09-18 { reference CR-1043 ; } revision 2023-05-10 { reference CR-0916; } @@ -22,46 +22,6 @@ module _3gpp-5g-common-yang-types { revision 2020-11-05 { reference CR-0412 ; } revision 2019-10-20 { reference "Initial version."; } - grouping NcgiGrp { - description "Represents the Ncgi datatype"; - - list plmnId { - description "This attribute represents a PLMN Identity."; - min-elements 1; - max-elements 1; - key "idx"; - leaf idx { type uint32 ; } - uses types3gpp:PLMNId ; - } - - leaf nrCellId { - type string; - mandatory true; - description "This attribute represents NR Cell Identity. - It's a 36-bit string identifying an NR Cell Id as specified in - clause 9.3.1.7 of TS 38.413, in hexadecimal representation. Each - character in the string shall take a value of - '0' to '9', 'a' to 'f' or 'A' to 'F' and shall represent 4 bits. - The most significant character representing the 4 most significant - bits of the Cell Id shall appear first in the string, and the - character representing the 4 least significant bit of the - Cell Id shall appear last in the string. - - Pattern: '^[A-Fa-f0-9]{9}$' - - Example: - An NR Cell Id 0x225BD6007 shall be encoded as '225BD6007'."; - } - - leaf nId { - type string; - mandatory true; - description "Network Identity; Shall be present if PlmnIdNid identifies - an SNPN (see clauses 5.30.2.3, 5.30.2.9, 6.3.4, and 6.3.8 in - 3GPP TS 23.501."; - } - } - typedef NRTAC { type string; description "This holds the identity of the common Tracking Area Code diff --git a/yang-models/_3gpp-5gc-nrm-amffunction.yang b/yang-models/_3gpp-5gc-nrm-amffunction.yang index f350abaec..310e71835 100755 --- a/yang-models/_3gpp-5gc-nrm-amffunction.yang +++ b/yang-models/_3gpp-5gc-nrm-amffunction.yang @@ -8,10 +8,7 @@ module _3gpp-5gc-nrm-amffunction { import _3gpp-common-yang-types { prefix types3gpp; } import _3gpp-5g-common-yang-types { prefix types5g3gpp; } import ietf-inet-types { prefix inet; } - import ietf-yang-types { prefix yang; } import _3gpp-common-top { prefix top3gpp; } - import _3gpp-nr-nrm-gnbcuupfunction { prefix gnbcuup3gpp ;} - import _3gpp-5gc-nrm-nfprofile { prefix nfp3gpp; } organization "3gpp SA5"; contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464"; @@ -20,16 +17,16 @@ module _3gpp-5gc-nrm-amffunction { TTA, TTC). All rights reserved."; reference "3GPP TS 28.541 5G Network Resource Model (NRM)"; - revision 2024-10-06 { reference CR-1389; } revision 2024-04-04 { reference CR-1139; } revision 2023-09-18 { reference CR-1043 ; } revision 2022-01-07 { reference CR-0643; } revision 2020-11-06 { reference CR-0412 ; } revision 2019-10-25 { reference "S5-194457 S5-193518"; } + revision 2019-05-31 { reference "Ericsson refactoring."; } revision 2018-08-07 { reference "Initial revision"; } - grouping NTNGlobalRanNodeIDGrp{ + grouping GlobalRanNodeIDGrp{ list pLMNId { description "The PLMN Identifier is composed of @@ -119,13 +116,14 @@ module _3gpp-5gc-nrm-amffunction { } } - grouping SatelliteBackhaulInfoGrp{ + grouping satelliteBackhaulInfo{ description "Defines information related to satellite backhaul category and corresponding information of gNB."; reference "3GPP TS 23.501"; - list nTNGlobalRanNodeID{ + list GlobalRanNodeID{ description "Unique identifier of an NG-RAN node."; + uses GlobalRanNodeIDGrp; min-elements 1; max-elements 1; leaf GlobalRanNodeIDValue{ @@ -133,7 +131,6 @@ module _3gpp-5gc-nrm-amffunction { description "this relies on the choice of GlobalRanNodeID"; } key "GlobalRanNodeIDValue"; - uses NTNGlobalRanNodeIDGrp; } leaf satelliteBackhaulCategory{ @@ -163,309 +160,20 @@ module _3gpp-5gc-nrm-amffunction { } } - grouping GUAMInfoGrp { - description "Represents the GUAMInfo datatype."; - - list pLMNId { - description "This attribute represents a PLMN Identity."; - min-elements 1; - max-elements 1; - key "idx"; - leaf idx { type uint32 ; } - uses types3gpp:PLMNId ; - } - - leaf aMFIdentifier { - type int64; - description "The AMFI is constructed from an AMF Region ID, an - AMF Set ID and an AMF Pointer. The AMF Region ID identifies the region, - the AMF Set ID uniquely identifies the AMF Set within the AMF Region, - and the AMF Pointer uniquely identifies the AMF within the AMF Set. - (Ref. 3GPP TS 23.003)"; - } - } - - grouping N2InterfaceAmfInfoGrp { - description "Represents the N2InterfaceAmfInfo datatype."; - - leaf-list ipv4EndpointAddress { - type inet:ipv4-address; - min-elements 1; - description "This attribute represents available AMF endpoint - IPv4 address(es) for N2."; - } - - leaf-list ipv6EndpointAddress { - type inet:ipv6-address; - min-elements 1; - description "This attribute represents available AMF endpoint - IPv6 address(es) for N2."; - } - - leaf amfName { - type inet:host-name; - description "This attribute represents AMF Name FQDN as defined in - clause 28.3.2.5 of TS 23.003."; - } - } - - grouping BlockedLocationInfoGrp { - description "Repreasents the datatype BlockedLocationInfo"; - - list blockedLocation { - description "This provides the geographical location at which the PLMN - are not allowed in case of NTN."; - min-elements 1; - max-elements 1; - key "mnc mcc"; - uses types3gpp:PLMNId ; - } - - list blockedDurWindow { - description "This provides the time durations for which the PLMN are - not allowed at a given location in case of NTN"; - key idx; - leaf idx { type uint32 ; } - uses types3gpp:TimeWindowGrp; - } - - list blockedSlice { - description "This provides the slice for which the access is - not allowed at a given location in case of NTN. "; - max-elements 1; - key idx; - unique "sst sd"; - leaf idx { type uint32; } - uses types5g3gpp:SNssai; - } - } - - grouping NTNPLMNRestrictionsInfoGrp { - description "Represents the datatype NTNPLMNRestrictionsInfo"; - - list pLMNId { - description "This attribute represents a PLMN Identity."; - min-elements 1; - max-elements 1; - key "mnc mcc"; - uses types3gpp:PLMNId ; - } - - list blockedLocationInfoList { - description "This defines the information related with the location - for which the access restrictions are to be applied in case of NTN."; - key "idx"; - leaf idx { type uint32 ; } - uses BlockedLocationInfoGrp; - } - } - - grouping NtnLocationInfoGrp { - description "Represents the NtnLocationInfo datatype."; - - list location { - description "This defines the Location (geographical area) under - consideration to which the satellite coverage info belongs"; - key idx; - leaf idx { type uint32 ; } - uses types3gpp:GeoAreaGrp; - } - - list availabilityWindows { - description "This attribute defines the list of time windows at which - the satellite coverage will be available for this location. - Either availabilityWindows or nonAvailabilityWindows shall be present."; - key idx; - leaf idx { type uint32 ; } - uses types3gpp:TimeWindowGrp; - } - - list nonAvailabilityWindows { - description "This attribute defines the list of time windows at which - the satellite coverage will not be available for this location. - Either availabilityWindows or nonAvailabilityWindows shall be present."; - key idx; - leaf idx { type uint32 ; } - uses types3gpp:TimeWindowGrp; - } - } - - grouping SatelliteCoverageInfoGrp { - description "Represents the datatype SatelliteCoverageInfo"; - - leaf nRSatelliteRATtype { - type enumeration { - enum NRLEO; - enum NRMEO; - enum NRGEO; - enum NROTHERSAT; - } - description "This attribute defines the RAT Type for NR satellite - access."; - } - - list locationInfo { - description "This attribute defines the information about location and - corresponding time windows for which the satellite coverage will be - available or unavailable."; - key idx; - leaf idx { type uint32 ; } - uses NtnLocationInfoGrp; - } - } - - grouping SliceExpiryInfoGrp { - description "Represents the datatype SliceExpiryInfo"; - - list pLMNInfo { - min-elements 1; // ??? - config false; - description "It defines the PLMN(s) of a Network Function. "; - key idx; - leaf idx { type uint32 ; } - uses types5g3gpp:PLMNInfo; - } - - leaf expiryTime { - type yang:date-and-time; - config false; - description "This attribute provides information about the time at - which the slice is scheduled to be expired as it is not required - anymore. - This attribute will be set based on the sliceAvailability coming as - part of ServiceProfile."; - } - } - - grouping MappedCellIdInfoGrp { - description "Represents the datatype MappedCellIdInfo"; - - list ntnGeoArea { - description "This attribute indicates a specific geographical location - mapped to Mapped Cell ID(s)."; - min-elements 1; - max-elements 1; - key "idx"; - leaf idx { type uint32 ; } - uses types3gpp:GeoAreaGrp; - } - - list mappedCellId { - description "This attribute is in format of NCGI to indicate a fixed - geographical area (See subclause 16.14.5 in TS 38.300"; - min-elements 1; - max-elements 1; - key "idx"; - leaf idx { type uint32 ; } - uses types5g3gpp:NcgiGrp; - } - } - - grouping AmfInfoGrp { - description "Represents the data type AmfInfo."; - - leaf amfRegionId { - type int64; - mandatory true; - description "It represents the AMF Region ID, which identifies the - region. AllowedValues: defined in subclause 2.10.1 of 3GPP TS 23.003 "; - } - - leaf amfSetId { - type int64; - mandatory true; - description "It represents the AMF Set ID, which is uniquely identifies - the AMF Set within the AMF Region. - allowedValues: defined in subclause 2.10.1 of 3GPP TS 23.003"; - } - - list taiList { - min-elements 1; - description "The list of TAIs."; - key "idx"; - leaf idx { type uint32 ; } - uses gnbcuup3gpp:TAIGrp; - } - - list taiRangeList { - min-elements 1; - description "The range of TAIs."; - key "idx"; - leaf idx { type uint32 ; } - uses nfp3gpp:TaiRangeGrp; - } - - list gUAMIdList { - description "List of supported Globally Unique AMF Ids (GUAMIs)."; - config false; - min-elements 1; - key "idx"; - leaf idx { type uint32 ; } - uses GUAMInfoGrp; - } - - list backupInfoAmfFailure { - description "List of GUAMIs for which the AMF acts as a backup for AMF - failure."; - min-elements 1; - key "idx"; - leaf idx { type uint32 ; } - uses GUAMInfoGrp; - } - - list backupInfoAmfRemoval { - description "List of GUAMIs for which the AMF acts as a backup for - planned AMF removal."; - min-elements 1; - key "idx"; - leaf idx { type uint32 ; } - uses GUAMInfoGrp; - } - - list n2InterfaceAmfInfo { - description "This attribute represents the N2 interface information of - the AMF. "; - max-elements 1; - key "idx"; - leaf idx { type uint32 ; } - uses N2InterfaceAmfInfoGrp; - } - - leaf amfOnboardingCapability { - type boolean; - default false; - description "This attribute indicates the AMF supports SNPN Onboarding - capability. This is used for the case of Onboarding of UEs for SNPNs - (see TS 23.501, clause 5.30.2.10). - - FALSE: AMF does not support SNPN Onboarding; - - TRUE: AMF supports SNPN Onboarding."; - } - - leaf highLatencyCom { - type boolean; - description "This attribute indicates whether the AMF supports High - Latency communication (e.g. for NR RedCap UE). This is used for CP NF - to discover AMF supporting High Latency communication (see TS 23.501, - clause 6.3.5). - - FALSE: AMF does not support High Latency communication e.g. for - NR RedCap UE; - - TRUE: AMF supports High Latency communication e.g. for NR RedCap UE;"; - } - } - grouping AMFFunctionGrp { description "Represents the AMFFunction IOC"; uses mf3gpp:ManagedFunctionGrp; - list pLMNInfoList { + list pLMNIdList { min-elements 1; - description "It defines the PLMN(s) of a Network Function. "; - key idx; - leaf idx { type uint32 ; } - uses types5g3gpp:PLMNInfo; + description "A list of PLMN identifiers (Mobile Country Code and Mobile + Network Code)."; + key "mcc mnc"; + uses types3gpp:PLMNId; } container aMFIdentifier { + //presence true; description "An AMF identifier, comprising an AMF Region ID, an AMF Set ID and an AMF Pointer."; uses types3gpp:AmfIdentifier; @@ -477,14 +185,15 @@ module _3gpp-5gc-nrm-amffunction { type inet:domain-name; } - leaf-list cNSIIdList { - type string; - description "It is a set of NSI ID. NSI ID is an identifier for - identifying the Core Network part of a Network Slice instance when - multiple Network Slice instances of the same Network Slice are deployed, - and there is a need to differentiate between them in the 5GC. - See NSI ID definition in clause 3.1 of TS 23.501 and - subclause 6.1.6.2.7 of TS 29.531"; + list sNSSAIList { + min-elements 1; + description "List of S-NSSAIs the managed object is capable of supporting. + (Single Network Slice Selection Assistance Information) + An S-NSSAI has an SST (Slice/Service type) and an optional SD + (Slice Differentiator) field."; + reference "3GPP TS 23.003"; + key "sd sst"; + uses types5g3gpp:SNssai; } list managedNFProfile { @@ -504,39 +213,6 @@ module _3gpp-5gc-nrm-amffunction { uses types5g3gpp:CommModel; } - list amfInfo { - max-elements 1; - description "This attribute represents information of an AMF - NF Instance."; - key "idx"; - leaf idx { type uint32 ; } - uses AmfInfoGrp; - } - - list nTNPLMNRestrictionsList { - description "This attribute defines the location restrictions per PLMN - that relates to non-terrestrial network access."; - key "idx"; - leaf idx { type uint32 ; } - uses NTNPLMNRestrictionsInfoGrp; - } - - list satelliteCoverageInfoList { - description "This attribute defines the information related to NR - Satellite RAT type and corresponding information of satellite coverage"; - key "idx"; - leaf idx { type uint32 ; } - uses SatelliteCoverageInfoGrp; - } - - list sliceExpiryInfo { - description "This provides information related to a network slice - validity."; - key "idx"; - leaf idx { type uint32 ; } - uses SliceExpiryInfoGrp; - } - list satelliteBackhaulInfoList{ description "Specifies a list of satellite backhaul information. It can be used by NF and NF services."; @@ -546,7 +222,7 @@ module _3gpp-5gc-nrm-amffunction { } key "GlobalRanNodeIDValue"; min-elements 1; - uses SatelliteBackhaulInfoGrp; + uses satelliteBackhaulInfo; } leaf-list mdtUserConsentReqList { @@ -567,30 +243,12 @@ module _3gpp-5gc-nrm-amffunction { Any MDT measurement, whose name is not specified in this list, is not subject to user consent at MDT activation."; } - - list mappedCellIdInfoList { - description "It provides the list of mapping between GEO area and - Mapped Cell ID."; - key "idx"; - leaf idx { type uint32 ; } - uses MappedCellIdInfoGrp; - } - - leaf aMFSetRef { - type types3gpp:DistinguishedName; - description "This is the DN of AMFSet"; - } } augment "/me3gpp:ManagedElement" { list AMFFunction { - description "This IOC represents the AMF functionality in 5GC. - For more information about the AMF, see 3GPP TS 23.501. - - The attribute sliceExpiryInfo is used when the validity information of - a network slice need to be configured. The attribute - sliceExpiryInfo.pLMNInfo indicates the network slice to which the - validity information applies."; + description "5G Core AMF Function"; + reference "3GPP TS 28.541"; key id; uses top3gpp:Top_Grp; container attributes { -- GitLab From 90e2286b66bbb7ec1a65cb03d2c6e4cb8b37d7a0 Mon Sep 17 00:00:00 2001 From: "U-ERICSSON\\ETHBLL" Date: Mon, 4 Nov 2024 11:52:39 +0100 Subject: [PATCH 209/587] update AMFFunction --- yang-models/_3gpp-5g-common-yang-types.yang | 42 ++- yang-models/_3gpp-5gc-nrm-amffunction.yang | 390 ++++++++++++++++++-- 2 files changed, 407 insertions(+), 25 deletions(-) diff --git a/yang-models/_3gpp-5g-common-yang-types.yang b/yang-models/_3gpp-5g-common-yang-types.yang index 08b8fc721..75786fb27 100755 --- a/yang-models/_3gpp-5g-common-yang-types.yang +++ b/yang-models/_3gpp-5g-common-yang-types.yang @@ -3,7 +3,6 @@ module _3gpp-5g-common-yang-types { namespace "urn:3gpp:sa5:_3gpp-5g-common-yang-types"; prefix "types5g3gpp"; - import ietf-yang-types { prefix yang; } import _3gpp-common-yang-types { prefix types3gpp; } @@ -15,6 +14,7 @@ module _3gpp-5g-common-yang-types { TTA, TTC). All rights reserved."; reference "3GPP TS 28.541"; + revision 2024-10-06 { reference CR-1389; } revision 2024-05-24 { reference CR-1273 ; } revision 2023-09-18 { reference CR-1043 ; } revision 2023-05-10 { reference CR-0916; } @@ -22,6 +22,46 @@ module _3gpp-5g-common-yang-types { revision 2020-11-05 { reference CR-0412 ; } revision 2019-10-20 { reference "Initial version."; } + grouping NcgiGrp { + description "Represents the Ncgi datatype"; + + list plmnId { + description "This attribute represents a PLMN Identity."; + min-elements 1; + max-elements 1; + key "idx"; + leaf idx { type uint32 ; } + uses types3gpp:PLMNId ; + } + + leaf nrCellId { + type string; + mandatory true; + description "This attribute represents NR Cell Identity. + It's a 36-bit string identifying an NR Cell Id as specified in + clause 9.3.1.7 of TS 38.413, in hexadecimal representation. Each + character in the string shall take a value of + '0' to '9', 'a' to 'f' or 'A' to 'F' and shall represent 4 bits. + The most significant character representing the 4 most significant + bits of the Cell Id shall appear first in the string, and the + character representing the 4 least significant bit of the + Cell Id shall appear last in the string. + + Pattern: '^[A-Fa-f0-9]{9}$' + + Example: + An NR Cell Id 0x225BD6007 shall be encoded as '225BD6007'."; + } + + leaf nId { + type string; + mandatory true; + description "Network Identity; Shall be present if PlmnIdNid identifies + an SNPN (see clauses 5.30.2.3, 5.30.2.9, 6.3.4, and 6.3.8 in + 3GPP TS 23.501."; + } + } + typedef NRTAC { type string; description "This holds the identity of the common Tracking Area Code diff --git a/yang-models/_3gpp-5gc-nrm-amffunction.yang b/yang-models/_3gpp-5gc-nrm-amffunction.yang index 310e71835..b28a1a521 100755 --- a/yang-models/_3gpp-5gc-nrm-amffunction.yang +++ b/yang-models/_3gpp-5gc-nrm-amffunction.yang @@ -8,7 +8,10 @@ module _3gpp-5gc-nrm-amffunction { import _3gpp-common-yang-types { prefix types3gpp; } import _3gpp-5g-common-yang-types { prefix types5g3gpp; } import ietf-inet-types { prefix inet; } + import ietf-yang-types { prefix yang; } import _3gpp-common-top { prefix top3gpp; } + import _3gpp-nr-nrm-gnbcuupfunction { prefix gnbcuup3gpp ;} + import _3gpp-5gc-nrm-nfprofile { prefix nfp3gpp; } organization "3gpp SA5"; contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464"; @@ -17,16 +20,16 @@ module _3gpp-5gc-nrm-amffunction { TTA, TTC). All rights reserved."; reference "3GPP TS 28.541 5G Network Resource Model (NRM)"; + revision 2024-10-06 { reference CR-1389; } revision 2024-04-04 { reference CR-1139; } revision 2023-09-18 { reference CR-1043 ; } revision 2022-01-07 { reference CR-0643; } revision 2020-11-06 { reference CR-0412 ; } revision 2019-10-25 { reference "S5-194457 S5-193518"; } - revision 2019-05-31 { reference "Ericsson refactoring."; } revision 2018-08-07 { reference "Initial revision"; } - - grouping GlobalRanNodeIDGrp{ + + grouping NTNGlobalRanNodeIDGrp{ list pLMNId { description "The PLMN Identifier is composed of @@ -116,14 +119,13 @@ module _3gpp-5gc-nrm-amffunction { } } - grouping satelliteBackhaulInfo{ + grouping SatelliteBackhaulInfoGrp{ description "Defines information related to satellite backhaul category and corresponding information of gNB."; reference "3GPP TS 23.501"; - list GlobalRanNodeID{ + list nTNGlobalRanNodeID{ description "Unique identifier of an NG-RAN node."; - uses GlobalRanNodeIDGrp; min-elements 1; max-elements 1; leaf GlobalRanNodeIDValue{ @@ -131,6 +133,7 @@ module _3gpp-5gc-nrm-amffunction { description "this relies on the choice of GlobalRanNodeID"; } key "GlobalRanNodeIDValue"; + uses NTNGlobalRanNodeIDGrp; } leaf satelliteBackhaulCategory{ @@ -160,20 +163,309 @@ module _3gpp-5gc-nrm-amffunction { } } + grouping GUAMInfoGrp { + description "Represents the GUAMInfo datatype."; + + list pLMNId { + description "This attribute represents a PLMN Identity."; + min-elements 1; + max-elements 1; + key "idx"; + leaf idx { type uint32 ; } + uses types3gpp:PLMNId ; + } + + leaf aMFIdentifier { + type int64; + description "The AMFI is constructed from an AMF Region ID, an + AMF Set ID and an AMF Pointer. The AMF Region ID identifies the region, + the AMF Set ID uniquely identifies the AMF Set within the AMF Region, + and the AMF Pointer uniquely identifies the AMF within the AMF Set. + (Ref. 3GPP TS 23.003)"; + } + } + + grouping N2InterfaceAmfInfoGrp { + description "Represents the N2InterfaceAmfInfo datatype."; + + leaf-list ipv4EndpointAddress { + type inet:ipv4-address; + min-elements 1; + description "This attribute represents available AMF endpoint + IPv4 address(es) for N2."; + } + + leaf-list ipv6EndpointAddress { + type inet:ipv6-address; + min-elements 1; + description "This attribute represents available AMF endpoint + IPv6 address(es) for N2."; + } + + leaf amfName { + type inet:host-name; + description "This attribute represents AMF Name FQDN as defined in + clause 28.3.2.5 of TS 23.003."; + } + } + + grouping BlockedLocationInfoGrp { + description "Repreasents the datatype BlockedLocationInfo"; + + list blockedLocation { + description "This provides the geographical location at which the PLMN + are not allowed in case of NTN."; + min-elements 1; + max-elements 1; + key "mnc mcc"; + uses types3gpp:PLMNId ; + } + + list blockedDurWindow { + description "This provides the time durations for which the PLMN are + not allowed at a given location in case of NTN"; + key idx; + leaf idx { type uint32 ; } + uses types3gpp:TimeWindowGrp; + } + + list blockedSlice { + description "This provides the slice for which the access is + not allowed at a given location in case of NTN. "; + max-elements 1; + key idx; + unique "sst sd"; + leaf idx { type uint32; } + uses types5g3gpp:SNssai; + } + } + + grouping NTNPLMNRestrictionsInfoGrp { + description "Represents the datatype NTNPLMNRestrictionsInfo"; + + list pLMNId { + description "This attribute represents a PLMN Identity."; + min-elements 1; + max-elements 1; + key "mnc mcc"; + uses types3gpp:PLMNId ; + } + + list blockedLocationInfoList { + description "This defines the information related with the location + for which the access restrictions are to be applied in case of NTN."; + key "idx"; + leaf idx { type uint32 ; } + uses BlockedLocationInfoGrp; + } + } + + grouping NtnLocationInfoGrp { + description "Represents the NtnLocationInfo datatype."; + + list location { + description "This defines the Location (geographical area) under + consideration to which the satellite coverage info belongs"; + key idx; + leaf idx { type uint32 ; } + uses types3gpp:GeoAreaGrp; + } + + list availabilityWindows { + description "This attribute defines the list of time windows at which + the satellite coverage will be available for this location. + Either availabilityWindows or nonAvailabilityWindows shall be present."; + key idx; + leaf idx { type uint32 ; } + uses types3gpp:TimeWindowGrp; + } + + list nonAvailabilityWindows { + description "This attribute defines the list of time windows at which + the satellite coverage will not be available for this location. + Either availabilityWindows or nonAvailabilityWindows shall be present."; + key idx; + leaf idx { type uint32 ; } + uses types3gpp:TimeWindowGrp; + } + } + + grouping SatelliteCoverageInfoGrp { + description "Represents the datatype SatelliteCoverageInfo"; + + leaf nRSatelliteRATtype { + type enumeration { + enum NRLEO; + enum NRMEO; + enum NRGEO; + enum NROTHERSAT; + } + description "This attribute defines the RAT Type for NR satellite + access."; + } + + list locationInfo { + description "This attribute defines the information about location and + corresponding time windows for which the satellite coverage will be + available or unavailable."; + key idx; + leaf idx { type uint32 ; } + uses NtnLocationInfoGrp; + } + } + + grouping SliceExpiryInfoGrp { + description "Represents the datatype SliceExpiryInfo"; + + list pLMNInfo { + min-elements 1; // ??? + config false; + description "It defines the PLMN(s) of a Network Function. "; + key idx; + leaf idx { type uint32 ; } + uses types5g3gpp:PLMNInfo; + } + + leaf expiryTime { + type yang:date-and-time; + config false; + description "This attribute provides information about the time at + which the slice is scheduled to be expired as it is not required + anymore. + This attribute will be set based on the sliceAvailability coming as + part of ServiceProfile."; + } + } + + grouping MappedCellIdInfoGrp { + description "Represents the datatype MappedCellIdInfo"; + + list ntnGeoArea { + description "This attribute indicates a specific geographical location + mapped to Mapped Cell ID(s)."; + min-elements 1; + max-elements 1; + key "idx"; + leaf idx { type uint32 ; } + uses types3gpp:GeoAreaGrp; + } + + list mappedCellId { + description "This attribute is in format of NCGI to indicate a fixed + geographical area (See subclause 16.14.5 in TS 38.300"; + min-elements 1; + max-elements 1; + key "idx"; + leaf idx { type uint32 ; } + uses types5g3gpp:NcgiGrp; + } + } + + grouping AmfInfoGrp { + description "Represents the data type AmfInfo."; + + leaf amfRegionId { + type int64; + mandatory true; + description "It represents the AMF Region ID, which identifies the + region. AllowedValues: defined in subclause 2.10.1 of 3GPP TS 23.003 "; + } + + leaf amfSetId { + type int64; + mandatory true; + description "It represents the AMF Set ID, which is uniquely identifies + the AMF Set within the AMF Region. + allowedValues: defined in subclause 2.10.1 of 3GPP TS 23.003"; + } + + list taiList { + min-elements 1; + description "The list of TAIs."; + key "idx"; + leaf idx { type uint32 ; } + uses gnbcuup3gpp:TAIGrp; + } + + list taiRangeList { + min-elements 1; + description "The range of TAIs."; + key "idx"; + leaf idx { type uint32 ; } + uses nfp3gpp:TaiRangeGrp; + } + + list gUAMIdList { + description "List of supported Globally Unique AMF Ids (GUAMIs)."; + config false; + min-elements 1; + key "idx"; + leaf idx { type uint32 ; } + uses GUAMInfoGrp; + } + + list backupInfoAmfFailure { + description "List of GUAMIs for which the AMF acts as a backup for AMF + failure."; + min-elements 1; + key "idx"; + leaf idx { type uint32 ; } + uses GUAMInfoGrp; + } + + list backupInfoAmfRemoval { + description "List of GUAMIs for which the AMF acts as a backup for + planned AMF removal."; + min-elements 1; + key "idx"; + leaf idx { type uint32 ; } + uses GUAMInfoGrp; + } + + list n2InterfaceAmfInfo { + description "This attribute represents the N2 interface information of + the AMF. "; + max-elements 1; + key "idx"; + leaf idx { type uint32 ; } + uses N2InterfaceAmfInfoGrp; + } + + leaf amfOnboardingCapability { + type boolean; + default false; + description "This attribute indicates the AMF supports SNPN Onboarding + capability. This is used for the case of Onboarding of UEs for SNPNs + (see TS 23.501, clause 5.30.2.10). + - FALSE: AMF does not support SNPN Onboarding; + - TRUE: AMF supports SNPN Onboarding."; + } + + leaf highLatencyCom { + type boolean; + description "This attribute indicates whether the AMF supports High + Latency communication (e.g. for NR RedCap UE). This is used for CP NF + to discover AMF supporting High Latency communication (see TS 23.501, + clause 6.3.5). + - FALSE: AMF does not support High Latency communication e.g. for + NR RedCap UE; + - TRUE: AMF supports High Latency communication e.g. for NR RedCap UE;"; + } + } + grouping AMFFunctionGrp { description "Represents the AMFFunction IOC"; uses mf3gpp:ManagedFunctionGrp; - list pLMNIdList { + list pLMNInfoList { min-elements 1; - description "A list of PLMN identifiers (Mobile Country Code and Mobile - Network Code)."; - key "mcc mnc"; - uses types3gpp:PLMNId; + description "It defines the PLMN(s) of a Network Function. "; + key idx; + leaf idx { type uint32 ; } + uses types5g3gpp:PLMNInfo; } container aMFIdentifier { - //presence true; description "An AMF identifier, comprising an AMF Region ID, an AMF Set ID and an AMF Pointer."; uses types3gpp:AmfIdentifier; @@ -185,15 +477,14 @@ module _3gpp-5gc-nrm-amffunction { type inet:domain-name; } - list sNSSAIList { - min-elements 1; - description "List of S-NSSAIs the managed object is capable of supporting. - (Single Network Slice Selection Assistance Information) - An S-NSSAI has an SST (Slice/Service type) and an optional SD - (Slice Differentiator) field."; - reference "3GPP TS 23.003"; - key "sd sst"; - uses types5g3gpp:SNssai; + leaf-list cNSIIdList { + type string; + description "It is a set of NSI ID. NSI ID is an identifier for + identifying the Core Network part of a Network Slice instance when + multiple Network Slice instances of the same Network Slice are deployed, + and there is a need to differentiate between them in the 5GC. + See NSI ID definition in clause 3.1 of TS 23.501 and + subclause 6.1.6.2.7 of TS 29.531"; } list managedNFProfile { @@ -213,6 +504,39 @@ module _3gpp-5gc-nrm-amffunction { uses types5g3gpp:CommModel; } + list amfInfo { + max-elements 1; + description "This attribute represents information of an AMF + NF Instance."; + key "idx"; + leaf idx { type uint32 ; } + uses AmfInfoGrp; + } + + list nTNPLMNRestrictionsList { + description "This attribute defines the location restrictions per PLMN + that relates to non-terrestrial network access."; + key "idx"; + leaf idx { type uint32 ; } + uses NTNPLMNRestrictionsInfoGrp; + } + + list satelliteCoverageInfoList { + description "This attribute defines the information related to NR + Satellite RAT type and corresponding information of satellite coverage"; + key "idx"; + leaf idx { type uint32 ; } + uses SatelliteCoverageInfoGrp; + } + + list sliceExpiryInfo { + description "This provides information related to a network slice + validity."; + key "idx"; + leaf idx { type uint32 ; } + uses SliceExpiryInfoGrp; + } + list satelliteBackhaulInfoList{ description "Specifies a list of satellite backhaul information. It can be used by NF and NF services."; @@ -222,7 +546,7 @@ module _3gpp-5gc-nrm-amffunction { } key "GlobalRanNodeIDValue"; min-elements 1; - uses satelliteBackhaulInfo; + uses SatelliteBackhaulInfoGrp; } leaf-list mdtUserConsentReqList { @@ -243,12 +567,30 @@ module _3gpp-5gc-nrm-amffunction { Any MDT measurement, whose name is not specified in this list, is not subject to user consent at MDT activation."; } + + list mappedCellIdInfoList { + description "It provides the list of mapping between GEO area and + Mapped Cell ID."; + key "idx"; + leaf idx { type uint32 ; } + uses MappedCellIdInfoGrp; + } + + leaf aMFSetRef { + type types3gpp:DistinguishedName; + description "This is the DN of AMFSet"; + } } augment "/me3gpp:ManagedElement" { list AMFFunction { - description "5G Core AMF Function"; - reference "3GPP TS 28.541"; + description "This IOC represents the AMF functionality in 5GC. + For more information about the AMF, see 3GPP TS 23.501. + + The attribute sliceExpiryInfo is used when the validity information of + a network slice need to be configured. The attribute + sliceExpiryInfo.pLMNInfo indicates the network slice to which the + validity information applies."; key id; uses top3gpp:Top_Grp; container attributes { -- GitLab From a9c98b1f2d475a912e62bd69498e61a76c5e9077 Mon Sep 17 00:00:00 2001 From: "U-ERICSSON\\ETHBLL" Date: Tue, 5 Nov 2024 01:14:26 +0100 Subject: [PATCH 210/587] Update LMFFunction --- yang-models/_3gpp-5g-common-yang-types.yang | 26 +++ yang-models/_3gpp-5gc-nrm-lmffunction.yang | 246 +++++++++++++++++++- 2 files changed, 262 insertions(+), 10 deletions(-) diff --git a/yang-models/_3gpp-5g-common-yang-types.yang b/yang-models/_3gpp-5g-common-yang-types.yang index 75786fb27..f286f2a94 100755 --- a/yang-models/_3gpp-5g-common-yang-types.yang +++ b/yang-models/_3gpp-5g-common-yang-types.yang @@ -14,6 +14,7 @@ module _3gpp-5g-common-yang-types { TTA, TTC). All rights reserved."; reference "3GPP TS 28.541"; + revision 2024-11-01 { reference CR-xxxx; } revision 2024-10-06 { reference CR-1389; } revision 2024-05-24 { reference CR-1273 ; } revision 2023-09-18 { reference CR-1043 ; } @@ -22,6 +23,31 @@ module _3gpp-5g-common-yang-types { revision 2020-11-05 { reference CR-0412 ; } revision 2019-10-20 { reference "Initial version."; } + grouping MappedCellIdInfoGrp { + description "This data type represents the mapping relationship between + Mapped Cell IDs and geographical areas (see clause 16.14.5 of TS 38.300"; + + list ntnGeoArea { + description "This attribute indicates a specific geographical location + mapped to Mapped Cell ID(s)."; + min-elements 1; + max-elements 1; + key idx; + leaf idx { type uint32; } + uses types3gpp:GeoAreaGrp; + } + + list mappedCellId { + description "This attribute is in format of NCGI to indicate a fixed + geographical area (See subclause 16.14.5 in TS 38.300)"; + min-elements 1; + max-elements 1; + key idx; + leaf idx { type uint32; } + uses NcgiGrp; + } + } + grouping NcgiGrp { description "Represents the Ncgi datatype"; diff --git a/yang-models/_3gpp-5gc-nrm-lmffunction.yang b/yang-models/_3gpp-5gc-nrm-lmffunction.yang index 6069ae513..776f87e86 100755 --- a/yang-models/_3gpp-5gc-nrm-lmffunction.yang +++ b/yang-models/_3gpp-5gc-nrm-lmffunction.yang @@ -9,28 +9,218 @@ module _3gpp-5gc-nrm-lmffunction { import _3gpp-common-yang-types { prefix types3gpp; } import _3gpp-5g-common-yang-types { prefix types5g3gpp; } import _3gpp-common-top { prefix top3gpp; } - + import _3gpp-5gc-nrm-nfprofile { prefix nfp3gpp; } + import _3gpp-nr-nrm-ntnfunction { prefix ntn3gpp; } + organization "3gpp SA5"; + contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464"; description "This IOC represents the LMF function defined in 3GPP TS 23.501. - Copyright 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + Copyright 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved."; reference "3GPP TS 28.541"; + revision 2024-11-01 { reference CR-xxxx ; } revision 2023-09-18 { reference CR-1043 ; } revision 2019-10-25 { reference "S5-194457 S5193518"; } + revision 2019-05-15 { reference "initial revision"; } + + grouping LmfInfoGrp { + description "Represents the LmfInfo datatype."; + + leaf-list servingClientTypes { + type enumeration { + enum EMERGENCY_SERVICES { + description "External client for emergency services"; + } + enum VALUE_ADDED_SERVICES { + description "External client for value added services"; + } + enum PLMN_OPERATOR_SERVICES { + description "External client for PLMN operator services"; + } + enum LAWFUL_INTERCEPT_SERVICES { + description "External client for Lawful Intercept services"; + } + enum PLMN_OPERATOR_BROADCAST_SERVICES { + description "External client for PLMN Operator Broadcast services"; + } + enum PLMN_OPERATOR_OM { + description "External client for PLMN Operator O&M"; + } + enum PLMN_OPERATOR_ANONYMOUS_STATISTICS { + description "External client for PLMN Operator anonymous statistics"; + } + enum PLMN_OPERATOR_TARGET_MS_SERVICE_SUPPORT { + description "External client for PLMN Operator target MS service + support"; + } + } + description "This attribute represents a list of external client type(s), + e.g. emergency client. The NRF should only include this LMF instance + to NF discovery with 'client-type' query parameter indicating one of + the external client types in the list. + + Absence of this attribute means the LMF is not dedicated to serve + specific client types."; + } + + leaf lmfId { + type string; + description "This attribute represents the LMF identification. + See clause 6.1.6.3.6 TS 29.572"; + } + + leaf-list servingAccessTypes { + type enumeration { + enum 3GPP_ACCESS; + enum NON_3GPP_ACCESS; + } + min-elements 1; + description "This attribute contains the access type (3GPP_ACCESS and/or + NON_3GPP_ACCESS) supported by the SMF. + If not included, it shall be assumed the both access types are + supported."; + } + + leaf-list servingAnNodeTypes { + type enumeration { + enum GNB; + enum NG; + enum ENB; + } + min-elements 1; + description "This attribute contains the AN node type (i.e. gNB or NG-eNB) + supported by the LMF. + If not included, it shall be assumed that all AN node types are + supported."; + } + + leaf-list servingRatTypes { + type string; + min-elements 1; + description "This attribute contains the RAT type (e.g. 5G NR, eLTE or + any of the RAT Types specified for NR satellite access) supported by + the LMF. + If not included, it shall be assumed that all RAT types are supported + allowedValues: see clause 5.4.3.2 of TS 29.571"; + } + + list taiList { + description "This attribute contains TAI list that the LMF can serve. + It may contain one or more non-3GPP access TAIs. + The absence of both this attribute and the taiRangeList attribute + indicates that the LMF can be selected for any TAI in the serving + network."; + min-elements 1; + key idx; + leaf idx { type uint32; } + uses types3gpp:TaiGrp; + } + + list taiRangeList { + description "This attribute contains TAI range list that the LMF can + serve. It may contain one or more non-3GPP access TAI ranges. + The absence of both this attribute and the taiList attribute indicates + that the LMF can be selected for any TAI in the serving network."; + min-elements 1; + key idx; + leaf idx { type uint32; } + uses nfp3gpp:TaiRangeGrp; + } + + leaf-list supportedGADShapes { + type enumeration { + enum POINT { + description "indicates Ellipsoid Point"; + } + enum POINT_UNCERTAINTY_CIRCLE { + description "indicates Ellipsoid point with uncertainty circle"; + } + enum POINT_UNCERTAINTY_ELLIPSE { + description "indicates Ellipsoid point with uncertainty ellipse"; + } + enum POLYGON { + description "indicates Polygon"; + } + enum POINT_ALTITUDE { + description "indicates Ellipsoid point with altitude"; + } + enum POINT_ALTITUDE_UNCERTAINTY { + description "indicates Ellipsoid point with altitude and + uncertainty ellipsoid"; + } + enum ELLIPSOID_ARC { + description "indicates Ellipsoid Arc"; + } + enum LOCAL_2D_POINT_UNCERTAINTY_ELLIPSE { + description "indicates Local 2D point with uncertainty ellipse"; + } + enum LOCAL_3D_POINT_UNCERTAINTY_ELLIPSOID { + description "indicates Local 3D point with uncertainty ellipsoid"; + } + } + min-elements 1; + description "This attribute contains the GAD shapes supported by the LMF. + If not included, it doesn't indicate that the LMF doesn't support any + GAD shapes. + The allowedValues are: see clause 6.1.6.3.4 of TS 29.572 "; + } + } - revision 2019-05-15 { - description "initial revision"; - reference "Based on - 3GPP TS 28.541 V15.X.XX"; + grouping TrpMappingInfoGrp { + description "This data type represents the mapping relationship between + satellite and TRPs."; + + leaf satelliteId { + type string { + pattern '[0-9]{5}'; + } + mandatory true; + description "This attribute indicates satellite Id. It shall be formatted + as a fixed 5-digit string, padding with leading digits '0' to complete + a 5-digit length."; + } + + leaf-list trpIds { + type uint8 { + range 1..max; + } + description "This attribute indicates TRPs uniquely within an NG-RAN + node (see TS 38.455 clause 9.2.24). A gNB may serve several TRPs. + For NTN, a TRP may be located on board the satellite."; + } } + + grouping TrpInfoGrp { + description "This data type represents the mapping relationship between + gNB and TRPs."; + + leaf gNBId { + type uint32; + mandatory true; + description "It identifies a gNB within a PLMN. The gNB ID is part of + the NR Cell Identifier (NCI) of the gNB cells. + See 'gNB Identifier (gNB ID)' of subclause 8.2 of TS 38.300. See + 'Global gNB ID' in subclause 9.3.1.6 of TS 38.413"; + } + list trpMappingInfoList { + description "This is the list of TRP mapping between satellite and TRPs."; + min-elements 1; + key idx; + leaf idx { type uint32; } + uses TrpMappingInfoGrp; + } + } + grouping LMFFunctionGrp { uses mf3gpp:ManagedFunctionGrp; list pLMNIdList { - description "List of at most six entries of PLMN Identifiers, but at least one (the primary PLMN Id). - The PLMN Identifier is composed of a Mobile Country Code (MCC) and a Mobile Network Code (MNC)."; + description "List of at most six entries of PLMN Identifiers, but at + least one (the primary PLMN Id). + The PLMN Identifier is composed of a Mobile Country Code (MCC) and a + Mobile Network Code (MNC)."; min-elements 1; max-elements 6; @@ -39,22 +229,58 @@ module _3gpp-5gc-nrm-lmffunction { } list managedNFProfile { + description "This parameter defines profile for managed NF. See TS 23.501"; key idx; min-elements 1; uses types3gpp:ManagedNFProfile; } list commModelList { + description "The attribute specifies a list of commModel. It can be used + by NF and NF services to interact with each other in 5G Core network + (see TS 23.501)"; min-elements 1; key "groupId"; uses types5g3gpp:CommModel; } + + list lmfInfo { + description "This attribute represents information of an LMF NF Instance"; + max-elements 1; + key idx; + leaf idx { type uint32; } + uses LmfInfoGrp; + } + + list mappedCellIdInfoList { + description "It provides the list of mapping between GEO area and + Mapped Cell ID."; + key idx; + leaf idx { type uint32; } + uses types5g3gpp:MappedCellIdInfoGrp; + } + + list ephemerisInfos { + description "This is the list of Ephemeris related information"; + min-elements 1; + key idx; + leaf idx { type uint32; } + uses ntn3gpp:EphemerisGrp; + } + + list trpInfoList { + description "This is the list of TRP (Transmission-Reception Point) + related information on LMF (see TS 38.305 clause 5.4.4)."; + min-elements 1; + key idx; + leaf idx { type uint32; } + uses TrpInfoGrp; + } } augment "/me3gpp:ManagedElement" { list LMFFunction { - description "5G Core LMF Function"; - reference "3GPP TS 28.541"; + description "5G Core LMF Function defined in TS 23.501"; key id; uses top3gpp:Top_Grp; container attributes { -- GitLab From fa2b151be25d82c2c670c5fbc0ca98dc9d1535b7 Mon Sep 17 00:00:00 2001 From: "U-ERICSSON\\ETHBLL" Date: Wed, 6 Nov 2024 00:42:15 +0100 Subject: [PATCH 211/587] update gnbcucp and gnbcuup --- yang-models/_3gpp-5gc-nrm-amffunction.yang | 4 +- yang-models/_3gpp-common-yang-types.yang | 30 +++- yang-models/_3gpp-nr-nrm-gnbcucpfunction.yang | 156 +++++++++++++++--- yang-models/_3gpp-nr-nrm-gnbcuupfunction.yang | 78 +-------- 4 files changed, 157 insertions(+), 111 deletions(-) diff --git a/yang-models/_3gpp-5gc-nrm-amffunction.yang b/yang-models/_3gpp-5gc-nrm-amffunction.yang index b28a1a521..2fb54ed2a 100755 --- a/yang-models/_3gpp-5gc-nrm-amffunction.yang +++ b/yang-models/_3gpp-5gc-nrm-amffunction.yang @@ -10,7 +10,6 @@ module _3gpp-5gc-nrm-amffunction { import ietf-inet-types { prefix inet; } import ietf-yang-types { prefix yang; } import _3gpp-common-top { prefix top3gpp; } - import _3gpp-nr-nrm-gnbcuupfunction { prefix gnbcuup3gpp ;} import _3gpp-5gc-nrm-nfprofile { prefix nfp3gpp; } organization "3gpp SA5"; @@ -20,6 +19,7 @@ module _3gpp-5gc-nrm-amffunction { TTA, TTC). All rights reserved."; reference "3GPP TS 28.541 5G Network Resource Model (NRM)"; + revision 2024-11-01 { reference CR-xxxx; } revision 2024-10-06 { reference CR-1389; } revision 2024-04-04 { reference CR-1139; } revision 2023-09-18 { reference CR-1043 ; } @@ -384,7 +384,7 @@ module _3gpp-5gc-nrm-amffunction { description "The list of TAIs."; key "idx"; leaf idx { type uint32 ; } - uses gnbcuup3gpp:TAIGrp; + uses types3gpp:TaiGrp; } list taiRangeList { diff --git a/yang-models/_3gpp-common-yang-types.yang b/yang-models/_3gpp-common-yang-types.yang index 25d9a5b5b..26ce0e0a1 100755 --- a/yang-models/_3gpp-common-yang-types.yang +++ b/yang-models/_3gpp-common-yang-types.yang @@ -620,10 +620,24 @@ module _3gpp-common-yang-types { } typedef Tac { - type int32 { - range 0..16777215 ; - } - description "Tracking Area Code"; + type string { + pattern "([A-Fa-f0-9]{4})|([A-Fa-f0-9]{6})" ; + } + description "Tracking Area Code + 2 or 3-octet string identifying a tracking area code as specified in + clause 9.3.3.10 of 3GPP TS 38.413 [34], in hexadecimal representation. + Each character in the string shall take a value of + '0' to '9', 'a' to 'f' or 'A' to 'F' and shall represent 4 bits. + The most significant character representing the 4 most significant + bits of the TAC shall appear first in the string, and the character + representing the 4 least significant bit of the TAC shall appear last + in the string. + + pattern: '(^[A-Fa-f0-9]{4}$)|(^[A-Fa-f0-9]{6}$)' + + Examples: + A legacy TAC 0x4305 shall be encoded as '4305'. + An extended TAC 0x63F84B shall be encoded as '63F84B'"; reference "TS 23.003 clause 19.4.2.3"; } @@ -632,7 +646,7 @@ module _3gpp-common-yang-types { as specified in clause 28.6 of TS 23.003, clause 8.2 of TS 38.300 and clause 9.3.3.11 of TS 38.413. It is composed of the PLMN identifier (PLMN-Id, which is composed of the MCC and MNC) and - the Tracking Area Code (TAC). "; + the Tracking Area Code (TAC)."; list plmnId { description "PLMN Identity."; min-elements 1; @@ -641,7 +655,11 @@ module _3gpp-common-yang-types { uses types3gpp:PLMNId; } - leaf tac { type Tac; } + leaf tac { + type Tac; + mandatory true; + description "Tracking Area Code"; + } } grouping GeoCoordinateGrp { diff --git a/yang-models/_3gpp-nr-nrm-gnbcucpfunction.yang b/yang-models/_3gpp-nr-nrm-gnbcucpfunction.yang index 839cb879c..80e45505c 100755 --- a/yang-models/_3gpp-nr-nrm-gnbcucpfunction.yang +++ b/yang-models/_3gpp-nr-nrm-gnbcucpfunction.yang @@ -4,6 +4,7 @@ module _3gpp-nr-nrm-gnbcucpfunction { prefix "gnbcucp3gpp"; import _3gpp-common-yang-types { prefix types3gpp; } + import _3gpp-5g-common-yang-types { prefix types5g3gpp; } import _3gpp-common-yang-extensions { prefix yext3gpp; } import _3gpp-common-managed-function { prefix mf3gpp; } import _3gpp-common-managed-element { prefix me3gpp; } @@ -19,6 +20,7 @@ module _3gpp-nr-nrm-gnbcucpfunction { TTA, TTC). All rights reserved."; reference "3GPP TS 28.541 5G Network Resource Model (NRM)"; + revision 2024-08-19 { reference "CR-xxxx"; } revision 2024-08-19 { reference "CR-1337 CR-1352"; } revision 2024-05-24 { reference CR-1273 ; } revision 2024-04-04 { reference CR-1139; } @@ -56,7 +58,85 @@ module _3gpp-nr-nrm-gnbcucpfunction { feature DMROFunction { description "Class representing D-SON function of MRO feature"; } - + + grouping BackhaulAddressGrp { + description "This data type represents the properties describing the + backhaul address of gNB. "; + + leaf gNBId { + type uint32 ; + mandatory true; + description "It identifies a gNB within a PLMN. The gNB ID is part of + the NR Cell Identifier (NCI) of the gNB cells."; + reference "gNB Identifier (gNB ID) of subclause 8.2 of TS 38.300. + Global gNB ID in subclause 9.3.1.6 of TS 38.413"; + } + + list tAI { + key tac; + min-elements 1; + max-elements 1; + description "Tracking Area Identity"; + reference "subclause 9.3.3.11 in TS 38.413"; + uses types3gpp:TaiGrp; + } + } + + grouping MappingSetIDBackhaulAddressGrp { + description "This data type represents the properties describing the + mapping relationship between set ID and backhaul address of gNB."; + + leaf setID { + type uint32 { + range 0..4194304; // 22 bits + } + mandatory true; + description "This specifies the set ID of a victim Set (RIM-RS1 Set) or + aggressor Set (RIM-RS2 set). (See subclause 7.4.1.6 in TS 38.211). + + allowedValues: + The bit length of the set ID is maximum 22bit."; + } + + list backhaulAddress { + description "The attribute specifies backhaulAddress which is defined as + a datatype."; + min-elements 1; + max-elements 1; + key gNBId; + uses BackhaulAddressGrp; + } + } + + grouping tceIDMappingInfoGrp { + description "This data type represents the properties describing the + mapping relationship between TCE ID, PLMN where TCE resides and + IP address of TCE."; + + leaf tceIPAddress { + type inet:ip-address; + mandatory true; + description "This attribute indicates IP address of TCE. + (See subclause 4.1.1.9.2 in TS 32.422)"; + } + + leaf tceID { + type int64; + mandatory true; + description "This attribute indicates TCE Id. + (See subclause 4.1.1.9.2 in TS 32.422)"; + } + + list pLMNTarget { + description "Indicates the PLMN where TCE resides. + (See subclauses 4.1.1.9.2 and 4.9.2 in TS 32.422)"; + min-elements 1; + max-elements 1; + key mnc; + uses types3gpp:PLMNId; + } + } + grouping GNBCUCPFunctionGrp { description "Represents the GNBCUCPFunction IOC."; reference "3GPP TS 28.541"; @@ -114,46 +194,50 @@ module _3gpp-nr-nrm-gnbcucpfunction { description "List of nodes to which X2 connections are enforced."; } - leaf-list xnHOBlockList { - type string; - description "List of nodes to which handovers over Xn are prohibited."; - } - - leaf configurable5QISetRef { - type types3gpp:DistinguishedName; - description "DN of the Configurable5QISet that the GNBCUCPFunction - supports (is associated to)."; - } - leaf-list x2HOBlockList { type string; description "List of nodes to which handovers over X2 are prohibited."; } - leaf dynamic5QISetRef { - type types3gpp:DistinguishedName; - description "DN of the Dynamic5QISet that the GNBCUCPFunction supports - (is associated to)."; + leaf-list xnHOBlockList { + type string; + description "List of nodes to which handovers over Xn are prohibited."; } - leaf dCHOControl { - type boolean; - description "This attribute determines whether the CHO function is - enabled or disabled."; + list mappingSetIDBackhaulAddressList { + description "The attribute specifies a list of mappingSetIDBackhaulAddress + which is defined as a datatype. Which is used to + retrieve the backhaul address of the victim set."; + min-elements 1; + key idx; + leaf idx {type uint32; } + uses MappingSetIDBackhaulAddressGrp; } - - leaf dLTMCellSwitchControl { - type boolean; - description "This attribute determines whether the distributed SON - function LTM Cell Switch is enabled or disabled."; + + list tceIDMappingInfoList { + description "This attribute includes a list of TCE ID, PLMN where TCE + resides and the corresponding TCE IP address. It is used in Logged MDT + case to provide the information to the gNodeB or GNBCUCPFunction to + get the corresponding TCE IP address when there is an MDT log + received from the UE."; + min-elements 1; + key idx; + leaf idx { type uint32; } + uses tceIDMappingInfoGrp; } - + leaf dDAPSHOControl { type boolean; description "This attribute determines whether the DAPS handover function is enabled or disabled."; } + leaf dCHOControl { + type boolean; + description "This attribute determines whether the CHO function is + enabled or disabled."; + } + list qceIdMappingInfoList { description "List of the mapping relationship between QoE collection entity identity, PLMN where QoE collection entity resides, and the IP address of @@ -183,6 +267,26 @@ module _3gpp-nr-nrm-gnbcucpfunction { subject to user consent at MDT activation."; } + list mappedCellIdInfoList { + description "This attribute provides the list of mapping between + geographical location and Mapped Cell ID."; + key idx; + leaf idx { type uint32; } + uses types5g3gpp:MappedCellIdInfoGrp; + } + + leaf configurable5QISetRef { + type types3gpp:DistinguishedName; + description "DN of the Configurable5QISet that the GNBCUCPFunction + supports (is associated to)."; + } + + leaf dynamic5QISetRef { + type types3gpp:DistinguishedName; + description "DN of the Dynamic5QISet that the GNBCUCPFunction supports + (is associated to)."; + } + leaf ephemerisInfoSetRef { type types3gpp:DistinguishedName; description "This is the DN of EphemerisInfoSet."; diff --git a/yang-models/_3gpp-nr-nrm-gnbcuupfunction.yang b/yang-models/_3gpp-nr-nrm-gnbcuupfunction.yang index fed4880c9..6009e3784 100755 --- a/yang-models/_3gpp-nr-nrm-gnbcuupfunction.yang +++ b/yang-models/_3gpp-nr-nrm-gnbcuupfunction.yang @@ -19,6 +19,7 @@ module _3gpp-nr-nrm-gnbcuupfunction { TTA, TTC). All rights reserved."; reference "3GPP TS 28.541 5G Network Resource Model (NRM)"; + revision 2024-11-01 { reference CR-xxxx ; } revision 2024-05-24 { reference CR-1273 ; } revision 2023-09-18 { reference CR-1043 ; } revision 2023-04-26 { reference CR-0916; } @@ -38,74 +39,6 @@ module _3gpp-nr-nrm-gnbcuupfunction { GNBCUUPFunction"; } - grouping TAIGrp { - description "Tracking Area Identity"; - - list pLMNId { - key "mcc mnc"; - description "PLMN IDs for the Tracking area"; - uses types3gpp:PLMNId; - } - - leaf nRTAC { - type types5g3gpp:NRTAC; - description "Identity of the common Tracking Area Code for the PLMNs - allowedValues: - a) It is the TAC or Extended-TAC. - b) A cell can only broadcast one TAC or Extended-TAC. - See TS 36.300, subclause 10.1.7 (PLMNID and TAC relation). - c) TAC is defined in subclause 19.4.2.3 of 3GPP TS 23.003 and - Extended-TAC is defined in subclause 9.3.1.29 of 3GPP TS 38.473. - d) For a 5G SA (Stand Alone), it has a non-null value."; - } - } - - grouping BackhaulAddressGrp { - description "Indicates the backhauladdress of gNB."; - - leaf gNBId { - type uint32 { - range "0..4294967295"; - } - description "It identifies a gNB within a PLMN. The gNB ID is part of - the NR Cell Identifier (NCI) of the gNB cells."; - reference "gNB Identifier (gNB ID) of subclause 8.2 of TS 38.300. - Global gNB ID in subclause 9.3.1.6 of TS 38.413"; - } - - list tAI { - key nRTAC; - min-elements 1; - max-elements 1; - description "Tracking Area Identity"; - reference "subclause 9.3.3.11 in TS 38.413"; - uses TAIGrp; - } - } - - grouping MappingSetIDBackhaulAddressGrp { - description "Mapping relationship between setID and backhaulAddress of gNB"; - - leaf idx { - type uint32 ; - description "ID value"; - } - - leaf setID { - type uint32; - mandatory true; - description "Indicates the setID of gNB."; - reference "Subclause 7.4.1.6 in TS 38.211"; - } - - list backhaulAddress { - key gNBId; - min-elements 1; - max-elements 1; - description "Indicates the backhauladdress of gNB."; - uses BackhaulAddressGrp; - } - } grouping GNBCUUPFunctionGrp { description "Represents the GNBCUUPFunction IOC."; reference "3GPP TS 28.541"; @@ -147,15 +80,6 @@ module _3gpp-nr-nrm-gnbcuupfunction { uses types5g3gpp:PLMNInfo; } - list mappingSetIDBackhaulAddressList { - key idx; - description "Specifies a list of mappingSetIDBackhaulAddress used to - retrieve the backhaul address of the victim set. - Must be present if Remote Interference Management function is - supported."; - uses MappingSetIDBackhaulAddressGrp; - } - leaf configurable5QISetRef { type types3gpp:DistinguishedName; description "DN of the Configurable5QISet that the GNBCUUPFunction -- GitLab From 0a780d6c33c8eb6d21c2d6091d36b282afd5210c Mon Sep 17 00:00:00 2001 From: "U-ERICSSON\\ETHBLL" Date: Wed, 6 Nov 2024 01:30:22 +0100 Subject: [PATCH 212/587] correct name of BWPSet IOC --- yang-models/#Untitled-1# | 4 ++++ yang-models/_3gpp-nr-nrm-bwpset.yang | 3 ++- 2 files changed, 6 insertions(+), 1 deletion(-) create mode 100644 yang-models/#Untitled-1# diff --git a/yang-models/#Untitled-1# b/yang-models/#Untitled-1# new file mode 100644 index 000000000..1b33bd249 --- /dev/null +++ b/yang-models/#Untitled-1# @@ -0,0 +1,4 @@ +look for every place of +EphemerisGrp +Satellit + diff --git a/yang-models/_3gpp-nr-nrm-bwpset.yang b/yang-models/_3gpp-nr-nrm-bwpset.yang index cba0ca407..2fc32a0ca 100644 --- a/yang-models/_3gpp-nr-nrm-bwpset.yang +++ b/yang-models/_3gpp-nr-nrm-bwpset.yang @@ -16,6 +16,7 @@ module _3gpp-nr-nrm-bwpset { TTA, TTC). All rights reserved."; reference "3GPP TS 28.541 5G Network Resource Model (NRM)"; + revision 2024-11-01 { reference CR-xxxx ; } revision 2024-08-19 { reference CR-1314 ; } revision 2023-09-18 { reference CR-1043 ; } revision 2022-06-29 { reference CR-0756 ; } @@ -27,7 +28,7 @@ module _3gpp-nr-nrm-bwpset { } augment "/me3gpp:ManagedElement/gnbdu3gpp:GNBDUFunction" { - list BWPLSett { + list BWPSet { description "Represents a bandwidth part (BWP) set."; key id; uses top3gpp:Top_Grp; -- GitLab From e8b72e99504e6fbc57c5f1c364822ecb40d008e8 Mon Sep 17 00:00:00 2001 From: lengyelb Date: Fri, 8 Nov 2024 22:14:46 +0000 Subject: [PATCH 213/587] Update revision statement _3gpp-common-yang-types.yang --- yang-models/_3gpp-common-yang-types.yang | 1 + 1 file changed, 1 insertion(+) diff --git a/yang-models/_3gpp-common-yang-types.yang b/yang-models/_3gpp-common-yang-types.yang index 26ce0e0a1..37fadf04a 100755 --- a/yang-models/_3gpp-common-yang-types.yang +++ b/yang-models/_3gpp-common-yang-types.yang @@ -16,6 +16,7 @@ module _3gpp-common-yang-types { TTA, TTC). All rights reserved."; reference "3GPP TS 28.623"; + revision 2024-11-01 { reference CR-0463; } revision 2024-08-13 { reference CR-0387; } revision 2024-05-18 { reference CR-0359; } revision 2024-04-12 { reference CR-0346; } -- GitLab From be2999439b0a1439afb463d449172fcdf738c78f Mon Sep 17 00:00:00 2001 From: lengyelb Date: Fri, 8 Nov 2024 22:22:13 +0000 Subject: [PATCH 214/587] Update revision statement _3gpp-5g-common-yang-types.yang --- yang-models/_3gpp-5g-common-yang-types.yang | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/yang-models/_3gpp-5g-common-yang-types.yang b/yang-models/_3gpp-5g-common-yang-types.yang index f286f2a94..421940541 100755 --- a/yang-models/_3gpp-5g-common-yang-types.yang +++ b/yang-models/_3gpp-5g-common-yang-types.yang @@ -14,7 +14,7 @@ module _3gpp-5g-common-yang-types { TTA, TTC). All rights reserved."; reference "3GPP TS 28.541"; - revision 2024-11-01 { reference CR-xxxx; } + revision 2024-11-01 { reference CR-1405; } revision 2024-10-06 { reference CR-1389; } revision 2024-05-24 { reference CR-1273 ; } revision 2023-09-18 { reference CR-1043 ; } -- GitLab From 5715b32d69cadae33022e00c66b3f37efbb24746 Mon Sep 17 00:00:00 2001 From: lengyelb Date: Fri, 8 Nov 2024 22:22:54 +0000 Subject: [PATCH 215/587] Update revision statement _3gpp-5gc-nrm-amffunction.yang --- yang-models/_3gpp-5gc-nrm-amffunction.yang | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/yang-models/_3gpp-5gc-nrm-amffunction.yang b/yang-models/_3gpp-5gc-nrm-amffunction.yang index 2fb54ed2a..cf6b290f2 100755 --- a/yang-models/_3gpp-5gc-nrm-amffunction.yang +++ b/yang-models/_3gpp-5gc-nrm-amffunction.yang @@ -19,7 +19,7 @@ module _3gpp-5gc-nrm-amffunction { TTA, TTC). All rights reserved."; reference "3GPP TS 28.541 5G Network Resource Model (NRM)"; - revision 2024-11-01 { reference CR-xxxx; } + revision 2024-11-01 { reference CR-1405; } revision 2024-10-06 { reference CR-1389; } revision 2024-04-04 { reference CR-1139; } revision 2023-09-18 { reference CR-1043 ; } -- GitLab From afb50d4a71991eed76563071374dfad2a90fe33a Mon Sep 17 00:00:00 2001 From: lengyelb Date: Fri, 8 Nov 2024 22:23:42 +0000 Subject: [PATCH 216/587] Update revision statement _3gpp-5gc-nrm-lmffunction.yang --- yang-models/_3gpp-5gc-nrm-lmffunction.yang | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/yang-models/_3gpp-5gc-nrm-lmffunction.yang b/yang-models/_3gpp-5gc-nrm-lmffunction.yang index 776f87e86..2a612372f 100755 --- a/yang-models/_3gpp-5gc-nrm-lmffunction.yang +++ b/yang-models/_3gpp-5gc-nrm-lmffunction.yang @@ -19,7 +19,7 @@ module _3gpp-5gc-nrm-lmffunction { TTA, TTC). All rights reserved."; reference "3GPP TS 28.541"; - revision 2024-11-01 { reference CR-xxxx ; } + revision 2024-11-01 { reference CR-1405 ; } revision 2023-09-18 { reference CR-1043 ; } revision 2019-10-25 { reference "S5-194457 S5193518"; } revision 2019-05-15 { reference "initial revision"; } -- GitLab From f4946ba040705299e809576dbe6c6df12d3e4955 Mon Sep 17 00:00:00 2001 From: lengyelb Date: Fri, 8 Nov 2024 22:24:27 +0000 Subject: [PATCH 217/587] Update revision statement _3gpp-nr-nrm-bwpset.yang --- yang-models/_3gpp-nr-nrm-bwpset.yang | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/yang-models/_3gpp-nr-nrm-bwpset.yang b/yang-models/_3gpp-nr-nrm-bwpset.yang index 2fc32a0ca..42f700352 100644 --- a/yang-models/_3gpp-nr-nrm-bwpset.yang +++ b/yang-models/_3gpp-nr-nrm-bwpset.yang @@ -16,7 +16,7 @@ module _3gpp-nr-nrm-bwpset { TTA, TTC). All rights reserved."; reference "3GPP TS 28.541 5G Network Resource Model (NRM)"; - revision 2024-11-01 { reference CR-xxxx ; } + revision 2024-11-01 { reference CR-1405 ; } revision 2024-08-19 { reference CR-1314 ; } revision 2023-09-18 { reference CR-1043 ; } revision 2022-06-29 { reference CR-0756 ; } -- GitLab From 5267bcaa7a5b897817aa9134f9eb86f10dc01795 Mon Sep 17 00:00:00 2001 From: lengyelb Date: Fri, 8 Nov 2024 22:25:16 +0000 Subject: [PATCH 218/587] Update revision statement _3gpp-nr-nrm-gnbcucpfunction.yang --- yang-models/_3gpp-nr-nrm-gnbcucpfunction.yang | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/yang-models/_3gpp-nr-nrm-gnbcucpfunction.yang b/yang-models/_3gpp-nr-nrm-gnbcucpfunction.yang index 80e45505c..ca324f891 100755 --- a/yang-models/_3gpp-nr-nrm-gnbcucpfunction.yang +++ b/yang-models/_3gpp-nr-nrm-gnbcucpfunction.yang @@ -20,7 +20,7 @@ module _3gpp-nr-nrm-gnbcucpfunction { TTA, TTC). All rights reserved."; reference "3GPP TS 28.541 5G Network Resource Model (NRM)"; - revision 2024-08-19 { reference "CR-xxxx"; } + revision 2024-08-19 { reference "CR-1405"; } revision 2024-08-19 { reference "CR-1337 CR-1352"; } revision 2024-05-24 { reference CR-1273 ; } revision 2024-04-04 { reference CR-1139; } -- GitLab From d4d01ff98a04429fb0b2a51f401d3f7032c00018 Mon Sep 17 00:00:00 2001 From: lengyelb Date: Fri, 8 Nov 2024 22:25:49 +0000 Subject: [PATCH 219/587] Update revision statement _3gpp-nr-nrm-gnbcuupfunction.yang --- yang-models/_3gpp-nr-nrm-gnbcuupfunction.yang | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/yang-models/_3gpp-nr-nrm-gnbcuupfunction.yang b/yang-models/_3gpp-nr-nrm-gnbcuupfunction.yang index 6009e3784..4238ccf3b 100755 --- a/yang-models/_3gpp-nr-nrm-gnbcuupfunction.yang +++ b/yang-models/_3gpp-nr-nrm-gnbcuupfunction.yang @@ -19,7 +19,7 @@ module _3gpp-nr-nrm-gnbcuupfunction { TTA, TTC). All rights reserved."; reference "3GPP TS 28.541 5G Network Resource Model (NRM)"; - revision 2024-11-01 { reference CR-xxxx ; } + revision 2024-11-01 { reference CR-1405 ; } revision 2024-05-24 { reference CR-1273 ; } revision 2023-09-18 { reference CR-1043 ; } revision 2023-04-26 { reference CR-0916; } -- GitLab From b0aa84738564f9885414b8baebd4704e373c4bc7 Mon Sep 17 00:00:00 2001 From: lengyelb Date: Mon, 25 Nov 2024 21:35:50 +0000 Subject: [PATCH 220/587] Delete #Untitled-1# --- yang-models/#Untitled-1# | 4 ---- 1 file changed, 4 deletions(-) delete mode 100644 yang-models/#Untitled-1# diff --git a/yang-models/#Untitled-1# b/yang-models/#Untitled-1# deleted file mode 100644 index 1b33bd249..000000000 --- a/yang-models/#Untitled-1# +++ /dev/null @@ -1,4 +0,0 @@ -look for every place of -EphemerisGrp -Satellit - -- GitLab From 4831f594d31b87771753c8630576d88a23a53e19 Mon Sep 17 00:00:00 2001 From: lengyelb Date: Tue, 26 Nov 2024 14:29:12 +0000 Subject: [PATCH 221/587] YANG_Corrections_28.623_CR_0488_Rel19_Keyless-list into Integration --- yang-models/_3gpp-common-measurements.yang | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/yang-models/_3gpp-common-measurements.yang b/yang-models/_3gpp-common-measurements.yang index e2cf97b8a..28c838a66 100755 --- a/yang-models/_3gpp-common-measurements.yang +++ b/yang-models/_3gpp-common-measurements.yang @@ -56,6 +56,7 @@ module _3gpp-common-measurements { Integration Reference Point (IRP); Information Service (IS)"; + revision 2024-11-01 { reference CR-0488; } revision 2024-05-06 { reference CR-0359; } revision 2024-02-24 { reference CR-0346; } revision 2023-11-18 { reference "CR-0299 CR-0305"; } @@ -187,6 +188,7 @@ module _3gpp-common-measurements { grouping SupportedPerfMetricGroupGrp { list SupportedPerfMetricGroups { config false; + key idx; description "Captures a group of supported performance metrics and associated parameters related to their production and reporting. A SupportedPerfMetricGroup attribute which is part of an MOI may @@ -195,6 +197,8 @@ module _3gpp-common-measurements { can specify supported metrics for contained ManagedFunctions like a GNBDUFunction."; + leaf idx { type uint32; } + leaf-list performanceMetrics { type string; min-elements 1; -- GitLab From f3687e55c99a02171a22136a18b8b499a2bf0b63 Mon Sep 17 00:00:00 2001 From: Zhen Li Date: Tue, 26 Nov 2024 14:36:03 +0000 Subject: [PATCH 222/587] 28.541 rel19 cr1404 add roaming exchange capability information to nwdaf function yang --- yang-models/_3gpp-5gc-nrm-nwdaffunction.yang | 24 +++++++++++++++++++- 1 file changed, 23 insertions(+), 1 deletion(-) diff --git a/yang-models/_3gpp-5gc-nrm-nwdaffunction.yang b/yang-models/_3gpp-5gc-nrm-nwdaffunction.yang index 33033562c..be566c2b3 100755 --- a/yang-models/_3gpp-5gc-nrm-nwdaffunction.yang +++ b/yang-models/_3gpp-5gc-nrm-nwdaffunction.yang @@ -72,7 +72,15 @@ module _3gpp-5gc-nrm-nwdaffunction { default false; description "It indicate whether the NWDAF supports analytics metadata provisioning:"; - } + } + + leaf roamingExchange { + type boolean ; + default false; + description "It indicates whether the NWDAF + supports roaming exchange capability"; + } + } grouping MlAnalyticsInfoGrp { @@ -370,6 +378,20 @@ module _3gpp-5gc-nrm-nwdaffunction { decomposition, in that case the NWDAF only supports the analytics services."; } + + leaf roamingAnalytics { + type boolean ; + config false; + description "It indicates whether the NWDAF supports + Nnwdaf_RoamingAnalytics service"; + } + + leaf roamingData { + type boolean ; + config false; + description "It indicates whether the NWDAF supports + Nnwdaf_RoamingData service"; + } } augment "/me3gpp:ManagedElement" { -- GitLab From 01078833cff9ec4121f63b4033b6bd2dfbe1b123 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jose=20Antonio=20Ordo=C3=B1ez=20Lucena?= Date: Thu, 7 Nov 2024 06:17:29 +0000 Subject: [PATCH 223/587] Update _3gpp-common-filemanagement.yang --- yang-models/_3gpp-common-filemanagement.yang | 21 ++++++++++++++++---- 1 file changed, 17 insertions(+), 4 deletions(-) diff --git a/yang-models/_3gpp-common-filemanagement.yang b/yang-models/_3gpp-common-filemanagement.yang index 1e03291af..90871d3b9 100644 --- a/yang-models/_3gpp-common-filemanagement.yang +++ b/yang-models/_3gpp-common-filemanagement.yang @@ -8,6 +8,7 @@ module _3gpp-common-filemanagement { import _3gpp-common-yang-types { prefix types3gpp; } import _3gpp-common-yang-extensions { prefix yext3gpp; } import _3gpp-common-managed-element { prefix me3gpp; } + import ietf-inet-types { prefix inet; } organization "3GPP SA5"; contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464"; @@ -17,6 +18,7 @@ module _3gpp-common-filemanagement { TTA, TTC). All rights reserved."; reference "3GPP TS 28.623 Generic Network Resource Model (NRM)"; + revision 2024-11-07 { reference CR-XXXX ; } revision 2023-09-18 { reference CR-0271 ; } revision 2023-02-14 { reference CR-0234; } revision 2022-10-24 { reference CR-0196; } @@ -52,12 +54,10 @@ module _3gpp-common-filemanagement { uses top3gpp:Top_Grp; leaf fileLocation { - description "Provides the location of a file. - allowedValues: File URI (See RFC 8089)"; - mandatory true; - type string; + type inet:uri yext3gpp:notNotifyable; yext3gpp:inVariant; + } leaf notificationRecipientAddress { @@ -65,6 +65,19 @@ module _3gpp-common-filemanagement { type string; yext3gpp:notNotifyable; yext3gpp:inVariant; + description "Location of the file incl. the file transfer protocol, + and the file name for the case the file content cannot be retrieved + by reading the 'fileContent' attribute. + + The allowed file transfer protocols are: + - sftp + - ftpes + - https + + Examples: + 'sftp://companyA.com/datastore/fileName.xml', + 'https://companyA.com/ManagedElement=1/Files=1/File=1' + "; } leaf cancelJob { -- GitLab From 03880a119aa0d2d04eb30cd9259cc88cee42453c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jose=20Antonio=20Ordo=C3=B1ez=20Lucena?= Date: Thu, 7 Nov 2024 06:33:06 +0000 Subject: [PATCH 224/587] Update _3gpp-common-filemanagement.yang --- yang-models/_3gpp-common-filemanagement.yang | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/yang-models/_3gpp-common-filemanagement.yang b/yang-models/_3gpp-common-filemanagement.yang index 90871d3b9..a409fc571 100644 --- a/yang-models/_3gpp-common-filemanagement.yang +++ b/yang-models/_3gpp-common-filemanagement.yang @@ -57,14 +57,6 @@ module _3gpp-common-filemanagement { type inet:uri yext3gpp:notNotifyable; yext3gpp:inVariant; - - } - - leaf notificationRecipientAddress { - description "Address of the notification recipient."; - type string; - yext3gpp:notNotifyable; - yext3gpp:inVariant; description "Location of the file incl. the file transfer protocol, and the file name for the case the file content cannot be retrieved by reading the 'fileContent' attribute. @@ -79,6 +71,13 @@ module _3gpp-common-filemanagement { 'https://companyA.com/ManagedElement=1/Files=1/File=1' "; } + + leaf notificationRecipientAddress { + description "Address of the notification recipient."; + type string; + yext3gpp:notNotifyable; + yext3gpp:inVariant; + } leaf cancelJob { description "Setting this attribute to TRUE cancels the file download job. -- GitLab From dc7507ad3e052230ecc5f78ae3405e0490052cce Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jose=20Antonio=20Ordo=C3=B1ez=20Lucena?= Date: Thu, 7 Nov 2024 06:34:57 +0000 Subject: [PATCH 225/587] Update _3gpp-common-filemanagement.yang --- yang-models/_3gpp-common-filemanagement.yang | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/yang-models/_3gpp-common-filemanagement.yang b/yang-models/_3gpp-common-filemanagement.yang index a409fc571..7ea5c096e 100644 --- a/yang-models/_3gpp-common-filemanagement.yang +++ b/yang-models/_3gpp-common-filemanagement.yang @@ -54,7 +54,7 @@ module _3gpp-common-filemanagement { uses top3gpp:Top_Grp; leaf fileLocation { - type inet:uri + type inet:uri; yext3gpp:notNotifyable; yext3gpp:inVariant; description "Location of the file incl. the file transfer protocol, -- GitLab From 08ebb1c0285d8d9c46afba5baa1b371d7b41b37c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jose=20Antonio=20Ordo=C3=B1ez=20Lucena?= Date: Fri, 8 Nov 2024 13:47:16 +0000 Subject: [PATCH 226/587] Update _3gpp-common-filemanagement.yang --- yang-models/_3gpp-common-filemanagement.yang | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/yang-models/_3gpp-common-filemanagement.yang b/yang-models/_3gpp-common-filemanagement.yang index 7ea5c096e..4ead4f89a 100644 --- a/yang-models/_3gpp-common-filemanagement.yang +++ b/yang-models/_3gpp-common-filemanagement.yang @@ -18,7 +18,7 @@ module _3gpp-common-filemanagement { TTA, TTC). All rights reserved."; reference "3GPP TS 28.623 Generic Network Resource Model (NRM)"; - revision 2024-11-07 { reference CR-XXXX ; } + revision 2024-11-07 { reference CR-0474 ; } revision 2023-09-18 { reference CR-0271 ; } revision 2023-02-14 { reference CR-0234; } revision 2022-10-24 { reference CR-0196; } -- GitLab From 2900685c74ad49cb97562d2638353312d641e768 Mon Sep 17 00:00:00 2001 From: "U-ERICSSON\\ETHBLL" Date: Tue, 26 Nov 2024 22:59:13 +0100 Subject: [PATCH 227/587] Locally rebased and merged https://forge.3gpp.org/rep/sa5/MnS/-/merge_requests/1464 --- yang-models/_3gpp-common-qmcjob.yang | 52 ++++----------------- yang-models/_3gpp-common-trace.yang | 68 ++++++++++++---------------- 2 files changed, 38 insertions(+), 82 deletions(-) diff --git a/yang-models/_3gpp-common-qmcjob.yang b/yang-models/_3gpp-common-qmcjob.yang index 5d991ae15..b69cd9a19 100644 --- a/yang-models/_3gpp-common-qmcjob.yang +++ b/yang-models/_3gpp-common-qmcjob.yang @@ -27,6 +27,7 @@ module _3gpp-common-qmcjob { Integration Reference Point (IRP); Information Service (IS)"; + revision 2024-11-05 { reference CR-0480; } revision 2024-04-04 { reference CR-0334; } revision 2023-09-18 { reference CR-0271 ; } revision 2023-02-14 { reference "CR-0234"; } @@ -50,12 +51,8 @@ module _3gpp-common-qmcjob { list areaScope { key "idx"; leaf idx { type uint32 ; } - description "It specifies the area where data shall be collected. - List of eNB/list of gNB/eNB/gNB for RLF or RCEF. - List of cells or Tracking Area for QMC. - Cell, TA, LA, RA are mutually exclusive."; - reference "Clause 5.10.2 of 3GPP TS 32.422"; - + description "It defines the area scope of QoE, which is specified + in clause 5.4 of TS 28.405."; uses trace3gpp:AreaScopeGrp; } @@ -182,12 +179,15 @@ module _3gpp-common-qmcjob { producer. For details of Management Based Activation of QoE Measurement Collection see clause 4.5 and for details of Signalling Based Activation of QoE Measurement Collection see clause 4.6 of TS 28.405. - The attributes areaScope and pLMNTarget are only relevant when + The attribute pLMNTarget is only relevant when Management Based Activation is used and the attribute qoETarget is only relevant when Signalling Based Activation is used. All other attributes are common for both Management Based Activation and Signalling Based Activation. + The areaScope attribute defines the area scope of QoE, which is + specified in clause 5.4 of TS 28.405. + When a MnS consumer wishes to deactivate a QMC Job, the MnS consumer shall delete the corresponding QMCJob instance. NOTE: If the reporting is ongoing, when a request to delete a QMCJob @@ -198,43 +198,7 @@ module _3gpp-common-qmcjob { jobId can be used to associate multiple QMCJob instances. For example, it is possible to configure the same jobId value for multiple QMCJob instances required to produce the data (e.g. Streaming services and - MTSI reports) for a specific network analysis. - The QoE Measurement Collection provides capability for collecting QoE - information from: - - UEs which are in the specified area in case of Management Based - Activation or - - an individual UE in case of Signalling Based Activation. - The QoE Measurement Collection enables collection of application layer - from the UE for specified end user service type. The supported service - types are: - - Streaming services, see TS 26.247. - - MTSI services, see TS 26.114. - - VR services, see TS 26.118. - A QMCJob instance represents the job for collecting QoE measurements - according to the job parameters. For details of the QoE measurement - collection configuration parameters see clause 5 of TS 28.405. A QMCJob - instance can be name-contained by SubNetwork or ManagedElement. - A QMC Job is activated by creating a QMCJob object instance in the - MnS producer. For details of Management Based Activation of QoE - Measurement Collection see clause 4.5 and for details of Signalling - Based Activation of QoE Measurement Collection see - clause 4.6 of TS 28.405. The attributes areaScope and pLMNTarget are - only relevant when Management Based Activation is used and the - attribute qoETarget is only relevant when Signalling Based Activation - is used. All other attributes are common for both Management Based - Activation and Signalling Based Activation. - - When a MnS consumer wishes to deactivate a QMC Job, the MnS consumer - shall delete the corresponding QMCJob instance. - NOTE: If the reporting is ongoing, when a request to delete a QMCJob - instance is received, the reporting does not end. The QMCJob instance - is deleted, when the last reporting for the QMC Job expires. - - The jobId attribute presents the job identifier of a QMCJob instance. - The jobId can be used to associate multiple QMCJob instances. - example, it is possible to configure the same jobId value for multiple - QMCJob instances required to produce the data (e.g. Streaming services - and MTSI reports) for a specific network analysis."; + MTSI reports) for a specific network analysis."; key id; uses top3gpp:Top_Grp; container attributes { diff --git a/yang-models/_3gpp-common-trace.yang b/yang-models/_3gpp-common-trace.yang index e3d6a800f..3c0f3401b 100755 --- a/yang-models/_3gpp-common-trace.yang +++ b/yang-models/_3gpp-common-trace.yang @@ -4,10 +4,11 @@ module _3gpp-common-trace { prefix "trace3gpp"; import _3gpp-common-top { prefix top3gpp; } - import _3gpp-common-yang-types {prefix types3gpp; } import _3gpp-common-yang-extensions {prefix yext3gpp; } import ietf-inet-types { prefix inet; } import _3gpp-common-files { prefix files3gpp; } + import _3gpp-common-yang-types { prefix types3gpp; } + import _3gpp-5g-common-yang-types {prefix types5g3gpp; } organization "3GPP SA5"; contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464"; @@ -25,6 +26,7 @@ module _3gpp-common-trace { Integration Reference Point (IRP); Information Service (IS)" ; + revision 2024-11-07 { reference "CR-0480"; } revision 2024-10-01 { reference "CR-0457"; } revision 2024-08-13 { reference "CR-0387 CR-0377"; } revision 2024-08-07 { reference "CR-0405 CR-0421 CR-0379"; } @@ -107,10 +109,7 @@ module _3gpp-common-trace { } grouping AreaScopeGrp { - description "Represents the AreaScope dataType. - This <> defines the area scope of MDT and QoE. - The Area Scope for MDT is specified in clause 5.10.2 of TS 32.422. - The Area Scope for QoE is specified in clause 5.4 of TS 28.405."; + description "This <> defines an area scope."; choice AreaScopeChoice { leaf-list eutraCellIdList { @@ -134,6 +133,15 @@ module _3gpp-common-trace { description "Tracking Area Code list"; } + list sliceIdList { + description "Network Slice Id list"; + key idx; + uses types5g3gpp:PLMNInfo; + min-elements 1; + max-elements 16384; + leaf idx { type string; } + } + list taiList { description "Tracking Area Identity list"; key idx; @@ -1431,14 +1439,10 @@ module _3gpp-common-trace { description "Defines the configuration parameters of IOC TraceJob which are specific for MDT. The attribute anonymizationOfMdtData specifies the level of anonymization - of MDT data. The optional attribute areaScope allows to - specify the area in terms of cells or Tracking Area/Routing - Area/Location area where the MDT data collection shall take - place. In case of RLF_REPORT_ONLY and RCEF_REPORT_ONLY the - optional attribute areaScope allows to specify the eNB or list - of eNBs or gNB or list of gNBs where the reports should be - collected. The optional attribute sensorInformation allows to - specify the sensor information to include. Based on the value + of MDT data. The attribute areaScope defines the area scope + of MDT, which is specified in clause 5.10.2 of TS 32.422. + The optional attribute sensorInformation allows to specify + the sensor information to include. Based on the value configured for attribute jobType in IOC TraceJob, the attributes immediateMdtConfig or loggedMdtConfig are available: In case of IMMEDIATE_MDT_ONLY or IMMEDIATE_MDT_AND_TRACE the attribute @@ -1459,21 +1463,9 @@ module _3gpp-common-trace { list areaScope { key "idx"; leaf idx { type uint32 ; } - description "It specifies the area where data shall be collected. - List of eNB/list of gNB/eNB/gNB for RLF or RCEF. - - List of cells/TA/LA/RA for signaling based MDT or management - based Logged MDT. - - List of cells for management based Immediate MDT. - - List of NPN IDs for management based MDT. - - Cell, TA, LA, RA are mutually exclusive. - - This attribute shall be present if MDT is supported."; - reference "Clause 5.10.2 of 3GPP TS 32.422"; - + description "It specifies the area where data shall be collected. "; + min-elements 0; + max-elements 1; uses AreaScopeGrp; } @@ -1552,8 +1544,8 @@ module _3gpp-common-trace { type uint32; mandatory true; units milliseconds; - description "It specifies the Granularity period used to produce 5GC UE level - measurements. The period is defined in milliseconds (ms)."; + description "It specifies the Granularity period used to produce 5GC UE + level measurements. The period is defined in milliseconds (ms)."; } leaf nfTypeToMeasure { @@ -1738,22 +1730,22 @@ module _3gpp-common-trace { ManagedEntity playing a role of ServinGWFunction. In case of signaling based Trace/MDT, the traceTarget attribute shall - be able to carry (IMSI or IMEI(SV)or SUPI), the mDTAreaScope attribute + be able to carry (IMSI or IMEI(SV)or SUPI), the areaScope attribute shall be able to carry a list of (cell or E-UtranCell or NRCellDU or TA/LA/RA). In case of management based Immediate MDT, the traceTarget attribute - shall be null value, the mDTAreaScope attribute shall carry a list of + shall be null value, the areaScope attribute shall carry a list of (Utrancell or E-UtranCell or NRCellDU). In case of management based Logged MDT, the traceTarget attribute shall carry an eBs or a RNC or gNBs. The Logged MDT should be initiated - on the specified eNB or RNC or gNB in traceTarget. The mDTAreaScope + on the specified eNB or RNC or gNB in traceTarget. The areaScope attribute shall carry a list of (Utrancell or E-UtranCell or NRCellDU or TA/LA/RA). In case of RLF reporting, or RCEF reporting, the traceTarget - attribute shall be null value, the mDTAreaScope attribute shall carry + attribute shall be null value, the areaScope attribute shall carry one or list of eNBs/gNBs"; reference "3GPP TS 32.422"; } @@ -1874,10 +1866,10 @@ module _3gpp-common-trace { only, RCEF reports only and Logged MBSFN MDT, the configuration parameters of attribute mdtConfig or a subset of these shall be applied. In case of UE measurements only, the configuration parameters - of attribute ueCoreMeasConfig shall be applied. In case of any combination - of Trace, Immediate MDT, Trace and UE measurements, the configuration - parameters of the corresponding attributes traceConfig, mdtConfig and - ueCoreMeasConfig are applicable. + of attribute ueCoreMeasConfig shall be applied. In case of any + combination of Trace, Immediate MDT, Trace and UE measurements, the + configuration parameters of the corresponding attributes traceConfig, + mdtConfig and ueCoreMeasConfig are applicable. Creation and deletion of TraceJob instances by MnS consumers is optional; when not supported, the TraceJob instances may be created -- GitLab From 82601f9492af043802c2cd4f6a6ea1845896fc04 Mon Sep 17 00:00:00 2001 From: "U-ERICSSON\\ETHBLL" Date: Tue, 26 Nov 2024 23:24:36 +0100 Subject: [PATCH 228/587] Locally rebased and merged https://forge.3gpp.org/rep/sa5/MnS/-/merge_requests/1453 --- yang-models/_3gpp-nr-nrm-gnbcucpfunction.yang | 70 +++++++++++++++---- 1 file changed, 58 insertions(+), 12 deletions(-) diff --git a/yang-models/_3gpp-nr-nrm-gnbcucpfunction.yang b/yang-models/_3gpp-nr-nrm-gnbcucpfunction.yang index ca324f891..aaf83c7ee 100755 --- a/yang-models/_3gpp-nr-nrm-gnbcucpfunction.yang +++ b/yang-models/_3gpp-nr-nrm-gnbcucpfunction.yang @@ -20,6 +20,7 @@ module _3gpp-nr-nrm-gnbcucpfunction { TTA, TTC). All rights reserved."; reference "3GPP TS 28.541 5G Network Resource Model (NRM)"; + revision 2024-11-07 { reference "CR-1443"; } revision 2024-08-19 { reference "CR-1405"; } revision 2024-08-19 { reference "CR-1337 CR-1352"; } revision 2024-05-24 { reference CR-1273 ; } @@ -174,34 +175,46 @@ module _3gpp-nr-nrm-gnbcucpfunction { uses types3gpp:PLMNId; } - leaf-list x2BlockList { - type string; + list x2BlockList { description "List of nodes to which X2 connections are prohibited."; + key idx; + leaf idx {type uint32;} + uses GeNBIdGrp; } - leaf-list x2AllowList { - type string; + list x2AllowList { description "List of nodes to which X2 connections are enforced."; + key idx; + leaf idx {type uint32;} + uses GeNBIdGrp; } - leaf-list xnBlockList { - type string; + list xnBlockList { description "List of nodes to which Xn connections are prohibited."; + key idx; + leaf idx {type uint32;} + uses GgNBIdGrp; } - leaf-list xnAllowList { - type string; + list xnAllowList { description "List of nodes to which X2 connections are enforced."; + key idx; + leaf idx {type uint32;} + uses GgNBIdGrp; } - leaf-list x2HOBlockList { - type string; + list x2HOBlockList { description "List of nodes to which handovers over X2 are prohibited."; + key idx; + leaf idx {type uint32;} + uses GeNBIdGrp; } - leaf-list xnHOBlockList { - type string; + list xnHOBlockList { description "List of nodes to which handovers over Xn are prohibited."; + key idx; + leaf idx {type uint32;} + uses GgNBIdGrp; } list mappingSetIDBackhaulAddressList { @@ -324,6 +337,39 @@ module _3gpp-nr-nrm-gnbcucpfunction { } } + grouping GgNBIdGrp { + description "Represents the properties of a global gNB ID (GgNBId)."; + + uses types3gpp:PLMNId; + + leaf gnbIdLength { + type int32 {range "22..32";} + mandatory true; + description "This indicates the number of bits for encoding the gNB ID. See 'Global gNB ID' in subclause 9.3.1.6 of TS 38.413"; + } + + leaf gnbId { + description "Identifies a gNB within a PLMN. The gNB Identifier (gNB ID) + is part of the NR Cell Identifier (NCI) of the gNB cells."; + reference "gNB ID in 3GPP TS 38.300, Global gNB ID in 3GPP TS 38.413"; + mandatory true; + type int64 { range "0..4294967295"; } + } + } + + grouping GeNBIdGrp { + description "Represents the properties of a global eNB ID (GeNBId)."; + uses types3gpp:PLMNId; + + leaf enbId { + description "It identifies an eNB within a PLMN. The eNB ID is part of the E-UTRAN Cell Global Identifier (ECGI) of the eNB + cells."; + reference "eNB ID in 3GPP TS 36.300. Global eNB ID in 3GPP TS 36.413."; + mandatory true; + type int32 {range "0..4194303";} + } + } + augment "/me3gpp:ManagedElement" { list GNBCUCPFunction { -- GitLab From 931706e26e879b8fbfce4bd0b6c1e6b94fabc819 Mon Sep 17 00:00:00 2001 From: lengyelb Date: Wed, 27 Nov 2024 16:53:30 +0000 Subject: [PATCH 229/587] Add new file _3gpp-5gc-nrm-stmfunction.yang --- yang-models/_3gpp-5gc-nrm-stmfunction.yang | 105 +++++++++++++++++++++ 1 file changed, 105 insertions(+) create mode 100644 yang-models/_3gpp-5gc-nrm-stmfunction.yang diff --git a/yang-models/_3gpp-5gc-nrm-stmfunction.yang b/yang-models/_3gpp-5gc-nrm-stmfunction.yang new file mode 100644 index 000000000..ace19e7f5 --- /dev/null +++ b/yang-models/_3gpp-5gc-nrm-stmfunction.yang @@ -0,0 +1,105 @@ +module _3gpp-5gc-nrm-stmfunction { + yang-version 1.1; + + namespace urn:3gpp:sa5:_3gpp-5gc-nrm-stmfunction; + prefix stm3gpp; + + import _3gpp-common-top { prefix top3gpp; } + 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 STM function defined in 3GPP TS 28.abc. + Copyright 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + TTA, TTC). All rights reserved."; + reference "3GPP TS 28.abc + Signalling traffic monitoring management"; + + revision 2024-11-07 { reference "S5-247077"; } + + grouping STMFunctionGrp { + leaf stmTargetUri { + type inet:uri; + description "It specifies the Uniform Resource Identifier (URI) of the STM + consumer that shall receive the monitored signalling message copies "; + reference "Clause 4.4 of 3GPP TS 32.158"; + } + + leaf-list networkInterfaceType { + type enumeration { + enum ALL; + enum N4; + enum N5; + enum N7; + enum N8; + enum N10; + enum N11; + enum N12; + enum N13; + enum N14; + enum N15; + enum N22; + enum N58; + enum N59; + enum N80; + enum N81; + } + description "List of network interface type. it specifies the network + function whose signalling traffic is to be monitored. If this + parameter is not present or it is empty, then all Network Functions + within the SubNetwork or ManagedElement shall be monitored. This + parameter shall be omitted if the STM control object is specified + under a ManagedFunction. "; + reference "Clause 4.2.3 of 3GPP TS 23.501 for details on the + allowed values."; + } + + leaf-list reportingNF { + type types3gpp:DistinguishedName; + description "List of Network Function Distinguished Name, which + specifies the target network interface type to be monitored. If + this parameter is not present or it is empty, then all applicable + interface types from the target NF shall be monitored"; + } + + leaf administrativeState { + default UNLOCKED; + type types3gpp:BasicAdministrativeState ; + description "It is used by the STM consumer to lock or unlock the + StmCtrl instance in order to stop or start the signalling traffic + monitoring"; + } + + leaf operationalState { + config false; + mandatory true; + type types3gpp:OperationalState ; + description "It is used by STM consumer to report its working state"; + } + } + + grouping STMFunctionSubTreee { + description "Contains classes that manage Tracing. + Should be used in all classes (or classes inheriting from) + - SubNnetwork + - ManagedElement + - ManagedFunction + + If a YANG module wants to augment these classes/list/groupings they must + augment all user classes!"; + + list StmCtrl { + description "This IOC represents the STM Control and Configuration + parameters of a particular STM controlling. It can be + name-contained by SubNetwork, ManagedElement, or ManagedFunction."; + + key id; + uses top3gpp:Top_Grp ; + container attributes { + uses STMFunctionGrp ; + } + + } + } +} \ No newline at end of file -- GitLab From 9de71c55d02a0d8a04a129ab3ac11815bd5ad44a Mon Sep 17 00:00:00 2001 From: "U-ERICSSON\\ETHBLL" Date: Wed, 27 Nov 2024 18:42:32 +0100 Subject: [PATCH 230/587] YANG corrections to stm and containing classes --- yang-models/_3gpp-5gc-nrm-stmfunction.yang | 48 +++++++++---------- yang-models/_3gpp-common-managed-element.yang | 11 ++++- .../_3gpp-common-managed-function.yang | 10 ++++ yang-models/_3gpp-common-subnetwork.yang | 10 +++- 4 files changed, 52 insertions(+), 27 deletions(-) diff --git a/yang-models/_3gpp-5gc-nrm-stmfunction.yang b/yang-models/_3gpp-5gc-nrm-stmfunction.yang index ace19e7f5..5ad40a9c2 100644 --- a/yang-models/_3gpp-5gc-nrm-stmfunction.yang +++ b/yang-models/_3gpp-5gc-nrm-stmfunction.yang @@ -18,15 +18,18 @@ module _3gpp-5gc-nrm-stmfunction { revision 2024-11-07 { reference "S5-247077"; } - grouping STMFunctionGrp { - leaf stmTargetUri { - type inet:uri; - description "It specifies the Uniform Resource Identifier (URI) of the STM - consumer that shall receive the monitored signalling message copies "; - reference "Clause 4.4 of 3GPP TS 32.158"; + grouping StmCtrlGrp { + description "Represents the StmCtrl IOC."; + + leaf-list reportingNFList { + type types3gpp:DistinguishedName; + description "List of Network Function Distinguished Name, which + specifies the target network interface type to be monitored. If + this parameter is not present or it is empty, then all applicable + interface types from the target NF shall be monitored"; } - leaf-list networkInterfaceType { + leaf-list networkInterfaceTypeList { type enumeration { enum ALL; enum N4; @@ -45,6 +48,7 @@ module _3gpp-5gc-nrm-stmfunction { enum N80; enum N81; } + default ALL; description "List of network interface type. it specifies the network function whose signalling traffic is to be monitored. If this parameter is not present or it is empty, then all Network Functions @@ -55,16 +59,16 @@ module _3gpp-5gc-nrm-stmfunction { allowed values."; } - leaf-list reportingNF { - type types3gpp:DistinguishedName; - description "List of Network Function Distinguished Name, which - specifies the target network interface type to be monitored. If - this parameter is not present or it is empty, then all applicable - interface types from the target NF shall be monitored"; + leaf stmTargetUri { + type inet:uri; + mandatory true; + description "It specifies the Uniform Resource Identifier (URI) of the STM + consumer that shall receive the monitored signalling message copies "; + reference "Clause 4.4 of 3GPP TS 32.158"; } - + leaf administrativeState { - default UNLOCKED; + default LOCKED; type types3gpp:BasicAdministrativeState ; description "It is used by the STM consumer to lock or unlock the StmCtrl instance in order to stop or start the signalling traffic @@ -79,15 +83,9 @@ module _3gpp-5gc-nrm-stmfunction { } } - grouping STMFunctionSubTreee { - description "Contains classes that manage Tracing. - Should be used in all classes (or classes inheriting from) - - SubNnetwork - - ManagedElement - - ManagedFunction - - If a YANG module wants to augment these classes/list/groupings they must - augment all user classes!"; + grouping StmCtrlSubTree { + description "Contains classes that manage Signalling traffic monitoring + management"; list StmCtrl { description "This IOC represents the STM Control and Configuration @@ -97,7 +95,7 @@ module _3gpp-5gc-nrm-stmfunction { key id; uses top3gpp:Top_Grp ; container attributes { - uses STMFunctionGrp ; + uses StmCtrlGrp ; } } diff --git a/yang-models/_3gpp-common-managed-element.yang b/yang-models/_3gpp-common-managed-element.yang index 852218598..d8ab19d68 100755 --- a/yang-models/_3gpp-common-managed-element.yang +++ b/yang-models/_3gpp-common-managed-element.yang @@ -13,6 +13,7 @@ module _3gpp-common-managed-element { import _3gpp-5gc-nrm-configurable5qiset { prefix fiveqi3gpp; } import _3gpp-5gc-nrm-ecmconnectioninfo { prefix econn3gpp ; } import _3gpp-nr-nrm-ecmappingrule { prefix ecmap3gpp ; } + import _3gpp-5gc-nrm-stmfunction { prefix stm3gpp; } organization "3GPP SA5"; contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464"; @@ -34,6 +35,7 @@ module _3gpp-common-managed-element { 3GPP TS 28.620 Umbrella Information Model (UIM)"; + revision 2024-11-19 { reference "Add STM"; } revision 2024-10-01 { reference "CR-0437,CR-0438" ; } revision 2024-01-30 { reference CR-0328 ; } revision 2023-11-14 { reference CR-0305 ; } @@ -126,6 +128,10 @@ module _3gpp-common-managed-element { ManagedElement."; } + feature StmCtrlUnderManagedElement { + description "The StmCtrlSubtree shall be contained under ManagedElement"; + } + grouping ManagedElement_Grp { description "Abstract class representing telecommunications resources. An ME communicates with a manager (directly or indirectly) for the @@ -314,6 +320,9 @@ module _3gpp-common-managed-element { uses ecmap3gpp:NRECMappingRuleSubtree { if-feature ECMappingRuleUnderManagedElement; } - + + uses stm3gpp:StmCtrlSubTree { + if-feature StmCtrlUnderManagedElement ; + } } } diff --git a/yang-models/_3gpp-common-managed-function.yang b/yang-models/_3gpp-common-managed-function.yang index ea4390cc3..8a012d09a 100755 --- a/yang-models/_3gpp-common-managed-function.yang +++ b/yang-models/_3gpp-common-managed-function.yang @@ -8,6 +8,7 @@ module _3gpp-common-managed-function { import _3gpp-common-top { prefix top3gpp; } import _3gpp-common-measurements { prefix meas3gpp; } import _3gpp-common-trace { prefix trace3gpp; } + import _3gpp-5gc-nrm-stmfunction { prefix stm3gpp; } organization "3GPP SA5"; contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464"; @@ -24,6 +25,7 @@ module _3gpp-common-managed-function { 3GPP TS 28.620 Umbrella Information Model (UIM)"; + revision 2024-11-19 { reference "Add STM"; } revision 2024-02-24 { reference CR-0346; } revision 2023-09-18 { reference CR-0271; } revision 2023-04-26 { reference CR-0250; } @@ -48,6 +50,10 @@ module _3gpp-common-managed-function { feature TraceUnderManagedFunction { description "The TraceSubtree shall be contained under ManagedFunction"; } + + feature StmCtrlUnderManagedFunction { + description "The StmCtrlSubtree shall be contained under ManagedFunction"; + } grouping OperationGrp { description "This data type represents an operation."; @@ -351,5 +357,9 @@ module _3gpp-common-managed-function { uses trace3gpp:TraceSubtree { if-feature TraceUnderManagedFunction ; } + + uses stm3gpp:StmCtrlSubTree { + if-feature StmCtrlUnderManagedFunction ; + } } } \ No newline at end of file diff --git a/yang-models/_3gpp-common-subnetwork.yang b/yang-models/_3gpp-common-subnetwork.yang index ddd472941..59868e1c6 100755 --- a/yang-models/_3gpp-common-subnetwork.yang +++ b/yang-models/_3gpp-common-subnetwork.yang @@ -14,6 +14,7 @@ module _3gpp-common-subnetwork { import _3gpp-5gc-nrm-configurable5qiset { prefix fiveqi3gpp; } import _3gpp-5gc-nrm-ecmconnectioninfo { prefix econn3gpp ; } import _3gpp-nr-nrm-ecmappingrule { prefix ecmap3gpp ; } + import _3gpp-5gc-nrm-stmfunction { prefix stm3gpp; } organization "3GPP SA5"; contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464"; @@ -34,6 +35,7 @@ module _3gpp-common-subnetwork { 3GPP TS 28.620 Umbrella Information Model (UIM)"; + revision 2024-11-19 { reference "Add STM"; } revision 2024-01-30 { reference CR-1337 ; } revision 2024-01-30 { reference CR-0328 ; } revision 2023-11-14 { reference CR-0305 ; } @@ -142,6 +144,10 @@ module _3gpp-common-subnetwork { feature. The CESManagementFunction shall be contained under SubNetwork."; } + feature StmCtrlUnderManagedSubNetwork { + description "The StmCtrlSubtree shall be contained under SubNetwork"; + } + grouping Domain_Grp { description "A domain is a partition of instances of managed entities such that : @@ -274,12 +280,14 @@ module _3gpp-common-subnetwork { if-feature EcmConnectionInfoUnderSubNetwork; } + uses stm3gpp:StmCtrlSubTree { + if-feature StmCtrlUnderManagedSubNetwork ; + } yangmnt:mount-point children-of-SubNetwork { description "Mountpoint for ManagedElement"; reference "RFC8528 YANG Schema Mount"; } - // augment external parts here } } -- GitLab From b0991defad8514a204e2976cc961a906ec588324 Mon Sep 17 00:00:00 2001 From: sunse Date: Wed, 18 Dec 2024 06:50:43 +0000 Subject: [PATCH 231/587] Integration rel19 sa5 158 yaml to Release branch after SA#106 --- OpenAPI/TS28104_MdaNrm.yaml | 41 ++- OpenAPI/TS28104_MdaReport.yaml | 22 +- OpenAPI/TS28105_AiMlNrm.yaml | 179 +++++++---- OpenAPI/TS28111_FaultNrm.yaml | 50 ++-- OpenAPI/TS28312_IntentExpectations.yaml | 27 +- OpenAPI/TS28312_IntentNrm.yaml | 54 +++- OpenAPI/TS28317_RanScNrm.yaml | 17 +- OpenAPI/TS28318_DsoNrm.yaml | 6 +- OpenAPI/TS28532_ProvMnS.yaml | 9 +- OpenAPI/TS28536_CoslaNrm.yaml | 27 +- OpenAPI/TS28538_EdgeNrm.yaml | 97 +++++- OpenAPI/TS28541_5GcNrm.yaml | 210 ++++++++++--- OpenAPI/TS28541_NrNrm.yaml | 280 ++++++++++++------ OpenAPI/TS28541_SliceNrm.yaml | 73 ++++- OpenAPI/TS28623_ComDefs.yaml | 51 +++- OpenAPI/TS28623_FileManagementNrm.yaml | 4 +- OpenAPI/TS28623_GenericNrm.yaml | 48 ++- OpenAPI/TS28623_MnSRegistryNrm.yaml | 4 +- OpenAPI/TS28623_PmControlNrm.yaml | 6 +- .../TS28623_QoEMeasurementCollectionNrm.yaml | 5 +- OpenAPI/TS28623_SubscriptionControlNrm.yaml | 9 +- OpenAPI/TS28623_ThresholdMonitorNrm.yaml | 6 +- OpenAPI/TS28623_TraceControlNrm.yaml | 64 +++- README.md | 14 +- 24 files changed, 985 insertions(+), 318 deletions(-) diff --git a/OpenAPI/TS28104_MdaNrm.yaml b/OpenAPI/TS28104_MdaNrm.yaml index 4290465aa..384d36a9a 100644 --- a/OpenAPI/TS28104_MdaNrm.yaml +++ b/OpenAPI/TS28104_MdaNrm.yaml @@ -1,7 +1,7 @@ openapi: 3.0.1 info: title: MDA NRM - version: 18.5.0 + version: 19.0.0 description: >- OAS 3.0.1 specification of the MDA NRM © 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). @@ -14,14 +14,35 @@ components: schemas: #-------- Definition of types----------------------------------------------------- + MDAType: + type: string + enum: + - COVERAGEANALYTICS_COVERAGEPROBLEMANALYSIS + - COVERAGEANALYTICS_PAGINGOPTIMIZATION + - SLSANALYSIS_SERVICEEXPERIENCEANALYSIS + - SLSANALYSIS_NETWORKSLICETHROUGHPUTANALYSIS + - SLSANALYSIS_NETWORKSLICETRAFFICANALYSIS + - SLSANALYSIS_E2ELATENCYANALYSIS + - SLSANALYSIS_NETWORKSLICELOADANALYSIS + - MDAASSISTEDFAULTMANAGEMENT_FAILUREPREDICTION + - MDAASSISTEDENERGYSAVING_ENERGYSAVINGANALYSIS + - MOBILITYMANAGEMENTANALYTICS_MOBILITYPERFORMANCEANALYSIS + - MOBILITYMANAGEMENTANALYTICS_HANDOVEROPTIMIZATION + - MAINTENANCE_MAINTENANCEANALYTICS + - RESOURCEANALYTICS_VIRTUALIZEDRESOURCEUTILIZATIONANALYSISNF + - RESOURCEANALYTICS_PHYISCALRESOURCEUTILIZATIONANALYSISNF + - RESOURCEANALYTICS_5GCCONTROLPLANECONGESTIONANALYSIS + - PREDICTIONS_PMDATA MDATypes: type: array + uniqueItems: true items: - type: string + $ref: '#/components/schemas/MDAType' MDAOutputs: type: array + uniqueItems: true items: $ref: '#/components/schemas/MDAOutputPerMDAType' @@ -34,7 +55,9 @@ components: - type: object properties: areaScope: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/GeoArea' + type: array + items: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/GeoArea' MDAOutputPerMDAType: @@ -44,6 +67,7 @@ components: type: string mDAOutputIEFilters: type: array + uniqueItems: true items: $ref: '#/components/schemas/MDAOutputIEFilter' @@ -55,7 +79,9 @@ components: filterValue: type: string threshold: - $ref: '#/components/schemas/ThresholdInfo' + type: array + items: + $ref: '#/components/schemas/ThresholdInfo' analyticsPeriod: $ref: '#/components/schemas/AnalyticsSchedule' timeOut: @@ -77,8 +103,9 @@ components: properties: timeDurations: type: array + uniqueItems: true items: - $ref: 'TS28104_MdaReport.yaml#/components/schemas/TimeWindow' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/TimeWindow' - type: object properties: granularityPeriod: @@ -140,9 +167,9 @@ components: supportedMDACapabilities: $ref: '#/components/schemas/MDATypes' mLModelRefList: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnListRo' aIMLInferenceFunctionRefList: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnListRo' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' - type: object properties: diff --git a/OpenAPI/TS28104_MdaReport.yaml b/OpenAPI/TS28104_MdaReport.yaml index b57be4d1a..dae638adf 100644 --- a/OpenAPI/TS28104_MdaReport.yaml +++ b/OpenAPI/TS28104_MdaReport.yaml @@ -1,7 +1,7 @@ openapi: 3.0.1 info: title: MDA Report - version: 18.3.0 + version: 19.0.0 description: >- OAS 3.0.1 specification of the MDA Report © 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). @@ -20,12 +20,14 @@ components: properties: mDAType: type: string + readOnly: true mDAOutputList: type: array + uniqueItems: true items: $ref: '#/components/schemas/MDAOutputEntry' analyticsWindow: - $ref: '#/components/schemas/TimeWindow' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/TimeWindowRo' confidenceDegree: type: number format: float @@ -35,18 +37,10 @@ components: properties: mDAOutputIEName: type: string + readOnly: true mDAOutputIEValue: {} - TimeWindow: - type: object - properties: - mDAOutputStartTime: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTime' - mDAOutputEndTime: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTime' - - #-------- Definition of MDA Report -------------------------------------------- MDAReport: @@ -61,6 +55,8 @@ components: mDAReportID: type: string mDAOutputs: - $ref: '#/components/schemas/MDAOutputs' + type: array + items: + $ref: '#/components/schemas/MDAOutputs' mDARequestRef: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnRo' diff --git a/OpenAPI/TS28105_AiMlNrm.yaml b/OpenAPI/TS28105_AiMlNrm.yaml index 4bdb73a0e..874220189 100644 --- a/OpenAPI/TS28105_AiMlNrm.yaml +++ b/OpenAPI/TS28105_AiMlNrm.yaml @@ -1,7 +1,7 @@ openapi: 3.0.1 info: title: AI/ML NRM - version: 18.5.0 + version: 19.1.0 description: >- OAS 3.0.1 specification of the AI/ML NRM © 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). @@ -18,13 +18,14 @@ components: MLContext: type: object properties: - inferenceModelRef: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList' + inferenceEntityRef: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnListRo' dataProviderRef: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnListRo' RequestStatus: type: string + readOnly: true enum: - NOT_STARTED - IN_PROGRESS @@ -69,6 +70,7 @@ components: properties: thresholdList: type: array + uniqueItems: true items: $ref: 'TS28623_ThresholdMonitorNrm.yaml#/components/schemas/ThresholdInfo' managedActivationScope: @@ -80,10 +82,15 @@ components: properties: performanceIndicatorName: type: string + readOnly: true isSupportedForTraining: type: boolean + readOnly: true + default: FALSE isSupportedForTesting: type: boolean + readOnly: true + default: FALSE ManagedActivationScope: oneOf: @@ -91,18 +98,21 @@ components: properties: dNList: type: array + uniqueItems: true items: $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' - type: object properties: timeWindow: type: array + uniqueItems: true items: $ref: 'TS28623_ComDefs.yaml#/components/schemas/TimeWindow' - type: object properties: geoPolygon: type: array + uniqueItems: true items: $ref: 'TS28623_ComDefs.yaml#/components/schemas/GeoArea' @@ -110,9 +120,10 @@ components: type: object properties: aIMLInferenceName: - type: string + $ref: '#/components/schemas/AIMLInferenceName' capabilityName: type: string + readOnly: true mLCapabilityParameters: description: A map (list of key-value pairs) for an aIMLInferenceName and capabilityName $ref: 'TS28623_ComDefs.yaml#/components/schemas/AttributeNameValuePairSet' @@ -122,36 +133,60 @@ components: properties: availMLCapabilityReportID: type: string + readOnly: true mLCapabilityVersionId: type: array + uniqueItems: true items: type: string + readOnly: true expectedPerformanceGains: type: array + uniqueItems: true items: $ref: '#/components/schemas/ModelPerformance' mLModelRef: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnListRo' InferenceOutput: type: object properties: inferenceOutputId: type: array + uniqueItems: true items: type: string + readOnly: true aIMLInferenceName: - type: string + $ref: '#/components/schemas/AIMLInferenceName' + readOnly: true inferenceOutputTime: type: array + uniqueItems: true items: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTime' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTimeRo' # FIXME, isOrder/isUnique both as True inferencePerformance: $ref: '#/components/schemas/ModelPerformance' outputResult: description: A map (list of key-value pairs) for Inference result name and it's value $ref: 'TS28623_ComDefs.yaml#/components/schemas/AttributeNameValuePairSet' + AIMLInferenceName: + oneOf: + - $ref: 'TS28104_MdaNrm.yaml#/components/schemas/MDAType' + - $ref: '#/components/schemas/NwdafAnalyticsType' + - $ref: '#/components/schemas/NgRanInferenceType' + - $ref: '#/components/schemas/VSExtensionType' + NwdafAnalyticsType: + $ref: 'TS29520_Nnwdaf_EventsSubscription.yaml#/components/schemas/NwdafEvent' + NgRanInferenceType: + type: string + enum: + - NG_RAN_NETWORK_ENERGY_SAVING + - NG_RAN_LOAD_BALANCING + - NG_RAN_ MOBILITY_OPTIMIZATION + VSExtensionType: + type: string #-------- Definition of types for name-containments ------ SubNetwork-ncO-AiMlNrm: @@ -199,7 +234,7 @@ components: - type: object properties: mLModelRepositoryRef: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnRo' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' - type: object properties: @@ -226,21 +261,25 @@ components: - type: object properties: aIMLInferenceName: - type: string + $ref: '#/components/schemas/AIMLInferenceName' candidateTrainingDataSource: type: array + uniqueItems: true items: type: string trainingDataQualityScore: $ref: 'TS28623_ComDefs.yaml#/components/schemas/Float' trainingRequestSource: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' + oneOf: + - type: string + - $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' requestStatus: $ref: '#/components/schemas/RequestStatus' expectedRuntimeContext: $ref: '#/components/schemas/MLContext' performanceRequirements: type: array + uniqueItems: true items: $ref: '#/components/schemas/ModelPerformance' cancelRequest: @@ -248,9 +287,9 @@ components: suspendRequest: type: boolean mLModelRef: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnRo' mLModelCoordinationGroupRef: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnRo' MLTrainingProcess-Single: allOf: @@ -263,22 +302,25 @@ components: properties: priority: type: integer + default: 0 terminationConditions: type: string progressStatus: $ref: '#/components/schemas/ProcessMonitor' cancelProcess: type: boolean + default: FALSE suspendProcess: type: boolean + default: FALSE trainingRequestRef: ## Figure 7.3a.1.1.1-1 has no such pointer - $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnListRo' trainingReportRef: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnRo' mLModelGeneratedRef: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnRo' mLModelRef: ## Figure 7.3a.1.1.1-1 is 1-0..1 mapping, hence should be single - $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnRo' MLTrainingReport-Single: allOf: @@ -291,34 +333,40 @@ components: properties: usedConsumerTrainingData: type: array + uniqueItems: true items: type: string + readOnly: true modelConfidenceIndication: type: integer + readOnly: true modelPerformanceTraining: type: array + uniqueItems: true items: $ref: '#/components/schemas/ModelPerformance' modelPerformanceValidation: type: array + uniqueItems: true items: $ref: '#/components/schemas/ModelPerformance' dataRatioTrainingAndValidation: type: integer areNewTrainingDataUsed: type: boolean + readOnly: true trainingRequestRef: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnListRo' trainingProcessRef: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnRo' lastTrainingRef: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnRo' mLModelGeneratedRef: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnRo' mLModelCoordinationGroupGeneratedRef: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnRo' mLModelRef: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnListRo' MLTestingFunction-Single: allOf: @@ -331,7 +379,7 @@ components: - type: object properties: ##FIXME pointer to MLModelCoordinationGroup missing mLModelRef: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnListRo' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' - type: object properties: @@ -353,12 +401,14 @@ components: $ref: '#/components/schemas/RequestStatus' cancelRequest: type: boolean + default: FALSE suspendRequest: - type: boolean + type: boolean + default: FALSE mLModelRef: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnRo' mLModelCoordinationGroupRef: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnRo' MLTestingReport-Single: allOf: @@ -371,12 +421,14 @@ components: properties: modelPerformanceTesting: type: array + uniqueItems: true items: $ref: '#/components/schemas/ModelPerformance' mLTestingResult: type: string + readOnly: true testingRequestRef: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnRo' MLModelLoadingRequest-Single: allOf: @@ -391,10 +443,12 @@ components: $ref: '#/components/schemas/RequestStatus' cancelRequest: type: boolean + default: FALSE suspendRequest: - type: boolean + type: boolean + default: FALSE mLModelToLoadRef: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnRo' MLModelLoadingPolicy-Single: allOf: @@ -406,11 +460,11 @@ components: - type: object properties: aIMLInferenceName: - type: string + $ref: '#/components/schemas/AIMLInferenceName' policyForLoading: $ref: '#/components/schemas/AIMLManagementPolicy' mLModelRef: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnListRo' MLModelLoadingProcess-Single: allOf: @@ -425,14 +479,16 @@ components: $ref: '#/components/schemas/ProcessMonitor' cancelProcess: type: boolean + default: FALSE suspendProcess: type: boolean + default: FALSE mLModelLoadingRequestRef: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnRo' mLModelLoadingPolicyRef: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnRo' loadedMLModelRef: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnRo' MLModel-Single: allOf: @@ -444,10 +500,12 @@ components: properties: mLModelId: type: string + readOnly: true aIMLInferenceName: - type: string + $ref: '#/components/schemas/AIMLInferenceName' mLModelVersion: type: string + readOnly: true expectedRunTimeContext: $ref: '#/components/schemas/MLContext' trainingContext: @@ -455,19 +513,25 @@ components: runTimeContext: $ref: '#/components/schemas/MLContext' supportedPerformanceIndicators: - $ref: '#/components/schemas/SupportedPerfIndicator' + type: array + uniqueItems: true + items: + $ref: '#/components/schemas/SupportedPerfIndicator' + minItems: 1 mLCapabilitiesInfoList: type: array + uniqueItems: true items: $ref: '#/components/schemas/MLCapabilityInfo' + minItems: 1 retrainingEventsMonitorRef: $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' sourceTrainedMLModelRef: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnRo' aIMLInferenceReportRefList: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnListRo' usedByFunctionRefList: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnListRo' MLModelRepository-Single: allOf: @@ -488,7 +552,11 @@ components: type: object properties: memberMLModelRefList: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList' + type: array + uniqueItems: true + items: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnRo' + minItems: 2 ## 7.3a.4.1 IOC MLUpdateFunction-Single: @@ -504,7 +572,7 @@ components: availMLCapabilityReport: $ref: '#/components/schemas/AvailMLCapabilityReport' mLModelRef: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnListRo' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' - type: object properties: @@ -525,10 +593,12 @@ components: properties: performanceGainThreshold: type: array + uniqueItems: true items: $ref: '#/components/schemas/ModelPerformance' newCapabilityVersionId: type: array + uniqueItems: true items: type: string updateTimeDeadline: @@ -539,12 +609,14 @@ components: $ref: 'TS28623_ComDefs.yaml#/components/schemas/TimeWindow' cancelRequest: type: boolean + default: FALSE suspendRequest: type: boolean + default: FALSE mLUpdateProcessRef: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnRo' mLModelRefList: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnListRo' MLUpdateProcess-Single: allOf: @@ -558,14 +630,16 @@ components: $ref: '#/components/schemas/ProcessMonitor' cancelProcess: type: boolean + default: FALSE suspendProcess: type: boolean + default: FALSE mLModelRefList: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnListRo' mLUpdateRequestRefList: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnListRo' mLUpdateReportRef: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnRo' MLUpdateReport-Single: allOf: @@ -578,9 +652,9 @@ components: updatedMLCapability: $ref: '#/components/schemas/AvailMLCapabilityReport' mLModelRefList: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnListRo' mLUpdateProcessRef: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnRo' AIMLInferenceFunction-Single: allOf: @@ -600,9 +674,9 @@ components: managedActivationScope: $ref: '#/components/schemas/AIMLManagementPolicy' usedByFunctionRefList: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnListRo' mLModelRefList: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnListRo' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' - type: object properties: @@ -628,11 +702,12 @@ components: properties: inferenceOutputs: type: array + uniqueItems: true items: $ref: '#/components/schemas/InferenceOutput' minItems: 1 mLModelRefList: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnListRo' AIMLInferenceEmulationFunction-Single: allOf: diff --git a/OpenAPI/TS28111_FaultNrm.yaml b/OpenAPI/TS28111_FaultNrm.yaml index 7a525d13f..321b34cc5 100644 --- a/OpenAPI/TS28111_FaultNrm.yaml +++ b/OpenAPI/TS28111_FaultNrm.yaml @@ -1,7 +1,7 @@ openapi: 3.0.1 info: title: Fault Management NRM - version: 18.1.0 + version: 19.0.0 description: >- OAS 3.0.1 definition of the Fault Supervision MnS © 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). @@ -40,6 +40,7 @@ components: - PHYSICAL_VIOLATION - SECURITY_SERVICE_OR_MECHANISM_VIOLATION - TIME_DOMAIN_VIOLATION + readOnly: true ProbableCause: description: >- The value of the probable cause may be a specific standardized string, or any @@ -58,12 +59,17 @@ components: - PROBABLE_CAUSE_003 - PROBABLE_CAUSE_004 - PROBABLE_CAUSE_005 + readOnly: true - type: string + readOnly: true - type: integer + readOnly: true SpecificProblem: oneOf: - type: string + readOnly: true - type: integer + readOnly: true PerceivedSeverity: type: string enum: @@ -72,9 +78,10 @@ components: - MAJOR - MINOR - WARNING - - CLEARED + - CLEARED TrendIndication: type: string + readOnly: true enum: - MORE_SEVERE - NO_CHANGE @@ -87,9 +94,9 @@ components: high: oneOf: - type: integer - - $ref: 'TS28623_ComDefs.yaml#/components/schemas/Float' + - $ref: 'TS28623_ComDefs.yaml#/components/schemas/FloatRo' low: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/Float' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/FloatRo' ThresholdLevelInd: oneOf: - type: object @@ -105,12 +112,14 @@ components: properties: observedMeasurement: type: string + readOnly: true observedValue: type: number + readOnly: true thresholdLevel: $ref: '#/components/schemas/ThresholdLevelInd' armTime: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTime' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTimeRo' required: - observedMeasurement - observedValue @@ -118,7 +127,7 @@ components: type: object properties: sourceObjectInstance: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnRo' notificationIds: type: array items: @@ -145,15 +154,15 @@ components: # alarmId: # $ref: '#/components/schemas/AlarmId' objectInstance: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnRo' notificationId: $ref: 'TS28623_ComDefs.yaml#/components/schemas/NotificationId' alarmRaisedTime: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTime' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTimeRo' alarmChangedTime: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTime' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTimeRo' alarmClearedTime: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTime' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTimeRo' alarmType: $ref: '#/components/schemas/AlarmType' probableCause: @@ -165,7 +174,7 @@ components: backedUpStatus: type: boolean backUpObject: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnRo' trendIndication: $ref: '#/components/schemas/TrendIndication' thresholdinfo: @@ -178,34 +187,36 @@ components: $ref: 'TS28623_ComDefs.yaml#/components/schemas/AttributeNameValuePairSet' proposedRepairActions: type: string + readOnly: true additionalText: type: string + readOnly: true additionalInformation: $ref: 'TS28623_ComDefs.yaml#/components/schemas/AttributeNameValuePairSet' - rootCauseIndicator: type: boolean - + readOnly: true ackTime: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTime' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTimeRo' ackUserId: type: string ackSystemId: type: string ackState: $ref: '#/components/schemas/AckState' - clearUserId: type: string clearSystemId: type: string serviceUser: type: string + readOnly: true serviceProvider: type: string + readOnly: true securityAlarmDetector: type: string - + readOnly: true AlarmList-Single: allOf: - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' @@ -220,8 +231,9 @@ components: $ref: 'TS28623_ComDefs.yaml#/components/schemas/OperationalState' numOfAlarmRecords: type: integer + readOnly: true lastModification: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTime' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTimeRo' alarmRecords: description: >- This resource represents a map of alarm records. @@ -230,7 +242,7 @@ components: additionalProperties: $ref: '#/components/schemas/AlarmRecord' unreliableAlarmScope: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnRo' #---- Definition of alarm notifications --------------------------------------------# @@ -539,7 +551,7 @@ components: type: object properties: commentTime: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTime' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTimeRo' commentUserId: type: string commentSystemId: diff --git a/OpenAPI/TS28312_IntentExpectations.yaml b/OpenAPI/TS28312_IntentExpectations.yaml index 3938719ef..e1d2bb5f6 100644 --- a/OpenAPI/TS28312_IntentExpectations.yaml +++ b/OpenAPI/TS28312_IntentExpectations.yaml @@ -1,7 +1,7 @@ openapi: 3.0.1 info: title: Scenario specific Intent Expectations - version: 18.4.0 + version: 19.0.0 description: >- OAS 3.0.1 definition of scenario specific Intent Expectations © 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). @@ -27,6 +27,7 @@ components: $ref: "#/components/schemas/RadioNetworkExpectationObject" expectationTargets: type: array + uniqueItems: true items: type: object oneOf: @@ -45,6 +46,7 @@ components: - $ref: 'TS28312_IntentNrm.yaml#/components/schemas/ExpectationTarget' expectationContexts: type: array + uniqueItems: true items: type: object oneOf: @@ -65,6 +67,7 @@ components: $ref: "#/components/schemas/RadioServiceExpectationObject" expectationTargets: type: array + uniqueItems: true items: type: object oneOf: @@ -75,6 +78,7 @@ components: - $ref: 'TS28312_IntentNrm.yaml#/components/schemas/ExpectationTarget' expectationContexts: type: array + uniqueItems: true items: $ref: 'TS28312_IntentNrm.yaml#/components/schemas/Context' required: @@ -92,6 +96,7 @@ components: $ref: '#/components/schemas/EdgeServiceSupportExpectationObject' expectationTargets: type: array + uniqueItems: true items: type: object oneOf: @@ -105,6 +110,7 @@ components: - $ref: 'TS28312_IntentNrm.yaml#/components/schemas/ExpectationTarget' expectationContexts: type: array + uniqueItems: true items: type: object oneOf: @@ -126,10 +132,12 @@ components: $ref: "TS28312_IntentNrm.yaml#/components/schemas/ExpectationVerb" expectationObjects: type: array + uniqueItems: true items: $ref: "#/components/schemas/5GCNetworkExpectationObject" expectationTargets: type: array + uniqueItems: true items: type: object oneOf: @@ -140,6 +148,7 @@ components: - $ref: "TS28312_IntentNrm.yaml#/components/schemas/ExpectationTarget" expectationContexts: type: array + uniqueItems: true items: type: object oneOf: @@ -164,6 +173,7 @@ components: $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' objectContexts: type: array + uniqueItems: true items: type: object oneOf: @@ -188,6 +198,7 @@ components: $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' objectContexts: type: array + uniqueItems: true items: type: object oneOf: @@ -207,6 +218,7 @@ components: $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' objectContexts: type: array + uniqueItems: true items: type: object oneOf: @@ -227,6 +239,7 @@ components: $ref: "TS28623_ComDefs.yaml#/components/schemas/Dn" objectContexts: type: array + uniqueItems: true items: type: object oneOf: @@ -812,6 +825,7 @@ components: - IS_ALL_OF contextValueRange: type: array + uniqueItems: true items: $ref: "TS28623_ComDefs.yaml#/components/schemas/Tac" PLMNContext: @@ -829,6 +843,7 @@ components: - IS_ALL_OF contextValueRange: type: array + uniqueItems: true items: $ref: 'TS28623_ComDefs.yaml#/components/schemas/PlmnId' DlFrequencyContext: @@ -847,6 +862,7 @@ components: - IS_ALL_OF contextValueRange: type: array + uniqueItems: true items: $ref: 'TS28312_IntentNrm.yaml#/components/schemas/Frequency' UlFrequencyContext: @@ -865,6 +881,7 @@ components: - IS_ALL_OF contextValueRange: type: array + uniqueItems: true items: $ref: 'TS28312_IntentNrm.yaml#/components/schemas/Frequency' RATContext: @@ -883,6 +900,7 @@ components: - IS_ALL_OF contextValueRange: type: array + uniqueItems: true items: type: string enum: @@ -904,6 +922,7 @@ components: - IS_ALL_OF contextValueRange: type: array + uniqueItems: true items: $ref: "TS28312_IntentNrm.yaml#/components/schemas/UEGroup" EdgeIdentificationIdContext: @@ -951,6 +970,7 @@ components: - IS_ALL_OF contextValueRange: type: array + uniqueItems: true items: $ref: "TS28623_ComDefs.yaml#/components/schemas/Tac" NfTypeContext: @@ -968,6 +988,7 @@ components: - IS_ALL_OF contextValueRange: type: array + uniqueItems: true items: $ref: "TS28541_5GcNrm.yaml#/components/schemas/NFType" NfInstanceLocationContext: @@ -985,6 +1006,7 @@ components: - IS_ALL_OF contextValueRange: type: array + uniqueItems: true items: type: string TaiContext: @@ -1002,6 +1024,7 @@ components: - IS_ALL_OF contextValueRange: type: array + uniqueItems: true items: $ref: "TS28623_GenericNrm.yaml#/components/schemas/Tai" ServingScopeContext: @@ -1019,6 +1042,7 @@ components: - IS_ALL_OF contextValueRange: type: array + uniqueItems: true items: type: string DnnContext: @@ -1036,6 +1060,7 @@ components: - IS_ALL_OF contextValueRange: type: array + uniqueItems: true items: type: string #-------Definition of the scenario specific ObjectTarget dataType----------------# diff --git a/OpenAPI/TS28312_IntentNrm.yaml b/OpenAPI/TS28312_IntentNrm.yaml index 3d018cb18..248eac3dc 100644 --- a/OpenAPI/TS28312_IntentNrm.yaml +++ b/OpenAPI/TS28312_IntentNrm.yaml @@ -1,7 +1,7 @@ openapi: 3.0.1 info: title: Intent NRM - version: 18.5.0 + version: 19.0.0 description: >- OAS 3.0.1 definition of the Intent NRM © 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). @@ -33,6 +33,8 @@ components: type: string intentExpectations: type: array + uniqueItems: true + minItems: 1 items: type: object oneOf: @@ -45,6 +47,7 @@ components: $ref: "#/components/schemas/Selectivity" intentContexts: type: array + uniqueItems: true items: $ref: '#/components/schemas/Context' description: >- @@ -71,7 +74,7 @@ components: It represents the observation period of the fulfilmentInfo for corresponding ExpectationTargets, IntentExpectations and Intent. intentReportReference: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnRo' IntentReport-Single: description: It represents intent report information from MnS producer to MnS consumer. allOf: @@ -82,14 +85,15 @@ components: $ref: '#/components/schemas/IntentFulfilmentReport' intentConflictReports: type: array + uniqueItems: true items: $ref: '#/components/schemas/IntentConflictReport' intentFeasibilityCheckReport: $ref: '#/components/schemas/IntentFeasibilityCheckReport' lastUpdatedTime: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTime' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTimeRo' intentReference: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnRo' IntentHandlingFunction-Single: description: >- It represents the intent handling capabilities can be supported by a specific intent @@ -100,6 +104,8 @@ components: properties: intentHandlingCapabilityList: type: array + uniqueItems: true + minItems: 1 items: $ref: '#/components/schemas/IntentHandlingCapability' Intent: @@ -125,12 +131,15 @@ components: $ref: "#/components/schemas/ExpectationObject" expectationTargets: type: array + uniqueItems: true + minItems: 1 items: $ref: '#/components/schemas/ExpectationTarget' contextSelectivity: $ref: "#/components/schemas/Selectivity" expectationContexts: type: array + uniqueItems: true items: $ref: '#/components/schemas/Context' required: @@ -155,6 +164,7 @@ components: $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' objectContexts: type: array + uniqueItems: true items: $ref: '#/components/schemas/Context' description: >- @@ -216,6 +226,7 @@ components: $ref: "#/components/schemas/NotFulfilledState" notFulfilledReasons: type: array + uniqueItems: true items: type: string readOnly: true @@ -285,6 +296,8 @@ components: targetValueRange: oneOf: - type: array + uniqueItems: true + minItems: 1 items: $ref: "#/components/schemas/ValueRangeType" - $ref: "#/components/schemas/ValueRangeType" @@ -292,6 +305,7 @@ components: $ref: "#/components/schemas/Selectivity" targetContexts: type: array + uniqueItems: true items: $ref: '#/components/schemas/Context' description: It describes the list of constraints and conditions that should apply for a specific expectationTarget. @@ -310,6 +324,8 @@ components: contextValueRange: oneOf: - type: array + uniqueItems: true + minItems: 1 items: $ref: "#/components/schemas/ValueRangeType" - $ref: "#/components/schemas/ValueRangeType" @@ -326,6 +342,8 @@ components: $ref: '#/components/schemas/FulfilmentInfo' expectationFulfilmentResult: type: array + uniqueItems: true + minItems: 1 items: $ref: '#/components/schemas/ExpectationFulfilmentResult' #-------Definition of the concrete IntentFulfilmentReport dataType----------------# @@ -338,10 +356,12 @@ components: properties: expectaitonId: type: string + readOnly: true expectationFulfilmentInfo: $ref: '#/components/schemas/FulfilmentInfo' - targetFulfilmentResult: + targetFulfilmentResults: type: array + uniqueItems: true items: $ref: '#/components/schemas/TargetFulfilmentResult' #-------Definition of the concrete ExpectationFulfilmentResult dataType----------------# @@ -354,6 +374,7 @@ components: properties: targetName: type: string + readOnly: true targetFulfilmentInfo: $ref: '#/components/schemas/FulfilmentInfo' targetAchievedValue: @@ -361,6 +382,7 @@ components: description: >- It describes the value that has been achieved for the expectation target at the time at which the report is generated. + readOnly: true #-------Definition of the concrete TargetFulfilmentResult dataType----------------# #-------Definition of the generic IntentConflictReport dataType----------------# @@ -372,8 +394,10 @@ components: properties: conflictId: type: string + readOnly: true conflictType: type: string + readOnly: true enum: - INTENT_CONFLICT - EXPECTATION_CONFLICT @@ -381,17 +405,20 @@ components: conflictingIntent: description: >- This will be present if the value of conflictType is INTENT_CONFLICT. It describes the DN of the conflicting intent - $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnRo' conflictingExpectation: description: >- This will be present if the value of conflictType is EXPECTATION_CONFLICT. It describes the expectationId of the conflicting IntentExpectation with an Intent - type: string + type: string + readOnly: true conflictingTarget: description: >- This will be present if the value of conflictType is TARGET_CONFLICT. It describes the targetName of the conflicting ExpectationTarget with an IntentExpectation - type: string + type: string + readOnly: true recommendedSolutions: - type: string + type: string + readOnly: true enum: - MODIFY - DELETE @@ -407,11 +434,13 @@ components: properties: feasibilityCheckResult: type: string + readOnly: true enum: - FEASIBLE - INFEASIBLE - infeasibilityReason: + infeasibilityReasons: type: string + readOnly: true description: An attribute which is used when feasibilityCheckResult is INFEASIBLE #-------Definition of the concrete IntentFeasibilityCheckReport dataType----------------# @@ -424,6 +453,7 @@ components: properties: intentHandlingCapabilityId: type: string + readOnly: true supportedExpectationObjectType: type: string enum: @@ -431,11 +461,15 @@ components: - EDGE_SERVICE_SUPPORT - 5GC_SUBNETWORK - Radio_Service + readOnly: true description: It describes the expectation object type which can be supported by a specific intent handling function of MnS producer. supportedExpectationTargetNames: type: array + uniqueItems: true + minItems: 1 items: type: string + readOnly: true description: It describes the supported expectation targets for the supported expectation object type. #-------Definition of the concrete IntentHandlingCapability dataType----------------# diff --git a/OpenAPI/TS28317_RanScNrm.yaml b/OpenAPI/TS28317_RanScNrm.yaml index 3b1973463..13a85ef1b 100644 --- a/OpenAPI/TS28317_RanScNrm.yaml +++ b/OpenAPI/TS28317_RanScNrm.yaml @@ -1,7 +1,7 @@ openapi: 3.0.1 info: title: RANSC NRM - version: 18.1.0 + version: 19.0.0 description: >- OAS 3.0.1 definition of the RANSC NRM © 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). @@ -34,6 +34,7 @@ components: properties: nEInformation: type: array + uniqueItems: true items: $ref: '#/components/schemas/NEInfomration' description: >- @@ -64,7 +65,7 @@ components: description: >- Setting this attribute to "TRUE" cancels the self configuration process. scMgmtProfileRef: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnRo' #-------Definition of IOCs ----------# @@ -100,8 +101,9 @@ components: for usage in the RANSC management for monitoring for the self configuration process. type: object properties: - jobId: + id: type: string + readOnly: true status: type: string enum: @@ -111,10 +113,12 @@ components: - FAILED - CANCELLING - CANCELLED + readOnly: true progressPercentage: type: integer minimum: 0 maximum: 100 + readOnly: true progressStateInfo: type: string enum: @@ -126,9 +130,11 @@ components: - RETRIEVE_CONFIGURATION_DATA - SETUP_PRECONFIGURED_SIGNALLING_LINKS - SET_FINAL_STATE_OF_NE + readOnly: true resultStateInfo: oneOf: - type: string + readOnly: true enum: - UNKNOWN - INCORRECT_CONFIGURATION @@ -136,10 +142,11 @@ components: - DISCONNECTION_BETWEEN_NE_AND_OAM - OTHER - type: string + readOnly: true startTime: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTime' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTimeRo' endTime: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTime' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTimeRo' #-------Definition of Data types ----------# diff --git a/OpenAPI/TS28318_DsoNrm.yaml b/OpenAPI/TS28318_DsoNrm.yaml index 7246dca06..06bc702eb 100644 --- a/OpenAPI/TS28318_DsoNrm.yaml +++ b/OpenAPI/TS28318_DsoNrm.yaml @@ -1,7 +1,7 @@ openapi: 3.0.1 info: title: 3GPP NRM - version: 18.1.0 + version: 19.0.0 description: >- OAS 3.0.1 specification of the OutageAndRecoveryInfo NRM © 2024, 3GPP Organizational OutageAndRecoveryInfo Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). @@ -47,11 +47,13 @@ components: dsoRapidInterventionDuration: type: integer mnoInterventionTime: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTime' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTimeRo' mnoInterventionDuration: type: integer + readOnly: true mnoMaxServiceDuration: type: integer + readOnly: true affectedArea: $ref: '#/components/schemas/EnergyServiceLocation' isAffectedAreaPriority: diff --git a/OpenAPI/TS28532_ProvMnS.yaml b/OpenAPI/TS28532_ProvMnS.yaml index 116dfc4b7..ce913eb9a 100755 --- a/OpenAPI/TS28532_ProvMnS.yaml +++ b/OpenAPI/TS28532_ProvMnS.yaml @@ -1,7 +1,7 @@ openapi: 3.0.1 info: title: Provisioning MnS - version: 18.3.0 + version: 18.5.0 description: >- OAS 3.0.1 definition of the Provisioning MnS © 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). @@ -219,7 +219,7 @@ paths: are targeted. required: false schema: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/Filter' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/JexConditions' - name: attributes in: query description: >- @@ -251,7 +251,10 @@ paths: select data nodes. required: false schema: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/Filter' + oneOf: + - $ref: 'TS28623_ComDefs.yaml#/components/schemas/JexNodeSelectionBasic' + - $ref: 'TS28623_ComDefs.yaml#/components/schemas/JexNodeSelectionAdvanced' + responses: '200': description: >- diff --git a/OpenAPI/TS28536_CoslaNrm.yaml b/OpenAPI/TS28536_CoslaNrm.yaml index 54d2c5898..05197c3c7 100755 --- a/OpenAPI/TS28536_CoslaNrm.yaml +++ b/OpenAPI/TS28536_CoslaNrm.yaml @@ -2,7 +2,7 @@ openapi: 3.0.1 info: title: coslaNrm - version: 18.2.0 + version: 19.0.0 description: >- OAS 3.0.1 specification of the Cosla NRM © 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). @@ -33,30 +33,35 @@ components: AssuranceGoalStatusObserved: type: string + readOnly: true enum: - FULFILLED - NOT_FULFILLED AssuranceGoalStatusPredicted: type: string + readOnly: true enum: - FULFILLED - NOT_FULFILLED AssuranceTargetStatusObserved: type: string + readOnly: true enum: - FULFILLED - NOT_FULFILLED AssuranceTargetStatusPredicted: type: string + readOnly: true enum: - FULFILLED - NOT_FULFILLED AssuranceTargetName: type: string + readOnly: true AssuranceTarget: type: object @@ -65,9 +70,12 @@ components: $ref: '#/components/schemas/AssuranceTargetName' assuranceTargetValue: type: string + readOnly: true AssuranceTargetList: type: array + uniqueItems: true + minItems: 1 items: $ref: '#/components/schemas/AssuranceTarget' @@ -76,17 +84,18 @@ components: properties: assuranceGoalStatusId: type: string + readOnly: true assuranceGoalId: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnRo' assuranceGoalStatusObserved: $ref: '#/components/schemas/AssuranceGoalStatusObserved' assuranceGoalStatusPredicted: $ref: '#/components/schemas/AssuranceGoalStatusPredicted' - assuranceGoalRef: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' AssuranceGoalStatusList: type: array + uniqueItems: true + minItems: 1 items: $ref: '#/components/schemas/AssuranceGoalStatus' @@ -95,6 +104,7 @@ components: properties: assuranceTargetStatusId: type: string + readOnly: true assuranceTargetName: $ref: '#/components/schemas/AssuranceTargetName' assuranceTargetStatusObserved: @@ -104,11 +114,14 @@ components: AssuranceTargetStatusList: type: array + uniqueItems: true + minItems: 1 items: $ref: '#/components/schemas/AssuranceTargetStatus' AttributeNameList: type: array + uniqueItems: true items: type: string @@ -155,7 +168,9 @@ components: controlLoopLifeCyclePhase: $ref: '#/components/schemas/ControlLoopLifeCyclePhase' aCCLDisallowedList: - $ref: '#/components/schemas/ACCLDisallowedAttributes' + type: array + items: + $ref: '#/components/schemas/ACCLDisallowedAttributes' networkSliceRef: $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' networkSliceSubnetRef: @@ -196,6 +211,8 @@ components: properties: assuranceGoalStatusList: $ref: '#/components/schemas/AssuranceGoalStatusList' + assuranceGoalRef: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnRo' #-------- Definition of JSON arrays for name-contained IOCs ---------------------- diff --git a/OpenAPI/TS28538_EdgeNrm.yaml b/OpenAPI/TS28538_EdgeNrm.yaml index 83f86744d..b4fc616cb 100644 --- a/OpenAPI/TS28538_EdgeNrm.yaml +++ b/OpenAPI/TS28538_EdgeNrm.yaml @@ -1,7 +1,7 @@ openapi: 3.0.1 info: title: 3GPP Edge NRM - version: 19.0.0 + version: 19.2.0 description: >- OAS 3.0.1 specification of the Edge NRM © 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). @@ -99,16 +99,10 @@ components: readOnly: true secCredential: type: string - Duration: - type: object - properties: - startTime: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTime' - endTime: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTime' EASServicePermission: type: string description: any of enumerated value + readOnly: true enum: - TRIAL - SILVER @@ -118,9 +112,11 @@ components: EASStatus: type: string description: any of enumerated value + readOnly: true enum: - ENABLED - DISABLED + - OVERLOAD_WARNING ResourceReservationRequirement: type: object properties: @@ -136,9 +132,11 @@ components: properties: resourceId: type: string + readOnly: true reservationStatus: type: string description: any of enumrated value + readOnly: true enum: - RESERVED - USEd @@ -153,9 +151,11 @@ components: - FUTURE futuristicTriggerTime: $ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTime' - AvailableEDNList: + AvailableEDN: type: object properties: + AvailableEDN: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' resourceQuota: $ref: '#/components/schemas/VirtualResource' FederatedECSInfo: @@ -169,6 +169,27 @@ components: $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' servedEESList: $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' + SAP: + type: object + properties: + host: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/HostAddr' + port: + type: integer + Operation: + type: object + properties: + name: + type: string + allowedConsumers: + type: string + operationSemantics: + type: string + description: any of enumrated value + enum: + - REQUEST_RESPONSE + - SUBSCRIBE_NOTIFY + #-------- Definition of types for name-containments ------ SubNetwork-ncO-EdgeNrm: type: object @@ -180,6 +201,29 @@ components: EASBundle: $ref: '#/components/schemas/EASBundle-Multiple' +#-------- Definition of Edge common IOCs -------------------------------------------- + ManagedEdgeNFService-Single: + allOf: + - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' + - type: object + properties: + attributes: + type: object + properties: + userLabel: + type: string + sAP: + $ref: '#/components/schemas/SAP' + operations: + type: array + items: + $ref: '#/components/schemas/Operation' + administrativeState: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/AdministrativeState' + operationalState: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/OperationalState' +#-------- Definition of Edge common IOCs -------------------------------------------- + #-------- Definition of concrete IOCs -------------------------------------------- EdgeDataNetwork-Single: @@ -199,6 +243,7 @@ components: $ref: '#/components/schemas/EESFunction-Multiple' availableEdgeVirtualResources: type: string + readOnly: true EASFunction-Single: allOf: @@ -228,6 +273,7 @@ components: $ref: '#/components/schemas/RelocationTriggerInfo' relocationRejectByASP: type: boolean + default: FALSE - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' EASProfile-Single: allOf: @@ -236,12 +282,15 @@ components: properties: aCID: type: string + readOnly: true eASProvider: type: string + readOnly: true eASdescription: type: string + readOnly: true eASSchedule: - $ref: '#/components/schemas/Duration' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/TimeWindowRo' eASGeographicalServiceArea: $ref: '#/components/schemas/GeoLoc' eASTopologicalServiceArea: @@ -252,10 +301,14 @@ components: $ref: '#/components/schemas/EASFeature' eASServiceContinuitySupport: type: boolean + readOnly: true + default: FALSE eASDNAI: type: string + readOnly: true eASAvailabilityReportingPeriod: type: integer + readOnly: true eASStatus: $ref: '#/components/schemas/EASStatus' EESFunction-Single: @@ -287,6 +340,10 @@ components: registrationInfo: $ref: '#/components/schemas/RegistrationInfo' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' + - type: object + properties: + ManagedEdgeNFService: + $ref: '#/components/schemas/ManagedEdgeNFService-Multiple' ECSFunction-Single: allOf: @@ -311,6 +368,10 @@ components: sharedECSInfo: $ref: '#/components/schemas/FederatedECSInfo' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' + - type: object + properties: + ManagedEdgeNFService: + $ref: '#/components/schemas/ManagedEdgeNFService-Multiple' EASRequirements-Single: allOf: @@ -328,7 +389,7 @@ components: softwareImageInfo: $ref: '#/components/schemas/SoftwareImageInfo' eASSchedule: - $ref: '#/components/schemas/Duration' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/TimeWindow' eASFeature: $ref: '#/components/schemas/EASFeature' relocationPolicy: @@ -384,8 +445,10 @@ components: $ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTime' leadingOPiD: type: string - avaibleEDNList: - $ref: '#/components/schemas/AvailableEDNList' + availableEDNList: + type: array + items: + $ref: '#/components/schemas/AvailableEDN' acceptedEDN: $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList' OperatorEdgeDataNetwork-Single: @@ -404,6 +467,7 @@ components: properties: bundleIdentifier: type: string + readOnly: true bundledEASIdentifier: type: string bundleType: @@ -412,6 +476,7 @@ components: type: string coordinatedEASDiscovery: type: boolean + default: FALSE coordinatedACR: type: boolean eDNAffinity: @@ -460,6 +525,11 @@ components: type: array items: $ref: '#/components/schemas/EASBundle-Single' + ManagedEdgeNFService-Multiple: + type: array + items: + $ref: '#/components/schemas/ManagedEdgeNFService-Single' + #--------------------------------- Definition ------------------------------------ resources-edgeNrm: @@ -475,3 +545,4 @@ components: - $ref: '#/components/schemas/OperatorEdgeDataNetwork-Single' - $ref: '#/components/schemas/EASResourceReservationJob-Single' - $ref: '#/components/schemas/EASBundle-Single' + - $ref: '#/components/schemas/ManagedEdgeNFService-Single' diff --git a/OpenAPI/TS28541_5GcNrm.yaml b/OpenAPI/TS28541_5GcNrm.yaml index 5fe4522ff..218c03a14 100755 --- a/OpenAPI/TS28541_5GcNrm.yaml +++ b/OpenAPI/TS28541_5GcNrm.yaml @@ -1,7 +1,7 @@ openapi: 3.0.1 info: title: 3GPP 5GC NRM - version: 19.1.0 + version: 19.2.0 description: >- OAS 3.0.1 specification of the 5GC NRM © 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). @@ -19,9 +19,9 @@ components: type: object description: 'AmfIdentifier comprise of amfRegionId, amfSetId and amfPointer' properties: - amfRegionId: + aMFRegionId: $ref: '#/components/schemas/AmfRegionId' - amfSetId: + aMFSetId: $ref: '#/components/schemas/AmfSetId' amfPointer: $ref: '#/components/schemas/AmfPointer' @@ -96,6 +96,13 @@ components: type: string schema: type: string + nfServiceStatus: + type: string + enum: + - REGISTERED + - SUSPENDED + - UNDISCOVERABLE + - CANARY_RELEASE fqdn: $ref: 'TS28623_ComDefs.yaml#/components/schemas/Fqdn' interPlmnFqdn: @@ -106,18 +113,53 @@ components: $ref: '#/components/schemas/IpEndPoint' apiPrefix: type: string - allowedPlmns: + allowedPLMNs: type: array items: $ref: 'TS28623_ComDefs.yaml#/components/schemas/PlmnId' + allowedSnpns: + type: array + items: + $ref: '#/components/schemas/SnpnId' allowedNfTypes: type: array items: $ref: '#/components/schemas/NFType' - allowedNssais: + allowedNfDomains: + type: array + items: + type: string + allowedNSSAIs: type: array items: $ref: 'TS28541_NrNrm.yaml#/components/schemas/Snssai' + priority: + type: integer + minimum: 0 + maximum: 65535 + capacity: + type: integer + recoveryTime: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTime' + vendorId: + $ref: '#/components/schemas/VendorId' + allowedOperationsPerNfType: + type: string + allowedOperationsPerNfInstance: + type: string + allowedOperationsPerNfInstanceOverrides: + type: boolean + sNssais: + $ref: 'TS29571_CommonData.yaml#/components/schemas/ExtSnssai' + oauth2Required: + type: boolean + sharedServiceDataId: + type: string + defaultNotificationSubscriptions: + type: array + items: + $ref: '#/components/schemas/DefaultNotificationSubscription' + NFStatus: type: string description: any of enumerated value @@ -196,6 +238,9 @@ components: - P_BDT - P_PLMNUE - P_NSSCD + - P_PDTQ + - P_MBSCD + - P_GROUP NotificationType: type: string readOnly: true @@ -208,6 +253,12 @@ components: - LOCATION_UPDATE_NOTIFICATION - NSSAA_REAUTH_NOTIFICATION - NSSAA_REVOC_NOTIFICATION + - MATCH_INFO_NOTIFICATION + - DATA_RESTORATION_NOTIFICATION + - TSCTS_NOTIFICATION + - LCS_KEY_DELIVERY_NOTIFICATION + - UUAA_MM_AUTH_NOTIFICATION + - DC_SESSION_EVENT_NOTIFICATION DefaultNotificationSubscription: type: object properties: @@ -216,6 +267,8 @@ components: callbackURI: type: string readOnly: true + interPlmnCallbackUri: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/UriRo' n1MessageClass: type: boolean readOnly: true @@ -228,6 +281,29 @@ components: binding: type: string readOnly: true + acceptedEncoding: + type: string + readOnly: true + supportedFeatures: + type: string + readOnly: true + serviceInfoList: + type: array + items: + $ref: '#/components/schemas/DefSubServiceInfo' + callbackUriPrefix: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/UriRo' + DefSubServiceInfo: + type: object + properties: + versions: + type: array + items: + type: string + readOnly: true + supportedFeatures: + type: string + readOnly: true ManagedNFProfile: type: object properties: @@ -437,8 +513,10 @@ components: $ref: 'TS29571_CommonData.yaml#/components/schemas/Arp' qosNotificationControl: type: boolean + default: false reflectiveQos: type: boolean + default: false sharingKeyDl: type: string sharingKeyUl: @@ -485,6 +563,7 @@ components: minItems: 1 muteNotif: type: boolean + default: false trafficSteeringPolIdDl: type: string nullable: true @@ -497,6 +576,7 @@ components: $ref: 'TS29571_CommonData.yaml#/components/schemas/RouteToLocation' traffCorreInd: type: boolean + default: false upPathChgEvent: $ref: 'TS29512_Npcf_SMPolicyControl.yaml#/components/schemas/UpPathChgEvent' steerFun: @@ -537,8 +617,10 @@ components: $ref: 'TS29512_Npcf_SMPolicyControl.yaml#/components/schemas/AfSigProtocol' isAppRelocatable: type: boolean + default: false isUeAddrPreserved: type: boolean + default: false qosData: type: array items: @@ -573,6 +655,7 @@ components: $ref: '#/components/schemas/SnssaiInfo' isSubjectToNsac: type: boolean + default: false maxNumberofUEs: type: integer eACMode: @@ -581,10 +664,13 @@ components: enum: - INACTIVE - ACTIVE + default: INACTIVE activeEacThreshold: type: integer + default: 0 deactiveEacThreshold: type: integer + default: 100 numberofUEs: type: integer readOnly: true @@ -692,8 +778,7 @@ components: type: object properties: uPFIpAddress: - type: string - readOnly: true + $ref: 'TS28623_ComDefs.yaml#/components/schemas/HostRo' uPFRef: $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnRo' SnssaiList: @@ -736,23 +821,31 @@ components: properties: proseDirectDiscovery: type: boolean + default: false proseDirectCommunication: type: boolean + default: false proseL2UetoNetworkRelay: type: boolean + default: false proseL3UetoNetworkRelay: type: boolean + default: false proseL2RemoteUe: type: boolean + default: false proseL3RemoteUe: type: boolean + default: false V2xCapability: type: object properties: lteV2x: type: boolean + default: false nrV2x: type: boolean + default: false InternalGroupIdRange: type: object properties: @@ -816,6 +909,21 @@ components: - N6MB - N19MB - NMB9 + - S1U + - S5U + - S8U + - S11U + - S12 + - S2AU + - S2BU + - N3TRUSTEDN3GPP + - N3UNTRUSTEDN3GPP + - N9ROAMING + - SGI + - N19 + - SXAU + - SXBU + - N4U ipv4EndpointAddresses: type: array items: @@ -1016,6 +1124,10 @@ components: analyticsMetadataProvisioning: type: boolean default: false + roamingExchange: + type: boolean + default: false + MlAnalyticsInfo: description: ML Analytics Filter information supported by the Nnwdaf_MLModelProvision service type: object @@ -1349,7 +1461,7 @@ components: minItems: 1 mappingInd: type: boolean - default: False + default: false ExternalClientType: description: Indicates types of External Clients. anyOf: @@ -2329,14 +2441,14 @@ components: description: globally identification of an NG-RAN node type: object oneOf: - - required: [ pLmnId, n3IwfId] - - required: [ plmnId, gNbId] - - required: [ pLmnId, ngeNbId] - - required: [ plmnId, wagfId] - - required: [ pLmnId, tngfId] - - required: [ plmnId, twifId] + - required: [ pLMNId, n3IwfId] + - required: [ plMNId, gNbId] + - required: [ pLMNId, ngeNbId] + - required: [ plMNId, wagfId] + - required: [ pLMNId, tngfId] + - required: [ plMNId, twifId] properties: - pLmnId: + pLMNId: $ref: 'TS28623_ComDefs.yaml#/components/schemas/PlmnId' n3IwfId: type: string @@ -2355,7 +2467,12 @@ components: type: string pattern: '^[A-Fa-f0-9]+$' twifId: - type: string + type: string + NTNPLMNRestrictionsList: + description: NTNPLMNRestrictionsInfoList that relates to non-terrestrial network access + type: array + items: + $ref: '#/components/schemas/NTNPLMNRestrictionsInfo' NTNPLMNRestrictionsInfo: description: restrictions per PLMN that relates to non-terrestrial network access type: object @@ -2365,34 +2482,24 @@ components: blockedLocationInfoList: type: array items: - $ref: '#/components/schemas/BlockedLocationInfoList' - minItems: 1 - BlockedLocationInfoList: + $ref: '#/components/schemas/BlockedLocationInfo' + BlockedLocationInfo: description: location for which the PLMN access restrictions are to be applied in case of NTN type: object properties: blockedLocation: $ref: 'TS28623_ComDefs.yaml#/components/schemas/PlmnId' - blockedDur: - $ref: '#/components/schemas/TimeDuration' + blockedDurWindow: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/TimeWindow' blockedSlice: $ref: 'TS28541_NrNrm.yaml#/components/schemas/Snssai' - TimeDuration: - description: location for which the PLMN access restrictions are to be applied in case of NTN - type: object - properties: - blockedDurStartTime: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTime' - blockedDurEndTime: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTime' - 5GDdnmfInfo: description: Information of an 5G DDNMF NF Instance type: object required: - - plmnId + - plMNId properties: - plmnId: + plMNId: $ref: 'TS29571_CommonData.yaml#/components/schemas/PlmnId' ImsiRange: description: > @@ -2603,7 +2710,7 @@ components: required: - mbsServiceIdStart - mbsServiceIdEnd - - plmnId + - plMNId properties: mbsServiceIdStart: type: string @@ -2611,7 +2718,7 @@ components: mbsServiceIdEnd: type: string pattern: '^[A-Fa-f0-9]{6}$' - plmnId: + plMNId: $ref: 'TS29571_CommonData.yaml#/components/schemas/PlmnId' nid: $ref: 'TS29571_CommonData.yaml#/components/schemas/Nid' @@ -2666,11 +2773,11 @@ components: type: string pattern: '^[A-Fa-f0-9]{6}$' description: MBS Service ID - plmnId: + plMNId: $ref: 'TS29571_CommonData.yaml#/components/schemas/PlmnId' required: - mbsServiceId - - plmnId + - plMNId Ssm: description: Source specific IP multicast address @@ -2724,7 +2831,7 @@ components: description: Contains the NCGI (NR Cell Global Identity), as described in 3GPP 23.003 type: object properties: - plmnId: + plMNId: $ref: 'TS29571_CommonData.yaml#/components/schemas/PlmnId' nrCellId: type: string @@ -3194,8 +3301,8 @@ components: $ref: '#/components/schemas/ManagedNFProfile' commModelList: $ref: '#/components/schemas/CommModelList' - nTNPLMNInfoList: - $ref: '#/components/schemas/NTNPLMNRestrictionsInfo' + nTNPLMNRestrictionsList: + $ref: '#/components/schemas/NTNPLMNRestrictionsList' amfInfo: $ref: '#/components/schemas/AmfInfo' sliceExpiryInfo: @@ -3787,6 +3894,11 @@ components: - NWDAF_WITH_ANLF - NWDAF_WITH_MTLF - NWDAF_WITH_ANLF_MTLF + roamingAnalytics: + type: boolean + roamingData: + type: boolean + - type: object properties: EP_NL3: @@ -3956,11 +4068,11 @@ components: eDNServiceArea: $ref: 'TS28538_EdgeNrm.yaml#/components/schemas/ServingLocation' eASIpAddress: - type: string + $ref: 'TS28623_ComDefs.yaml#/components/schemas/IpAddr' eESIpAddress: - type: string + $ref: 'TS28623_ComDefs.yaml#/components/schemas/IpAddr' eCSIpAddress: - type: string + $ref: 'TS28623_ComDefs.yaml#/components/schemas/IpAddr' ednIdentifier: type: string ecmConnectionType: @@ -4680,7 +4792,7 @@ components: allOf: - type: object properties: - FiveQiDscpMappingList: + fiveQiDscpMappingList: type: array items: $ref: '#/components/schemas/FiveQiDscpMapping' @@ -4763,12 +4875,15 @@ components: isEventTriggeredGtpUPathMonitoringSupported: type: boolean readOnly: true + default: true isPeriodicGtpUMonitoringSupported: type: boolean readOnly: true + default: true isImmediateGtpUMonitoringSupported: type: boolean readOnly: true + default: true gtpUPathDelayThresholds: $ref: '#/components/schemas/GtpUPathDelayThresholdsType' gtpUPathMinimumWaitTime: @@ -4803,12 +4918,15 @@ components: isEventTriggeredQFMonitoringSupported: type: boolean readOnly: true + default: true isPeriodicQFMonitoringSupported: type: boolean readOnly: true + default: true isSessionReleasedQFMonitoringSupported: type: boolean readOnly: true + default: true qFPacketDelayThresholds: $ref: '#/components/schemas/QFPacketDelayThresholdsType' qFMinimumWaitTime: @@ -5513,7 +5631,11 @@ components: enum: - ACTIVATED - DEACTIVATED - readOnly: true + readOnly: true + mLModelRefList: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnListRo' + aIMLInferenceFunctionRefList: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnListRo' EP_SM12-Single: allOf: - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' diff --git a/OpenAPI/TS28541_NrNrm.yaml b/OpenAPI/TS28541_NrNrm.yaml index 3aea8f9c8..7d47c2449 100755 --- a/OpenAPI/TS28541_NrNrm.yaml +++ b/OpenAPI/TS28541_NrNrm.yaml @@ -1,7 +1,7 @@ openapi: 3.0.1 info: title: NR NRM - version: 19.1.0 + version: 19.2.0 description: >- OAS 3.0.1 specification of the NR NRM © 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). @@ -51,6 +51,7 @@ components: PlmnIdList: type: array + uniqueItems: true items: $ref: 'TS28623_ComDefs.yaml#/components/schemas/PlmnId' PlmnInfo: @@ -64,26 +65,44 @@ components: $ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTime' PlmnInfoList: type: array + uniqueItems: true items: - $ref: '#/components/schemas/PlmnInfo' + $ref: '#/components/schemas/PlmnInfo' + minItems: 1 NpnIdentityList: type: array + uniqueItems: true items: $ref: 'TS28623_GenericNrm.yaml#/components/schemas/NpnId-Type' + minItems: 1 GGnbId: - type: string - pattern: '^[0-9]{3}[0-9]{2,3}-(22|23|24|25|26|27|28|29|30|31|32)-[0-9]{1,10}' + type: object + properties: + plmnId: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/PlmnId' + gnbIdLength: + $ref: '#/components/schemas/GnbIdLength' + gnbId: + $ref: '#/components/schemas/GnbId' GEnbId: - type: string - pattern: '^[0-9]{3}[0-9]{2,3}-(18|20|21|22)-[0-9]{1,7}' + type: object + properties: + plmnId: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/PlmnId' + enbId: + type: integer + minimum: 0 + maximum: 4194303 GGnbIdList: type: array + uniqueItems: true items: $ref: '#/components/schemas/GGnbId' GEnbIdList: type: array + uniqueItems: true items: $ref: '#/components/schemas/GEnbId' @@ -94,10 +113,12 @@ components: $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Tac' NrTacList: type: array + uniqueItems: true items: $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Tac' TaiList: type: array + uniqueItems: true items: $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Tai' BackhaulAddress: @@ -110,7 +131,7 @@ components: MappingSetIDBackhaulAddress: type: object properties: - setID: + setId: type: integer backhaulAddress: $ref: '#/components/schemas/BackhaulAddress' @@ -168,13 +189,24 @@ components: type: integer minimum: 0 maximum: 100 - numberOfPreamblesSent: - type: integer - minimum: 0 - maximum: 200 + maxNumberOfPreamblesSent: + type: string + enum: + - n3 + - n4 + - n5 + - n6 + - n7 + - n8 + - n10 + - n20 + - n50 + - n100 + - n200 UeAccDelayProbabilityDist: type: array + uniqueItems: true items: $ref: '#/components/schemas/UeAccDelayProbability' @@ -192,6 +224,7 @@ components: NRPciList: type: array + uniqueItems: true items: $ref: '#/components/schemas/NrPci' minItems: 0 @@ -199,6 +232,7 @@ components: CSonPciList: type: array + uniqueItems: true items: $ref: '#/components/schemas/NrPci' minItems: 1 @@ -277,15 +311,15 @@ components: $ref: '#/components/schemas/Snssai' RrmPolicyMemberList: type: array + uniqueItems: true items: $ref: '#/components/schemas/RrmPolicyMember' + minItems: 1 AddressWithVlan: type: object properties: - ipv4Address: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/Ipv4Addr' - ipv6Address: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/Ipv6Addr' + iPAddress: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/IpAddr' vlanId: type: integer minimum: 0 @@ -300,36 +334,10 @@ components: minimum: 0 maximum: 65535 RemoteAddress: - type: object - properties: - ipv4Address: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/Ipv4Addr' - ipv6Address: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/Ipv6Addr' - - CellIndividualOffset: - type: object - properties: - rsrpOffsetSSB: - type: integer - default: 0 - rsrqOffsetSSB: - type: integer - default: 0 - sinrOffsetSSB: - type: integer - default: 0 - rsrpOffsetCSI-RS: - type: integer - default: 0 - rsrqOffsetCSI-RS: - type: integer - default: 0 - sinrOffsetCSI-RS: - type: integer - default: 0 + $ref: 'TS28623_ComDefs.yaml#/components/schemas/IpAddr' QOffsetRange: type: integer + default: 0 enum: - -24 - -22 @@ -362,21 +370,6 @@ components: - 3 - 2 - 1 - QOffsetRangeList: - type: object - properties: - rsrpOffsetSSB: - $ref: '#/components/schemas/QOffsetRange' - rsrqOffsetSSB: - $ref: '#/components/schemas/QOffsetRange' - sinrOffsetSSB: - $ref: '#/components/schemas/QOffsetRange' - rsrpOffsetCSI-RS: - $ref: '#/components/schemas/QOffsetRange' - rsrqOffsetCSI-RS: - $ref: '#/components/schemas/QOffsetRange' - sinrOffsetCSI-RS: - $ref: '#/components/schemas/QOffsetRange' QOffsetFreq: type: number default: 0 @@ -422,7 +415,6 @@ components: type: integer minimum: -1800 maximum: 1800 - RSSetId: type: integer maximum: 4194303 @@ -449,9 +441,16 @@ components: rimRSStartingFrequencyOffsetIdList: type: array + uniqueItems: true items: type: integer - + minimum: 0 + maximum: 550 + minItems: 1 + maxItems: 4 + description: > + It is a list of configured frequency offsets in units of resource blocks. + Only 1,2 or 4 number of elements allowed in the array. SequenceDomainPara: type: object properties: @@ -459,14 +458,24 @@ components: type: integer rimRSScrambleIdListofRS1: type: array + uniqueItems: true items: type: integer + minimum: 0 + maximum: 1023 + minItems: 1 + maxItems: 8 nrofRIMRSSequenceCandidatesofRS2: type: integer rimRSScrambleIdListofRS2: type: array + uniqueItems: true items: type: integer + minimum: 0 + maximum: 1023 + minItems: 1 + maxItems: 8 enableEnoughNotEnoughIndication: type: string enum: @@ -523,10 +532,12 @@ components: type: integer consecutiveRIMRS1List: type: array + uniqueItems: true items: type: integer consecutiveRIMRS2List: type: array + uniqueItems: true items: type: integer enablenearfarIndicationRS1: @@ -574,23 +585,24 @@ components: type: integer rimRSReportInfoList: type: array + uniqueItems: true items: $ref: '#/components/schemas/RimRSReportInfo' - TceMappingInfo: + TceIDMappingInfo: type: object properties: - TceIPAddress: - oneOf: - - $ref: 'TS28623_ComDefs.yaml#/components/schemas/Ipv4Addr' - - $ref: 'TS28623_ComDefs.yaml#/components/schemas/Ipv6Addr' - TceID: + tceIPAddress: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/IpAddr' + tceID: type: integer - PlmnTarget: + pLMNTarget: $ref: 'TS28623_ComDefs.yaml#/components/schemas/PlmnId' - TceMappingInfoList: + TceIDMappingInfoList: type: array + uniqueItems: true items: - $ref: '#/components/schemas/TceMappingInfo' + $ref: '#/components/schemas/TceIDMappingInfo' + minItems: 1 ResourceType: type: string enum: @@ -609,6 +621,7 @@ components: NTNTAClist: type: array + uniqueItems: true items: $ref: '#/components/schemas/NrTac' @@ -633,8 +646,10 @@ components: EphemerisInfos: type: array + uniqueItems: true items: $ref: '#/components/schemas/Ephemeris' + minItems: 1 PositionVelocity: type: object @@ -713,6 +728,7 @@ components: $ref: 'TS28541_5GcNrm.yaml#/components/schemas/Ncgi' MappedCellIdInfoList: type: array + uniqueItems: true items: $ref: '#/components/schemas/MappedCellIdInfo' QceIdMappingInfo: @@ -728,10 +744,13 @@ components: $ref: 'TS28623_ComDefs.yaml#/components/schemas/PlmnId' QceIdMappingInfoList: type: array + uniqueItems: true items: - $ref: '#/components/schemas/QceIdMappingInfo' + $ref: '#/components/schemas/QceIdMappingInfo' + minItems: 1 MdtUserConsentReqList: type: array + uniqueItems: true items: type: string enum: @@ -972,10 +991,14 @@ components: $ref: '#/components/schemas/GEnbIdList' xnHOBlackList: $ref: '#/components/schemas/GGnbIdList' - mappingSetIDBackhaulAddress: - $ref: '#/components/schemas/MappingSetIDBackhaulAddress' - tceMappingInfoList: - $ref: '#/components/schemas/TceMappingInfoList' + mappingSetIDBackhaulAddressList: + type: array + uniqueItems: true + items: + $ref: '#/components/schemas/MappingSetIDBackhaulAddress' + minItems: 1 + tceIDMappingInfoList: + $ref: '#/components/schemas/TceIDMappingInfoList' configurable5QISetRef: $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' dynamic5QISetRef: @@ -992,6 +1015,10 @@ components: $ref: '#/components/schemas/QceIdMappingInfoList' mdtUserConsentReqList: $ref: '#/components/schemas/MdtUserConsentReqList' + mWABRef: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnRo' + nRECMappingRuleRef: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' - type: object properties: @@ -1120,11 +1147,13 @@ components: $ref: '#/components/schemas/SsbDuration' nrSectorCarrierRef: type: array + uniqueItems: true items: $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' bwpRef: description: "Condition is BWP sets are not supported" type: array + uniqueItems: true items: $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' bwpSetRef: @@ -1167,6 +1196,7 @@ components: properties: bWPlist: type: array + uniqueItems: true items: $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' maxItems: 12 @@ -1288,11 +1318,18 @@ components: digitalAzimuth: $ref: '#/components/schemas/DigitalAzimuth' digitalTilt: - $ref: '#/components/schemas/DigitalTilt' + $ref: '#/components/schemas/DigitalTilt' - type: object properties: Beam: $ref: '#/components/schemas/Beam-Multiple' + CCOWeakCoverageParameters: + $ref: '#/components/schemas/CCOWeakCoverageParameters-Single' + CCOPilotPollutionParameters: + $ref: '#/components/schemas/CCOWeakCoverageParameters-Single' + CCOOvershootCoverageParameters: + $ref: '#/components/schemas/CCOOvershootCoverageParameters-Single' + Beam-Single: allOf: - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' @@ -1367,7 +1404,11 @@ components: nRTCI: type: integer cellIndividualOffset: - $ref: '#/components/schemas/CellIndividualOffset' + type: array + items: + $ref: '#/components/schemas/QOffsetRange' + minItems: 6 + maxItems: 6 adjacentNRCellRef: $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' nRFreqRelationRef: @@ -1404,15 +1445,27 @@ components: type: object properties: offsetMO: - $ref: '#/components/schemas/QOffsetRangeList' + type: array + items: + $ref: '#/components/schemas/QOffsetRange' + minItems: 6 + maxItems: 6 blockListEntry: type: array + uniqueItems: true items: type: integer minimum: 0 - maximum: 1007 + maximum: 503 + maxItems: 16 blockListEntryIdleMode: - type: integer + type: array + uniqueItems: true + items: + type: integer + minimum: 0 + maximum: 1007 + maxItems: 16 cellReselectionPriority: type: integer cellReselectionSubPriority: @@ -1467,15 +1520,27 @@ components: type: object properties: cellIndividualOffset: - $ref: '#/components/schemas/CellIndividualOffset' - blackListEntry: type: array + items: + $ref: '#/components/schemas/QOffsetRange' + minItems: 6 + maxItems: 6 + blockListEntry: + type: array + uniqueItems: true + items: + type: integer + minimum: 0 + maximum: 503 + maxItems: 16 + blockListEntryIdleMode: + type: array + uniqueItems: true items: type: integer minimum: 0 maximum: 1007 - blackListEntryIdleMode: - type: integer + maxItems: 16 cellReselectionPriority: type: integer default: 0 @@ -1753,6 +1818,11 @@ components: $ref: '#/components/schemas/NRFrequency-Multiple' ExternalGnbCuCpFunction: $ref: '#/components/schemas/ExternalGnbCuCpFunction-Multiple' + ExternalGnbCuUpFunction: + $ref: '#/components/schemas/ExternalGnbCuUpFunction-Multiple' + ExternalGnbDuFunction: + $ref: '#/components/schemas/ExternalGnbDuFunction-Multiple' + ExternalGnbCuUpFunction-Single: allOf: @@ -1819,8 +1889,13 @@ components: type: integer nrPci: $ref: '#/components/schemas/NrPci' - plmnIdList: - $ref: '#/components/schemas/PlmnIdList' + plMNIdList: + type: array + uniqueItems: true + items: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/PlmnId' + minItems: 1 + maxItems: 12 nRFrequencyRef: $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' @@ -2089,6 +2164,34 @@ components: properties: ephemerisInfos: $ref: '#/components/schemas/EphemerisInfos' + MWAB-Single: + allOf: + - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' + - type: object + properties: + attributes: + type: object + properties: + administrativeState: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/AdministrativeState' + operationalState: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/OperationalState' + + NRECMappingRule-Single: + allOf: + - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' + - type: object + properties: + attributes: + allOf: + - type: object + properties: + ecMRInputMinimumValue: + type: integer + ecMRInputMaximumValue: + type: integer + ecTimeInterval: + type: integer #-------- Definition of JSON arrays for name-contained IOCs ---------------------- @@ -2248,6 +2351,10 @@ components: type: array items: $ref: '#/components/schemas/EphemerisInfoSet-Single' + NRECMappingRule-Multiple: + type: array + items: + $ref: '#/components/schemas/NRECMappingRule-Single' #-------- Definitions in TS 28.541 for TS 28.532 --------------------------------- @@ -2315,4 +2422,5 @@ components: - $ref: '#/components/schemas/CCOOvershootCoverageParameters-Single' - $ref: '#/components/schemas/NTNFunction-Single' - $ref: '#/components/schemas/EphemerisInfoSet-Single' - + - $ref: '#/components/schemas/MWAB-Single' + - $ref: '#/components/schemas/NRECMappingRule-Single' diff --git a/OpenAPI/TS28541_SliceNrm.yaml b/OpenAPI/TS28541_SliceNrm.yaml index 1dc47d0e4..92192eb0c 100755 --- a/OpenAPI/TS28541_SliceNrm.yaml +++ b/OpenAPI/TS28541_SliceNrm.yaml @@ -1,7 +1,7 @@ openapi: 3.0.1 info: title: Slice NRM - version: 19.0.0 + version: 19.2.0 description: >- OAS 3.0.1 specification of the Slice NRM @ 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). @@ -34,6 +34,7 @@ components: readOnly: true PositioningAvailability: type: array + uniqueItems: true items: type: string enum: @@ -43,7 +44,9 @@ components: - AECID - HYBRID_POSITIONING - NET_RTK - readOnly: true + readOnly: true + minItems: 1 + maxItems: 6 PredictionFrequency: type: string enum: @@ -75,13 +78,16 @@ components: Tagging: type: array readOnly: true + uniqueItems: true items: type: string enum: - PERFORMANCE - FUNCTION - OPERATION - readOnly: true + minItems: 1 + maxItems: 3 + readOnly: true Exposure: type: string enum: @@ -125,17 +131,19 @@ components: $ref: '#/components/schemas/Support' periodicityList: type: array + uniqueItems: true items: type: integer + minItems: 1 XLThpt: type: object properties: servAttrCom: $ref: '#/components/schemas/ServAttrCom' guaThpt: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/FloatRo' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/Float' maxThpt: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/FloatRo' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/Float' MaxPktSize: type: object properties: @@ -150,7 +158,15 @@ components: $ref: '#/components/schemas/ServAttrCom' nOofPDUSessions: type: integer - readOnly: true + MaxNumberofUEs: + type: object + properties: + servAttrCom: + $ref: '#/components/schemas/ServAttrCom' + 3GPPNoOfUEs: + type: integer + non3GPPNoOfUEs: + type: integer KPIMonitoring: type: object properties: @@ -158,6 +174,7 @@ components: $ref: '#/components/schemas/ServAttrCom' kPIList: type: array + uniqueItems: true items: type: string readOnly: true @@ -175,6 +192,7 @@ components: $ref: '#/components/schemas/ServAttrCom' nROperatingBands: type: array + uniqueItems: true items: type: string Synchronicity: @@ -218,7 +236,6 @@ components: $ref: '#/components/schemas/ServAttrCom' density: type: integer - readOnly: true NsInfo: type: object properties: @@ -289,6 +306,7 @@ components: type: string secRules: type: array + uniqueItems: true items: type: string readOnly: true @@ -299,8 +317,10 @@ components: $ref: '#/components/schemas/ServAttrCom' secFuncList: type: array + uniqueItems: true items: $ref: '#/components/schemas/SecFunc' + minItems: 1 DataNetwork: type: object properties: @@ -308,6 +328,7 @@ components: $ref: '#/components/schemas/ServAttrCom' dnnList: type: array + uniqueItems: true items: type: string DataAccess: @@ -353,14 +374,17 @@ components: $ref: '#/components/schemas/ServAttrCom' dataAccessList: type: array + uniqueItems: true items: $ref: '#/components/schemas/DataAccess' tunnellingMechanismList: type: array + uniqueItems: true items: $ref: '#/components/schemas/TunnellingMechanism' localBreakoutAllowedList: type: array + uniqueItems: true items: $ref: '#/components/schemas/LboAllowed' @@ -368,7 +392,7 @@ components: type: object properties: maxNumberofUEs: - type: integer + $ref: '#/components/schemas/MaxNumberofUEs' dLLatency: type: number uLLatency: @@ -428,7 +452,10 @@ components: uLPktDelayVariation: $ref: '#/components/schemas/Float' sliceSubnetAvailability: - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/SchedulingTime' + type: array + uniqueItems: true + items: + $ref: 'TS28623_GenericNrm.yaml#/components/schemas/SchedulingTime' RANSliceSubnetProfile: type: object @@ -444,7 +471,7 @@ components: resourceSharingLevel: $ref: '#/components/schemas/SharingLevel' maxNumberofUEs: - type: integer + $ref: '#/components/schemas/MaxNumberofUEs' activityFactor: type: integer dLThptPerSliceSubnet: @@ -467,6 +494,7 @@ components: type: integer nROperatingBands: type: array + uniqueItems: true items: type: string delayTolerance: @@ -510,7 +538,7 @@ components: uLLatency: type: integer maxNumberofUEs: - type: integer + $ref: '#/components/schemas/MaxNumberofUEs' dLThptPerSliceSubnet: $ref: '#/components/schemas/XLThpt' dLThptPerUE: @@ -527,6 +555,7 @@ components: type: integer nROperatingBands: type: array + uniqueItems: true items: type: string sliceSimultaneousUse: @@ -584,7 +613,10 @@ components: uLPktDelayVariation: $ref: '#/components/schemas/Float' sliceSubnetAvailability: - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/SchedulingTime' + type: array + uniqueItems: true + items: + $ref: 'TS28623_GenericNrm.yaml#/components/schemas/SchedulingTime' ServiceProfile: type: object @@ -595,7 +627,7 @@ components: plmnInfoList: $ref: 'TS28541_NrNrm.yaml#/components/schemas/PlmnInfoList' maxNumberofUEs: - type: number + $ref: '#/components/schemas/MaxNumberofUEs' dLLatency: type: number uLLatency: @@ -644,6 +676,7 @@ components: $ref: '#/components/schemas/V2XCommModels' coverageArea: type: array + uniqueItems: true items: $ref: 'TS28623_ComDefs.yaml#/components/schemas/GeoArea' termDensity: @@ -681,7 +714,10 @@ components: uLPktDelayVariation: $ref: '#/components/schemas/Float' sliceAvailability: - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/SchedulingTime' + type: array + uniqueItems: true + items: + $ref: 'TS28623_GenericNrm.yaml#/components/schemas/SchedulingTime' SliceProfile: type: object @@ -742,11 +778,13 @@ components: ServiceProfileList: type: array + uniqueItems: true items: $ref: '#/components/schemas/ServiceProfile' SliceProfileList: type: array + uniqueItems: true items: $ref: '#/components/schemas/SliceProfile' FeasibilityResult: @@ -765,7 +803,8 @@ components: RecommendationRequest: description: >- An attribute represents MnS consumer's request for recommended network slice related requirements. - type: boolean + type: boolean + default: false RecommendedRequirements: description: >- An attribute that specifies the recommended network slicing related requirements (i.e. ServiceProfile and SliceProfile information) which can be supported by the MnS producer.. @@ -775,6 +814,7 @@ components: description: >- An attribute represents MnS consumer's requirements for resource reservation. type: boolean + default: false RequestedReservationExpiration: description: >- An attribute which specifies MnS consuner's requirements for the validity period of the resource reservation. @@ -914,7 +954,7 @@ components: type: string epApplicationRefs: $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList' - connectionPointRefList: + externalEndPointRefList: type: array items: $ref: '#/components/schemas/ConnectionPointInfo' @@ -1035,6 +1075,7 @@ components: $ref: '#/components/schemas/NetworkSlicingApplicability' resourceIsolationRuleList: type: array + uniqueItems: true items: $ref: '#/components/schemas/ResourceIsolationRule' networkSliceRefList: diff --git a/OpenAPI/TS28623_ComDefs.yaml b/OpenAPI/TS28623_ComDefs.yaml index ff303617c..b06b18ccc 100755 --- a/OpenAPI/TS28623_ComDefs.yaml +++ b/OpenAPI/TS28623_ComDefs.yaml @@ -1,7 +1,7 @@ openapi: 3.0.1 info: title: Common Type Definitions - version: 19.1.0 + version: 19.2.0 description: >- OAS 3.0.1 specification of common type definitions in the Generic NRM © 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). @@ -69,11 +69,13 @@ components: DnList: description: This datatype is used for writable attribute type: array + uniqueItems: true items: $ref: '#/components/schemas/Dn' DnListRo: description: This datatype is used for readOnly attribute type: array + uniqueItems: true items: $ref: '#/components/schemas/DnRo' @@ -168,16 +170,19 @@ components: $ref: '#/components/schemas/Longitude' altitude: $ref: '#/components/schemas/Float' - ConvexGeoPolygon: + GeoPolygon: type: array + uniqueItems: true items: $ref: '#/components/schemas/GeoCoordinate' - minItems: 3 + minItems: 1 GeoArea: - type: object - properties: - convexGeoPolygon: - $ref: '#/components/schemas/ConvexGeoPolygon' + oneOf: + - type: object + properties: + geoPolygon: + $ref: '#/components/schemas/GeoCoordinate' + minItems: 1 GeoAreaToCellMapping: type: object properties: @@ -193,16 +198,23 @@ components: - type: array items: $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Tai' + minItems: 1 + maxItems: 8 - type: array items: $ref: '#/components/schemas/NrCellId' + minItems: 1 + maxItems: 32 - type: array items: $ref: '#/components/schemas/EutraCellId' + minItems: 1 + maxItems: 32 - type: array items: $ref: '#/components/schemas/UtraCellId' - + minItems: 1 + maxItems: 32 Fqdn: type: string description: This datatype is used for writable attribute @@ -281,6 +293,10 @@ components: oneOf: - $ref: '#/components/schemas/IpAddr' - $ref: '#/components/schemas/Fqdn' + HostRo: + oneOf: + - $ref: '#/components/schemas/IpAddrRo' + - $ref: '#/components/schemas/FqdnRo' Uri: description: This datatype is used for writable attribute type: string @@ -357,11 +373,26 @@ components: description: >- The filter format shall be compliant to Jex (TS 32.161). type: string + JexConditions: + type: string + description: >- + The value of the string shall be a Jex expression that is compliant to the + Jex conditions profile specified in clause 7.6 of TS 32.161. + JexNodeSelectionBasic: + type: string + description: >- + The value of the string shall be a Jex expression that is compliant to the + Jex basic profile specified in clause 7.4 of TS 32.161. + JexNodeSelectionAdvanced: + type: string + description: >- + The value of the string shall be a Jex expression that is compliant to the + Jex advanced profile specified in clause 7.5 of TS 32.161. SystemDN: type: string - NotificationId: type: integer + readOnly: true NotificationType: oneOf: - $ref: 'TS28111_FaultNrm.yaml#/components/schemas/AlarmNotificationTypes' @@ -408,7 +439,7 @@ components: timeTick: type: integer filter: - $ref: '#/components/schemas/Filter' + $ref: '#/components/schemas/JexConditions' ErrorResponseGet: description: >- diff --git a/OpenAPI/TS28623_FileManagementNrm.yaml b/OpenAPI/TS28623_FileManagementNrm.yaml index 305ba783a..60d44b7f0 100644 --- a/OpenAPI/TS28623_FileManagementNrm.yaml +++ b/OpenAPI/TS28623_FileManagementNrm.yaml @@ -1,7 +1,7 @@ openapi: 3.0.1 info: title: File Management NRM - version: 19.1.0 + version: 19.2.0 description: >- OAS 3.0.1 definition of the File Management NRM fragment © 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). @@ -38,7 +38,7 @@ components: for usage in the "FileDownloadJob". type: object properties: - jobId: + id: type: string readOnly: true status: diff --git a/OpenAPI/TS28623_GenericNrm.yaml b/OpenAPI/TS28623_GenericNrm.yaml index 1346cf3a9..89d1d35e8 100755 --- a/OpenAPI/TS28623_GenericNrm.yaml +++ b/OpenAPI/TS28623_GenericNrm.yaml @@ -1,7 +1,7 @@ openapi: 3.0.1 info: title: Generic NRM - version: 19.1.0 + version: 19.2.0 description: >- OAS 3.0.1 definition of the Generic NRM © 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). @@ -59,17 +59,21 @@ components: properties: performanceMetrics: type: array + uniqueItems: true items: type: string - readOnly: true + readOnly: true + minItems: 1 granularityPeriods: type: array + uniqueItems: true items: type: integer minimum: 1 readOnly: true reportingMethods: type: array + uniqueItems: true items: type: string enum: @@ -79,6 +83,7 @@ components: readOnly: true reportingPeriods: type: array + uniqueItems: true items: type: integer minimum: 1 @@ -110,7 +115,7 @@ components: This data type is the "ProcessMonitor" data type without specialisations. type: object properties: - jobId: + id: type: string readOnly: true status: @@ -146,19 +151,28 @@ components: - type: array items: $ref: '#/components/schemas/NpnId-Type' + minItems: 1 - oneOf: - type: array items: $ref: '#/components/schemas/EutraCellId' + minItems: 1 + maxItems: 32 - type: array items: $ref: '#/components/schemas/NrCellId' + minItems: 1 + maxItems: 32 - type: array items: $ref: '#/components/schemas/Tac' + minItems: 1 + maxItems: 8 - type: array items: $ref: '#/components/schemas/Tai' + minItems: 1 + maxItems: 8 Tai: type: object properties: @@ -189,16 +203,19 @@ components: properties: timeIntervals: type: array + uniqueItems: true items: $ref: 'TS28623_ComDefs.yaml#/components/schemas/TimeInterval' - type: object properties: timeIntervals: type: array + uniqueItems: true items: $ref: 'TS28623_ComDefs.yaml#/components/schemas/TimeInterval' daysOfWeek: type: array + uniqueItems: true items: type: string enum: @@ -209,14 +226,18 @@ components: - FRIDAY - SATURDAY - SUNDAY + minItems: 1 + maxItems: 7 - type: object properties: timeIntervals: type: array + uniqueItems: true items: $ref: 'TS28623_ComDefs.yaml#/components/schemas/TimeInterval' daysOfMonth: type: array + uniqueItems: true items: type: integer minimum: 0 @@ -228,15 +249,15 @@ components: $ref: 'TS28623_ComDefs.yaml#/components/schemas/PlmnId' cAGIdList: type: array + uniqueItems: true items: type: string - minItems: 1 maxItems: 256 nIDList: type: array + uniqueItems: true items: $ref: 'TS28623_ComDefs.yaml#/components/schemas/Nid' - minItems: 1 maxItems: 16 oneOf: - required: [plmnId, cAGIdList] @@ -288,18 +309,22 @@ components: type: string setOfMcc: type: array + uniqueItems: true items: $ref: 'TS28623_ComDefs.yaml#/components/schemas/Mcc' - readOnly: true + readOnly: true + minItems: 1 priorityLabel: type: integer readOnly: true supportedPerfMetricGroups: type: array + uniqueItems: true items: $ref: '#/components/schemas/SupportedPerfMetricGroup' supportedTraceMetrics: type: array + uniqueItems: true items: type: string ManagedElement-Attr: @@ -309,6 +334,7 @@ components: type: string managedElementTypeList: type: array + uniqueItems: true items: type: string userLabel: @@ -329,10 +355,12 @@ components: type: integer supportedPerfMetricGroups: type: array + uniqueItems: true items: $ref: '#/components/schemas/SupportedPerfMetricGroup' supportedTraceMetrics: type: array + uniqueItems: true items: type: string readOnly: true @@ -384,20 +412,24 @@ components: type: string vnfParametersList: type: array + uniqueItems: true items: $ref: '#/components/schemas/VnfParameter' peeParametersList: type: array + uniqueItems: true items: $ref: '#/components/schemas/PeeParameter' priorityLabel: type: integer supportedPerfMetricGroups: type: array + uniqueItems: true items: $ref: '#/components/schemas/SupportedPerfMetricGroup' supportedTraceMetrics: type: array + uniqueItems: true items: type: string EP_RP-Attr: @@ -410,6 +442,7 @@ components: readOnly: true supportedPerfMetricGroups: type: array + uniqueItems: true items: $ref: '#/components/schemas/SupportedPerfMetricGroup' @@ -500,6 +533,7 @@ components: properties: schedulingTimes: type: array + uniqueItems: true items: $ref: '#/components/schemas/SchedulingTime' minItems: 1 @@ -530,10 +564,12 @@ components: properties: notificationTypes: type: array + uniqueItems: true items: $ref: 'TS28623_ComDefs.yaml#/components/schemas/NotificationType' notificationProtocols: type: array + uniqueItems: true items: type: string enum: diff --git a/OpenAPI/TS28623_MnSRegistryNrm.yaml b/OpenAPI/TS28623_MnSRegistryNrm.yaml index 153a45cc9..299cca657 100644 --- a/OpenAPI/TS28623_MnSRegistryNrm.yaml +++ b/OpenAPI/TS28623_MnSRegistryNrm.yaml @@ -1,7 +1,7 @@ openapi: 3.0.1 info: title: MnS Registry NRM - version: 19.1.0 + version: 19.2.0 description: >- OAS 3.0.1 definition of the MnS Registry NRM fragment © 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). @@ -61,8 +61,10 @@ components: contain the DN of the SubNetwork instead of the DNs of the individual managed entities within the SubNetwork. type: array + uniqueItems: true items: $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnRo' + minItems: 1 #-------- Definition of YAML arrays for name-contained IOCs ---------------------- diff --git a/OpenAPI/TS28623_PmControlNrm.yaml b/OpenAPI/TS28623_PmControlNrm.yaml index 720842e2d..2a3a50d15 100644 --- a/OpenAPI/TS28623_PmControlNrm.yaml +++ b/OpenAPI/TS28623_PmControlNrm.yaml @@ -1,7 +1,7 @@ openapi: 3.0.1 info: title: PM control NRM - version: 19.0.0 + version: 19.2.0 description: >- OAS 3.0.1 definition of the PM control NRM fragment © 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). @@ -47,8 +47,10 @@ components: type: string performanceMetrics: type: array + uniqueItems: true items: type: string + minItems: 1 granularityPeriod: type: integer minimum: 1 @@ -62,6 +64,8 @@ components: $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' reportingCtrl: $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ReportingCtrl' + _linkToFiles: + type: string Files: $ref: 'TS28623_FileManagementNrm.yaml#/components/schemas/Files-Multiple' diff --git a/OpenAPI/TS28623_QoEMeasurementCollectionNrm.yaml b/OpenAPI/TS28623_QoEMeasurementCollectionNrm.yaml index c7811203e..fb0eaeaf1 100644 --- a/OpenAPI/TS28623_QoEMeasurementCollectionNrm.yaml +++ b/OpenAPI/TS28623_QoEMeasurementCollectionNrm.yaml @@ -1,7 +1,7 @@ openapi: 3.0.1 info: title: QoE Measurement Collection NRM - version: 19.1.0 + version: 19.2.0 description: >- OAS 3.0.1 definition of the QoE Measurement Collection NRM © 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). @@ -45,6 +45,7 @@ components: - VR areaScope: type: array + uniqueItems: true items: $ref: 'TS28623_GenericNrm.yaml#/components/schemas/AreaScope' qoECollectionEntityAddress: @@ -59,6 +60,7 @@ components: type: string sliceScope: type: array + uniqueItems: true items: $ref: 'TS28541_NrNrm.yaml#/components/schemas/Snssai' qMCConfigFile: @@ -67,6 +69,7 @@ components: $ref: 'TS28623_TraceControlNrm.yaml#/components/schemas/traceReference-Type' availableRANqoEMetrics: type: array + uniqueItems: true items: type: string enum: diff --git a/OpenAPI/TS28623_SubscriptionControlNrm.yaml b/OpenAPI/TS28623_SubscriptionControlNrm.yaml index f077c875d..83b75c6b6 100644 --- a/OpenAPI/TS28623_SubscriptionControlNrm.yaml +++ b/OpenAPI/TS28623_SubscriptionControlNrm.yaml @@ -1,7 +1,7 @@ openapi: 3.0.1 info: title: Subscription Control NRM - version: 19.1.0 + version: 19.2.0 description: >- OAS 3.0.1 definition of the Subscription Control NRM fragment © 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). @@ -42,7 +42,9 @@ components: - type: object properties: dataNodeSelector: - type: string + oneOf: + - $ref: 'TS28623_ComDefs.yaml#/components/schemas/JexNodeSelectionBasic' + - $ref: 'TS28623_ComDefs.yaml#/components/schemas/JexNodeSelectionAdvanced' #-------- Definition of concrete IOCs -------------------------------------------- NtfSubscriptionControl-Single: @@ -57,12 +59,13 @@ components: $ref: 'TS28623_ComDefs.yaml#/components/schemas/Uri' notificationTypes: type: array + uniqueItems: true items: $ref: 'TS28623_ComDefs.yaml#/components/schemas/NotificationType' scope: $ref: '#/components/schemas/Scope' notificationFilter: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/Filter' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/JexConditions' HeartbeatControl: $ref: '#/components/schemas/HeartbeatControl-Single' HeartbeatControl-Single: diff --git a/OpenAPI/TS28623_ThresholdMonitorNrm.yaml b/OpenAPI/TS28623_ThresholdMonitorNrm.yaml index 84e95a94a..6479b1f5c 100644 --- a/OpenAPI/TS28623_ThresholdMonitorNrm.yaml +++ b/OpenAPI/TS28623_ThresholdMonitorNrm.yaml @@ -1,7 +1,7 @@ openapi: 3.0.1 info: title: Threshold Monitor NRM - version: 19.0.0 + version: 19.2.0 description: >- OAS 3.0.1 definition of the Threshold Monitor NRM fragment © 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). @@ -31,8 +31,10 @@ components: properties: performanceMetrics: type: array + uniqueItems: true items: type: string + minItems: 1 thresholdDirection: type: string enum: @@ -66,8 +68,10 @@ components: $ref: 'TS28623_ComDefs.yaml#/components/schemas/OperationalState' thresholdInfoList: type: array + uniqueItems: true items: $ref: '#/components/schemas/ThresholdInfo' + minItems: 1 monitorGranularityPeriod: type: integer minimum: 1 diff --git a/OpenAPI/TS28623_TraceControlNrm.yaml b/OpenAPI/TS28623_TraceControlNrm.yaml index f2d85e495..d7ceac452 100644 --- a/OpenAPI/TS28623_TraceControlNrm.yaml +++ b/OpenAPI/TS28623_TraceControlNrm.yaml @@ -1,7 +1,7 @@ openapi: 3.0.1 info: title: Trace Control NRM - version: 19.1.0 + version: 19.2.0 description: >- OAS 3.0.1 definition of the Trace Control NRM fragment © 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). @@ -385,6 +385,7 @@ components: listOfNeTypes-Type: description: The Network Element types where Trace Session activation is needed. See 3GPP TS 32.422 clause 5.4 for additional details. type: array + uniqueItems: true items: type: string enum: @@ -423,6 +424,7 @@ components: listOfTraceMetrics: description: The trace metrics to be reported. See 3GPP TS 32.422 clause 10 for additional details. type: array + uniqueItems: true items: type: string @@ -820,13 +822,16 @@ components: items: type: string enum: - - M1 - - M2 - - M3 - - M4 - - M5 - - M6 - - M7 + - M1_DL + - M2_DL + - M4_DL + - M4_UL + - M5_DL + - M5_UL + - M6_DL + - M6_UL + - M7_DL + - M7_UL - M1_EVENT_TRIGGERED - M8 - M9 @@ -973,6 +978,7 @@ components: plmnList-Type: description: See details in 3GPP TS 32.422 clause 5.10.24. type: array + uniqueItems: true items: type: object properties: @@ -1218,6 +1224,7 @@ components: sensorInformation-Type: description: See details in 3GPP TS 32.422 clause 5.10.29. type: array + uniqueItems: true items: type: string enum: @@ -1261,6 +1268,7 @@ components: excessPacketDelayThresholds-Type: description: Array of type excessPacketDelayThreshold-Type. type: array + uniqueItems: true items: $ref: '#/components/schemas/excessPacketDelayThreshold-Type' minItems: 0 @@ -1360,6 +1368,7 @@ components: $ref: '#/components/schemas/timeToTriggerL1-Type' mbsfnAreaList: type: array + uniqueItems: true items: $ref: '#/components/schemas/MbsfnArea' maxItems: 8 @@ -1371,11 +1380,13 @@ components: $ref: '#/components/schemas/eventListForEventTriggeredMeasurement-Type' areaConfigurationForNeighCell: type: array + uniqueItems: true items: $ref: '#/components/schemas/AreaConfig' maxItems: 32 nPNIdentityList: type: array + uniqueItems: true items: $ref: 'TS28623_GenericNrm.yaml#/components/schemas/NpnId-Type' @@ -1387,8 +1398,9 @@ components: $ref: '#/components/schemas/anonymizationOfMdtData-Type' areaScope: type: array + uniqueItems: true items: - $ref: '#/components/schemas/AreaScope' + $ref: 'TS28623_GenericNrm.yaml#/components/schemas/AreaScope' sensorInformation: $ref: '#/components/schemas/sensorInformation-Type' immediateMDTConfig: @@ -1401,7 +1413,10 @@ components: type: object properties: ueCoreMeasurements: - type: string + type: array + items: + type: string + minItems: 1 ueCoreMeasGranularityPeriod: type: integer nfTypeToMeasure: @@ -1414,20 +1429,29 @@ components: AreaScope: oneOf: - type: array + uniqueItems: true items: $ref: 'TS28623_ComDefs.yaml#/components/schemas/EutraCellId' - type: array + uniqueItems: true items: $ref: 'TS28623_ComDefs.yaml#/components/schemas/NrCellId' - type: array + uniqueItems: true items: $ref: 'TS28623_ComDefs.yaml#/components/schemas/Tac' - type: array + uniqueItems: true items: $ref: '#/components/schemas/Tai' - type: array + uniqueItems: true items: $ref: 'TS28623_GenericNrm.yaml#/components/schemas/NpnId-Type' + - type: array + items: + $ref: '#/components/schemas/PLMNInfo' + Tai: type: object properties: @@ -1437,7 +1461,15 @@ components: $ref: 'TS28623_ComDefs.yaml#/components/schemas/Mnc' tac: $ref: 'TS28623_ComDefs.yaml#/components/schemas/Tac' - + PLMNInfo: + type: object + properties: + plmnId: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/PlmnId' + sNSSAI: + type: array + items: + $ref: 'TS28541_NrNrm.yaml#/components/schemas/Snssai' AreaConfig: type: object properties: @@ -1445,8 +1477,13 @@ components: $ref: '#/components/schemas/FreqInfo' pciList: type: array + uniqueItems: true items: type: integer + minimum: 0 + maximum: 1007 + minItems: 1 + maxItems: 32 FreqInfo: description: specifies the carrier frequency and bands used in a cell. type: object @@ -1455,8 +1492,10 @@ components: type: integer freqBands: type: array + uniqueItems: true items: type: integer + minItems: 1 MbsfnArea: type: object properties: @@ -1478,6 +1517,9 @@ components: $ref: 'TS28623_GenericNrm.yaml#/components/schemas/NpnId-Type' listOfTraceMetrics: type: array + uniqueItems: true + items: + type: string traceReportingConsumerUri: $ref: 'TS28623_ComDefs.yaml#/components/schemas/Uri' traceCollectionEntityIpAddress: diff --git a/README.md b/README.md index 7ded0d216..f4bd9cbd1 100644 --- a/README.md +++ b/README.md @@ -4,18 +4,20 @@ The Rel-16 branch represents the latest Rel-16 content approved and published af The Rel-17 branch represents the latest Rel-17 content approved and published after each TSG SA plenary. -Rel-18 branch represents the current working in progress release status. +The Rel-18 branch represents the latest Rel-18 content approved and published after each TSG SA plenary. -(c) 2020, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). +The Rel-19 branch represents the current working in progress release status. + +(c) 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved. -Branch {+Rel-18+} validation status: +Branch {+Rel-19+} validation status: [![pipeline status](https://forge.3gpp.org/rep/SA5/MnS/badges/Rel-18/pipeline.svg)](https://forge.3gpp.org/rep/SA5/MnS/commits/Rel-18) -## Data models validation +## Data models/Schema validation -The YANG data models in the present projects are validated by an automated CI agent. Learn more at: +The YANG data models and YAML Schema in the present projects are validated by an automated CI agent. Learn more at: * [Management And Orchestration APIs Wiki](https://forge.3gpp.org/rep/sa5/MnS/-/wikis/home) -* [Validation scripts repository](https://forge.3gpp.org/rep/tools/3gpp-scripts/sa5) +* [Validation scripts repository](https://forge.3gpp.org/rep/tools/3gpp-scripts/-/tree/master/sa5) -- GitLab From 31603ae5db5b61804d952d29daa69cd5aeda5cf5 Mon Sep 17 00:00:00 2001 From: "U-ERICSSON\\ETHBLL" Date: Thu, 9 Jan 2025 17:43:55 +0100 Subject: [PATCH 232/587] Rel-19 CR 28.111 Add missing input parameters --- OpenAPI/TS28111_FaultNrm.yaml | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/OpenAPI/TS28111_FaultNrm.yaml b/OpenAPI/TS28111_FaultNrm.yaml index 321b34cc5..66f4ae6c9 100644 --- a/OpenAPI/TS28111_FaultNrm.yaml +++ b/OpenAPI/TS28111_FaultNrm.yaml @@ -360,6 +360,8 @@ components: $ref: '#/components/schemas/AlarmType' probableCause: $ref: '#/components/schemas/ProbableCause' + specificProblem: + $ref: '#/components/schemas/SpecificProblem' perceivedSeverity: $ref: '#/components/schemas/PerceivedSeverity' correlatedNotifications: @@ -384,6 +386,8 @@ components: $ref: '#/components/schemas/AlarmType' probableCause: $ref: '#/components/schemas/ProbableCause' + specificProblem: + $ref: '#/components/schemas/SpecificProblem' perceivedSeverity: $ref: '#/components/schemas/PerceivedSeverity' NotifyChangedAlarmGeneral: @@ -393,6 +397,7 @@ components: required: - alarmId - alarmType + - probableCause properties: alarmId: $ref: '#/components/schemas/AlarmId' @@ -435,6 +440,7 @@ components: required: - alarmId - alarmType + - probableCause - serviceUser - serviceProvider - securityAlarmDetector @@ -470,6 +476,8 @@ components: required: - alarmId - correlatedNotifications + - alarmType + - probableCause properties: alarmId: $ref: '#/components/schemas/AlarmId' @@ -477,6 +485,12 @@ components: $ref: '#/components/schemas/CorrelatedNotifications' rootCauseIndicator: type: boolean + alarmType: + $ref: '#/components/schemas/AlarmType' + probableCause: + $ref: '#/components/schemas/ProbableCause' + specificProblem: + $ref: '#/components/schemas/SpecificProblem' NotifyAckStateChanged: allOf: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/NotificationHeader' @@ -495,6 +509,8 @@ components: $ref: '#/components/schemas/AlarmType' probableCause: $ref: '#/components/schemas/ProbableCause' + specificProblem: + $ref: '#/components/schemas/SpecificProblem' perceivedSeverity: $ref: '#/components/schemas/PerceivedSeverity' ackState: @@ -520,6 +536,8 @@ components: $ref: '#/components/schemas/AlarmType' probableCause: $ref: '#/components/schemas/ProbableCause' + specificProblem: + $ref: '#/components/schemas/SpecificProblem' perceivedSeverity: $ref: '#/components/schemas/PerceivedSeverity' comments: -- GitLab From d258d95cad3fb8909cc69b76059517d613a1b56b Mon Sep 17 00:00:00 2001 From: lengyelb Date: Thu, 9 Jan 2025 16:51:58 +0000 Subject: [PATCH 233/587] Revert "Rel-19 CR 28.111 Add missing input parameters" This reverts commit 31603ae5db5b61804d952d29daa69cd5aeda5cf5 --- OpenAPI/TS28111_FaultNrm.yaml | 18 ------------------ 1 file changed, 18 deletions(-) diff --git a/OpenAPI/TS28111_FaultNrm.yaml b/OpenAPI/TS28111_FaultNrm.yaml index 66f4ae6c9..321b34cc5 100644 --- a/OpenAPI/TS28111_FaultNrm.yaml +++ b/OpenAPI/TS28111_FaultNrm.yaml @@ -360,8 +360,6 @@ components: $ref: '#/components/schemas/AlarmType' probableCause: $ref: '#/components/schemas/ProbableCause' - specificProblem: - $ref: '#/components/schemas/SpecificProblem' perceivedSeverity: $ref: '#/components/schemas/PerceivedSeverity' correlatedNotifications: @@ -386,8 +384,6 @@ components: $ref: '#/components/schemas/AlarmType' probableCause: $ref: '#/components/schemas/ProbableCause' - specificProblem: - $ref: '#/components/schemas/SpecificProblem' perceivedSeverity: $ref: '#/components/schemas/PerceivedSeverity' NotifyChangedAlarmGeneral: @@ -397,7 +393,6 @@ components: required: - alarmId - alarmType - - probableCause properties: alarmId: $ref: '#/components/schemas/AlarmId' @@ -440,7 +435,6 @@ components: required: - alarmId - alarmType - - probableCause - serviceUser - serviceProvider - securityAlarmDetector @@ -476,8 +470,6 @@ components: required: - alarmId - correlatedNotifications - - alarmType - - probableCause properties: alarmId: $ref: '#/components/schemas/AlarmId' @@ -485,12 +477,6 @@ components: $ref: '#/components/schemas/CorrelatedNotifications' rootCauseIndicator: type: boolean - alarmType: - $ref: '#/components/schemas/AlarmType' - probableCause: - $ref: '#/components/schemas/ProbableCause' - specificProblem: - $ref: '#/components/schemas/SpecificProblem' NotifyAckStateChanged: allOf: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/NotificationHeader' @@ -509,8 +495,6 @@ components: $ref: '#/components/schemas/AlarmType' probableCause: $ref: '#/components/schemas/ProbableCause' - specificProblem: - $ref: '#/components/schemas/SpecificProblem' perceivedSeverity: $ref: '#/components/schemas/PerceivedSeverity' ackState: @@ -536,8 +520,6 @@ components: $ref: '#/components/schemas/AlarmType' probableCause: $ref: '#/components/schemas/ProbableCause' - specificProblem: - $ref: '#/components/schemas/SpecificProblem' perceivedSeverity: $ref: '#/components/schemas/PerceivedSeverity' comments: -- GitLab From f803cd85afdc8e313cc1414c85d56dd21e373184 Mon Sep 17 00:00:00 2001 From: "U-ERICSSON\\ETHBLL" Date: Thu, 9 Jan 2025 18:06:11 +0100 Subject: [PATCH 234/587] Rel-19 CR 28.111 Add missing input parameters --- OpenAPI/TS28111_FaultNrm.yaml | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/OpenAPI/TS28111_FaultNrm.yaml b/OpenAPI/TS28111_FaultNrm.yaml index 321b34cc5..66f4ae6c9 100644 --- a/OpenAPI/TS28111_FaultNrm.yaml +++ b/OpenAPI/TS28111_FaultNrm.yaml @@ -360,6 +360,8 @@ components: $ref: '#/components/schemas/AlarmType' probableCause: $ref: '#/components/schemas/ProbableCause' + specificProblem: + $ref: '#/components/schemas/SpecificProblem' perceivedSeverity: $ref: '#/components/schemas/PerceivedSeverity' correlatedNotifications: @@ -384,6 +386,8 @@ components: $ref: '#/components/schemas/AlarmType' probableCause: $ref: '#/components/schemas/ProbableCause' + specificProblem: + $ref: '#/components/schemas/SpecificProblem' perceivedSeverity: $ref: '#/components/schemas/PerceivedSeverity' NotifyChangedAlarmGeneral: @@ -393,6 +397,7 @@ components: required: - alarmId - alarmType + - probableCause properties: alarmId: $ref: '#/components/schemas/AlarmId' @@ -435,6 +440,7 @@ components: required: - alarmId - alarmType + - probableCause - serviceUser - serviceProvider - securityAlarmDetector @@ -470,6 +476,8 @@ components: required: - alarmId - correlatedNotifications + - alarmType + - probableCause properties: alarmId: $ref: '#/components/schemas/AlarmId' @@ -477,6 +485,12 @@ components: $ref: '#/components/schemas/CorrelatedNotifications' rootCauseIndicator: type: boolean + alarmType: + $ref: '#/components/schemas/AlarmType' + probableCause: + $ref: '#/components/schemas/ProbableCause' + specificProblem: + $ref: '#/components/schemas/SpecificProblem' NotifyAckStateChanged: allOf: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/NotificationHeader' @@ -495,6 +509,8 @@ components: $ref: '#/components/schemas/AlarmType' probableCause: $ref: '#/components/schemas/ProbableCause' + specificProblem: + $ref: '#/components/schemas/SpecificProblem' perceivedSeverity: $ref: '#/components/schemas/PerceivedSeverity' ackState: @@ -520,6 +536,8 @@ components: $ref: '#/components/schemas/AlarmType' probableCause: $ref: '#/components/schemas/ProbableCause' + specificProblem: + $ref: '#/components/schemas/SpecificProblem' perceivedSeverity: $ref: '#/components/schemas/PerceivedSeverity' comments: -- GitLab From d95d3166d61fa6de06932554d9d6aa23bb99ffde Mon Sep 17 00:00:00 2001 From: lengyelb Date: Thu, 9 Jan 2025 17:11:33 +0000 Subject: [PATCH 235/587] Revert "Rel-19 CR 28.111 Add missing input parameters" This reverts commit f803cd85afdc8e313cc1414c85d56dd21e373184 --- OpenAPI/TS28111_FaultNrm.yaml | 18 ------------------ 1 file changed, 18 deletions(-) diff --git a/OpenAPI/TS28111_FaultNrm.yaml b/OpenAPI/TS28111_FaultNrm.yaml index 66f4ae6c9..321b34cc5 100644 --- a/OpenAPI/TS28111_FaultNrm.yaml +++ b/OpenAPI/TS28111_FaultNrm.yaml @@ -360,8 +360,6 @@ components: $ref: '#/components/schemas/AlarmType' probableCause: $ref: '#/components/schemas/ProbableCause' - specificProblem: - $ref: '#/components/schemas/SpecificProblem' perceivedSeverity: $ref: '#/components/schemas/PerceivedSeverity' correlatedNotifications: @@ -386,8 +384,6 @@ components: $ref: '#/components/schemas/AlarmType' probableCause: $ref: '#/components/schemas/ProbableCause' - specificProblem: - $ref: '#/components/schemas/SpecificProblem' perceivedSeverity: $ref: '#/components/schemas/PerceivedSeverity' NotifyChangedAlarmGeneral: @@ -397,7 +393,6 @@ components: required: - alarmId - alarmType - - probableCause properties: alarmId: $ref: '#/components/schemas/AlarmId' @@ -440,7 +435,6 @@ components: required: - alarmId - alarmType - - probableCause - serviceUser - serviceProvider - securityAlarmDetector @@ -476,8 +470,6 @@ components: required: - alarmId - correlatedNotifications - - alarmType - - probableCause properties: alarmId: $ref: '#/components/schemas/AlarmId' @@ -485,12 +477,6 @@ components: $ref: '#/components/schemas/CorrelatedNotifications' rootCauseIndicator: type: boolean - alarmType: - $ref: '#/components/schemas/AlarmType' - probableCause: - $ref: '#/components/schemas/ProbableCause' - specificProblem: - $ref: '#/components/schemas/SpecificProblem' NotifyAckStateChanged: allOf: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/NotificationHeader' @@ -509,8 +495,6 @@ components: $ref: '#/components/schemas/AlarmType' probableCause: $ref: '#/components/schemas/ProbableCause' - specificProblem: - $ref: '#/components/schemas/SpecificProblem' perceivedSeverity: $ref: '#/components/schemas/PerceivedSeverity' ackState: @@ -536,8 +520,6 @@ components: $ref: '#/components/schemas/AlarmType' probableCause: $ref: '#/components/schemas/ProbableCause' - specificProblem: - $ref: '#/components/schemas/SpecificProblem' perceivedSeverity: $ref: '#/components/schemas/PerceivedSeverity' comments: -- GitLab From b6526cea4ef51b4526d2d70b8c3aa034ab96630c Mon Sep 17 00:00:00 2001 From: ruiyue Date: Mon, 13 Jan 2025 04:05:32 +0000 Subject: [PATCH 236/587] Update file TS28312_IntentExpectations.yaml --- OpenAPI/TS28312_IntentExpectations.yaml | 70 ++++++++++++++++++++++++- 1 file changed, 69 insertions(+), 1 deletion(-) diff --git a/OpenAPI/TS28312_IntentExpectations.yaml b/OpenAPI/TS28312_IntentExpectations.yaml index e1d2bb5f6..ba388ec9c 100644 --- a/OpenAPI/TS28312_IntentExpectations.yaml +++ b/OpenAPI/TS28312_IntentExpectations.yaml @@ -42,7 +42,8 @@ components: - $ref: '#/components/schemas/AveULPrbLoadTarget' - $ref: '#/components/schemas/AveDLPrbLoadTarget' - $ref: "#/components/schemas/RANEnergyConsumptionTarget" - - $ref: "#/components/schemas/RANEnergyEfficiencyTarget" + - $ref: "#/components/schemas/RANEnergyEfficiencyTarget" + - $ref: "#/components/schemas/ActiveUEsNumTarget" - $ref: 'TS28312_IntentNrm.yaml#/components/schemas/ExpectationTarget' expectationContexts: type: array @@ -51,6 +52,7 @@ components: type: object oneOf: - $ref: '#/components/schemas/TargetAssuranceTimeContext' + - $ref: '#/components/schemas/SchedulingTimeContext' - $ref: 'TS28312_IntentNrm.yaml#/components/schemas/Context' required: - expectationId @@ -179,6 +181,7 @@ components: oneOf: - $ref: '#/components/schemas/CoverageAreaPolygonContext' - $ref: '#/components/schemas/CoverageTACContext' + - $ref: '#/components/schemas/CellContext' - $ref: '#/components/schemas/PLMNContext' - $ref: '#/components/schemas/DlFrequencyContext' - $ref: '#/components/schemas/UlFrequencyContext' @@ -594,6 +597,30 @@ components: - IS_GREATER_THAN targetValueRange: type: integer + ActiveUEsNumTarget: + description: >- + This data type is the "ExpectationTarget" data type with specialisations for ActiveUEsNumTarget. + It describes the number of Active UEs for the specified areas. This target is related to Mean + number of Active UEs in the DL per cell and Mean number of Active UEs in the UL per cell defined + in 3GPP TS 28.552 [6]. + type: object + properties: + targetName: + type: string + enum: + - ActiveUEsNum + targetCondition: + type: string + enum: + - IS_WITHIN_RANGE + targetValueRange: + type: array + description: >- + a pair of integer values to represent minimum number of active UEs and maximum number of active UEs. + items: + type: integer + minItems: 1 + maxItems: 2 DLThptPerUETarget: description: >- This data type is the "ExpectationTarget" data type with specialisations for DLThptPerUETarget. It describes the DL throughput target by the per UE for the @@ -828,6 +855,30 @@ components: uniqueItems: true items: $ref: "TS28623_ComDefs.yaml#/components/schemas/Tac" + CellContext: + description: >- + This data type is the "ObjectContext" data type with specialisations for CellContext. + It describes the coverage areas for the RAN SubNetwork that the intent expectation is applied + in the form of a list of cells (including E-UTRAN cells identified by E-UTRAN-CGI and NR cells + identified by NG-RAN CGI). + type: object + properties: + contextAttribute: + type: string + enum: + - Cell + contextCondition: + type: string + enum: + - IS_ALL_OF + contextValueRange: + type: array + items: + $ref: "#/components/schemas/CellId" + CellId: + oneOf: + - $ref: 'TS28623_ComDefs.yaml#/components/schemas/EutraCellId' + - $ref: 'TS28623_ComDefs.yaml#/components/schemas/NrCellId' PLMNContext: description: >- This data type is the "ObjectContext" data type with specialisations for PLMNContext @@ -1160,6 +1211,23 @@ components: - IS_EQUAL_TO contextValueRange: $ref: "TS28541_NrNrm.yaml#/components/schemas/Sst" + SchedulingTimeContext: + description: >- + This data type is the "ExpectationContext" data type with specialisations for SchedulingTimeContext.It describes + the scheduled times (including one-time interval, daily periodicity, weekly periodicity or monthly periodicity) + for the IntentObject that the intent expectation is applied. + type: object + properties: + contextAttribute: + type: string + enum: + - schedulingTime + contextCondition: + type: string + enum: + - IS_ALL_OF + contextValueRange: + $ref: "TS28623_GenericNrm.yaml#/components/schemas/SchedulingTime" StartTimeContext: description: >- This data type is the "ExpectationContext" data type with specialisations for StartTimeContext -- GitLab From 2e95980a5c0350d3017b93b76da6210bda7d639d Mon Sep 17 00:00:00 2001 From: ruiyue Date: Wed, 15 Jan 2025 03:54:07 +0000 Subject: [PATCH 237/587] Update file TS28312_IntentNrm.yaml --- OpenAPI/TS28312_IntentNrm.yaml | 35 +++++++++++++++++++++++++++++++++- 1 file changed, 34 insertions(+), 1 deletion(-) diff --git a/OpenAPI/TS28312_IntentNrm.yaml b/OpenAPI/TS28312_IntentNrm.yaml index 248eac3dc..379182d0e 100644 --- a/OpenAPI/TS28312_IntentNrm.yaml +++ b/OpenAPI/TS28312_IntentNrm.yaml @@ -89,7 +89,9 @@ components: items: $ref: '#/components/schemas/IntentConflictReport' intentFeasibilityCheckReport: - $ref: '#/components/schemas/IntentFeasibilityCheckReport' + $ref: '#/components/schemas/IntentFeasibilityCheckReport' + intentExplorationReport: + $ref: '#/components/schemas/IntentExplorationReport' lastUpdatedTime: $ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTimeRo' intentReference: @@ -444,6 +446,37 @@ components: description: An attribute which is used when feasibilityCheckResult is INFEASIBLE #-------Definition of the concrete IntentFeasibilityCheckReport dataType----------------# + + #-------Definition of the generic IntentExplorationReport dataType----------------# + IntentExplorationReport: + description: >- + It represents the intent exploration information + This attribute shall be supported when intent exploration information is supported by IntentReport + type: object + properties: + expectationExporationResults: + type: array + items: + $ref: '#/components/schemas/ExpectationExplorationResult' + ExpectationExplorationResult: + description: >- + It represents the expectation exploration result for a specific intent expectation + type: object + properties: + expectationId: + type: string + readOnly: true + targetExplorationResults: + type: array + items: + $ref: '#/components/schemas/ExpectationTarget' + contextExplorationResults: + type: array + items: + $ref: '#/components/schemas/Context' + #-------Definition of the generic IntentExplorationReport dataType----------------# + + #-------Definition of the generic IntentHandlingCapability dataType----------------# IntentHandlingCapability: description: >- -- GitLab From 15fe15fa4890e5c9a8da98092888cd855b413369 Mon Sep 17 00:00:00 2001 From: ruiyue Date: Wed, 15 Jan 2025 08:36:27 +0000 Subject: [PATCH 238/587] Update file TS28312_IntentNrm.yaml --- OpenAPI/TS28312_IntentNrm.yaml | 28 +++++++++++++++++++++++++++- 1 file changed, 27 insertions(+), 1 deletion(-) diff --git a/OpenAPI/TS28312_IntentNrm.yaml b/OpenAPI/TS28312_IntentNrm.yaml index 248eac3dc..a625e06fb 100644 --- a/OpenAPI/TS28312_IntentNrm.yaml +++ b/OpenAPI/TS28312_IntentNrm.yaml @@ -44,7 +44,9 @@ components: - $ref: "TS28312_IntentExpectations.yaml#/components/schemas/5GCNetworkExpectation" - $ref: "TS28312_IntentExpectations.yaml#/components/schemas/RadioServiceExpectation" contextSelectivity: - $ref: "#/components/schemas/Selectivity" + $ref: "#/components/schemas/Selectivity" + expectationSelectivity: + $ref: "#/components/schemas/Selectivity" intentContexts: type: array uniqueItems: true @@ -108,6 +110,12 @@ components: minItems: 1 items: $ref: '#/components/schemas/IntentHandlingCapability' + supportedExpectationTargetInfo: + type: array + items: + $ref: '#/components/schemas/SupportedExpectationTargetInfo' + uniqueItems: true + minItems: 1 Intent: $ref: '#/components/schemas/Intent-Multiple' IntentReport: @@ -471,6 +479,24 @@ components: type: string readOnly: true description: It describes the supported expectation targets for the supported expectation object type. + SupportedExpectationTargetInfo: + description: >- + It indicates the detailed information about what the intent driven MnS producer supports for a given supportedExpectationObjectType. + type: object + properties: + supportedExpectationTargetName: + type: string + readOnly: true + supportedTargetCondition: + $ref: '#/components/schemas/Condition' + supportedTargetValueRange: + oneOf: + - type: array + uniqueItems: true + minItems: 1 + items: + $ref: '#/components/schemas/ValueRangeType' + - $ref: '#/components/schemas/ValueRangeType' #-------Definition of the concrete IntentHandlingCapability dataType----------------# #------Definition of JSON arrays for name-contained IOCs ---------------# -- GitLab From 1a38d6f6beaadb5f355b10be1527b08d9fdd0173 Mon Sep 17 00:00:00 2001 From: ruiyue Date: Wed, 15 Jan 2025 09:40:40 +0000 Subject: [PATCH 239/587] Update file TS28312_IntentNrm.yaml --- OpenAPI/TS28312_IntentNrm.yaml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/OpenAPI/TS28312_IntentNrm.yaml b/OpenAPI/TS28312_IntentNrm.yaml index 379182d0e..3c637ead6 100644 --- a/OpenAPI/TS28312_IntentNrm.yaml +++ b/OpenAPI/TS28312_IntentNrm.yaml @@ -458,6 +458,8 @@ components: type: array items: $ref: '#/components/schemas/ExpectationExplorationResult' + uniqueItems: true + minItems: 1 ExpectationExplorationResult: description: >- It represents the expectation exploration result for a specific intent expectation @@ -470,10 +472,14 @@ components: type: array items: $ref: '#/components/schemas/ExpectationTarget' + uniqueItems: true + minItems: 1 contextExplorationResults: type: array items: $ref: '#/components/schemas/Context' + uniqueItems: true + minItems: 1 #-------Definition of the generic IntentExplorationReport dataType----------------# -- GitLab From 6d8d4905527cd992b72613a454bc11c46b5c05ff Mon Sep 17 00:00:00 2001 From: ruiyue Date: Thu, 23 Jan 2025 03:51:40 +0000 Subject: [PATCH 240/587] Update file TS28312_IntentNrm.yaml --- OpenAPI/TS28312_IntentNrm.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OpenAPI/TS28312_IntentNrm.yaml b/OpenAPI/TS28312_IntentNrm.yaml index a625e06fb..c05aee14d 100644 --- a/OpenAPI/TS28312_IntentNrm.yaml +++ b/OpenAPI/TS28312_IntentNrm.yaml @@ -46,7 +46,7 @@ components: contextSelectivity: $ref: "#/components/schemas/Selectivity" expectationSelectivity: - $ref: "#/components/schemas/Selectivity" + $ref: "#/components/schemas/Selectivity" intentContexts: type: array uniqueItems: true -- GitLab From 38dacf6d805e9312cab8c0add3a5ef8fbfd2e6f5 Mon Sep 17 00:00:00 2001 From: sunse Date: Wed, 5 Feb 2025 07:31:33 +0000 Subject: [PATCH 241/587] Rel19 CR1449 TS28.541 Enhance the OpenAPI related to isUnique property for 5GCNrm --- OpenAPI/TS28541_5GcNrm.yaml | 225 ++++++++++++++++++++++++++++++++++++ 1 file changed, 225 insertions(+) diff --git a/OpenAPI/TS28541_5GcNrm.yaml b/OpenAPI/TS28541_5GcNrm.yaml index 218c03a14..f763e7bd8 100755 --- a/OpenAPI/TS28541_5GcNrm.yaml +++ b/OpenAPI/TS28541_5GcNrm.yaml @@ -52,6 +52,7 @@ components: type: integer NFProfileList: type: array + uniqueItems: true description: List of NF profile items: $ref: '#/components/schemas/NFProfile' @@ -68,10 +69,12 @@ components: $ref: '#/components/schemas/NFStatus' plmn: type: array + uniqueItems: true items: $ref: 'TS28623_ComDefs.yaml#/components/schemas/PlmnId' sNssais: type: array + uniqueItems: true items: $ref: 'TS28541_NrNrm.yaml#/components/schemas/Snssai' fqdn: @@ -80,6 +83,7 @@ components: $ref: 'TS28623_ComDefs.yaml#/components/schemas/Fqdn' nfServices: type: array + uniqueItems: true items: $ref: '#/components/schemas/NFService' NFService: @@ -92,6 +96,7 @@ components: type: string versions: type: array + uniqueItems: true items: type: string schema: @@ -109,28 +114,34 @@ components: $ref: 'TS28623_ComDefs.yaml#/components/schemas/Fqdn' ipEndPoints: type: array + uniqueItems: true items: $ref: '#/components/schemas/IpEndPoint' apiPrefix: type: string allowedPLMNs: type: array + uniqueItems: true items: $ref: 'TS28623_ComDefs.yaml#/components/schemas/PlmnId' allowedSnpns: type: array + uniqueItems: true items: $ref: '#/components/schemas/SnpnId' allowedNfTypes: type: array + uniqueItems: true items: $ref: '#/components/schemas/NFType' allowedNfDomains: type: array + uniqueItems: true items: type: string allowedNSSAIs: type: array + uniqueItems: true items: $ref: 'TS28541_NrNrm.yaml#/components/schemas/Snssai' priority: @@ -157,6 +168,7 @@ components: type: string defaultNotificationSubscriptions: type: array + uniqueItems: true items: $ref: '#/components/schemas/DefaultNotificationSubscription' @@ -168,6 +180,7 @@ components: - SUSPENDED CNSIIdList: type: array + uniqueItems: true items: $ref: '#/components/schemas/CNSIId' CNSIId: @@ -188,6 +201,7 @@ components: - IS_ENERGYSAVING TACList: type: array + uniqueItems: true items: $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Tac' WeightFactor: @@ -204,17 +218,20 @@ components: readOnly: true supiRanges: type: array + uniqueItems: true items: $ref: '#/components/schemas/SupiRange' minItems: 1 routingIndicators: type: array + uniqueItems: true items: type: string pattern: '^[0-9]{1,4}$' minItems: 1 suciInfos: type: array + uniqueItems: true items: $ref: '#/components/schemas/SuciInfo' minItems: 1 @@ -289,6 +306,7 @@ components: readOnly: true serviceInfoList: type: array + uniqueItems: true items: $ref: '#/components/schemas/DefSubServiceInfo' callbackUriPrefix: @@ -298,6 +316,7 @@ components: properties: versions: type: array + uniqueItems: true items: type: string readOnly: true @@ -309,6 +328,7 @@ components: properties: hniList: type: array + uniqueItems: true items: $ref: 'TS28623_ComDefs.yaml#/components/schemas/Fqdn' interPlmnFqdn: @@ -326,26 +346,32 @@ components: $ref: 'TS28623_ComDefs.yaml#/components/schemas/HostAddr' allowedPLMNs: type: array + uniqueItems: true items: $ref: 'TS28623_ComDefs.yaml#/components/schemas/PlmnId' sNPNList: type: array + uniqueItems: true items: $ref: '#/components/schemas/SnpnId' allowedSNPNs: type: array + uniqueItems: true items: $ref: '#/components/schemas/SnpnId' allowedNfTypes: type: array + uniqueItems: true items: $ref: '#/components/schemas/NFType' allowedNfDomains: type: array + uniqueItems: true items: type: string allowedNSSAIs: type: array + uniqueItems: true items: $ref: 'TS28541_NrNrm.yaml#/components/schemas/Snssai' locality: @@ -354,10 +380,12 @@ components: type: integer nfSetIdList: type: array + uniqueItems: true items: type: string servingScope: type: array + uniqueItems: true items: type: string lcHSupportInd: @@ -368,10 +396,12 @@ components: readOnly: true nfSetRecoveryTimeList: type: array + uniqueItems: true items: $ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTimeRo' scpDomains: type: array + uniqueItems: true items: type: string recoveryTime: @@ -383,11 +413,13 @@ components: type: boolean defaultNotificationSubscriptions: type: array + uniqueItems: true items: $ref: '#/components/schemas/DefaultNotificationSubscription' minItems: 1 serviceSetRecoveryTimeList: type: array + uniqueItems: true items: $ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTimeRo' minItems: 1 @@ -432,6 +464,7 @@ components: type: string CommModelList: type: array + uniqueItems: true items: $ref: '#/components/schemas/CommModel' CapabilityList: @@ -443,6 +476,7 @@ components: properties: fiveQIValues: type: array + uniqueItems: true items: type: integer dscp: @@ -458,6 +492,7 @@ components: $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList' NetworkSliceInfoList: type: array + uniqueItems: true items: $ref: '#/components/schemas/NetworkSliceInfo' @@ -530,6 +565,7 @@ components: QosDataList: type: array + uniqueItems: true items: $ref: '#/components/schemas/QosData' @@ -558,6 +594,7 @@ components: $ref: 'TS29512_Npcf_SMPolicyControl.yaml#/components/schemas/RedirectInformation' addRedirectInfo: type: array + uniqueItems: true items: $ref: 'TS29512_Npcf_SMPolicyControl.yaml#/components/schemas/RedirectInformation' minItems: 1 @@ -572,6 +609,7 @@ components: nullable: true routeToLocs: type: array + uniqueItems: true items: $ref: 'TS29571_CommonData.yaml#/components/schemas/RouteToLocation' traffCorreInd: @@ -592,6 +630,7 @@ components: TrafficControlDataList: type: array + uniqueItems: true items: $ref: '#/components/schemas/TrafficControlData' @@ -603,6 +642,7 @@ components: description: Univocally identifies the PCC rule within a PDU session. flowInfoList: type: array + uniqueItems: true items: $ref: 'TS29512_Npcf_SMPolicyControl.yaml#/components/schemas/FlowInformation' applicationId: @@ -623,14 +663,17 @@ components: default: false qosData: type: array + uniqueItems: true items: $ref: '#/components/schemas/QosDataList' altQosParams: type: array + uniqueItems: true items: $ref: '#/components/schemas/QosDataList' trafficControlData: type: array + uniqueItems: true items: $ref: '#/components/schemas/TrafficControlDataList' conditionData: @@ -676,6 +719,7 @@ components: readOnly: true uEIdList: type: array + uniqueItems: true items: type: string readOnly: true @@ -699,6 +743,7 @@ components: $ref: 'TS28623_ComDefs.yaml#/components/schemas/PlmnId' nRTACRangelist: type: array + uniqueItems: true items: $ref: '#/components/schemas/NRTACRange' @@ -712,11 +757,13 @@ components: SupportedBMOList: type: array + uniqueItems: true items: type: string ECSAddrConfigInfo: type: array + uniqueItems: true items: type: string @@ -727,6 +774,7 @@ components: type: string dnaiList: type: array + uniqueItems: true items: $ref: 'TS29571_CommonData.yaml#/components/schemas/Dnai' minItems: 1 @@ -736,6 +784,7 @@ components: properties: dnaiList: type: array + uniqueItems: true items: $ref: 'TS29571_CommonData.yaml#/components/schemas/Dnai' minItems: 1 @@ -750,11 +799,13 @@ components: $ref: 'TS28541_NrNrm.yaml#/components/schemas/Snssai' dnnSmfInfoList: type: array + uniqueItems: true items: $ref: '#/components/schemas/DnnSmfInfoItem' 5GCNfConnEcmInfoList: type: array + uniqueItems: true items: $ref: '#/components/schemas/5GCNfConnEcmInfo' 5GCNfConnEcmInfo: @@ -783,6 +834,7 @@ components: $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnRo' SnssaiList: type: array + uniqueItems: true items: $ref: 'TS28541_NrNrm.yaml#/components/schemas/Snssai' SnpnId: @@ -796,6 +848,7 @@ components: type: string TaiList: type: array + uniqueItems: true items: $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Tai' SupiRange: @@ -860,14 +913,17 @@ components: properties: routingInds: type: array + uniqueItems: true items: type: string hNwPubKeyIds: type: array + uniqueItems: true items: type: integer SuciInfoList: type: array + uniqueItems: true items: $ref: '#/components/schemas/SuciInfo' SharedDataIdRange: @@ -877,14 +933,17 @@ components: type: string SupiRangeList: type: array + uniqueItems: true items: $ref: '#/components/schemas/SupiRange' IdentityRangeList: type: array + uniqueItems: true items: $ref: '#/components/schemas/IdentityRange' InternalGroupIdRangeList: type: array + uniqueItems: true items: $ref: '#/components/schemas/InternalGroupIdRange' SupportedDataSetList: @@ -893,6 +952,7 @@ components: $ref: '#/components/schemas/SupportedDataSet' SharedDataIdRangeList: type: array + uniqueItems: true items: $ref: '#/components/schemas/SharedDataIdRange' InterfaceUpfInfoItem: @@ -926,10 +986,12 @@ components: - N4U ipv4EndpointAddresses: type: array + uniqueItems: true items: $ref: 'TS28623_ComDefs.yaml#/components/schemas/Ipv4Addr' ipv6EndpointAddresses: type: array + uniqueItems: true items: $ref: 'TS28623_ComDefs.yaml#/components/schemas/Ipv6Addr' fqdn: @@ -952,10 +1014,12 @@ components: properties: ipv4EndpointAddresses: type: array + uniqueItems: true items: $ref: 'TS28623_ComDefs.yaml#/components/schemas/Ipv4Addr' ipv6EndpointAddresses: type: array + uniqueItems: true items: $ref: 'TS28623_ComDefs.yaml#/components/schemas/Ipv6Addr' fqdn: @@ -1011,6 +1075,7 @@ components: $ref: 'TS28623_ComDefs.yaml#/components/schemas/Fqdn' scpIpEndPoints: type: array + uniqueItems: true items: $ref: 'TS28541_5GcNrm.yaml#/components/schemas/IpEndPoint' minItems: 1 @@ -1043,11 +1108,13 @@ components: minProperties: 1 remotePlmnList: type: array + uniqueItems: true items: $ref: 'TS28623_ComDefs.yaml#/components/schemas/PlmnId' minItems: 1 remoteSnpnList: type: array + uniqueItems: true items: $ref: 'TS29571_CommonData.yaml#/components/schemas/PlmnIdNid' minItems: 1 @@ -1060,6 +1127,7 @@ components: $ref: 'TS29571_CommonData.yaml#/components/schemas/NfGroupId' supiRanges: type: array + uniqueItems: true items: $ref: '#/components/schemas/SupiRange' minItems: 1 @@ -1070,6 +1138,7 @@ components: type: object additionalProperties: type: array + uniqueItems: true items: $ref: '#/components/schemas/IdentityRange' minItems: 1 @@ -1110,6 +1179,7 @@ components: $ref: '#/components/schemas/TaiList' taiRangeList: type: array + uniqueItems: true items: $ref: '#/components/schemas/TaiRange' minItems: 1 @@ -1134,6 +1204,7 @@ components: properties: mlAnalyticsIds: type: array + uniqueItems: true items: $ref: 'TS29520_Nnwdaf_EventsSubscription.yaml#/components/schemas/NwdafEvent' minItems: 1 @@ -1143,6 +1214,7 @@ components: $ref: '#/components/schemas/TaiList' mlModelInterInfo: type: array + uniqueItems: true items: $ref: '#/components/schemas/VendorId' minItems: 0 @@ -1154,6 +1226,7 @@ components: - FL_SERVER_AND_CLIENT flTimeInterval: type: array + uniqueItems: true items: $ref: 'TS28623_ComDefs.yaml#/components/schemas/TimeWindow' minItems: 1 @@ -1163,11 +1236,13 @@ components: properties: eventIds: type: array + uniqueItems: true items: $ref: 'TS29520_Nnwdaf_AnalyticsInfo.yaml#/components/schemas/EventId' minItems: 1 nwdafEvents: type: array + uniqueItems: true items: $ref: 'TS29520_Nnwdaf_EventsSubscription.yaml#/components/schemas/NwdafEvent' minItems: 1 @@ -1175,6 +1250,7 @@ components: $ref: '#/components/schemas/TaiList' taiRangeList: type: array + uniqueItems: true items: $ref: '#/components/schemas/TaiRange' minItems: 1 @@ -1184,16 +1260,19 @@ components: $ref: 'TS29571_CommonData.yaml#/components/schemas/DurationSec' servingNfSetIdList: type: array + uniqueItems: true items: $ref: 'TS29571_CommonData.yaml#/components/schemas/NfSetId' minItems: 1 servingNfTypeList: type: array + uniqueItems: true items: $ref: '#/components/schemas/NFType' minItems: 1 mlAnalyticsList: type: array + uniqueItems: true items: $ref: '#/components/schemas/MlAnalyticsInfo' minItems: 1 @@ -1223,41 +1302,49 @@ components: minProperties: 1 addressDomains: type: array + uniqueItems: true items: type: string minItems: 1 ipv4Addresses: type: array + uniqueItems: true items: $ref: 'TS29571_CommonData.yaml#/components/schemas/Ipv4Addr' minItems: 1 ipv6Prefixes: type: array + uniqueItems: true items: $ref: 'TS29571_CommonData.yaml#/components/schemas/Ipv6Prefix' minItems: 1 ipv4AddrRanges: type: array + uniqueItems: true items: $ref: '#/components/schemas/Ipv4AddressRange' minItems: 1 ipv6PrefixRanges: type: array + uniqueItems: true items: $ref: '#/components/schemas/Ipv6PrefixRange' minItems: 1 servedNfSetIdList: type: array + uniqueItems: true items: $ref: 'TS29571_CommonData.yaml#/components/schemas/NfSetId' minItems: 1 remotePlmnList: type: array + uniqueItems: true items: $ref: 'TS29571_CommonData.yaml#/components/schemas/PlmnId' minItems: 1 remoteSnpnList: type: array + uniqueItems: true items: $ref: '#/components/schemas/PlmnIdNid' minItems: 1 @@ -1265,6 +1352,7 @@ components: $ref: '#/components/schemas/IpReachability' scpCapabilities: type: array + uniqueItems: true items: $ref: '#/components/schemas/ScpCapability' @@ -1274,12 +1362,14 @@ components: properties: appIds: type: array + uniqueItems: true items: type: string minItems: 1 readOnly: true afIds: type: array + uniqueItems: true items: type: string minItems: 1 @@ -1314,17 +1404,20 @@ components: properties: afEvents: type: array + uniqueItems: true items: $ref: '#/components/schemas/AfEvent' minItems: 1 afIds: type: array + uniqueItems: true items: type: string minItems: 1 readOnly: true appIds: type: array + uniqueItems: true items: type: string minItems: 1 @@ -1377,16 +1470,19 @@ components: properties: sNssaiEasdfInfoList: type: array + uniqueItems: true items: $ref: '#/components/schemas/SnssaiEasdfInfoItem' minItems: 1 easdfN6IpAddressList: type: array + uniqueItems: true items: $ref: 'TS28623_ComDefs.yaml#/components/schemas/IpAddr' minItems: 1 upfN6IpAddressList: type: array + uniqueItems: true items: $ref: 'TS28623_ComDefs.yaml#/components/schemas/IpAddr' minItems: 1 @@ -1402,6 +1498,7 @@ components: $ref: 'TS29571_CommonData.yaml#/components/schemas/ExtSnssai' dnnEasdfInfoList: type: array + uniqueItems: true items: $ref: '#/components/schemas/DnnEasdfInfoItem' minItems: 1 @@ -1418,6 +1515,7 @@ components: - $ref: 'TS29571_CommonData.yaml#/components/schemas/WildcardDnn' dnaiList: type: array + uniqueItems: true items: $ref: 'TS29571_CommonData.yaml#/components/schemas/Dnai' minItems: 1 @@ -1427,11 +1525,13 @@ components: properties: supiRanges: type: array + uniqueItems: true items: $ref: '#/components/schemas/SupiRange' minItems: 1 internalGroupIdentifiersRanges: type: array + uniqueItems: true items: $ref: '#/components/schemas/InternalGroupIdRange' minItems: 1 @@ -1441,21 +1541,25 @@ components: properties: sNssaiInfoList: type: array + uniqueItems: true items: $ref: '#/components/schemas/SnssaiInfoItem' minItems: 1 afEvents: type: array + uniqueItems: true items: $ref: '#/components/schemas/AfEvent' minItems: 1 appIds: type: array + uniqueItems: true items: type: string minItems: 1 internalGroupId: type: array + uniqueItems: true items: $ref: 'TS29571_CommonData.yaml#/components/schemas/GroupId' minItems: 1 @@ -1508,6 +1612,7 @@ components: pattern: '^[0-9]{5}$' trpIds: type: array + uniqueItems: true items: type: integer minimum: 1 @@ -1523,12 +1628,14 @@ components: maximum: 4294967295 trpMappingInfoList: type: array + uniqueItems: true items: $ref: '#/components/schemas/TrpMappingInfo' minItems: 1 TrpInfoList: type: array + uniqueItems: true items: $ref: '#/components/schemas/TrpInfo' @@ -1538,6 +1645,7 @@ components: properties: servingClientTypes: type: array + uniqueItems: true items: $ref: '#/components/schemas/ExternalClientType' minItems: 1 @@ -1545,31 +1653,37 @@ components: type: string servingAccessTypes: type: array + uniqueItems: true items: $ref: 'TS29571_CommonData.yaml#/components/schemas/AccessType' minItems: 1 servingAnNodeTypes: type: array + uniqueItems: true items: $ref: '#/components/schemas/AnNodeType' minItems: 1 servingRatTypes: type: array + uniqueItems: true items: $ref: 'TS29571_CommonData.yaml#/components/schemas/RatType' minItems: 1 taiList: type: array + uniqueItems: true items: $ref: 'TS29571_CommonData.yaml#/components/schemas/Tai' minItems: 1 taiRangeList: type: array + uniqueItems: true items: $ref: '#/components/schemas/TaiRange' minItems: 1 supportedGADShapes: type: array + uniqueItems: true items: $ref: '#/components/schemas/SupportedGADShapes' minItems: 1 @@ -1581,11 +1695,13 @@ components: $ref: 'TS29571_CommonData.yaml#/components/schemas/NfGroupId' supiRanges: type: array + uniqueItems: true items: $ref: '#/components/schemas/SupiRange' minItems: 1 gpsiRanges: type: array + uniqueItems: true items: $ref: '#/components/schemas/IdentityRange' minItems: 1 @@ -1603,32 +1719,38 @@ components: $ref: 'TS29571_CommonData.yaml#/components/schemas/NfGroupId' supiRanges: type: array + uniqueItems: true items: $ref: '#/components/schemas/SupiRange' minItems: 1 gpsiRanges: type: array + uniqueItems: true items: $ref: '#/components/schemas/IdentityRange' minItems: 1 externalGroupIdentifiersRanges: type: array + uniqueItems: true items: $ref: '#/components/schemas/IdentityRange' minItems: 1 routingIndicators: type: array + uniqueItems: true items: type: string pattern: '^[0-9]{1,4}$' minItems: 1 internalGroupIdentifiersRanges: type: array + uniqueItems: true items: $ref: '#/components/schemas/InternalGroupIdRange' minItems: 1 suciInfos: type: array + uniqueItems: true items: $ref: '#/components/schemas/SuciInfo' minItems: 1 @@ -1656,6 +1778,7 @@ components: type: boolean remotePlmnRangeList: type: array + uniqueItems: true items: $ref: '#/components/schemas/PlmnRange' minItems: 1 @@ -1666,11 +1789,13 @@ components: properties: servingNfTypeList: type: array + uniqueItems: true items: $ref: '#/components/schemas/NFType' minItems: 1 servingNfSetIdList: type: array + uniqueItems: true items: $ref: 'TS29571_CommonData.yaml#/components/schemas/NfSetId' minItems: 1 @@ -1678,6 +1803,7 @@ components: $ref: '#/components/schemas/TaiList' taiRangeList: type: array + uniqueItems: true items: $ref: '#/components/schemas/TaiRange' minItems: 1 @@ -1688,16 +1814,19 @@ components: properties: servingNfTypeList: type: array + uniqueItems: true items: $ref: '#/components/schemas/NFType' servingNfSetIdList: type: array + uniqueItems: true items: $ref: 'TS29571_CommonData.yaml#/components/schemas/NfSetId' taiList: $ref: '#/components/schemas/TaiList' taiRangeList: type: array + uniqueItems: true items: $ref: '#/components/schemas/TaiRange' @@ -1709,16 +1838,19 @@ components: properties: supiRangeList: type: array + uniqueItems: true items: $ref: '#/components/schemas/SupiRange' minItems: 0 gpsiRangeList: type: array + uniqueItems: true items: $ref: '#/components/schemas/IdentityRange' minItems: 0 plmnRangeList: type: array + uniqueItems: true items: $ref: '#/components/schemas/PlmnRange' minItems: 0 @@ -1738,11 +1870,13 @@ components: properties: ipv4EndpointAddress: type: array + uniqueItems: true items: $ref: 'TS28623_ComDefs.yaml#/components/schemas/Ipv4Addr' minItems: 1 ipv6EndpointAddress: type: array + uniqueItems: true items: $ref: 'TS28623_ComDefs.yaml#/components/schemas/Ipv6Addr' minItems: 1 @@ -1763,26 +1897,31 @@ components: $ref: 'TS29571_CommonData.yaml#/components/schemas/AmfRegionId' guamiList: type: array + uniqueItems: true items: $ref: 'TS29571_CommonData.yaml#/components/schemas/Guami' minItems: 1 taiList: type: array + uniqueItems: true items: $ref: 'TS29571_CommonData.yaml#/components/schemas/Tai' minItems: 1 taiRangeList: type: array + uniqueItems: true items: $ref: '#/components/schemas/TaiRange' minItems: 1 backupInfoAmfFailure: type: array + uniqueItems: true items: $ref: 'TS29571_CommonData.yaml#/components/schemas/Guami' minItems: 1 backupInfoAmfRemoval: type: array + uniqueItems: true items: $ref: 'TS29571_CommonData.yaml#/components/schemas/Guami' minItems: 1 @@ -1802,16 +1941,19 @@ components: properties: sNssaiSmfInfoList: type: array + uniqueItems: true items: $ref: '#/components/schemas/SnssaiSmfInfoItem' minItems: 1 taiList: type: array + uniqueItems: true items: $ref: 'TS29571_CommonData.yaml#/components/schemas/Tai' minItems: 1 taiRangeList: type: array + uniqueItems: true items: $ref: '#/components/schemas/TaiRange' minItems: 1 @@ -1819,11 +1961,13 @@ components: $ref: 'TS29571_CommonData.yaml#/components/schemas/Fqdn' pgwIpAddrList: type: array + uniqueItems: true items: $ref: 'TS28623_ComDefs.yaml#/components/schemas/IpAddr' minItems: 1 accessType: type: array + uniqueItems: true items: $ref: 'TS29571_CommonData.yaml#/components/schemas/AccessType' minItems: 1 @@ -1835,6 +1979,7 @@ components: type: boolean pgwFqdnList: type: array + uniqueItems: true items: $ref: 'TS29571_CommonData.yaml#/components/schemas/Fqdn' minItems: 1 @@ -1856,16 +2001,19 @@ components: properties: sNssaiUpfInfoList: type: array + uniqueItems: true items: $ref: '#/components/schemas/SnssaiUpfInfoItem' minItems: 1 smfServingArea: type: array + uniqueItems: true items: type: string minItems: 1 interfaceUpfInfoList: type: array + uniqueItems: true items: $ref: '#/components/schemas/InterfaceUpfInfoItem' minItems: 1 @@ -1878,6 +2026,7 @@ components: readOnly: true pduSessionTypes: type: array + uniqueItems: true items: $ref: 'TS29571_CommonData.yaml#/components/schemas/PduSessionType' minItems: 1 @@ -1889,11 +2038,13 @@ components: readOnly: true taiList: type: array + uniqueItems: true items: $ref: 'TS29571_CommonData.yaml#/components/schemas/Tai' minItems: 1 taiRangeList: type: array + uniqueItems: true items: $ref: '#/components/schemas/TaiRange' minItems: 1 @@ -1925,6 +2076,7 @@ components: readOnly: true # upfEvents: # type: array + uniqueItems: true # items: # $ref: 'TS29564_Nupf_EventExposure.yaml#/components/schemas/EventType' # minItems: 1 @@ -1937,16 +2089,19 @@ components: $ref: 'TS29571_CommonData.yaml#/components/schemas/NfGroupId' dnnList: type: array + uniqueItems: true items: $ref: 'TS29571_CommonData.yaml#/components/schemas/Dnn' minItems: 1 supiRanges: type: array + uniqueItems: true items: $ref: '#/components/schemas/SupiRange' minItems: 1 gpsiRanges: type: array + uniqueItems: true items: $ref: '#/components/schemas/IdentityRange' minItems: 1 @@ -2001,16 +2156,19 @@ components: $ref: '#/components/schemas/AfEventExposureData' gpsiRanges: type: array + uniqueItems: true items: $ref: '#/components/schemas/IdentityRange' minItems: 1 externalGroupIdentifiersRanges: type: array + uniqueItems: true items: $ref: '#/components/schemas/IdentityRange' minItems: 1 servedFqdnList: type: array + uniqueItems: true items: type: string minItems: 1 @@ -2018,16 +2176,19 @@ components: $ref: '#/components/schemas/TaiList' taiRangeList: type: array + uniqueItems: true items: $ref: '#/components/schemas/TaiRange' minItems: 1 dnaiList: type: array + uniqueItems: true items: $ref: 'TS29571_CommonData.yaml#/components/schemas/Dnai' minItems: 1 unTrustAfInfoList: type: array + uniqueItems: true items: $ref: '#/components/schemas/UnTrustAfInfo' minItems: 1 @@ -2471,6 +2632,7 @@ components: NTNPLMNRestrictionsList: description: NTNPLMNRestrictionsInfoList that relates to non-terrestrial network access type: array + uniqueItems: true items: $ref: '#/components/schemas/NTNPLMNRestrictionsInfo' NTNPLMNRestrictionsInfo: @@ -2481,6 +2643,7 @@ components: $ref: 'TS28623_ComDefs.yaml#/components/schemas/PlmnId' blockedLocationInfoList: type: array + uniqueItems: true items: $ref: '#/components/schemas/BlockedLocationInfo' BlockedLocationInfo: @@ -2539,26 +2702,31 @@ components: $ref: 'TS29571_CommonData.yaml#/components/schemas/NfGroupId' imsiRanges: type: array + uniqueItems: true items: $ref: '#/components/schemas/ImsiRange' minItems: 1 imsPrivateIdentityRanges: type: array + uniqueItems: true items: $ref: '#/components/schemas/IdentityRange' minItems: 1 imsPublicIdentityRanges: type: array + uniqueItems: true items: $ref: '#/components/schemas/IdentityRange' minItems: 1 msisdnRanges: type: array + uniqueItems: true items: $ref: '#/components/schemas/IdentityRange' minItems: 1 externalGroupIdentifiersRanges: type: array + uniqueItems: true items: $ref: '#/components/schemas/IdentityRange' minItems: 1 @@ -2566,6 +2734,7 @@ components: $ref: '#/components/schemas/NetworkNodeDiameterAddress' additionalDiamAddresses: type: array + uniqueItems: true items: $ref: '#/components/schemas/NetworkNodeDiameterAddress' minItems: 1 @@ -2575,10 +2744,12 @@ components: properties: servingClientTypes: type: array + uniqueItems: true items: $ref: '#/components/schemas/ExternalClientType' gmlcNumbers: type: array + uniqueItems: true items: type: string pattern: '^[0-9]{5,15}$' @@ -2594,6 +2765,7 @@ components: $ref: 'TS29571_CommonData.yaml#/components/schemas/ExtSnssai' dnnInfoList: type: array + uniqueItems: true items: $ref: '#/components/schemas/DnnTsctsfInfoItem' minItems: 1 @@ -2618,18 +2790,22 @@ components: minProperties: 0 externalGroupIdentifiersRanges: type: array + uniqueItems: true items: $ref: '#/components/schemas/IdentityRange' supiRanges: type: array + uniqueItems: true items: $ref: '#/components/schemas/SupiRange' gpsiRanges: type: array + uniqueItems: true items: $ref: '#/components/schemas/IdentityRange' internalGroupIdentifiersRanges: type: array + uniqueItems: true items: $ref: '#/components/schemas/InternalGroupIdRange' @@ -2639,21 +2815,25 @@ components: properties: dnnList: type: array + uniqueItems: true items: $ref: 'TS29571_CommonData.yaml#/components/schemas/Dnn' minItems: 0 ipDomainList: type: array + uniqueItems: true items: type: string minItems: 0 ipv4AddressRanges: type: array + uniqueItems: true items: $ref: '#/components/schemas/Ipv4AddressRange' minItems: 0 ipv6PrefixRanges: type: array + uniqueItems: true items: $ref: '#/components/schemas/Ipv6PrefixRange' minItems: 0 @@ -2665,11 +2845,13 @@ components: $ref: 'TS29571_CommonData.yaml#/components/schemas/NfGroupId' supiRanges: type: array + uniqueItems: true items: $ref: '#/components/schemas/SupiRange' minItems: 0 gpsiRanges: type: array + uniqueItems: true items: $ref: '#/components/schemas/IdentityRange' minItems: 0 @@ -2690,11 +2872,13 @@ components: minProperties: 1 taiList: type: array + uniqueItems: true items: $ref: 'TS29571_CommonData.yaml#/components/schemas/Tai' minItems: 1 taiRangeList: type: array + uniqueItems: true items: $ref: '#/components/schemas/TaiRange' minItems: 1 @@ -2797,12 +2981,14 @@ components: properties: ncgiList: type: array + uniqueItems: true items: $ref: '#/components/schemas/NcgiTai' minItems: 1 description: List of NR cell Ids taiList: type: array + uniqueItems: true items: $ref: 'TS29571_CommonData.yaml#/components/schemas/Tai' minItems: 1 @@ -2819,6 +3005,7 @@ components: $ref: 'TS29571_CommonData.yaml#/components/schemas/Tai' cellList: type: array + uniqueItems: true items: $ref: '#/components/schemas/Ncgi' minItems: 1 @@ -2854,6 +3041,7 @@ components: $ref: 'TS29571_CommonData.yaml#/components/schemas/ExtSnssai' dnnInfoList: type: array + uniqueItems: true items: $ref: '#/components/schemas/DnnMbSmfInfoItem' minItems: 1 @@ -2875,6 +3063,7 @@ components: properties: routingIndicators: type: array + uniqueItems: true items: type: string pattern: '^[0-9]{1,4}$' @@ -2887,26 +3076,31 @@ components: properties: sNssaiMbUpfInfoList: type: array + uniqueItems: true items: $ref: '#/components/schemas/SnssaiUpfInfoItem' minItems: 1 mbSmfServingArea: type: array + uniqueItems: true items: type: string minItems: 1 interfaceMbUpfInfoList: type: array + uniqueItems: true items: $ref: '#/components/schemas/InterfaceUpfInfoItem' minItems: 1 taiList: type: array + uniqueItems: true items: $ref: 'TS29571_CommonData.yaml#/components/schemas/Tai' minItems: 1 taiRangeList: type: array + uniqueItems: true items: $ref: '#/components/schemas/TaiRange' minItems: 1 @@ -2927,6 +3121,7 @@ components: $ref: 'TS29571_CommonData.yaml#/components/schemas/ExtSnssai' dnnUpfInfoList: type: array + uniqueItems: true items: $ref: '#/components/schemas/DnnUpfInfoItem' minItems: 1 @@ -2948,41 +3143,49 @@ components: $ref: 'TS29571_CommonData.yaml#/components/schemas/Dnn' dnaiList: type: array + uniqueItems: true items: $ref: 'TS29571_CommonData.yaml#/components/schemas/Dnai' minItems: 1 pduSessionTypes: type: array + uniqueItems: true items: $ref: 'TS29571_CommonData.yaml#/components/schemas/PduSessionType' minItems: 1 ipv4AddressRanges: type: array + uniqueItems: true items: $ref: '#/components/schemas/Ipv4AddressRange' minItems: 1 ipv6PrefixRanges: type: array + uniqueItems: true items: $ref: '#/components/schemas/Ipv6PrefixRange' minItems: 1 natedIpv4AddressRanges: type: array + uniqueItems: true items: $ref: '#/components/schemas/Ipv4AddressRange' minItems: 1 natedIpv6PrefixRanges: type: array + uniqueItems: true items: $ref: '#/components/schemas/Ipv6PrefixRange' minItems: 1 ipv4IndexList: type: array + uniqueItems: true items: $ref: '#/components/schemas/IpIndex' minItems: 1 ipv6IndexList: type: array + uniqueItems: true items: $ref: '#/components/schemas/IpIndex' minItems: 1 @@ -3007,6 +3210,7 @@ components: properties: msisdnRanges: type: array + uniqueItems: true items: $ref: '#/components/schemas/IdentityRange' minItems: 1 @@ -3026,11 +3230,13 @@ components: properties: accessType: type: array + uniqueItems: true items: $ref: 'TS29571_CommonData.yaml#/components/schemas/AccessType' minItems: 1 dnnList: type: array + uniqueItems: true items: $ref: 'TS29571_CommonData.yaml#/components/schemas/Dnn' minItems: 1 @@ -3038,11 +3244,13 @@ components: $ref: 'TS28623_ComDefs.yaml#/components/schemas/Fqdn' gmIpv4Addresses: type: array + uniqueItems: true items: $ref: 'TS28623_ComDefs.yaml#/components/schemas/Ipv4Addr' minItems: 1 gmIpv6Addresses: type: array + uniqueItems: true items: $ref: 'TS28623_ComDefs.yaml#/components/schemas/Ipv6Addr' minItems: 1 @@ -3050,21 +3258,25 @@ components: $ref: 'TS28623_ComDefs.yaml#/components/schemas/Fqdn' mwIpv4Addresses: type: array + uniqueItems: true items: $ref: 'TS28623_ComDefs.yaml#/components/schemas/Ipv4Addr' minItems: 1 mwIpv6Addresses: type: array + uniqueItems: true items: $ref: 'TS28623_ComDefs.yaml#/components/schemas/Ipv6Addr' minItems: 1 servedIpv4AddressRanges: type: array + uniqueItems: true items: $ref: '#/components/schemas/Ipv4AddressRange' minItems: 1 servedIpv6PrefixRanges: type: array + uniqueItems: true items: $ref: '#/components/schemas/Ipv6PrefixRange' minItems: 1 @@ -3420,6 +3632,7 @@ components: $ref: '#/components/schemas/CommModelList' SmfInfo: type: array + uniqueItems: true items: $ref: '#/components/schemas/SmfInfo' configurable5QISetRef: @@ -3428,6 +3641,7 @@ components: $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnRo' dnaiSatelliteMappingList: type: array + uniqueItems: true items: $ref: '#/components/schemas/dnaiSatelliteMapping' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' @@ -3487,6 +3701,7 @@ components: $ref: '#/components/schemas/SupportedBMOList' upfInfo: type: array + uniqueItems: true items: $ref: '#/components/schemas/UpfInfo' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' @@ -3547,6 +3762,7 @@ components: $ref: '#/components/schemas/SupportedBMOList' PcfInfo: type: array + uniqueItems: true items: $ref: '#/components/schemas/PcfInfo' configurable5QISetRef: @@ -3983,6 +4199,7 @@ components: $ref: '#/components/schemas/ManagedNFProfile' nsacfInfoSnssai: type: array + uniqueItems: true items: $ref: '#/components/schemas/NsacfInfoSnssai' nsacfInfo: @@ -4794,6 +5011,7 @@ components: properties: fiveQiDscpMappingList: type: array + uniqueItems: true items: $ref: '#/components/schemas/FiveQiDscpMapping' @@ -4864,10 +5082,12 @@ components: - DISABLED gtpUPathMonitoredSNSSAIs: type: array + uniqueItems: true items: $ref: 'TS28541_NrNrm.yaml#/components/schemas/Snssai' monitoredDSCPs: type: array + uniqueItems: true items: type: integer minimum: 0 @@ -4907,10 +5127,12 @@ components: - DISABLED qFMonitoredSNSSAIs: type: array + uniqueItems: true items: $ref: 'TS28541_NrNrm.yaml#/components/schemas/Snssai' qFMonitored5QIs: type: array + uniqueItems: true items: type: integer minimum: 0 @@ -4945,6 +5167,7 @@ components: properties: predefinedPccRules: type: array + uniqueItems: true items: $ref: '#/components/schemas/PccRule' @@ -5422,6 +5645,7 @@ components: $ref: '#/components/schemas/CommModelList' bsfInfo: type: array + uniqueItems: true items: $ref: '#/components/schemas/BsfInfo' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' @@ -5704,6 +5928,7 @@ components: $ref: '#/components/schemas/SAP' operations: type: array + uniqueItems: true items: $ref: '#/components/schemas/Operation' administrativeState: -- GitLab From 9567f0c0447d48917e5f7997c28f4b4740636283 Mon Sep 17 00:00:00 2001 From: ruiyue Date: Thu, 6 Feb 2025 02:14:42 +0000 Subject: [PATCH 242/587] Update file TS28312_IntentNrm.yaml --- OpenAPI/TS28312_IntentNrm.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OpenAPI/TS28312_IntentNrm.yaml b/OpenAPI/TS28312_IntentNrm.yaml index 3c637ead6..5411ba482 100644 --- a/OpenAPI/TS28312_IntentNrm.yaml +++ b/OpenAPI/TS28312_IntentNrm.yaml @@ -454,7 +454,7 @@ components: This attribute shall be supported when intent exploration information is supported by IntentReport type: object properties: - expectationExporationResults: + expectationExplorationResults: type: array items: $ref: '#/components/schemas/ExpectationExplorationResult' -- GitLab From c5ead5612125bba3deba887477b781e6137f8b7c Mon Sep 17 00:00:00 2001 From: ruiyue Date: Mon, 17 Feb 2025 20:44:25 +0000 Subject: [PATCH 243/587] Update file TS28312_IntentNrm.yaml --- OpenAPI/TS28312_IntentNrm.yaml | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/OpenAPI/TS28312_IntentNrm.yaml b/OpenAPI/TS28312_IntentNrm.yaml index 5411ba482..ff9f18cc7 100644 --- a/OpenAPI/TS28312_IntentNrm.yaml +++ b/OpenAPI/TS28312_IntentNrm.yaml @@ -43,6 +43,8 @@ components: - $ref: "TS28312_IntentExpectations.yaml#/components/schemas/EdgeServiceSupportExpectation" - $ref: "TS28312_IntentExpectations.yaml#/components/schemas/5GCNetworkExpectation" - $ref: "TS28312_IntentExpectations.yaml#/components/schemas/RadioServiceExpectation" + intentMgmtPurpose: + $ref: "#/components/schemas/IntentMgmtPurpose" contextSelectivity: $ref: "#/components/schemas/Selectivity" intentContexts: @@ -194,6 +196,16 @@ components: - ALL_OF - ONE_OF - ANY_OF + IntentMgmtPurpose: + description: >- + It describes the MnS consumer requirements for the management purpose (required procedures) + of the created or modified intent instance + type: string + enum: + - FEASIBILITYCHECK + - FULFILMENT + - EXPLORATION + default: FULFILMENT FulfilmentStatus: type: string readOnly: true -- GitLab From 33ed47ee4c42c6e7b83c3c99b85e14da31e6cb3c Mon Sep 17 00:00:00 2001 From: sunse Date: Wed, 19 Feb 2025 11:35:04 +0000 Subject: [PATCH 244/587] Rel19 CR1450 TS28.541 NRM_enhancements_to_NFProfile Update TS28541_5GcNrm.yaml --- OpenAPI/TS28541_5GcNrm.yaml | 48 ++++++++++++++++--------------------- 1 file changed, 20 insertions(+), 28 deletions(-) diff --git a/OpenAPI/TS28541_5GcNrm.yaml b/OpenAPI/TS28541_5GcNrm.yaml index 218c03a14..1c5ef9459 100755 --- a/OpenAPI/TS28541_5GcNrm.yaml +++ b/OpenAPI/TS28541_5GcNrm.yaml @@ -54,34 +54,7 @@ components: type: array description: List of NF profile items: - $ref: '#/components/schemas/NFProfile' - NFProfile: - type: object - description: 'NF profile stored in NRF, defined in TS 29.510' - properties: - nfInstanceId: - type: string - description: uuid of NF instance - nfType: - $ref: '#/components/schemas/NFType' - nfStatus: - $ref: '#/components/schemas/NFStatus' - plmn: - type: array - items: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/PlmnId' - sNssais: - type: array - items: - $ref: 'TS28541_NrNrm.yaml#/components/schemas/Snssai' - fqdn: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/Fqdn' - interPlmnFqdn: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/Fqdn' - nfServices: - type: array - items: - $ref: '#/components/schemas/NFService' + $ref: '#/components/schemas/ManagedNFProfile' NFService: type: object description: NF Service is defined in TS 29.510 @@ -318,6 +291,20 @@ components: readOnly: true nfType: $ref: '#/components/schemas/NFType' + nfStatus: + $ref: '#/components/schemas/NFStatus' + plmnList: + type: array + uniqueItems: true + items: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/PlmnId' + sNssais: + type: array + uniqueItems: true + items: + $ref: 'TS28541_NrNrm.yaml#/components/schemas/Snssai' + fqdn: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/Fqdn' heartbeatTimer: type: integer authzInfo: @@ -393,6 +380,11 @@ components: minItems: 1 vendorId: $ref: '#/components/schemas/VendorId' + nfServices: + type: array + uniqueItems: true + items: + $ref: '#/components/schemas/NFService' SEPPType: type: string readOnly: true -- GitLab From 890f85f6499dddd9fa96e56d1a7caee4ab68d249 Mon Sep 17 00:00:00 2001 From: ruiyue Date: Thu, 20 Feb 2025 05:07:31 +0000 Subject: [PATCH 245/587] Update file TS28312_IntentNrm.yaml --- OpenAPI/TS28312_IntentNrm.yaml | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/OpenAPI/TS28312_IntentNrm.yaml b/OpenAPI/TS28312_IntentNrm.yaml index 248eac3dc..cba7697a1 100644 --- a/OpenAPI/TS28312_IntentNrm.yaml +++ b/OpenAPI/TS28312_IntentNrm.yaml @@ -439,9 +439,14 @@ components: - FEASIBLE - INFEASIBLE infeasibilityReasons: - type: string - readOnly: true - description: An attribute which is used when feasibilityCheckResult is INFEASIBLE + description: An attribute which is used when feasibilityCheckResult is INFEASIBLE + type: array + items: + type: string + readOnly: true + enum: + - INVALID_INTENT_EXPRESSION + - INTENT_CONFLICT #-------Definition of the concrete IntentFeasibilityCheckReport dataType----------------# #-------Definition of the generic IntentHandlingCapability dataType----------------# -- GitLab From d6c95cf512d3c53259fa53f9ae865f217afd6c03 Mon Sep 17 00:00:00 2001 From: sunse Date: Wed, 5 Feb 2025 07:31:33 +0000 Subject: [PATCH 246/587] Rel19 CR1449 TS28.541 Enhance the OpenAPI related to isUnique property for 5GCNrm --- OpenAPI/TS28541_5GcNrm.yaml | 222 ++++++++++++++++++++++++++++++++++++ 1 file changed, 222 insertions(+) diff --git a/OpenAPI/TS28541_5GcNrm.yaml b/OpenAPI/TS28541_5GcNrm.yaml index 19406a523..c6d1effe4 100755 --- a/OpenAPI/TS28541_5GcNrm.yaml +++ b/OpenAPI/TS28541_5GcNrm.yaml @@ -52,6 +52,7 @@ components: type: integer NFProfileList: type: array + uniqueItems: true description: List of NF profile items: $ref: '#/components/schemas/ManagedNFProfile' @@ -65,6 +66,7 @@ components: type: string versions: type: array + uniqueItems: true items: type: string minItems: 1 @@ -83,28 +85,34 @@ components: $ref: 'TS28623_ComDefs.yaml#/components/schemas/Fqdn' ipEndPoints: type: array + uniqueItems: true items: $ref: '#/components/schemas/IpEndPoint' apiPrefix: type: string allowedPLMNs: type: array + uniqueItems: true items: $ref: 'TS28623_ComDefs.yaml#/components/schemas/PlmnId' allowedSnpns: type: array + uniqueItems: true items: $ref: '#/components/schemas/SnpnId' allowedNfTypes: type: array + uniqueItems: true items: $ref: '#/components/schemas/NFType' allowedNfDomains: type: array + uniqueItems: true items: type: string allowedNSSAIs: type: array + uniqueItems: true items: $ref: 'TS28541_NrNrm.yaml#/components/schemas/Snssai' priority: @@ -131,6 +139,7 @@ components: type: string defaultNotificationSubscriptions: type: array + uniqueItems: true items: $ref: '#/components/schemas/DefaultNotificationSubscription' @@ -142,6 +151,7 @@ components: - SUSPENDED CNSIIdList: type: array + uniqueItems: true items: $ref: '#/components/schemas/CNSIId' CNSIId: @@ -162,6 +172,7 @@ components: - IS_ENERGYSAVING TACList: type: array + uniqueItems: true items: $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Tac' WeightFactor: @@ -178,17 +189,20 @@ components: readOnly: true supiRanges: type: array + uniqueItems: true items: $ref: '#/components/schemas/SupiRange' minItems: 1 routingIndicators: type: array + uniqueItems: true items: type: string pattern: '^[0-9]{1,4}$' minItems: 1 suciInfos: type: array + uniqueItems: true items: $ref: '#/components/schemas/SuciInfo' minItems: 1 @@ -263,6 +277,7 @@ components: readOnly: true serviceInfoList: type: array + uniqueItems: true items: $ref: '#/components/schemas/DefSubServiceInfo' minItems: 1 @@ -273,6 +288,7 @@ components: properties: versions: type: array + uniqueItems: true items: type: string minItems: 1 @@ -285,6 +301,7 @@ components: properties: hniList: type: array + uniqueItems: true items: $ref: 'TS28623_ComDefs.yaml#/components/schemas/Fqdn' minItems: 1 @@ -317,26 +334,32 @@ components: $ref: 'TS28623_ComDefs.yaml#/components/schemas/HostAddr' allowedPLMNs: type: array + uniqueItems: true items: $ref: 'TS28623_ComDefs.yaml#/components/schemas/PlmnId' sNPNList: type: array + uniqueItems: true items: $ref: '#/components/schemas/SnpnId' allowedSNPNs: type: array + uniqueItems: true items: $ref: '#/components/schemas/SnpnId' allowedNfTypes: type: array + uniqueItems: true items: $ref: '#/components/schemas/NFType' allowedNfDomains: type: array + uniqueItems: true items: type: string allowedNSSAIs: type: array + uniqueItems: true items: $ref: 'TS28541_NrNrm.yaml#/components/schemas/Snssai' locality: @@ -345,11 +368,13 @@ components: type: integer nfSetIdList: type: array + uniqueItems: true items: type: string minItems: 1 servingScope: type: array + uniqueItems: true items: type: string minItems: 1 @@ -361,11 +386,13 @@ components: readOnly: true nfSetRecoveryTimeList: type: array + uniqueItems: true items: $ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTimeRo' minItems: 1 scpDomains: type: array + uniqueItems: true items: type: string minItems: 1 @@ -378,11 +405,13 @@ components: type: boolean defaultNotificationSubscriptions: type: array + uniqueItems: true items: $ref: '#/components/schemas/DefaultNotificationSubscription' minItems: 1 serviceSetRecoveryTimeList: type: array + uniqueItems: true items: $ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTimeRo' minItems: 1 @@ -433,6 +462,7 @@ components: type: string CommModelList: type: array + uniqueItems: true items: $ref: '#/components/schemas/CommModel' minItems: 1 @@ -446,6 +476,7 @@ components: properties: fiveQIValues: type: array + uniqueItems: true items: type: integer dscp: @@ -461,6 +492,7 @@ components: $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList' NetworkSliceInfoList: type: array + uniqueItems: true items: $ref: '#/components/schemas/NetworkSliceInfo' minItems: 1 @@ -533,6 +565,7 @@ components: QosDataList: type: array + uniqueItems: true items: $ref: '#/components/schemas/QosData' @@ -561,6 +594,7 @@ components: $ref: 'TS29512_Npcf_SMPolicyControl.yaml#/components/schemas/RedirectInformation' addRedirectInfo: type: array + uniqueItems: true items: $ref: 'TS29512_Npcf_SMPolicyControl.yaml#/components/schemas/RedirectInformation' minItems: 1 @@ -575,6 +609,7 @@ components: nullable: true routeToLocs: type: array + uniqueItems: true items: $ref: 'TS29571_CommonData.yaml#/components/schemas/RouteToLocation' minItems: 1 @@ -596,6 +631,7 @@ components: TrafficControlDataList: type: array + uniqueItems: true items: $ref: '#/components/schemas/TrafficControlData' @@ -607,6 +643,7 @@ components: description: Univocally identifies the PCC rule within a PDU session. flowInfoList: type: array + uniqueItems: true items: $ref: 'TS29512_Npcf_SMPolicyControl.yaml#/components/schemas/FlowInformation' applicationId: @@ -627,14 +664,17 @@ components: default: false qosData: type: array + uniqueItems: true items: $ref: '#/components/schemas/QosDataList' altQosParams: type: array + uniqueItems: true items: $ref: '#/components/schemas/QosDataList' trafficControlData: type: array + uniqueItems: true items: $ref: '#/components/schemas/TrafficControlDataList' conditionData: @@ -680,6 +720,7 @@ components: readOnly: true uEIdList: type: array + uniqueItems: true items: type: string readOnly: true @@ -703,6 +744,7 @@ components: $ref: 'TS28623_ComDefs.yaml#/components/schemas/PlmnId' nRTACRangelist: type: array + uniqueItems: true items: $ref: '#/components/schemas/NRTACRange' minItems: 1 @@ -717,11 +759,13 @@ components: SupportedBMOList: type: array + uniqueItems: true items: type: string ECSAddrConfigInfo: type: array + uniqueItems: true items: type: string minItems: 1 @@ -732,6 +776,7 @@ components: type: string dnaiList: type: array + uniqueItems: true items: $ref: 'TS29571_CommonData.yaml#/components/schemas/Dnai' minItems: 1 @@ -741,6 +786,7 @@ components: properties: dnaiList: type: array + uniqueItems: true items: $ref: 'TS29571_CommonData.yaml#/components/schemas/Dnai' minItems: 1 @@ -755,12 +801,14 @@ components: $ref: 'TS28541_NrNrm.yaml#/components/schemas/Snssai' dnnSmfInfoList: type: array + uniqueItems: true items: $ref: '#/components/schemas/DnnSmfInfoItem' minItems: 1 5GCNfConnEcmInfoList: type: array + uniqueItems: true items: $ref: '#/components/schemas/5GCNfConnEcmInfo' minItems: 1 @@ -790,6 +838,7 @@ components: $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnRo' SnssaiList: type: array + uniqueItems: true items: $ref: 'TS28541_NrNrm.yaml#/components/schemas/Snssai' SnpnId: @@ -803,6 +852,7 @@ components: type: string TaiList: type: array + uniqueItems: true items: $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Tai' SupiRange: @@ -867,16 +917,19 @@ components: properties: routingInds: type: array + uniqueItems: true items: type: string minItems: 1 hNwPubKeyIds: type: array + uniqueItems: true items: type: integer minItems: 1 SuciInfoList: type: array + uniqueItems: true items: $ref: '#/components/schemas/SuciInfo' SharedDataIdRange: @@ -886,15 +939,18 @@ components: type: string SupiRangeList: type: array + uniqueItems: true items: $ref: '#/components/schemas/SupiRange' IdentityRangeList: type: array + uniqueItems: true items: $ref: '#/components/schemas/IdentityRange' minItems: 1 InternalGroupIdRangeList: type: array + uniqueItems: true items: $ref: '#/components/schemas/InternalGroupIdRange' SupportedDataSetList: @@ -904,6 +960,7 @@ components: minItems: 1 SharedDataIdRangeList: type: array + uniqueItems: true items: $ref: '#/components/schemas/SharedDataIdRange' minItems: 1 @@ -938,10 +995,12 @@ components: - N4U ipv4EndpointAddresses: type: array + uniqueItems: true items: $ref: 'TS28623_ComDefs.yaml#/components/schemas/Ipv4Addr' ipv6EndpointAddresses: type: array + uniqueItems: true items: $ref: 'TS28623_ComDefs.yaml#/components/schemas/Ipv6Addr' fqdn: @@ -964,10 +1023,12 @@ components: properties: ipv4EndpointAddresses: type: array + uniqueItems: true items: $ref: 'TS28623_ComDefs.yaml#/components/schemas/Ipv4Addr' ipv6EndpointAddresses: type: array + uniqueItems: true items: $ref: 'TS28623_ComDefs.yaml#/components/schemas/Ipv6Addr' fqdn: @@ -1023,6 +1084,7 @@ components: $ref: 'TS28623_ComDefs.yaml#/components/schemas/Fqdn' scpIpEndPoints: type: array + uniqueItems: true items: $ref: 'TS28541_5GcNrm.yaml#/components/schemas/IpEndPoint' minItems: 1 @@ -1055,11 +1117,13 @@ components: minProperties: 1 remotePlmnList: type: array + uniqueItems: true items: $ref: 'TS28623_ComDefs.yaml#/components/schemas/PlmnId' minItems: 1 remoteSnpnList: type: array + uniqueItems: true items: $ref: 'TS29571_CommonData.yaml#/components/schemas/PlmnIdNid' minItems: 1 @@ -1072,6 +1136,7 @@ components: $ref: 'TS29571_CommonData.yaml#/components/schemas/NfGroupId' supiRanges: type: array + uniqueItems: true items: $ref: '#/components/schemas/SupiRange' minItems: 1 @@ -1082,6 +1147,7 @@ components: type: object additionalProperties: type: array + uniqueItems: true items: $ref: '#/components/schemas/IdentityRange' minItems: 1 @@ -1122,6 +1188,7 @@ components: $ref: '#/components/schemas/TaiList' taiRangeList: type: array + uniqueItems: true items: $ref: '#/components/schemas/TaiRange' minItems: 1 @@ -1146,6 +1213,7 @@ components: properties: mlAnalyticsIds: type: array + uniqueItems: true items: $ref: 'TS29520_Nnwdaf_EventsSubscription.yaml#/components/schemas/NwdafEvent' minItems: 1 @@ -1155,6 +1223,7 @@ components: $ref: '#/components/schemas/TaiList' mlModelInterInfo: type: array + uniqueItems: true items: $ref: '#/components/schemas/VendorId' minItems: 0 @@ -1166,6 +1235,7 @@ components: - FL_SERVER_AND_CLIENT flTimeInterval: type: array + uniqueItems: true items: $ref: 'TS28623_ComDefs.yaml#/components/schemas/TimeWindow' minItems: 1 @@ -1175,11 +1245,13 @@ components: properties: eventIds: type: array + uniqueItems: true items: $ref: 'TS29520_Nnwdaf_AnalyticsInfo.yaml#/components/schemas/EventId' minItems: 1 nwdafEvents: type: array + uniqueItems: true items: $ref: 'TS29520_Nnwdaf_EventsSubscription.yaml#/components/schemas/NwdafEvent' minItems: 1 @@ -1187,6 +1259,7 @@ components: $ref: '#/components/schemas/TaiList' taiRangeList: type: array + uniqueItems: true items: $ref: '#/components/schemas/TaiRange' minItems: 1 @@ -1196,16 +1269,19 @@ components: $ref: 'TS29571_CommonData.yaml#/components/schemas/DurationSec' servingNfSetIdList: type: array + uniqueItems: true items: $ref: 'TS29571_CommonData.yaml#/components/schemas/NfSetId' minItems: 1 servingNfTypeList: type: array + uniqueItems: true items: $ref: '#/components/schemas/NFType' minItems: 1 mlAnalyticsList: type: array + uniqueItems: true items: $ref: '#/components/schemas/MlAnalyticsInfo' minItems: 1 @@ -1235,41 +1311,49 @@ components: minProperties: 1 addressDomains: type: array + uniqueItems: true items: type: string minItems: 1 ipv4Addresses: type: array + uniqueItems: true items: $ref: 'TS29571_CommonData.yaml#/components/schemas/Ipv4Addr' minItems: 1 ipv6Prefixes: type: array + uniqueItems: true items: $ref: 'TS29571_CommonData.yaml#/components/schemas/Ipv6Prefix' minItems: 1 ipv4AddrRanges: type: array + uniqueItems: true items: $ref: '#/components/schemas/Ipv4AddressRange' minItems: 1 ipv6PrefixRanges: type: array + uniqueItems: true items: $ref: '#/components/schemas/Ipv6PrefixRange' minItems: 1 servedNfSetIdList: type: array + uniqueItems: true items: $ref: 'TS29571_CommonData.yaml#/components/schemas/NfSetId' minItems: 1 remotePlmnList: type: array + uniqueItems: true items: $ref: 'TS29571_CommonData.yaml#/components/schemas/PlmnId' minItems: 1 remoteSnpnList: type: array + uniqueItems: true items: $ref: '#/components/schemas/PlmnIdNid' minItems: 1 @@ -1277,6 +1361,7 @@ components: $ref: '#/components/schemas/IpReachability' scpCapabilities: type: array + uniqueItems: true items: $ref: '#/components/schemas/ScpCapability' @@ -1286,12 +1371,14 @@ components: properties: appIds: type: array + uniqueItems: true items: type: string minItems: 1 readOnly: true afIds: type: array + uniqueItems: true items: type: string minItems: 1 @@ -1326,17 +1413,20 @@ components: properties: afEvents: type: array + uniqueItems: true items: $ref: '#/components/schemas/AfEvent' minItems: 1 afIds: type: array + uniqueItems: true items: type: string minItems: 1 readOnly: true appIds: type: array + uniqueItems: true items: type: string minItems: 1 @@ -1389,16 +1479,19 @@ components: properties: sNssaiEasdfInfoList: type: array + uniqueItems: true items: $ref: '#/components/schemas/SnssaiEasdfInfoItem' minItems: 1 easdfN6IpAddressList: type: array + uniqueItems: true items: $ref: 'TS28623_ComDefs.yaml#/components/schemas/IpAddr' minItems: 1 upfN6IpAddressList: type: array + uniqueItems: true items: $ref: 'TS28623_ComDefs.yaml#/components/schemas/IpAddr' minItems: 1 @@ -1414,6 +1507,7 @@ components: $ref: 'TS29571_CommonData.yaml#/components/schemas/ExtSnssai' dnnEasdfInfoList: type: array + uniqueItems: true items: $ref: '#/components/schemas/DnnEasdfInfoItem' minItems: 1 @@ -1430,6 +1524,7 @@ components: - $ref: 'TS29571_CommonData.yaml#/components/schemas/WildcardDnn' dnaiList: type: array + uniqueItems: true items: $ref: 'TS29571_CommonData.yaml#/components/schemas/Dnai' minItems: 1 @@ -1439,11 +1534,13 @@ components: properties: supiRanges: type: array + uniqueItems: true items: $ref: '#/components/schemas/SupiRange' minItems: 1 internalGroupIdentifiersRanges: type: array + uniqueItems: true items: $ref: '#/components/schemas/InternalGroupIdRange' minItems: 1 @@ -1453,21 +1550,25 @@ components: properties: sNssaiInfoList: type: array + uniqueItems: true items: $ref: '#/components/schemas/SnssaiInfoItem' minItems: 1 afEvents: type: array + uniqueItems: true items: $ref: '#/components/schemas/AfEvent' minItems: 1 appIds: type: array + uniqueItems: true items: type: string minItems: 1 internalGroupId: type: array + uniqueItems: true items: $ref: 'TS29571_CommonData.yaml#/components/schemas/GroupId' minItems: 1 @@ -1520,6 +1621,7 @@ components: pattern: '^[0-9]{5}$' trpIds: type: array + uniqueItems: true items: type: integer minimum: 1 @@ -1535,12 +1637,14 @@ components: maximum: 4294967295 trpMappingInfoList: type: array + uniqueItems: true items: $ref: '#/components/schemas/TrpMappingInfo' minItems: 1 TrpInfoList: type: array + uniqueItems: true items: $ref: '#/components/schemas/TrpInfo' minItems: 1 @@ -1551,6 +1655,7 @@ components: properties: servingClientTypes: type: array + uniqueItems: true items: $ref: '#/components/schemas/ExternalClientType' minItems: 1 @@ -1558,31 +1663,37 @@ components: type: string servingAccessTypes: type: array + uniqueItems: true items: $ref: 'TS29571_CommonData.yaml#/components/schemas/AccessType' minItems: 1 servingAnNodeTypes: type: array + uniqueItems: true items: $ref: '#/components/schemas/AnNodeType' minItems: 1 servingRatTypes: type: array + uniqueItems: true items: $ref: 'TS29571_CommonData.yaml#/components/schemas/RatType' minItems: 1 taiList: type: array + uniqueItems: true items: $ref: 'TS29571_CommonData.yaml#/components/schemas/Tai' minItems: 1 taiRangeList: type: array + uniqueItems: true items: $ref: '#/components/schemas/TaiRange' minItems: 1 supportedGADShapes: type: array + uniqueItems: true items: $ref: '#/components/schemas/SupportedGADShapes' minItems: 1 @@ -1594,11 +1705,13 @@ components: $ref: 'TS29571_CommonData.yaml#/components/schemas/NfGroupId' supiRanges: type: array + uniqueItems: true items: $ref: '#/components/schemas/SupiRange' minItems: 1 gpsiRanges: type: array + uniqueItems: true items: $ref: '#/components/schemas/IdentityRange' minItems: 1 @@ -1616,32 +1729,38 @@ components: $ref: 'TS29571_CommonData.yaml#/components/schemas/NfGroupId' supiRanges: type: array + uniqueItems: true items: $ref: '#/components/schemas/SupiRange' minItems: 1 gpsiRanges: type: array + uniqueItems: true items: $ref: '#/components/schemas/IdentityRange' minItems: 1 externalGroupIdentifiersRanges: type: array + uniqueItems: true items: $ref: '#/components/schemas/IdentityRange' minItems: 1 routingIndicators: type: array + uniqueItems: true items: type: string pattern: '^[0-9]{1,4}$' minItems: 1 internalGroupIdentifiersRanges: type: array + uniqueItems: true items: $ref: '#/components/schemas/InternalGroupIdRange' minItems: 1 suciInfos: type: array + uniqueItems: true items: $ref: '#/components/schemas/SuciInfo' minItems: 1 @@ -1669,6 +1788,7 @@ components: type: boolean remotePlmnRangeList: type: array + uniqueItems: true items: $ref: '#/components/schemas/PlmnRange' minItems: 1 @@ -1679,11 +1799,13 @@ components: properties: servingNfTypeList: type: array + uniqueItems: true items: $ref: '#/components/schemas/NFType' minItems: 1 servingNfSetIdList: type: array + uniqueItems: true items: $ref: 'TS29571_CommonData.yaml#/components/schemas/NfSetId' minItems: 1 @@ -1691,6 +1813,7 @@ components: $ref: '#/components/schemas/TaiList' taiRangeList: type: array + uniqueItems: true items: $ref: '#/components/schemas/TaiRange' minItems: 1 @@ -1701,16 +1824,19 @@ components: properties: servingNfTypeList: type: array + uniqueItems: true items: $ref: '#/components/schemas/NFType' servingNfSetIdList: type: array + uniqueItems: true items: $ref: 'TS29571_CommonData.yaml#/components/schemas/NfSetId' taiList: $ref: '#/components/schemas/TaiList' taiRangeList: type: array + uniqueItems: true items: $ref: '#/components/schemas/TaiRange' @@ -1722,16 +1848,19 @@ components: properties: supiRangeList: type: array + uniqueItems: true items: $ref: '#/components/schemas/SupiRange' minItems: 0 gpsiRangeList: type: array + uniqueItems: true items: $ref: '#/components/schemas/IdentityRange' minItems: 0 plmnRangeList: type: array + uniqueItems: true items: $ref: '#/components/schemas/PlmnRange' minItems: 0 @@ -1751,11 +1880,13 @@ components: properties: ipv4EndpointAddress: type: array + uniqueItems: true items: $ref: 'TS28623_ComDefs.yaml#/components/schemas/Ipv4Addr' minItems: 1 ipv6EndpointAddress: type: array + uniqueItems: true items: $ref: 'TS28623_ComDefs.yaml#/components/schemas/Ipv6Addr' minItems: 1 @@ -1776,26 +1907,31 @@ components: $ref: 'TS29571_CommonData.yaml#/components/schemas/AmfRegionId' guamiList: type: array + uniqueItems: true items: $ref: 'TS29571_CommonData.yaml#/components/schemas/Guami' minItems: 1 taiList: type: array + uniqueItems: true items: $ref: 'TS29571_CommonData.yaml#/components/schemas/Tai' minItems: 1 taiRangeList: type: array + uniqueItems: true items: $ref: '#/components/schemas/TaiRange' minItems: 1 backupInfoAmfFailure: type: array + uniqueItems: true items: $ref: 'TS29571_CommonData.yaml#/components/schemas/Guami' minItems: 1 backupInfoAmfRemoval: type: array + uniqueItems: true items: $ref: 'TS29571_CommonData.yaml#/components/schemas/Guami' minItems: 1 @@ -1815,16 +1951,19 @@ components: properties: sNssaiSmfInfoList: type: array + uniqueItems: true items: $ref: '#/components/schemas/SnssaiSmfInfoItem' minItems: 1 taiList: type: array + uniqueItems: true items: $ref: 'TS29571_CommonData.yaml#/components/schemas/Tai' minItems: 1 taiRangeList: type: array + uniqueItems: true items: $ref: '#/components/schemas/TaiRange' minItems: 1 @@ -1832,11 +1971,13 @@ components: $ref: 'TS29571_CommonData.yaml#/components/schemas/Fqdn' pgwIpAddrList: type: array + uniqueItems: true items: $ref: 'TS28623_ComDefs.yaml#/components/schemas/IpAddr' minItems: 1 accessType: type: array + uniqueItems: true items: $ref: 'TS29571_CommonData.yaml#/components/schemas/AccessType' minItems: 1 @@ -1848,6 +1989,7 @@ components: type: boolean pgwFqdnList: type: array + uniqueItems: true items: $ref: 'TS29571_CommonData.yaml#/components/schemas/Fqdn' minItems: 1 @@ -1869,16 +2011,19 @@ components: properties: sNssaiUpfInfoList: type: array + uniqueItems: true items: $ref: '#/components/schemas/SnssaiUpfInfoItem' minItems: 1 smfServingArea: type: array + uniqueItems: true items: type: string minItems: 1 interfaceUpfInfoList: type: array + uniqueItems: true items: $ref: '#/components/schemas/InterfaceUpfInfoItem' minItems: 1 @@ -1891,6 +2036,7 @@ components: readOnly: true pduSessionTypes: type: array + uniqueItems: true items: $ref: 'TS29571_CommonData.yaml#/components/schemas/PduSessionType' minItems: 1 @@ -1902,11 +2048,13 @@ components: readOnly: true taiList: type: array + uniqueItems: true items: $ref: 'TS29571_CommonData.yaml#/components/schemas/Tai' minItems: 1 taiRangeList: type: array + uniqueItems: true items: $ref: '#/components/schemas/TaiRange' minItems: 1 @@ -1938,6 +2086,7 @@ components: readOnly: true # upfEvents: # type: array + uniqueItems: true # items: # $ref: 'TS29564_Nupf_EventExposure.yaml#/components/schemas/EventType' # minItems: 1 @@ -1950,16 +2099,19 @@ components: $ref: 'TS29571_CommonData.yaml#/components/schemas/NfGroupId' dnnList: type: array + uniqueItems: true items: $ref: 'TS29571_CommonData.yaml#/components/schemas/Dnn' minItems: 1 supiRanges: type: array + uniqueItems: true items: $ref: '#/components/schemas/SupiRange' minItems: 1 gpsiRanges: type: array + uniqueItems: true items: $ref: '#/components/schemas/IdentityRange' minItems: 1 @@ -2014,16 +2166,19 @@ components: $ref: '#/components/schemas/AfEventExposureData' gpsiRanges: type: array + uniqueItems: true items: $ref: '#/components/schemas/IdentityRange' minItems: 1 externalGroupIdentifiersRanges: type: array + uniqueItems: true items: $ref: '#/components/schemas/IdentityRange' minItems: 1 servedFqdnList: type: array + uniqueItems: true items: type: string minItems: 1 @@ -2031,16 +2186,19 @@ components: $ref: '#/components/schemas/TaiList' taiRangeList: type: array + uniqueItems: true items: $ref: '#/components/schemas/TaiRange' minItems: 1 dnaiList: type: array + uniqueItems: true items: $ref: 'TS29571_CommonData.yaml#/components/schemas/Dnai' minItems: 1 unTrustAfInfoList: type: array + uniqueItems: true items: $ref: '#/components/schemas/UnTrustAfInfo' minItems: 1 @@ -2484,6 +2642,7 @@ components: NTNPLMNRestrictionsList: description: NTNPLMNRestrictionsInfoList that relates to non-terrestrial network access type: array + uniqueItems: true items: $ref: '#/components/schemas/NTNPLMNRestrictionsInfo' NTNPLMNRestrictionsInfo: @@ -2494,6 +2653,7 @@ components: $ref: 'TS28623_ComDefs.yaml#/components/schemas/PlmnId' blockedLocationInfoList: type: array + uniqueItems: true items: $ref: '#/components/schemas/BlockedLocationInfo' BlockedLocationInfo: @@ -2552,26 +2712,31 @@ components: $ref: 'TS29571_CommonData.yaml#/components/schemas/NfGroupId' imsiRanges: type: array + uniqueItems: true items: $ref: '#/components/schemas/ImsiRange' minItems: 1 imsPrivateIdentityRanges: type: array + uniqueItems: true items: $ref: '#/components/schemas/IdentityRange' minItems: 1 imsPublicIdentityRanges: type: array + uniqueItems: true items: $ref: '#/components/schemas/IdentityRange' minItems: 1 msisdnRanges: type: array + uniqueItems: true items: $ref: '#/components/schemas/IdentityRange' minItems: 1 externalGroupIdentifiersRanges: type: array + uniqueItems: true items: $ref: '#/components/schemas/IdentityRange' minItems: 1 @@ -2579,6 +2744,7 @@ components: $ref: '#/components/schemas/NetworkNodeDiameterAddress' additionalDiamAddresses: type: array + uniqueItems: true items: $ref: '#/components/schemas/NetworkNodeDiameterAddress' minItems: 1 @@ -2588,10 +2754,12 @@ components: properties: servingClientTypes: type: array + uniqueItems: true items: $ref: '#/components/schemas/ExternalClientType' gmlcNumbers: type: array + uniqueItems: true items: type: string pattern: '^[0-9]{5,15}$' @@ -2607,6 +2775,7 @@ components: $ref: 'TS29571_CommonData.yaml#/components/schemas/ExtSnssai' dnnInfoList: type: array + uniqueItems: true items: $ref: '#/components/schemas/DnnTsctsfInfoItem' minItems: 1 @@ -2631,18 +2800,22 @@ components: minProperties: 0 externalGroupIdentifiersRanges: type: array + uniqueItems: true items: $ref: '#/components/schemas/IdentityRange' supiRanges: type: array + uniqueItems: true items: $ref: '#/components/schemas/SupiRange' gpsiRanges: type: array + uniqueItems: true items: $ref: '#/components/schemas/IdentityRange' internalGroupIdentifiersRanges: type: array + uniqueItems: true items: $ref: '#/components/schemas/InternalGroupIdRange' @@ -2652,21 +2825,25 @@ components: properties: dnnList: type: array + uniqueItems: true items: $ref: 'TS29571_CommonData.yaml#/components/schemas/Dnn' minItems: 0 ipDomainList: type: array + uniqueItems: true items: type: string minItems: 0 ipv4AddressRanges: type: array + uniqueItems: true items: $ref: '#/components/schemas/Ipv4AddressRange' minItems: 0 ipv6PrefixRanges: type: array + uniqueItems: true items: $ref: '#/components/schemas/Ipv6PrefixRange' minItems: 0 @@ -2678,11 +2855,13 @@ components: $ref: 'TS29571_CommonData.yaml#/components/schemas/NfGroupId' supiRanges: type: array + uniqueItems: true items: $ref: '#/components/schemas/SupiRange' minItems: 0 gpsiRanges: type: array + uniqueItems: true items: $ref: '#/components/schemas/IdentityRange' minItems: 0 @@ -2703,11 +2882,13 @@ components: minProperties: 1 taiList: type: array + uniqueItems: true items: $ref: 'TS29571_CommonData.yaml#/components/schemas/Tai' minItems: 1 taiRangeList: type: array + uniqueItems: true items: $ref: '#/components/schemas/TaiRange' minItems: 1 @@ -2810,12 +2991,14 @@ components: properties: ncgiList: type: array + uniqueItems: true items: $ref: '#/components/schemas/NcgiTai' minItems: 1 description: List of NR cell Ids taiList: type: array + uniqueItems: true items: $ref: 'TS29571_CommonData.yaml#/components/schemas/Tai' minItems: 1 @@ -2832,6 +3015,7 @@ components: $ref: 'TS29571_CommonData.yaml#/components/schemas/Tai' cellList: type: array + uniqueItems: true items: $ref: '#/components/schemas/Ncgi' minItems: 1 @@ -2867,6 +3051,7 @@ components: $ref: 'TS29571_CommonData.yaml#/components/schemas/ExtSnssai' dnnInfoList: type: array + uniqueItems: true items: $ref: '#/components/schemas/DnnMbSmfInfoItem' minItems: 1 @@ -2888,6 +3073,7 @@ components: properties: routingIndicators: type: array + uniqueItems: true items: type: string pattern: '^[0-9]{1,4}$' @@ -2900,26 +3086,31 @@ components: properties: sNssaiMbUpfInfoList: type: array + uniqueItems: true items: $ref: '#/components/schemas/SnssaiUpfInfoItem' minItems: 1 mbSmfServingArea: type: array + uniqueItems: true items: type: string minItems: 1 interfaceMbUpfInfoList: type: array + uniqueItems: true items: $ref: '#/components/schemas/InterfaceUpfInfoItem' minItems: 1 taiList: type: array + uniqueItems: true items: $ref: 'TS29571_CommonData.yaml#/components/schemas/Tai' minItems: 1 taiRangeList: type: array + uniqueItems: true items: $ref: '#/components/schemas/TaiRange' minItems: 1 @@ -2940,6 +3131,7 @@ components: $ref: 'TS29571_CommonData.yaml#/components/schemas/ExtSnssai' dnnUpfInfoList: type: array + uniqueItems: true items: $ref: '#/components/schemas/DnnUpfInfoItem' minItems: 1 @@ -2961,41 +3153,49 @@ components: $ref: 'TS29571_CommonData.yaml#/components/schemas/Dnn' dnaiList: type: array + uniqueItems: true items: $ref: 'TS29571_CommonData.yaml#/components/schemas/Dnai' minItems: 1 pduSessionTypes: type: array + uniqueItems: true items: $ref: 'TS29571_CommonData.yaml#/components/schemas/PduSessionType' minItems: 1 ipv4AddressRanges: type: array + uniqueItems: true items: $ref: '#/components/schemas/Ipv4AddressRange' minItems: 1 ipv6PrefixRanges: type: array + uniqueItems: true items: $ref: '#/components/schemas/Ipv6PrefixRange' minItems: 1 natedIpv4AddressRanges: type: array + uniqueItems: true items: $ref: '#/components/schemas/Ipv4AddressRange' minItems: 1 natedIpv6PrefixRanges: type: array + uniqueItems: true items: $ref: '#/components/schemas/Ipv6PrefixRange' minItems: 1 ipv4IndexList: type: array + uniqueItems: true items: $ref: '#/components/schemas/IpIndex' minItems: 1 ipv6IndexList: type: array + uniqueItems: true items: $ref: '#/components/schemas/IpIndex' minItems: 1 @@ -3020,6 +3220,7 @@ components: properties: msisdnRanges: type: array + uniqueItems: true items: $ref: '#/components/schemas/IdentityRange' minItems: 1 @@ -3039,11 +3240,13 @@ components: properties: accessType: type: array + uniqueItems: true items: $ref: 'TS29571_CommonData.yaml#/components/schemas/AccessType' minItems: 1 dnnList: type: array + uniqueItems: true items: $ref: 'TS29571_CommonData.yaml#/components/schemas/Dnn' minItems: 1 @@ -3051,11 +3254,13 @@ components: $ref: 'TS28623_ComDefs.yaml#/components/schemas/Fqdn' gmIpv4Addresses: type: array + uniqueItems: true items: $ref: 'TS28623_ComDefs.yaml#/components/schemas/Ipv4Addr' minItems: 1 gmIpv6Addresses: type: array + uniqueItems: true items: $ref: 'TS28623_ComDefs.yaml#/components/schemas/Ipv6Addr' minItems: 1 @@ -3063,21 +3268,25 @@ components: $ref: 'TS28623_ComDefs.yaml#/components/schemas/Fqdn' mwIpv4Addresses: type: array + uniqueItems: true items: $ref: 'TS28623_ComDefs.yaml#/components/schemas/Ipv4Addr' minItems: 1 mwIpv6Addresses: type: array + uniqueItems: true items: $ref: 'TS28623_ComDefs.yaml#/components/schemas/Ipv6Addr' minItems: 1 servedIpv4AddressRanges: type: array + uniqueItems: true items: $ref: '#/components/schemas/Ipv4AddressRange' minItems: 1 servedIpv6PrefixRanges: type: array + uniqueItems: true items: $ref: '#/components/schemas/Ipv6PrefixRange' minItems: 1 @@ -3433,6 +3642,7 @@ components: $ref: '#/components/schemas/CommModelList' SmfInfo: type: array + uniqueItems: true items: $ref: '#/components/schemas/SmfInfo' configurable5QISetRef: @@ -3441,6 +3651,7 @@ components: $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnRo' dnaiSatelliteMappingList: type: array + uniqueItems: true items: $ref: '#/components/schemas/dnaiSatelliteMapping' minItems: 1 @@ -3501,6 +3712,7 @@ components: $ref: '#/components/schemas/SupportedBMOList' upfInfo: type: array + uniqueItems: true items: $ref: '#/components/schemas/UpfInfo' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' @@ -3561,6 +3773,7 @@ components: $ref: '#/components/schemas/SupportedBMOList' PcfInfo: type: array + uniqueItems: true items: $ref: '#/components/schemas/PcfInfo' configurable5QISetRef: @@ -3997,6 +4210,7 @@ components: $ref: '#/components/schemas/ManagedNFProfile' nsacfInfoSnssai: type: array + uniqueItems: true items: $ref: '#/components/schemas/NsacfInfoSnssai' nsacfInfo: @@ -4808,6 +5022,7 @@ components: properties: fiveQiDscpMappingList: type: array + uniqueItems: true items: $ref: '#/components/schemas/FiveQiDscpMapping' @@ -4878,10 +5093,12 @@ components: - DISABLED gtpUPathMonitoredSNSSAIs: type: array + uniqueItems: true items: $ref: 'TS28541_NrNrm.yaml#/components/schemas/Snssai' monitoredDSCPs: type: array + uniqueItems: true items: type: integer minimum: 0 @@ -4921,10 +5138,12 @@ components: - DISABLED qFMonitoredSNSSAIs: type: array + uniqueItems: true items: $ref: 'TS28541_NrNrm.yaml#/components/schemas/Snssai' qFMonitored5QIs: type: array + uniqueItems: true items: type: integer minimum: 0 @@ -4959,6 +5178,7 @@ components: properties: predefinedPccRules: type: array + uniqueItems: true items: $ref: '#/components/schemas/PccRule' minItems: 1 @@ -5437,6 +5657,7 @@ components: $ref: '#/components/schemas/CommModelList' bsfInfo: type: array + uniqueItems: true items: $ref: '#/components/schemas/BsfInfo' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' @@ -5719,6 +5940,7 @@ components: $ref: '#/components/schemas/SAP' operations: type: array + uniqueItems: true items: $ref: '#/components/schemas/Operation' minItems: 1 -- GitLab From 28d0dc4686076c8085e8f7dc2339486695731662 Mon Sep 17 00:00:00 2001 From: sunse Date: Thu, 6 Feb 2025 08:43:52 +0000 Subject: [PATCH 247/587] Rel19 CR0508 TS28.623 correction to definitions related to availableRANqoEMetrics for OpenAPI SS --- OpenAPI/TS28623_QoEMeasurementCollectionNrm.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/OpenAPI/TS28623_QoEMeasurementCollectionNrm.yaml b/OpenAPI/TS28623_QoEMeasurementCollectionNrm.yaml index fb0eaeaf1..5ac351443 100644 --- a/OpenAPI/TS28623_QoEMeasurementCollectionNrm.yaml +++ b/OpenAPI/TS28623_QoEMeasurementCollectionNrm.yaml @@ -4,7 +4,7 @@ info: version: 19.2.0 description: >- OAS 3.0.1 definition of the QoE Measurement Collection NRM - © 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). + © 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved. externalDocs: description: 3GPP TS 28.623; Generic NRM,QoE Measurement Collection NRM fragment @@ -73,8 +73,8 @@ components: items: type: string enum: - - APPLAYERBUFFERLEVELLIST - - PLAYOUTDELAYFORMEDIA_STARTUP + - APP_LAYER_BUFFER_LEVEL_LIST + - PLAYOUT_DELAY_FOR_MEDIA_STARTUP minItems: 0 maxItems: 2 mBSCommunicationServiceType: -- GitLab From 7f396c1d1127784fa96f2802f167912e77099620 Mon Sep 17 00:00:00 2001 From: sunse Date: Wed, 5 Feb 2025 08:15:34 +0000 Subject: [PATCH 248/587] Rel19 CR0090 TS28.550 OpenAPI correction related to format of URI query parameters --- OpenAPI/TS28550_PerfMeasJobCtrlMnS.yaml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/OpenAPI/TS28550_PerfMeasJobCtrlMnS.yaml b/OpenAPI/TS28550_PerfMeasJobCtrlMnS.yaml index 7de08a785..1bded8d4c 100755 --- a/OpenAPI/TS28550_PerfMeasJobCtrlMnS.yaml +++ b/OpenAPI/TS28550_PerfMeasJobCtrlMnS.yaml @@ -4,7 +4,7 @@ info: version: 18.1.0 description: >- OAS 3.0.1 specification of the Performance Measurement Job Control Service - @ 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). + @ 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved. externalDocs: description: 3GPP TS 28.550 Performance assurance @@ -56,6 +56,8 @@ paths: in: query description: This parameter identifies the list of jobId to select the resources from the collection resources identified with the path component of the URI. required: true + style: form + explode: false schema: type: array items: -- GitLab From 76c5845fe5a9324ab22837634d12767e3010501d Mon Sep 17 00:00:00 2001 From: sunse Date: Fri, 21 Feb 2025 11:34:54 +0000 Subject: [PATCH 249/587] Rel19 CR0362 TS28.532 OpenAPI correction related to format of URI query parameters --- OpenAPI/TS28532_ProvMnS.yaml | 11 +++++------ OpenAPI/TS28532_StreamingDataMnS.yaml | 6 ++++++ 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/OpenAPI/TS28532_ProvMnS.yaml b/OpenAPI/TS28532_ProvMnS.yaml index ce913eb9a..93f928a8e 100755 --- a/OpenAPI/TS28532_ProvMnS.yaml +++ b/OpenAPI/TS28532_ProvMnS.yaml @@ -203,13 +203,12 @@ paths: in: query description: >- This parameter extends the set of targeted resources beyond the base - resource identified with the path component of the URI. No scoping - mechanism is specified in the present document. + resource identified with the path component of the URI. required: false - schema: - $ref: '#/components/schemas/Scope' - style: form - explode: true + content: + application/json: + schema: + $ref: '#/components/schemas/Scope' - name: filter in: query description: >- diff --git a/OpenAPI/TS28532_StreamingDataMnS.yaml b/OpenAPI/TS28532_StreamingDataMnS.yaml index 6f7f94fc7..bcac29257 100755 --- a/OpenAPI/TS28532_StreamingDataMnS.yaml +++ b/OpenAPI/TS28532_StreamingDataMnS.yaml @@ -48,6 +48,8 @@ paths: in: query description: The list of connectionId for which the connection information is to be returned. required: false + style: form + explode: false schema: type: array items: @@ -187,6 +189,8 @@ paths: in: query description: The list of streamId for the stream(s) to be deleted. required: true + style: form + explode: false schema: type: array items: @@ -214,6 +218,8 @@ paths: in: query description: The list of streamId for which the stream information is to be retrieved. required: true + style: form + explode: false schema: type: array items: -- GitLab From 09314e50f3bbcf142f1d0964f608b63f88dea6c4 Mon Sep 17 00:00:00 2001 From: sunse Date: Thu, 6 Feb 2025 09:35:28 +0000 Subject: [PATCH 250/587] Rel19 CR0233 TS28.105 correction to data type definitions related to AIMLInferenceName --- OpenAPI/TS28105_AiMlNrm.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/OpenAPI/TS28105_AiMlNrm.yaml b/OpenAPI/TS28105_AiMlNrm.yaml index 874220189..2c690d276 100644 --- a/OpenAPI/TS28105_AiMlNrm.yaml +++ b/OpenAPI/TS28105_AiMlNrm.yaml @@ -183,8 +183,8 @@ components: type: string enum: - NG_RAN_NETWORK_ENERGY_SAVING - - NG_RAN_LOAD_BALANCING - - NG_RAN_ MOBILITY_OPTIMIZATION + - NG_RAN_LOAD_BALANCING + - NG_RAN_MOBILITY_OPTIMIZATION VSExtensionType: type: string -- GitLab From 18b8583d62a2badfdfa2aabd96b6c0fcec479bfd Mon Sep 17 00:00:00 2001 From: sunse Date: Wed, 5 Feb 2025 07:46:42 +0000 Subject: [PATCH 251/587] Rel19 CR1451 TS28.541 Enhance the OpenAPI related to multiplicity for 5GCNrm --- OpenAPI/TS28541_5GcNrm.yaml | 30 +++++++++++++++++++++++++++--- 1 file changed, 27 insertions(+), 3 deletions(-) diff --git a/OpenAPI/TS28541_5GcNrm.yaml b/OpenAPI/TS28541_5GcNrm.yaml index 1c5ef9459..19406a523 100755 --- a/OpenAPI/TS28541_5GcNrm.yaml +++ b/OpenAPI/TS28541_5GcNrm.yaml @@ -67,6 +67,7 @@ components: type: array items: type: string + minItems: 1 schema: type: string nfServiceStatus: @@ -264,6 +265,7 @@ components: type: array items: $ref: '#/components/schemas/DefSubServiceInfo' + minItems: 1 callbackUriPrefix: $ref: 'TS28623_ComDefs.yaml#/components/schemas/UriRo' DefSubServiceInfo: @@ -273,6 +275,7 @@ components: type: array items: type: string + minItems: 1 readOnly: true supportedFeatures: type: string @@ -284,6 +287,7 @@ components: type: array items: $ref: 'TS28623_ComDefs.yaml#/components/schemas/Fqdn' + minItems: 1 interPlmnFqdn: $ref: 'TS28623_ComDefs.yaml#/components/schemas/Fqdn' nfInstanceID: @@ -343,10 +347,12 @@ components: type: array items: type: string + minItems: 1 servingScope: type: array items: type: string + minItems: 1 lcHSupportInd: type: boolean readOnly: true @@ -357,10 +363,12 @@ components: type: array items: $ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTimeRo' + minItems: 1 scpDomains: type: array items: type: string + minItems: 1 recoveryTime: $ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTimeRo' nfServicePersistence: @@ -403,6 +411,7 @@ components: type: array items: $ref: '#/components/schemas/SupportedFunc' + minItems: 1 CommModelType: type: string description: any of enumerated value @@ -426,10 +435,12 @@ components: type: array items: $ref: '#/components/schemas/CommModel' + minItems: 1 CapabilityList: type: array items: type: string + minItems: 1 FiveQiDscpMapping: type: object properties: @@ -452,7 +463,7 @@ components: type: array items: $ref: '#/components/schemas/NetworkSliceInfo' - + minItems: 1 PacketErrorRate: type: object properties: @@ -566,6 +577,7 @@ components: type: array items: $ref: 'TS29571_CommonData.yaml#/components/schemas/RouteToLocation' + minItems: 1 traffCorreInd: type: boolean default: false @@ -693,6 +705,7 @@ components: type: array items: $ref: '#/components/schemas/NRTACRange' + minItems: 1 GUAMInfo: type: object @@ -711,7 +724,7 @@ components: type: array items: type: string - + minItems: 1 DnnSmfInfoItem: type: object properties: @@ -744,11 +757,13 @@ components: type: array items: $ref: '#/components/schemas/DnnSmfInfoItem' + minItems: 1 5GCNfConnEcmInfoList: type: array items: $ref: '#/components/schemas/5GCNfConnEcmInfo' + minItems: 1 5GCNfConnEcmInfo: type: object description: 'Store the 5GC NF connection information' @@ -854,10 +869,12 @@ components: type: array items: type: string + minItems: 1 hNwPubKeyIds: type: array items: type: integer + minItems: 1 SuciInfoList: type: array items: @@ -875,6 +892,7 @@ components: type: array items: $ref: '#/components/schemas/IdentityRange' + minItems: 1 InternalGroupIdRangeList: type: array items: @@ -883,10 +901,12 @@ components: type: array items: $ref: '#/components/schemas/SupportedDataSet' + minItems: 1 SharedDataIdRangeList: type: array items: $ref: '#/components/schemas/SharedDataIdRange' + minItems: 1 InterfaceUpfInfoItem: type: object properties: @@ -1523,6 +1543,7 @@ components: type: array items: $ref: '#/components/schemas/TrpInfo' + minItems: 1 LmfInfo: description: Information of an LMF NF Instance @@ -3422,6 +3443,7 @@ components: type: array items: $ref: '#/components/schemas/dnaiSatelliteMapping' + minItems: 1 - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' - $ref: '#/components/schemas/ManagedFunction5GC-nc0' - type: object @@ -4938,7 +4960,8 @@ components: predefinedPccRules: type: array items: - $ref: '#/components/schemas/PccRule' + $ref: '#/components/schemas/PccRule' + minItems: 1 AfFunction-Single: allOf: @@ -5698,6 +5721,7 @@ components: type: array items: $ref: '#/components/schemas/Operation' + minItems: 1 administrativeState: $ref: 'TS28623_ComDefs.yaml#/components/schemas/AdministrativeState' operationalState: -- GitLab From ce7330f62a6998ac59993fc3c0233b7196ad6ca2 Mon Sep 17 00:00:00 2001 From: sunse Date: Fri, 21 Feb 2025 11:45:08 +0000 Subject: [PATCH 252/587] Rel19 CR0508 TS28.623 correction to definitions related to availableRANqoEMetrics for YANG SS --- yang-models/_3gpp-common-qmcjob.yang | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/yang-models/_3gpp-common-qmcjob.yang b/yang-models/_3gpp-common-qmcjob.yang index b69cd9a19..9d58855f5 100644 --- a/yang-models/_3gpp-common-qmcjob.yang +++ b/yang-models/_3gpp-common-qmcjob.yang @@ -15,7 +15,7 @@ module _3gpp-common-qmcjob { organization "3GPP SA5"; contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464"; description "Quality of Experience Measurement Collection Job handling - Copyright 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + Copyright 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved."; reference "3GPP TS 28.623 Generic Network Resource Model (NRM) @@ -27,6 +27,7 @@ module _3gpp-common-qmcjob { Integration Reference Point (IRP); Information Service (IS)"; + revision 2025-02-06 { reference CR-0508; } revision 2024-11-05 { reference CR-0480; } revision 2024-04-04 { reference CR-0334; } revision 2023-09-18 { reference CR-0271 ; } @@ -138,9 +139,8 @@ module _3gpp-common-qmcjob { leaf-list availableRANqoEMetrics { type enumeration { - enum appLayerBufferLevelList; - enum playoutDelayForMedia; - enum Startup; + enum APP_LAYER_BUFFER_LEVEL_LIST; + enum PLAYOUT_DELAY_FOR_MEDIA_STARTUP; } max-elements 2; description "This parameter indicates available RAN visible QoE metrics -- GitLab From fce789169e5990fdd08f293d6600a5a6c35d05d7 Mon Sep 17 00:00:00 2001 From: sunse Date: Wed, 5 Feb 2025 09:15:18 +0000 Subject: [PATCH 253/587] Rel19 CR1449 TS28.541 correction to inconsistency between stage 2 and stage 3 --- OpenAPI/TS28541_NrNrm.yaml | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/OpenAPI/TS28541_NrNrm.yaml b/OpenAPI/TS28541_NrNrm.yaml index 7d47c2449..7c2027fe1 100755 --- a/OpenAPI/TS28541_NrNrm.yaml +++ b/OpenAPI/TS28541_NrNrm.yaml @@ -273,10 +273,8 @@ components: CyclicPrefix: type: string enum: - - '15' - - '30' - - '60' - - '120' + - NORMAL + - EXTENDED TxDirection: type: string enum: @@ -294,8 +292,6 @@ components: enum: - INITIAL - OTHER - - SUL - IsESCoveredBy: type: string enum: @@ -989,7 +985,7 @@ components: $ref: '#/components/schemas/GGnbIdList' x2HOBlockList: $ref: '#/components/schemas/GEnbIdList' - xnHOBlackList: + xnHOBlockList: $ref: '#/components/schemas/GGnbIdList' mappingSetIDBackhaulAddressList: type: array -- GitLab From 384c528c38a691a311dcc88ebaa75eea8c6a303a Mon Sep 17 00:00:00 2001 From: srinivasaraj Date: Fri, 21 Feb 2025 13:03:27 +0000 Subject: [PATCH 254/587] Rel-19 CR0116 28.536 Enhance stage 3 OpenAPI for isUnique property --- OpenAPI/TS28536_CoslaNrm.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/OpenAPI/TS28536_CoslaNrm.yaml b/OpenAPI/TS28536_CoslaNrm.yaml index 05197c3c7..c179fe3b1 100755 --- a/OpenAPI/TS28536_CoslaNrm.yaml +++ b/OpenAPI/TS28536_CoslaNrm.yaml @@ -169,6 +169,7 @@ components: $ref: '#/components/schemas/ControlLoopLifeCyclePhase' aCCLDisallowedList: type: array + uniqueItems: true items: $ref: '#/components/schemas/ACCLDisallowedAttributes' networkSliceRef: -- GitLab From 775898ea78f37acb04871c03828cd4fde416946c Mon Sep 17 00:00:00 2001 From: srinivasaraj Date: Fri, 21 Feb 2025 13:08:00 +0000 Subject: [PATCH 255/587] Rel 19 cr0169 28.104 enhance stage 3 open api for is unique property --- OpenAPI/TS28104_MdaNrm.yaml | 2 ++ OpenAPI/TS28104_MdaReport.yaml | 1 + 2 files changed, 3 insertions(+) diff --git a/OpenAPI/TS28104_MdaNrm.yaml b/OpenAPI/TS28104_MdaNrm.yaml index 384d36a9a..2405f576f 100644 --- a/OpenAPI/TS28104_MdaNrm.yaml +++ b/OpenAPI/TS28104_MdaNrm.yaml @@ -56,6 +56,7 @@ components: properties: areaScope: type: array + uniqueItems: true items: $ref: 'TS28623_ComDefs.yaml#/components/schemas/GeoArea' @@ -80,6 +81,7 @@ components: type: string threshold: type: array + uniqueItems: true items: $ref: '#/components/schemas/ThresholdInfo' analyticsPeriod: diff --git a/OpenAPI/TS28104_MdaReport.yaml b/OpenAPI/TS28104_MdaReport.yaml index dae638adf..1ac30cb81 100644 --- a/OpenAPI/TS28104_MdaReport.yaml +++ b/OpenAPI/TS28104_MdaReport.yaml @@ -56,6 +56,7 @@ components: type: string mDAOutputs: type: array + uniqueItems: true items: $ref: '#/components/schemas/MDAOutputs' mDARequestRef: -- GitLab From 7b8fdc7a07c6d48fbc4257c1be40dd7861c14c28 Mon Sep 17 00:00:00 2001 From: allwang Date: Tue, 4 Feb 2025 14:15:52 +0000 Subject: [PATCH 256/587] Update TS28623_ComDefs.yaml --- OpenAPI/TS28623_ComDefs.yaml | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/OpenAPI/TS28623_ComDefs.yaml b/OpenAPI/TS28623_ComDefs.yaml index b06b18ccc..d80f95b91 100755 --- a/OpenAPI/TS28623_ComDefs.yaml +++ b/OpenAPI/TS28623_ComDefs.yaml @@ -170,18 +170,14 @@ components: $ref: '#/components/schemas/Longitude' altitude: $ref: '#/components/schemas/Float' - GeoPolygon: - type: array - uniqueItems: true - items: - $ref: '#/components/schemas/GeoCoordinate' - minItems: 1 GeoArea: oneOf: - type: object properties: geoPolygon: - $ref: '#/components/schemas/GeoCoordinate' + type: array + items: + $ref: '#/components/schemas/GeoCoordinate' minItems: 1 GeoAreaToCellMapping: type: object -- GitLab From 698c1ab5e76449baebbbb92e3d8e4d3fd43913e1 Mon Sep 17 00:00:00 2001 From: ruiyue Date: Mon, 13 Jan 2025 03:41:48 +0000 Subject: [PATCH 257/587] Update 2 files - /OpenAPI/TS28312_IntentExpectations.yaml - /OpenAPI/TS28312_IntentNrm.yaml --- OpenAPI/TS28312_IntentExpectations.yaml | 57 ++++++++++++++++++++++++- OpenAPI/TS28312_IntentNrm.yaml | 4 +- 2 files changed, 59 insertions(+), 2 deletions(-) diff --git a/OpenAPI/TS28312_IntentExpectations.yaml b/OpenAPI/TS28312_IntentExpectations.yaml index e1d2bb5f6..14920955e 100644 --- a/OpenAPI/TS28312_IntentExpectations.yaml +++ b/OpenAPI/TS28312_IntentExpectations.yaml @@ -75,12 +75,16 @@ components: - $ref: '#/components/schemas/ULLatencyTarget' - $ref: '#/components/schemas/DLThptPerUETarget' - $ref: '#/components/schemas/ULThptPerUETarget' + - $ref: '#/components/schemas/NumberofUEsTarget' - $ref: 'TS28312_IntentNrm.yaml#/components/schemas/ExpectationTarget' expectationContexts: type: array uniqueItems: true items: - $ref: 'TS28312_IntentNrm.yaml#/components/schemas/Context' + type: object + oneOf: + - $ref: '#/components/schemas/SchedulingTimeContext' + - $ref: 'TS28312_IntentNrm.yaml#/components/schemas/Context' required: - expectationId EdgeServiceSupportExpectation: @@ -204,6 +208,7 @@ components: oneOf: - $ref: '#/components/schemas/CoverageAreaPolygonContext' - $ref: '#/components/schemas/ServiceTypeContext' + - $ref: '#/components/schemas/PlmnInfoContext' - $ref: 'TS28312_IntentNrm.yaml#/components/schemas/Context' EdgeServiceSupportExpectationObject: description: >- @@ -594,6 +599,22 @@ components: - IS_GREATER_THAN targetValueRange: type: integer + NumberofUEsTarget: + description: >- + This data type is the "ExpectationTarget" data type with specialisations for NumberofUEsTarget.It describes + the number of UEs target for the Radio Service that the intent expectation is applied. + type: object + properties: + targetName: + type: string + enum: + - NumberofUEs + targetCondition: + type: string + enum: + - IS_LESS_THAN + targetValueRange: + type: integer DLThptPerUETarget: description: >- This data type is the "ExpectationTarget" data type with specialisations for DLThptPerUETarget. It describes the DL throughput target by the per UE for the @@ -1160,6 +1181,40 @@ components: - IS_EQUAL_TO contextValueRange: $ref: "TS28541_NrNrm.yaml#/components/schemas/Sst" + PlmnInfoContext: + description: >- + This data type is the "ExpectationContext" data type with specialisations for PlmnInfoContext.It describes + the PLMN supported by the Radio Service that the intent expectation is applied. In case of network slicing + feature is supported, this also represents the S-NSSAI in the PLMN supported by the Radio Service. + type: object + properties: + contextAttribute: + type: string + enum: + - PlmnInfo + contextCondition: + type: string + enum: + - IS_ALL_OF + contextValueRange: + $ref: "TS28541_NrNrm.yaml#/components/schemas/PlmnInfo" + SchedulingTimeContext: + description: >- + This data type is the "ExpectationContext" data type with specialisations for SchedulingTimeContext.It describes + the scheduled times (including one-time interval, daily periodicity, weekly periodicity or monthly periodicity) + for the IntentObject that the intent expectation is applied. + type: object + properties: + contextAttribute: + type: string + enum: + - schedulingTime + contextCondition: + type: string + enum: + - IS_ALL_OF + contextValueRange: + $ref: "TS28623_GenericNrm.yaml#/components/schemas/SchedulingTime" StartTimeContext: description: >- This data type is the "ExpectationContext" data type with specialisations for StartTimeContext diff --git a/OpenAPI/TS28312_IntentNrm.yaml b/OpenAPI/TS28312_IntentNrm.yaml index 248eac3dc..bc8d92cca 100644 --- a/OpenAPI/TS28312_IntentNrm.yaml +++ b/OpenAPI/TS28312_IntentNrm.yaml @@ -266,7 +266,9 @@ components: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/PlmnId' - $ref: 'TS28623_ComDefs.yaml#/components/schemas/GeoCoordinate' - $ref: '#/components/schemas/UEGroup' - - $ref: '#/components/schemas/Frequency' + - $ref: '#/components/schemas/Frequency' + - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/SchedulingTime' + - $ref: 'TS28541_NrNrm.yaml#/components/schemas/PlmnInfo' UEGroup: description: >- It describes the UE Group, which is -- GitLab From 91357534210965f7e56ab1bd454b4efa92f69dc0 Mon Sep 17 00:00:00 2001 From: ruiyue Date: Mon, 13 Jan 2025 06:12:02 +0000 Subject: [PATCH 258/587] Update 2 files - /OpenAPI/TS28312_IntentExpectations.yaml - /OpenAPI/TS28312_IntentNrm.yaml --- OpenAPI/TS28312_IntentExpectations.yaml | 14 ++++++++++++++ OpenAPI/TS28312_IntentNrm.yaml | 7 ++++++- 2 files changed, 20 insertions(+), 1 deletion(-) diff --git a/OpenAPI/TS28312_IntentExpectations.yaml b/OpenAPI/TS28312_IntentExpectations.yaml index b0021fc5c..a987a4538 100644 --- a/OpenAPI/TS28312_IntentExpectations.yaml +++ b/OpenAPI/TS28312_IntentExpectations.yaml @@ -355,6 +355,13 @@ components: - IS_GREATER_THAN targetValueRange: type: integer + targetContexts: + type: array + items: + type: object + oneOf: + - $ref: '#/components/schemas/UlFrequencyContext' + - $ref: '#/components/schemas/RATContext' AveDLRANUEThptTarget: description: >- This data type is the "ExpectationTarget" data type with specialisations for AveDLRANUEThptTarget.It describes the average @@ -372,6 +379,13 @@ components: - IS_GREATER_THAN targetValueRange: type: integer + targetContexts: + type: array + items: + type: object + oneOf: + - $ref: '#/components/schemas/DlFrequencyContext' + - $ref: '#/components/schemas/RATContext' LowULRANUEThptRatioTarget: description: >- This data type is the "ExpectationTarget" data type with specialisations for LowULRANUEThptRatioTarget.It describes the low diff --git a/OpenAPI/TS28312_IntentNrm.yaml b/OpenAPI/TS28312_IntentNrm.yaml index bc8d92cca..a400e02ad 100644 --- a/OpenAPI/TS28312_IntentNrm.yaml +++ b/OpenAPI/TS28312_IntentNrm.yaml @@ -384,7 +384,12 @@ components: description: >- It describes the value that has been achieved for the expectation target at the time at which the report is generated. - readOnly: true + readOnly: true + targetContexts: + type: array + uniqueItems: true + items: + $ref: '#/components/schemas/Context' #-------Definition of the concrete TargetFulfilmentResult dataType----------------# #-------Definition of the generic IntentConflictReport dataType----------------# -- GitLab From 7bf83265eef10ae34b142b405cda906419371e51 Mon Sep 17 00:00:00 2001 From: ruiyue Date: Tue, 14 Jan 2025 01:38:20 +0000 Subject: [PATCH 259/587] Update file TS28312_IntentNrm.yaml --- OpenAPI/TS28312_IntentNrm.yaml | 40 +++++++++++++++++++++++++++++----- 1 file changed, 35 insertions(+), 5 deletions(-) diff --git a/OpenAPI/TS28312_IntentNrm.yaml b/OpenAPI/TS28312_IntentNrm.yaml index a400e02ad..0f00f5bcf 100644 --- a/OpenAPI/TS28312_IntentNrm.yaml +++ b/OpenAPI/TS28312_IntentNrm.yaml @@ -40,9 +40,11 @@ components: oneOf: - $ref: "#/components/schemas/IntentExpectation" - $ref: "TS28312_IntentExpectations.yaml#/components/schemas/RadioNetworkExpectation" - - $ref: "TS28312_IntentExpectations.yaml#/components/schemas/EdgeServiceSupportExpectation" - - $ref: "TS28312_IntentExpectations.yaml#/components/schemas/5GCNetworkExpectation" - - $ref: "TS28312_IntentExpectations.yaml#/components/schemas/RadioServiceExpectation" + - $ref: "TS28312_IntentExpectations.yaml#/components/schemas/EdgeServiceSupportExpectation" + - $ref: "TS28312_IntentExpectations.yaml#/components/schemas/5GCNetworkExpectation" + - $ref: "TS28312_IntentExpectations.yaml#/components/schemas/RadioServiceExpectation" + intentMgmtPurpose: + $ref: "#/components/schemas/IntentMgmtPurpose" contextSelectivity: $ref: "#/components/schemas/Selectivity" intentContexts: @@ -192,6 +194,15 @@ components: - ALL_OF - ONE_OF - ANY_OF + IntentMgmtPurpose: + description: >- + It describes the MnS consumer requirements for the management purpose (required procedures) + of the created or modified intent instance + type: string + enum: + - FEASIBILITYCHECK + - FULFILMENT + default: FULFILMENT FulfilmentStatus: type: string readOnly: true @@ -436,7 +447,7 @@ components: IntentFeasibilityCheckReport: description: >- It represents the intent feasibility check information - This attribute shall be supported when intent feasibility check information information is supported by IntentReport + This attribute shall be supported when intent feasibility check information information is supported by IntentReport type: object properties: feasibilityCheckResult: @@ -448,7 +459,26 @@ components: infeasibilityReasons: type: string readOnly: true - description: An attribute which is used when feasibilityCheckResult is INFEASIBLE + description: An attribute which is used when feasibilityCheckResult is INFEASIBLE + inFeasibleExpectationInfos: + type: array + items: + $ref: '#/components/schemas/InFeasibleExpectationInfo' + InFeasibleExpectationInfo: + description: >- + It describes the list of InFeasibleExpectationInfo for all infeasible IntentExpectations + in the intent + type: object + properties: + expectationId: + type: string + readOnly: true + inFeasibleTargets: + type: array + items: + type: string + readOnly: true + description: It describes the list of TargetNames for the InFeasibleTargets #-------Definition of the concrete IntentFeasibilityCheckReport dataType----------------# #-------Definition of the generic IntentHandlingCapability dataType----------------# -- GitLab From f8055cbf1729f5fe740b059faaf25896700af2f9 Mon Sep 17 00:00:00 2001 From: ruiyue Date: Tue, 14 Jan 2025 02:20:04 +0000 Subject: [PATCH 260/587] Update file TS28312_IntentNrm.yaml --- OpenAPI/TS28312_IntentNrm.yaml | 70 +++++++++++++++++++++++++++++++--- 1 file changed, 65 insertions(+), 5 deletions(-) diff --git a/OpenAPI/TS28312_IntentNrm.yaml b/OpenAPI/TS28312_IntentNrm.yaml index 0f00f5bcf..aa5a738ab 100644 --- a/OpenAPI/TS28312_IntentNrm.yaml +++ b/OpenAPI/TS28312_IntentNrm.yaml @@ -70,11 +70,8 @@ components: description: It expresses the priority of the stated intent within a MnS consumer. intentPreemptionCapability: type: boolean - observationPeriod: - type: integer - description: >- - It represents the observation period of the fulfilmentInfo for corresponding - ExpectationTargets, IntentExpectations and Intent. + intentReportControl: + $ref: '#/components/schemas/IntentReportControl' intentReportReference: $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnRo' IntentReport-Single: @@ -344,6 +341,69 @@ components: - $ref: "#/components/schemas/ValueRangeType" #-------Definition of the generic Context dataType----------------# + #-------Definition of the generic IntentReportControl dataType----------------# + IntentReportControl: + description: >- + It describes intent report subscription information + type: object + properties: + reportRecipientAddress: + description: >- + It indicates the address of report recipient for MnS consumer + type: string + observationPeriod: + description: >- + It indicates the time period for which the fulfilment process is observed + and at the end of which the fulfilmentInfo for corresponding + ExpectationTargets, IntentExpectations and Intent is updated. + type: integer + expectedReportTypes: + description: >- + It indicates the type of IntentReports. + type: string + enum: + - INTENT_FULFILMENT_REPORT + - INTENT_CONFLICT_REPORT + - INTENT_FEASIBILITY_CHECK_REPORT + reportingConditions: + description: >- + It indicates the specified conditions for intent reporting. + type: array + items: + $ref: '#/components/schemas/ReportingCondition' + reportingTargets: + description: >- + It indicates the specified targets needed to be reported. + type: array + items: + type: string + ReportingCondition: + description: >- + It describes the specified conditions for intent reporting. + oneOf: + - $ref: '#/components/schemas/TimeCondition' + - $ref: '#/components/schemas/TargetFulfilmentCondition' + TimeCondition: + $ref: 'TS28623_GenericNrm.yaml#/components/schemas/SchedulingTime' + TargetFulfilmentCondition: + description: >- + It indicates the specified conditions of target fulfilment for intent reporting. + type: object + properties: + targetName: + type: string + targetCondition: + $ref: '#/components/schemas/Condition' + targetValueRange: + oneOf: + - type: array + uniqueItems: true + items: + $ref: "#/components/schemas/ValueRangeType" + - $ref: "#/components/schemas/ValueRangeType" + #-------Definition of the concrete IntentReportControl dataType----------------# + + #-------Definition of the generic IntentFulfilmentReport dataType----------------# IntentFulfilmentReport: description: >- -- GitLab From d93d447cd52ccfd1e0e677ecb16615c7c2b21035 Mon Sep 17 00:00:00 2001 From: ruiyue Date: Tue, 14 Jan 2025 08:37:13 +0000 Subject: [PATCH 261/587] Update file TS28312_IntentNrm.yaml --- OpenAPI/TS28312_IntentNrm.yaml | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/OpenAPI/TS28312_IntentNrm.yaml b/OpenAPI/TS28312_IntentNrm.yaml index aa5a738ab..61668ebe8 100644 --- a/OpenAPI/TS28312_IntentNrm.yaml +++ b/OpenAPI/TS28312_IntentNrm.yaml @@ -419,6 +419,8 @@ components: minItems: 1 items: $ref: '#/components/schemas/ExpectationFulfilmentResult' + enablerInfo: + $ref: '#/components/schemas/EnablerInfo' #-------Definition of the concrete IntentFulfilmentReport dataType----------------# #-------Definition of the generic ExpectationFulfilmentResult dataType----------------# @@ -463,6 +465,32 @@ components: $ref: '#/components/schemas/Context' #-------Definition of the concrete TargetFulfilmentResult dataType----------------# + #-------Definition of the generic EnablerInfo dataType----------------# + EnablerInfo: + description: >- + This data type represents the information of enablers for intent fulfilment. + type: object + properties: + managedObjectTypes: + type: array + items: + type: string + readOnly: true + managedObjectInstanceInfos: + type: array + items: + $ref: '#/components/schemas/ManagedObjectInstanceInfo' + ManagedObjectInstanceInfo: + description: >- + It represents the information of managed object (e.g., NE, NF, Cell) during intent fulfilment. + type: object + properties: + managedObjectInstance: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnRo' + modifications: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/AttributeValueChangeSet' + #-------Definition of the generic EnablerInfo dataType----------------# + #-------Definition of the generic IntentConflictReport dataType----------------# IntentConflictReport: description: >- -- GitLab From 35c1d33faef648f54492146694461c7fe8f49567 Mon Sep 17 00:00:00 2001 From: ruiyue Date: Wed, 15 Jan 2025 09:04:57 +0000 Subject: [PATCH 262/587] Update file TS28312_IntentNrm.yaml --- OpenAPI/TS28312_IntentNrm.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/OpenAPI/TS28312_IntentNrm.yaml b/OpenAPI/TS28312_IntentNrm.yaml index 61668ebe8..7962d7ccb 100644 --- a/OpenAPI/TS28312_IntentNrm.yaml +++ b/OpenAPI/TS28312_IntentNrm.yaml @@ -474,7 +474,8 @@ components: managedObjectTypes: type: array items: - type: string + type: string + uniqueItems: true readOnly: true managedObjectInstanceInfos: type: array -- GitLab From 6a17071379564ae1f9269fa73b0c0a5df0e328d9 Mon Sep 17 00:00:00 2001 From: ruiyue Date: Wed, 19 Feb 2025 11:18:30 +0000 Subject: [PATCH 263/587] Update file TS28312_IntentNrm.yaml --- OpenAPI/TS28312_IntentNrm.yaml | 31 ++----------------------------- 1 file changed, 2 insertions(+), 29 deletions(-) diff --git a/OpenAPI/TS28312_IntentNrm.yaml b/OpenAPI/TS28312_IntentNrm.yaml index 7962d7ccb..f5ec79299 100644 --- a/OpenAPI/TS28312_IntentNrm.yaml +++ b/OpenAPI/TS28312_IntentNrm.yaml @@ -419,8 +419,8 @@ components: minItems: 1 items: $ref: '#/components/schemas/ExpectationFulfilmentResult' - enablerInfo: - $ref: '#/components/schemas/EnablerInfo' + additionalFulfilmentInfo: + type: string #-------Definition of the concrete IntentFulfilmentReport dataType----------------# #-------Definition of the generic ExpectationFulfilmentResult dataType----------------# @@ -465,33 +465,6 @@ components: $ref: '#/components/schemas/Context' #-------Definition of the concrete TargetFulfilmentResult dataType----------------# - #-------Definition of the generic EnablerInfo dataType----------------# - EnablerInfo: - description: >- - This data type represents the information of enablers for intent fulfilment. - type: object - properties: - managedObjectTypes: - type: array - items: - type: string - uniqueItems: true - readOnly: true - managedObjectInstanceInfos: - type: array - items: - $ref: '#/components/schemas/ManagedObjectInstanceInfo' - ManagedObjectInstanceInfo: - description: >- - It represents the information of managed object (e.g., NE, NF, Cell) during intent fulfilment. - type: object - properties: - managedObjectInstance: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnRo' - modifications: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/AttributeValueChangeSet' - #-------Definition of the generic EnablerInfo dataType----------------# - #-------Definition of the generic IntentConflictReport dataType----------------# IntentConflictReport: description: >- -- GitLab From 5331d2f32551915a4d05543de4bdbc99cac64b38 Mon Sep 17 00:00:00 2001 From: ruiyue Date: Thu, 16 Jan 2025 02:26:40 +0000 Subject: [PATCH 264/587] Add new file --- OpenAPI/TS28623_featureNrm.yaml | 40 +++++++++++++++++++++++++++++++++ 1 file changed, 40 insertions(+) create mode 100644 OpenAPI/TS28623_featureNrm.yaml diff --git a/OpenAPI/TS28623_featureNrm.yaml b/OpenAPI/TS28623_featureNrm.yaml new file mode 100644 index 000000000..5ce0b62e6 --- /dev/null +++ b/OpenAPI/TS28623_featureNrm.yaml @@ -0,0 +1,40 @@ +openapi: 3.0.1 +info: + title: NRM feautres + version: 19.0.0 + description: >- + OAS 3.0.1 definition of the features of NRM + © 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). + All rights reserved. +externalDocs: + description: 3GPP TS 28.623; Generic NRM, NRM features + url: http://www.3gpp.org/ftp/Specs/archive/28_series/28.623/ +paths: {} +components: + schemas: +#----- Definitions in TS 28.623 for TS 28.532 --------------------------# + resources-feature: + anyOf: + - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/resources-genericNrm' + - $ref: 'TS28541_NrNrm.yaml#/components/schemas/resources-nrNrm' + - $ref: 'TS28541_5GcNrm.yaml#/components/schemas/resources-5gcNrm' + - $ref: 'TS28541_SliceNrm.yaml#/components/schemas/resources-sliceNrm' + - $ref: 'TS28536_CoslaNrm.yaml#/components/schemas/resources-coslaNrm' + - $ref: 'TS28312_IntentNrm.yaml#/components/schemas/resources-intentNrm' + - $ref: 'TS28104_MdaNrm.yaml#/components/schemas/resources-mdaNrm' + - $ref: 'TS28105_AiMlNrm.yaml#/components/schemas/resources-AiMlNrm' + - $ref: 'TS28538_EdgeNrm.yaml#/components/schemas/resources-edgeNrm' + - $ref: 'TS28317_RanScNrm.yaml#/components/schemas/resources-RanScNrm' + - $ref: 'TS28623_FileManagementNrm.yaml#/components/schemas/resources-fileMgmtNrm' + - $ref: 'TS28623_ManagementDataCollectionNrm.yaml#/components/schemas/resources-mgmtDataCollectionNrm' + - $ref: 'TS28623_MnSRegistryNrm.yaml#/components/schemas/resources-mnSRegistryNrm' + - $ref: 'TS28623_PmControlNrm.yaml#/components/schemas/resources-pmControlNrm' + - $ref: 'TS28111_FaultNrm.yaml#/components/schemas/resources-faultNrm' + - $ref: 'TS28623_QoEMeasurementCollectionNrm.yaml#/components/schemas/resources-qoEMeasuremetCollectionNrm' + - $ref: 'TS28623_SubscriptionControlNrm.yaml#/components/schemas/resources-subscriptionControlNrm' + - $ref: 'TS28623_ThresholdMonitorNrm.yaml#/components/schemas/resources-thresholdMonitorNrm' + - $ref: 'TS28623_TraceControlNrm.yaml#/components/schemas/resources-traceControlNrm' + - $ref: 'TS28319_MsacNrm.yaml#/components/schemas/resources-msacNrm' + - $ref: 'TS28318_DsoNrm.yaml#/components/schemas/resources-DSORecovery' + +#----- Definitions in TS 28.623 for TS 28.532 --------------------------# -- GitLab From 7c1672d25ab1ffcc2b6413f3732cd1ef7d6bd224 Mon Sep 17 00:00:00 2001 From: ruiyue Date: Thu, 16 Jan 2025 02:43:33 +0000 Subject: [PATCH 265/587] Update TS28623_featureNrm.yaml --- .../{TS28623_featureNrm.yaml => TS28623_FeatureNrm.yaml} | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) rename OpenAPI/{TS28623_featureNrm.yaml => TS28623_FeatureNrm.yaml} (95%) diff --git a/OpenAPI/TS28623_featureNrm.yaml b/OpenAPI/TS28623_FeatureNrm.yaml similarity index 95% rename from OpenAPI/TS28623_featureNrm.yaml rename to OpenAPI/TS28623_FeatureNrm.yaml index 5ce0b62e6..e4a7ff9a6 100644 --- a/OpenAPI/TS28623_featureNrm.yaml +++ b/OpenAPI/TS28623_FeatureNrm.yaml @@ -1,13 +1,13 @@ openapi: 3.0.1 info: - title: NRM feautres + title: NRM Feautres version: 19.0.0 description: >- - OAS 3.0.1 definition of the features of NRM + OAS 3.0.1 definition of the Features of NRM © 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved. externalDocs: - description: 3GPP TS 28.623; Generic NRM, NRM features + description: 3GPP TS 28.623; Generic NRM, NRM Features url: http://www.3gpp.org/ftp/Specs/archive/28_series/28.623/ paths: {} components: -- GitLab From f0647b037db53fd5a4a2d9a475125c1247f8e420 Mon Sep 17 00:00:00 2001 From: ruiyue Date: Thu, 16 Jan 2025 02:53:18 +0000 Subject: [PATCH 266/587] Update file TS28532_ProvMnS.yaml --- OpenAPI/TS28532_ProvMnS.yaml | 24 +----------------------- 1 file changed, 1 insertion(+), 23 deletions(-) diff --git a/OpenAPI/TS28532_ProvMnS.yaml b/OpenAPI/TS28532_ProvMnS.yaml index 93f928a8e..5ba1b679f 100755 --- a/OpenAPI/TS28532_ProvMnS.yaml +++ b/OpenAPI/TS28532_ProvMnS.yaml @@ -401,7 +401,6 @@ components: - copy - move - test - Resource: oneOf: - type: object @@ -420,28 +419,7 @@ components: type: object required: - id - - anyOf: - - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/resources-genericNrm' - - $ref: 'TS28541_NrNrm.yaml#/components/schemas/resources-nrNrm' - - $ref: 'TS28541_5GcNrm.yaml#/components/schemas/resources-5gcNrm' - - $ref: 'TS28541_SliceNrm.yaml#/components/schemas/resources-sliceNrm' - - $ref: 'TS28536_CoslaNrm.yaml#/components/schemas/resources-coslaNrm' - - $ref: 'TS28312_IntentNrm.yaml#/components/schemas/resources-intentNrm' - - $ref: 'TS28104_MdaNrm.yaml#/components/schemas/resources-mdaNrm' - - $ref: 'TS28105_AiMlNrm.yaml#/components/schemas/resources-AiMlNrm' - - $ref: 'TS28538_EdgeNrm.yaml#/components/schemas/resources-edgeNrm' - - $ref: 'TS28317_RanScNrm.yaml#/components/schemas/resources-RanScNrm' - - $ref: 'TS28623_FileManagementNrm.yaml#/components/schemas/resources-fileMgmtNrm' - - $ref: 'TS28623_ManagementDataCollectionNrm.yaml#/components/schemas/resources-mgmtDataCollectionNrm' - - $ref: 'TS28623_MnSRegistryNrm.yaml#/components/schemas/resources-mnSRegistryNrm' - - $ref: 'TS28623_PmControlNrm.yaml#/components/schemas/resources-pmControlNrm' - - $ref: 'TS28111_FaultNrm.yaml#/components/schemas/resources-faultNrm' - - $ref: 'TS28623_QoEMeasurementCollectionNrm.yaml#/components/schemas/resources-qoEMeasuremetCollectionNrm' - - $ref: 'TS28623_SubscriptionControlNrm.yaml#/components/schemas/resources-subscriptionControlNrm' - - $ref: 'TS28623_ThresholdMonitorNrm.yaml#/components/schemas/resources-thresholdMonitorNrm' - - $ref: 'TS28623_TraceControlNrm.yaml#/components/schemas/resources-traceControlNrm' - - $ref: 'TS28319_MsacNrm.yaml#/components/schemas/resources-msacNrm' - - $ref: 'TS28318_DsoNrm.yaml#/components/schemas/resources-DSORecovery' + - $ref: 'TS28623_FeatureNrm.yaml#/components/schemas/resources-feature' Scope: type: object properties: -- GitLab From ae2590bf0f51af2cbfe7218f7032dc05223cd7da Mon Sep 17 00:00:00 2001 From: ruiyue Date: Wed, 19 Feb 2025 11:05:14 +0000 Subject: [PATCH 267/587] Update file TS28623_FeatureNrm.yaml --- OpenAPI/TS28623_FeatureNrm.yaml | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/OpenAPI/TS28623_FeatureNrm.yaml b/OpenAPI/TS28623_FeatureNrm.yaml index e4a7ff9a6..3171f4557 100644 --- a/OpenAPI/TS28623_FeatureNrm.yaml +++ b/OpenAPI/TS28623_FeatureNrm.yaml @@ -15,26 +15,26 @@ components: #----- Definitions in TS 28.623 for TS 28.532 --------------------------# resources-feature: anyOf: - - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/resources-genericNrm' + - $ref: 'TS28104_MdaNrm.yaml#/components/schemas/resources-mdaNrm' + - $ref: 'TS28105_AiMlNrm.yaml#/components/schemas/resources-AiMlNrm' + - $ref: 'TS28111_FaultNrm.yaml#/components/schemas/resources-faultNrm' + - $ref: 'TS28312_IntentNrm.yaml#/components/schemas/resources-intentNrm' + - $ref: 'TS28317_RanScNrm.yaml#/components/schemas/resources-RanScNrm' + - $ref: 'TS28318_DsoNrm.yaml#/components/schemas/resources-DSORecovery' + - $ref: 'TS28319_MsacNrm.yaml#/components/schemas/resources-msacNrm' + - $ref: 'TS28536_CoslaNrm.yaml#/components/schemas/resources-coslaNrm' + - $ref: 'TS28538_EdgeNrm.yaml#/components/schemas/resources-edgeNrm' - $ref: 'TS28541_NrNrm.yaml#/components/schemas/resources-nrNrm' - $ref: 'TS28541_5GcNrm.yaml#/components/schemas/resources-5gcNrm' - $ref: 'TS28541_SliceNrm.yaml#/components/schemas/resources-sliceNrm' - - $ref: 'TS28536_CoslaNrm.yaml#/components/schemas/resources-coslaNrm' - - $ref: 'TS28312_IntentNrm.yaml#/components/schemas/resources-intentNrm' - - $ref: 'TS28104_MdaNrm.yaml#/components/schemas/resources-mdaNrm' - - $ref: 'TS28105_AiMlNrm.yaml#/components/schemas/resources-AiMlNrm' - - $ref: 'TS28538_EdgeNrm.yaml#/components/schemas/resources-edgeNrm' - - $ref: 'TS28317_RanScNrm.yaml#/components/schemas/resources-RanScNrm' - $ref: 'TS28623_FileManagementNrm.yaml#/components/schemas/resources-fileMgmtNrm' + - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/resources-genericNrm' - $ref: 'TS28623_ManagementDataCollectionNrm.yaml#/components/schemas/resources-mgmtDataCollectionNrm' - - $ref: 'TS28623_MnSRegistryNrm.yaml#/components/schemas/resources-mnSRegistryNrm' + - $ref: 'TS28623_MnSRegistryNrm.yaml#/components/schemas/resources-mnSRegistryNrm' - $ref: 'TS28623_PmControlNrm.yaml#/components/schemas/resources-pmControlNrm' - - $ref: 'TS28111_FaultNrm.yaml#/components/schemas/resources-faultNrm' - - $ref: 'TS28623_QoEMeasurementCollectionNrm.yaml#/components/schemas/resources-qoEMeasuremetCollectionNrm' - - $ref: 'TS28623_SubscriptionControlNrm.yaml#/components/schemas/resources-subscriptionControlNrm' - - $ref: 'TS28623_ThresholdMonitorNrm.yaml#/components/schemas/resources-thresholdMonitorNrm' - - $ref: 'TS28623_TraceControlNrm.yaml#/components/schemas/resources-traceControlNrm' - - $ref: 'TS28319_MsacNrm.yaml#/components/schemas/resources-msacNrm' - - $ref: 'TS28318_DsoNrm.yaml#/components/schemas/resources-DSORecovery' + - $ref: 'TS28623_QoEMeasurementCollectionNrm.yaml#/components/schemas/resources-qoEMeasuremetCollectionNrm' + - $ref: 'TS28623_SubscriptionControlNrm.yaml#/components/schemas/resources-subscriptionControlNrm' + - $ref: 'TS28623_ThresholdMonitorNrm.yaml#/components/schemas/resources-thresholdMonitorNrm' + - $ref: 'TS28623_TraceControlNrm.yaml#/components/schemas/resources-traceControlNrm' #----- Definitions in TS 28.623 for TS 28.532 --------------------------# -- GitLab From a613930e6b767aaecebaa2815e21ade06300cd7a Mon Sep 17 00:00:00 2001 From: ruiyue Date: Mon, 20 Jan 2025 01:44:42 +0000 Subject: [PATCH 268/587] Update file TS28623_MnSRegistryNrm.yaml --- OpenAPI/TS28623_MnSRegistryNrm.yaml | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/OpenAPI/TS28623_MnSRegistryNrm.yaml b/OpenAPI/TS28623_MnSRegistryNrm.yaml index 299cca657..b4e8c68e3 100644 --- a/OpenAPI/TS28623_MnSRegistryNrm.yaml +++ b/OpenAPI/TS28623_MnSRegistryNrm.yaml @@ -39,10 +39,8 @@ components: properties: mnsLabel: type: string - readOnly: true mnsType: type: string - readOnly: true enum: - PROV_MNS - FAULT_SUPERVISION_MNS @@ -50,7 +48,6 @@ components: - FILE_DATA_REPORTING_MNS mnsVersion: type: string - readOnly: true mnsAddress: description: Resource URI as defined in the relevant Technical Specification $ref: 'TS28623_ComDefs.yaml#/components/schemas/UriRo' @@ -63,7 +60,7 @@ components: type: array uniqueItems: true items: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnRo' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' minItems: 1 #-------- Definition of YAML arrays for name-contained IOCs ---------------------- -- GitLab From e0abe46776360be78d4e29c79d81d4365011dd70 Mon Sep 17 00:00:00 2001 From: ruiyue Date: Tue, 21 Jan 2025 11:32:13 +0000 Subject: [PATCH 269/587] Update file TS28541_NrNrm.yaml --- OpenAPI/TS28541_NrNrm.yaml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/OpenAPI/TS28541_NrNrm.yaml b/OpenAPI/TS28541_NrNrm.yaml index 7c2027fe1..38cbf5ca5 100755 --- a/OpenAPI/TS28541_NrNrm.yaml +++ b/OpenAPI/TS28541_NrNrm.yaml @@ -799,6 +799,8 @@ components: $ref: 'TS28541_5GcNrm.yaml#/components/schemas/Dynamic5QISet-Multiple' CCOFunction: $ref: '#/components/schemas/CCOFunction-Single' + NTNFunction: + $ref: '#/components/schemas/NTNFunction-Single' ManagedElement-ncO-NrNrm: type: object @@ -827,6 +829,8 @@ components: $ref: 'TS28541_5GcNrm.yaml#/components/schemas/Configurable5QISet-Multiple' Dynamic5QISet: $ref: 'TS28541_5GcNrm.yaml#/components/schemas/Dynamic5QISet-Multiple' + NTNFunction: + $ref: '#/components/schemas/NTNFunction-Single' #-------- Definition of abstract IOCs -------------------------------------------- -- GitLab From a7c8d7d15ff5573cacc70798e43097e85e33398b Mon Sep 17 00:00:00 2001 From: ruiyue Date: Tue, 21 Jan 2025 12:40:22 +0000 Subject: [PATCH 270/587] Update 2 files - /OpenAPI/TS28104_MdaNrm.yaml - /OpenAPI/TS28104_MdaReport.yaml --- OpenAPI/TS28104_MdaNrm.yaml | 2 +- OpenAPI/TS28104_MdaReport.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/OpenAPI/TS28104_MdaNrm.yaml b/OpenAPI/TS28104_MdaNrm.yaml index 2405f576f..8aefa574d 100644 --- a/OpenAPI/TS28104_MdaNrm.yaml +++ b/OpenAPI/TS28104_MdaNrm.yaml @@ -65,7 +65,7 @@ components: type: object properties: mDAType: - type: string + $ref: '#/components/schemas/MDAType' mDAOutputIEFilters: type: array uniqueItems: true diff --git a/OpenAPI/TS28104_MdaReport.yaml b/OpenAPI/TS28104_MdaReport.yaml index 1ac30cb81..12c2a4c04 100644 --- a/OpenAPI/TS28104_MdaReport.yaml +++ b/OpenAPI/TS28104_MdaReport.yaml @@ -19,7 +19,7 @@ components: type: object properties: mDAType: - type: string + $ref: 'TS28104_MdaNrm#/components/schemas/MDAType' readOnly: true mDAOutputList: type: array -- GitLab From c27f2f508f3a8dab333609c68da545b92db054d4 Mon Sep 17 00:00:00 2001 From: ruiyue Date: Tue, 21 Jan 2025 12:43:13 +0000 Subject: [PATCH 271/587] Update file TS28104_MdaReport.yaml --- OpenAPI/TS28104_MdaReport.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OpenAPI/TS28104_MdaReport.yaml b/OpenAPI/TS28104_MdaReport.yaml index 12c2a4c04..a8163ef43 100644 --- a/OpenAPI/TS28104_MdaReport.yaml +++ b/OpenAPI/TS28104_MdaReport.yaml @@ -19,7 +19,7 @@ components: type: object properties: mDAType: - $ref: 'TS28104_MdaNrm#/components/schemas/MDAType' + $ref: 'TS28104_MdaNrm.yaml#/components/schemas/MDAType' readOnly: true mDAOutputList: type: array -- GitLab From 9a2d10ff55306d7d5419c574791863fd78bdcd86 Mon Sep 17 00:00:00 2001 From: ruiyue Date: Wed, 22 Jan 2025 00:55:19 +0000 Subject: [PATCH 272/587] Update file TS28104_MdaReport.yaml --- OpenAPI/TS28104_MdaReport.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/OpenAPI/TS28104_MdaReport.yaml b/OpenAPI/TS28104_MdaReport.yaml index a8163ef43..188c222d2 100644 --- a/OpenAPI/TS28104_MdaReport.yaml +++ b/OpenAPI/TS28104_MdaReport.yaml @@ -20,7 +20,6 @@ components: properties: mDAType: $ref: 'TS28104_MdaNrm.yaml#/components/schemas/MDAType' - readOnly: true mDAOutputList: type: array uniqueItems: true -- GitLab From ac75349d795395c313130550a9f1b4fc2148d54a Mon Sep 17 00:00:00 2001 From: ruiyue Date: Wed, 22 Jan 2025 07:50:38 +0000 Subject: [PATCH 273/587] Update file TS28541_NrNrm.yaml --- OpenAPI/TS28541_NrNrm.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/OpenAPI/TS28541_NrNrm.yaml b/OpenAPI/TS28541_NrNrm.yaml index 38cbf5ca5..698814957 100755 --- a/OpenAPI/TS28541_NrNrm.yaml +++ b/OpenAPI/TS28541_NrNrm.yaml @@ -1145,6 +1145,9 @@ components: maximum: 159 ssbDuration: $ref: '#/components/schemas/SsbDuration' + redCapCellFlag: + type: boolean + default: FALSE nrSectorCarrierRef: type: array uniqueItems: true -- GitLab From 6b89774b2f291336026aa98ceca0480bedf9f282 Mon Sep 17 00:00:00 2001 From: ruiyue Date: Thu, 20 Feb 2025 05:26:15 +0000 Subject: [PATCH 274/587] Update file TS28541_NrNrm.yaml --- OpenAPI/TS28541_NrNrm.yaml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/OpenAPI/TS28541_NrNrm.yaml b/OpenAPI/TS28541_NrNrm.yaml index 698814957..2cd49ae3a 100755 --- a/OpenAPI/TS28541_NrNrm.yaml +++ b/OpenAPI/TS28541_NrNrm.yaml @@ -1146,7 +1146,10 @@ components: ssbDuration: $ref: '#/components/schemas/SsbDuration' redCapCellFlag: - type: boolean + type: string + enum: + - TRUE + - FALSE default: FALSE nrSectorCarrierRef: type: array -- GitLab From 0ed2ff5de47353afde1562798f0f647f5aad63ee Mon Sep 17 00:00:00 2001 From: ruiyue Date: Thu, 20 Feb 2025 15:19:44 +0000 Subject: [PATCH 275/587] Update file TS28541_NrNrm.yaml --- OpenAPI/TS28541_NrNrm.yaml | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/OpenAPI/TS28541_NrNrm.yaml b/OpenAPI/TS28541_NrNrm.yaml index 2cd49ae3a..ab5d1862d 100755 --- a/OpenAPI/TS28541_NrNrm.yaml +++ b/OpenAPI/TS28541_NrNrm.yaml @@ -1145,12 +1145,14 @@ components: maximum: 159 ssbDuration: $ref: '#/components/schemas/SsbDuration' - redCapCellFlag: - type: string - enum: - - TRUE - - FALSE - default: FALSE + uECellBarredAccess: + type: arrary + uniqueItems: true + items: + type: string + enum: + - REDCAP_1RX + - REDCAP_2RX nrSectorCarrierRef: type: array uniqueItems: true -- GitLab From 36246e129650de200b2ece5c6b7babd931f01f66 Mon Sep 17 00:00:00 2001 From: ruiyue Date: Thu, 20 Feb 2025 15:23:36 +0000 Subject: [PATCH 276/587] Update file TS28541_NrNrm.yaml --- OpenAPI/TS28541_NrNrm.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OpenAPI/TS28541_NrNrm.yaml b/OpenAPI/TS28541_NrNrm.yaml index ab5d1862d..452d843e9 100755 --- a/OpenAPI/TS28541_NrNrm.yaml +++ b/OpenAPI/TS28541_NrNrm.yaml @@ -1146,7 +1146,7 @@ components: ssbDuration: $ref: '#/components/schemas/SsbDuration' uECellBarredAccess: - type: arrary + type: array uniqueItems: true items: type: string -- GitLab From f6e4592cb50a465df44cfab750f2ca4d03e2dfe6 Mon Sep 17 00:00:00 2001 From: rosabolzek Date: Fri, 31 Jan 2025 14:26:19 +0100 Subject: [PATCH 277/587] yang implementation CR1442 --- .../_3gpp-5gc-nrm-FiveQiDscpMappingSet.yang | 5 +- yang-models/_3gpp-5gc-nrm-neffunction.yang | 5 +- yang-models/_3gpp-5gc-nrm-nfprofile.yang | 41 +++---- yang-models/_3gpp-5gc-nrm-nfservice.yang | 109 +++++++++++++----- yang-models/_3gpp-5gc-nrm-nrffunction.yang | 5 +- yang-models/_3gpp-common-yang-types.yang | 98 +++++++++++++++- .../_3gpp-nr-nrm-eutranfreqrelation.yang | 5 +- yang-models/_3gpp-nr-nrm-gnbcucpfunction.yang | 13 ++- yang-models/_3gpp-nr-nrm-nrcelldu.yang | 46 +------- yang-models/_3gpp-nr-nrm-nrfreqrelation.yang | 5 +- yang-models/_3gpp-nr-nrm-nrfrequency.yang | 5 +- .../_3gpp-ns-nrm-networkslicesubnet.yang | 39 +++++-- yang-models/_3gpp-ns-nrm-sliceprofile.yang | 54 +-------- 13 files changed, 260 insertions(+), 170 deletions(-) diff --git a/yang-models/_3gpp-5gc-nrm-FiveQiDscpMappingSet.yang b/yang-models/_3gpp-5gc-nrm-FiveQiDscpMappingSet.yang index 10e0ee414..82d33842e 100755 --- a/yang-models/_3gpp-5gc-nrm-FiveQiDscpMappingSet.yang +++ b/yang-models/_3gpp-5gc-nrm-FiveQiDscpMappingSet.yang @@ -11,10 +11,11 @@ module _3gpp-5gc-nrm-FiveQiDscpMappingSet { organization "3gpp SA5"; contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464"; description " This IOC represents the set of mapping between 5QIs and DSCP. - Copyright 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + Copyright 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved."; reference "3GPP TS 28.541"; + revision 2025-01-25 { reference CR-1442 ; } revision 2023-09-18 { reference CR-1043 ; } revision 2020-08-03 { reference "CR-0321"; } revision 2020-05-27 { reference "CR-0287"; } @@ -38,7 +39,7 @@ module _3gpp-5gc-nrm-FiveQiDscpMappingSet { grouping FiveQiDscpMappingSetGrp { description "Represents the FiveQiDscpMappingSet IOC."; - list FiveQiDscpMappingList { + list fiveQiDscpMappingList { key "dscp"; uses FiveQiDscpMapping; } diff --git a/yang-models/_3gpp-5gc-nrm-neffunction.yang b/yang-models/_3gpp-5gc-nrm-neffunction.yang index fec93a992..1c48c30c8 100755 --- a/yang-models/_3gpp-5gc-nrm-neffunction.yang +++ b/yang-models/_3gpp-5gc-nrm-neffunction.yang @@ -17,10 +17,11 @@ module _3gpp-5gc-nrm-neffunction { contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464"; description "This IOC represents the NEF function in 5GC. For more information about the NEF, see 3GPP TS 23.501. - Copyright 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + Copyright 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved."; reference "3GPP TS 28.541"; + revision 2025-01-25 { reference CR-1442 ; } revision 2024-05-18 { reference CR-1273 ; } revision 2024-04-12 { reference CR-1218 ; } revision 2023-09-18 { reference CR-1103 ; } @@ -156,7 +157,7 @@ module _3gpp-5gc-nrm-neffunction { uses types3gpp:TaiGrp; } - list taiRangelist { + list taiRangeList { config false; description "Range of TAIs"; yext3gpp:inVariant; diff --git a/yang-models/_3gpp-5gc-nrm-nfprofile.yang b/yang-models/_3gpp-5gc-nrm-nfprofile.yang index 15dc5e0a1..35ed626ff 100755 --- a/yang-models/_3gpp-5gc-nrm-nfprofile.yang +++ b/yang-models/_3gpp-5gc-nrm-nfprofile.yang @@ -12,10 +12,11 @@ module _3gpp-5gc-nrm-nfprofile { organization "3gpp SA5"; contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464"; description "NF profile class. - Copyright 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + Copyright 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved."; reference "3GPP TS 29.510"; + revision 2025-01-25 { reference CR-1442 ; } revision 2024-04-12 { reference CR-1218 ; } revision 2023-11-18 { reference CR-1103 ; } revision 2023-09-18 { reference CR-1043 ; } @@ -23,7 +24,7 @@ module _3gpp-5gc-nrm-nfprofile { revision 2019-06-17 { reference "initial revision"; } grouping NFProfileGrp { - leaf nfInstanceID { + leaf nfInstanceId { description "String uniquely identifying a NF instance."; mandatory true; type string; @@ -588,8 +589,8 @@ module _3gpp-5gc-nrm-nfprofile { locally configured in the NRF or the NRF received during NF registration."; - key nfInstanceID; - leaf nfInstanceID { + key nfInstanceId; + leaf nfInstanceId { description "String uniquely identifying a NF instance."; type string; } @@ -604,8 +605,8 @@ module _3gpp-5gc-nrm-nfprofile { locally configured in the NRF or the NRF received during NF registration."; - key nfInstanceID; - leaf nfInstanceID { + key nfInstanceId; + leaf nfInstanceId { description "String uniquely identifying a NF instance."; type string; } @@ -620,8 +621,8 @@ module _3gpp-5gc-nrm-nfprofile { locally configured in the NRF or the NRF received during NF registration."; - key nfInstanceID; - leaf nfInstanceID { + key nfInstanceId; + leaf nfInstanceId { description "String uniquely identifying a NF instance."; type string; } @@ -636,8 +637,8 @@ module _3gpp-5gc-nrm-nfprofile { locally configured in the NRF or the NRF received during NF registration."; - key nfInstanceID; - leaf nfInstanceID { + key nfInstanceId; + leaf nfInstanceId { description "String uniquely identifying a NF instance."; type string; } @@ -652,8 +653,8 @@ module _3gpp-5gc-nrm-nfprofile { locally configured in the NRF or the NRF received during NF registration."; - key nfInstanceID; - leaf nfInstanceID { + key nfInstanceId; + leaf nfInstanceId { description "String uniquely identifying a NF instance."; type string; } @@ -668,8 +669,8 @@ module _3gpp-5gc-nrm-nfprofile { locally configured in the NRF or the NRF received during NF registration."; - key nfInstanceID; - leaf nfInstanceID { + key nfInstanceId; + leaf nfInstanceId { description "String uniquely identifying a NF instance."; type string; } @@ -684,8 +685,8 @@ module _3gpp-5gc-nrm-nfprofile { locally configured in the NRF or the NRF received during NF registration."; - key nfInstanceID; - leaf nfInstanceID { + key nfInstanceId; + leaf nfInstanceId { description "String uniquely identifying a NF instance."; type string; } @@ -700,8 +701,8 @@ module _3gpp-5gc-nrm-nfprofile { locally configured in the NRF or the NRF received during NF registration."; - key nfInstanceID; - leaf nfInstanceID { + key nfInstanceId; + leaf nfInstanceId{ description "String uniquely identifying a NF instance."; type string; } @@ -716,8 +717,8 @@ module _3gpp-5gc-nrm-nfprofile { locally configured in the NRF or the NRF received during NF registration."; - key nfInstanceID; - leaf nfInstanceID { + key nfInstanceId; + leaf nfInstanceId { description "String uniquely identifying a NF instance."; type string; } diff --git a/yang-models/_3gpp-5gc-nrm-nfservice.yang b/yang-models/_3gpp-5gc-nrm-nfservice.yang index 82cf61e87..d3d3a71cd 100755 --- a/yang-models/_3gpp-5gc-nrm-nfservice.yang +++ b/yang-models/_3gpp-5gc-nrm-nfservice.yang @@ -12,10 +12,11 @@ module _3gpp-5gc-nrm-nfservice { organization "3gpp SA5"; contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464"; description "NF service class. - Copyright 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + Copyright 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved."; reference "3GPP TS 29.510"; + revision 2025-01-25 { reference CR-1442; } revision 2023-09-18 { reference CR-1043 ; } revision 2021-01-25 { reference CR-0454 ; } revision 2020-11-05 { reference CR-0412 ; } @@ -98,7 +99,7 @@ module _3gpp-5gc-nrm-nfservice { uses types3gpp:DefaultNotificationSubscription; } - list allowedPlmns { + list allowedPLMNs { description "PLMNs allowed to access the service instance. The absence of this attribute indicates that any PLMN is allowed to access the service instance."; @@ -108,15 +109,21 @@ module _3gpp-5gc-nrm-nfservice { key "mcc mnc"; uses types3gpp:PLMNId; } - - leaf-list allowedNfTypes { - description "Type of the NFs allowed to access the service instance. - The absence of this attribute indicates that any NF type is allowed - to access the service instance."; + list allowedSnpns { + description "PLMNs allowed to access the service instance. + The absence of this attribute indicates that any PLMN is allowed to + access the service instance."; min-elements 1; //optional support - type types3gpp:NfType; + key "mcc mnc"; + uses types3gpp:PLMNId; + } + leaf-list allowedNfTypes { + description "SNPNs allowed to access the NF instance"; + min-elements 1; + //optional support + type types3gpp:NfType; } leaf-list allowedNfDomains { @@ -126,7 +133,7 @@ module _3gpp-5gc-nrm-nfservice { type string; } - list allowedNssais { + list allowedNSSAI { description "S-NSSAI of the allowed slices to access the service instance. The absence of this attribute indicates that any slice is allowed to access the service instance."; @@ -135,13 +142,51 @@ module _3gpp-5gc-nrm-nfservice { key "sd sst"; uses types5g3gpp:SNssai; } - + leaf-list allowedOperationsPerNfType { + description "It indicates the allowed operations on resources for each type + of NF; the key of the map is the NF Type, and the value is an array of scopes"; + //optional support + type string; + min-elements 1; + } + leaf-list allowedOperationsPerNfInstance { + description "It indicates the allowed operations on resources for a given NF + Instance; the key of the map is the NF Instance Id, and the value is an array of scopes"; + //optional support + type string; + min-elements 1; + } + leaf allowedOperationsPerNfInstanceOverrides { + type boolean; + default false; + description "When it is present and set to true, indicates that the scopes defined in + attribute allowedOperationsPerNfInstance for a given NF Instance ID take precedence over + the scopes defined in attribute allowedOperationsPerNfType for the corresponding NF type + of the NF Instance associated to such NF Instance ID.."; + } + + leaf-list oauth2Required { + type boolean; + max-elements 1; + description "It indicates whether the NF Service Instance requires Oauth2-based authorization"; + } + + leaf-list sharedServiceDataId { + type string; + max-elements 1; + description "String uniquely identifying SharedServiceData. The format of the + sharedServiceDataId shall be a Universally Unique Identifier (UUID) version 4, + as described in IETF RFC 4122 [44]. The hexadecimal letters should be formatted + as lower-case characters by the sender, and they shall be handled as case-insensitive + by the receiver."; + } + leaf priority { description "Priority (relative to other services of the same type) in the range of 0-65535, to be used for NF Service selection; lower values indicate a higher priority."; //optional support - type uint16; + type uint16 { range "0..65535"; } } leaf capacity { @@ -151,31 +196,17 @@ module _3gpp-5gc-nrm-nfservice { type uint16; } - leaf load { - description "Dynamic load information, ranged from 0 to 100, indicates - the current load percentage of the NF Service."; - //optional support - type types3gpp:Load; - } - + leaf recoveryTime { description "Timestamp when the NF was (re)started."; //optional support type yang:date-and-time; } - - list chfServiceInfo { //is the key unique - description "Specific data for a CHF service instance."; - //optional support - max-elements 1; - key "primaryChfServiceInstance secondaryChfServiceInstance"; - uses ChfServiceInfo; - } - - leaf supportedFeatures { - description "Supported Features of the NF Service instance."; + + leaf vendorId { + description "Vendor ID of the NF instance"; //optional support - type SupportedFeatures; + type string; } } @@ -302,4 +333,22 @@ module _3gpp-5gc-nrm-nfservice { type string; } } + grouping SNPNIdGrp { + description "This <> represents the information of a SNPN + identification"; + leaf mCC { + description "This is the Mobile Country Code (MCC) of the PLMN + identifier. See TS 23.003 [13] subclause 2.2 and 12.1"; + type string; + } + leaf mNC { + description "This is the Mobile Network Code (MNC) of the PLMN identifier. + See TS 23.003 [13] subclause 2.2 and 12.1."; + type string; + } + leaf nId { + description "Network Identity; Shall be present if PlmnIdNid identifies an SNPN"; + type string; + } + } } \ No newline at end of file diff --git a/yang-models/_3gpp-5gc-nrm-nrffunction.yang b/yang-models/_3gpp-5gc-nrm-nrffunction.yang index 25507c96a..e8a8ff3bc 100755 --- a/yang-models/_3gpp-5gc-nrm-nrffunction.yang +++ b/yang-models/_3gpp-5gc-nrm-nrffunction.yang @@ -16,10 +16,11 @@ module _3gpp-5gc-nrm-nrffunction { contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464"; description "This IOC represents the NRF function in 5GC. For more information about the NRF, see 3GPP TS 23.501 [2]. - Copyright 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + Copyright 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved."; reference "3GPP TS 28.541"; + revision 2025-01-25 { reference CR-1442 ; } revision 2023-09-18 { reference CR-1043 ; } revision 2023-04-26 { reference CR-0916; } revision 2020-11-08 { reference CR-0412 ; } @@ -72,7 +73,7 @@ module _3gpp-5gc-nrm-nrffunction { list nFProfileList { description "Set of NFProfile(s) to be registered in the NRF instance."; //optional support - key nfInstanceID; + key nfInstanceId; uses nfp3gpp:NFProfileGrp; } } diff --git a/yang-models/_3gpp-common-yang-types.yang b/yang-models/_3gpp-common-yang-types.yang index 37fadf04a..0195a23c3 100755 --- a/yang-models/_3gpp-common-yang-types.yang +++ b/yang-models/_3gpp-common-yang-types.yang @@ -12,10 +12,12 @@ module _3gpp-common-yang-types { description "The model defines a YANG mapping of the top level information classes used for management of 5G networks and network slicing. - Copyright 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + Copyright 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved."; reference "3GPP TS 28.623"; + revision 2024-11-25 { reference CR-1442; } + revision 2024-11-25 { reference CR-1412; } revision 2024-11-01 { reference CR-0463; } revision 2024-08-13 { reference CR-0387; } revision 2024-05-18 { reference CR-0359; } @@ -299,6 +301,44 @@ module _3gpp-common-yang-types { yext3gpp:notNotifyable; } } + grouping NPNIdGrp { + description "Represents the NPN supported by the <> using this + <> as one of its attributes in case of the cell is a + NPN-only cell."; + + list plmnid { + key "mcc mnc"; + min-elements 1; + description "PLMNId"; + uses types3gpp:PLMNId; + } + + leaf cAGIdList { + type string; + mandatory true; + description "It identifies a CAG list containing up to 12 CAG-identifiers + per PLMN Identity, see TS 38.331. + + CAG is used for the PNI-NPNs to prevent UE(s), which are not allowed + to access the NPN via the associated cell(s), from automatically + selecting and accessing the associated CAG cell(s). + + CAG ID is used to combine with PLMN ID to identify a PNI-NPN. + + Exist if the cell is a NPN-only cell see TS 38.331"; + } + + leaf nIDList { + type string; + mandatory true; + description "It identifies a list of NIDs containing up to 12 NIDs per + PLMN Identity, see TS 38.331. + + NID is used to combine with PLMN ID to identify an SNPN. + + Exist if the cell is a NPN-only cell see TS 38.331"; + } + } typedef TenthOfDegrees { type uint16 { @@ -369,7 +409,7 @@ module _3gpp-common-yang-types { leaf idx { type uint32 ; } - leaf nfInstanceID { + leaf nfInstanceId { config false; mandatory true; type yang:uuid ; @@ -829,6 +869,11 @@ module _3gpp-common-yang-types { type inet:uri; } + leaf interPlmnCallbackUri { + description "It indicates the callback URI to be used by NF Service + Producers located in PLMNs that are different from the PLMN of the NF consumer."; + type inet:uri; + } leaf n1MessageClass { type N1MessageClass; } @@ -836,6 +881,55 @@ module _3gpp-common-yang-types { leaf n2InformationClass { type N2InformationClass; } + + leaf versions { + description "This attribute identifies the API versions + (e.g. v1) supported for the default notification type"; + //optional + type N2InformationClass; + } + leaf binding { + description "This attribute shall contain the value of the Binding Indication + for the default subscription notification "; + reference " i.e. the value part of 3gpp-Sbi-Binding header, as specified in + clause 6.12.4 of 3GPP TS 29.500 76. "; + //optional + type string; + config false; + } + leaf acceptedEncoding { + description "It indicates the content encodings that are accepted by a NF Service + Consumer when receiving a notification related to a default notification subscription"; + reference "IETF RFC 9110 clause 12.5.3 "; + //optional + type string; + config false; + } + leaf supportedFeatures { + description "It is a string, which indicates the features of the service corresponding + to the subscribed default notification, which are supported by the NF (Service) instance + acting as NF service consumer. The string shall contain a bitmask indicating supported + features in hexadecimal representation:Each character in the string shall take a value + of 0 to 9, a to f or A to F "; + reference "shall represent the support of 4 features as described in table 5.2.2-3 of TS 29.571 [61]."; + //optional + type string; + config false; + } + leaf serviceInfoList { + description "It indicates a list of service specific information. It may be present + when the notification request of the notification type may be generated by multiple + services, i.e. notifications from different services may be received by the subscription."; + //optional + type string; + config false; + } + leaf callbackUriPrefix { + description "It indicates the optional path segment(s) used to construct the prefix of the + Callback URIs during the reselection of an NF service consumer, as described in 3GPP TS 29.501"; + //optional + type inet:uri; + } } grouping Ipv4AddressRange { diff --git a/yang-models/_3gpp-nr-nrm-eutranfreqrelation.yang b/yang-models/_3gpp-nr-nrm-eutranfreqrelation.yang index 0ebea1981..b5479dfd0 100755 --- a/yang-models/_3gpp-nr-nrm-eutranfreqrelation.yang +++ b/yang-models/_3gpp-nr-nrm-eutranfreqrelation.yang @@ -13,10 +13,11 @@ module _3gpp-nr-nrm-eutranfreqrelation { organization "3GPP SA5"; description "Defines the YANG mapping of the EUtranFreqRelation Information Object Class (IOC) that is part of the NR Network Resource Model (NRM). - Copyright 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + Copyright 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved."; reference "3GPP TS 28.541 5G Network Resource Model (NRM)"; + revision 2025-01-25 { reference CR-; } revision 2024-02-24 { reference CR-1218; } revision 2023-09-18 { reference CR-1043; } revision 2019-10-28 { reference S5-193518 ; } @@ -44,7 +45,7 @@ module _3gpp-nr-nrm-eutranfreqrelation { blocklisted in E-UTRAN measurements."; reference "3GPP TS 38.331"; min-elements 0; - type uint16 { range "0..1007"; } + type uint16 { range "0..503"; } } leaf-list blockListEntryIdleMode { diff --git a/yang-models/_3gpp-nr-nrm-gnbcucpfunction.yang b/yang-models/_3gpp-nr-nrm-gnbcucpfunction.yang index aaf83c7ee..9b0452ac3 100755 --- a/yang-models/_3gpp-nr-nrm-gnbcucpfunction.yang +++ b/yang-models/_3gpp-nr-nrm-gnbcucpfunction.yang @@ -16,10 +16,11 @@ module _3gpp-nr-nrm-gnbcucpfunction { contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464"; description "Defines the YANG mapping of the GNBCUCPFunction Information Object Class (IOC) that is part of the NR Network Resource Model (NRM). - Copyright 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + Copyright 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved."; reference "3GPP TS 28.541 5G Network Resource Model (NRM)"; + revision 2025-01-25 { reference "CR-1442"; } revision 2024-11-07 { reference "CR-1443"; } revision 2024-08-19 { reference "CR-1405"; } revision 2024-08-19 { reference "CR-1337 CR-1352"; } @@ -87,7 +88,7 @@ module _3gpp-nr-nrm-gnbcucpfunction { description "This data type represents the properties describing the mapping relationship between set ID and backhaul address of gNB."; - leaf setID { + leaf setId { type uint32 { range 0..4194304; // 22 bits } @@ -109,7 +110,7 @@ module _3gpp-nr-nrm-gnbcucpfunction { } } - grouping tceIDMappingInfoGrp { + grouping TceIDMappingInfoGrp { description "This data type represents the properties describing the mapping relationship between TCE ID, PLMN where TCE resides and IP address of TCE."; @@ -236,7 +237,7 @@ module _3gpp-nr-nrm-gnbcucpfunction { min-elements 1; key idx; leaf idx { type uint32; } - uses tceIDMappingInfoGrp; + uses TceIDMappingInfoGrp; } leaf dDAPSHOControl { @@ -311,6 +312,10 @@ module _3gpp-nr-nrm-gnbcucpfunction { NRECMappingRule contained by parent, e.g. ManagedElement or SubNetwork, applies."; } + + leaf mWABRef { + type types3gpp:DistinguishedName; + } } grouping QceIdMappingInfoGrp { diff --git a/yang-models/_3gpp-nr-nrm-nrcelldu.yang b/yang-models/_3gpp-nr-nrm-nrcelldu.yang index da3e12195..94420e4df 100755 --- a/yang-models/_3gpp-nr-nrm-nrcelldu.yang +++ b/yang-models/_3gpp-nr-nrm-nrcelldu.yang @@ -15,10 +15,11 @@ module _3gpp-nr-nrm-nrcelldu { contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464"; description "Defines the YANG mapping of the NRCellDU Information Object Class (IOC) that is part of the NR Network Resource Model (NRM). - Copyright 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + Copyright 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved."; reference "3GPP TS 28.541 5G Network Resource Model (NRM)"; + revision 2024-05-25 { reference CR-1412 ; } revision 2024-05-24 { reference CR-1273 ; } revision 2023-09-18 { reference CR-1043 ; } revision 2022-07-28 { reference "CR-0770"; } @@ -42,46 +43,7 @@ module _3gpp-nr-nrm-nrcelldu { description "Class representing Centralized SON function of PCI configuration feature"; } - - grouping NPNIdentityGrp { - description "Represents the NPN supported by the <> using this - <> as one of its attributes in case of the cell is a - NPN-only cell."; - - list plmnid { - key "mcc mnc"; - min-elements 1; - description "PLMNId"; - uses types3gpp:PLMNId; - } - - leaf cAGIdList { - type string; - mandatory true; - description "It identifies a CAG list containing up to 12 CAG-identifiers - per PLMN Identity, see TS 38.331. - - CAG is used for the PNI-NPNs to prevent UE(s), which are not allowed - to access the NPN via the associated cell(s), from automatically - selecting and accessing the associated CAG cell(s). - - CAG ID is used to combine with PLMN ID to identify a PNI-NPN. - - Exist if the cell is a NPN-only cell see TS 38.331"; - } - - leaf nIDList { - type string; - mandatory true; - description "It identifies a list of NIDs containing up to 12 NIDs per - PLMN Identity, see TS 38.331. - - NID is used to combine with PLMN ID to identify an SNPN. - - Exist if the cell is a NPN-only cell see TS 38.331"; - } - } - + grouping NRCellDUGrp { description "Represents the NRCellDU IOC."; reference "3GPP TS 28.541"; @@ -143,7 +105,7 @@ module _3gpp-nr-nrm-nrcelldu { corresponding PNI-NPN or SNPN in case of the cell is NPN-only cell."; reference "3GPP TS 38.331"; leaf idx { type uint32 ; } - uses NPNIdentityGrp; + uses types3gpp:NPNIdGrp; } leaf nRPCI { diff --git a/yang-models/_3gpp-nr-nrm-nrfreqrelation.yang b/yang-models/_3gpp-nr-nrm-nrfreqrelation.yang index 90705d9b9..46b942353 100755 --- a/yang-models/_3gpp-nr-nrm-nrfreqrelation.yang +++ b/yang-models/_3gpp-nr-nrm-nrfreqrelation.yang @@ -12,10 +12,11 @@ module _3gpp-nr-nrm-nrfreqrelation { organization "3GPP SA5"; description "Defines the YANG mapping of the NRFreqRelation Information Object Class (IOC) that is part of the NR Network Resource Model (NRM). - Copyright 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + Copyright 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved."; reference "3GPP TS 28.541 5G Network Resource Model (NRM)"; + revision 2025-01-25 { reference CR-; } revision 2024-02-24 { reference CR-1218; } revision 2023-09-18 { reference CR-1043; } revision 2023-04-26 { reference CR-0916; } @@ -81,7 +82,7 @@ module _3gpp-nr-nrm-nrfreqrelation { blocklisted in NR measurements."; reference "3GPP TS 38.331"; min-elements 0; - type uint16 { range "0..1007"; } + type uint16 { range "0..503"; } } leaf-list blockListEntryIdleMode { diff --git a/yang-models/_3gpp-nr-nrm-nrfrequency.yang b/yang-models/_3gpp-nr-nrm-nrfrequency.yang index a1589ef2b..1ae6f94fc 100755 --- a/yang-models/_3gpp-nr-nrm-nrfrequency.yang +++ b/yang-models/_3gpp-nr-nrm-nrfrequency.yang @@ -11,10 +11,11 @@ module _3gpp-nr-nrm-nrfrequency { organization "3GPP SA5"; description "Defines the YANG mapping of the NRFrequency Information Object Class (IOC) that is part of the NR Network Resource Model (NRM). - Copyright 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + Copyright 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved."; reference "3GPP TS 28.541 5G Network Resource Model (NRM)"; + revision 2025-01-25 { reference CR-1442 ; } revision 2023-09-18 { reference CR-1043 ; } revision 2019-10-28 { reference S5-193518 ; } revision 2019-06-17 { @@ -33,7 +34,7 @@ module _3gpp-nr-nrm-nrfrequency { type uint32 { range "0.. 3279165"; } } - leaf sSBSubCarrierSpacing { + leaf ssBSubCarrierSpacing { description "Sub-carrier spacing of the SSB."; mandatory true; type uint8 { range "15 | 30 | 60 | 120"; } diff --git a/yang-models/_3gpp-ns-nrm-networkslicesubnet.yang b/yang-models/_3gpp-ns-nrm-networkslicesubnet.yang index 3453e5166..7aba7f7e6 100755 --- a/yang-models/_3gpp-ns-nrm-networkslicesubnet.yang +++ b/yang-models/_3gpp-ns-nrm-networkslicesubnet.yang @@ -15,7 +15,7 @@ module _3gpp-ns-nrm-networkslicesubnet { "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464"; description "This IOC represents the properties of a network slice subnet instance in a 5G network. - Copyright 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + Copyright 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved."; reference "3GPP TS 28.541 Management and orchestration; @@ -23,6 +23,7 @@ module _3gpp-ns-nrm-networkslicesubnet { Information model definitions for network slice NRM (chapter 6) "; + revision 2025-01-25 { reference CR-1412 ; } revision 2023-09-18 { reference CR-1043 ; } revision 2022-07-26 { reference CR-0770 ; } revision 2021-05-05 { @@ -45,7 +46,27 @@ module _3gpp-ns-nrm-networkslicesubnet { type string; reference "ETSI GS NFV-IFA 013"; } - + grouping ConnectionPointInfoGrp { + description "TThis datatype contains information required to identify a + connection point outside of scope of 3GPP MIB (e.g. transport domain), "; + reference "FC 8345 [89] and YANG Data Models for 'Attachment + Circuits'-as-a-Service (ACaaS) [90]"; + leaf connectionPointId { + description "This parameter specifies the identifier of a TN object"; + type string; + } + leaf connectionPointIdType { + description "This parameter specifies the type of the connection point identifier"; + type enumeration { + enum VLAN; + enum MPLS; + enum SEGMENT; + enum IPV4; + enum IPV6; + enum ATTACHMENT_CIRCUIT; + } + } + } grouping EPTransportGrp { leaf ipAddress { description "This parameter specifies the IP address assigned to a @@ -61,13 +82,6 @@ module _3gpp-ns-nrm-networkslicesubnet { mandatory true; type string; } - leaf-list nextHopInfo { - description "This parameter is used to identify ingress transport - node. Each node can be identified by any of combination of IP - address of next-hop router of transport network, system name, - port name, IP management address of transport nodes."; - type string; - } leaf-list qosProfile { description "This parameter specifies reference to QoS Profile for a logical transport interface. A QoS profile includes a set of @@ -81,8 +95,13 @@ module _3gpp-ns-nrm-networkslicesubnet { min-elements 1; type types3gpp:DistinguishedName; } + list externalEndPointRefList { + description "This parameter is used to identify a list of connection + point info(s)"; + uses ConnectionPointInfoGrp; + } uses top3gpp:Top_Grp; - } + } grouping NsInfoGrp { description "The NsInfo of the NS instance corresponding to the network diff --git a/yang-models/_3gpp-ns-nrm-sliceprofile.yang b/yang-models/_3gpp-ns-nrm-sliceprofile.yang index 8745dd815..6ba9a70cb 100755 --- a/yang-models/_3gpp-ns-nrm-sliceprofile.yang +++ b/yang-models/_3gpp-ns-nrm-sliceprofile.yang @@ -13,7 +13,7 @@ submodule _3gpp-ns-nrm-sliceprofile { description "Represents the properties of network slice subnet related requirement that should be supported by the network slice subnet instance in a 5G network. - Copyright 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + Copyright 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved."; reference "3GPP TS 28.541 Management and orchestration; @@ -21,6 +21,7 @@ submodule _3gpp-ns-nrm-sliceprofile { Information model definitions for network slice NRM (chapter 6) "; + revision 2025-01-25 { reference CR-1442; } revision 2023-11-04 { reference CR-1129; } revision 2023-09-18 { reference CR-1043 ; } revision 2023-04-26 { reference CR-0916; } @@ -502,6 +503,7 @@ submodule _3gpp-ns-nrm-sliceprofile { list maxNumberofPDUSessions { description "Represents the maximum number of concurrent PDU sessions supported by the network slice"; + //optional config false; key idx; max-elements 1; @@ -621,54 +623,6 @@ submodule _3gpp-ns-nrm-sliceprofile { } } - grouping PositioningRANSubnetGrp { - description "Represents positioning support in RAN domain"; - leaf-list availability { - type enumeration { - enum CIDE_CID ; - enum OTDOA; - enum RF_FINGERPRINTING; - enum AECID; - enum HYBRID_POSITIONING; - enum NET_RTK; - } - config false; - description "Specifies if this attribute is provided by the RAN domain - of the network slice and contains a list of positioning methods - provided by the RAN domain. If the list is empty this attribute is - not available in the RAN domain and the other parameters might be - ignored, see NG.116. Values allowed: are - CIDE-CID (LTE and NR), OTDOA (LTE and NR), RF fingerprinting, AECID, - Hybrid positioning, NET-RTK."; - } - leaf predictionfrequency { - type enumeration { - enum PERSEC; - enum PERMIN; - enum PERHOUR; - } - mandatory true; - description "Specifies how often location information is provided. - This parameter simply defines how often the customer is allowed to - request location information. This is not related to the time it - takes to determine the location, which is a characteristic of the - positioning method. - If leaf-list availability is empty, the value has no meaning."; - reference "NG.116"; - } - leaf accuracy { - type decimal64 { - fraction-digits 2; - } - units meter; - mandatory true; - description "Specifies the accuracy of the location information. - Accuracy depends on the respective positioning solution applied in the - RAN domain of the network slice."; - reference "NG.116"; - } - } - grouping RANSliceSubnetProfileGrp { description "Represents the RANSliceSubnetProfile datatype"; leaf latency { @@ -936,7 +890,7 @@ submodule _3gpp-ns-nrm-sliceprofile { description "Specifies whether the RAN domain of the network slice provides geo-localization methods or supporting methods."; reference "Clause 3.4.20 of NG.116 [50]."; - uses PositioningRANSubnetGrp; + uses PositioningGrp; } } -- GitLab From 4eb51a0d69824b08bf8f6fa83086652bf524ae58 Mon Sep 17 00:00:00 2001 From: rosabolzek Date: Tue, 4 Feb 2025 09:31:41 +0100 Subject: [PATCH 278/587] Updated YANG models for compliance and corrections --- .../_3gpp-5gc-nrm-FiveQiDscpMappingSet.yang | 1 + yang-models/_3gpp-5gc-nrm-nfservice.yang | 48 +++++++++-------- yang-models/_3gpp-common-yang-types.yang | 53 +++++++++++-------- .../_3gpp-nr-nrm-eutranfreqrelation.yang | 18 ++++--- yang-models/_3gpp-nr-nrm-gnbcucpfunction.yang | 7 +-- yang-models/_3gpp-nr-nrm-nrfreqrelation.yang | 18 +++---- yang-models/_3gpp-nr-nrm-nrfrequency.yang | 7 +-- .../_3gpp-ns-nrm-networkslicesubnet.yang | 7 +-- 8 files changed, 90 insertions(+), 69 deletions(-) diff --git a/yang-models/_3gpp-5gc-nrm-FiveQiDscpMappingSet.yang b/yang-models/_3gpp-5gc-nrm-FiveQiDscpMappingSet.yang index 82d33842e..0a1adaef4 100755 --- a/yang-models/_3gpp-5gc-nrm-FiveQiDscpMappingSet.yang +++ b/yang-models/_3gpp-5gc-nrm-FiveQiDscpMappingSet.yang @@ -40,6 +40,7 @@ module _3gpp-5gc-nrm-FiveQiDscpMappingSet { grouping FiveQiDscpMappingSetGrp { description "Represents the FiveQiDscpMappingSet IOC."; list fiveQiDscpMappingList { + description "It provides the list of mapping between 5QIs and DSCP."; key "dscp"; uses FiveQiDscpMapping; } diff --git a/yang-models/_3gpp-5gc-nrm-nfservice.yang b/yang-models/_3gpp-5gc-nrm-nfservice.yang index d3d3a71cd..2577809c6 100755 --- a/yang-models/_3gpp-5gc-nrm-nfservice.yang +++ b/yang-models/_3gpp-5gc-nrm-nfservice.yang @@ -127,31 +127,34 @@ module _3gpp-5gc-nrm-nfservice { } leaf-list allowedNfDomains { - description "Pattern representing the NF domain names allowed to access the service instance."; + description "Pattern representing the NF domain names allowed to + access the service instance."; //optional support min-elements 1; type string; } list allowedNSSAI { - description "S-NSSAI of the allowed slices to access the service instance. - The absence of this attribute indicates that any slice is allowed to - access the service instance."; + description "S-NSSAI of the allowed slices to access the service + instance. The absence of this attribute indicates that any slice + is allowed to access the service instance."; min-elements 1; //optional support key "sd sst"; uses types5g3gpp:SNssai; } leaf-list allowedOperationsPerNfType { - description "It indicates the allowed operations on resources for each type - of NF; the key of the map is the NF Type, and the value is an array of scopes"; + description "It indicates the allowed operations on resources for + each type of NF; the key of the map is the NF Type, and the value + is an array of scopes"; //optional support type string; min-elements 1; } leaf-list allowedOperationsPerNfInstance { - description "It indicates the allowed operations on resources for a given NF - Instance; the key of the map is the NF Instance Id, and the value is an array of scopes"; + description "It indicates the allowed operations on resources for + a given NF Instance; the key of the map is the NF Instance Id, and + the value is an array of scopes"; //optional support type string; min-elements 1; @@ -159,26 +162,28 @@ module _3gpp-5gc-nrm-nfservice { leaf allowedOperationsPerNfInstanceOverrides { type boolean; default false; - description "When it is present and set to true, indicates that the scopes defined in - attribute allowedOperationsPerNfInstance for a given NF Instance ID take precedence over - the scopes defined in attribute allowedOperationsPerNfType for the corresponding NF type - of the NF Instance associated to such NF Instance ID.."; + description "When it is present and set to true, indicates that + the scopes defined in attribute allowedOperationsPerNfInstance + for a given NF Instance ID take precedence over the scopes defined + in attribute allowedOperationsPerNfType for the corresponding + NF type of the NF Instance associated to such NF Instance ID.."; } leaf-list oauth2Required { type boolean; max-elements 1; - description "It indicates whether the NF Service Instance requires Oauth2-based authorization"; + description "It indicates whether the NF Service Instance requires + Oauth2-based authorization"; } leaf-list sharedServiceDataId { type string; max-elements 1; - description "String uniquely identifying SharedServiceData. The format of the - sharedServiceDataId shall be a Universally Unique Identifier (UUID) version 4, - as described in IETF RFC 4122 [44]. The hexadecimal letters should be formatted - as lower-case characters by the sender, and they shall be handled as case-insensitive - by the receiver."; + description "String uniquely identifying SharedServiceData. The format + of the sharedServiceDataId shall be a Universally Unique Identifier + (UUID) version 4, as described in IETF RFC 4122 [44]. The hexadecimal + letters should be formatted as lower-case characters by the sender, + and they shall be handled as case-insensitive by the receiver."; } leaf priority { @@ -342,12 +347,13 @@ module _3gpp-5gc-nrm-nfservice { type string; } leaf mNC { - description "This is the Mobile Network Code (MNC) of the PLMN identifier. - See TS 23.003 [13] subclause 2.2 and 12.1."; + description "This is the Mobile Network Code (MNC) of the PLMN + identifier. See TS 23.003 [13] subclause 2.2 and 12.1."; type string; } leaf nId { - description "Network Identity; Shall be present if PlmnIdNid identifies an SNPN"; + description "Network Identity; Shall be present if PlmnIdNid + identifies an SNPN"; type string; } } diff --git a/yang-models/_3gpp-common-yang-types.yang b/yang-models/_3gpp-common-yang-types.yang index 0195a23c3..de9ff55c9 100755 --- a/yang-models/_3gpp-common-yang-types.yang +++ b/yang-models/_3gpp-common-yang-types.yang @@ -731,9 +731,9 @@ module _3gpp-common-yang-types { grouping GeoAreaGrp { description "This data type defines a geographical area. The geo-area is defined using a convex polygon in the attribute - 'convexGeoPolygon'."; + 'geoPolygon'."; - list convexGeoPolygon { + list geoPolygon { description "Specifies the geographical area with a convex polygon. The convex polygon is specified by its corners."; key "latitude longitude"; @@ -871,7 +871,8 @@ module _3gpp-common-yang-types { leaf interPlmnCallbackUri { description "It indicates the callback URI to be used by NF Service - Producers located in PLMNs that are different from the PLMN of the NF consumer."; + Producers located in PLMNs that are different from the PLMN of + the NF consumer."; type inet:uri; } leaf n1MessageClass { @@ -889,44 +890,50 @@ module _3gpp-common-yang-types { type N2InformationClass; } leaf binding { - description "This attribute shall contain the value of the Binding Indication - for the default subscription notification "; - reference " i.e. the value part of 3gpp-Sbi-Binding header, as specified in + description "This attribute shall contain the value of the Binding + Indication for the default subscription notification "; + reference " i.e. the value part of 3gpp-Sbi-Binding header, as + specified in clause 6.12.4 of 3GPP TS 29.500 76. "; //optional type string; config false; } leaf acceptedEncoding { - description "It indicates the content encodings that are accepted by a NF Service - Consumer when receiving a notification related to a default notification subscription"; + description "It indicates the content encodings that are accepted by a + NF Service Consumer when receiving a notification related to a default + notification subscription"; reference "IETF RFC 9110 clause 12.5.3 "; //optional type string; config false; } leaf supportedFeatures { - description "It is a string, which indicates the features of the service corresponding - to the subscribed default notification, which are supported by the NF (Service) instance - acting as NF service consumer. The string shall contain a bitmask indicating supported - features in hexadecimal representation:Each character in the string shall take a value + description "It is a string, which indicates the features of the service + corresponding to the subscribed default notification, which are supported + by the NF (Service) instance acting as NF service consumer. The string + shall contain a bitmask indicating supported features in hexadecimal + representation:Each character in the string shall take a value of 0 to 9, a to f or A to F "; - reference "shall represent the support of 4 features as described in table 5.2.2-3 of TS 29.571 [61]."; + reference "shall represent the support of 4 features as described in + table 5.2.2-3 of TS 29.571 [61]."; //optional type string; config false; } leaf serviceInfoList { - description "It indicates a list of service specific information. It may be present - when the notification request of the notification type may be generated by multiple - services, i.e. notifications from different services may be received by the subscription."; + description "It indicates a list of service specific information. It may + be present when the notification request of the notification type may be + generated by multiple services, i.e. notifications from different + services may be received by the subscription."; //optional type string; config false; } leaf callbackUriPrefix { - description "It indicates the optional path segment(s) used to construct the prefix of the - Callback URIs during the reselection of an NF service consumer, as described in 3GPP TS 29.501"; + description "It indicates the optional path segment(s) used to construct + the prefix of the Callback URIs during the reselection of an NF service + consumer, as described in 3GPP TS 29.501"; //optional type inet:uri; } @@ -1104,9 +1111,9 @@ module _3gpp-common-yang-types { In addition, the MnS producer shall create on behalf of the MnS consumer a subscription, using 'NtfSubscriptionControl', for the notification types 'notifyMOICreation' and 'notifyMOIDeletion' related - to the 'File' instances that will be produced later. In case an existing - subscription does already include the 'File' instances to be produced, - no new subscription shall be created. The + to the 'File' instances that will be produced later. In case an + existing subscription does already include the 'File' instances to be + produced, no new subscription shall be created. The 'notificationRecipientAddress' attribute in the created 'NtfSubscriptionControl' instance shall be set to the value of the 'notificationRecipientAddress' in the related 'PerfMetricJob'. This @@ -1148,8 +1155,8 @@ module _3gpp-common-yang-types { leaf fileLocation { type string ; description "Applicable and must be present when the file-based - reporting method is supported, and the files are stored on the MnS - consumer."; + reporting method is supported, and the files are stored on the + MnS consumer."; } } case notification-target { diff --git a/yang-models/_3gpp-nr-nrm-eutranfreqrelation.yang b/yang-models/_3gpp-nr-nrm-eutranfreqrelation.yang index b5479dfd0..50ed647f5 100755 --- a/yang-models/_3gpp-nr-nrm-eutranfreqrelation.yang +++ b/yang-models/_3gpp-nr-nrm-eutranfreqrelation.yang @@ -11,18 +11,20 @@ module _3gpp-nr-nrm-eutranfreqrelation { import _3gpp-nr-nrm-nrcellcu { prefix nrcellcu3gpp; } organization "3GPP SA5"; + contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464"; description "Defines the YANG mapping of the EUtranFreqRelation Information Object Class (IOC) that is part of the NR Network Resource Model (NRM). Copyright 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved."; reference "3GPP TS 28.541 5G Network Resource Model (NRM)"; - revision 2025-01-25 { reference CR-; } + revision 2025-01-25 { reference CR-1442; } revision 2024-02-24 { reference CR-1218; } revision 2023-09-18 { reference CR-1043; } revision 2019-10-28 { reference S5-193518 ; } - revision 2019-06-17 { + revision 2019-06-17 {reference CR-; } description "Initial revision"; + } grouping EUtranFreqRelationGrp { @@ -42,16 +44,16 @@ module _3gpp-nr-nrm-eutranfreqrelation { leaf-list blockListEntry { description "A list of Physical Cell Identities (PCIs) that are - blocklisted in E-UTRAN measurements."; + blocklisted in E-UTRAN measurements."; reference "3GPP TS 38.331"; - min-elements 0; + //optional type uint16 { range "0..503"; } } leaf-list blockListEntryIdleMode { description "A list of Physical Cell Identities (PCIs) that are blocklisted in SIB4 and SIB5."; - min-elements 0; + //optional type uint16 { range "0..1007"; } } @@ -153,7 +155,6 @@ module _3gpp-nr-nrm-eutranfreqrelation { serving frequency. Each frequency of NR and E-UTRAN might have a specific threshold."; reference "ThreshX, LowQ in 3GPP TS 38.304"; - mandatory false; type int32 { range "0..31"; } units dB; } @@ -196,7 +197,10 @@ module _3gpp-nr-nrm-eutranfreqrelation { } } - augment /me3gpp:ManagedElement/gnbcucp3gpp:GNBCUCPFunction/nrcellcu3gpp:NRCellCU { + augment + /me3gpp:ManagedElement + /gnbcucp3gpp:GNBCUCPFunction + /nrcellcu3gpp:NRCellCU { list EUtranFreqRelation { description "Represents a frequency relation between an NR cell and an diff --git a/yang-models/_3gpp-nr-nrm-gnbcucpfunction.yang b/yang-models/_3gpp-nr-nrm-gnbcucpfunction.yang index 9b0452ac3..b7c05dddd 100755 --- a/yang-models/_3gpp-nr-nrm-gnbcucpfunction.yang +++ b/yang-models/_3gpp-nr-nrm-gnbcucpfunction.yang @@ -350,7 +350,8 @@ module _3gpp-nr-nrm-gnbcucpfunction { leaf gnbIdLength { type int32 {range "22..32";} mandatory true; - description "This indicates the number of bits for encoding the gNB ID. See 'Global gNB ID' in subclause 9.3.1.6 of TS 38.413"; + description "This indicates the number of bits for encoding the gNB ID. + See 'Global gNB ID' in subclause 9.3.1.6 of TS 38.413"; } leaf gnbId { @@ -367,8 +368,8 @@ module _3gpp-nr-nrm-gnbcucpfunction { uses types3gpp:PLMNId; leaf enbId { - description "It identifies an eNB within a PLMN. The eNB ID is part of the E-UTRAN Cell Global Identifier (ECGI) of the eNB - cells."; + description "It identifies an eNB within a PLMN. The eNB ID is part of + the E-UTRAN Cell Global Identifier (ECGI) of the eNB cells."; reference "eNB ID in 3GPP TS 36.300. Global eNB ID in 3GPP TS 36.413."; mandatory true; type int32 {range "0..4194303";} diff --git a/yang-models/_3gpp-nr-nrm-nrfreqrelation.yang b/yang-models/_3gpp-nr-nrm-nrfreqrelation.yang index 46b942353..d4b04ea70 100755 --- a/yang-models/_3gpp-nr-nrm-nrfreqrelation.yang +++ b/yang-models/_3gpp-nr-nrm-nrfreqrelation.yang @@ -10,19 +10,20 @@ module _3gpp-nr-nrm-nrfreqrelation { import _3gpp-nr-nrm-nrcellcu { prefix nrcellcu3gpp; } organization "3GPP SA5"; + contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464"; description "Defines the YANG mapping of the NRFreqRelation Information Object Class (IOC) that is part of the NR Network Resource Model (NRM). Copyright 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved."; reference "3GPP TS 28.541 5G Network Resource Model (NRM)"; - revision 2025-01-25 { reference CR-; } + revision 2025-01-25 { reference CR-1442; } revision 2024-02-24 { reference CR-1218; } revision 2023-09-18 { reference CR-1043; } revision 2023-04-26 { reference CR-0916; } revision 2020-04-23 { reference CR-0281; } revision 2019-10-28 { reference S5-193518; } - revision 2019-06-17 { + revision 2019-06-17 { reference S5-} description "Initial revision"; } @@ -81,14 +82,12 @@ module _3gpp-nr-nrm-nrfreqrelation { description "A list of Physical Cell Identities (PCIs) that are blocklisted in NR measurements."; reference "3GPP TS 38.331"; - min-elements 0; type uint16 { range "0..503"; } } leaf-list blockListEntryIdleMode { description "A list of Physical Cell Identities (PCIs) that are blocklisted in SIB4 and SIB5."; - min-elements 0; type uint16 { range "0..1007"; } } @@ -117,7 +116,6 @@ module _3gpp-nr-nrm-nrfreqrelation { description "Used for calculation of the parameter Pcompensation (defined in 3GPP TS 38.304), at cell reselection to a cell."; reference "PEMAX in 3GPP TS 38.101-1"; - mandatory false; type int32 { range "-30..33"; } units dBm; } @@ -125,7 +123,6 @@ module _3gpp-nr-nrm-nrfreqrelation { leaf qOffsetFreq { description "The frequency specific offset applied when evaluating candidates for cell reselection."; - mandatory false; type types3gpp:QOffsetRange; default 0; } @@ -204,7 +201,7 @@ module _3gpp-nr-nrm-nrfreqrelation { units s; } - leaf tReselectionNRSfHigh { + leaf tReselectionNRSfHigh { description "The attribute tReselectionNr (parameter TreselectionNR in 3GPP TS 38.304) is multiplied with this scaling factor if the UE is in high mobility state."; @@ -226,14 +223,17 @@ module _3gpp-nr-nrm-nrfreqrelation { units %; } - leaf nRFrequencyRef { + leaf nRFrequencyRef { description "Reference to a corresponding NRFrequency instance."; mandatory true; type types3gpp:DistinguishedName; } } - augment /me3gpp:ManagedElement/gnbcucp3gpp:GNBCUCPFunction/nrcellcu3gpp:NRCellCU { + augment + /me3gpp:ManagedElement + /gnbcucp3gpp:GNBCUCPFunction + /nrcellcu3gpp:NRCellCU { list NRFreqRelation { description "Together with the target NRFrequency, it represents the diff --git a/yang-models/_3gpp-nr-nrm-nrfrequency.yang b/yang-models/_3gpp-nr-nrm-nrfrequency.yang index 1ae6f94fc..d3acc7a0f 100755 --- a/yang-models/_3gpp-nr-nrm-nrfrequency.yang +++ b/yang-models/_3gpp-nr-nrm-nrfrequency.yang @@ -1,6 +1,6 @@ module _3gpp-nr-nrm-nrfrequency { yang-version 1.1; - namespace "urn:3gpp:sa5:_3gpp-nr-nrm-nrnetwork-nrfrequency"; + namespace "urn:3gpp:sa5:_3gpp-nr-nrm-nrfrequency"; prefix "nrfreq3gpp"; import _3gpp-common-managed-function { prefix mf3gpp; } @@ -9,6 +9,7 @@ module _3gpp-nr-nrm-nrfrequency { import _3gpp-common-top { prefix top3gpp; } organization "3GPP SA5"; + contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464"; description "Defines the YANG mapping of the NRFrequency Information Object Class (IOC) that is part of the NR Network Resource Model (NRM). Copyright 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, @@ -18,7 +19,7 @@ module _3gpp-nr-nrm-nrfrequency { revision 2025-01-25 { reference CR-1442 ; } revision 2023-09-18 { reference CR-1043 ; } revision 2019-10-28 { reference S5-193518 ; } - revision 2019-06-17 { + revision 2019-06-17 { reference S5-} description "Initial revision"; } @@ -45,7 +46,7 @@ module _3gpp-nr-nrm-nrfrequency { description "List of additional frequency bands the frequency belongs to. The list is automatically set by the gNB."; config false; - min-elements 0; + min-elements 1; type uint16 { range "1..256"; } } } diff --git a/yang-models/_3gpp-ns-nrm-networkslicesubnet.yang b/yang-models/_3gpp-ns-nrm-networkslicesubnet.yang index 7aba7f7e6..2491ec1c2 100755 --- a/yang-models/_3gpp-ns-nrm-networkslicesubnet.yang +++ b/yang-models/_3gpp-ns-nrm-networkslicesubnet.yang @@ -23,10 +23,10 @@ module _3gpp-ns-nrm-networkslicesubnet { Information model definitions for network slice NRM (chapter 6) "; - revision 2025-01-25 { reference CR-1412 ; } + revision 2025-01-25 { reference CR-1442 ; } revision 2023-09-18 { reference CR-1043 ; } revision 2022-07-26 { reference CR-0770 ; } - revision 2021-05-05 { + revision 2021-05-05 { reference CR- } description "replace perfReq with 3 new datatypes xxxSliceSubnetProfile"; reference "CR-0485"; } @@ -56,7 +56,8 @@ module _3gpp-ns-nrm-networkslicesubnet { type string; } leaf connectionPointIdType { - description "This parameter specifies the type of the connection point identifier"; + description "This parameter specifies the type of the connection point + identifier"; type enumeration { enum VLAN; enum MPLS; -- GitLab From 66312d6cd3ec6d882e4c5944eee8b3fddbbd6c90 Mon Sep 17 00:00:00 2001 From: rosabolzek Date: Tue, 4 Feb 2025 09:50:55 +0100 Subject: [PATCH 279/587] Updated YANG models for compliance and corrections --- yang-models/_3gpp-nr-nrm-eutranfreqrelation.yang | 11 ++++------- yang-models/_3gpp-nr-nrm-nrfreqrelation.yang | 8 +++----- yang-models/_3gpp-nr-nrm-nrfrequency.yang | 3 ++- yang-models/_3gpp-ns-nrm-networkslicesubnet.yang | 6 +++--- 4 files changed, 12 insertions(+), 16 deletions(-) diff --git a/yang-models/_3gpp-nr-nrm-eutranfreqrelation.yang b/yang-models/_3gpp-nr-nrm-eutranfreqrelation.yang index 50ed647f5..6318de4ca 100755 --- a/yang-models/_3gpp-nr-nrm-eutranfreqrelation.yang +++ b/yang-models/_3gpp-nr-nrm-eutranfreqrelation.yang @@ -22,9 +22,9 @@ module _3gpp-nr-nrm-eutranfreqrelation { revision 2024-02-24 { reference CR-1218; } revision 2023-09-18 { reference CR-1043; } revision 2019-10-28 { reference S5-193518 ; } - revision 2019-06-17 {reference CR-; } + revision 2019-06-17 { + reference "Initial version"; description "Initial revision"; - } grouping EUtranFreqRelationGrp { @@ -196,11 +196,8 @@ module _3gpp-nr-nrm-eutranfreqrelation { type types3gpp:DistinguishedName; } } - - augment - /me3gpp:ManagedElement - /gnbcucp3gpp:GNBCUCPFunction - /nrcellcu3gpp:NRCellCU { + + augment /me3gpp:ManagedElement/gnbcucp3gpp:GNBCUCPFunction/nrcellcu3gpp:NRCellCU { list EUtranFreqRelation { description "Represents a frequency relation between an NR cell and an diff --git a/yang-models/_3gpp-nr-nrm-nrfreqrelation.yang b/yang-models/_3gpp-nr-nrm-nrfreqrelation.yang index d4b04ea70..8ca1ce760 100755 --- a/yang-models/_3gpp-nr-nrm-nrfreqrelation.yang +++ b/yang-models/_3gpp-nr-nrm-nrfreqrelation.yang @@ -23,7 +23,8 @@ module _3gpp-nr-nrm-nrfreqrelation { revision 2023-04-26 { reference CR-0916; } revision 2020-04-23 { reference CR-0281; } revision 2019-10-28 { reference S5-193518; } - revision 2019-06-17 { reference S5-} + revision 2019-06-17 { + reference "Initial version"; description "Initial revision"; } @@ -230,10 +231,7 @@ module _3gpp-nr-nrm-nrfreqrelation { } } - augment - /me3gpp:ManagedElement - /gnbcucp3gpp:GNBCUCPFunction - /nrcellcu3gpp:NRCellCU { + augment /me3gpp:ManagedElement/gnbcucp3gpp:GNBCUCPFunction/nrcellcu3gpp:NRCellCU { list NRFreqRelation { description "Together with the target NRFrequency, it represents the diff --git a/yang-models/_3gpp-nr-nrm-nrfrequency.yang b/yang-models/_3gpp-nr-nrm-nrfrequency.yang index d3acc7a0f..5564721df 100755 --- a/yang-models/_3gpp-nr-nrm-nrfrequency.yang +++ b/yang-models/_3gpp-nr-nrm-nrfrequency.yang @@ -19,7 +19,8 @@ module _3gpp-nr-nrm-nrfrequency { revision 2025-01-25 { reference CR-1442 ; } revision 2023-09-18 { reference CR-1043 ; } revision 2019-10-28 { reference S5-193518 ; } - revision 2019-06-17 { reference S5-} + revision 2019-06-17 { + reference "Initial version"; description "Initial revision"; } diff --git a/yang-models/_3gpp-ns-nrm-networkslicesubnet.yang b/yang-models/_3gpp-ns-nrm-networkslicesubnet.yang index 2491ec1c2..8b31dd8ed 100755 --- a/yang-models/_3gpp-ns-nrm-networkslicesubnet.yang +++ b/yang-models/_3gpp-ns-nrm-networkslicesubnet.yang @@ -26,10 +26,10 @@ module _3gpp-ns-nrm-networkslicesubnet { revision 2025-01-25 { reference CR-1442 ; } revision 2023-09-18 { reference CR-1043 ; } revision 2022-07-26 { reference CR-0770 ; } - revision 2021-05-05 { reference CR- } - description "replace perfReq with 3 new datatypes xxxSliceSubnetProfile"; + revision 2021-05-05 { reference "CR-0485"; - } + description "replace perfReq with 3 new datatypes xxxSliceSubnetProfile"; + } revision 2020-02-19 { description "Introduction of YANG definitions for network slice NRM"; -- GitLab From d646b607701a45a344f84de1ced61bfa9b353cdf Mon Sep 17 00:00:00 2001 From: rosabolzek Date: Tue, 4 Feb 2025 10:04:30 +0100 Subject: [PATCH 280/587] Updated YANG models for compliance and corrections --- yang-models/_3gpp-nr-nrm-eutranfreqrelation.yang | 3 ++- yang-models/_3gpp-nr-nrm-nrfreqrelation.yang | 9 +++++---- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/yang-models/_3gpp-nr-nrm-eutranfreqrelation.yang b/yang-models/_3gpp-nr-nrm-eutranfreqrelation.yang index 6318de4ca..32e67873d 100755 --- a/yang-models/_3gpp-nr-nrm-eutranfreqrelation.yang +++ b/yang-models/_3gpp-nr-nrm-eutranfreqrelation.yang @@ -197,7 +197,8 @@ module _3gpp-nr-nrm-eutranfreqrelation { } } - augment /me3gpp:ManagedElement/gnbcucp3gpp:GNBCUCPFunction/nrcellcu3gpp:NRCellCU { + augment "/me3gpp:ManagedElement" + + "/gnbcucp3gpp:GNBCUCPFunction/nrcellcu3gpp:NRCellCU" { list EUtranFreqRelation { description "Represents a frequency relation between an NR cell and an diff --git a/yang-models/_3gpp-nr-nrm-nrfreqrelation.yang b/yang-models/_3gpp-nr-nrm-nrfreqrelation.yang index 8ca1ce760..f3f80a3d9 100755 --- a/yang-models/_3gpp-nr-nrm-nrfreqrelation.yang +++ b/yang-models/_3gpp-nr-nrm-nrfreqrelation.yang @@ -194,15 +194,15 @@ module _3gpp-nr-nrm-nrfreqrelation { units dB; } - leaf tReselectionNR { + leaf tReselectionNR { description "Cell reselection timer for NR."; reference "TreselectionRAT for NR in 3GPP TS 38.331"; mandatory true; type int32 { range "0..7"; } - units s; + units s; } - leaf tReselectionNRSfHigh { + leaf tReselectionNRSfHigh { description "The attribute tReselectionNr (parameter TreselectionNR in 3GPP TS 38.304) is multiplied with this scaling factor if the UE is in high mobility state."; @@ -231,7 +231,8 @@ module _3gpp-nr-nrm-nrfreqrelation { } } - augment /me3gpp:ManagedElement/gnbcucp3gpp:GNBCUCPFunction/nrcellcu3gpp:NRCellCU { + augment "/me3gpp:ManagedElement" + + "/gnbcucp3gpp:GNBCUCPFunction/nrcellcu3gpp:NRCellCU" { list NRFreqRelation { description "Together with the target NRFrequency, it represents the -- GitLab From 23db97320ce18e6a668b6295f0e99993908b1a60 Mon Sep 17 00:00:00 2001 From: "U-ERICSSON\\ETHBLL" Date: Wed, 5 Feb 2025 15:15:44 +0100 Subject: [PATCH 281/587] yang extensions updated --- yang-models/_3gpp-common-yang-extensions.yang | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/yang-models/_3gpp-common-yang-extensions.yang b/yang-models/_3gpp-common-yang-extensions.yang index dc9c8e5b5..05ab00ea5 100755 --- a/yang-models/_3gpp-common-yang-extensions.yang +++ b/yang-models/_3gpp-common-yang-extensions.yang @@ -46,6 +46,7 @@ module _3gpp-common-yang-extensions { Solution Set (SS) definitions 3GPP TS 28.623"; + revision 2024-12-13 { reference "CR-0492" ; } revision 2024-04-05 { reference "CR-0332, 0333" ; } revision 2023-09-17 { reference "CR-0270, 0271" ; } revision 2022-10-31 { reference "CR-0195, 0196"; } @@ -65,7 +66,9 @@ module _3gpp-common-yang-extensions { Zero or one only-system-created statement per parent statement is allowed. No sub-statements are allowed. - Adding this statement is an NBC change, removing it is BC."; + Adding this statement is an NBC change, + removing it is BC, however if the system behavior is also changed in + parallel (the system stops creating the MOIs), this behavior is NBC."; } extension notNotifyable { @@ -73,14 +76,16 @@ module _3gpp-common-yang-extensions { "Indicates that data change notifications shall not be sent for this attribute. If the extension is not present and other conditions are fulfilled data change notification should be sent. + If a list or container already has the notNotifyable extension, that is also valid for all contained data nodes. The statement MUST only be a substatement of a leaf, leaf-list, list, container statement that is contained within the 'attributes' container of an IOC and that represents an attribute or sub-parts of - an attribute . - + an attribute. If the attribute is represented by a container or list, + the statement shall be put on these, not on data nodes inside the + list/container. Zero or one notNotifyable statement is allowed per parent statement. NO substatements are allowed. @@ -103,8 +108,12 @@ module _3gpp-common-yang-extensions { It is unnecessary to use and MUST NOT be used for key leafs. - The statement MUST only be a substatement of a leaf, leaf-list, list - statement that is config=true. + The statement MUST only be a substatement of a leaf, leaf-list, list, + container statement that is contained within the 'attributes' + container of an IOC and that represents an attribute or sub-parts of + an attribute and is config=true. If the attribute is represented by a + container or list, the statement shall be put on these, not on data + nodes inside the list/container. Zero or one inVariant statement is allowed per parent statement. NO substatements are allowed. -- GitLab From 2302b1fd4957d30207f79f1ac6d1d0366f15c634 Mon Sep 17 00:00:00 2001 From: "U-ERICSSON\\ETHBLL" Date: Wed, 5 Feb 2025 15:25:00 +0100 Subject: [PATCH 282/587] yang extension 2 --- yang-models/_3gpp-common-yang-extensions.yang | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/yang-models/_3gpp-common-yang-extensions.yang b/yang-models/_3gpp-common-yang-extensions.yang index 05ab00ea5..9fc38940c 100755 --- a/yang-models/_3gpp-common-yang-extensions.yang +++ b/yang-models/_3gpp-common-yang-extensions.yang @@ -38,7 +38,7 @@ module _3gpp-common-yang-extensions { If support for an extension is missing the extension statement needs individual handling or it SHOULD be removed from the module using the extension e.g. with a deviation. - Copyright 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + Copyright 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved."; reference "3GPP TS 28.623 Generic Network Resource Model (NRM) @@ -46,7 +46,7 @@ module _3gpp-common-yang-extensions { Solution Set (SS) definitions 3GPP TS 28.623"; - revision 2024-12-13 { reference "CR-0492" ; } + revision 2025-02-07 { reference "CR-0492" ; } revision 2024-04-05 { reference "CR-0332, 0333" ; } revision 2023-09-17 { reference "CR-0270, 0271" ; } revision 2022-10-31 { reference "CR-0195, 0196"; } -- GitLab From 7e5f91c40b2587153ce7d136981f188cd49fb8b6 Mon Sep 17 00:00:00 2001 From: "U-ERICSSON\\ETHBLL" Date: Thu, 6 Feb 2025 01:12:17 +0100 Subject: [PATCH 283/587] yang extension 3 common with r18 --- yang-models/_3gpp-common-yang-extensions.yang | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/yang-models/_3gpp-common-yang-extensions.yang b/yang-models/_3gpp-common-yang-extensions.yang index 9fc38940c..0b1c1ee27 100755 --- a/yang-models/_3gpp-common-yang-extensions.yang +++ b/yang-models/_3gpp-common-yang-extensions.yang @@ -46,7 +46,7 @@ module _3gpp-common-yang-extensions { Solution Set (SS) definitions 3GPP TS 28.623"; - revision 2025-02-07 { reference "CR-0492" ; } + revision 2025-01-12 { reference "CR-0507, 0492" ; } revision 2024-04-05 { reference "CR-0332, 0333" ; } revision 2023-09-17 { reference "CR-0270, 0271" ; } revision 2022-10-31 { reference "CR-0195, 0196"; } -- GitLab From 18a88fe00bf5a71a50646cff1919275783f35328 Mon Sep 17 00:00:00 2001 From: "U-ERICSSON\\ETHBLL" Date: Thu, 6 Feb 2025 15:23:43 +0100 Subject: [PATCH 284/587] thresholdinfo in fm corrected --- yang-models/_3gpp-common-fm.yang | 44 ++------------------------------ 1 file changed, 2 insertions(+), 42 deletions(-) diff --git a/yang-models/_3gpp-common-fm.yang b/yang-models/_3gpp-common-fm.yang index 223ea0033..62ee4555e 100755 --- a/yang-models/_3gpp-common-fm.yang +++ b/yang-models/_3gpp-common-fm.yang @@ -7,6 +7,7 @@ module _3gpp-common-fm { import _3gpp-common-top { prefix top3gpp; } import _3gpp-common-yang-types { prefix types3gpp; } import _3gpp-common-yang-extensions { prefix yext3gpp; } + import _3gpp-common-measurements { prefix meas3gpp; } organization "3GPP SA5"; contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464"; @@ -255,52 +256,11 @@ module _3gpp-common-fm { yext3gpp:notNotifyable; } - grouping ThresholdInfoGrp { - leaf measurementType { - type string; - mandatory true; - } - - leaf direction { - type enumeration { - enum INCREASING; - enum DECREASING; - } - mandatory true; - description " - If it is 'Increasing', the threshold crossing notification is - triggered when the measurement value equals or exceeds a - thresholdValue. - - If it is 'Decreasing', the threshold crossing notification is - triggered when the measurement value equals or below a - thresholdValue."; - } - - leaf thresholdLevel { - type string; - } - - leaf thresholdValue { - type string; - } - - leaf hysteresis { - type string; - description "The hysteresis has a threshold high and a threshold - low value that are different from the threshold value. - A hysteresis, therefore, defines the threshold-high and - threshold-low levels within which the measurementType value is - allowed to oscillate without triggering the threshold crossing - notification."; - } - } - list thresholdInfo { config false ; yext3gpp:notNotifyable; description "Indicates the crossed threshold"; - uses ThresholdInfoGrp; + uses meas3gpp:ThresholdInfoGrp; } list stateChangeDefinition { -- GitLab From 3be825c34f2eefbafc4fe33b1d5e4a7b70f21e29 Mon Sep 17 00:00:00 2001 From: rosabolzek Date: Thu, 6 Feb 2025 16:17:33 +0100 Subject: [PATCH 285/587] Corrrect NpnId defintions for _3gpp-common-trace.yang _3gpp-common-yang-types.yang_3gpp-nr-nrm-nrcelldu.yang --- yang-models/_3gpp-common-trace.yang | 32 +++--------------- yang-models/_3gpp-common-yang-types.yang | 42 ++++++++++-------------- yang-models/_3gpp-nr-nrm-nrcelldu.yang | 3 +- 3 files changed, 24 insertions(+), 53 deletions(-) diff --git a/yang-models/_3gpp-common-trace.yang b/yang-models/_3gpp-common-trace.yang index 3c0f3401b..8894d92f3 100755 --- a/yang-models/_3gpp-common-trace.yang +++ b/yang-models/_3gpp-common-trace.yang @@ -26,6 +26,7 @@ module _3gpp-common-trace { Integration Reference Point (IRP); Information Service (IS)" ; + revision 2024-11-25 { reference CR-0942; } revision 2024-11-07 { reference "CR-0480"; } revision 2024-10-01 { reference "CR-0457"; } revision 2024-08-13 { reference "CR-0387 CR-0377"; } @@ -158,36 +159,11 @@ module _3gpp-common-trace { identified by Network ID with associated plmn-Identity"; key idx; min-elements 1; - uses NpnIdGrp; + uses types3gpp:NpnIdGrp; leaf idx { type string; } } } - grouping NpnIdGrp { - description "Represents the NpnId dataType."; - - list plmnId { - key "mcc mnc"; - description "It specifies the PLMN Id of the NPN network."; - uses types3gpp:PLMNId; - max-elements 1; - } - - list cAGIdList { - key idx; - max-elements 256; - description "It specifies the PNI-NPN identified by CAG ID "; - leaf idx { type string; } - } - - list nIDList { - key idx; - max-elements 16; - description "It specifies the SNPN identified by Network ID"; - leaf idx { type string; } - } - } - grouping ExcessPacketDelayThresholdsGrp { description "Represents the ExcessPacketDelayThresholds dataType. This <> defines a excess packet delay threshold information @@ -1430,7 +1406,7 @@ module _3gpp-common-trace { corresponding PNI-NPN or SNPN."; key idx; max-elements 1; - uses NpnIdGrp; + uses types3gpp:NpnIdGrp; leaf idx { type string;} } } @@ -1798,7 +1774,7 @@ module _3gpp-common-trace { several NPNs are supported in the RAN."; key idx; max-elements 1; - uses NpnIdGrp; + uses types3gpp:NpnIdGrp; leaf idx { type string;} } } diff --git a/yang-models/_3gpp-common-yang-types.yang b/yang-models/_3gpp-common-yang-types.yang index de9ff55c9..f316abd34 100755 --- a/yang-models/_3gpp-common-yang-types.yang +++ b/yang-models/_3gpp-common-yang-types.yang @@ -16,6 +16,7 @@ module _3gpp-common-yang-types { TTA, TTC). All rights reserved."; reference "3GPP TS 28.623"; + revision 2024-11-25 { reference CR-0942; } revision 2024-11-25 { reference CR-1442; } revision 2024-11-25 { reference CR-1412; } revision 2024-11-01 { reference CR-0463; } @@ -301,42 +302,35 @@ module _3gpp-common-yang-types { yext3gpp:notNotifyable; } } - grouping NPNIdGrp { + grouping NpnIdGrp { description "Represents the NPN supported by the <> using this <> as one of its attributes in case of the cell is a NPN-only cell."; - list plmnid { + list plmnId { key "mcc mnc"; min-elements 1; - description "PLMNId"; + description "It specifies the PLMN Id of the NPN network."; uses types3gpp:PLMNId; } - leaf cAGIdList { - type string; - mandatory true; + list cAGIdList { + key idx; + max-elements 256; description "It identifies a CAG list containing up to 12 CAG-identifiers - per PLMN Identity, see TS 38.331. - - CAG is used for the PNI-NPNs to prevent UE(s), which are not allowed - to access the NPN via the associated cell(s), from automatically - selecting and accessing the associated CAG cell(s). - - CAG ID is used to combine with PLMN ID to identify a PNI-NPN. - - Exist if the cell is a NPN-only cell see TS 38.331"; + per Ue or up to 12 CAG-identifiers per cell, see TS 38.331 [38]. + CAG ID is used to combine with PLMN ID to identify a PNI-NPN.CAG ID is + a hexadecimal range with size 32 bit"; + leaf idx { type string; } } - leaf nIDList { - type string; - mandatory true; - description "It identifies a list of NIDs containing up to 12 NIDs per - PLMN Identity, see TS 38.331. - - NID is used to combine with PLMN ID to identify an SNPN. - - Exist if the cell is a NPN-only cell see TS 38.331"; + list nIDList { + key idx; + max-elements 16; + description "It identifies a list of NIDs containing up to 16 NIDs, see + TS 38.331 [38].NID is used to combine with PLMN ID to identify an SNPN. + NID is a hexadecimal range with size 44 bit."; + leaf idx { type string; } } } diff --git a/yang-models/_3gpp-nr-nrm-nrcelldu.yang b/yang-models/_3gpp-nr-nrm-nrcelldu.yang index 94420e4df..8db5164c4 100755 --- a/yang-models/_3gpp-nr-nrm-nrcelldu.yang +++ b/yang-models/_3gpp-nr-nrm-nrcelldu.yang @@ -19,6 +19,7 @@ module _3gpp-nr-nrm-nrcelldu { TTA, TTC). All rights reserved."; reference "3GPP TS 28.541 5G Network Resource Model (NRM)"; + revision 2024-11-25 { reference CR-0942; } revision 2024-05-25 { reference CR-1412 ; } revision 2024-05-24 { reference CR-1273 ; } revision 2023-09-18 { reference CR-1043 ; } @@ -105,7 +106,7 @@ module _3gpp-nr-nrm-nrcelldu { corresponding PNI-NPN or SNPN in case of the cell is NPN-only cell."; reference "3GPP TS 38.331"; leaf idx { type uint32 ; } - uses types3gpp:NPNIdGrp; + uses types3gpp:NpnIdGrp; } leaf nRPCI { -- GitLab From 753c03a94654ceee2eb3fc02e1c6c29999373469 Mon Sep 17 00:00:00 2001 From: rosabolzek Date: Thu, 6 Feb 2025 16:23:13 +0100 Subject: [PATCH 286/587] Corrrect min-elements 0 --- yang-models/_3gpp-common-trace.yang | 1 - 1 file changed, 1 deletion(-) diff --git a/yang-models/_3gpp-common-trace.yang b/yang-models/_3gpp-common-trace.yang index 8894d92f3..d4ce40c13 100755 --- a/yang-models/_3gpp-common-trace.yang +++ b/yang-models/_3gpp-common-trace.yang @@ -1440,7 +1440,6 @@ module _3gpp-common-trace { key "idx"; leaf idx { type uint32 ; } description "It specifies the area where data shall be collected. "; - min-elements 0; max-elements 1; uses AreaScopeGrp; } -- GitLab From 481aa4bf9e914b1712996ecdb833dcb0e46549c9 Mon Sep 17 00:00:00 2001 From: "U-ERICSSON\\ETHBLL" Date: Thu, 6 Feb 2025 18:47:11 +0100 Subject: [PATCH 287/587] added CRno to fm --- yang-models/_3gpp-common-fm.yang | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/yang-models/_3gpp-common-fm.yang b/yang-models/_3gpp-common-fm.yang index 62ee4555e..da5d3eaee 100755 --- a/yang-models/_3gpp-common-fm.yang +++ b/yang-models/_3gpp-common-fm.yang @@ -13,12 +13,14 @@ module _3gpp-common-fm { contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464"; description "Defines a Fault Management model - Copyright 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + Copyright 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved."; reference "3GPP TS 28.111"; + revision 2025-02-07 { reference CR-0022 ; } revision 2024-05-12 { - description "The definition of the module was from TS 28.623 to TS 28.111"; + description "The definition of the module was moved from TS 28.623 to + TS 28.111"; reference CR-0008 ; } revision 2024-03-06 { reference CR-0333 ; } -- GitLab From 90410851f80ff658ad30ded4dcc2ff029c52107d Mon Sep 17 00:00:00 2001 From: "U-ERICSSON\\ETHBLL" Date: Fri, 7 Feb 2025 17:32:12 +0100 Subject: [PATCH 288/587] correcting crno+copyrigt --- yang-models/_3gpp-common-trace.yang | 4 ++-- yang-models/_3gpp-common-yang-types.yang | 2 +- yang-models/_3gpp-nr-nrm-nrcelldu.yang | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/yang-models/_3gpp-common-trace.yang b/yang-models/_3gpp-common-trace.yang index d4ce40c13..9b505b336 100755 --- a/yang-models/_3gpp-common-trace.yang +++ b/yang-models/_3gpp-common-trace.yang @@ -14,7 +14,7 @@ module _3gpp-common-trace { contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464"; description "Trace handling - Copyright 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + Copyright 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved."; reference "3GPP TS 28.623 Generic Network Resource Model (NRM) @@ -26,7 +26,7 @@ module _3gpp-common-trace { Integration Reference Point (IRP); Information Service (IS)" ; - revision 2024-11-25 { reference CR-0942; } + revision 2024-11-25 { reference CR-0492; } revision 2024-11-07 { reference "CR-0480"; } revision 2024-10-01 { reference "CR-0457"; } revision 2024-08-13 { reference "CR-0387 CR-0377"; } diff --git a/yang-models/_3gpp-common-yang-types.yang b/yang-models/_3gpp-common-yang-types.yang index f316abd34..7b2c50ed8 100755 --- a/yang-models/_3gpp-common-yang-types.yang +++ b/yang-models/_3gpp-common-yang-types.yang @@ -16,7 +16,7 @@ module _3gpp-common-yang-types { TTA, TTC). All rights reserved."; reference "3GPP TS 28.623"; - revision 2024-11-25 { reference CR-0942; } + revision 2025-02-07 { reference CR-0492; } revision 2024-11-25 { reference CR-1442; } revision 2024-11-25 { reference CR-1412; } revision 2024-11-01 { reference CR-0463; } diff --git a/yang-models/_3gpp-nr-nrm-nrcelldu.yang b/yang-models/_3gpp-nr-nrm-nrcelldu.yang index 8db5164c4..392b11cd2 100755 --- a/yang-models/_3gpp-nr-nrm-nrcelldu.yang +++ b/yang-models/_3gpp-nr-nrm-nrcelldu.yang @@ -19,7 +19,7 @@ module _3gpp-nr-nrm-nrcelldu { TTA, TTC). All rights reserved."; reference "3GPP TS 28.541 5G Network Resource Model (NRM)"; - revision 2024-11-25 { reference CR-0942; } + revision 2025-02-07 { reference CR-1442; } revision 2024-05-25 { reference CR-1412 ; } revision 2024-05-24 { reference CR-1273 ; } revision 2023-09-18 { reference CR-1043 ; } -- GitLab From 47cacabce2237f6f2bf7170d5b9cfccad11f5dcf Mon Sep 17 00:00:00 2001 From: "U-ERICSSON\\ETHBLL" Date: Mon, 10 Feb 2025 12:18:32 +0100 Subject: [PATCH 289/587] npnidgrp correction --- yang-models/_3gpp-common-yang-types.yang | 38 +++++++++++++----------- 1 file changed, 20 insertions(+), 18 deletions(-) diff --git a/yang-models/_3gpp-common-yang-types.yang b/yang-models/_3gpp-common-yang-types.yang index 7b2c50ed8..cfbcd7890 100755 --- a/yang-models/_3gpp-common-yang-types.yang +++ b/yang-models/_3gpp-common-yang-types.yang @@ -302,7 +302,8 @@ module _3gpp-common-yang-types { yext3gpp:notNotifyable; } } - grouping NpnIdGrp { + + grouping NpnIdGrp { description "Represents the NPN supported by the <> using this <> as one of its attributes in case of the cell is a NPN-only cell."; @@ -314,23 +315,24 @@ module _3gpp-common-yang-types { uses types3gpp:PLMNId; } - list cAGIdList { - key idx; - max-elements 256; - description "It identifies a CAG list containing up to 12 CAG-identifiers - per Ue or up to 12 CAG-identifiers per cell, see TS 38.331 [38]. - CAG ID is used to combine with PLMN ID to identify a PNI-NPN.CAG ID is - a hexadecimal range with size 32 bit"; - leaf idx { type string; } - } - - list nIDList { - key idx; - max-elements 16; - description "It identifies a list of NIDs containing up to 16 NIDs, see - TS 38.331 [38].NID is used to combine with PLMN ID to identify an SNPN. - NID is a hexadecimal range with size 44 bit."; - leaf idx { type string; } + choice npnidChoice { + leaf-list cAGIdList { + type string; + max-elements 256; + description "It identifies a CAG list containing up to 12 + CAG-identifiers per Ue or up to 12 CAG-identifiers per cell, + see TS 38.331. + CAG ID is used to combine with PLMN ID to identify a PNI-NPN.CAG ID is + a hexadecimal range with size 32 bit"; + } + + leaf-list nIDList { + type string; + max-elements 16; + description "It identifies a list of NIDs containing up to 16 NIDs, see + TS 38.331. NID is used to combine with PLMN ID to identify an SNPN. + NID is a hexadecimal range with size 44 bit."; + } } } -- GitLab From 582302affdbe94b79801486ae6e4e09ad43699cd Mon Sep 17 00:00:00 2001 From: "U-ERICSSON\\ETHBLL" Date: Wed, 19 Feb 2025 16:31:03 +0100 Subject: [PATCH 290/587] update GeographicalCoordinates remove altitude GeocoordinateGrp add alititude --- yang-models/_3gpp-common-yang-types.yang | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/yang-models/_3gpp-common-yang-types.yang b/yang-models/_3gpp-common-yang-types.yang index cfbcd7890..1cc7338f2 100755 --- a/yang-models/_3gpp-common-yang-types.yang +++ b/yang-models/_3gpp-common-yang-types.yang @@ -372,7 +372,7 @@ module _3gpp-common-yang-types { grouping GeographicalCoordinates { description "This datatype represents the geographical coordinates"; - reference "#GPP TS 28.558 clause 6.3.8"; + reference "3GPP TS 28.538 clause 6.3.8"; leaf latitude { type Latitude; @@ -382,12 +382,7 @@ module _3gpp-common-yang-types { leaf longitude { type Longitude; mandatory true; - } - - leaf altitude { - type Altitude; - } - + } } typedef OnOff { @@ -722,6 +717,10 @@ module _3gpp-common-yang-types { global reference frame (WGS 84). Positive values correspond to degrees east of 0 degrees longitude."; } + + leaf altitude { + type Altitude; + } } grouping GeoAreaGrp { -- GitLab From b11aa21a64ab8b4301459ee2a4381aba37be49e7 Mon Sep 17 00:00:00 2001 From: "U-ERICSSON\\ETHBLL" Date: Wed, 26 Feb 2025 19:05:31 +0100 Subject: [PATCH 291/587] Locally rebased and merged https://forge.3gpp.org/rep/sa5/MnS/-/merge_requests/1578 --- yang-models/_3gpp-common-trace.yang | 806 ++++++++++++++++------------ 1 file changed, 475 insertions(+), 331 deletions(-) diff --git a/yang-models/_3gpp-common-trace.yang b/yang-models/_3gpp-common-trace.yang index 9b505b336..23152ebf5 100755 --- a/yang-models/_3gpp-common-trace.yang +++ b/yang-models/_3gpp-common-trace.yang @@ -26,6 +26,7 @@ module _3gpp-common-trace { Integration Reference Point (IRP); Information Service (IS)" ; + revision 2025-02-07 { reference "CR-0504"; } revision 2024-11-25 { reference CR-0492; } revision 2024-11-07 { reference "CR-0480"; } revision 2024-10-01 { reference "CR-0457"; } @@ -239,7 +240,7 @@ module _3gpp-common-trace { The attribute traceDepth allows to configure the level of detail of the information which shall be recorded. For trace the reporting is event based, where the triggering event is configured with - attribute triggeringEvent. For each triggering event the first and + attribute triggeringEvents. For each triggering event the first and last message (start/stop triggering event) to record are specified."; list listOfInterfaces { @@ -545,7 +546,7 @@ module _3gpp-common-trace { } } - leaf-list listOfNETypes { + leaf-list listOfNeTypes { type enumeration { enum MSC_SERVER; enum SGSN; @@ -562,12 +563,10 @@ module _3gpp-common-trace { enum GNB_CU_UP; enum GNB_DU; } - description "Specifies in which type of ManagedFunction the trace should + description "Specifies the network element types where the trace should be activated. The attribute is applicable only for Trace with - Signalling Based Trace activation. In case this attribute is not used, - it carries a null semantic"; - reference "Clause 5.4 of 3GPP TS 32.422 for additional details on the - allowed values"; + Signalling Based Trace activation."; + reference "Clause 5.4 of 3GPP TS 32.422. "; } leaf traceDepth { @@ -582,71 +581,177 @@ module _3gpp-common-trace { enum VENDORMAXIMUM; } default MAXIMUM; - description "Specifies how detailed information should be recorded in the - Network Element. The Trace Depth is a paremeter for Trace Session level, - i.e., the Trace Depth is the same for all of the NEs to be traced in - the same Trace Session. - The attribute is applicable only for Trace, otherwise it carries a null - semantic."; - reference "Clause 5.3 of 3GPP TS 32.422"; + description "It specifies the trace depth. The attribute is applicable + only for Trace."; + reference "Clause 5.3 of 3GPP TS 32.422."; } - leaf triggeringEvents { - type enumeration { - enum MO_MT_CALLS; - enum MO_MT_SMS; - enum LU_IMSIattach_IMSIdetach; - enum HANDOVER; - enum SS; - enum PDPcontext; - enum RAU_GPRSattach_GPRSdetach; - enum MBMScontext; - enum CONTEXT; - enum SIPsession_StandaloneTransaction; - enum MBMSactivation; - enum UEinitiatedPDNconnectivityRequest; - enum ServiceRequest; - enum InitialAttach_TAU_Detach; - enum UEinitiatedPDNdisconnection; - enum BearerActivationModificationDeletion; - enum Handover; - enum PDNconnectionCreation; - enum PDNconnectionTermination; - enum Registration; - enum UEderegistration; - enum NetworkDeregistration; - enum UEMobilityFromEPC; - enum UEMobilityToEPC; - enum PDUsessionEstablishment; - enum PDUsessionModification; - enum PDUsessionRelease; - enum PDUsessionUPactivationDeactivation; - enum MobilityBtw3gppAndN3gppTo5GC; - enum MobilityFromEpc; - enum AMpolicy; - enum SMpolicy; - enum Authorization; - enum BDTpolicy; - enum N4Session; - enum UEauthentication; - enum EventExposure; - enum PFDmanagement; - enum ParameterProvision; - enum Trigger; - enum NFmanagement; - enum NFdiscovery; - enum NSSelection; - enum NSSAI; - enum SMservice; - enum UEcontext; - enum SubscriberData; - } + list triggeringEvents { + key idx; description "It specifies the triggering event parameter of the trace - session. The attribute is applicable only for Trace. In case this - attribute is not used, it carries a null semantic. + session. The attribute is applicable only for Trace."; + reference "Clause 5.1 of 3GPP TS 32.422"; + leaf idx { type uint32; } + max-elements 1; - See the clause 5.1 of 3GPP TS 32.422 for additional details on the - allowed values."; + leaf-list MSC_SERVER { + type enumeration { + enum MO_MT_CALLS; + enum MO_MT_SMS; + enum LU_IMSIattach_IMSIdetach; + enum SS; + } + } + + leaf-list SGSN { + type enumeration { + enum PDPcontext; + enum MO_MT_SMS; + enum RAU_GPRSattach_GPRSdetach; + enum MBMScontext; + } + } + + + leaf-list MGW { + type enumeration { + enum CONTEXT; + } + } + + leaf-list GGSN { + type enumeration { + enum PDPcontext; + enum MBMScontext; + } + } + + leaf-list IMS { + type enumeration { + enum SIPsession_StandaloenTransaction; + } + } + + leaf-list BM_SC { + type enumeration { + enum MBMSactivation; + } + } + + leaf-list MME { + type enumeration { + enum UEinitiatedPDNconnectivityRequest; + enum ServiceRequest; + enum InitialAttach_TAU_Detach; + enum UEInitiatedPDNdisconnection; + enum BearerActivationModificationDeletion; + enum Handover; + } + } + + + leaf-list SGW { + type enumeration { + enum PDNconnectionCreation; + enum PDNconnectionTermination; + enum BearerActivationModificationDeletion; + } + } + + leaf-list PGW { + type enumeration { + enum PDNconnectionCreation; + enum PDNconnectionTermination; + enum BearerActivationModificationDeletion; + } + } + + leaf-list AMF { + type enumeration { + enum Registration; + enum ServiceRequest; + enum Handover; + enum UEderegistration; + enum NetworkDeregistration; + enum UEMobilityFromEPC; + enum UEMobilityToEPC; + enum CovergedChargingService; + } + } + + leaf-list SMF { + type enumeration { + enum PDUsessionEstablishment; + enum PDUsessionModification; + enum PDUsessionRelease; + enum PDUsessionUPactivationDeactivation; + enum MobilityBtw3gppAndN3gppTo5GC; + enum MobilityFromEpc; + enum MobilityBtwISMForVSMF; + enum CovergedChargingService; + enum OfflineOnlyCharging; + } + } + + leaf-list PCF { + type enumeration { + enum AMpolicy; + enum SMpolicy; + enum Authorization; + enum BDTpolicy; + enum SpendingLimitControl; + } + } + + leaf-list UPF { + type enumeration { + enum N4Session; + } + } + + leaf-list AUSF { + type enumeration { + enum UEauthentication; + } + } + + leaf-list NEF { + type enumeration { + enum EventExposure; + enum PFDmanagement; + enum ParameterProvisiong; + enum Trigger; + } + } + + leaf-list NRF { + type enumeration { + enum NFmanagement; + enum NFdiscovery; + } + } + + leaf-list NSSF { + type enumeration { + enum NSSelection; + enum NSSAI; + } + } + + leaf-list SMSF { + type enumeration { + enum SMService; + } + } + + leaf-list UDM { + type enumeration { + enum UEcontext; + enum SubscriberData; + enum UEauthentication; + enum EventExposure; + } + } } } @@ -661,14 +766,24 @@ module _3gpp-common-trace { The following attributes are conditional available based on the measurements configured in listOfMeasurements: - -reportInterval: conditional for M1 in LTE or NR and M1/M2 in UMTS, - -reportAmount: conditional for M1 in LTE or NR and M1/M2 in UMTS, - -reportingTrigger: conditional for M1 in LTE or NR and M1/M2 in UMTS, - -eventThreshold: conditional for A2 event reporting or A2 event - triggered periodic reporting, - -collectionPeriodRRMNR: conditional for M4 and M5 in NR, - -collectionPeriodM6NR: conditional for M6 in NR, - -collectionPeriodM7NR: conditional for M7 in NR, + -reportInterval (conditional for M1 in LTE or NR and M1/M2 in UMTS), + -reportAmount (conditional for M1/M2 in UMTS), + -reportAmountM1LTE (conditional for M1 in LTE), + -reportAmountM4LTE (conditional for M4 in LTE), + -reportAmountM5LTE (conditional for M5 in LTE), + -reportAmountM6LTE (conditional for M6 in LTE), + -reportAmountM7LTE (conditional for M7 in LTE), + -reportAmountM1NR (conditional for M1 in NR), + -reportAmountM4NR (conditional for M4 in NR), + -reportAmountM5NR (conditional for M5 in NR), + -reportAmountM6NR (conditional for M6 in NR), + -reportAmountM7NR (conditional for M7 in NR), + -reportingTrigger (conditional for M1 in LTE or NR and M1/M2 in UMTS), + -eventThreshold (conditional for A2 event reporting or A2 event + triggered periodic reporting), + -collectionPeriodRRMNR (conditional for M4 and M5 in NR), + -collectionPeriodM6NR (conditional for M6 in NR), + -collectionPeriodM7NR (conditional for M7 in NR), -collectionPeriodRRMLTE (conditional for M3 in LTE), -measurementPeriodLTE (conditional for M4 and M5 in LTE), -collectionPeriodM6LTE (conditional for M6 in LTE), @@ -710,7 +825,8 @@ module _3gpp-common-trace { - For measurement M2 in LTE or NR, reporting is according to RRM configuration, see TS 38.321, TS 36.321 and TS 38.331, TS 36.331. - For measurement M4 in UMTS, reporting is either according to RRM + + - For measurement M4 in UMTS, reporting is either according to RRM configuration, see TS 25.321 and TS 25.331 or periodic or event triggered periodic using parameter collectionPeriodRRMUMTS and eventThresholdUphUMTS. @@ -724,9 +840,17 @@ module _3gpp-common-trace { is the interval between two measurements (collectionPeriodRRMNR, collectionPeriodM6NR, collectionPeriodM7NR, collectionPeriodRRMLTE, measurementPeriodLte, collectionPeriodM6LTE, collectionPeriodM7LTE, - collectionPeriodRRMUMTS, measurementPeriodUMTS). If no collection - period is configured for M5 in UMTS, all available measurements are - logged according to RRM configuration."; + collectionPeriodRRMUMTS, measurementPeriodUMTS) and the number of + reports (reportAmountM4NR, reportAmountM5NR, reportAmountM6NR, + reportAmountM7NR, reportAmountM4LTE, reportAmountM5LTE, + reportAmountM6LTE,reportAmountM7LTE). If no collection period + is configured for M5 in UMTS, all available measurements are + logged according to RRM configuration. + + - Measurements M8 and M9 in NR or LTE are reported according to + configured M1 and/or M6 related UE measurement reporting. + + "; leaf listOfMeasurements { when '../../../jobType = "IMMEDIATE_MDT_ONLY"'; @@ -746,10 +870,10 @@ module _3gpp-common-trace { enum M8; enum M9; } - description "It specifies the UE measurements that shall be collected in - an Immediate MDT job. The attribute is applicable only for Immediate MDT. - In case this attribute is not used, it carries a null semantic."; - reference "3GPP TS 32.422 clause 5.10.3"; + description "It specifies the UE measurements that shall be + collected in an Immediate MDT job. The attribute is + applicable only for Immediate MDT."; + reference "Clause 5.10.3 of 3GPP TS 32.422."; } leaf reportingTrigger { @@ -767,9 +891,8 @@ module _3gpp-common-trace { should be collected. The attribute is applicable only for Immediate MDT and when the listOfMeasurements is configured for M1 (for both UMTS and LTE) - or M2 (only for UMTS). In case this attribute is not used, it carries - a null semantic."; - reference "Clause 5.10.4 of 3GPP TS 32.422"; + or M2 (only for UMTS)."; + reference "Clause 5.10.4 of 3GPP TS 32.422."; } leaf reportInterval { @@ -785,9 +908,8 @@ module _3gpp-common-trace { description "It specifies the interval between the periodical measurements that shall be taken when the UE is in connected mode. The attribute is applicable only for Immediate MDT and when - reportingTrigger is configured for periodical measurements. In case - this attribute is not used, it carries a null semantic."; - reference "5.10.5 of 3GPP TS 32.422"; + reportingTrigger is configured for periodical measurements."; + reference "5.10.5 of 3GPP TS 32.422."; } leaf reportAmount { @@ -804,8 +926,7 @@ module _3gpp-common-trace { description "It specifies the number of measurement reports that shall be taken for periodic reporting while the UE is in connected. The attribute is applicable only for Immediate MDT and when - reportingTrigger is configured for periodical measurements. In - case this attribute is not used, it carries a null semantic."; + reportingTrigger is configured for periodical measurements."; reference "Clause 5.10.6 of 3GPP TS 32.422"; } @@ -815,8 +936,7 @@ module _3gpp-common-trace { description "Specifies the threshold which should trigger the reporting in case A2 event reporting in LTE or 1F/1l event in UMTS. The attribute is applicable only for Immediate MDT and when reportingTrigger is - configured for A2 event in LTE or 1F event or 1l event in UMTS. In - case this attribute is not used, it carries a null semantic."; + configured for A2 event in LTE or 1F event or 1l event in UMTS."; reference "Clauses 5.10.7 and 5.10.7a of 3GPP TS 32.422"; } @@ -829,8 +949,7 @@ module _3gpp-common-trace { units milliseconds; description "Specifies the collection period for collecting RRM configured measurement samples for M4, M5 in NR. The attribute is - applicable only for Immediate MDT. In case this attribute is not - used, it carries a null semantic."; + applicable only for Immediate MDT."; reference "Clause 5.10.30 of 3GPP TS 32.422"; } @@ -855,8 +974,7 @@ module _3gpp-common-trace { } description "It specifies the collection period for the Packet Delay measurement (M6) for NR MDT taken by the gNB. The attribute is - applicable only for Immediate MDT. In case this attribute is not used, - it carries a null semantic."; + applicable only for Immediate MDT. "; reference "clause 5.10.34 of TS 32.422"; } @@ -868,40 +986,47 @@ module _3gpp-common-trace { } description "It specifies the collection period for the Packet Loss Rate measurement (M7) for NR MDT taken by the gNB. The attribute is - applicable only for Immediate MDT. In case this attribute is not used, - it carries a null semantic."; + applicable only for Immediate MDT."; reference "clause 5.10.35 of TS 32.422"; } leaf collectionPeriodRRMLTE { when '../../../jobType = "IMMEDIATE_MDT_ONLY"' + ' or ../../../jobType = "IMMEDIATE_MDT_AND_TRACE"'; - type uint32 { - range "250|500|1000|2000|3000|4000|6000|8000|12000|16000|20000|" - +"24000|28000|32000|64000"; + type enumeration { + enum 100ms; + enum 1000ms; + enum 1024ms; + enum 1280ms; + enum 2048ms; + enum 2560ms; + enum 5120ms; + enum 10000ms; + enum 10240ms; + enum 1min; } - units milliseconds; description "Specifies the collection period for collecting RRM configured - measurement samples for M2, M3 in LTE. The attribute is applicable only - for Immediate MDT. In case this attribute is not used, it carries a - null semantic."; - reference "Clause 5.10.20 of 3GPP TS 32.422"; + measurement samples for M3 in LTE. The attribute is applicable only + for Immediate MDT."; + reference "Clause 5.10.20 of 3GPP TS 32.422."; } leaf measurementPeriodLTE { when '../../../jobType = "IMMEDIATE_MDT_ONLY"' + ' or ../../../jobType = "IMMEDIATE_MDT_AND_TRACE"'; - type uint32 { - range "1024|1280|2048|2560|5120|" - +"10240|60000"; + type enumeration { + enum 1024ms; + enum 2048ms; + enum 5120ms; + enum 10240ms; + enum 1min; } - units milliseconds; mandatory true; - description "It specifies the measurement period for the Data Volume and - Scheduled IP throughput measurements for MDT taken by the eNB. - The attribute is applicable only for Immediate MDT. In case this - attribute is not used, it carries a null semantic."; - reference "Clause 5.10.23 of 3GPP TS 32.422"; + description "It specifies the measurement period for the + Data Volume (M4) and Scheduled IP throughput + measurements (M5) for LTE MDT taken by the eNB. + The attribute is applicable only for Immediate MDT."; + reference "Clause 5.10.23 of 3GPP TS 32.422."; } leaf collectionPeriodM6LTE { @@ -915,7 +1040,7 @@ module _3gpp-common-trace { measurement (M6) for MDT taken by the eNB. The attribute is applicable only for Immediate MDT. In case this attribute is not used, it carries a null semantic."; - reference "Clause 5.10.32 of TS 32.422 "; + reference "Clause 5.10.32 of TS 32.422. "; } leaf collectionPeriodM7LTE { @@ -926,9 +1051,8 @@ module _3gpp-common-trace { } description "It specifies the collection period for the Packet Loss Rate measurement (M7) for LTE MDT taken by the eNB. The attribute is - applicable only for Immediate MDT. In case this attribute - is not used, it carries a null semantic."; - reference "Clause 5.10.33 of TS 32.422 ."; + applicable only for Immediate MDT."; + reference "Clause 5.10.33 of TS 32.422."; } leaf eventThresholdUphUMTS { @@ -939,35 +1063,32 @@ module _3gpp-common-trace { } description "It specifies the threshold which should trigger the reporting in case of event-triggered periodic reporting for M4 - (UE power headroom measurement) in UMTS. In case this attribute is - not used, it carries a null semantic."; - reference "5.10.39 of TS 32.422"; + (UE power headroom measurement) in UMTS."; + reference "Clause 5.10.39 of TS 32.422."; } leaf collectionPeriodRRMUMTS { when '../../../jobType = "IMMEDIATE_MDT_ONLY"' + ' or ../../../jobType = "IMMEDIATE_MDT_AND_TRACE"'; type uint32 { - range "1024|1280|2048|2560|5120|" - +"10240|60000"; + range "100|250|500|1000|2000|" + +"3000|4000|6000"; } units milliseconds; description "Specifies the collection period for collecting RRM configured measurement samples for M3, M4, M5 in UMTS. The attribute is applicable - only for Immediate MDT. In case this attribute is not used, it carries - a null semantic"; - reference "Clause 5.10.21 of 3GPP TS 32.422"; + only for Immediate MDT. "; + reference "Clause 5.10.21 of 3GPP TS 32.422."; } leaf measurementPeriodUMTS { when '../../../jobType = "IMMEDIATE_MDT_ONLY"' + 'or ../../../jobType = "IMMEDIATE_MDT_AND_TRACE"'; type uint32 { - range "250|500|1000|2000|3000|4000|6000|8000|12000|16000|20000|" + range "1000|2000|3000|4000|6000|8000|12000|16000|20000|" +"24000|28000|32000|64000"; } units milliseconds; - mandatory true; description "It specifies the measurement period for the Data Volume and Throughput measurements for MDT taken by RNC. The attribute is applicable only for Immediate MDT. In case this @@ -985,7 +1106,7 @@ module _3gpp-common-trace { } description "It specifies the measurements that are collected in an MDT job for a UMTS MDT configured for event triggered reporting."; - reference "Clause 5.10.15 of 3GPP TS 32.422"; + reference "Clause 5.10.15 of 3GPP TS 32.422."; } leaf beamLevelMeasurement { @@ -995,7 +1116,7 @@ module _3gpp-common-trace { default false; description "Indicates whether the NR M1 beam level measurements shall be included or not."; - reference "Clause 5.10.40 of TS 32.422"; + reference "Clause 5.10.40 of 3GPP TS 32.422."; } leaf positioningMethod { @@ -1007,7 +1128,7 @@ module _3gpp-common-trace { } description "It specifies what positioning method should be used in the MDT job."; - reference "Clause 5.10.19 of 3GPP TS 32.422"; + reference "Clause 5.10.19 of 3GPP TS 32.422."; } list excessPacketDelayThresholds { @@ -1033,10 +1154,8 @@ module _3gpp-common-trace { taken for periodic reporting while the UE is in connected mode. The attribute is applicable only for Immediate MDT and combined Trace and Immediate MDT and when reportingTrigger is configured for periodical - measurements and applicable only for LTE. In case this attribute is not - used, it carries a null semantic. - See the clause 5.10.6 of TS 32.422 for additional details on the - allowed values."; + measurements and applicable only for LTE."; + reference "Clause 5.10.19 of 3GPP TS 32.422."; } leaf reportAmountM4LTE { @@ -1051,13 +1170,11 @@ module _3gpp-common-trace { enum INFINITY; } description "It specifies the number of measurement reports that shall be - taken for periodic reporting while the UE is in connected mode. - The attribute is applicable only for Immediate MDT and combined Trace - and Immediate MDT and when reportingTrigger is configured for periodical - measurements and applicable only for LTE. In case this attribute is not - used, it carries a null semantic. - See the clause 5.10.6 of TS 32.422 for additional details on the - allowed values."; + taken for periodic reporting while the UE is in connected mode. + The attribute is applicable only for Immediate MDT and combined Trace + and Immediate MDT and when reportingTrigger is configured for periodical + measurements and applicable only for LTE."; + reference "Clause 5.10.6 of TS 32.422."; } leaf reportAmountM5LTE { @@ -1072,13 +1189,11 @@ module _3gpp-common-trace { enum INFINITY; } description "It specifies the number of measurement reports that shall be - taken for periodic reporting while the UE is in connected mode. - The attribute is applicable only for Immediate MDT and combined Trace - and Immediate MDT and when reportingTrigger is configured for periodical - measurements and applicable only for LTE. In case this attribute is not - used, it carries a null semantic. - See the clause 5.10.6 of TS 32.422 for additional details on the - allowed values."; + taken for periodic reporting while the UE is in connected mode. + The attribute is applicable only for Immediate MDT and combined Trace + and Immediate MDT and when reportingTrigger is configured for periodical + measurements and applicable only for LTE."; + reference "Clause 5.10.6 of TS 32.422."; } leaf reportAmountM6LTE { @@ -1093,13 +1208,11 @@ module _3gpp-common-trace { enum INFINITY; } description "It specifies the number of measurement reports that shall be - taken for periodic reporting while the UE is in connected mode. - The attribute is applicable only for Immediate MDT and combined Trace - and Immediate MDT and when reportingTrigger is configured for periodical - measurements and applicable only for LTE. In case this attribute is not - used, it carries a null semantic. - See the clause 5.10.6 of TS 32.422 for additional details on the - allowed values."; + taken for periodic reporting while the UE is in connected mode. + The attribute is applicable only for Immediate MDT and combined Trace + and Immediate MDT and when reportingTrigger is configured for periodical + measurements and applicable only for LTE."; + reference "Clause 5.10.6 of TS 32.422."; } leaf reportAmountM7LTE { @@ -1114,13 +1227,11 @@ module _3gpp-common-trace { enum INFINITY; } description "It specifies the number of measurement reports that shall be - taken for periodic reporting while the UE is in connected mode. - The attribute is applicable only for Immediate MDT and combined Trace - and Immediate MDT and when reportingTrigger is configured for periodical - measurements and applicable only for LTE. In case this attribute is not - used, it carries a null semantic. - See the clause 5.10.6 of TS 32.422 for additional details on the - allowed values."; + taken for periodic reporting while the UE is in connected mode. + The attribute is applicable only for Immediate MDT and combined Trace + and Immediate MDT and when reportingTrigger is configured for periodical + measurements and applicable only for LTE."; + reference "Clause 5.10.6 of TS 32.422."; } leaf reportAmountM1NR { @@ -1135,13 +1246,11 @@ module _3gpp-common-trace { enum INFINITY; } description "It specifies the number of measurement reports that shall be - taken for periodic reporting while the UE is in connected mode. - The attribute is applicable only for Immediate MDT and combined Trace - and Immediate MDT and when reportingTrigger is configured for periodical - measurements and applicable only for NR. In case this attribute is not - used, it carries a null semantic. - See the clause 5.10.6 of TS 32.422 for additional details on the - allowed values."; + taken for periodic reporting while the UE is in connected mode. + The attribute is applicable only for Immediate MDT and combined Trace + and Immediate MDT and when reportingTrigger is configured for periodical + measurements and applicable only for NR."; + reference "Clause 5.10.6 of TS 32.422."; } leaf reportAmountM4NR { @@ -1156,13 +1265,11 @@ module _3gpp-common-trace { enum INFINITY; } description "It specifies the number of measurement reports that shall be - taken for periodic reporting while the UE is in connected mode. - The attribute is applicable only for Immediate MDT and combined Trace - and Immediate MDT and when reportingTrigger is configured for periodical - measurements and applicable only for NR. In case this attribute is not - used, it carries a null semantic. - See the clause 5.10.6 of TS 32.422 for additional details on the - allowed values."; + taken for periodic reporting while the UE is in connected mode. + The attribute is applicable only for Immediate MDT and combined Trace + and Immediate MDT and when reportingTrigger is configured for periodical + measurements and applicable only for NR."; + reference "Clause 5.10.6 of TS 32.422."; } leaf reportAmountM5NR { @@ -1177,13 +1284,11 @@ module _3gpp-common-trace { enum INFINITY; } description "It specifies the number of measurement reports that shall be - taken for periodic reporting while the UE is in connected mode. - The attribute is applicable only for Immediate MDT and combined Trace - and Immediate MDT and when reportingTrigger is configured for periodical - measurements and applicable only for NR. In case this attribute is not - used, it carries a null semantic. - See the clause 5.10.6 of TS 32.422 for additional details on the - allowed values."; + taken for periodic reporting while the UE is in connected mode. + The attribute is applicable only for Immediate MDT and combined Trace + and Immediate MDT and when reportingTrigger is configured for periodical + measurements and applicable only for NR."; + reference "Clause 5.10.6 of TS 32.422."; } leaf reportAmountM6NR { @@ -1198,13 +1303,11 @@ module _3gpp-common-trace { enum INFINITY; } description "It specifies the number of measurement reports that shall be - taken for periodic reporting while the UE is in connected mode. - The attribute is applicable only for Immediate MDT and combined Trace - and Immediate MDT and when reportingTrigger is configured for periodical - measurements and applicable only for NR. In case this attribute is not - used, it carries a null semantic. - See the clause 5.10.6 of TS 32.422 for additional details on the - allowed values."; + taken for periodic reporting while the UE is in connected mode. + The attribute is applicable only for Immediate MDT and combined Trace + and Immediate MDT and when reportingTrigger is configured for periodical + measurements and applicable only for NR."; + reference "Clause 5.10.6 of TS 32.422."; } leaf reportAmountM7NR { @@ -1219,48 +1322,58 @@ module _3gpp-common-trace { enum INFINITY; } description "It specifies the number of measurement reports that shall be - taken for periodic reporting while the UE is in connected mode. - The attribute is applicable only for Immediate MDT and combined Trace - and Immediate MDT and when reportingTrigger is configured for periodical - measurements and applicable only for NR. In case this attribute is not - used, it carries a null semantic. - See the clause 5.10.6 of TS 32.422 for additional details on the - allowed values."; + taken for periodic reporting while the UE is in connected mode. + The attribute is applicable only for Immediate MDT and combined Trace + and Immediate MDT and when reportingTrigger is configured for periodical + measurements and applicable only for NR."; + reference "Clause 5.10.6 of TS 32.422."; } } grouping LoggedMdtConfigGrp { description "This <> defines the configuration parameters of - IOC TraceJob which are specific for Logged MDT or Logged MBSFN MDT. - The optional attribute plmnList allows to specify the PLMNs where - measurement collection, status indication and log reporting is allowed, - the optional attribute areaConfigurationForNeighCell allows to specify - the area for which UE is requested to perform measurements logging for - neighbour cells which have list of frequencies. For logged MDT in UMTS - and LTE, the reporting is periodical. Parameter loggingInterval determines - the interval between the reports and parameter loggingDuration determines - how long the configuration is valid meaning after this duration has passed - no further reports are sent. In NR, the reporting can be periodical or event - based, determined by parameter reportType. For periodical reporting the - same parameters as in LTE and UMTS apply. For event based reporting, - parameter eventListForEventTriggeredMeasurement configures the event type, - namely 'out of coverage' or 'L1 event'. In case 'L1 event' is selected as - event type, the logging is performed according to parameter loggingInterval - at regular intervals only when the conditions indicated by eventThresholdL1, - hysteresisL1, timeToTriggerL1 (defining the thresholds, hysteresis and time - to trigger) are met and if UE is 'camped normally' state (TS 38.331, - TS 38.304). In case 'out of coverage' is selected as event type, the - logging is performed according to parameter loggingInterval at regular - intervals only when the UE is in 'any cell selection' state. - Furthermore, logging is performed immediately upon transition from the - 'any cell selection' state to the 'camped normally' state (TS 38.331, - TS 38.304)."; + IOC TraceJob which are specific for Logged MDT or Logged MBSFN MDT. + + Based on the value configured for attribute jobType in IOC TraceJob, + different attributes are available. In case of LOGGED_MDT_ONLY, the + attributes reportType, eventListForEventTriggeredMeasurement, + eventThresholdL1, hysteresisL1, timeToTriggerL1, + areaConfigurationForNeighCells and npnIdentityList are applicable. + In case of LOGGED_MBSFN_MDT, + the attribute mbsfnAreaList is applicable. The optional attribute + plmnList allows to specify the PLMNs where + measurement collection, status indication and log reporting is + allowed, the optional attribute areaConfigurationForNeighCell + allows to specify the area for which UE is requested to perform + measurements logging for neighbour cells which have list of + frequencies. + + For logged MDT in UMTS and LTE, the reporting is periodical. Parameter + loggingInterval determines the interval between the reports and parameter + loggingDuration determines how long the configuration is valid meaning + after this duration has passed no further reports are sent. In NR, the + reporting can be periodical or event based, determined by parameter + reportType. For periodical reporting the same parameters as in LTE and + UMTS apply. For event based reporting, + parameter eventListForEventTriggeredMeasurement configures the event type, + namely 'out of coverage' or 'L1 event'. In case 'L1 event' is selected as + event type, the logging is performed according to parameter loggingInterval + at regular intervals only when the conditions indicated by + eventThresholdL1, hysteresisL1, timeToTriggerL1 (defining the thresholds, + hysteresis and time to trigger) are met and if UE is 'camped normally' + state (TS 38.331, + TS 38.304). In case 'out of coverage' is selected as event type, the + logging is performed according to parameter loggingInterval at regular + intervals only when the UE is in 'any cell selection' state. + Furthermore, logging is performed immediately upon transition from the + 'any cell selection' state to the 'camped normally' state (TS 38.331, + TS 38.304)."; leaf traceCollectionEntityId { type int64; description "It specifies the TCE Id which is sent to the UE in - Logged MDT. See the clause 5.10.11 of 3GPP TS 32.422 for additional - details on the allowed values."; + Logged MDT."; + reference "Clause 5.10.11 of 3GPP TS 32.422."; } leaf loggingDuration { @@ -1272,24 +1385,29 @@ module _3gpp-common-trace { units seconds; description "Specifies how long the MDT configuration is valid at the UE in case of Logged MDT. The attribute is applicable only for - Logged MDT and Logged MBSFN MDT. In case this attribute is not used, it - carries a null semantic."; - reference "5.10.9 of 3GPP TS 32.422"; + Logged MDT and Logged MBSFN MDT."; + reference "Clause 5.10.9 of 3GPP TS 32.422"; } leaf loggingInterval { when '../../../jobType = "LOGGED_MDT_ONLY" or' + ' ../../../jobType = "LOGGED_MBSFN_MDT"'; - type uint32 { - range "0|320|640|1280|2560|5120|10240|20480|" - +"30720|40960|61440"; + type enumeration { + enum 320ms; + enum 640ms; + enum 1280ms; + enum 2560ms; + enum 5120ms; + enum 10240ms; + enum 20480ms; + enum 30720ms; + enum 40960ms; + enum 61440ms; + enum INFINITY; } - units milliseconds; description "Specifies the periodicty for Logged MDT. The attribute is - applicable only for Logged MDT and Logged MBSFN MDT. In case this - attribute is not used, it carries a null semantic. - The value 0 indicates Infinity for NR."; - reference "5.10.8 of 3GPP TS 32.422"; + applicable only for Logged MDT and Logged MBSFN MDT."; + reference "Clause 5.10.8 of 3GPP TS 32.422"; } leaf reportType { @@ -1299,7 +1417,7 @@ module _3gpp-common-trace { enum EVENT_TRIGGERED; } description "It specifies report type for logged NR MDT"; - reference "Clause 5.10.27 of 3GPP TS 32.422"; + reference "Clause 5.10.27 of 3GPP TS 32.422."; } leaf eventListForEventTriggeredMeasurement { @@ -1314,7 +1432,7 @@ module _3gpp-common-trace { condition being fulfilled: - Out of coverage. - A2 event."; - reference "Clause 5.10.28 of 3GPP TS 32.422"; + reference "Clause 5.10.28 of 3GPP TS 32.422."; } leaf eventThresholdL1 { @@ -1327,8 +1445,7 @@ module _3gpp-common-trace { the reporting in case of event based reporting of logged NR MDT. The attribute is applicable only for Logged MDT and when reportType is configured for event triggered reporting and when - eventListForEventTriggeredMeasurement is configured for L1 event. - In case this attribute is not used, it carries a null semantic."; + eventListForEventTriggeredMeasurement is configured for L1 event."; reference "clause 5.10.36 of TS 32.422"; } @@ -1342,8 +1459,7 @@ module _3gpp-common-trace { condition of the L1 event based reporting of logged NR MDT. The attribute is applicable only for Logged MDT, when reportType is configured for event triggered reporting and when - eventListForEventTriggeredMeasurement is configured for L1 event. - In case this attribute is not used, it carries a null semantic."; + eventListForEventTriggeredMeasurement is configured for L1 event."; reference "clause 5.10.37 of TS 32.422"; } @@ -1358,19 +1474,18 @@ module _3gpp-common-trace { the reporting in case of event based reporting of logged NR MDT. The attribute is applicable only for Logged MDT, when reportType is configured for event triggered reporting and when - eventListForEventTriggeredMeasurement is configured for L1 event. - In case this attribute is not used, it carries a null semantic."; - reference "clauses 5.10.38 of TS 32.422"; + eventListForEventTriggeredMeasurement is configured for L1 event."; + reference "clause 5.10.38 of TS 32.422"; } - list pLMNList { + list plmnList { when '../../../jobType = "LOGGED_MDT_ONLY"'; key "mcc mnc"; uses types3gpp:PLMNId; max-elements 16; description "It indicates the PLMNs where measurement collection, status indication and log reporting is allowed."; - reference "Clause 5.10.24 of 3GPP TS 32.422"; + reference "Clause 5.10.24 of 3GPP TS 32.422."; } list areaConfigurationForNeighCells { @@ -1383,7 +1498,7 @@ module _3gpp-common-trace { all the neighbour cells. Applicable only to NR Logged MDT."; - reference "3GPP TS 32.422 clause 5.10.26."; + reference "Clause 5.10.26 of 3GPP TS 32.422."; uses AreaConfigGrp; } @@ -1395,7 +1510,7 @@ module _3gpp-common-trace { description "The MBSFN Area consists of a MBSFN Area ID and Carrier Frequency (EARFCN). The target MBSFN area List can have up to 8 entries. This parameter is applicable only if the job type is Logged MBSFN MDT."; - reference "5.10.25 of 3GPP TS 32.422"; + reference "Clause 5.10.25 of 3GPP TS 32.422."; uses MbsfnAreaGrp; } @@ -1403,7 +1518,8 @@ module _3gpp-common-trace { list nPNIdentityList { description "It defines which NPNs that can be served by the NR cell, and which CAG IDs or NIDs can be supported by the NR cell for - corresponding PNI-NPN or SNPN."; + corresponding PNI-NPN or SNPN in case of the cell is NPN-only cell. + (NPN-Identity referring to TS 38.331)"; key idx; max-elements 1; uses types3gpp:NpnIdGrp; @@ -1432,8 +1548,9 @@ module _3gpp-common-trace { enum TAC_OF_IMEI; } default NO_IDENTITY; - description "Specifies level of MDT anonymization."; - reference "3GPP TS 32.422 clause 5.10.12."; + description "Specifies level of anonymization of MDT data. + This attribute is only applicable for management based activation."; + reference "Clause 5.10.12 of 3GPP TS 32.422"; } list areaScope { @@ -1451,17 +1568,13 @@ module _3gpp-common-trace { enum UE_ORIENTATION; } description "It specifies which sensor information shall be included in - logged NR MDT and immediate NR MDT measurement if they are available. - The following sensor measurement can be included or excluded for - the UE."; - reference "Clause 5.10.29 of 3GPP TS 32.422"; + logged NR MDT and immediate NR MDT measurement if they are available."; + reference "Clause 5.10.29 of 3GPP TS 32.422."; } list immediateMdtConfig { description "The set of parameters specific for Immediate MDT - configuration. - This attribute shall be present only if MDT is supported and the jobType - attribute is set to Immediate MDT or combined Trace and Immediate MDT"; + configuration."; key idx; max-elements 1; leaf idx { type string; } @@ -1470,9 +1583,7 @@ module _3gpp-common-trace { list loggedMdtConfig { description "The set of parameters specific for Logged MDT and Logged - MBSFN MDT configuration. - This attribute shall be present only if MDT is supported and the - jobType attribute is set to Logged MDT or Logged MBSFN MDT."; + MBSFN MDT configuration."; key idx; max-elements 1; leaf idx { type string; } @@ -1504,12 +1615,12 @@ module _3gpp-common-trace { For 5GC UE level measurements defined in TS 28.558, the name is constructed as follows: - - 'family.measurementName.subcounter' for measurement type with + 'family.measurementName.subcounter' for measurement type with specified subcounter - - 'family.measurementName.ALL' for measurement type with all supported + 'family.measurementName.ALL' for measurement type with all supported subcounters - - 'family.measurementName' for measurement type without subcounters - - 'family' for measurement family, including all measurement types and + 'family.measurementName' for measurement type without subcounters + 'family' for measurement family, including all measurement types and the associated subcounters under this family. For non-3GPP specified 5GC UE level measurements the name is defined elsewhere."; @@ -1519,7 +1630,7 @@ module _3gpp-common-trace { type uint32; mandatory true; units milliseconds; - description "It specifies the Granularity period used to produce 5GC UE + description "Granularity period used to produce 5GC UE level measurements. The period is defined in milliseconds (ms)."; } @@ -1536,12 +1647,16 @@ module _3gpp-common-trace { leaf-list objectInstances { type string; - description "List of object instances."; + description "List of object instances. + Each object instance is identified by its DN."; } leaf-list rootObjectInstances { type string; - description "List of root object instances."; + description "List of root object instances. + Each object instance is identified by its DN and designates + the root of a substree that contains the root object and all + descendant objects."; } } @@ -1563,15 +1678,11 @@ module _3gpp-common-trace { enum RRC_REPORT; } default TRACE_ONLY; - description "Specifies the MDT mode and it specifies also whether the - TraceJob represents only MDT, Logged MBSFN MDT, Trace, or 5GC UE - level measurement collection, or any combination - of Trace, immediate MDT and 5GC UE level measurement collection or RRC - reporting. - The attribute is applicable for Trace, MDT, RCEF, RRC and - RLF reporting, and 5GC UE level measurement collection."; - reference "Clause 5.9a of 3GPP TS 32.422 for additional details on the - allowed values."; + description "It specifies whether the + TraceJob represents only MDT, Trace, RLF, RCEF, RRC or 5GC UE + level measurements job, or a combined job. It also defines the + MDT mode."; + reference "Clause 5.9a of 3GPP TS 32.422."; } leaf-list rrcReportType { type enumeration { @@ -1583,15 +1694,13 @@ module _3gpp-common-trace { enum RA_REPORT; } description "Specifies the RRC reports requested. "; - reference "Clause 5.14 of 3GPP TS 32.422 for additional details on the - allowed values."; + reference "3GPP TS 38.331"; } list pLMNTarget { key "mcc mnc"; - description "Specifies which PLMN that the subscriber of the session to - be recorded uses as selected PLMN. PLMN Target might differ from the - PLMN specified in the Trace Reference"; + description "It specifies which PLMN that the subscriber of the session to + be recorded uses as selected PLMN."; reference "Clause 5.9b of 3GPP TS 32.422"; uses types3gpp:PLMNId; @@ -1601,7 +1710,14 @@ module _3gpp-common-trace { when '../jobType = "TRACE_ONLY"' + ' or ../jobType = "IMMEDIATE_MDT_AND_TRACE"'; type string; - description "Specifies the metrics to be reported."; + description "List of trace metrics identified by name. + Includes trace messages, MDT measurements (Immediate MDT, + Logged MDT, Logged MBSFN MDT), RLF, RCEF and RRC reports, + see TS 32.422 Trace messages are identified with their message + identifier. Trace metric identifier is constructed as defined + in clause 10 of TS 32.422. + For non-3GPP specified trace metrics the name is defined elsewhere. +"; reference "Clause 10 of 3GPP TS 32.422"; } @@ -1610,9 +1726,8 @@ module _3gpp-common-trace { description "It specifies the address of the Trace Collection Entity when the attribute traceReportingFormat is configured for the file-based reporting. The attribute is applicable for both Trace and - MDT. - See the clause 5.9 of TS 32.422 for additional details on the allowed - values."; + MDT."; + reference "Clause 5.9 of 3GPP TS 32.422."; } @@ -1621,7 +1736,7 @@ module _3gpp-common-trace { type inet:uri; description "URI of the Streaming Trace data reporting MnS consumer (a.k.a. streaming target)."; - reference "Clause 5.9 of 3GPP TS 32.422"; + reference "Clause 5.9 of 3GPP TS 32.422."; } list traceReference { @@ -1633,7 +1748,7 @@ module _3gpp-common-trace { In case of shared network, it is the MCC and MNC of the Participating Operator that request the trace session that shall be provided. The attribute is applicable for both Trace and MDT."; - reference "Clause 5.6 of 3GPP TS 32.422"; + reference "Clause 5.6 of 3GPP TS 32.422."; leaf idx { type uint32 ; } uses trace3gpp:TraceReferenceGrp ; @@ -1685,13 +1800,21 @@ module _3gpp-common-trace { attribute is applicable for both Trace and MDT. This attribute includes the ID type of the target as an enumeration and the ID value. - The traceTarget shall be public ID in case of a Management Based - Activation is done to an ScscfFunction. The traceTarget shall be - cell only in case of the UTRAN cell traffic trace function. + The traceTarget shall be 'PUBLIC_ID' in case of a Management Based + Activation is done to an SCSCFFunction (Serving Call + Session Control Function) + or PCSCFFunction (Proxy Call Session Control Function). + The traceTarget shall be 'UTRAN_CELL' only in case of the UTRAN + cell traffic trace function. + + The traceTarget shall be 'E-UTRAN_CELL' only in case of E-UTRAN cell + traffic trace function. - The traceTarget shall be E-UtranCell only in case of E-UTRAN cell - traffic trace function.The traceTarget shall be either IMSI or - IMEI(SV) if the Trace Session is activated to any of the following + The traceTarget shall be 'NG-RAN_CELL' only in case of NR cell + traffic trace function. + + The traceTarget shall be either 'IMSI', 'IMEI' or + 'IMEISV' if the Trace Session is activated to any of the following ManagedEntity(ies): - HssFunction - MscServerFunction @@ -1700,28 +1823,39 @@ module _3gpp-common-trace { - BmscFunction - RncFunction - MmeFunction - - The traceTarget shall be IMSI if the Trace Session is activated to a - ManagedEntity playing a role of ServinGWFunction. - - In case of signaling based Trace/MDT, the traceTarget attribute shall - be able to carry (IMSI or IMEI(SV)or SUPI), the areaScope attribute - shall be able to carry a list of (cell or E-UtranCell or NRCellDU or - TA/LA/RA). - - In case of management based Immediate MDT, the traceTarget attribute - shall be null value, the areaScope attribute shall carry a list of - (Utrancell or E-UtranCell or NRCellDU). - - In case of management based Logged MDT, the traceTarget attribute - shall carry an eBs or a RNC or gNBs. The Logged MDT should be initiated - on the specified eNB or RNC or gNB in traceTarget. The areaScope - attribute shall carry a list of (Utrancell or E-UtranCell or NRCellDU or - TA/LA/RA). - - In case of RLF reporting, or RCEF reporting, the traceTarget - attribute shall be null value, the areaScope attribute shall carry - one or list of eNBs/gNBs"; + - ServingGWFunction + - PGWFunction + + The traceTarget shall be either 'SUPI' or 'IMEISV' if the Trace Session + is activated to any of the followed ManagedEntity(ies): + - AFFunction + - AMFFunction + - AUSFFunction + - NEFFunction + - NRFFunction + - NSSFFunction + - PCSCFFunction + - SMFFunction + - UPFFunction + - UDMFunction + + In case of signalling based MDT, the traceTarget attribute should + be able to carry 'PUBLIC_ID', 'IMSI', 'IMEI', 'IMEISV' or 'SUPI'. + + In case of management based Immediate MDT, the traceTarget attribute + shall be null value. In case of management based Logged MDT, the + traceTarget attribute shall carry an 'eNB' or a 'gNB' or an 'RNC'. + The Logged MDT should be initiated on the specified + eNB/gNB/RNC in traceTarget. + + In case of RLF reporting, or RCEF reporting, or RRC reporting, the + traceTarget attribute shall be null value. + + In case of signalling based GC UE level measurements collection, + the traceTarget attribute shall be able to carry the corresponding + Measured UE Identifier as defined by the bullet g) of the 5GC UE + level measurements (see TS 28.558) when the TraceJob is created + at the subject ManagedEntity."; reference "3GPP TS 32.422"; } @@ -1781,7 +1915,7 @@ module _3gpp-common-trace { grouping TraceSubtree { description "Contains classes that manage Tracing. Should be used in all classes (or classes inheriting from) - - SubNnetwork + - SubNetwork - ManagedElement - ManagedFunction @@ -1833,18 +1967,28 @@ module _3gpp-common-trace { Session is activated different types of the target object are possible. The attribute pLMNTarget defines the PLMN for which sessions shall be selected in the Trace Session in case of management based activation - when several PLMNs are supported in the RAN. - - The attribute jobType specifies the kind of data to collect. In case of - Trace only, the configuration parameters of attribute traceConfig shall - be applied. In case of Immediate MDT only, Logged MDT only, RLF reports - only, RCEF reports only and Logged MBSFN MDT, the configuration - parameters of attribute mdtConfig or a subset of these shall be - applied. In case of UE measurements only, the configuration parameters + when several PLMNs are supported in the RAN.The MDT configuration may + include area scope defined by network slice, in which case + the attribute pLMNTarget is not applicable. + + The attribute listOfTraceMetrics allows configuraton of which metrics + shall be recorded. + + The attribute jobType specifies the kind of data to collect. In case of + TRACE_ONLY, the configuration parameters of attribute traceConfig + shall be applied. In case of IMMEDIATE_MDT_ONLY, LOGGED_MDT_ONLY, + RLF_REPORT_ONLY, RCEF_REPORT_ONLY and LOGGED_MBSFN_MDT the + configuration parameters of + attribute mdtConfig or a subset of these shall be applied. In case of + 5GC_UE_LEVEL_MEASUREMENTS_ONLY, the configuration parameters of attribute ueCoreMeasConfig shall be applied. In case of any - combination of Trace, Immediate MDT, Trace and UE measurements, the - configuration parameters of the corresponding attributes traceConfig, - mdtConfig and ueCoreMeasConfig are applicable. + combination of Trace, Immediate MDT, and 5GC UE level measurements, + the configuration parameters + of the corresponding attributes, traceConfig, mdtConfig and + ueCoreMeasConfig are applicable. + + If jobType has the value RRC Report, the attribute rrcReportType shall + bepresent. The rrcReportType allows the tracing of RRC reports. Creation and deletion of TraceJob instances by MnS consumers is optional; when not supported, the TraceJob instances may be created -- GitLab From 07028b206fc770b376f162aeb8fc8c3a53efe567 Mon Sep 17 00:00:00 2001 From: scottma Date: Fri, 7 Feb 2025 16:24:40 +0000 Subject: [PATCH 292/587] Update _3gpp-nr-nrm-ntnfunction.yang --- yang-models/_3gpp-nr-nrm-ntnfunction.yang | 67 ++++++++++++++++++++++- 1 file changed, 65 insertions(+), 2 deletions(-) diff --git a/yang-models/_3gpp-nr-nrm-ntnfunction.yang b/yang-models/_3gpp-nr-nrm-ntnfunction.yang index 5abe98f62..896879c28 100644 --- a/yang-models/_3gpp-nr-nrm-ntnfunction.yang +++ b/yang-models/_3gpp-nr-nrm-ntnfunction.yang @@ -9,16 +9,20 @@ module _3gpp-nr-nrm-ntnfunction { import ietf-yang-types { prefix yang; } import _3gpp-common-managed-element { prefix me3gpp; } import _3gpp-common-subnetwork { prefix subnet3gpp; } + import _3gpp-common-yang-types { prefix typesyang; } + organization "3gpp SA5"; contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464"; description "Implements support the C-SON function of Capacity and Coverage optimization . - Copyright 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + Copyright 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved."; reference "3GPP TS 28.541"; + revision 2025-01-29 { reference CR-1479 ; } revision 2024-05-24 { reference CR-1273 ; } + feature NTNFunctionUnderSubNetwork { description "The NTNFunction shall be contained under SubNetwork"; @@ -241,6 +245,62 @@ module _3gpp-nr-nrm-ntnfunction { } } + grouping NTNEntityConfigGrp { + description ""; + + leaf nTNConfEntity { + type types3gpp:DistinguishedName; + min-elements 1; + description "Specifies the DN of a specific NTN related MOI. + allowedValues: DN of of the following MOIs: + EP_NgC, NRCellCU, NRCellDU, NRSectorCarrier, + SectorEquipmentFunction, NRCellRelation."; + } + + leaf-list nTNEntityConfigRefList { + type typesyang:nameValuePair ; + min-elements 0; + description "Specifies the list of configuration parameters and values. + The content of the attribute is a list of attributeName- attributeValue + pairs. AttributeValues may be complex types."; + } + + } + + + grouping NTNTimeBasedConfigGrp { + description "This IOC represents a configuration to be applied during + a specified time window. + The attribute timeWindow specifies the time window during which the + specified configuration is applied. + The attribute nTNEntityRefList specifies MOI(s) to be used during the + specified timeWindow. + The attribute nTNEntityConfigList specifies configuration updates applied + to MOI(s) during the specified timeWindow."; + + leaf timeWindow { + type types3gpp:TimeWindowGrp; + config true; + description "It defines the time window."; + } + + leaf-list nTNEntityRefList { + type types3gpp:DistinguishedName; + min-elements 0; + description "It contains a list of NTN related MOIs. + allowedValues: DN of of the following MOIs: + EP_NgC, NRCellCU, NRCellDU, NRSectorCarrier, + SectorEquipmentFunction, NRCellRelation."; + } + + leaf-list nTNEntityConfigRefList { + uses NTNEntityConfigGrp; + min-elements 0; + description "It contains a list of configuration + updates to be applied to specified NTN entities."; + } + } + grouping NTNFunctionGrp { description "Represents the NTNFunction IOC"; @@ -270,7 +330,10 @@ module _3gpp-nr-nrm-ntnfunction { grouping NTNFunctionSubtreeGrp { list NTNFunction { description "This IOC contains attributes to support the non-terrestrial - NR access."; + NR access. This IOC contains instances of NTNTimeBasedConfig to support + time-based configuration of the following NTN related entities: + EP_NgC, NRCellCU, NRCellDU, NRSectorCarrier, SectorEquipmentFunction, + and NRCellRelation."; key id; max-elements 1; uses top3gpp:Top_Grp; -- GitLab From f39a2bcccac130e654224bd6375595745eb4a3ec Mon Sep 17 00:00:00 2001 From: scottma Date: Fri, 7 Feb 2025 16:29:42 +0000 Subject: [PATCH 293/587] Update _3gpp-nr-nrm-ntnfunction.yang --- yang-models/_3gpp-nr-nrm-ntnfunction.yang | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/yang-models/_3gpp-nr-nrm-ntnfunction.yang b/yang-models/_3gpp-nr-nrm-ntnfunction.yang index 896879c28..e2f600715 100644 --- a/yang-models/_3gpp-nr-nrm-ntnfunction.yang +++ b/yang-models/_3gpp-nr-nrm-ntnfunction.yang @@ -10,6 +10,7 @@ module _3gpp-nr-nrm-ntnfunction { import _3gpp-common-managed-element { prefix me3gpp; } import _3gpp-common-subnetwork { prefix subnet3gpp; } import _3gpp-common-yang-types { prefix typesyang; } + import _3gpp-common-yang-types { prefix types3gpp; } organization "3gpp SA5"; @@ -257,14 +258,14 @@ module _3gpp-nr-nrm-ntnfunction { SectorEquipmentFunction, NRCellRelation."; } - leaf-list nTNEntityConfigRefList { - type typesyang:nameValuePair ; - min-elements 0; + list nTNEntityConfigRefList { + key name; + config false ; + yext3gpp:notNotifyable; description "Specifies the list of configuration parameters and values. The content of the attribute is a list of attributeName- attributeValue pairs. AttributeValues may be complex types."; - } - + } } -- GitLab From 6bca4c541365216afaf0f812e0c331471f70934e Mon Sep 17 00:00:00 2001 From: scottma Date: Fri, 7 Feb 2025 16:41:53 +0000 Subject: [PATCH 294/587] Update _3gpp-nr-nrm-ntnfunction.yang --- yang-models/_3gpp-nr-nrm-ntnfunction.yang | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/yang-models/_3gpp-nr-nrm-ntnfunction.yang b/yang-models/_3gpp-nr-nrm-ntnfunction.yang index e2f600715..e55c8e448 100644 --- a/yang-models/_3gpp-nr-nrm-ntnfunction.yang +++ b/yang-models/_3gpp-nr-nrm-ntnfunction.yang @@ -9,10 +9,8 @@ module _3gpp-nr-nrm-ntnfunction { import ietf-yang-types { prefix yang; } import _3gpp-common-managed-element { prefix me3gpp; } import _3gpp-common-subnetwork { prefix subnet3gpp; } - import _3gpp-common-yang-types { prefix typesyang; } import _3gpp-common-yang-types { prefix types3gpp; } - organization "3gpp SA5"; contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464"; description "Implements support the C-SON function of Capacity and @@ -251,7 +249,6 @@ module _3gpp-nr-nrm-ntnfunction { leaf nTNConfEntity { type types3gpp:DistinguishedName; - min-elements 1; description "Specifies the DN of a specific NTN related MOI. allowedValues: DN of of the following MOIs: EP_NgC, NRCellCU, NRCellDU, NRSectorCarrier, @@ -260,15 +257,14 @@ module _3gpp-nr-nrm-ntnfunction { list nTNEntityConfigRefList { key name; - config false ; - yext3gpp:notNotifyable; + config true; + uses types3gpp:nameValuePair description "Specifies the list of configuration parameters and values. The content of the attribute is a list of attributeName- attributeValue pairs. AttributeValues may be complex types."; } } - grouping NTNTimeBasedConfigGrp { description "This IOC represents a configuration to be applied during a specified time window. @@ -280,7 +276,7 @@ module _3gpp-nr-nrm-ntnfunction { to MOI(s) during the specified timeWindow."; leaf timeWindow { - type types3gpp:TimeWindowGrp; + uses types3gpp:TimeWindowGrp; config true; description "It defines the time window."; } -- GitLab From 8638598694105e78916f991ebf4f0b1abc6684e7 Mon Sep 17 00:00:00 2001 From: scottma Date: Fri, 7 Feb 2025 16:43:58 +0000 Subject: [PATCH 295/587] Update _3gpp-nr-nrm-ntnfunction.yang --- yang-models/_3gpp-nr-nrm-ntnfunction.yang | 36 +++++++++++------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/yang-models/_3gpp-nr-nrm-ntnfunction.yang b/yang-models/_3gpp-nr-nrm-ntnfunction.yang index e55c8e448..cc14c83cd 100644 --- a/yang-models/_3gpp-nr-nrm-ntnfunction.yang +++ b/yang-models/_3gpp-nr-nrm-ntnfunction.yang @@ -250,31 +250,31 @@ module _3gpp-nr-nrm-ntnfunction { leaf nTNConfEntity { type types3gpp:DistinguishedName; description "Specifies the DN of a specific NTN related MOI. - allowedValues: DN of of the following MOIs: - EP_NgC, NRCellCU, NRCellDU, NRSectorCarrier, - SectorEquipmentFunction, NRCellRelation."; + allowedValues: DN of of the following MOIs: + EP_NgC, NRCellCU, NRCellDU, NRSectorCarrier, + SectorEquipmentFunction, NRCellRelation."; } list nTNEntityConfigRefList { key name; config true; - uses types3gpp:nameValuePair + uses types3gpp:nameValuePair; description "Specifies the list of configuration parameters and values. - The content of the attribute is a list of attributeName- attributeValue - pairs. AttributeValues may be complex types."; + The content of the attribute is a list of attributeName- attributeValue + pairs. AttributeValues may be complex types."; } } grouping NTNTimeBasedConfigGrp { description "This IOC represents a configuration to be applied during - a specified time window. - The attribute timeWindow specifies the time window during which the - specified configuration is applied. - The attribute nTNEntityRefList specifies MOI(s) to be used during the - specified timeWindow. - The attribute nTNEntityConfigList specifies configuration updates applied - to MOI(s) during the specified timeWindow."; - + a specified time window. + The attribute timeWindow specifies the time window during which the + specified configuration is applied. + The attribute nTNEntityRefList specifies MOI(s) to be used during the + specified timeWindow. + The attribute nTNEntityConfigList specifies configuration updates applied + to MOI(s) during the specified timeWindow."; + leaf timeWindow { uses types3gpp:TimeWindowGrp; config true; @@ -285,16 +285,16 @@ module _3gpp-nr-nrm-ntnfunction { type types3gpp:DistinguishedName; min-elements 0; description "It contains a list of NTN related MOIs. - allowedValues: DN of of the following MOIs: - EP_NgC, NRCellCU, NRCellDU, NRSectorCarrier, - SectorEquipmentFunction, NRCellRelation."; + allowedValues: DN of of the following MOIs: + EP_NgC, NRCellCU, NRCellDU, NRSectorCarrier, + SectorEquipmentFunction, NRCellRelation."; } leaf-list nTNEntityConfigRefList { uses NTNEntityConfigGrp; min-elements 0; description "It contains a list of configuration - updates to be applied to specified NTN entities."; + updates to be applied to specified NTN entities."; } } -- GitLab From de7d9567d82f67783660fb7af590f2bfadd455da Mon Sep 17 00:00:00 2001 From: scottma Date: Fri, 7 Feb 2025 16:48:00 +0000 Subject: [PATCH 296/587] Update _3gpp-nr-nrm-ntnfunction.yang --- yang-models/_3gpp-nr-nrm-ntnfunction.yang | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/yang-models/_3gpp-nr-nrm-ntnfunction.yang b/yang-models/_3gpp-nr-nrm-ntnfunction.yang index cc14c83cd..0767395f8 100644 --- a/yang-models/_3gpp-nr-nrm-ntnfunction.yang +++ b/yang-models/_3gpp-nr-nrm-ntnfunction.yang @@ -276,7 +276,7 @@ module _3gpp-nr-nrm-ntnfunction { to MOI(s) during the specified timeWindow."; leaf timeWindow { - uses types3gpp:TimeWindowGrp; + type types3gpp:TimeWindowGrp; config true; description "It defines the time window."; } @@ -291,7 +291,7 @@ module _3gpp-nr-nrm-ntnfunction { } leaf-list nTNEntityConfigRefList { - uses NTNEntityConfigGrp; + type NTNEntityConfigGrp; min-elements 0; description "It contains a list of configuration updates to be applied to specified NTN entities."; -- GitLab From 2ce21929051e34d94c4bab789e40d035ee4374a0 Mon Sep 17 00:00:00 2001 From: scottma Date: Fri, 7 Feb 2025 17:07:29 +0000 Subject: [PATCH 297/587] Update _3gpp-nr-nrm-ntnfunction.yang --- yang-models/_3gpp-nr-nrm-ntnfunction.yang | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/yang-models/_3gpp-nr-nrm-ntnfunction.yang b/yang-models/_3gpp-nr-nrm-ntnfunction.yang index 0767395f8..7d2aa59ca 100644 --- a/yang-models/_3gpp-nr-nrm-ntnfunction.yang +++ b/yang-models/_3gpp-nr-nrm-ntnfunction.yang @@ -255,7 +255,7 @@ module _3gpp-nr-nrm-ntnfunction { SectorEquipmentFunction, NRCellRelation."; } - list nTNEntityConfigRefList { + leaf-list nTNEntityConfigRefList { key name; config true; uses types3gpp:nameValuePair; @@ -275,14 +275,16 @@ module _3gpp-nr-nrm-ntnfunction { The attribute nTNEntityConfigList specifies configuration updates applied to MOI(s) during the specified timeWindow."; - leaf timeWindow { - type types3gpp:TimeWindowGrp; + leaf-list timeWindow { + uses types3gpp:TimeWindowGrp; + min-elements 1; + max-elements 1; config true; description "It defines the time window."; } leaf-list nTNEntityRefList { - type types3gpp:DistinguishedName; + uses types3gpp:DistinguishedName; min-elements 0; description "It contains a list of NTN related MOIs. allowedValues: DN of of the following MOIs: -- GitLab From d51afb335692b23d4d4a90a050affc3576911a92 Mon Sep 17 00:00:00 2001 From: scottma Date: Fri, 7 Feb 2025 17:13:36 +0000 Subject: [PATCH 298/587] Update _3gpp-nr-nrm-ntnfunction.yang --- yang-models/_3gpp-nr-nrm-ntnfunction.yang | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/yang-models/_3gpp-nr-nrm-ntnfunction.yang b/yang-models/_3gpp-nr-nrm-ntnfunction.yang index 7d2aa59ca..de7f3a491 100644 --- a/yang-models/_3gpp-nr-nrm-ntnfunction.yang +++ b/yang-models/_3gpp-nr-nrm-ntnfunction.yang @@ -256,8 +256,6 @@ module _3gpp-nr-nrm-ntnfunction { } leaf-list nTNEntityConfigRefList { - key name; - config true; uses types3gpp:nameValuePair; description "Specifies the list of configuration parameters and values. The content of the attribute is a list of attributeName- attributeValue @@ -293,7 +291,7 @@ module _3gpp-nr-nrm-ntnfunction { } leaf-list nTNEntityConfigRefList { - type NTNEntityConfigGrp; + uses NTNEntityConfigGrp; min-elements 0; description "It contains a list of configuration updates to be applied to specified NTN entities."; -- GitLab From eaafe20e8e7d6cb342b576d16d1f6677f892d3bd Mon Sep 17 00:00:00 2001 From: scottma Date: Fri, 7 Feb 2025 17:22:10 +0000 Subject: [PATCH 299/587] Update _3gpp-nr-nrm-ntnfunction.yang --- yang-models/_3gpp-nr-nrm-ntnfunction.yang | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/yang-models/_3gpp-nr-nrm-ntnfunction.yang b/yang-models/_3gpp-nr-nrm-ntnfunction.yang index de7f3a491..49c913b0e 100644 --- a/yang-models/_3gpp-nr-nrm-ntnfunction.yang +++ b/yang-models/_3gpp-nr-nrm-ntnfunction.yang @@ -255,8 +255,9 @@ module _3gpp-nr-nrm-ntnfunction { SectorEquipmentFunction, NRCellRelation."; } - leaf-list nTNEntityConfigRefList { + list nTNEntityConfigRefList { uses types3gpp:nameValuePair; + key "name"; description "Specifies the list of configuration parameters and values. The content of the attribute is a list of attributeName- attributeValue pairs. AttributeValues may be complex types."; @@ -273,15 +274,13 @@ module _3gpp-nr-nrm-ntnfunction { The attribute nTNEntityConfigList specifies configuration updates applied to MOI(s) during the specified timeWindow."; - leaf-list timeWindow { - uses types3gpp:TimeWindowGrp; - min-elements 1; - max-elements 1; + leaf timeWindow { + type types3gpp:TimeWindowGrp; config true; description "It defines the time window."; } - leaf-list nTNEntityRefList { + list nTNEntityRefList { uses types3gpp:DistinguishedName; min-elements 0; description "It contains a list of NTN related MOIs. -- GitLab From d82097b38afc5c51247b16470e60c05e3e879e5b Mon Sep 17 00:00:00 2001 From: scottma Date: Fri, 7 Feb 2025 17:27:58 +0000 Subject: [PATCH 300/587] Update _3gpp-nr-nrm-ntnfunction.yang --- yang-models/_3gpp-nr-nrm-ntnfunction.yang | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/yang-models/_3gpp-nr-nrm-ntnfunction.yang b/yang-models/_3gpp-nr-nrm-ntnfunction.yang index 49c913b0e..d3512158e 100644 --- a/yang-models/_3gpp-nr-nrm-ntnfunction.yang +++ b/yang-models/_3gpp-nr-nrm-ntnfunction.yang @@ -274,13 +274,18 @@ module _3gpp-nr-nrm-ntnfunction { The attribute nTNEntityConfigList specifies configuration updates applied to MOI(s) during the specified timeWindow."; - leaf timeWindow { - type types3gpp:TimeWindowGrp; - config true; + list timeWindow { + key idx; + leaf idx { type uint32 ; } + min-elements 1; + max-elements 1; + uses types3gpp:TimeWindowGrp; description "It defines the time window."; } list nTNEntityRefList { + key idx; + leaf idx { type uint32 ; } uses types3gpp:DistinguishedName; min-elements 0; description "It contains a list of NTN related MOIs. @@ -289,7 +294,9 @@ module _3gpp-nr-nrm-ntnfunction { SectorEquipmentFunction, NRCellRelation."; } - leaf-list nTNEntityConfigRefList { + list nTNEntityConfigRefList { + key idx; + leaf idx { type uint32 ; } uses NTNEntityConfigGrp; min-elements 0; description "It contains a list of configuration -- GitLab From 6ea821de57aa88fdc3405e71f7dbfc2825d45952 Mon Sep 17 00:00:00 2001 From: scottma Date: Fri, 7 Feb 2025 17:37:28 +0000 Subject: [PATCH 301/587] Update _3gpp-nr-nrm-ntnfunction.yang --- yang-models/_3gpp-nr-nrm-ntnfunction.yang | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/yang-models/_3gpp-nr-nrm-ntnfunction.yang b/yang-models/_3gpp-nr-nrm-ntnfunction.yang index d3512158e..ea4f00087 100644 --- a/yang-models/_3gpp-nr-nrm-ntnfunction.yang +++ b/yang-models/_3gpp-nr-nrm-ntnfunction.yang @@ -283,9 +283,7 @@ module _3gpp-nr-nrm-ntnfunction { description "It defines the time window."; } - list nTNEntityRefList { - key idx; - leaf idx { type uint32 ; } + leaf-list nTNEntityRefList { uses types3gpp:DistinguishedName; min-elements 0; description "It contains a list of NTN related MOIs. @@ -294,7 +292,7 @@ module _3gpp-nr-nrm-ntnfunction { SectorEquipmentFunction, NRCellRelation."; } - list nTNEntityConfigRefList { + list nTNEntityConfigRefList { key idx; leaf idx { type uint32 ; } uses NTNEntityConfigGrp; -- GitLab From 232ae1d960aa0944525985c7e68c731e49565f44 Mon Sep 17 00:00:00 2001 From: scottma Date: Fri, 7 Feb 2025 17:39:29 +0000 Subject: [PATCH 302/587] Update _3gpp-nr-nrm-ntnfunction.yang --- yang-models/_3gpp-nr-nrm-ntnfunction.yang | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/yang-models/_3gpp-nr-nrm-ntnfunction.yang b/yang-models/_3gpp-nr-nrm-ntnfunction.yang index ea4f00087..7fc86ea92 100644 --- a/yang-models/_3gpp-nr-nrm-ntnfunction.yang +++ b/yang-models/_3gpp-nr-nrm-ntnfunction.yang @@ -284,7 +284,7 @@ module _3gpp-nr-nrm-ntnfunction { } leaf-list nTNEntityRefList { - uses types3gpp:DistinguishedName; + type types3gpp:DistinguishedName; min-elements 0; description "It contains a list of NTN related MOIs. allowedValues: DN of of the following MOIs: -- GitLab From 01d54d02c07c8911dfcd4122fffb49394dfe2565 Mon Sep 17 00:00:00 2001 From: scottma Date: Fri, 7 Feb 2025 17:45:02 +0000 Subject: [PATCH 303/587] Update _3gpp-nr-nrm-ntnfunction.yang --- yang-models/_3gpp-nr-nrm-ntnfunction.yang | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/yang-models/_3gpp-nr-nrm-ntnfunction.yang b/yang-models/_3gpp-nr-nrm-ntnfunction.yang index 7fc86ea92..534b8477d 100644 --- a/yang-models/_3gpp-nr-nrm-ntnfunction.yang +++ b/yang-models/_3gpp-nr-nrm-ntnfunction.yang @@ -274,12 +274,9 @@ module _3gpp-nr-nrm-ntnfunction { The attribute nTNEntityConfigList specifies configuration updates applied to MOI(s) during the specified timeWindow."; - list timeWindow { - key idx; - leaf idx { type uint32 ; } - min-elements 1; - max-elements 1; - uses types3gpp:TimeWindowGrp; + leaf timeWindow { + type types3gpp:TimeWindowGrp; + mandatory true; description "It defines the time window."; } -- GitLab From c07d00beca546cc008dd776a0e5f0c6d6b0edee4 Mon Sep 17 00:00:00 2001 From: scottma Date: Fri, 7 Feb 2025 17:47:35 +0000 Subject: [PATCH 304/587] Update _3gpp-nr-nrm-ntnfunction.yang --- yang-models/_3gpp-nr-nrm-ntnfunction.yang | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/yang-models/_3gpp-nr-nrm-ntnfunction.yang b/yang-models/_3gpp-nr-nrm-ntnfunction.yang index 534b8477d..7fc86ea92 100644 --- a/yang-models/_3gpp-nr-nrm-ntnfunction.yang +++ b/yang-models/_3gpp-nr-nrm-ntnfunction.yang @@ -274,9 +274,12 @@ module _3gpp-nr-nrm-ntnfunction { The attribute nTNEntityConfigList specifies configuration updates applied to MOI(s) during the specified timeWindow."; - leaf timeWindow { - type types3gpp:TimeWindowGrp; - mandatory true; + list timeWindow { + key idx; + leaf idx { type uint32 ; } + min-elements 1; + max-elements 1; + uses types3gpp:TimeWindowGrp; description "It defines the time window."; } -- GitLab From c0874f9ddb9b63d9d2bdeb739d035fcda7c9e0db Mon Sep 17 00:00:00 2001 From: scottma Date: Fri, 14 Feb 2025 12:34:17 +0000 Subject: [PATCH 305/587] Update _3gpp-nr-nrm-ntnfunction.yang --- yang-models/_3gpp-nr-nrm-ntnfunction.yang | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/yang-models/_3gpp-nr-nrm-ntnfunction.yang b/yang-models/_3gpp-nr-nrm-ntnfunction.yang index 7fc86ea92..e0f9d04df 100644 --- a/yang-models/_3gpp-nr-nrm-ntnfunction.yang +++ b/yang-models/_3gpp-nr-nrm-ntnfunction.yang @@ -19,7 +19,7 @@ module _3gpp-nr-nrm-ntnfunction { TTA, TTC). All rights reserved."; reference "3GPP TS 28.541"; - revision 2025-01-29 { reference CR-1479 ; } + revision 2025-02-13 { reference CR-1479 ; } revision 2024-05-24 { reference CR-1273 ; } @@ -265,8 +265,8 @@ module _3gpp-nr-nrm-ntnfunction { } grouping NTNTimeBasedConfigGrp { - description "This IOC represents a configuration to be applied during - a specified time window. + description "Define configuration to be applied during a specified time + window. The attribute timeWindow specifies the time window during which the specified configuration is applied. The attribute nTNEntityRefList specifies MOI(s) to be used during the @@ -352,6 +352,15 @@ module _3gpp-nr-nrm-ntnfunction { uses EphemerisInfoSetGrp; } } + + list NTNTimeBasedConfig { + description "This IOC represents the NTN time-based configuration."; + key id; + uses top3gpp:Top_Grp; + container attributes { + uses NTNTimeBasedConfigGrp; + } + } } } -- GitLab From b7525718099364db36c75a842030e578ed74ce2d Mon Sep 17 00:00:00 2001 From: scottma Date: Mon, 17 Feb 2025 10:17:21 +0000 Subject: [PATCH 306/587] Update _3gpp-nr-nrm-ntnfunction.yang --- yang-models/_3gpp-nr-nrm-ntnfunction.yang | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/yang-models/_3gpp-nr-nrm-ntnfunction.yang b/yang-models/_3gpp-nr-nrm-ntnfunction.yang index e0f9d04df..de9c99cf1 100644 --- a/yang-models/_3gpp-nr-nrm-ntnfunction.yang +++ b/yang-models/_3gpp-nr-nrm-ntnfunction.yang @@ -255,7 +255,7 @@ module _3gpp-nr-nrm-ntnfunction { SectorEquipmentFunction, NRCellRelation."; } - list nTNEntityConfigRefList { + list nTNConfigList { uses types3gpp:nameValuePair; key "name"; description "Specifies the list of configuration parameters and values. @@ -292,7 +292,7 @@ module _3gpp-nr-nrm-ntnfunction { SectorEquipmentFunction, NRCellRelation."; } - list nTNEntityConfigRefList { + list nTNEntityConfigList { key idx; leaf idx { type uint32 ; } uses NTNEntityConfigGrp; -- GitLab From d67d55fd897e8efbb3ec67cb6b81b148b04de95d Mon Sep 17 00:00:00 2001 From: scottma Date: Mon, 17 Feb 2025 15:32:38 +0000 Subject: [PATCH 307/587] Update _3gpp-nr-nrm-ntnfunction.yang --- yang-models/_3gpp-nr-nrm-ntnfunction.yang | 23 ++++++++--------------- 1 file changed, 8 insertions(+), 15 deletions(-) diff --git a/yang-models/_3gpp-nr-nrm-ntnfunction.yang b/yang-models/_3gpp-nr-nrm-ntnfunction.yang index de9c99cf1..20dd62cf4 100644 --- a/yang-models/_3gpp-nr-nrm-ntnfunction.yang +++ b/yang-models/_3gpp-nr-nrm-ntnfunction.yang @@ -19,7 +19,7 @@ module _3gpp-nr-nrm-ntnfunction { TTA, TTC). All rights reserved."; reference "3GPP TS 28.541"; - revision 2025-02-13 { reference CR-1479 ; } + revision 2025-02-17 { reference CR-1479 ; } revision 2024-05-24 { reference CR-1273 ; } @@ -245,7 +245,10 @@ module _3gpp-nr-nrm-ntnfunction { } grouping NTNEntityConfigGrp { - description ""; + description "The attribute nTNConfEntity specifies an NTN related MOI. + The attribute nTNConfList optionally specifies configuration + updates to be applied to the nTNConfEntity. If no updates are provided + the value of nTNConfEntity is used without modification."; leaf nTNConfEntity { type types3gpp:DistinguishedName; @@ -269,10 +272,8 @@ module _3gpp-nr-nrm-ntnfunction { window. The attribute timeWindow specifies the time window during which the specified configuration is applied. - The attribute nTNEntityRefList specifies MOI(s) to be used during the - specified timeWindow. The attribute nTNEntityConfigList specifies configuration updates applied - to MOI(s) during the specified timeWindow."; + during the specified timeWindow."; list timeWindow { key idx; @@ -283,15 +284,6 @@ module _3gpp-nr-nrm-ntnfunction { description "It defines the time window."; } - leaf-list nTNEntityRefList { - type types3gpp:DistinguishedName; - min-elements 0; - description "It contains a list of NTN related MOIs. - allowedValues: DN of of the following MOIs: - EP_NgC, NRCellCU, NRCellDU, NRSectorCarrier, - SectorEquipmentFunction, NRCellRelation."; - } - list nTNEntityConfigList { key idx; leaf idx { type uint32 ; } @@ -354,7 +346,8 @@ module _3gpp-nr-nrm-ntnfunction { } list NTNTimeBasedConfig { - description "This IOC represents the NTN time-based configuration."; + description "This IOC represents the NTN time-based configuration. + "; key id; uses top3gpp:Top_Grp; container attributes { -- GitLab From 4d0b9d471043db467ef687f311af554b22784e80 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jose=20Antonio=20Ordo=C3=B1ez=20Lucena?= Date: Mon, 3 Feb 2025 08:21:16 +0000 Subject: [PATCH 308/587] Update _3gpp-common-managementdatacollection.yang --- yang-models/_3gpp-common-managementdatacollection.yang | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/yang-models/_3gpp-common-managementdatacollection.yang b/yang-models/_3gpp-common-managementdatacollection.yang index 2a6ffea33..d7f49897f 100644 --- a/yang-models/_3gpp-common-managementdatacollection.yang +++ b/yang-models/_3gpp-common-managementdatacollection.yang @@ -12,7 +12,7 @@ module _3gpp-common-managementdatacollection { contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464"; description "Handling management data collection - Copyright 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + Copyright 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved."; reference "3GPP TS 28.623 Generic Network Resource Model (NRM) @@ -24,6 +24,7 @@ module _3gpp-common-managementdatacollection { Integration Reference Point (IRP); Information Service (IS)"; + revision 2025-02-07 { reference CR-XXXX; } revision 2024-04-12 { reference CR-0346; } revision 2023-11-18 { reference CR-0299 ; } revision 2023-11-06 { reference "CR-0305"; } @@ -224,7 +225,7 @@ module _3gpp-common-managementdatacollection { KPI definitions template as the component designated with a). For trace metrics (including trace messages, MDT measurements - (Immediate MDT, Logged MDT, Logged MBSFN MDT), RLF and RCEF + (Immediate MDT, Logged MDT, Logged MBSFN MDT), RRC, RLF and RCEF reports) defined in TS 32.422, the name (metric identifier) is defined in clause 10 of TS 32.422. @@ -288,7 +289,7 @@ module _3gpp-common-managementdatacollection { description "This IOC represents a management data collection request job. The requested data could be of kind Trace, MDT (Minimization of Drive Test), RLF (Radio Link Failure) report, RCEF (RRC Connection - Establishment Failure) report, PM (performance measurements), KPI + Establishment Failure) report, RRC report, PM (performance measurements), KPI (end-to-end key performance indicators) or a combination of these. The attribute 'managementData' defines the management data which shall -- GitLab From b2a08186458b842bae6c0554ef118c9f245b057f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jose=20Antonio=20Ordo=C3=B1ez=20Lucena?= Date: Wed, 5 Feb 2025 08:00:22 +0000 Subject: [PATCH 309/587] Update _3gpp-common-managementdatacollection.yang --- yang-models/_3gpp-common-managementdatacollection.yang | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/yang-models/_3gpp-common-managementdatacollection.yang b/yang-models/_3gpp-common-managementdatacollection.yang index d7f49897f..bb9f3e9c1 100644 --- a/yang-models/_3gpp-common-managementdatacollection.yang +++ b/yang-models/_3gpp-common-managementdatacollection.yang @@ -289,7 +289,8 @@ module _3gpp-common-managementdatacollection { description "This IOC represents a management data collection request job. The requested data could be of kind Trace, MDT (Minimization of Drive Test), RLF (Radio Link Failure) report, RCEF (RRC Connection - Establishment Failure) report, RRC report, PM (performance measurements), KPI + Establishment Failure) report, RRC report, + PM (performance measurements), KPI (end-to-end key performance indicators) or a combination of these. The attribute 'managementData' defines the management data which shall -- GitLab From 8ae3d45a8bbdad12170bcb5c8cd3119d2308cedd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jose=20Antonio=20Ordo=C3=B1ez=20Lucena?= Date: Thu, 6 Feb 2025 10:06:41 +0000 Subject: [PATCH 310/587] Update _3gpp-common-managementdatacollection.yang --- yang-models/_3gpp-common-managementdatacollection.yang | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/yang-models/_3gpp-common-managementdatacollection.yang b/yang-models/_3gpp-common-managementdatacollection.yang index bb9f3e9c1..960eba475 100644 --- a/yang-models/_3gpp-common-managementdatacollection.yang +++ b/yang-models/_3gpp-common-managementdatacollection.yang @@ -24,7 +24,7 @@ module _3gpp-common-managementdatacollection { Integration Reference Point (IRP); Information Service (IS)"; - revision 2025-02-07 { reference CR-XXXX; } + revision 2025-02-07 { reference CR-0505; } revision 2024-04-12 { reference CR-0346; } revision 2023-11-18 { reference CR-0299 ; } revision 2023-11-06 { reference "CR-0305"; } -- GitLab From 8edfc3173588b1685144e0271f2ad816e8bc5b28 Mon Sep 17 00:00:00 2001 From: ligan Date: Wed, 5 Feb 2025 03:07:58 +0000 Subject: [PATCH 311/587] Update _3gpp-nr-nrm-gnbdufunction.yang --- yang-models/_3gpp-nr-nrm-gnbdufunction.yang | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/yang-models/_3gpp-nr-nrm-gnbdufunction.yang b/yang-models/_3gpp-nr-nrm-gnbdufunction.yang index ca3c6f768..8e0b34487 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-02-05 { reference CR-1441; } revision 2024-02-24 { reference CR-1218; } revision 2023-09-18 { reference CR-1043 ; } revision 2023-04-26 { reference CR-0916; } @@ -195,6 +196,14 @@ module _3gpp-nr-nrm-gnbdufunction { type types3gpp:DistinguishedName; description "DN of the Dynamic5QISet that the GNBDUFunction supports (is associated to)."; } + + leaf nRECMappingRuleRef { + type types3gpp:DistinguishedName; + description "DN of a NRECMappingRule. An empty value indicates the + NRECMappingRule contained by parent, e.g. ManagedElement or + SubNetwork, applies."; + } + } augment "/me3gpp:ManagedElement" { -- GitLab From a6d77d142c27c777f5680308d2157c26031e14a2 Mon Sep 17 00:00:00 2001 From: ligan Date: Thu, 6 Feb 2025 02:56:29 +0000 Subject: [PATCH 312/587] Update _3gpp-nr-nrm-gnbdufunction.yang --- yang-models/_3gpp-nr-nrm-gnbdufunction.yang | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/yang-models/_3gpp-nr-nrm-gnbdufunction.yang b/yang-models/_3gpp-nr-nrm-gnbdufunction.yang index 8e0b34487..5e70bfb2d 100755 --- a/yang-models/_3gpp-nr-nrm-gnbdufunction.yang +++ b/yang-models/_3gpp-nr-nrm-gnbdufunction.yang @@ -188,16 +188,17 @@ module _3gpp-nr-nrm-gnbdufunction { leaf configurable5QISetRef { type types3gpp:DistinguishedName; - description "DN of the Configurable5QISet that the GNBDUFunction supports (is associated - to)."; + description "DN of the Configurable5QISet that the GNBDUFunction supports + (is associated to)."; } leaf dynamic5QISetRef { type types3gpp:DistinguishedName; - description "DN of the Dynamic5QISet that the GNBDUFunction supports (is associated to)."; + description "DN of the Dynamic5QISet that the GNBDUFunction supports + (is associated to)."; } - leaf nRECMappingRuleRef { + leaf nRECMappingRuleRef { type types3gpp:DistinguishedName; description "DN of a NRECMappingRule. An empty value indicates the NRECMappingRule contained by parent, e.g. ManagedElement or -- GitLab From 5a3da3bcb3154bcd90bda8087264b248c149a08f Mon Sep 17 00:00:00 2001 From: ligan Date: Tue, 18 Feb 2025 08:31:49 +0000 Subject: [PATCH 313/587] Update _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 5e70bfb2d..4932b44d8 100755 --- a/yang-models/_3gpp-nr-nrm-gnbdufunction.yang +++ b/yang-models/_3gpp-nr-nrm-gnbdufunction.yang @@ -14,7 +14,7 @@ module _3gpp-nr-nrm-gnbdufunction { contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464"; description "Defines the YANG mapping of the GNBDUFunction Information Object Class (IOC) that is part of the NR Network Resource Model (NRM). - Copyright 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + Copyright 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved."; reference "3GPP TS 28.541 5G Network Resource Model (NRM)"; -- GitLab From c38224a16c019f95b8b5659bca7d096bd207f64e Mon Sep 17 00:00:00 2001 From: "U-ERICSSON\\ETHBLL" Date: Thu, 27 Feb 2025 02:46:52 +0100 Subject: [PATCH 314/587] Locally rebased and merged https://forge.3gpp.org/rep/sa5/MnS/-/merge_requests/1575 --- yang-models/_3gpp-common-measurements.yang | 5 +++-- yang-models/_3gpp-common-yang-types.yang | 15 ++++++++++----- 2 files changed, 13 insertions(+), 7 deletions(-) diff --git a/yang-models/_3gpp-common-measurements.yang b/yang-models/_3gpp-common-measurements.yang index 28c838a66..8dff9d525 100755 --- a/yang-models/_3gpp-common-measurements.yang +++ b/yang-models/_3gpp-common-measurements.yang @@ -44,7 +44,7 @@ module _3gpp-common-measurements { Measurements can be contained under ManagedElement, SubNetwork, or any list representing a class inheriting from Subnetwork or ManagedFunction. Note: KPIs will only be supported under SubNetwork - Copyright 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + Copyright 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved."; reference "3GPP TS 28.623 Generic Network Resource Model (NRM) @@ -56,6 +56,7 @@ module _3gpp-common-measurements { Integration Reference Point (IRP); Information Service (IS)"; + revision 2025-01-29 { reference CR-0512; } revision 2024-11-01 { reference CR-0488; } revision 2024-05-06 { reference CR-0359; } revision 2024-02-24 { reference CR-0346; } @@ -251,7 +252,7 @@ module _3gpp-common-measurements { } grouping PerfMetricJobGrp { - description "Represents the attributtes of the IOC PerfMetricJob"; + description "Represents the attributes of the IOC PerfMetricJob"; leaf administrativeState { default UNLOCKED; diff --git a/yang-models/_3gpp-common-yang-types.yang b/yang-models/_3gpp-common-yang-types.yang index 1cc7338f2..7590af02d 100755 --- a/yang-models/_3gpp-common-yang-types.yang +++ b/yang-models/_3gpp-common-yang-types.yang @@ -16,6 +16,7 @@ module _3gpp-common-yang-types { TTA, TTC). All rights reserved."; reference "3GPP TS 28.623"; + revision 2025-02-19 { reference CR-0512; } revision 2025-02-07 { reference CR-0492; } revision 2024-11-25 { reference CR-1442; } revision 2024-11-25 { reference CR-1412; } @@ -1117,11 +1118,15 @@ module _3gpp-common-yang-types { notification subscription). When the related 'PerfMetricJob' is deleted, the 'NtfSubscriptionControl' instance created due to the request for implicit subscription shall be deleted as well. - - - When only the fileReportingPeriod and fileLocation attributes are - present, the MnS producer shall store the files on a MnS consumer, that - can be any entity such as a file server, at the location specified by - fileLocation. No notification is emitted by the MnS producer. + - When only the 'fileReportingPeriod' and 'fileLocation' attributes + are present (CHOICE_3), the MnS producer shall store the files at the + location specified by 'fileLocation'. The file location may identify + any entity such as a file server or a MnS consumer. The identified + MnS consumer may or may not be identical to the MnS consumer creating + the 'PerfMetricJob'. As for CHOICE_1 the MnS producer may emit + 'notifyFileReady' and 'notifyFilePreparationError' notifications to + inform subscribers that a file has been made available at the location + specified by 'fileLocation'. - When only the streamTarget attribute is present, the MnS producer shall stream the data to the location specified by streamTarget. -- GitLab From d0596a8dcd9c1f3064782322620552e7f6bd8d74 Mon Sep 17 00:00:00 2001 From: "U-ERICSSON\\ETHBLL" Date: Thu, 27 Feb 2025 03:36:49 +0100 Subject: [PATCH 315/587] Locally rebased and merged https://forge.3gpp.org/rep/sa5/MnS/-/merge_requests/1551 --- ..._3gpp-common-managementdatacollection.yang | 9 ++------ yang-models/_3gpp-common-measurements.yang | 22 +++++-------------- yang-models/_3gpp-common-trace.yang | 10 +-------- 3 files changed, 8 insertions(+), 33 deletions(-) diff --git a/yang-models/_3gpp-common-managementdatacollection.yang b/yang-models/_3gpp-common-managementdatacollection.yang index 960eba475..68e8a3ad8 100644 --- a/yang-models/_3gpp-common-managementdatacollection.yang +++ b/yang-models/_3gpp-common-managementdatacollection.yang @@ -24,7 +24,7 @@ module _3gpp-common-managementdatacollection { Integration Reference Point (IRP); Information Service (IS)"; - revision 2025-02-07 { reference CR-0505; } + revision 2025-02-07 { reference "CR-0461 CR-0505"; } revision 2024-04-12 { reference CR-0346; } revision 2023-11-18 { reference CR-0299 ; } revision 2023-11-06 { reference "CR-0305"; } @@ -214,12 +214,7 @@ module _3gpp-common-managementdatacollection { The metrics are identified with their names/identifiers. For performance measurements defined in TS 28.552 the name is - constructed as follows: - - 'family.measurementName.subcounter' for measurement types with - subcounters - - 'family.measurementName' for measurement types without - subcounters - - 'family' for measurement families + constructed as the bullet e) of the measurement definition. For KPIs defined in TS 28.554 the name is defined according to the KPI definitions template as the component designated with a). diff --git a/yang-models/_3gpp-common-measurements.yang b/yang-models/_3gpp-common-measurements.yang index 8dff9d525..02df31bf7 100755 --- a/yang-models/_3gpp-common-measurements.yang +++ b/yang-models/_3gpp-common-measurements.yang @@ -56,6 +56,7 @@ module _3gpp-common-measurements { Integration Reference Point (IRP); Information Service (IS)"; + revision 2025-02-07 { reference CR-0461; } revision 2025-01-29 { reference CR-0512; } revision 2024-11-01 { reference CR-0488; } revision 2024-05-06 { reference CR-0359; } @@ -94,13 +95,8 @@ module _3gpp-common-measurements { by other SDOs, or be vendor specific. Performance metrics are identified with their names. - For measurements defined in TS 28.552 the name is constructed as follows: - - 'family.measurementName.subcounter' for measurement types with - subcounters - - 'family.measurementName' for measurement types without subcounters - `- 'family' for measurement families - For KPIs defined in TS 28.554 [28] the name is defined in the KPI - definitions template as the component designated with e). + For measurements defined in TS 28.552 the name is constructed as the + bullet e) of the measurement definition. A name can also identify a vendor specific performance metric or a group of vendor specific performance metrics."; @@ -209,11 +205,7 @@ module _3gpp-common-measurements { Measurements are identified by name. For measurements defined in TS 28.552 the name is constructed as - follows: - - 'family.measurementName.subcounter' for measurement types with - subcounters - - 'family.measurementName' for measurement types without subcounters - - 'family' for measurement families + the bullet e) of the measurement definition. For KPIs defined in TS 28.554 the name is defined in the KPI definitions template as the component designated with e). @@ -283,11 +275,7 @@ module _3gpp-common-measurements { identify a vendor specific group of performance metrics. For measurements defined in TS 28.552 the name is constructed as - follows: - - 'family.measurementName.subcounter' for measurement types with - subcounters - - 'family.measurementName' for measurement types without subcounters - - 'family' for measurement families + the bullet e) of the measurement definition. For KPIs defined in TS 28.554 the name is defined in the KPI definitions template as the component designated with e)."; diff --git a/yang-models/_3gpp-common-trace.yang b/yang-models/_3gpp-common-trace.yang index 23152ebf5..a989450d9 100755 --- a/yang-models/_3gpp-common-trace.yang +++ b/yang-models/_3gpp-common-trace.yang @@ -27,6 +27,7 @@ module _3gpp-common-trace { Information Service (IS)" ; revision 2025-02-07 { reference "CR-0504"; } + revision 2025-02-05 { reference "CR-0461" ; } revision 2024-11-25 { reference CR-0492; } revision 2024-11-07 { reference "CR-0480"; } revision 2024-10-01 { reference "CR-0457"; } @@ -1613,15 +1614,6 @@ module _3gpp-common-trace { The list may include 5GC UE level measurements defined in TS 28.558, or vendor specific measurements. - For 5GC UE level measurements defined in TS 28.558, the name is - constructed as follows: - 'family.measurementName.subcounter' for measurement type with - specified subcounter - 'family.measurementName.ALL' for measurement type with all supported - subcounters - 'family.measurementName' for measurement type without subcounters - 'family' for measurement family, including all measurement types and - the associated subcounters under this family. For non-3GPP specified 5GC UE level measurements the name is defined elsewhere."; } -- GitLab From 64e03575aff7111d60936b12a18c0b1a094eac7c Mon Sep 17 00:00:00 2001 From: Pengxiang Xie Date: Wed, 15 Jan 2025 08:22:44 +0000 Subject: [PATCH 316/587] Update TS28541_5GcNrm.yaml --- OpenAPI/TS28541_5GcNrm.yaml | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/OpenAPI/TS28541_5GcNrm.yaml b/OpenAPI/TS28541_5GcNrm.yaml index c6d1effe4..49d99eeea 100755 --- a/OpenAPI/TS28541_5GcNrm.yaml +++ b/OpenAPI/TS28541_5GcNrm.yaml @@ -142,7 +142,10 @@ components: uniqueItems: true items: $ref: '#/components/schemas/DefaultNotificationSubscription' - + callbackUriPrefixList: + type: array + items: + $ref: '#/components/schemas/DefaultNotificationSubscription' NFStatus: type: string description: any of enumerated value @@ -283,6 +286,15 @@ components: minItems: 1 callbackUriPrefix: $ref: 'TS28623_ComDefs.yaml#/components/schemas/UriRo' + CallbackUriPrefixItem: + type: object + properties: + notificationTypes: + type: array + items: + $ref: '#/components/schemas/notificationType' + callbackUriPrefix: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/UriRo' DefSubServiceInfo: type: object properties: -- GitLab From e0edc257deecd417a1f6cb2103f11d45bcb45112 Mon Sep 17 00:00:00 2001 From: Pengxiang Xie Date: Wed, 15 Jan 2025 08:33:21 +0000 Subject: [PATCH 317/587] Update TS28541_5GcNrm.yaml --- OpenAPI/TS28541_5GcNrm.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OpenAPI/TS28541_5GcNrm.yaml b/OpenAPI/TS28541_5GcNrm.yaml index 49d99eeea..643fa71f5 100755 --- a/OpenAPI/TS28541_5GcNrm.yaml +++ b/OpenAPI/TS28541_5GcNrm.yaml @@ -145,7 +145,7 @@ components: callbackUriPrefixList: type: array items: - $ref: '#/components/schemas/DefaultNotificationSubscription' + $ref: '#/components/schemas/CallbackUriPrefixItem' NFStatus: type: string description: any of enumerated value -- GitLab From a76f4dc22125a29ebb5cd99c727e056075ad1b9e Mon Sep 17 00:00:00 2001 From: Pengxiang Xie Date: Wed, 15 Jan 2025 08:43:49 +0000 Subject: [PATCH 318/587] Update TS28541_5GcNrm.yaml --- OpenAPI/TS28541_5GcNrm.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OpenAPI/TS28541_5GcNrm.yaml b/OpenAPI/TS28541_5GcNrm.yaml index 643fa71f5..7812ed540 100755 --- a/OpenAPI/TS28541_5GcNrm.yaml +++ b/OpenAPI/TS28541_5GcNrm.yaml @@ -292,7 +292,7 @@ components: notificationTypes: type: array items: - $ref: '#/components/schemas/notificationType' + $ref: '#/components/schemas/NotificationType' callbackUriPrefix: $ref: 'TS28623_ComDefs.yaml#/components/schemas/UriRo' DefSubServiceInfo: -- GitLab From f4d323d2ada083e36e5b6b7645430c6834c92481 Mon Sep 17 00:00:00 2001 From: Pengxiang Xie Date: Fri, 17 Jan 2025 03:38:52 +0000 Subject: [PATCH 319/587] Update TS28312_IntentNrm.yaml --- OpenAPI/TS28312_IntentNrm.yaml | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/OpenAPI/TS28312_IntentNrm.yaml b/OpenAPI/TS28312_IntentNrm.yaml index 575f97efd..7472671d8 100644 --- a/OpenAPI/TS28312_IntentNrm.yaml +++ b/OpenAPI/TS28312_IntentNrm.yaml @@ -151,6 +151,11 @@ components: uniqueItems: true items: $ref: '#/components/schemas/Context' + preferenceWeight: + type: integer + minimum: 0 + maximum: 10 + description: It represents the preference information of the Consumer on expectations. required: - expectationId #-------Definition of the generic IntentExpectation dataType ----------# @@ -330,6 +335,12 @@ components: items: $ref: '#/components/schemas/Context' description: It describes the list of constraints and conditions that should apply for a specific expectationTarget. + preferenceWeight: + type: integer + minimum: 0 + maximum: 10 + description: It represents the preference information of the Consumer on expectationTargets. + #-------Definition of the generic ExpectationTarget dataType----------# #-------Definition of the generic Context dataType----------------# -- GitLab From 33c3ae781ea74131223aa6a48ea719b8fe3bdc7e Mon Sep 17 00:00:00 2001 From: Pengxiang Xie Date: Fri, 17 Jan 2025 06:41:43 +0000 Subject: [PATCH 320/587] Update TS28312_IntentNrm.yaml --- OpenAPI/TS28312_IntentNrm.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OpenAPI/TS28312_IntentNrm.yaml b/OpenAPI/TS28312_IntentNrm.yaml index 7472671d8..0fcb60483 100644 --- a/OpenAPI/TS28312_IntentNrm.yaml +++ b/OpenAPI/TS28312_IntentNrm.yaml @@ -151,7 +151,7 @@ components: uniqueItems: true items: $ref: '#/components/schemas/Context' - preferenceWeight: + preferenceWeight: type: integer minimum: 0 maximum: 10 -- GitLab From d27f988a6353d3b5e18f70cc5037f72c508e82a9 Mon Sep 17 00:00:00 2001 From: ruanb Date: Fri, 7 Feb 2025 09:21:20 +0000 Subject: [PATCH 321/587] Rel19_CR1466_TS28.541_add_missing_satelliteCoverageInfoList_for_stage3_OpenAPI --- OpenAPI/TS28541_5GcNrm.yaml | 46 +++++++++++++++++++++++++++++++++---- 1 file changed, 41 insertions(+), 5 deletions(-) diff --git a/OpenAPI/TS28541_5GcNrm.yaml b/OpenAPI/TS28541_5GcNrm.yaml index 7812ed540..a063922dc 100755 --- a/OpenAPI/TS28541_5GcNrm.yaml +++ b/OpenAPI/TS28541_5GcNrm.yaml @@ -178,8 +178,6 @@ components: uniqueItems: true items: $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Tac' - WeightFactor: - type: integer VendorId: type: string description: Vendor ID of the NF Service instance (Private Enterprise Number assigned by IANA) @@ -2675,9 +2673,47 @@ components: blockedLocation: $ref: 'TS28623_ComDefs.yaml#/components/schemas/PlmnId' blockedDurWindow: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/TimeWindow' + type: array + items: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/TimeWindow' blockedSlice: $ref: 'TS28541_NrNrm.yaml#/components/schemas/Snssai' + SatelliteCoverageInfoList: + description: SatelliteCoverageInfoList that relates to NR Satellite RAT type and corresponding information of satellite coverage + type: array + items: + $ref: '#/components/schemas/SatelliteCoverageInfo' + SatelliteCoverageInfo: + description: This datatype defines information related to NR Satellite RAT type and corresponding information of satellite coverage + type: object + properties: + nRSatelliteRATtype: + anyOf: + - type: string + enum: + - NRLEO + - NRMEO + - NRGEO + - NROTHERSAT + - type: string + locationInfo: + type: array + items: + $ref: '#/components/schemas/NtnLocationInfo' + NtnLocationInfo: + description: This datatype defines the information about locations and corresponding time windows + type: object + properties: + location: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/GeoArea' + availabilityWindows: + type: array + items: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/TimeWindow' + nonAvailabilityWindows: + type: array + items: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/TimeWindow' 5GDdnmfInfo: description: Information of an 5G DDNMF NF Instance type: object @@ -3525,8 +3561,6 @@ components: $ref: '#/components/schemas/AmfIdentifier' sBIFqdn: type: string - weightFactor: - $ref: '#/components/schemas/WeightFactor' cNSIIdList: $ref: '#/components/schemas/CNSIIdList' amfSetRef: @@ -3537,6 +3571,8 @@ components: $ref: '#/components/schemas/CommModelList' nTNPLMNRestrictionsList: $ref: '#/components/schemas/NTNPLMNRestrictionsList' + satelliteCoverageInfoList: + $ref: '#/components/schemas/SatelliteCoverageInfoList' amfInfo: $ref: '#/components/schemas/AmfInfo' sliceExpiryInfo: -- GitLab From 248f6ee8731d1897b04ff710f20b25b7ee9f9c63 Mon Sep 17 00:00:00 2001 From: shixixi Date: Tue, 14 Jan 2025 02:16:03 +0000 Subject: [PATCH 322/587] Update TS28541_NrNrm.yaml --- OpenAPI/TS28541_NrNrm.yaml | 19 +++++-------------- 1 file changed, 5 insertions(+), 14 deletions(-) diff --git a/OpenAPI/TS28541_NrNrm.yaml b/OpenAPI/TS28541_NrNrm.yaml index 452d843e9..93a21737a 100755 --- a/OpenAPI/TS28541_NrNrm.yaml +++ b/OpenAPI/TS28541_NrNrm.yaml @@ -189,20 +189,11 @@ components: type: integer minimum: 0 maximum: 100 - maxNumberOfPreamblesSent: - type: string - enum: - - n3 - - n4 - - n5 - - n6 - - n7 - - n8 - - n10 - - n20 - - n50 - - n100 - - n200 + NumberOfPreamblesSent: + type: integer + minimum: 0 + maximum: 200 + UeAccDelayProbabilityDist: type: array -- GitLab From 811866909d4386cdf911e105686c62aa3cebcfcd Mon Sep 17 00:00:00 2001 From: Shitao Li Date: Thu, 20 Feb 2025 08:43:51 +0000 Subject: [PATCH 323/587] Update TS28104_MdaNrm.yaml --- OpenAPI/TS28104_MdaNrm.yaml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/OpenAPI/TS28104_MdaNrm.yaml b/OpenAPI/TS28104_MdaNrm.yaml index 8aefa574d..a36c777d5 100644 --- a/OpenAPI/TS28104_MdaNrm.yaml +++ b/OpenAPI/TS28104_MdaNrm.yaml @@ -203,7 +203,12 @@ components: $ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTime' recommendationFilter: $ref: '#/components/schemas/AnalyticsScopeType' - + performanceThresholdInfo: + type: array + items: + $ref: 'TS28623_ThresholdMonitorNrm.yaml#/components/schemas/ThresholdInfo' + thresholdMonitorRefList: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList' MDAReport-Single: $ref: 'TS28104_MdaReport.yaml#/components/schemas/MDAReport' -- GitLab From fa90521abf0649c0da981e3119429e2e2477fcef Mon Sep 17 00:00:00 2001 From: shumim Date: Wed, 5 Feb 2025 05:23:53 +0000 Subject: [PATCH 324/587] Add attributes to support 5G Prose multi-hop relay services --- OpenAPI/TS28541_5GcNrm.yaml | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/OpenAPI/TS28541_5GcNrm.yaml b/OpenAPI/TS28541_5GcNrm.yaml index a063922dc..fe2d5d5c1 100755 --- a/OpenAPI/TS28541_5GcNrm.yaml +++ b/OpenAPI/TS28541_5GcNrm.yaml @@ -904,6 +904,33 @@ components: proseL3RemoteUe: type: boolean default: false + proseL2UetoUeRelay: + type: boolean + default: false + proseL3UetoUeRelay: + type: boolean + default: false + proseL2EndUe: + type: boolean + default: false + proseL3EndUe: + type: boolean + default: false + proseL3IntermRelay: + type: boolean + default: false + proseL3MultihopRemote: + type: boolean + default: false + proseL3NetMultihopRelay: + type: boolean + default: false + proseL3UeMultihopRelay: + type: boolean + default: false + proseL3EndUeMultihop: + type: boolean + default: false V2xCapability: type: object properties: -- GitLab From e6a0016a25c0d524324899ffbf9beb8b24e6be23 Mon Sep 17 00:00:00 2001 From: Shitao Li Date: Fri, 7 Feb 2025 06:41:35 +0000 Subject: [PATCH 325/587] Update TS28538_EdgeNrm.yaml --- OpenAPI/TS28538_EdgeNrm.yaml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/OpenAPI/TS28538_EdgeNrm.yaml b/OpenAPI/TS28538_EdgeNrm.yaml index b4fc616cb..d4ac66e35 100644 --- a/OpenAPI/TS28538_EdgeNrm.yaml +++ b/OpenAPI/TS28538_EdgeNrm.yaml @@ -275,6 +275,10 @@ components: type: boolean default: FALSE - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' + - type: object + properties: + ManagedEdgeNFService: + $ref: '#/components/schemas/ManagedEdgeNFService-Multiple' EASProfile-Single: allOf: - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' -- GitLab From 48b40eb865cfc1c489c178e263472857d4d714e5 Mon Sep 17 00:00:00 2001 From: shumim Date: Fri, 7 Feb 2025 08:32:51 +0000 Subject: [PATCH 326/587] For Rel19_CR1470_TS28.541_Add_Attributes_to_support_5GS_Functions_Onboard_NTN --- OpenAPI/TS28541_5GcNrm.yaml | 7 ++++++- OpenAPI/TS28541_NrNrm.yaml | 19 +++++++++++++++++-- 2 files changed, 23 insertions(+), 3 deletions(-) diff --git a/OpenAPI/TS28541_5GcNrm.yaml b/OpenAPI/TS28541_5GcNrm.yaml index fe2d5d5c1..c535dc040 100755 --- a/OpenAPI/TS28541_5GcNrm.yaml +++ b/OpenAPI/TS28541_5GcNrm.yaml @@ -3789,7 +3789,12 @@ components: type: array uniqueItems: true items: - $ref: '#/components/schemas/UpfInfo' + $ref: '#/components/schemas/UpfInfo' + isOnboardSatellite: + type: boolean + onboardSatelliteId: + type: string + pattern: '^[0-9]{5}$' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' - $ref: '#/components/schemas/ManagedFunction5GC-nc0' - type: object diff --git a/OpenAPI/TS28541_NrNrm.yaml b/OpenAPI/TS28541_NrNrm.yaml index 93a21737a..8023f5975 100755 --- a/OpenAPI/TS28541_NrNrm.yaml +++ b/OpenAPI/TS28541_NrNrm.yaml @@ -49,6 +49,10 @@ components: type: string pattern: '^[A-Fa-f0-9]{6}$' + SatelliteId: + type: string + pattern: '^[0-9]{5}$' + PlmnIdList: type: array uniqueItems: true @@ -622,8 +626,7 @@ components: - epochTime properties: satelliteId: - type: string - pattern: '^[0-9]{5}$' + $ref: '#/components/schemas/SatelliteId' epochTime: $ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTime' positionVelocity: @@ -853,6 +856,10 @@ components: $ref: '#/components/schemas/GnbId' gnbIdLength: $ref: '#/components/schemas/GnbIdLength' + isOnboardSatellite: + type: boolean + onboardSatelliteId: + $ref: '#/components/schemas/SatelliteId' rimRSReportConf: $ref: '#/components/schemas/RimRSReportConf' configurable5QISetRef: @@ -924,6 +931,10 @@ components: $ref: '#/components/schemas/GnbIdLength' gnbCuUpId: $ref: '#/components/schemas/GnbCuUpId' + isOnboardSatellite: + type: boolean + onboardSatelliteId: + $ref: '#/components/schemas/SatelliteId' plmnInfoList: $ref: '#/components/schemas/PlmnInfoList' configurable5QISetRef: @@ -988,6 +999,10 @@ components: items: $ref: '#/components/schemas/MappingSetIDBackhaulAddress' minItems: 1 + isOnboardSatellite: + type: boolean + onboardSatelliteId: + $ref: '#/components/schemas/SatelliteId' tceIDMappingInfoList: $ref: '#/components/schemas/TceIDMappingInfoList' configurable5QISetRef: -- GitLab From 25befe67163ab6ab11484959399a832ff1f3910b Mon Sep 17 00:00:00 2001 From: Zhen Xing Date: Fri, 14 Feb 2025 08:25:22 +0000 Subject: [PATCH 327/587] Update TS28541_NrNrm.yaml --- OpenAPI/TS28541_NrNrm.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/OpenAPI/TS28541_NrNrm.yaml b/OpenAPI/TS28541_NrNrm.yaml index 8023f5975..c177f4e7e 100755 --- a/OpenAPI/TS28541_NrNrm.yaml +++ b/OpenAPI/TS28541_NrNrm.yaml @@ -286,6 +286,7 @@ components: type: string enum: - INITIAL + - INITIAL-REDCAP - OTHER IsESCoveredBy: type: string -- GitLab From af83847e6114fd4e6f7dfc6ffb75d44e1bf18229 Mon Sep 17 00:00:00 2001 From: Zhen Xing Date: Fri, 14 Feb 2025 08:39:37 +0000 Subject: [PATCH 328/587] Update TS28541_NrNrm.yaml --- OpenAPI/TS28541_NrNrm.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OpenAPI/TS28541_NrNrm.yaml b/OpenAPI/TS28541_NrNrm.yaml index c177f4e7e..acbc1c5ea 100755 --- a/OpenAPI/TS28541_NrNrm.yaml +++ b/OpenAPI/TS28541_NrNrm.yaml @@ -286,7 +286,7 @@ components: type: string enum: - INITIAL - - INITIAL-REDCAP + - INITIAL_REDCAP - OTHER IsESCoveredBy: type: string -- GitLab From 03927bf8314d65a786a5c9239d9d70270b5160cc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jose=20Antonio=20Ordo=C3=B1ez=20Lucena?= Date: Fri, 31 Jan 2025 12:05:56 +0000 Subject: [PATCH 329/587] Update TS28623_TraceControlNrm.yaml with appropriate ENUM value conventions. --- OpenAPI/TS28623_TraceControlNrm.yaml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/OpenAPI/TS28623_TraceControlNrm.yaml b/OpenAPI/TS28623_TraceControlNrm.yaml index d7ceac452..61ccad6ae 100644 --- a/OpenAPI/TS28623_TraceControlNrm.yaml +++ b/OpenAPI/TS28623_TraceControlNrm.yaml @@ -455,9 +455,9 @@ components: type: string description: Specifies whether file-based or streaming reporting shall be used for this Trace Session. See 3GPP TS 32.422 clause 5.11 for additional details. enum: - - FILE-BASED + - FILE_BASED - STREAMING - default: FILE-BASED + default: FILE_BASED traceTarget-Type: type: object @@ -471,8 +471,8 @@ components: - IMEISV - PUBLIC_ID - UTRAN_CELL - - E-UTRAN_CELL - - NG-RAN_CELL + - E_UTRAN_CELL + - NG_RAN_CELL - ENB - RNC - GNB -- GitLab From 68754ef221069cf22628e554d79604fde7db142c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jose=20Antonio=20Ordo=C3=B1ez=20Lucena?= Date: Fri, 31 Jan 2025 12:12:22 +0000 Subject: [PATCH 330/587] Update TS28623_TraceControlNrm.yaml --- OpenAPI/TS28623_TraceControlNrm.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OpenAPI/TS28623_TraceControlNrm.yaml b/OpenAPI/TS28623_TraceControlNrm.yaml index 61ccad6ae..383e229d8 100644 --- a/OpenAPI/TS28623_TraceControlNrm.yaml +++ b/OpenAPI/TS28623_TraceControlNrm.yaml @@ -4,7 +4,7 @@ info: version: 19.2.0 description: >- OAS 3.0.1 definition of the Trace Control NRM fragment - © 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). + © 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved. externalDocs: description: 3GPP TS 28.623; Generic NRM,Trace Control NRM -- GitLab From 4e2255c778ce2507ca50a89902ce4f093e9937b9 Mon Sep 17 00:00:00 2001 From: ruiyue Date: Fri, 28 Feb 2025 08:53:09 +0000 Subject: [PATCH 331/587] Code Moderator manually merge MR 1553 --- OpenAPI/TS28541_5GcNrm.yaml | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/OpenAPI/TS28541_5GcNrm.yaml b/OpenAPI/TS28541_5GcNrm.yaml index c535dc040..f154699cb 100755 --- a/OpenAPI/TS28541_5GcNrm.yaml +++ b/OpenAPI/TS28541_5GcNrm.yaml @@ -146,6 +146,24 @@ components: type: array items: $ref: '#/components/schemas/CallbackUriPrefixItem' + supportedFeatures: + type: string + supportedVendorSpecificFeatures: + description: A map (list of key-value pairs) where IANA-assigned "SMI Network Management Private Enterprise Codes" serves as key + type: object + additionalProperties: + type: array + items: + $ref: '#/components/schemas/VendorSpecificFeature' + minItems: 1 + minProperties: 1 + VendorSpecificFeature: + type: object + properties: + featureName: + type: string + featureVersion: + type: string NFStatus: type: string description: any of enumerated value -- GitLab From 35be38cd81f0b66ef5403cf6241fcc3c5b3b0a31 Mon Sep 17 00:00:00 2001 From: mcdonnelleo Date: Fri, 31 Jan 2025 11:49:55 +0000 Subject: [PATCH 332/587] Update TS28538_EdgeNrm.yaml --- OpenAPI/TS28538_EdgeNrm.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OpenAPI/TS28538_EdgeNrm.yaml b/OpenAPI/TS28538_EdgeNrm.yaml index d4ac66e35..71eebf1f6 100644 --- a/OpenAPI/TS28538_EdgeNrm.yaml +++ b/OpenAPI/TS28538_EdgeNrm.yaml @@ -445,7 +445,7 @@ components: properties: federationID: type: string - FederationExpiry: + federationExpiry: $ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTime' leadingOPiD: type: string -- GitLab From 6a34a7ac0a5d76dce6342812b4dc395404c1daed Mon Sep 17 00:00:00 2001 From: gautamd Date: Wed, 12 Feb 2025 07:15:35 +0000 Subject: [PATCH 333/587] Update TS28541_NrNrm.yaml --- OpenAPI/TS28541_NrNrm.yaml | 55 ++++++++++++++++++++++++++++++++++++-- 1 file changed, 53 insertions(+), 2 deletions(-) diff --git a/OpenAPI/TS28541_NrNrm.yaml b/OpenAPI/TS28541_NrNrm.yaml index acbc1c5ea..8b78ba630 100755 --- a/OpenAPI/TS28541_NrNrm.yaml +++ b/OpenAPI/TS28541_NrNrm.yaml @@ -755,7 +755,47 @@ components: - M8 - M9 - MDT_UE_LOCATION - + URSPInfo: + type: object + properties: + applicationID: + type: integer + destinationIPInfo: + type: integer + destinationIPInfo: + type: integer + nonIPDescriptiors: + type: string + dNNs: + type: string + connectionCapabilities: + type: string + enum: + - IMS + - MMS + - INTERNET + destinationFQDN: + type: string + pINID: + type: string + connectivityGrpId: + type: string + ApplicationID: + type: object + properties: + oSID: + type: string + oSAppId: + type: string + DestinationIPInfo: + type: object + properties: + iPAddress: + type: string + port: + type: string + protocolID: + type: string #-------- Definition of types for name-containments ------ SubNetwork-ncO-NrNrm: type: object @@ -2191,7 +2231,18 @@ components: $ref: 'TS28623_ComDefs.yaml#/components/schemas/AdministrativeState' operationalState: $ref: 'TS28623_ComDefs.yaml#/components/schemas/OperationalState' - + allowedPLMNInfo: + $ref: '#/components/schemas/PlmnInfo' + allowedArea: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/GeoArea' + allowedTime: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTime' + relatedN2URSPInfo: + $ref: '#/components/schemas/PlmnInfo' + relatedN3URSPInfo: + $ref: '#/components/schemas/PlmnInfo' + relatedXnURSPInfo: + $ref: '#/components/schemas/PlmnInfo' NRECMappingRule-Single: allOf: - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' -- GitLab From 043baaa980019767db9e60997181f8252f187f29 Mon Sep 17 00:00:00 2001 From: gautamd Date: Wed, 12 Feb 2025 07:18:09 +0000 Subject: [PATCH 334/587] Update TS28541_NrNrm.yaml --- OpenAPI/TS28541_NrNrm.yaml | 2 -- 1 file changed, 2 deletions(-) diff --git a/OpenAPI/TS28541_NrNrm.yaml b/OpenAPI/TS28541_NrNrm.yaml index 8b78ba630..4c33cc5c6 100755 --- a/OpenAPI/TS28541_NrNrm.yaml +++ b/OpenAPI/TS28541_NrNrm.yaml @@ -762,8 +762,6 @@ components: type: integer destinationIPInfo: type: integer - destinationIPInfo: - type: integer nonIPDescriptiors: type: string dNNs: -- GitLab From f274a0b6bde1a77ae9a79a5b6a6e572a2fb0675f Mon Sep 17 00:00:00 2001 From: gautamd Date: Thu, 20 Feb 2025 12:55:43 +0000 Subject: [PATCH 335/587] Update TS28541_NrNrm.yaml --- OpenAPI/TS28541_NrNrm.yaml | 52 +++----------------------------------- 1 file changed, 3 insertions(+), 49 deletions(-) diff --git a/OpenAPI/TS28541_NrNrm.yaml b/OpenAPI/TS28541_NrNrm.yaml index 4c33cc5c6..3d0b1dd69 100755 --- a/OpenAPI/TS28541_NrNrm.yaml +++ b/OpenAPI/TS28541_NrNrm.yaml @@ -755,45 +755,6 @@ components: - M8 - M9 - MDT_UE_LOCATION - URSPInfo: - type: object - properties: - applicationID: - type: integer - destinationIPInfo: - type: integer - nonIPDescriptiors: - type: string - dNNs: - type: string - connectionCapabilities: - type: string - enum: - - IMS - - MMS - - INTERNET - destinationFQDN: - type: string - pINID: - type: string - connectivityGrpId: - type: string - ApplicationID: - type: object - properties: - oSID: - type: string - oSAppId: - type: string - DestinationIPInfo: - type: object - properties: - iPAddress: - type: string - port: - type: string - protocolID: - type: string #-------- Definition of types for name-containments ------ SubNetwork-ncO-NrNrm: type: object @@ -2228,19 +2189,12 @@ components: administrativeState: $ref: 'TS28623_ComDefs.yaml#/components/schemas/AdministrativeState' operationalState: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/OperationalState' - allowedPLMNInfo: - $ref: '#/components/schemas/PlmnInfo' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/OperationalState' allowedArea: $ref: 'TS28623_ComDefs.yaml#/components/schemas/GeoArea' allowedTime: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTime' - relatedN2URSPInfo: - $ref: '#/components/schemas/PlmnInfo' - relatedN3URSPInfo: - $ref: '#/components/schemas/PlmnInfo' - relatedXnURSPInfo: - $ref: '#/components/schemas/PlmnInfo' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTime' + NRECMappingRule-Single: allOf: - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' -- GitLab From e01b4437974d30bf4ba33cef4198c0d39b821617 Mon Sep 17 00:00:00 2001 From: gautamd Date: Thu, 20 Feb 2025 17:27:36 +0000 Subject: [PATCH 336/587] Update TS28541_NrNrm.yaml --- OpenAPI/TS28541_NrNrm.yaml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/OpenAPI/TS28541_NrNrm.yaml b/OpenAPI/TS28541_NrNrm.yaml index 3d0b1dd69..7b49f8f3e 100755 --- a/OpenAPI/TS28541_NrNrm.yaml +++ b/OpenAPI/TS28541_NrNrm.yaml @@ -2191,9 +2191,13 @@ components: operationalState: $ref: 'TS28623_ComDefs.yaml#/components/schemas/OperationalState' allowedArea: + type: array + items: $ref: 'TS28623_ComDefs.yaml#/components/schemas/GeoArea' allowedTime: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTime' + type: array + items: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTime' NRECMappingRule-Single: allOf: -- GitLab From 81b55e61379949e0e7dd56b7b236bb7cae91afa8 Mon Sep 17 00:00:00 2001 From: "U-ERICSSON\\ETHBLL" Date: Mon, 6 Jan 2025 19:57:00 +0100 Subject: [PATCH 337/587] Updated components/schemas/NotificationHeader --- OpenAPI/TS28623_ComDefs.yaml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/OpenAPI/TS28623_ComDefs.yaml b/OpenAPI/TS28623_ComDefs.yaml index d80f95b91..930d64bdf 100755 --- a/OpenAPI/TS28623_ComDefs.yaml +++ b/OpenAPI/TS28623_ComDefs.yaml @@ -409,6 +409,10 @@ components: $ref: '#/components/schemas/DateTime' systemDN: $ref: '#/components/schemas/SystemDN' + sequnceNo: + type: integer + subscriptionId: + type: string required: - href - notificationId -- GitLab From 7dc7e6014a01146820653324f3f9fdd300d9f1da Mon Sep 17 00:00:00 2001 From: "U-ERICSSON\\ETHBLL" Date: Tue, 7 Jan 2025 12:09:05 +0100 Subject: [PATCH 338/587] Corrected sequnceNo typo --- OpenAPI/TS28623_ComDefs.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OpenAPI/TS28623_ComDefs.yaml b/OpenAPI/TS28623_ComDefs.yaml index 930d64bdf..b88602da4 100755 --- a/OpenAPI/TS28623_ComDefs.yaml +++ b/OpenAPI/TS28623_ComDefs.yaml @@ -409,7 +409,7 @@ components: $ref: '#/components/schemas/DateTime' systemDN: $ref: '#/components/schemas/SystemDN' - sequnceNo: + sequenceNo: type: integer subscriptionId: type: string -- GitLab From e29ce33e34169bbf62699f12116dd747ff2b78cc Mon Sep 17 00:00:00 2001 From: ruiyue Date: Fri, 28 Feb 2025 09:15:24 +0000 Subject: [PATCH 339/587] Code Moderator manually merge MR 1535 --- OpenAPI/TS28111_FaultNrm.yaml | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/OpenAPI/TS28111_FaultNrm.yaml b/OpenAPI/TS28111_FaultNrm.yaml index 321b34cc5..ced0e0f82 100644 --- a/OpenAPI/TS28111_FaultNrm.yaml +++ b/OpenAPI/TS28111_FaultNrm.yaml @@ -360,6 +360,8 @@ components: $ref: '#/components/schemas/AlarmType' probableCause: $ref: '#/components/schemas/ProbableCause' + specificProblem: + $ref: '#/components/schemas/SpecificProblem' perceivedSeverity: $ref: '#/components/schemas/PerceivedSeverity' correlatedNotifications: @@ -384,6 +386,8 @@ components: $ref: '#/components/schemas/AlarmType' probableCause: $ref: '#/components/schemas/ProbableCause' + specificProblem: + $ref: '#/components/schemas/SpecificProblem' perceivedSeverity: $ref: '#/components/schemas/PerceivedSeverity' NotifyChangedAlarmGeneral: @@ -393,6 +397,7 @@ components: required: - alarmId - alarmType + - probableCause properties: alarmId: $ref: '#/components/schemas/AlarmId' @@ -435,6 +440,7 @@ components: required: - alarmId - alarmType + - probableCause - serviceUser - serviceProvider - securityAlarmDetector @@ -445,6 +451,8 @@ components: $ref: '#/components/schemas/AlarmType' probableCause: $ref: '#/components/schemas/ProbableCause' + specificProblem: + $ref: '#/components/schemas/SpecificProblem' perceivedSeverity: $ref: '#/components/schemas/PerceivedSeverity' correlatedNotifications: @@ -470,9 +478,17 @@ components: required: - alarmId - correlatedNotifications + - alarmType + - probableCause properties: alarmId: $ref: '#/components/schemas/AlarmId' + alarmType: + $ref: '#/components/schemas/AlarmType' + probableCause: + $ref: '#/components/schemas/ProbableCause' + specificProblem: + $ref: '#/components/schemas/SpecificProblem' correlatedNotifications: $ref: '#/components/schemas/CorrelatedNotifications' rootCauseIndicator: @@ -495,6 +511,8 @@ components: $ref: '#/components/schemas/AlarmType' probableCause: $ref: '#/components/schemas/ProbableCause' + specificProblem: + $ref: '#/components/schemas/SpecificProblem' perceivedSeverity: $ref: '#/components/schemas/PerceivedSeverity' ackState: @@ -520,6 +538,8 @@ components: $ref: '#/components/schemas/AlarmType' probableCause: $ref: '#/components/schemas/ProbableCause' + specificProblem: + $ref: '#/components/schemas/SpecificProblem' perceivedSeverity: $ref: '#/components/schemas/PerceivedSeverity' comments: -- GitLab From 712b232caaef9dd6d80d81a6a1bb3ea5fa995438 Mon Sep 17 00:00:00 2001 From: ruiyue Date: Fri, 28 Feb 2025 09:58:14 +0000 Subject: [PATCH 340/587] Code Moderator update the copyright and version --- OpenAPI/TS28104_MdaNrm.yaml | 4 ++-- OpenAPI/TS28104_MdaReport.yaml | 4 ++-- OpenAPI/TS28105_AiMlNrm.yaml | 4 ++-- OpenAPI/TS28111_FaultNrm.yaml | 4 ++-- OpenAPI/TS28312_IntentExpectations.yaml | 4 ++-- OpenAPI/TS28312_IntentNrm.yaml | 4 ++-- OpenAPI/TS28532_ProvMnS.yaml | 4 ++-- OpenAPI/TS28532_StreamingDataMnS.yaml | 4 ++-- OpenAPI/TS28536_CoslaNrm.yaml | 4 ++-- OpenAPI/TS28538_EdgeNrm.yaml | 4 ++-- OpenAPI/TS28541_5GcNrm.yaml | 4 ++-- OpenAPI/TS28541_NrNrm.yaml | 4 ++-- OpenAPI/TS28541_SliceNrm.yaml | 4 ++-- OpenAPI/TS28550_PerfMeasJobCtrlMnS.yaml | 2 +- OpenAPI/TS28623_ComDefs.yaml | 4 ++-- OpenAPI/TS28623_MnSRegistryNrm.yaml | 4 ++-- OpenAPI/TS28623_QoEMeasurementCollectionNrm.yaml | 2 +- OpenAPI/TS28623_TraceControlNrm.yaml | 2 +- 18 files changed, 33 insertions(+), 33 deletions(-) diff --git a/OpenAPI/TS28104_MdaNrm.yaml b/OpenAPI/TS28104_MdaNrm.yaml index a36c777d5..babe49e8f 100644 --- a/OpenAPI/TS28104_MdaNrm.yaml +++ b/OpenAPI/TS28104_MdaNrm.yaml @@ -1,10 +1,10 @@ openapi: 3.0.1 info: title: MDA NRM - version: 19.0.0 + version: 19.1.0 description: >- OAS 3.0.1 specification of the MDA NRM - © 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). + © 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved. externalDocs: description: 3GPP TS 28.104; MDA diff --git a/OpenAPI/TS28104_MdaReport.yaml b/OpenAPI/TS28104_MdaReport.yaml index 188c222d2..46eaca579 100644 --- a/OpenAPI/TS28104_MdaReport.yaml +++ b/OpenAPI/TS28104_MdaReport.yaml @@ -1,10 +1,10 @@ openapi: 3.0.1 info: title: MDA Report - version: 19.0.0 + version: 19.1.0 description: >- OAS 3.0.1 specification of the MDA Report - © 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). + © 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved. externalDocs: description: 3GPP TS 28.104; MDA Report diff --git a/OpenAPI/TS28105_AiMlNrm.yaml b/OpenAPI/TS28105_AiMlNrm.yaml index 2c690d276..f76a2a491 100644 --- a/OpenAPI/TS28105_AiMlNrm.yaml +++ b/OpenAPI/TS28105_AiMlNrm.yaml @@ -1,10 +1,10 @@ openapi: 3.0.1 info: title: AI/ML NRM - version: 19.1.0 + version: 19.2.0 description: >- OAS 3.0.1 specification of the AI/ML NRM - © 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). + © 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved. externalDocs: description: 3GPP TS 28.105; AI/ML Management diff --git a/OpenAPI/TS28111_FaultNrm.yaml b/OpenAPI/TS28111_FaultNrm.yaml index ced0e0f82..1ea8c64e9 100644 --- a/OpenAPI/TS28111_FaultNrm.yaml +++ b/OpenAPI/TS28111_FaultNrm.yaml @@ -1,10 +1,10 @@ openapi: 3.0.1 info: title: Fault Management NRM - version: 19.0.0 + version: 19.1.0 description: >- OAS 3.0.1 definition of the Fault Supervision MnS - © 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). + © 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved. externalDocs: description: 3GPP TS 28.111; Fault Management diff --git a/OpenAPI/TS28312_IntentExpectations.yaml b/OpenAPI/TS28312_IntentExpectations.yaml index a987a4538..157ebfe8e 100644 --- a/OpenAPI/TS28312_IntentExpectations.yaml +++ b/OpenAPI/TS28312_IntentExpectations.yaml @@ -1,10 +1,10 @@ openapi: 3.0.1 info: title: Scenario specific Intent Expectations - version: 19.0.0 + version: 19.1.0 description: >- OAS 3.0.1 definition of scenario specific Intent Expectations - © 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). + © 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved. externalDocs: description: 3GPP TS 28.312; Intent driven management services for mobile networks diff --git a/OpenAPI/TS28312_IntentNrm.yaml b/OpenAPI/TS28312_IntentNrm.yaml index 0fcb60483..1f08fd187 100644 --- a/OpenAPI/TS28312_IntentNrm.yaml +++ b/OpenAPI/TS28312_IntentNrm.yaml @@ -1,10 +1,10 @@ openapi: 3.0.1 info: title: Intent NRM - version: 19.0.0 + version: 19.1.0 description: >- OAS 3.0.1 definition of the Intent NRM - © 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). + © 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved. externalDocs: description: 3GPP TS 28.312; Intent driven management services for mobile networks diff --git a/OpenAPI/TS28532_ProvMnS.yaml b/OpenAPI/TS28532_ProvMnS.yaml index 5ba1b679f..6c23bf257 100755 --- a/OpenAPI/TS28532_ProvMnS.yaml +++ b/OpenAPI/TS28532_ProvMnS.yaml @@ -1,10 +1,10 @@ openapi: 3.0.1 info: title: Provisioning MnS - version: 18.5.0 + version: 19.0.0 description: >- OAS 3.0.1 definition of the Provisioning MnS - © 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). + © 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved. externalDocs: description: 3GPP TS 28.532; Generic management services diff --git a/OpenAPI/TS28532_StreamingDataMnS.yaml b/OpenAPI/TS28532_StreamingDataMnS.yaml index bcac29257..82ce927d5 100755 --- a/OpenAPI/TS28532_StreamingDataMnS.yaml +++ b/OpenAPI/TS28532_StreamingDataMnS.yaml @@ -1,10 +1,10 @@ openapi: 3.0.1 info: title: TS 28.532 Streaming data reporting service - version: 18.1.0 + version: 19.0.0 description: >- OAS 3.0.1 specification for the Streaming data reporting service (Streaming MnS) - © 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). + © 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved. servers: - url: '{MnSRoot}/StreamingDataReportingMnS/{MnSVersion}' diff --git a/OpenAPI/TS28536_CoslaNrm.yaml b/OpenAPI/TS28536_CoslaNrm.yaml index c179fe3b1..47ddfaa2c 100755 --- a/OpenAPI/TS28536_CoslaNrm.yaml +++ b/OpenAPI/TS28536_CoslaNrm.yaml @@ -2,10 +2,10 @@ openapi: 3.0.1 info: title: coslaNrm - version: 19.0.0 + version: 19.1.0 description: >- OAS 3.0.1 specification of the Cosla NRM - © 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). + © 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved. externalDocs: diff --git a/OpenAPI/TS28538_EdgeNrm.yaml b/OpenAPI/TS28538_EdgeNrm.yaml index 71eebf1f6..3aa0bbfa7 100644 --- a/OpenAPI/TS28538_EdgeNrm.yaml +++ b/OpenAPI/TS28538_EdgeNrm.yaml @@ -1,10 +1,10 @@ openapi: 3.0.1 info: title: 3GPP Edge NRM - version: 19.2.0 + version: 19.3.0 description: >- OAS 3.0.1 specification of the Edge NRM - © 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). + © 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved. externalDocs: description: 3GPP TS 28.538; Edge NRM diff --git a/OpenAPI/TS28541_5GcNrm.yaml b/OpenAPI/TS28541_5GcNrm.yaml index f154699cb..0cab03904 100755 --- a/OpenAPI/TS28541_5GcNrm.yaml +++ b/OpenAPI/TS28541_5GcNrm.yaml @@ -1,10 +1,10 @@ openapi: 3.0.1 info: title: 3GPP 5GC NRM - version: 19.2.0 + version: 19.3.0 description: >- OAS 3.0.1 specification of the 5GC NRM - © 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). + © 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved. externalDocs: description: 3GPP TS 28.541; 5G NRM, 5GC NRM diff --git a/OpenAPI/TS28541_NrNrm.yaml b/OpenAPI/TS28541_NrNrm.yaml index 7b49f8f3e..4f85f0025 100755 --- a/OpenAPI/TS28541_NrNrm.yaml +++ b/OpenAPI/TS28541_NrNrm.yaml @@ -1,10 +1,10 @@ openapi: 3.0.1 info: title: NR NRM - version: 19.2.0 + version: 19.3.0 description: >- OAS 3.0.1 specification of the NR NRM - © 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). + © 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved. externalDocs: description: 3GPP TS 28.541; 5G NRM, NR NRM diff --git a/OpenAPI/TS28541_SliceNrm.yaml b/OpenAPI/TS28541_SliceNrm.yaml index 92192eb0c..b65edbc63 100755 --- a/OpenAPI/TS28541_SliceNrm.yaml +++ b/OpenAPI/TS28541_SliceNrm.yaml @@ -1,10 +1,10 @@ openapi: 3.0.1 info: title: Slice NRM - version: 19.2.0 + version: 19.3.0 description: >- OAS 3.0.1 specification of the Slice NRM - @ 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). + @ 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved. externalDocs: description: 3GPP TS 28.541; 5G NRM, Slice NRM diff --git a/OpenAPI/TS28550_PerfMeasJobCtrlMnS.yaml b/OpenAPI/TS28550_PerfMeasJobCtrlMnS.yaml index 1bded8d4c..4dc673d5d 100755 --- a/OpenAPI/TS28550_PerfMeasJobCtrlMnS.yaml +++ b/OpenAPI/TS28550_PerfMeasJobCtrlMnS.yaml @@ -1,7 +1,7 @@ openapi: 3.0.1 info: title: TS 28.550 Performance Measurement Job Control Service - version: 18.1.0 + version: 19.0.0 description: >- OAS 3.0.1 specification of the Performance Measurement Job Control Service @ 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). diff --git a/OpenAPI/TS28623_ComDefs.yaml b/OpenAPI/TS28623_ComDefs.yaml index b88602da4..3742ff064 100755 --- a/OpenAPI/TS28623_ComDefs.yaml +++ b/OpenAPI/TS28623_ComDefs.yaml @@ -1,10 +1,10 @@ openapi: 3.0.1 info: title: Common Type Definitions - version: 19.2.0 + version: 19.3.0 description: >- OAS 3.0.1 specification of common type definitions in the Generic NRM - © 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). + © 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved. externalDocs: description: 3GPP TS 28.623; Generic NRM; Common type definitions diff --git a/OpenAPI/TS28623_MnSRegistryNrm.yaml b/OpenAPI/TS28623_MnSRegistryNrm.yaml index b4e8c68e3..70e245c10 100644 --- a/OpenAPI/TS28623_MnSRegistryNrm.yaml +++ b/OpenAPI/TS28623_MnSRegistryNrm.yaml @@ -1,10 +1,10 @@ openapi: 3.0.1 info: title: MnS Registry NRM - version: 19.2.0 + version: 19.3.0 description: >- OAS 3.0.1 definition of the MnS Registry NRM fragment - © 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). + © 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved. externalDocs: description: 3GPP TS 28.623; Generic NRM, MnS Registry NRM diff --git a/OpenAPI/TS28623_QoEMeasurementCollectionNrm.yaml b/OpenAPI/TS28623_QoEMeasurementCollectionNrm.yaml index 5ac351443..90151f4bf 100644 --- a/OpenAPI/TS28623_QoEMeasurementCollectionNrm.yaml +++ b/OpenAPI/TS28623_QoEMeasurementCollectionNrm.yaml @@ -1,7 +1,7 @@ openapi: 3.0.1 info: title: QoE Measurement Collection NRM - version: 19.2.0 + version: 19.3.0 description: >- OAS 3.0.1 definition of the QoE Measurement Collection NRM © 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). diff --git a/OpenAPI/TS28623_TraceControlNrm.yaml b/OpenAPI/TS28623_TraceControlNrm.yaml index 383e229d8..b335275c8 100644 --- a/OpenAPI/TS28623_TraceControlNrm.yaml +++ b/OpenAPI/TS28623_TraceControlNrm.yaml @@ -1,7 +1,7 @@ openapi: 3.0.1 info: title: Trace Control NRM - version: 19.2.0 + version: 19.3.0 description: >- OAS 3.0.1 definition of the Trace Control NRM fragment © 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). -- GitLab From f2f5bfb0659da0b70484eba7c8fcc84f878cd229 Mon Sep 17 00:00:00 2001 From: "U-ERICSSON\\ETHBLL" Date: Thu, 9 Jan 2025 17:43:55 +0100 Subject: [PATCH 341/587] Rel-19 CR 28.111 Add missing input parameters --- OpenAPI/TS28111_FaultNrm.yaml | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/OpenAPI/TS28111_FaultNrm.yaml b/OpenAPI/TS28111_FaultNrm.yaml index 321b34cc5..66f4ae6c9 100644 --- a/OpenAPI/TS28111_FaultNrm.yaml +++ b/OpenAPI/TS28111_FaultNrm.yaml @@ -360,6 +360,8 @@ components: $ref: '#/components/schemas/AlarmType' probableCause: $ref: '#/components/schemas/ProbableCause' + specificProblem: + $ref: '#/components/schemas/SpecificProblem' perceivedSeverity: $ref: '#/components/schemas/PerceivedSeverity' correlatedNotifications: @@ -384,6 +386,8 @@ components: $ref: '#/components/schemas/AlarmType' probableCause: $ref: '#/components/schemas/ProbableCause' + specificProblem: + $ref: '#/components/schemas/SpecificProblem' perceivedSeverity: $ref: '#/components/schemas/PerceivedSeverity' NotifyChangedAlarmGeneral: @@ -393,6 +397,7 @@ components: required: - alarmId - alarmType + - probableCause properties: alarmId: $ref: '#/components/schemas/AlarmId' @@ -435,6 +440,7 @@ components: required: - alarmId - alarmType + - probableCause - serviceUser - serviceProvider - securityAlarmDetector @@ -470,6 +476,8 @@ components: required: - alarmId - correlatedNotifications + - alarmType + - probableCause properties: alarmId: $ref: '#/components/schemas/AlarmId' @@ -477,6 +485,12 @@ components: $ref: '#/components/schemas/CorrelatedNotifications' rootCauseIndicator: type: boolean + alarmType: + $ref: '#/components/schemas/AlarmType' + probableCause: + $ref: '#/components/schemas/ProbableCause' + specificProblem: + $ref: '#/components/schemas/SpecificProblem' NotifyAckStateChanged: allOf: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/NotificationHeader' @@ -495,6 +509,8 @@ components: $ref: '#/components/schemas/AlarmType' probableCause: $ref: '#/components/schemas/ProbableCause' + specificProblem: + $ref: '#/components/schemas/SpecificProblem' perceivedSeverity: $ref: '#/components/schemas/PerceivedSeverity' ackState: @@ -520,6 +536,8 @@ components: $ref: '#/components/schemas/AlarmType' probableCause: $ref: '#/components/schemas/ProbableCause' + specificProblem: + $ref: '#/components/schemas/SpecificProblem' perceivedSeverity: $ref: '#/components/schemas/PerceivedSeverity' comments: -- GitLab From 5686e12e27c6ab3445f3efd14b3fb80c93714c05 Mon Sep 17 00:00:00 2001 From: lengyelb Date: Thu, 9 Jan 2025 16:51:58 +0000 Subject: [PATCH 342/587] Revert "Rel-19 CR 28.111 Add missing input parameters" This reverts commit 31603ae5db5b61804d952d29daa69cd5aeda5cf5 --- OpenAPI/TS28111_FaultNrm.yaml | 18 ------------------ 1 file changed, 18 deletions(-) diff --git a/OpenAPI/TS28111_FaultNrm.yaml b/OpenAPI/TS28111_FaultNrm.yaml index 66f4ae6c9..321b34cc5 100644 --- a/OpenAPI/TS28111_FaultNrm.yaml +++ b/OpenAPI/TS28111_FaultNrm.yaml @@ -360,8 +360,6 @@ components: $ref: '#/components/schemas/AlarmType' probableCause: $ref: '#/components/schemas/ProbableCause' - specificProblem: - $ref: '#/components/schemas/SpecificProblem' perceivedSeverity: $ref: '#/components/schemas/PerceivedSeverity' correlatedNotifications: @@ -386,8 +384,6 @@ components: $ref: '#/components/schemas/AlarmType' probableCause: $ref: '#/components/schemas/ProbableCause' - specificProblem: - $ref: '#/components/schemas/SpecificProblem' perceivedSeverity: $ref: '#/components/schemas/PerceivedSeverity' NotifyChangedAlarmGeneral: @@ -397,7 +393,6 @@ components: required: - alarmId - alarmType - - probableCause properties: alarmId: $ref: '#/components/schemas/AlarmId' @@ -440,7 +435,6 @@ components: required: - alarmId - alarmType - - probableCause - serviceUser - serviceProvider - securityAlarmDetector @@ -476,8 +470,6 @@ components: required: - alarmId - correlatedNotifications - - alarmType - - probableCause properties: alarmId: $ref: '#/components/schemas/AlarmId' @@ -485,12 +477,6 @@ components: $ref: '#/components/schemas/CorrelatedNotifications' rootCauseIndicator: type: boolean - alarmType: - $ref: '#/components/schemas/AlarmType' - probableCause: - $ref: '#/components/schemas/ProbableCause' - specificProblem: - $ref: '#/components/schemas/SpecificProblem' NotifyAckStateChanged: allOf: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/NotificationHeader' @@ -509,8 +495,6 @@ components: $ref: '#/components/schemas/AlarmType' probableCause: $ref: '#/components/schemas/ProbableCause' - specificProblem: - $ref: '#/components/schemas/SpecificProblem' perceivedSeverity: $ref: '#/components/schemas/PerceivedSeverity' ackState: @@ -536,8 +520,6 @@ components: $ref: '#/components/schemas/AlarmType' probableCause: $ref: '#/components/schemas/ProbableCause' - specificProblem: - $ref: '#/components/schemas/SpecificProblem' perceivedSeverity: $ref: '#/components/schemas/PerceivedSeverity' comments: -- GitLab From d7b71df3e17733f8486ab37273484a11a7c85d93 Mon Sep 17 00:00:00 2001 From: "U-ERICSSON\\ETHBLL" Date: Thu, 9 Jan 2025 18:06:11 +0100 Subject: [PATCH 343/587] Rel-19 CR 28.111 Add missing input parameters --- OpenAPI/TS28111_FaultNrm.yaml | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/OpenAPI/TS28111_FaultNrm.yaml b/OpenAPI/TS28111_FaultNrm.yaml index 321b34cc5..66f4ae6c9 100644 --- a/OpenAPI/TS28111_FaultNrm.yaml +++ b/OpenAPI/TS28111_FaultNrm.yaml @@ -360,6 +360,8 @@ components: $ref: '#/components/schemas/AlarmType' probableCause: $ref: '#/components/schemas/ProbableCause' + specificProblem: + $ref: '#/components/schemas/SpecificProblem' perceivedSeverity: $ref: '#/components/schemas/PerceivedSeverity' correlatedNotifications: @@ -384,6 +386,8 @@ components: $ref: '#/components/schemas/AlarmType' probableCause: $ref: '#/components/schemas/ProbableCause' + specificProblem: + $ref: '#/components/schemas/SpecificProblem' perceivedSeverity: $ref: '#/components/schemas/PerceivedSeverity' NotifyChangedAlarmGeneral: @@ -393,6 +397,7 @@ components: required: - alarmId - alarmType + - probableCause properties: alarmId: $ref: '#/components/schemas/AlarmId' @@ -435,6 +440,7 @@ components: required: - alarmId - alarmType + - probableCause - serviceUser - serviceProvider - securityAlarmDetector @@ -470,6 +476,8 @@ components: required: - alarmId - correlatedNotifications + - alarmType + - probableCause properties: alarmId: $ref: '#/components/schemas/AlarmId' @@ -477,6 +485,12 @@ components: $ref: '#/components/schemas/CorrelatedNotifications' rootCauseIndicator: type: boolean + alarmType: + $ref: '#/components/schemas/AlarmType' + probableCause: + $ref: '#/components/schemas/ProbableCause' + specificProblem: + $ref: '#/components/schemas/SpecificProblem' NotifyAckStateChanged: allOf: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/NotificationHeader' @@ -495,6 +509,8 @@ components: $ref: '#/components/schemas/AlarmType' probableCause: $ref: '#/components/schemas/ProbableCause' + specificProblem: + $ref: '#/components/schemas/SpecificProblem' perceivedSeverity: $ref: '#/components/schemas/PerceivedSeverity' ackState: @@ -520,6 +536,8 @@ components: $ref: '#/components/schemas/AlarmType' probableCause: $ref: '#/components/schemas/ProbableCause' + specificProblem: + $ref: '#/components/schemas/SpecificProblem' perceivedSeverity: $ref: '#/components/schemas/PerceivedSeverity' comments: -- GitLab From 8428bb7ae1dde703728363cde6b710ae536ec3ef Mon Sep 17 00:00:00 2001 From: lengyelb Date: Thu, 9 Jan 2025 17:11:33 +0000 Subject: [PATCH 344/587] Revert "Rel-19 CR 28.111 Add missing input parameters" This reverts commit f803cd85afdc8e313cc1414c85d56dd21e373184 --- OpenAPI/TS28111_FaultNrm.yaml | 18 ------------------ 1 file changed, 18 deletions(-) diff --git a/OpenAPI/TS28111_FaultNrm.yaml b/OpenAPI/TS28111_FaultNrm.yaml index 66f4ae6c9..321b34cc5 100644 --- a/OpenAPI/TS28111_FaultNrm.yaml +++ b/OpenAPI/TS28111_FaultNrm.yaml @@ -360,8 +360,6 @@ components: $ref: '#/components/schemas/AlarmType' probableCause: $ref: '#/components/schemas/ProbableCause' - specificProblem: - $ref: '#/components/schemas/SpecificProblem' perceivedSeverity: $ref: '#/components/schemas/PerceivedSeverity' correlatedNotifications: @@ -386,8 +384,6 @@ components: $ref: '#/components/schemas/AlarmType' probableCause: $ref: '#/components/schemas/ProbableCause' - specificProblem: - $ref: '#/components/schemas/SpecificProblem' perceivedSeverity: $ref: '#/components/schemas/PerceivedSeverity' NotifyChangedAlarmGeneral: @@ -397,7 +393,6 @@ components: required: - alarmId - alarmType - - probableCause properties: alarmId: $ref: '#/components/schemas/AlarmId' @@ -440,7 +435,6 @@ components: required: - alarmId - alarmType - - probableCause - serviceUser - serviceProvider - securityAlarmDetector @@ -476,8 +470,6 @@ components: required: - alarmId - correlatedNotifications - - alarmType - - probableCause properties: alarmId: $ref: '#/components/schemas/AlarmId' @@ -485,12 +477,6 @@ components: $ref: '#/components/schemas/CorrelatedNotifications' rootCauseIndicator: type: boolean - alarmType: - $ref: '#/components/schemas/AlarmType' - probableCause: - $ref: '#/components/schemas/ProbableCause' - specificProblem: - $ref: '#/components/schemas/SpecificProblem' NotifyAckStateChanged: allOf: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/NotificationHeader' @@ -509,8 +495,6 @@ components: $ref: '#/components/schemas/AlarmType' probableCause: $ref: '#/components/schemas/ProbableCause' - specificProblem: - $ref: '#/components/schemas/SpecificProblem' perceivedSeverity: $ref: '#/components/schemas/PerceivedSeverity' ackState: @@ -536,8 +520,6 @@ components: $ref: '#/components/schemas/AlarmType' probableCause: $ref: '#/components/schemas/ProbableCause' - specificProblem: - $ref: '#/components/schemas/SpecificProblem' perceivedSeverity: $ref: '#/components/schemas/PerceivedSeverity' comments: -- GitLab From 25b0a2cbbe8bc3090cba1348e81b9a7a90663e0c Mon Sep 17 00:00:00 2001 From: ruiyue Date: Thu, 20 Feb 2025 05:07:31 +0000 Subject: [PATCH 345/587] Update file TS28312_IntentNrm.yaml --- OpenAPI/TS28312_IntentNrm.yaml | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/OpenAPI/TS28312_IntentNrm.yaml b/OpenAPI/TS28312_IntentNrm.yaml index 248eac3dc..cba7697a1 100644 --- a/OpenAPI/TS28312_IntentNrm.yaml +++ b/OpenAPI/TS28312_IntentNrm.yaml @@ -439,9 +439,14 @@ components: - FEASIBLE - INFEASIBLE infeasibilityReasons: - type: string - readOnly: true - description: An attribute which is used when feasibilityCheckResult is INFEASIBLE + description: An attribute which is used when feasibilityCheckResult is INFEASIBLE + type: array + items: + type: string + readOnly: true + enum: + - INVALID_INTENT_EXPRESSION + - INTENT_CONFLICT #-------Definition of the concrete IntentFeasibilityCheckReport dataType----------------# #-------Definition of the generic IntentHandlingCapability dataType----------------# -- GitLab From acecc95f8d9ffbde6a714c25629aa4b47d0e49c6 Mon Sep 17 00:00:00 2001 From: ruiyue Date: Wed, 15 Jan 2025 08:36:27 +0000 Subject: [PATCH 346/587] Update file TS28312_IntentNrm.yaml --- OpenAPI/TS28312_IntentNrm.yaml | 28 +++++++++++++++++++++++++++- 1 file changed, 27 insertions(+), 1 deletion(-) diff --git a/OpenAPI/TS28312_IntentNrm.yaml b/OpenAPI/TS28312_IntentNrm.yaml index cba7697a1..b8dda27f9 100644 --- a/OpenAPI/TS28312_IntentNrm.yaml +++ b/OpenAPI/TS28312_IntentNrm.yaml @@ -44,7 +44,9 @@ components: - $ref: "TS28312_IntentExpectations.yaml#/components/schemas/5GCNetworkExpectation" - $ref: "TS28312_IntentExpectations.yaml#/components/schemas/RadioServiceExpectation" contextSelectivity: - $ref: "#/components/schemas/Selectivity" + $ref: "#/components/schemas/Selectivity" + expectationSelectivity: + $ref: "#/components/schemas/Selectivity" intentContexts: type: array uniqueItems: true @@ -108,6 +110,12 @@ components: minItems: 1 items: $ref: '#/components/schemas/IntentHandlingCapability' + supportedExpectationTargetInfo: + type: array + items: + $ref: '#/components/schemas/SupportedExpectationTargetInfo' + uniqueItems: true + minItems: 1 Intent: $ref: '#/components/schemas/Intent-Multiple' IntentReport: @@ -476,6 +484,24 @@ components: type: string readOnly: true description: It describes the supported expectation targets for the supported expectation object type. + SupportedExpectationTargetInfo: + description: >- + It indicates the detailed information about what the intent driven MnS producer supports for a given supportedExpectationObjectType. + type: object + properties: + supportedExpectationTargetName: + type: string + readOnly: true + supportedTargetCondition: + $ref: '#/components/schemas/Condition' + supportedTargetValueRange: + oneOf: + - type: array + uniqueItems: true + minItems: 1 + items: + $ref: '#/components/schemas/ValueRangeType' + - $ref: '#/components/schemas/ValueRangeType' #-------Definition of the concrete IntentHandlingCapability dataType----------------# #------Definition of JSON arrays for name-contained IOCs ---------------# -- GitLab From 9547cca8c4cd47f818ff7df61fef476ad336dfcf Mon Sep 17 00:00:00 2001 From: ruiyue Date: Thu, 23 Jan 2025 03:51:40 +0000 Subject: [PATCH 347/587] Update file TS28312_IntentNrm.yaml --- OpenAPI/TS28312_IntentNrm.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OpenAPI/TS28312_IntentNrm.yaml b/OpenAPI/TS28312_IntentNrm.yaml index b8dda27f9..cf7f387a4 100644 --- a/OpenAPI/TS28312_IntentNrm.yaml +++ b/OpenAPI/TS28312_IntentNrm.yaml @@ -46,7 +46,7 @@ components: contextSelectivity: $ref: "#/components/schemas/Selectivity" expectationSelectivity: - $ref: "#/components/schemas/Selectivity" + $ref: "#/components/schemas/Selectivity" intentContexts: type: array uniqueItems: true -- GitLab From c9655020b423d01f933b795a21095190cd18228b Mon Sep 17 00:00:00 2001 From: ruiyue Date: Wed, 15 Jan 2025 03:54:07 +0000 Subject: [PATCH 348/587] Update file TS28312_IntentNrm.yaml --- OpenAPI/TS28312_IntentNrm.yaml | 35 +++++++++++++++++++++++++++++++++- 1 file changed, 34 insertions(+), 1 deletion(-) diff --git a/OpenAPI/TS28312_IntentNrm.yaml b/OpenAPI/TS28312_IntentNrm.yaml index cf7f387a4..369b8565c 100644 --- a/OpenAPI/TS28312_IntentNrm.yaml +++ b/OpenAPI/TS28312_IntentNrm.yaml @@ -91,7 +91,9 @@ components: items: $ref: '#/components/schemas/IntentConflictReport' intentFeasibilityCheckReport: - $ref: '#/components/schemas/IntentFeasibilityCheckReport' + $ref: '#/components/schemas/IntentFeasibilityCheckReport' + intentExplorationReport: + $ref: '#/components/schemas/IntentExplorationReport' lastUpdatedTime: $ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTimeRo' intentReference: @@ -457,6 +459,37 @@ components: - INTENT_CONFLICT #-------Definition of the concrete IntentFeasibilityCheckReport dataType----------------# + + #-------Definition of the generic IntentExplorationReport dataType----------------# + IntentExplorationReport: + description: >- + It represents the intent exploration information + This attribute shall be supported when intent exploration information is supported by IntentReport + type: object + properties: + expectationExporationResults: + type: array + items: + $ref: '#/components/schemas/ExpectationExplorationResult' + ExpectationExplorationResult: + description: >- + It represents the expectation exploration result for a specific intent expectation + type: object + properties: + expectationId: + type: string + readOnly: true + targetExplorationResults: + type: array + items: + $ref: '#/components/schemas/ExpectationTarget' + contextExplorationResults: + type: array + items: + $ref: '#/components/schemas/Context' + #-------Definition of the generic IntentExplorationReport dataType----------------# + + #-------Definition of the generic IntentHandlingCapability dataType----------------# IntentHandlingCapability: description: >- -- GitLab From 1c32e6a8e5ccfa7ed28655ec1f045a15a48025e3 Mon Sep 17 00:00:00 2001 From: ruiyue Date: Wed, 15 Jan 2025 09:40:40 +0000 Subject: [PATCH 349/587] Update file TS28312_IntentNrm.yaml --- OpenAPI/TS28312_IntentNrm.yaml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/OpenAPI/TS28312_IntentNrm.yaml b/OpenAPI/TS28312_IntentNrm.yaml index 369b8565c..16af17a08 100644 --- a/OpenAPI/TS28312_IntentNrm.yaml +++ b/OpenAPI/TS28312_IntentNrm.yaml @@ -471,6 +471,8 @@ components: type: array items: $ref: '#/components/schemas/ExpectationExplorationResult' + uniqueItems: true + minItems: 1 ExpectationExplorationResult: description: >- It represents the expectation exploration result for a specific intent expectation @@ -483,10 +485,14 @@ components: type: array items: $ref: '#/components/schemas/ExpectationTarget' + uniqueItems: true + minItems: 1 contextExplorationResults: type: array items: $ref: '#/components/schemas/Context' + uniqueItems: true + minItems: 1 #-------Definition of the generic IntentExplorationReport dataType----------------# -- GitLab From d3924adb68d4dc6a37f735dff42c5178428895ff Mon Sep 17 00:00:00 2001 From: ruiyue Date: Thu, 6 Feb 2025 02:14:42 +0000 Subject: [PATCH 350/587] Update file TS28312_IntentNrm.yaml --- OpenAPI/TS28312_IntentNrm.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OpenAPI/TS28312_IntentNrm.yaml b/OpenAPI/TS28312_IntentNrm.yaml index 16af17a08..98d9cce34 100644 --- a/OpenAPI/TS28312_IntentNrm.yaml +++ b/OpenAPI/TS28312_IntentNrm.yaml @@ -467,7 +467,7 @@ components: This attribute shall be supported when intent exploration information is supported by IntentReport type: object properties: - expectationExporationResults: + expectationExplorationResults: type: array items: $ref: '#/components/schemas/ExpectationExplorationResult' -- GitLab From 69a19213b4c7a23655831391f4e140f21a21bcc8 Mon Sep 17 00:00:00 2001 From: ruiyue Date: Mon, 17 Feb 2025 20:44:25 +0000 Subject: [PATCH 351/587] Update file TS28312_IntentNrm.yaml --- OpenAPI/TS28312_IntentNrm.yaml | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/OpenAPI/TS28312_IntentNrm.yaml b/OpenAPI/TS28312_IntentNrm.yaml index 98d9cce34..736d32efb 100644 --- a/OpenAPI/TS28312_IntentNrm.yaml +++ b/OpenAPI/TS28312_IntentNrm.yaml @@ -43,6 +43,8 @@ components: - $ref: "TS28312_IntentExpectations.yaml#/components/schemas/EdgeServiceSupportExpectation" - $ref: "TS28312_IntentExpectations.yaml#/components/schemas/5GCNetworkExpectation" - $ref: "TS28312_IntentExpectations.yaml#/components/schemas/RadioServiceExpectation" + intentMgmtPurpose: + $ref: "#/components/schemas/IntentMgmtPurpose" contextSelectivity: $ref: "#/components/schemas/Selectivity" expectationSelectivity: @@ -202,6 +204,16 @@ components: - ALL_OF - ONE_OF - ANY_OF + IntentMgmtPurpose: + description: >- + It describes the MnS consumer requirements for the management purpose (required procedures) + of the created or modified intent instance + type: string + enum: + - FEASIBILITYCHECK + - FULFILMENT + - EXPLORATION + default: FULFILMENT FulfilmentStatus: type: string readOnly: true -- GitLab From b96f56cedee14109cfa8442e6ccda329d4913185 Mon Sep 17 00:00:00 2001 From: ruiyue Date: Mon, 13 Jan 2025 04:05:32 +0000 Subject: [PATCH 352/587] Update file TS28312_IntentExpectations.yaml --- OpenAPI/TS28312_IntentExpectations.yaml | 70 ++++++++++++++++++++++++- 1 file changed, 69 insertions(+), 1 deletion(-) diff --git a/OpenAPI/TS28312_IntentExpectations.yaml b/OpenAPI/TS28312_IntentExpectations.yaml index e1d2bb5f6..ba388ec9c 100644 --- a/OpenAPI/TS28312_IntentExpectations.yaml +++ b/OpenAPI/TS28312_IntentExpectations.yaml @@ -42,7 +42,8 @@ components: - $ref: '#/components/schemas/AveULPrbLoadTarget' - $ref: '#/components/schemas/AveDLPrbLoadTarget' - $ref: "#/components/schemas/RANEnergyConsumptionTarget" - - $ref: "#/components/schemas/RANEnergyEfficiencyTarget" + - $ref: "#/components/schemas/RANEnergyEfficiencyTarget" + - $ref: "#/components/schemas/ActiveUEsNumTarget" - $ref: 'TS28312_IntentNrm.yaml#/components/schemas/ExpectationTarget' expectationContexts: type: array @@ -51,6 +52,7 @@ components: type: object oneOf: - $ref: '#/components/schemas/TargetAssuranceTimeContext' + - $ref: '#/components/schemas/SchedulingTimeContext' - $ref: 'TS28312_IntentNrm.yaml#/components/schemas/Context' required: - expectationId @@ -179,6 +181,7 @@ components: oneOf: - $ref: '#/components/schemas/CoverageAreaPolygonContext' - $ref: '#/components/schemas/CoverageTACContext' + - $ref: '#/components/schemas/CellContext' - $ref: '#/components/schemas/PLMNContext' - $ref: '#/components/schemas/DlFrequencyContext' - $ref: '#/components/schemas/UlFrequencyContext' @@ -594,6 +597,30 @@ components: - IS_GREATER_THAN targetValueRange: type: integer + ActiveUEsNumTarget: + description: >- + This data type is the "ExpectationTarget" data type with specialisations for ActiveUEsNumTarget. + It describes the number of Active UEs for the specified areas. This target is related to Mean + number of Active UEs in the DL per cell and Mean number of Active UEs in the UL per cell defined + in 3GPP TS 28.552 [6]. + type: object + properties: + targetName: + type: string + enum: + - ActiveUEsNum + targetCondition: + type: string + enum: + - IS_WITHIN_RANGE + targetValueRange: + type: array + description: >- + a pair of integer values to represent minimum number of active UEs and maximum number of active UEs. + items: + type: integer + minItems: 1 + maxItems: 2 DLThptPerUETarget: description: >- This data type is the "ExpectationTarget" data type with specialisations for DLThptPerUETarget. It describes the DL throughput target by the per UE for the @@ -828,6 +855,30 @@ components: uniqueItems: true items: $ref: "TS28623_ComDefs.yaml#/components/schemas/Tac" + CellContext: + description: >- + This data type is the "ObjectContext" data type with specialisations for CellContext. + It describes the coverage areas for the RAN SubNetwork that the intent expectation is applied + in the form of a list of cells (including E-UTRAN cells identified by E-UTRAN-CGI and NR cells + identified by NG-RAN CGI). + type: object + properties: + contextAttribute: + type: string + enum: + - Cell + contextCondition: + type: string + enum: + - IS_ALL_OF + contextValueRange: + type: array + items: + $ref: "#/components/schemas/CellId" + CellId: + oneOf: + - $ref: 'TS28623_ComDefs.yaml#/components/schemas/EutraCellId' + - $ref: 'TS28623_ComDefs.yaml#/components/schemas/NrCellId' PLMNContext: description: >- This data type is the "ObjectContext" data type with specialisations for PLMNContext @@ -1160,6 +1211,23 @@ components: - IS_EQUAL_TO contextValueRange: $ref: "TS28541_NrNrm.yaml#/components/schemas/Sst" + SchedulingTimeContext: + description: >- + This data type is the "ExpectationContext" data type with specialisations for SchedulingTimeContext.It describes + the scheduled times (including one-time interval, daily periodicity, weekly periodicity or monthly periodicity) + for the IntentObject that the intent expectation is applied. + type: object + properties: + contextAttribute: + type: string + enum: + - schedulingTime + contextCondition: + type: string + enum: + - IS_ALL_OF + contextValueRange: + $ref: "TS28623_GenericNrm.yaml#/components/schemas/SchedulingTime" StartTimeContext: description: >- This data type is the "ExpectationContext" data type with specialisations for StartTimeContext -- GitLab From 9b85bad7d4afc948175ea253834799b6483ab5cd Mon Sep 17 00:00:00 2001 From: sunse Date: Wed, 19 Feb 2025 11:35:04 +0000 Subject: [PATCH 353/587] Rel19 CR1450 TS28.541 NRM_enhancements_to_NFProfile Update TS28541_5GcNrm.yaml --- OpenAPI/TS28541_5GcNrm.yaml | 48 ++++++++++++++++--------------------- 1 file changed, 20 insertions(+), 28 deletions(-) diff --git a/OpenAPI/TS28541_5GcNrm.yaml b/OpenAPI/TS28541_5GcNrm.yaml index 218c03a14..1c5ef9459 100755 --- a/OpenAPI/TS28541_5GcNrm.yaml +++ b/OpenAPI/TS28541_5GcNrm.yaml @@ -54,34 +54,7 @@ components: type: array description: List of NF profile items: - $ref: '#/components/schemas/NFProfile' - NFProfile: - type: object - description: 'NF profile stored in NRF, defined in TS 29.510' - properties: - nfInstanceId: - type: string - description: uuid of NF instance - nfType: - $ref: '#/components/schemas/NFType' - nfStatus: - $ref: '#/components/schemas/NFStatus' - plmn: - type: array - items: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/PlmnId' - sNssais: - type: array - items: - $ref: 'TS28541_NrNrm.yaml#/components/schemas/Snssai' - fqdn: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/Fqdn' - interPlmnFqdn: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/Fqdn' - nfServices: - type: array - items: - $ref: '#/components/schemas/NFService' + $ref: '#/components/schemas/ManagedNFProfile' NFService: type: object description: NF Service is defined in TS 29.510 @@ -318,6 +291,20 @@ components: readOnly: true nfType: $ref: '#/components/schemas/NFType' + nfStatus: + $ref: '#/components/schemas/NFStatus' + plmnList: + type: array + uniqueItems: true + items: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/PlmnId' + sNssais: + type: array + uniqueItems: true + items: + $ref: 'TS28541_NrNrm.yaml#/components/schemas/Snssai' + fqdn: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/Fqdn' heartbeatTimer: type: integer authzInfo: @@ -393,6 +380,11 @@ components: minItems: 1 vendorId: $ref: '#/components/schemas/VendorId' + nfServices: + type: array + uniqueItems: true + items: + $ref: '#/components/schemas/NFService' SEPPType: type: string readOnly: true -- GitLab From 2ee4257e47bdb8584b70367a63ff87269aabaf7f Mon Sep 17 00:00:00 2001 From: sunse Date: Thu, 6 Feb 2025 08:43:52 +0000 Subject: [PATCH 354/587] Rel19 CR0508 TS28.623 correction to definitions related to availableRANqoEMetrics for OpenAPI SS --- OpenAPI/TS28623_QoEMeasurementCollectionNrm.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/OpenAPI/TS28623_QoEMeasurementCollectionNrm.yaml b/OpenAPI/TS28623_QoEMeasurementCollectionNrm.yaml index fb0eaeaf1..5ac351443 100644 --- a/OpenAPI/TS28623_QoEMeasurementCollectionNrm.yaml +++ b/OpenAPI/TS28623_QoEMeasurementCollectionNrm.yaml @@ -4,7 +4,7 @@ info: version: 19.2.0 description: >- OAS 3.0.1 definition of the QoE Measurement Collection NRM - © 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). + © 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved. externalDocs: description: 3GPP TS 28.623; Generic NRM,QoE Measurement Collection NRM fragment @@ -73,8 +73,8 @@ components: items: type: string enum: - - APPLAYERBUFFERLEVELLIST - - PLAYOUTDELAYFORMEDIA_STARTUP + - APP_LAYER_BUFFER_LEVEL_LIST + - PLAYOUT_DELAY_FOR_MEDIA_STARTUP minItems: 0 maxItems: 2 mBSCommunicationServiceType: -- GitLab From c4cc7ff0a931c873900cc0737e649b28bd42afd6 Mon Sep 17 00:00:00 2001 From: sunse Date: Wed, 5 Feb 2025 08:15:34 +0000 Subject: [PATCH 355/587] Rel19 CR0090 TS28.550 OpenAPI correction related to format of URI query parameters --- OpenAPI/TS28550_PerfMeasJobCtrlMnS.yaml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/OpenAPI/TS28550_PerfMeasJobCtrlMnS.yaml b/OpenAPI/TS28550_PerfMeasJobCtrlMnS.yaml index 7de08a785..1bded8d4c 100755 --- a/OpenAPI/TS28550_PerfMeasJobCtrlMnS.yaml +++ b/OpenAPI/TS28550_PerfMeasJobCtrlMnS.yaml @@ -4,7 +4,7 @@ info: version: 18.1.0 description: >- OAS 3.0.1 specification of the Performance Measurement Job Control Service - @ 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). + @ 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved. externalDocs: description: 3GPP TS 28.550 Performance assurance @@ -56,6 +56,8 @@ paths: in: query description: This parameter identifies the list of jobId to select the resources from the collection resources identified with the path component of the URI. required: true + style: form + explode: false schema: type: array items: -- GitLab From c5feb563ed44daae4ba38fd71232da52221c7b79 Mon Sep 17 00:00:00 2001 From: sunse Date: Fri, 21 Feb 2025 11:34:54 +0000 Subject: [PATCH 356/587] Rel19 CR0362 TS28.532 OpenAPI correction related to format of URI query parameters --- OpenAPI/TS28532_ProvMnS.yaml | 11 +++++------ OpenAPI/TS28532_StreamingDataMnS.yaml | 6 ++++++ 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/OpenAPI/TS28532_ProvMnS.yaml b/OpenAPI/TS28532_ProvMnS.yaml index ce913eb9a..93f928a8e 100755 --- a/OpenAPI/TS28532_ProvMnS.yaml +++ b/OpenAPI/TS28532_ProvMnS.yaml @@ -203,13 +203,12 @@ paths: in: query description: >- This parameter extends the set of targeted resources beyond the base - resource identified with the path component of the URI. No scoping - mechanism is specified in the present document. + resource identified with the path component of the URI. required: false - schema: - $ref: '#/components/schemas/Scope' - style: form - explode: true + content: + application/json: + schema: + $ref: '#/components/schemas/Scope' - name: filter in: query description: >- diff --git a/OpenAPI/TS28532_StreamingDataMnS.yaml b/OpenAPI/TS28532_StreamingDataMnS.yaml index 6f7f94fc7..bcac29257 100755 --- a/OpenAPI/TS28532_StreamingDataMnS.yaml +++ b/OpenAPI/TS28532_StreamingDataMnS.yaml @@ -48,6 +48,8 @@ paths: in: query description: The list of connectionId for which the connection information is to be returned. required: false + style: form + explode: false schema: type: array items: @@ -187,6 +189,8 @@ paths: in: query description: The list of streamId for the stream(s) to be deleted. required: true + style: form + explode: false schema: type: array items: @@ -214,6 +218,8 @@ paths: in: query description: The list of streamId for which the stream information is to be retrieved. required: true + style: form + explode: false schema: type: array items: -- GitLab From 9126f860d5fd437e6ca133c727590e26201a1f50 Mon Sep 17 00:00:00 2001 From: sunse Date: Thu, 6 Feb 2025 09:35:28 +0000 Subject: [PATCH 357/587] Rel19 CR0233 TS28.105 correction to data type definitions related to AIMLInferenceName --- OpenAPI/TS28105_AiMlNrm.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/OpenAPI/TS28105_AiMlNrm.yaml b/OpenAPI/TS28105_AiMlNrm.yaml index 874220189..2c690d276 100644 --- a/OpenAPI/TS28105_AiMlNrm.yaml +++ b/OpenAPI/TS28105_AiMlNrm.yaml @@ -183,8 +183,8 @@ components: type: string enum: - NG_RAN_NETWORK_ENERGY_SAVING - - NG_RAN_LOAD_BALANCING - - NG_RAN_ MOBILITY_OPTIMIZATION + - NG_RAN_LOAD_BALANCING + - NG_RAN_MOBILITY_OPTIMIZATION VSExtensionType: type: string -- GitLab From 84acb8de5fac55eaa92b2ce4a5a0b52c6e2a00c8 Mon Sep 17 00:00:00 2001 From: sunse Date: Wed, 5 Feb 2025 07:46:42 +0000 Subject: [PATCH 358/587] Rel19 CR1451 TS28.541 Enhance the OpenAPI related to multiplicity for 5GCNrm --- OpenAPI/TS28541_5GcNrm.yaml | 30 +++++++++++++++++++++++++++--- 1 file changed, 27 insertions(+), 3 deletions(-) diff --git a/OpenAPI/TS28541_5GcNrm.yaml b/OpenAPI/TS28541_5GcNrm.yaml index 1c5ef9459..19406a523 100755 --- a/OpenAPI/TS28541_5GcNrm.yaml +++ b/OpenAPI/TS28541_5GcNrm.yaml @@ -67,6 +67,7 @@ components: type: array items: type: string + minItems: 1 schema: type: string nfServiceStatus: @@ -264,6 +265,7 @@ components: type: array items: $ref: '#/components/schemas/DefSubServiceInfo' + minItems: 1 callbackUriPrefix: $ref: 'TS28623_ComDefs.yaml#/components/schemas/UriRo' DefSubServiceInfo: @@ -273,6 +275,7 @@ components: type: array items: type: string + minItems: 1 readOnly: true supportedFeatures: type: string @@ -284,6 +287,7 @@ components: type: array items: $ref: 'TS28623_ComDefs.yaml#/components/schemas/Fqdn' + minItems: 1 interPlmnFqdn: $ref: 'TS28623_ComDefs.yaml#/components/schemas/Fqdn' nfInstanceID: @@ -343,10 +347,12 @@ components: type: array items: type: string + minItems: 1 servingScope: type: array items: type: string + minItems: 1 lcHSupportInd: type: boolean readOnly: true @@ -357,10 +363,12 @@ components: type: array items: $ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTimeRo' + minItems: 1 scpDomains: type: array items: type: string + minItems: 1 recoveryTime: $ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTimeRo' nfServicePersistence: @@ -403,6 +411,7 @@ components: type: array items: $ref: '#/components/schemas/SupportedFunc' + minItems: 1 CommModelType: type: string description: any of enumerated value @@ -426,10 +435,12 @@ components: type: array items: $ref: '#/components/schemas/CommModel' + minItems: 1 CapabilityList: type: array items: type: string + minItems: 1 FiveQiDscpMapping: type: object properties: @@ -452,7 +463,7 @@ components: type: array items: $ref: '#/components/schemas/NetworkSliceInfo' - + minItems: 1 PacketErrorRate: type: object properties: @@ -566,6 +577,7 @@ components: type: array items: $ref: 'TS29571_CommonData.yaml#/components/schemas/RouteToLocation' + minItems: 1 traffCorreInd: type: boolean default: false @@ -693,6 +705,7 @@ components: type: array items: $ref: '#/components/schemas/NRTACRange' + minItems: 1 GUAMInfo: type: object @@ -711,7 +724,7 @@ components: type: array items: type: string - + minItems: 1 DnnSmfInfoItem: type: object properties: @@ -744,11 +757,13 @@ components: type: array items: $ref: '#/components/schemas/DnnSmfInfoItem' + minItems: 1 5GCNfConnEcmInfoList: type: array items: $ref: '#/components/schemas/5GCNfConnEcmInfo' + minItems: 1 5GCNfConnEcmInfo: type: object description: 'Store the 5GC NF connection information' @@ -854,10 +869,12 @@ components: type: array items: type: string + minItems: 1 hNwPubKeyIds: type: array items: type: integer + minItems: 1 SuciInfoList: type: array items: @@ -875,6 +892,7 @@ components: type: array items: $ref: '#/components/schemas/IdentityRange' + minItems: 1 InternalGroupIdRangeList: type: array items: @@ -883,10 +901,12 @@ components: type: array items: $ref: '#/components/schemas/SupportedDataSet' + minItems: 1 SharedDataIdRangeList: type: array items: $ref: '#/components/schemas/SharedDataIdRange' + minItems: 1 InterfaceUpfInfoItem: type: object properties: @@ -1523,6 +1543,7 @@ components: type: array items: $ref: '#/components/schemas/TrpInfo' + minItems: 1 LmfInfo: description: Information of an LMF NF Instance @@ -3422,6 +3443,7 @@ components: type: array items: $ref: '#/components/schemas/dnaiSatelliteMapping' + minItems: 1 - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' - $ref: '#/components/schemas/ManagedFunction5GC-nc0' - type: object @@ -4938,7 +4960,8 @@ components: predefinedPccRules: type: array items: - $ref: '#/components/schemas/PccRule' + $ref: '#/components/schemas/PccRule' + minItems: 1 AfFunction-Single: allOf: @@ -5698,6 +5721,7 @@ components: type: array items: $ref: '#/components/schemas/Operation' + minItems: 1 administrativeState: $ref: 'TS28623_ComDefs.yaml#/components/schemas/AdministrativeState' operationalState: -- GitLab From 3ce52f7ba4ed9bb9b91be39deb1fb4390db9bbe2 Mon Sep 17 00:00:00 2001 From: sunse Date: Wed, 5 Feb 2025 09:15:18 +0000 Subject: [PATCH 359/587] Rel19 CR1449 TS28.541 correction to inconsistency between stage 2 and stage 3 --- OpenAPI/TS28541_NrNrm.yaml | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/OpenAPI/TS28541_NrNrm.yaml b/OpenAPI/TS28541_NrNrm.yaml index 7d47c2449..7c2027fe1 100755 --- a/OpenAPI/TS28541_NrNrm.yaml +++ b/OpenAPI/TS28541_NrNrm.yaml @@ -273,10 +273,8 @@ components: CyclicPrefix: type: string enum: - - '15' - - '30' - - '60' - - '120' + - NORMAL + - EXTENDED TxDirection: type: string enum: @@ -294,8 +292,6 @@ components: enum: - INITIAL - OTHER - - SUL - IsESCoveredBy: type: string enum: @@ -989,7 +985,7 @@ components: $ref: '#/components/schemas/GGnbIdList' x2HOBlockList: $ref: '#/components/schemas/GEnbIdList' - xnHOBlackList: + xnHOBlockList: $ref: '#/components/schemas/GGnbIdList' mappingSetIDBackhaulAddressList: type: array -- GitLab From 8c2918ca51c4d67b29e97fe7c1c21e0104af5ab2 Mon Sep 17 00:00:00 2001 From: sunse Date: Wed, 5 Feb 2025 07:31:33 +0000 Subject: [PATCH 360/587] Rel19 CR1449 TS28.541 Enhance the OpenAPI related to isUnique property for 5GCNrm --- OpenAPI/TS28541_5GcNrm.yaml | 222 ++++++++++++++++++++++++++++++++++++ 1 file changed, 222 insertions(+) diff --git a/OpenAPI/TS28541_5GcNrm.yaml b/OpenAPI/TS28541_5GcNrm.yaml index 19406a523..c6d1effe4 100755 --- a/OpenAPI/TS28541_5GcNrm.yaml +++ b/OpenAPI/TS28541_5GcNrm.yaml @@ -52,6 +52,7 @@ components: type: integer NFProfileList: type: array + uniqueItems: true description: List of NF profile items: $ref: '#/components/schemas/ManagedNFProfile' @@ -65,6 +66,7 @@ components: type: string versions: type: array + uniqueItems: true items: type: string minItems: 1 @@ -83,28 +85,34 @@ components: $ref: 'TS28623_ComDefs.yaml#/components/schemas/Fqdn' ipEndPoints: type: array + uniqueItems: true items: $ref: '#/components/schemas/IpEndPoint' apiPrefix: type: string allowedPLMNs: type: array + uniqueItems: true items: $ref: 'TS28623_ComDefs.yaml#/components/schemas/PlmnId' allowedSnpns: type: array + uniqueItems: true items: $ref: '#/components/schemas/SnpnId' allowedNfTypes: type: array + uniqueItems: true items: $ref: '#/components/schemas/NFType' allowedNfDomains: type: array + uniqueItems: true items: type: string allowedNSSAIs: type: array + uniqueItems: true items: $ref: 'TS28541_NrNrm.yaml#/components/schemas/Snssai' priority: @@ -131,6 +139,7 @@ components: type: string defaultNotificationSubscriptions: type: array + uniqueItems: true items: $ref: '#/components/schemas/DefaultNotificationSubscription' @@ -142,6 +151,7 @@ components: - SUSPENDED CNSIIdList: type: array + uniqueItems: true items: $ref: '#/components/schemas/CNSIId' CNSIId: @@ -162,6 +172,7 @@ components: - IS_ENERGYSAVING TACList: type: array + uniqueItems: true items: $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Tac' WeightFactor: @@ -178,17 +189,20 @@ components: readOnly: true supiRanges: type: array + uniqueItems: true items: $ref: '#/components/schemas/SupiRange' minItems: 1 routingIndicators: type: array + uniqueItems: true items: type: string pattern: '^[0-9]{1,4}$' minItems: 1 suciInfos: type: array + uniqueItems: true items: $ref: '#/components/schemas/SuciInfo' minItems: 1 @@ -263,6 +277,7 @@ components: readOnly: true serviceInfoList: type: array + uniqueItems: true items: $ref: '#/components/schemas/DefSubServiceInfo' minItems: 1 @@ -273,6 +288,7 @@ components: properties: versions: type: array + uniqueItems: true items: type: string minItems: 1 @@ -285,6 +301,7 @@ components: properties: hniList: type: array + uniqueItems: true items: $ref: 'TS28623_ComDefs.yaml#/components/schemas/Fqdn' minItems: 1 @@ -317,26 +334,32 @@ components: $ref: 'TS28623_ComDefs.yaml#/components/schemas/HostAddr' allowedPLMNs: type: array + uniqueItems: true items: $ref: 'TS28623_ComDefs.yaml#/components/schemas/PlmnId' sNPNList: type: array + uniqueItems: true items: $ref: '#/components/schemas/SnpnId' allowedSNPNs: type: array + uniqueItems: true items: $ref: '#/components/schemas/SnpnId' allowedNfTypes: type: array + uniqueItems: true items: $ref: '#/components/schemas/NFType' allowedNfDomains: type: array + uniqueItems: true items: type: string allowedNSSAIs: type: array + uniqueItems: true items: $ref: 'TS28541_NrNrm.yaml#/components/schemas/Snssai' locality: @@ -345,11 +368,13 @@ components: type: integer nfSetIdList: type: array + uniqueItems: true items: type: string minItems: 1 servingScope: type: array + uniqueItems: true items: type: string minItems: 1 @@ -361,11 +386,13 @@ components: readOnly: true nfSetRecoveryTimeList: type: array + uniqueItems: true items: $ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTimeRo' minItems: 1 scpDomains: type: array + uniqueItems: true items: type: string minItems: 1 @@ -378,11 +405,13 @@ components: type: boolean defaultNotificationSubscriptions: type: array + uniqueItems: true items: $ref: '#/components/schemas/DefaultNotificationSubscription' minItems: 1 serviceSetRecoveryTimeList: type: array + uniqueItems: true items: $ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTimeRo' minItems: 1 @@ -433,6 +462,7 @@ components: type: string CommModelList: type: array + uniqueItems: true items: $ref: '#/components/schemas/CommModel' minItems: 1 @@ -446,6 +476,7 @@ components: properties: fiveQIValues: type: array + uniqueItems: true items: type: integer dscp: @@ -461,6 +492,7 @@ components: $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList' NetworkSliceInfoList: type: array + uniqueItems: true items: $ref: '#/components/schemas/NetworkSliceInfo' minItems: 1 @@ -533,6 +565,7 @@ components: QosDataList: type: array + uniqueItems: true items: $ref: '#/components/schemas/QosData' @@ -561,6 +594,7 @@ components: $ref: 'TS29512_Npcf_SMPolicyControl.yaml#/components/schemas/RedirectInformation' addRedirectInfo: type: array + uniqueItems: true items: $ref: 'TS29512_Npcf_SMPolicyControl.yaml#/components/schemas/RedirectInformation' minItems: 1 @@ -575,6 +609,7 @@ components: nullable: true routeToLocs: type: array + uniqueItems: true items: $ref: 'TS29571_CommonData.yaml#/components/schemas/RouteToLocation' minItems: 1 @@ -596,6 +631,7 @@ components: TrafficControlDataList: type: array + uniqueItems: true items: $ref: '#/components/schemas/TrafficControlData' @@ -607,6 +643,7 @@ components: description: Univocally identifies the PCC rule within a PDU session. flowInfoList: type: array + uniqueItems: true items: $ref: 'TS29512_Npcf_SMPolicyControl.yaml#/components/schemas/FlowInformation' applicationId: @@ -627,14 +664,17 @@ components: default: false qosData: type: array + uniqueItems: true items: $ref: '#/components/schemas/QosDataList' altQosParams: type: array + uniqueItems: true items: $ref: '#/components/schemas/QosDataList' trafficControlData: type: array + uniqueItems: true items: $ref: '#/components/schemas/TrafficControlDataList' conditionData: @@ -680,6 +720,7 @@ components: readOnly: true uEIdList: type: array + uniqueItems: true items: type: string readOnly: true @@ -703,6 +744,7 @@ components: $ref: 'TS28623_ComDefs.yaml#/components/schemas/PlmnId' nRTACRangelist: type: array + uniqueItems: true items: $ref: '#/components/schemas/NRTACRange' minItems: 1 @@ -717,11 +759,13 @@ components: SupportedBMOList: type: array + uniqueItems: true items: type: string ECSAddrConfigInfo: type: array + uniqueItems: true items: type: string minItems: 1 @@ -732,6 +776,7 @@ components: type: string dnaiList: type: array + uniqueItems: true items: $ref: 'TS29571_CommonData.yaml#/components/schemas/Dnai' minItems: 1 @@ -741,6 +786,7 @@ components: properties: dnaiList: type: array + uniqueItems: true items: $ref: 'TS29571_CommonData.yaml#/components/schemas/Dnai' minItems: 1 @@ -755,12 +801,14 @@ components: $ref: 'TS28541_NrNrm.yaml#/components/schemas/Snssai' dnnSmfInfoList: type: array + uniqueItems: true items: $ref: '#/components/schemas/DnnSmfInfoItem' minItems: 1 5GCNfConnEcmInfoList: type: array + uniqueItems: true items: $ref: '#/components/schemas/5GCNfConnEcmInfo' minItems: 1 @@ -790,6 +838,7 @@ components: $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnRo' SnssaiList: type: array + uniqueItems: true items: $ref: 'TS28541_NrNrm.yaml#/components/schemas/Snssai' SnpnId: @@ -803,6 +852,7 @@ components: type: string TaiList: type: array + uniqueItems: true items: $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Tai' SupiRange: @@ -867,16 +917,19 @@ components: properties: routingInds: type: array + uniqueItems: true items: type: string minItems: 1 hNwPubKeyIds: type: array + uniqueItems: true items: type: integer minItems: 1 SuciInfoList: type: array + uniqueItems: true items: $ref: '#/components/schemas/SuciInfo' SharedDataIdRange: @@ -886,15 +939,18 @@ components: type: string SupiRangeList: type: array + uniqueItems: true items: $ref: '#/components/schemas/SupiRange' IdentityRangeList: type: array + uniqueItems: true items: $ref: '#/components/schemas/IdentityRange' minItems: 1 InternalGroupIdRangeList: type: array + uniqueItems: true items: $ref: '#/components/schemas/InternalGroupIdRange' SupportedDataSetList: @@ -904,6 +960,7 @@ components: minItems: 1 SharedDataIdRangeList: type: array + uniqueItems: true items: $ref: '#/components/schemas/SharedDataIdRange' minItems: 1 @@ -938,10 +995,12 @@ components: - N4U ipv4EndpointAddresses: type: array + uniqueItems: true items: $ref: 'TS28623_ComDefs.yaml#/components/schemas/Ipv4Addr' ipv6EndpointAddresses: type: array + uniqueItems: true items: $ref: 'TS28623_ComDefs.yaml#/components/schemas/Ipv6Addr' fqdn: @@ -964,10 +1023,12 @@ components: properties: ipv4EndpointAddresses: type: array + uniqueItems: true items: $ref: 'TS28623_ComDefs.yaml#/components/schemas/Ipv4Addr' ipv6EndpointAddresses: type: array + uniqueItems: true items: $ref: 'TS28623_ComDefs.yaml#/components/schemas/Ipv6Addr' fqdn: @@ -1023,6 +1084,7 @@ components: $ref: 'TS28623_ComDefs.yaml#/components/schemas/Fqdn' scpIpEndPoints: type: array + uniqueItems: true items: $ref: 'TS28541_5GcNrm.yaml#/components/schemas/IpEndPoint' minItems: 1 @@ -1055,11 +1117,13 @@ components: minProperties: 1 remotePlmnList: type: array + uniqueItems: true items: $ref: 'TS28623_ComDefs.yaml#/components/schemas/PlmnId' minItems: 1 remoteSnpnList: type: array + uniqueItems: true items: $ref: 'TS29571_CommonData.yaml#/components/schemas/PlmnIdNid' minItems: 1 @@ -1072,6 +1136,7 @@ components: $ref: 'TS29571_CommonData.yaml#/components/schemas/NfGroupId' supiRanges: type: array + uniqueItems: true items: $ref: '#/components/schemas/SupiRange' minItems: 1 @@ -1082,6 +1147,7 @@ components: type: object additionalProperties: type: array + uniqueItems: true items: $ref: '#/components/schemas/IdentityRange' minItems: 1 @@ -1122,6 +1188,7 @@ components: $ref: '#/components/schemas/TaiList' taiRangeList: type: array + uniqueItems: true items: $ref: '#/components/schemas/TaiRange' minItems: 1 @@ -1146,6 +1213,7 @@ components: properties: mlAnalyticsIds: type: array + uniqueItems: true items: $ref: 'TS29520_Nnwdaf_EventsSubscription.yaml#/components/schemas/NwdafEvent' minItems: 1 @@ -1155,6 +1223,7 @@ components: $ref: '#/components/schemas/TaiList' mlModelInterInfo: type: array + uniqueItems: true items: $ref: '#/components/schemas/VendorId' minItems: 0 @@ -1166,6 +1235,7 @@ components: - FL_SERVER_AND_CLIENT flTimeInterval: type: array + uniqueItems: true items: $ref: 'TS28623_ComDefs.yaml#/components/schemas/TimeWindow' minItems: 1 @@ -1175,11 +1245,13 @@ components: properties: eventIds: type: array + uniqueItems: true items: $ref: 'TS29520_Nnwdaf_AnalyticsInfo.yaml#/components/schemas/EventId' minItems: 1 nwdafEvents: type: array + uniqueItems: true items: $ref: 'TS29520_Nnwdaf_EventsSubscription.yaml#/components/schemas/NwdafEvent' minItems: 1 @@ -1187,6 +1259,7 @@ components: $ref: '#/components/schemas/TaiList' taiRangeList: type: array + uniqueItems: true items: $ref: '#/components/schemas/TaiRange' minItems: 1 @@ -1196,16 +1269,19 @@ components: $ref: 'TS29571_CommonData.yaml#/components/schemas/DurationSec' servingNfSetIdList: type: array + uniqueItems: true items: $ref: 'TS29571_CommonData.yaml#/components/schemas/NfSetId' minItems: 1 servingNfTypeList: type: array + uniqueItems: true items: $ref: '#/components/schemas/NFType' minItems: 1 mlAnalyticsList: type: array + uniqueItems: true items: $ref: '#/components/schemas/MlAnalyticsInfo' minItems: 1 @@ -1235,41 +1311,49 @@ components: minProperties: 1 addressDomains: type: array + uniqueItems: true items: type: string minItems: 1 ipv4Addresses: type: array + uniqueItems: true items: $ref: 'TS29571_CommonData.yaml#/components/schemas/Ipv4Addr' minItems: 1 ipv6Prefixes: type: array + uniqueItems: true items: $ref: 'TS29571_CommonData.yaml#/components/schemas/Ipv6Prefix' minItems: 1 ipv4AddrRanges: type: array + uniqueItems: true items: $ref: '#/components/schemas/Ipv4AddressRange' minItems: 1 ipv6PrefixRanges: type: array + uniqueItems: true items: $ref: '#/components/schemas/Ipv6PrefixRange' minItems: 1 servedNfSetIdList: type: array + uniqueItems: true items: $ref: 'TS29571_CommonData.yaml#/components/schemas/NfSetId' minItems: 1 remotePlmnList: type: array + uniqueItems: true items: $ref: 'TS29571_CommonData.yaml#/components/schemas/PlmnId' minItems: 1 remoteSnpnList: type: array + uniqueItems: true items: $ref: '#/components/schemas/PlmnIdNid' minItems: 1 @@ -1277,6 +1361,7 @@ components: $ref: '#/components/schemas/IpReachability' scpCapabilities: type: array + uniqueItems: true items: $ref: '#/components/schemas/ScpCapability' @@ -1286,12 +1371,14 @@ components: properties: appIds: type: array + uniqueItems: true items: type: string minItems: 1 readOnly: true afIds: type: array + uniqueItems: true items: type: string minItems: 1 @@ -1326,17 +1413,20 @@ components: properties: afEvents: type: array + uniqueItems: true items: $ref: '#/components/schemas/AfEvent' minItems: 1 afIds: type: array + uniqueItems: true items: type: string minItems: 1 readOnly: true appIds: type: array + uniqueItems: true items: type: string minItems: 1 @@ -1389,16 +1479,19 @@ components: properties: sNssaiEasdfInfoList: type: array + uniqueItems: true items: $ref: '#/components/schemas/SnssaiEasdfInfoItem' minItems: 1 easdfN6IpAddressList: type: array + uniqueItems: true items: $ref: 'TS28623_ComDefs.yaml#/components/schemas/IpAddr' minItems: 1 upfN6IpAddressList: type: array + uniqueItems: true items: $ref: 'TS28623_ComDefs.yaml#/components/schemas/IpAddr' minItems: 1 @@ -1414,6 +1507,7 @@ components: $ref: 'TS29571_CommonData.yaml#/components/schemas/ExtSnssai' dnnEasdfInfoList: type: array + uniqueItems: true items: $ref: '#/components/schemas/DnnEasdfInfoItem' minItems: 1 @@ -1430,6 +1524,7 @@ components: - $ref: 'TS29571_CommonData.yaml#/components/schemas/WildcardDnn' dnaiList: type: array + uniqueItems: true items: $ref: 'TS29571_CommonData.yaml#/components/schemas/Dnai' minItems: 1 @@ -1439,11 +1534,13 @@ components: properties: supiRanges: type: array + uniqueItems: true items: $ref: '#/components/schemas/SupiRange' minItems: 1 internalGroupIdentifiersRanges: type: array + uniqueItems: true items: $ref: '#/components/schemas/InternalGroupIdRange' minItems: 1 @@ -1453,21 +1550,25 @@ components: properties: sNssaiInfoList: type: array + uniqueItems: true items: $ref: '#/components/schemas/SnssaiInfoItem' minItems: 1 afEvents: type: array + uniqueItems: true items: $ref: '#/components/schemas/AfEvent' minItems: 1 appIds: type: array + uniqueItems: true items: type: string minItems: 1 internalGroupId: type: array + uniqueItems: true items: $ref: 'TS29571_CommonData.yaml#/components/schemas/GroupId' minItems: 1 @@ -1520,6 +1621,7 @@ components: pattern: '^[0-9]{5}$' trpIds: type: array + uniqueItems: true items: type: integer minimum: 1 @@ -1535,12 +1637,14 @@ components: maximum: 4294967295 trpMappingInfoList: type: array + uniqueItems: true items: $ref: '#/components/schemas/TrpMappingInfo' minItems: 1 TrpInfoList: type: array + uniqueItems: true items: $ref: '#/components/schemas/TrpInfo' minItems: 1 @@ -1551,6 +1655,7 @@ components: properties: servingClientTypes: type: array + uniqueItems: true items: $ref: '#/components/schemas/ExternalClientType' minItems: 1 @@ -1558,31 +1663,37 @@ components: type: string servingAccessTypes: type: array + uniqueItems: true items: $ref: 'TS29571_CommonData.yaml#/components/schemas/AccessType' minItems: 1 servingAnNodeTypes: type: array + uniqueItems: true items: $ref: '#/components/schemas/AnNodeType' minItems: 1 servingRatTypes: type: array + uniqueItems: true items: $ref: 'TS29571_CommonData.yaml#/components/schemas/RatType' minItems: 1 taiList: type: array + uniqueItems: true items: $ref: 'TS29571_CommonData.yaml#/components/schemas/Tai' minItems: 1 taiRangeList: type: array + uniqueItems: true items: $ref: '#/components/schemas/TaiRange' minItems: 1 supportedGADShapes: type: array + uniqueItems: true items: $ref: '#/components/schemas/SupportedGADShapes' minItems: 1 @@ -1594,11 +1705,13 @@ components: $ref: 'TS29571_CommonData.yaml#/components/schemas/NfGroupId' supiRanges: type: array + uniqueItems: true items: $ref: '#/components/schemas/SupiRange' minItems: 1 gpsiRanges: type: array + uniqueItems: true items: $ref: '#/components/schemas/IdentityRange' minItems: 1 @@ -1616,32 +1729,38 @@ components: $ref: 'TS29571_CommonData.yaml#/components/schemas/NfGroupId' supiRanges: type: array + uniqueItems: true items: $ref: '#/components/schemas/SupiRange' minItems: 1 gpsiRanges: type: array + uniqueItems: true items: $ref: '#/components/schemas/IdentityRange' minItems: 1 externalGroupIdentifiersRanges: type: array + uniqueItems: true items: $ref: '#/components/schemas/IdentityRange' minItems: 1 routingIndicators: type: array + uniqueItems: true items: type: string pattern: '^[0-9]{1,4}$' minItems: 1 internalGroupIdentifiersRanges: type: array + uniqueItems: true items: $ref: '#/components/schemas/InternalGroupIdRange' minItems: 1 suciInfos: type: array + uniqueItems: true items: $ref: '#/components/schemas/SuciInfo' minItems: 1 @@ -1669,6 +1788,7 @@ components: type: boolean remotePlmnRangeList: type: array + uniqueItems: true items: $ref: '#/components/schemas/PlmnRange' minItems: 1 @@ -1679,11 +1799,13 @@ components: properties: servingNfTypeList: type: array + uniqueItems: true items: $ref: '#/components/schemas/NFType' minItems: 1 servingNfSetIdList: type: array + uniqueItems: true items: $ref: 'TS29571_CommonData.yaml#/components/schemas/NfSetId' minItems: 1 @@ -1691,6 +1813,7 @@ components: $ref: '#/components/schemas/TaiList' taiRangeList: type: array + uniqueItems: true items: $ref: '#/components/schemas/TaiRange' minItems: 1 @@ -1701,16 +1824,19 @@ components: properties: servingNfTypeList: type: array + uniqueItems: true items: $ref: '#/components/schemas/NFType' servingNfSetIdList: type: array + uniqueItems: true items: $ref: 'TS29571_CommonData.yaml#/components/schemas/NfSetId' taiList: $ref: '#/components/schemas/TaiList' taiRangeList: type: array + uniqueItems: true items: $ref: '#/components/schemas/TaiRange' @@ -1722,16 +1848,19 @@ components: properties: supiRangeList: type: array + uniqueItems: true items: $ref: '#/components/schemas/SupiRange' minItems: 0 gpsiRangeList: type: array + uniqueItems: true items: $ref: '#/components/schemas/IdentityRange' minItems: 0 plmnRangeList: type: array + uniqueItems: true items: $ref: '#/components/schemas/PlmnRange' minItems: 0 @@ -1751,11 +1880,13 @@ components: properties: ipv4EndpointAddress: type: array + uniqueItems: true items: $ref: 'TS28623_ComDefs.yaml#/components/schemas/Ipv4Addr' minItems: 1 ipv6EndpointAddress: type: array + uniqueItems: true items: $ref: 'TS28623_ComDefs.yaml#/components/schemas/Ipv6Addr' minItems: 1 @@ -1776,26 +1907,31 @@ components: $ref: 'TS29571_CommonData.yaml#/components/schemas/AmfRegionId' guamiList: type: array + uniqueItems: true items: $ref: 'TS29571_CommonData.yaml#/components/schemas/Guami' minItems: 1 taiList: type: array + uniqueItems: true items: $ref: 'TS29571_CommonData.yaml#/components/schemas/Tai' minItems: 1 taiRangeList: type: array + uniqueItems: true items: $ref: '#/components/schemas/TaiRange' minItems: 1 backupInfoAmfFailure: type: array + uniqueItems: true items: $ref: 'TS29571_CommonData.yaml#/components/schemas/Guami' minItems: 1 backupInfoAmfRemoval: type: array + uniqueItems: true items: $ref: 'TS29571_CommonData.yaml#/components/schemas/Guami' minItems: 1 @@ -1815,16 +1951,19 @@ components: properties: sNssaiSmfInfoList: type: array + uniqueItems: true items: $ref: '#/components/schemas/SnssaiSmfInfoItem' minItems: 1 taiList: type: array + uniqueItems: true items: $ref: 'TS29571_CommonData.yaml#/components/schemas/Tai' minItems: 1 taiRangeList: type: array + uniqueItems: true items: $ref: '#/components/schemas/TaiRange' minItems: 1 @@ -1832,11 +1971,13 @@ components: $ref: 'TS29571_CommonData.yaml#/components/schemas/Fqdn' pgwIpAddrList: type: array + uniqueItems: true items: $ref: 'TS28623_ComDefs.yaml#/components/schemas/IpAddr' minItems: 1 accessType: type: array + uniqueItems: true items: $ref: 'TS29571_CommonData.yaml#/components/schemas/AccessType' minItems: 1 @@ -1848,6 +1989,7 @@ components: type: boolean pgwFqdnList: type: array + uniqueItems: true items: $ref: 'TS29571_CommonData.yaml#/components/schemas/Fqdn' minItems: 1 @@ -1869,16 +2011,19 @@ components: properties: sNssaiUpfInfoList: type: array + uniqueItems: true items: $ref: '#/components/schemas/SnssaiUpfInfoItem' minItems: 1 smfServingArea: type: array + uniqueItems: true items: type: string minItems: 1 interfaceUpfInfoList: type: array + uniqueItems: true items: $ref: '#/components/schemas/InterfaceUpfInfoItem' minItems: 1 @@ -1891,6 +2036,7 @@ components: readOnly: true pduSessionTypes: type: array + uniqueItems: true items: $ref: 'TS29571_CommonData.yaml#/components/schemas/PduSessionType' minItems: 1 @@ -1902,11 +2048,13 @@ components: readOnly: true taiList: type: array + uniqueItems: true items: $ref: 'TS29571_CommonData.yaml#/components/schemas/Tai' minItems: 1 taiRangeList: type: array + uniqueItems: true items: $ref: '#/components/schemas/TaiRange' minItems: 1 @@ -1938,6 +2086,7 @@ components: readOnly: true # upfEvents: # type: array + uniqueItems: true # items: # $ref: 'TS29564_Nupf_EventExposure.yaml#/components/schemas/EventType' # minItems: 1 @@ -1950,16 +2099,19 @@ components: $ref: 'TS29571_CommonData.yaml#/components/schemas/NfGroupId' dnnList: type: array + uniqueItems: true items: $ref: 'TS29571_CommonData.yaml#/components/schemas/Dnn' minItems: 1 supiRanges: type: array + uniqueItems: true items: $ref: '#/components/schemas/SupiRange' minItems: 1 gpsiRanges: type: array + uniqueItems: true items: $ref: '#/components/schemas/IdentityRange' minItems: 1 @@ -2014,16 +2166,19 @@ components: $ref: '#/components/schemas/AfEventExposureData' gpsiRanges: type: array + uniqueItems: true items: $ref: '#/components/schemas/IdentityRange' minItems: 1 externalGroupIdentifiersRanges: type: array + uniqueItems: true items: $ref: '#/components/schemas/IdentityRange' minItems: 1 servedFqdnList: type: array + uniqueItems: true items: type: string minItems: 1 @@ -2031,16 +2186,19 @@ components: $ref: '#/components/schemas/TaiList' taiRangeList: type: array + uniqueItems: true items: $ref: '#/components/schemas/TaiRange' minItems: 1 dnaiList: type: array + uniqueItems: true items: $ref: 'TS29571_CommonData.yaml#/components/schemas/Dnai' minItems: 1 unTrustAfInfoList: type: array + uniqueItems: true items: $ref: '#/components/schemas/UnTrustAfInfo' minItems: 1 @@ -2484,6 +2642,7 @@ components: NTNPLMNRestrictionsList: description: NTNPLMNRestrictionsInfoList that relates to non-terrestrial network access type: array + uniqueItems: true items: $ref: '#/components/schemas/NTNPLMNRestrictionsInfo' NTNPLMNRestrictionsInfo: @@ -2494,6 +2653,7 @@ components: $ref: 'TS28623_ComDefs.yaml#/components/schemas/PlmnId' blockedLocationInfoList: type: array + uniqueItems: true items: $ref: '#/components/schemas/BlockedLocationInfo' BlockedLocationInfo: @@ -2552,26 +2712,31 @@ components: $ref: 'TS29571_CommonData.yaml#/components/schemas/NfGroupId' imsiRanges: type: array + uniqueItems: true items: $ref: '#/components/schemas/ImsiRange' minItems: 1 imsPrivateIdentityRanges: type: array + uniqueItems: true items: $ref: '#/components/schemas/IdentityRange' minItems: 1 imsPublicIdentityRanges: type: array + uniqueItems: true items: $ref: '#/components/schemas/IdentityRange' minItems: 1 msisdnRanges: type: array + uniqueItems: true items: $ref: '#/components/schemas/IdentityRange' minItems: 1 externalGroupIdentifiersRanges: type: array + uniqueItems: true items: $ref: '#/components/schemas/IdentityRange' minItems: 1 @@ -2579,6 +2744,7 @@ components: $ref: '#/components/schemas/NetworkNodeDiameterAddress' additionalDiamAddresses: type: array + uniqueItems: true items: $ref: '#/components/schemas/NetworkNodeDiameterAddress' minItems: 1 @@ -2588,10 +2754,12 @@ components: properties: servingClientTypes: type: array + uniqueItems: true items: $ref: '#/components/schemas/ExternalClientType' gmlcNumbers: type: array + uniqueItems: true items: type: string pattern: '^[0-9]{5,15}$' @@ -2607,6 +2775,7 @@ components: $ref: 'TS29571_CommonData.yaml#/components/schemas/ExtSnssai' dnnInfoList: type: array + uniqueItems: true items: $ref: '#/components/schemas/DnnTsctsfInfoItem' minItems: 1 @@ -2631,18 +2800,22 @@ components: minProperties: 0 externalGroupIdentifiersRanges: type: array + uniqueItems: true items: $ref: '#/components/schemas/IdentityRange' supiRanges: type: array + uniqueItems: true items: $ref: '#/components/schemas/SupiRange' gpsiRanges: type: array + uniqueItems: true items: $ref: '#/components/schemas/IdentityRange' internalGroupIdentifiersRanges: type: array + uniqueItems: true items: $ref: '#/components/schemas/InternalGroupIdRange' @@ -2652,21 +2825,25 @@ components: properties: dnnList: type: array + uniqueItems: true items: $ref: 'TS29571_CommonData.yaml#/components/schemas/Dnn' minItems: 0 ipDomainList: type: array + uniqueItems: true items: type: string minItems: 0 ipv4AddressRanges: type: array + uniqueItems: true items: $ref: '#/components/schemas/Ipv4AddressRange' minItems: 0 ipv6PrefixRanges: type: array + uniqueItems: true items: $ref: '#/components/schemas/Ipv6PrefixRange' minItems: 0 @@ -2678,11 +2855,13 @@ components: $ref: 'TS29571_CommonData.yaml#/components/schemas/NfGroupId' supiRanges: type: array + uniqueItems: true items: $ref: '#/components/schemas/SupiRange' minItems: 0 gpsiRanges: type: array + uniqueItems: true items: $ref: '#/components/schemas/IdentityRange' minItems: 0 @@ -2703,11 +2882,13 @@ components: minProperties: 1 taiList: type: array + uniqueItems: true items: $ref: 'TS29571_CommonData.yaml#/components/schemas/Tai' minItems: 1 taiRangeList: type: array + uniqueItems: true items: $ref: '#/components/schemas/TaiRange' minItems: 1 @@ -2810,12 +2991,14 @@ components: properties: ncgiList: type: array + uniqueItems: true items: $ref: '#/components/schemas/NcgiTai' minItems: 1 description: List of NR cell Ids taiList: type: array + uniqueItems: true items: $ref: 'TS29571_CommonData.yaml#/components/schemas/Tai' minItems: 1 @@ -2832,6 +3015,7 @@ components: $ref: 'TS29571_CommonData.yaml#/components/schemas/Tai' cellList: type: array + uniqueItems: true items: $ref: '#/components/schemas/Ncgi' minItems: 1 @@ -2867,6 +3051,7 @@ components: $ref: 'TS29571_CommonData.yaml#/components/schemas/ExtSnssai' dnnInfoList: type: array + uniqueItems: true items: $ref: '#/components/schemas/DnnMbSmfInfoItem' minItems: 1 @@ -2888,6 +3073,7 @@ components: properties: routingIndicators: type: array + uniqueItems: true items: type: string pattern: '^[0-9]{1,4}$' @@ -2900,26 +3086,31 @@ components: properties: sNssaiMbUpfInfoList: type: array + uniqueItems: true items: $ref: '#/components/schemas/SnssaiUpfInfoItem' minItems: 1 mbSmfServingArea: type: array + uniqueItems: true items: type: string minItems: 1 interfaceMbUpfInfoList: type: array + uniqueItems: true items: $ref: '#/components/schemas/InterfaceUpfInfoItem' minItems: 1 taiList: type: array + uniqueItems: true items: $ref: 'TS29571_CommonData.yaml#/components/schemas/Tai' minItems: 1 taiRangeList: type: array + uniqueItems: true items: $ref: '#/components/schemas/TaiRange' minItems: 1 @@ -2940,6 +3131,7 @@ components: $ref: 'TS29571_CommonData.yaml#/components/schemas/ExtSnssai' dnnUpfInfoList: type: array + uniqueItems: true items: $ref: '#/components/schemas/DnnUpfInfoItem' minItems: 1 @@ -2961,41 +3153,49 @@ components: $ref: 'TS29571_CommonData.yaml#/components/schemas/Dnn' dnaiList: type: array + uniqueItems: true items: $ref: 'TS29571_CommonData.yaml#/components/schemas/Dnai' minItems: 1 pduSessionTypes: type: array + uniqueItems: true items: $ref: 'TS29571_CommonData.yaml#/components/schemas/PduSessionType' minItems: 1 ipv4AddressRanges: type: array + uniqueItems: true items: $ref: '#/components/schemas/Ipv4AddressRange' minItems: 1 ipv6PrefixRanges: type: array + uniqueItems: true items: $ref: '#/components/schemas/Ipv6PrefixRange' minItems: 1 natedIpv4AddressRanges: type: array + uniqueItems: true items: $ref: '#/components/schemas/Ipv4AddressRange' minItems: 1 natedIpv6PrefixRanges: type: array + uniqueItems: true items: $ref: '#/components/schemas/Ipv6PrefixRange' minItems: 1 ipv4IndexList: type: array + uniqueItems: true items: $ref: '#/components/schemas/IpIndex' minItems: 1 ipv6IndexList: type: array + uniqueItems: true items: $ref: '#/components/schemas/IpIndex' minItems: 1 @@ -3020,6 +3220,7 @@ components: properties: msisdnRanges: type: array + uniqueItems: true items: $ref: '#/components/schemas/IdentityRange' minItems: 1 @@ -3039,11 +3240,13 @@ components: properties: accessType: type: array + uniqueItems: true items: $ref: 'TS29571_CommonData.yaml#/components/schemas/AccessType' minItems: 1 dnnList: type: array + uniqueItems: true items: $ref: 'TS29571_CommonData.yaml#/components/schemas/Dnn' minItems: 1 @@ -3051,11 +3254,13 @@ components: $ref: 'TS28623_ComDefs.yaml#/components/schemas/Fqdn' gmIpv4Addresses: type: array + uniqueItems: true items: $ref: 'TS28623_ComDefs.yaml#/components/schemas/Ipv4Addr' minItems: 1 gmIpv6Addresses: type: array + uniqueItems: true items: $ref: 'TS28623_ComDefs.yaml#/components/schemas/Ipv6Addr' minItems: 1 @@ -3063,21 +3268,25 @@ components: $ref: 'TS28623_ComDefs.yaml#/components/schemas/Fqdn' mwIpv4Addresses: type: array + uniqueItems: true items: $ref: 'TS28623_ComDefs.yaml#/components/schemas/Ipv4Addr' minItems: 1 mwIpv6Addresses: type: array + uniqueItems: true items: $ref: 'TS28623_ComDefs.yaml#/components/schemas/Ipv6Addr' minItems: 1 servedIpv4AddressRanges: type: array + uniqueItems: true items: $ref: '#/components/schemas/Ipv4AddressRange' minItems: 1 servedIpv6PrefixRanges: type: array + uniqueItems: true items: $ref: '#/components/schemas/Ipv6PrefixRange' minItems: 1 @@ -3433,6 +3642,7 @@ components: $ref: '#/components/schemas/CommModelList' SmfInfo: type: array + uniqueItems: true items: $ref: '#/components/schemas/SmfInfo' configurable5QISetRef: @@ -3441,6 +3651,7 @@ components: $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnRo' dnaiSatelliteMappingList: type: array + uniqueItems: true items: $ref: '#/components/schemas/dnaiSatelliteMapping' minItems: 1 @@ -3501,6 +3712,7 @@ components: $ref: '#/components/schemas/SupportedBMOList' upfInfo: type: array + uniqueItems: true items: $ref: '#/components/schemas/UpfInfo' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' @@ -3561,6 +3773,7 @@ components: $ref: '#/components/schemas/SupportedBMOList' PcfInfo: type: array + uniqueItems: true items: $ref: '#/components/schemas/PcfInfo' configurable5QISetRef: @@ -3997,6 +4210,7 @@ components: $ref: '#/components/schemas/ManagedNFProfile' nsacfInfoSnssai: type: array + uniqueItems: true items: $ref: '#/components/schemas/NsacfInfoSnssai' nsacfInfo: @@ -4808,6 +5022,7 @@ components: properties: fiveQiDscpMappingList: type: array + uniqueItems: true items: $ref: '#/components/schemas/FiveQiDscpMapping' @@ -4878,10 +5093,12 @@ components: - DISABLED gtpUPathMonitoredSNSSAIs: type: array + uniqueItems: true items: $ref: 'TS28541_NrNrm.yaml#/components/schemas/Snssai' monitoredDSCPs: type: array + uniqueItems: true items: type: integer minimum: 0 @@ -4921,10 +5138,12 @@ components: - DISABLED qFMonitoredSNSSAIs: type: array + uniqueItems: true items: $ref: 'TS28541_NrNrm.yaml#/components/schemas/Snssai' qFMonitored5QIs: type: array + uniqueItems: true items: type: integer minimum: 0 @@ -4959,6 +5178,7 @@ components: properties: predefinedPccRules: type: array + uniqueItems: true items: $ref: '#/components/schemas/PccRule' minItems: 1 @@ -5437,6 +5657,7 @@ components: $ref: '#/components/schemas/CommModelList' bsfInfo: type: array + uniqueItems: true items: $ref: '#/components/schemas/BsfInfo' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' @@ -5719,6 +5940,7 @@ components: $ref: '#/components/schemas/SAP' operations: type: array + uniqueItems: true items: $ref: '#/components/schemas/Operation' minItems: 1 -- GitLab From 98b87bb0c6ab1697e0b3beafee57dd3812e0652a Mon Sep 17 00:00:00 2001 From: srinivasaraj Date: Fri, 21 Feb 2025 13:03:27 +0000 Subject: [PATCH 361/587] Rel-19 CR0116 28.536 Enhance stage 3 OpenAPI for isUnique property --- OpenAPI/TS28536_CoslaNrm.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/OpenAPI/TS28536_CoslaNrm.yaml b/OpenAPI/TS28536_CoslaNrm.yaml index 05197c3c7..c179fe3b1 100755 --- a/OpenAPI/TS28536_CoslaNrm.yaml +++ b/OpenAPI/TS28536_CoslaNrm.yaml @@ -169,6 +169,7 @@ components: $ref: '#/components/schemas/ControlLoopLifeCyclePhase' aCCLDisallowedList: type: array + uniqueItems: true items: $ref: '#/components/schemas/ACCLDisallowedAttributes' networkSliceRef: -- GitLab From 2fb9d5175d618ba7ced7b8a5f2a0bd48e328facc Mon Sep 17 00:00:00 2001 From: srinivasaraj Date: Fri, 21 Feb 2025 13:08:00 +0000 Subject: [PATCH 362/587] Rel 19 cr0169 28.104 enhance stage 3 open api for is unique property --- OpenAPI/TS28104_MdaNrm.yaml | 2 ++ OpenAPI/TS28104_MdaReport.yaml | 1 + 2 files changed, 3 insertions(+) diff --git a/OpenAPI/TS28104_MdaNrm.yaml b/OpenAPI/TS28104_MdaNrm.yaml index 384d36a9a..2405f576f 100644 --- a/OpenAPI/TS28104_MdaNrm.yaml +++ b/OpenAPI/TS28104_MdaNrm.yaml @@ -56,6 +56,7 @@ components: properties: areaScope: type: array + uniqueItems: true items: $ref: 'TS28623_ComDefs.yaml#/components/schemas/GeoArea' @@ -80,6 +81,7 @@ components: type: string threshold: type: array + uniqueItems: true items: $ref: '#/components/schemas/ThresholdInfo' analyticsPeriod: diff --git a/OpenAPI/TS28104_MdaReport.yaml b/OpenAPI/TS28104_MdaReport.yaml index dae638adf..1ac30cb81 100644 --- a/OpenAPI/TS28104_MdaReport.yaml +++ b/OpenAPI/TS28104_MdaReport.yaml @@ -56,6 +56,7 @@ components: type: string mDAOutputs: type: array + uniqueItems: true items: $ref: '#/components/schemas/MDAOutputs' mDARequestRef: -- GitLab From 03674a81608ae7b370bb3f303802862aa61b0543 Mon Sep 17 00:00:00 2001 From: allwang Date: Tue, 4 Feb 2025 14:15:52 +0000 Subject: [PATCH 363/587] Update TS28623_ComDefs.yaml --- OpenAPI/TS28623_ComDefs.yaml | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/OpenAPI/TS28623_ComDefs.yaml b/OpenAPI/TS28623_ComDefs.yaml index b06b18ccc..d80f95b91 100755 --- a/OpenAPI/TS28623_ComDefs.yaml +++ b/OpenAPI/TS28623_ComDefs.yaml @@ -170,18 +170,14 @@ components: $ref: '#/components/schemas/Longitude' altitude: $ref: '#/components/schemas/Float' - GeoPolygon: - type: array - uniqueItems: true - items: - $ref: '#/components/schemas/GeoCoordinate' - minItems: 1 GeoArea: oneOf: - type: object properties: geoPolygon: - $ref: '#/components/schemas/GeoCoordinate' + type: array + items: + $ref: '#/components/schemas/GeoCoordinate' minItems: 1 GeoAreaToCellMapping: type: object -- GitLab From 883ae28b72cc6a7ead7cfce34e6fa17aedf7194c Mon Sep 17 00:00:00 2001 From: ruiyue Date: Mon, 13 Jan 2025 03:41:48 +0000 Subject: [PATCH 364/587] Update 2 files - /OpenAPI/TS28312_IntentExpectations.yaml - /OpenAPI/TS28312_IntentNrm.yaml --- OpenAPI/TS28312_IntentExpectations.yaml | 42 +++++++++++++++++++++++-- OpenAPI/TS28312_IntentNrm.yaml | 4 ++- 2 files changed, 43 insertions(+), 3 deletions(-) diff --git a/OpenAPI/TS28312_IntentExpectations.yaml b/OpenAPI/TS28312_IntentExpectations.yaml index ba388ec9c..4b39484ab 100644 --- a/OpenAPI/TS28312_IntentExpectations.yaml +++ b/OpenAPI/TS28312_IntentExpectations.yaml @@ -77,12 +77,16 @@ components: - $ref: '#/components/schemas/ULLatencyTarget' - $ref: '#/components/schemas/DLThptPerUETarget' - $ref: '#/components/schemas/ULThptPerUETarget' + - $ref: '#/components/schemas/NumberofUEsTarget' - $ref: 'TS28312_IntentNrm.yaml#/components/schemas/ExpectationTarget' expectationContexts: type: array uniqueItems: true items: - $ref: 'TS28312_IntentNrm.yaml#/components/schemas/Context' + type: object + oneOf: + - $ref: '#/components/schemas/SchedulingTimeContext' + - $ref: 'TS28312_IntentNrm.yaml#/components/schemas/Context' required: - expectationId EdgeServiceSupportExpectation: @@ -207,6 +211,7 @@ components: oneOf: - $ref: '#/components/schemas/CoverageAreaPolygonContext' - $ref: '#/components/schemas/ServiceTypeContext' + - $ref: '#/components/schemas/PlmnInfoContext' - $ref: 'TS28312_IntentNrm.yaml#/components/schemas/Context' EdgeServiceSupportExpectationObject: description: >- @@ -621,6 +626,22 @@ components: type: integer minItems: 1 maxItems: 2 + NumberofUEsTarget: + description: >- + This data type is the "ExpectationTarget" data type with specialisations for NumberofUEsTarget.It describes + the number of UEs target for the Radio Service that the intent expectation is applied. + type: object + properties: + targetName: + type: string + enum: + - NumberofUEs + targetCondition: + type: string + enum: + - IS_LESS_THAN + targetValueRange: + type: integer DLThptPerUETarget: description: >- This data type is the "ExpectationTarget" data type with specialisations for DLThptPerUETarget. It describes the DL throughput target by the per UE for the @@ -1211,11 +1232,28 @@ components: - IS_EQUAL_TO contextValueRange: $ref: "TS28541_NrNrm.yaml#/components/schemas/Sst" + PlmnInfoContext: + description: >- + This data type is the "ExpectationContext" data type with specialisations for PlmnInfoContext.It describes + the PLMN supported by the Radio Service that the intent expectation is applied. In case of network slicing + feature is supported, this also represents the S-NSSAI in the PLMN supported by the Radio Service. + type: object + properties: + contextAttribute: + type: string + enum: + - PlmnInfo + contextCondition: + type: string + enum: + - IS_ALL_OF + contextValueRange: + $ref: "TS28541_NrNrm.yaml#/components/schemas/PlmnInfo" SchedulingTimeContext: description: >- This data type is the "ExpectationContext" data type with specialisations for SchedulingTimeContext.It describes the scheduled times (including one-time interval, daily periodicity, weekly periodicity or monthly periodicity) - for the IntentObject that the intent expectation is applied. + for the IntentObject that the intent expectation is applied. type: object properties: contextAttribute: diff --git a/OpenAPI/TS28312_IntentNrm.yaml b/OpenAPI/TS28312_IntentNrm.yaml index 736d32efb..36ee467ec 100644 --- a/OpenAPI/TS28312_IntentNrm.yaml +++ b/OpenAPI/TS28312_IntentNrm.yaml @@ -288,7 +288,9 @@ components: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/PlmnId' - $ref: 'TS28623_ComDefs.yaml#/components/schemas/GeoCoordinate' - $ref: '#/components/schemas/UEGroup' - - $ref: '#/components/schemas/Frequency' + - $ref: '#/components/schemas/Frequency' + - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/SchedulingTime' + - $ref: 'TS28541_NrNrm.yaml#/components/schemas/PlmnInfo' UEGroup: description: >- It describes the UE Group, which is -- GitLab From 4f5b456ce813e0d2302d54af2b0759d6a43f9cf6 Mon Sep 17 00:00:00 2001 From: ruiyue Date: Mon, 13 Jan 2025 06:12:02 +0000 Subject: [PATCH 365/587] Update 2 files - /OpenAPI/TS28312_IntentExpectations.yaml - /OpenAPI/TS28312_IntentNrm.yaml --- OpenAPI/TS28312_IntentExpectations.yaml | 14 ++++++++++++++ OpenAPI/TS28312_IntentNrm.yaml | 7 ++++++- 2 files changed, 20 insertions(+), 1 deletion(-) diff --git a/OpenAPI/TS28312_IntentExpectations.yaml b/OpenAPI/TS28312_IntentExpectations.yaml index 4b39484ab..a4be21b9a 100644 --- a/OpenAPI/TS28312_IntentExpectations.yaml +++ b/OpenAPI/TS28312_IntentExpectations.yaml @@ -355,6 +355,13 @@ components: - IS_GREATER_THAN targetValueRange: type: integer + targetContexts: + type: array + items: + type: object + oneOf: + - $ref: '#/components/schemas/UlFrequencyContext' + - $ref: '#/components/schemas/RATContext' AveDLRANUEThptTarget: description: >- This data type is the "ExpectationTarget" data type with specialisations for AveDLRANUEThptTarget.It describes the average @@ -372,6 +379,13 @@ components: - IS_GREATER_THAN targetValueRange: type: integer + targetContexts: + type: array + items: + type: object + oneOf: + - $ref: '#/components/schemas/DlFrequencyContext' + - $ref: '#/components/schemas/RATContext' LowULRANUEThptRatioTarget: description: >- This data type is the "ExpectationTarget" data type with specialisations for LowULRANUEThptRatioTarget.It describes the low diff --git a/OpenAPI/TS28312_IntentNrm.yaml b/OpenAPI/TS28312_IntentNrm.yaml index 36ee467ec..7376810cd 100644 --- a/OpenAPI/TS28312_IntentNrm.yaml +++ b/OpenAPI/TS28312_IntentNrm.yaml @@ -406,7 +406,12 @@ components: description: >- It describes the value that has been achieved for the expectation target at the time at which the report is generated. - readOnly: true + readOnly: true + targetContexts: + type: array + uniqueItems: true + items: + $ref: '#/components/schemas/Context' #-------Definition of the concrete TargetFulfilmentResult dataType----------------# #-------Definition of the generic IntentConflictReport dataType----------------# -- GitLab From 9270dcebdcd5395af5906d8989b953b3f94842af Mon Sep 17 00:00:00 2001 From: ruiyue Date: Tue, 14 Jan 2025 01:38:20 +0000 Subject: [PATCH 366/587] Update file TS28312_IntentNrm.yaml --- OpenAPI/TS28312_IntentNrm.yaml | 30 ++++++++++++++++++++++++------ 1 file changed, 24 insertions(+), 6 deletions(-) diff --git a/OpenAPI/TS28312_IntentNrm.yaml b/OpenAPI/TS28312_IntentNrm.yaml index 7376810cd..b91cf5e44 100644 --- a/OpenAPI/TS28312_IntentNrm.yaml +++ b/OpenAPI/TS28312_IntentNrm.yaml @@ -40,11 +40,11 @@ components: oneOf: - $ref: "#/components/schemas/IntentExpectation" - $ref: "TS28312_IntentExpectations.yaml#/components/schemas/RadioNetworkExpectation" - - $ref: "TS28312_IntentExpectations.yaml#/components/schemas/EdgeServiceSupportExpectation" - - $ref: "TS28312_IntentExpectations.yaml#/components/schemas/5GCNetworkExpectation" - - $ref: "TS28312_IntentExpectations.yaml#/components/schemas/RadioServiceExpectation" + - $ref: "TS28312_IntentExpectations.yaml#/components/schemas/EdgeServiceSupportExpectation" + - $ref: "TS28312_IntentExpectations.yaml#/components/schemas/5GCNetworkExpectation" + - $ref: "TS28312_IntentExpectations.yaml#/components/schemas/RadioServiceExpectation" intentMgmtPurpose: - $ref: "#/components/schemas/IntentMgmtPurpose" + $ref: "#/components/schemas/IntentMgmtPurpose" contextSelectivity: $ref: "#/components/schemas/Selectivity" expectationSelectivity: @@ -458,7 +458,7 @@ components: IntentFeasibilityCheckReport: description: >- It represents the intent feasibility check information - This attribute shall be supported when intent feasibility check information information is supported by IntentReport + This attribute shall be supported when intent feasibility check information information is supported by IntentReport type: object properties: feasibilityCheckResult: @@ -476,6 +476,25 @@ components: enum: - INVALID_INTENT_EXPRESSION - INTENT_CONFLICT + inFeasibleExpectationInfos: + type: array + items: + $ref: '#/components/schemas/InFeasibleExpectationInfo' + InFeasibleExpectationInfo: + description: >- + It describes the list of InFeasibleExpectationInfo for all infeasible IntentExpectations + in the intent + type: object + properties: + expectationId: + type: string + readOnly: true + inFeasibleTargets: + type: array + items: + type: string + readOnly: true + description: It describes the list of TargetNames for the InFeasibleTargets #-------Definition of the concrete IntentFeasibilityCheckReport dataType----------------# @@ -514,7 +533,6 @@ components: minItems: 1 #-------Definition of the generic IntentExplorationReport dataType----------------# - #-------Definition of the generic IntentHandlingCapability dataType----------------# IntentHandlingCapability: description: >- -- GitLab From ea9888014295a7752398e98fda63b09f82c6331d Mon Sep 17 00:00:00 2001 From: ruiyue Date: Tue, 14 Jan 2025 02:20:04 +0000 Subject: [PATCH 367/587] Update file TS28312_IntentNrm.yaml --- OpenAPI/TS28312_IntentNrm.yaml | 70 +++++++++++++++++++++++++++++++--- 1 file changed, 65 insertions(+), 5 deletions(-) diff --git a/OpenAPI/TS28312_IntentNrm.yaml b/OpenAPI/TS28312_IntentNrm.yaml index b91cf5e44..1d9d198dc 100644 --- a/OpenAPI/TS28312_IntentNrm.yaml +++ b/OpenAPI/TS28312_IntentNrm.yaml @@ -72,11 +72,8 @@ components: description: It expresses the priority of the stated intent within a MnS consumer. intentPreemptionCapability: type: boolean - observationPeriod: - type: integer - description: >- - It represents the observation period of the fulfilmentInfo for corresponding - ExpectationTargets, IntentExpectations and Intent. + intentReportControl: + $ref: '#/components/schemas/IntentReportControl' intentReportReference: $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnRo' IntentReport-Single: @@ -355,6 +352,69 @@ components: - $ref: "#/components/schemas/ValueRangeType" #-------Definition of the generic Context dataType----------------# + #-------Definition of the generic IntentReportControl dataType----------------# + IntentReportControl: + description: >- + It describes intent report subscription information + type: object + properties: + reportRecipientAddress: + description: >- + It indicates the address of report recipient for MnS consumer + type: string + observationPeriod: + description: >- + It indicates the time period for which the fulfilment process is observed + and at the end of which the fulfilmentInfo for corresponding + ExpectationTargets, IntentExpectations and Intent is updated. + type: integer + expectedReportTypes: + description: >- + It indicates the type of IntentReports. + type: string + enum: + - INTENT_FULFILMENT_REPORT + - INTENT_CONFLICT_REPORT + - INTENT_FEASIBILITY_CHECK_REPORT + reportingConditions: + description: >- + It indicates the specified conditions for intent reporting. + type: array + items: + $ref: '#/components/schemas/ReportingCondition' + reportingTargets: + description: >- + It indicates the specified targets needed to be reported. + type: array + items: + type: string + ReportingCondition: + description: >- + It describes the specified conditions for intent reporting. + oneOf: + - $ref: '#/components/schemas/TimeCondition' + - $ref: '#/components/schemas/TargetFulfilmentCondition' + TimeCondition: + $ref: 'TS28623_GenericNrm.yaml#/components/schemas/SchedulingTime' + TargetFulfilmentCondition: + description: >- + It indicates the specified conditions of target fulfilment for intent reporting. + type: object + properties: + targetName: + type: string + targetCondition: + $ref: '#/components/schemas/Condition' + targetValueRange: + oneOf: + - type: array + uniqueItems: true + items: + $ref: "#/components/schemas/ValueRangeType" + - $ref: "#/components/schemas/ValueRangeType" + #-------Definition of the concrete IntentReportControl dataType----------------# + + #-------Definition of the generic IntentFulfilmentReport dataType----------------# IntentFulfilmentReport: description: >- -- GitLab From 59f9d0267bb7e13bb75290d7950bcb40afb722e1 Mon Sep 17 00:00:00 2001 From: ruiyue Date: Tue, 14 Jan 2025 08:37:13 +0000 Subject: [PATCH 368/587] Update file TS28312_IntentNrm.yaml --- OpenAPI/TS28312_IntentNrm.yaml | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/OpenAPI/TS28312_IntentNrm.yaml b/OpenAPI/TS28312_IntentNrm.yaml index 1d9d198dc..38eb39f73 100644 --- a/OpenAPI/TS28312_IntentNrm.yaml +++ b/OpenAPI/TS28312_IntentNrm.yaml @@ -430,6 +430,8 @@ components: minItems: 1 items: $ref: '#/components/schemas/ExpectationFulfilmentResult' + enablerInfo: + $ref: '#/components/schemas/EnablerInfo' #-------Definition of the concrete IntentFulfilmentReport dataType----------------# #-------Definition of the generic ExpectationFulfilmentResult dataType----------------# @@ -474,6 +476,32 @@ components: $ref: '#/components/schemas/Context' #-------Definition of the concrete TargetFulfilmentResult dataType----------------# + #-------Definition of the generic EnablerInfo dataType----------------# + EnablerInfo: + description: >- + This data type represents the information of enablers for intent fulfilment. + type: object + properties: + managedObjectTypes: + type: array + items: + type: string + readOnly: true + managedObjectInstanceInfos: + type: array + items: + $ref: '#/components/schemas/ManagedObjectInstanceInfo' + ManagedObjectInstanceInfo: + description: >- + It represents the information of managed object (e.g., NE, NF, Cell) during intent fulfilment. + type: object + properties: + managedObjectInstance: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnRo' + modifications: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/AttributeValueChangeSet' + #-------Definition of the generic EnablerInfo dataType----------------# + #-------Definition of the generic IntentConflictReport dataType----------------# IntentConflictReport: description: >- -- GitLab From 21a05c88302af556e767d6b9bc5218306b74a000 Mon Sep 17 00:00:00 2001 From: ruiyue Date: Wed, 15 Jan 2025 09:04:57 +0000 Subject: [PATCH 369/587] Update file TS28312_IntentNrm.yaml --- OpenAPI/TS28312_IntentNrm.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/OpenAPI/TS28312_IntentNrm.yaml b/OpenAPI/TS28312_IntentNrm.yaml index 38eb39f73..6550edb39 100644 --- a/OpenAPI/TS28312_IntentNrm.yaml +++ b/OpenAPI/TS28312_IntentNrm.yaml @@ -485,7 +485,8 @@ components: managedObjectTypes: type: array items: - type: string + type: string + uniqueItems: true readOnly: true managedObjectInstanceInfos: type: array -- GitLab From e05395f169c304623961e9088096fbbd908ee5c2 Mon Sep 17 00:00:00 2001 From: ruiyue Date: Wed, 19 Feb 2025 11:18:30 +0000 Subject: [PATCH 370/587] Update file TS28312_IntentNrm.yaml --- OpenAPI/TS28312_IntentNrm.yaml | 31 ++----------------------------- 1 file changed, 2 insertions(+), 29 deletions(-) diff --git a/OpenAPI/TS28312_IntentNrm.yaml b/OpenAPI/TS28312_IntentNrm.yaml index 6550edb39..70d109a36 100644 --- a/OpenAPI/TS28312_IntentNrm.yaml +++ b/OpenAPI/TS28312_IntentNrm.yaml @@ -430,8 +430,8 @@ components: minItems: 1 items: $ref: '#/components/schemas/ExpectationFulfilmentResult' - enablerInfo: - $ref: '#/components/schemas/EnablerInfo' + additionalFulfilmentInfo: + type: string #-------Definition of the concrete IntentFulfilmentReport dataType----------------# #-------Definition of the generic ExpectationFulfilmentResult dataType----------------# @@ -476,33 +476,6 @@ components: $ref: '#/components/schemas/Context' #-------Definition of the concrete TargetFulfilmentResult dataType----------------# - #-------Definition of the generic EnablerInfo dataType----------------# - EnablerInfo: - description: >- - This data type represents the information of enablers for intent fulfilment. - type: object - properties: - managedObjectTypes: - type: array - items: - type: string - uniqueItems: true - readOnly: true - managedObjectInstanceInfos: - type: array - items: - $ref: '#/components/schemas/ManagedObjectInstanceInfo' - ManagedObjectInstanceInfo: - description: >- - It represents the information of managed object (e.g., NE, NF, Cell) during intent fulfilment. - type: object - properties: - managedObjectInstance: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnRo' - modifications: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/AttributeValueChangeSet' - #-------Definition of the generic EnablerInfo dataType----------------# - #-------Definition of the generic IntentConflictReport dataType----------------# IntentConflictReport: description: >- -- GitLab From ee7333438c1f71b622a1fdb55a88d457d3ee0ee6 Mon Sep 17 00:00:00 2001 From: ruiyue Date: Thu, 16 Jan 2025 02:26:40 +0000 Subject: [PATCH 371/587] Add new file --- OpenAPI/TS28623_featureNrm.yaml | 40 +++++++++++++++++++++++++++++++++ 1 file changed, 40 insertions(+) create mode 100644 OpenAPI/TS28623_featureNrm.yaml diff --git a/OpenAPI/TS28623_featureNrm.yaml b/OpenAPI/TS28623_featureNrm.yaml new file mode 100644 index 000000000..5ce0b62e6 --- /dev/null +++ b/OpenAPI/TS28623_featureNrm.yaml @@ -0,0 +1,40 @@ +openapi: 3.0.1 +info: + title: NRM feautres + version: 19.0.0 + description: >- + OAS 3.0.1 definition of the features of NRM + © 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). + All rights reserved. +externalDocs: + description: 3GPP TS 28.623; Generic NRM, NRM features + url: http://www.3gpp.org/ftp/Specs/archive/28_series/28.623/ +paths: {} +components: + schemas: +#----- Definitions in TS 28.623 for TS 28.532 --------------------------# + resources-feature: + anyOf: + - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/resources-genericNrm' + - $ref: 'TS28541_NrNrm.yaml#/components/schemas/resources-nrNrm' + - $ref: 'TS28541_5GcNrm.yaml#/components/schemas/resources-5gcNrm' + - $ref: 'TS28541_SliceNrm.yaml#/components/schemas/resources-sliceNrm' + - $ref: 'TS28536_CoslaNrm.yaml#/components/schemas/resources-coslaNrm' + - $ref: 'TS28312_IntentNrm.yaml#/components/schemas/resources-intentNrm' + - $ref: 'TS28104_MdaNrm.yaml#/components/schemas/resources-mdaNrm' + - $ref: 'TS28105_AiMlNrm.yaml#/components/schemas/resources-AiMlNrm' + - $ref: 'TS28538_EdgeNrm.yaml#/components/schemas/resources-edgeNrm' + - $ref: 'TS28317_RanScNrm.yaml#/components/schemas/resources-RanScNrm' + - $ref: 'TS28623_FileManagementNrm.yaml#/components/schemas/resources-fileMgmtNrm' + - $ref: 'TS28623_ManagementDataCollectionNrm.yaml#/components/schemas/resources-mgmtDataCollectionNrm' + - $ref: 'TS28623_MnSRegistryNrm.yaml#/components/schemas/resources-mnSRegistryNrm' + - $ref: 'TS28623_PmControlNrm.yaml#/components/schemas/resources-pmControlNrm' + - $ref: 'TS28111_FaultNrm.yaml#/components/schemas/resources-faultNrm' + - $ref: 'TS28623_QoEMeasurementCollectionNrm.yaml#/components/schemas/resources-qoEMeasuremetCollectionNrm' + - $ref: 'TS28623_SubscriptionControlNrm.yaml#/components/schemas/resources-subscriptionControlNrm' + - $ref: 'TS28623_ThresholdMonitorNrm.yaml#/components/schemas/resources-thresholdMonitorNrm' + - $ref: 'TS28623_TraceControlNrm.yaml#/components/schemas/resources-traceControlNrm' + - $ref: 'TS28319_MsacNrm.yaml#/components/schemas/resources-msacNrm' + - $ref: 'TS28318_DsoNrm.yaml#/components/schemas/resources-DSORecovery' + +#----- Definitions in TS 28.623 for TS 28.532 --------------------------# -- GitLab From b18b5fb96df27bf6a3290472011f4e84324a368d Mon Sep 17 00:00:00 2001 From: ruiyue Date: Thu, 16 Jan 2025 02:43:33 +0000 Subject: [PATCH 372/587] Update TS28623_featureNrm.yaml --- .../{TS28623_featureNrm.yaml => TS28623_FeatureNrm.yaml} | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) rename OpenAPI/{TS28623_featureNrm.yaml => TS28623_FeatureNrm.yaml} (95%) diff --git a/OpenAPI/TS28623_featureNrm.yaml b/OpenAPI/TS28623_FeatureNrm.yaml similarity index 95% rename from OpenAPI/TS28623_featureNrm.yaml rename to OpenAPI/TS28623_FeatureNrm.yaml index 5ce0b62e6..e4a7ff9a6 100644 --- a/OpenAPI/TS28623_featureNrm.yaml +++ b/OpenAPI/TS28623_FeatureNrm.yaml @@ -1,13 +1,13 @@ openapi: 3.0.1 info: - title: NRM feautres + title: NRM Feautres version: 19.0.0 description: >- - OAS 3.0.1 definition of the features of NRM + OAS 3.0.1 definition of the Features of NRM © 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved. externalDocs: - description: 3GPP TS 28.623; Generic NRM, NRM features + description: 3GPP TS 28.623; Generic NRM, NRM Features url: http://www.3gpp.org/ftp/Specs/archive/28_series/28.623/ paths: {} components: -- GitLab From eae4d31a6d59f21f2444cfde5b51211543dbae69 Mon Sep 17 00:00:00 2001 From: ruiyue Date: Thu, 16 Jan 2025 02:53:18 +0000 Subject: [PATCH 373/587] Update file TS28532_ProvMnS.yaml --- OpenAPI/TS28532_ProvMnS.yaml | 24 +----------------------- 1 file changed, 1 insertion(+), 23 deletions(-) diff --git a/OpenAPI/TS28532_ProvMnS.yaml b/OpenAPI/TS28532_ProvMnS.yaml index 93f928a8e..5ba1b679f 100755 --- a/OpenAPI/TS28532_ProvMnS.yaml +++ b/OpenAPI/TS28532_ProvMnS.yaml @@ -401,7 +401,6 @@ components: - copy - move - test - Resource: oneOf: - type: object @@ -420,28 +419,7 @@ components: type: object required: - id - - anyOf: - - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/resources-genericNrm' - - $ref: 'TS28541_NrNrm.yaml#/components/schemas/resources-nrNrm' - - $ref: 'TS28541_5GcNrm.yaml#/components/schemas/resources-5gcNrm' - - $ref: 'TS28541_SliceNrm.yaml#/components/schemas/resources-sliceNrm' - - $ref: 'TS28536_CoslaNrm.yaml#/components/schemas/resources-coslaNrm' - - $ref: 'TS28312_IntentNrm.yaml#/components/schemas/resources-intentNrm' - - $ref: 'TS28104_MdaNrm.yaml#/components/schemas/resources-mdaNrm' - - $ref: 'TS28105_AiMlNrm.yaml#/components/schemas/resources-AiMlNrm' - - $ref: 'TS28538_EdgeNrm.yaml#/components/schemas/resources-edgeNrm' - - $ref: 'TS28317_RanScNrm.yaml#/components/schemas/resources-RanScNrm' - - $ref: 'TS28623_FileManagementNrm.yaml#/components/schemas/resources-fileMgmtNrm' - - $ref: 'TS28623_ManagementDataCollectionNrm.yaml#/components/schemas/resources-mgmtDataCollectionNrm' - - $ref: 'TS28623_MnSRegistryNrm.yaml#/components/schemas/resources-mnSRegistryNrm' - - $ref: 'TS28623_PmControlNrm.yaml#/components/schemas/resources-pmControlNrm' - - $ref: 'TS28111_FaultNrm.yaml#/components/schemas/resources-faultNrm' - - $ref: 'TS28623_QoEMeasurementCollectionNrm.yaml#/components/schemas/resources-qoEMeasuremetCollectionNrm' - - $ref: 'TS28623_SubscriptionControlNrm.yaml#/components/schemas/resources-subscriptionControlNrm' - - $ref: 'TS28623_ThresholdMonitorNrm.yaml#/components/schemas/resources-thresholdMonitorNrm' - - $ref: 'TS28623_TraceControlNrm.yaml#/components/schemas/resources-traceControlNrm' - - $ref: 'TS28319_MsacNrm.yaml#/components/schemas/resources-msacNrm' - - $ref: 'TS28318_DsoNrm.yaml#/components/schemas/resources-DSORecovery' + - $ref: 'TS28623_FeatureNrm.yaml#/components/schemas/resources-feature' Scope: type: object properties: -- GitLab From 9b3efffc97f1a394f1b5335d93fb97083692484b Mon Sep 17 00:00:00 2001 From: ruiyue Date: Wed, 19 Feb 2025 11:05:14 +0000 Subject: [PATCH 374/587] Update file TS28623_FeatureNrm.yaml --- OpenAPI/TS28623_FeatureNrm.yaml | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/OpenAPI/TS28623_FeatureNrm.yaml b/OpenAPI/TS28623_FeatureNrm.yaml index e4a7ff9a6..3171f4557 100644 --- a/OpenAPI/TS28623_FeatureNrm.yaml +++ b/OpenAPI/TS28623_FeatureNrm.yaml @@ -15,26 +15,26 @@ components: #----- Definitions in TS 28.623 for TS 28.532 --------------------------# resources-feature: anyOf: - - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/resources-genericNrm' + - $ref: 'TS28104_MdaNrm.yaml#/components/schemas/resources-mdaNrm' + - $ref: 'TS28105_AiMlNrm.yaml#/components/schemas/resources-AiMlNrm' + - $ref: 'TS28111_FaultNrm.yaml#/components/schemas/resources-faultNrm' + - $ref: 'TS28312_IntentNrm.yaml#/components/schemas/resources-intentNrm' + - $ref: 'TS28317_RanScNrm.yaml#/components/schemas/resources-RanScNrm' + - $ref: 'TS28318_DsoNrm.yaml#/components/schemas/resources-DSORecovery' + - $ref: 'TS28319_MsacNrm.yaml#/components/schemas/resources-msacNrm' + - $ref: 'TS28536_CoslaNrm.yaml#/components/schemas/resources-coslaNrm' + - $ref: 'TS28538_EdgeNrm.yaml#/components/schemas/resources-edgeNrm' - $ref: 'TS28541_NrNrm.yaml#/components/schemas/resources-nrNrm' - $ref: 'TS28541_5GcNrm.yaml#/components/schemas/resources-5gcNrm' - $ref: 'TS28541_SliceNrm.yaml#/components/schemas/resources-sliceNrm' - - $ref: 'TS28536_CoslaNrm.yaml#/components/schemas/resources-coslaNrm' - - $ref: 'TS28312_IntentNrm.yaml#/components/schemas/resources-intentNrm' - - $ref: 'TS28104_MdaNrm.yaml#/components/schemas/resources-mdaNrm' - - $ref: 'TS28105_AiMlNrm.yaml#/components/schemas/resources-AiMlNrm' - - $ref: 'TS28538_EdgeNrm.yaml#/components/schemas/resources-edgeNrm' - - $ref: 'TS28317_RanScNrm.yaml#/components/schemas/resources-RanScNrm' - $ref: 'TS28623_FileManagementNrm.yaml#/components/schemas/resources-fileMgmtNrm' + - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/resources-genericNrm' - $ref: 'TS28623_ManagementDataCollectionNrm.yaml#/components/schemas/resources-mgmtDataCollectionNrm' - - $ref: 'TS28623_MnSRegistryNrm.yaml#/components/schemas/resources-mnSRegistryNrm' + - $ref: 'TS28623_MnSRegistryNrm.yaml#/components/schemas/resources-mnSRegistryNrm' - $ref: 'TS28623_PmControlNrm.yaml#/components/schemas/resources-pmControlNrm' - - $ref: 'TS28111_FaultNrm.yaml#/components/schemas/resources-faultNrm' - - $ref: 'TS28623_QoEMeasurementCollectionNrm.yaml#/components/schemas/resources-qoEMeasuremetCollectionNrm' - - $ref: 'TS28623_SubscriptionControlNrm.yaml#/components/schemas/resources-subscriptionControlNrm' - - $ref: 'TS28623_ThresholdMonitorNrm.yaml#/components/schemas/resources-thresholdMonitorNrm' - - $ref: 'TS28623_TraceControlNrm.yaml#/components/schemas/resources-traceControlNrm' - - $ref: 'TS28319_MsacNrm.yaml#/components/schemas/resources-msacNrm' - - $ref: 'TS28318_DsoNrm.yaml#/components/schemas/resources-DSORecovery' + - $ref: 'TS28623_QoEMeasurementCollectionNrm.yaml#/components/schemas/resources-qoEMeasuremetCollectionNrm' + - $ref: 'TS28623_SubscriptionControlNrm.yaml#/components/schemas/resources-subscriptionControlNrm' + - $ref: 'TS28623_ThresholdMonitorNrm.yaml#/components/schemas/resources-thresholdMonitorNrm' + - $ref: 'TS28623_TraceControlNrm.yaml#/components/schemas/resources-traceControlNrm' #----- Definitions in TS 28.623 for TS 28.532 --------------------------# -- GitLab From 7ecbafe2209b07ff4b817e0af634273c0798540d Mon Sep 17 00:00:00 2001 From: ruiyue Date: Mon, 20 Jan 2025 01:44:42 +0000 Subject: [PATCH 375/587] Update file TS28623_MnSRegistryNrm.yaml --- OpenAPI/TS28623_MnSRegistryNrm.yaml | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/OpenAPI/TS28623_MnSRegistryNrm.yaml b/OpenAPI/TS28623_MnSRegistryNrm.yaml index 299cca657..b4e8c68e3 100644 --- a/OpenAPI/TS28623_MnSRegistryNrm.yaml +++ b/OpenAPI/TS28623_MnSRegistryNrm.yaml @@ -39,10 +39,8 @@ components: properties: mnsLabel: type: string - readOnly: true mnsType: type: string - readOnly: true enum: - PROV_MNS - FAULT_SUPERVISION_MNS @@ -50,7 +48,6 @@ components: - FILE_DATA_REPORTING_MNS mnsVersion: type: string - readOnly: true mnsAddress: description: Resource URI as defined in the relevant Technical Specification $ref: 'TS28623_ComDefs.yaml#/components/schemas/UriRo' @@ -63,7 +60,7 @@ components: type: array uniqueItems: true items: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnRo' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' minItems: 1 #-------- Definition of YAML arrays for name-contained IOCs ---------------------- -- GitLab From 5e99dd36b6d4664b5eae2d0f33e73434199af7f4 Mon Sep 17 00:00:00 2001 From: ruiyue Date: Tue, 21 Jan 2025 11:32:13 +0000 Subject: [PATCH 376/587] Update file TS28541_NrNrm.yaml --- OpenAPI/TS28541_NrNrm.yaml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/OpenAPI/TS28541_NrNrm.yaml b/OpenAPI/TS28541_NrNrm.yaml index 7c2027fe1..38cbf5ca5 100755 --- a/OpenAPI/TS28541_NrNrm.yaml +++ b/OpenAPI/TS28541_NrNrm.yaml @@ -799,6 +799,8 @@ components: $ref: 'TS28541_5GcNrm.yaml#/components/schemas/Dynamic5QISet-Multiple' CCOFunction: $ref: '#/components/schemas/CCOFunction-Single' + NTNFunction: + $ref: '#/components/schemas/NTNFunction-Single' ManagedElement-ncO-NrNrm: type: object @@ -827,6 +829,8 @@ components: $ref: 'TS28541_5GcNrm.yaml#/components/schemas/Configurable5QISet-Multiple' Dynamic5QISet: $ref: 'TS28541_5GcNrm.yaml#/components/schemas/Dynamic5QISet-Multiple' + NTNFunction: + $ref: '#/components/schemas/NTNFunction-Single' #-------- Definition of abstract IOCs -------------------------------------------- -- GitLab From 880582e834514a9cb065383dcac20efa1647abc6 Mon Sep 17 00:00:00 2001 From: ruiyue Date: Tue, 21 Jan 2025 12:40:22 +0000 Subject: [PATCH 377/587] Update 2 files - /OpenAPI/TS28104_MdaNrm.yaml - /OpenAPI/TS28104_MdaReport.yaml --- OpenAPI/TS28104_MdaNrm.yaml | 2 +- OpenAPI/TS28104_MdaReport.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/OpenAPI/TS28104_MdaNrm.yaml b/OpenAPI/TS28104_MdaNrm.yaml index 2405f576f..8aefa574d 100644 --- a/OpenAPI/TS28104_MdaNrm.yaml +++ b/OpenAPI/TS28104_MdaNrm.yaml @@ -65,7 +65,7 @@ components: type: object properties: mDAType: - type: string + $ref: '#/components/schemas/MDAType' mDAOutputIEFilters: type: array uniqueItems: true diff --git a/OpenAPI/TS28104_MdaReport.yaml b/OpenAPI/TS28104_MdaReport.yaml index 1ac30cb81..12c2a4c04 100644 --- a/OpenAPI/TS28104_MdaReport.yaml +++ b/OpenAPI/TS28104_MdaReport.yaml @@ -19,7 +19,7 @@ components: type: object properties: mDAType: - type: string + $ref: 'TS28104_MdaNrm#/components/schemas/MDAType' readOnly: true mDAOutputList: type: array -- GitLab From f5af9007cd3de3583553886fa9b295b0d98e5281 Mon Sep 17 00:00:00 2001 From: ruiyue Date: Tue, 21 Jan 2025 12:43:13 +0000 Subject: [PATCH 378/587] Update file TS28104_MdaReport.yaml --- OpenAPI/TS28104_MdaReport.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OpenAPI/TS28104_MdaReport.yaml b/OpenAPI/TS28104_MdaReport.yaml index 12c2a4c04..a8163ef43 100644 --- a/OpenAPI/TS28104_MdaReport.yaml +++ b/OpenAPI/TS28104_MdaReport.yaml @@ -19,7 +19,7 @@ components: type: object properties: mDAType: - $ref: 'TS28104_MdaNrm#/components/schemas/MDAType' + $ref: 'TS28104_MdaNrm.yaml#/components/schemas/MDAType' readOnly: true mDAOutputList: type: array -- GitLab From 2c491e054696e8b46fff3a40aa85cf2ae13d7763 Mon Sep 17 00:00:00 2001 From: ruiyue Date: Wed, 22 Jan 2025 00:55:19 +0000 Subject: [PATCH 379/587] Update file TS28104_MdaReport.yaml --- OpenAPI/TS28104_MdaReport.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/OpenAPI/TS28104_MdaReport.yaml b/OpenAPI/TS28104_MdaReport.yaml index a8163ef43..188c222d2 100644 --- a/OpenAPI/TS28104_MdaReport.yaml +++ b/OpenAPI/TS28104_MdaReport.yaml @@ -20,7 +20,6 @@ components: properties: mDAType: $ref: 'TS28104_MdaNrm.yaml#/components/schemas/MDAType' - readOnly: true mDAOutputList: type: array uniqueItems: true -- GitLab From 795b98652dd436ecc931a3858549d6ce1a404543 Mon Sep 17 00:00:00 2001 From: ruiyue Date: Wed, 22 Jan 2025 07:50:38 +0000 Subject: [PATCH 380/587] Update file TS28541_NrNrm.yaml --- OpenAPI/TS28541_NrNrm.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/OpenAPI/TS28541_NrNrm.yaml b/OpenAPI/TS28541_NrNrm.yaml index 38cbf5ca5..698814957 100755 --- a/OpenAPI/TS28541_NrNrm.yaml +++ b/OpenAPI/TS28541_NrNrm.yaml @@ -1145,6 +1145,9 @@ components: maximum: 159 ssbDuration: $ref: '#/components/schemas/SsbDuration' + redCapCellFlag: + type: boolean + default: FALSE nrSectorCarrierRef: type: array uniqueItems: true -- GitLab From 2dc66472ba2ad227a72130aaaa98e26c73f0fd48 Mon Sep 17 00:00:00 2001 From: ruiyue Date: Thu, 20 Feb 2025 05:26:15 +0000 Subject: [PATCH 381/587] Update file TS28541_NrNrm.yaml --- OpenAPI/TS28541_NrNrm.yaml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/OpenAPI/TS28541_NrNrm.yaml b/OpenAPI/TS28541_NrNrm.yaml index 698814957..2cd49ae3a 100755 --- a/OpenAPI/TS28541_NrNrm.yaml +++ b/OpenAPI/TS28541_NrNrm.yaml @@ -1146,7 +1146,10 @@ components: ssbDuration: $ref: '#/components/schemas/SsbDuration' redCapCellFlag: - type: boolean + type: string + enum: + - TRUE + - FALSE default: FALSE nrSectorCarrierRef: type: array -- GitLab From 7f6a36e029b772c05a9953e1dac179fa4cf09186 Mon Sep 17 00:00:00 2001 From: ruiyue Date: Thu, 20 Feb 2025 15:19:44 +0000 Subject: [PATCH 382/587] Update file TS28541_NrNrm.yaml --- OpenAPI/TS28541_NrNrm.yaml | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/OpenAPI/TS28541_NrNrm.yaml b/OpenAPI/TS28541_NrNrm.yaml index 2cd49ae3a..ab5d1862d 100755 --- a/OpenAPI/TS28541_NrNrm.yaml +++ b/OpenAPI/TS28541_NrNrm.yaml @@ -1145,12 +1145,14 @@ components: maximum: 159 ssbDuration: $ref: '#/components/schemas/SsbDuration' - redCapCellFlag: - type: string - enum: - - TRUE - - FALSE - default: FALSE + uECellBarredAccess: + type: arrary + uniqueItems: true + items: + type: string + enum: + - REDCAP_1RX + - REDCAP_2RX nrSectorCarrierRef: type: array uniqueItems: true -- GitLab From be3d90454a6be500409a46e0a3bbb9678e97d5eb Mon Sep 17 00:00:00 2001 From: ruiyue Date: Thu, 20 Feb 2025 15:23:36 +0000 Subject: [PATCH 383/587] Update file TS28541_NrNrm.yaml --- OpenAPI/TS28541_NrNrm.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OpenAPI/TS28541_NrNrm.yaml b/OpenAPI/TS28541_NrNrm.yaml index ab5d1862d..452d843e9 100755 --- a/OpenAPI/TS28541_NrNrm.yaml +++ b/OpenAPI/TS28541_NrNrm.yaml @@ -1146,7 +1146,7 @@ components: ssbDuration: $ref: '#/components/schemas/SsbDuration' uECellBarredAccess: - type: arrary + type: array uniqueItems: true items: type: string -- GitLab From bf291bfabcd2761c864edbf45510eb1c1b1509a5 Mon Sep 17 00:00:00 2001 From: Pengxiang Xie Date: Wed, 15 Jan 2025 08:22:44 +0000 Subject: [PATCH 384/587] Update TS28541_5GcNrm.yaml --- OpenAPI/TS28541_5GcNrm.yaml | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/OpenAPI/TS28541_5GcNrm.yaml b/OpenAPI/TS28541_5GcNrm.yaml index c6d1effe4..49d99eeea 100755 --- a/OpenAPI/TS28541_5GcNrm.yaml +++ b/OpenAPI/TS28541_5GcNrm.yaml @@ -142,7 +142,10 @@ components: uniqueItems: true items: $ref: '#/components/schemas/DefaultNotificationSubscription' - + callbackUriPrefixList: + type: array + items: + $ref: '#/components/schemas/DefaultNotificationSubscription' NFStatus: type: string description: any of enumerated value @@ -283,6 +286,15 @@ components: minItems: 1 callbackUriPrefix: $ref: 'TS28623_ComDefs.yaml#/components/schemas/UriRo' + CallbackUriPrefixItem: + type: object + properties: + notificationTypes: + type: array + items: + $ref: '#/components/schemas/notificationType' + callbackUriPrefix: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/UriRo' DefSubServiceInfo: type: object properties: -- GitLab From f3cf66de9f41ee1951e059e206bb5818e2735448 Mon Sep 17 00:00:00 2001 From: Pengxiang Xie Date: Wed, 15 Jan 2025 08:33:21 +0000 Subject: [PATCH 385/587] Update TS28541_5GcNrm.yaml --- OpenAPI/TS28541_5GcNrm.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OpenAPI/TS28541_5GcNrm.yaml b/OpenAPI/TS28541_5GcNrm.yaml index 49d99eeea..643fa71f5 100755 --- a/OpenAPI/TS28541_5GcNrm.yaml +++ b/OpenAPI/TS28541_5GcNrm.yaml @@ -145,7 +145,7 @@ components: callbackUriPrefixList: type: array items: - $ref: '#/components/schemas/DefaultNotificationSubscription' + $ref: '#/components/schemas/CallbackUriPrefixItem' NFStatus: type: string description: any of enumerated value -- GitLab From 4c99b28131d7473ef7531f1386120faa331dd0a7 Mon Sep 17 00:00:00 2001 From: Pengxiang Xie Date: Wed, 15 Jan 2025 08:43:49 +0000 Subject: [PATCH 386/587] Update TS28541_5GcNrm.yaml --- OpenAPI/TS28541_5GcNrm.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OpenAPI/TS28541_5GcNrm.yaml b/OpenAPI/TS28541_5GcNrm.yaml index 643fa71f5..7812ed540 100755 --- a/OpenAPI/TS28541_5GcNrm.yaml +++ b/OpenAPI/TS28541_5GcNrm.yaml @@ -292,7 +292,7 @@ components: notificationTypes: type: array items: - $ref: '#/components/schemas/notificationType' + $ref: '#/components/schemas/NotificationType' callbackUriPrefix: $ref: 'TS28623_ComDefs.yaml#/components/schemas/UriRo' DefSubServiceInfo: -- GitLab From ea2ad3bee833f72e38d5a44b47363623af2f6dfe Mon Sep 17 00:00:00 2001 From: Pengxiang Xie Date: Fri, 17 Jan 2025 03:38:52 +0000 Subject: [PATCH 387/587] Update TS28312_IntentNrm.yaml --- OpenAPI/TS28312_IntentNrm.yaml | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/OpenAPI/TS28312_IntentNrm.yaml b/OpenAPI/TS28312_IntentNrm.yaml index 70d109a36..23993c8bd 100644 --- a/OpenAPI/TS28312_IntentNrm.yaml +++ b/OpenAPI/TS28312_IntentNrm.yaml @@ -151,6 +151,11 @@ components: uniqueItems: true items: $ref: '#/components/schemas/Context' + preferenceWeight: + type: integer + minimum: 0 + maximum: 10 + description: It represents the preference information of the Consumer on expectations. required: - expectationId #-------Definition of the generic IntentExpectation dataType ----------# @@ -330,6 +335,12 @@ components: items: $ref: '#/components/schemas/Context' description: It describes the list of constraints and conditions that should apply for a specific expectationTarget. + preferenceWeight: + type: integer + minimum: 0 + maximum: 10 + description: It represents the preference information of the Consumer on expectationTargets. + #-------Definition of the generic ExpectationTarget dataType----------# #-------Definition of the generic Context dataType----------------# -- GitLab From b541e4e9f7f633928e84083e829d3f7f8f2215d8 Mon Sep 17 00:00:00 2001 From: Pengxiang Xie Date: Fri, 17 Jan 2025 06:41:43 +0000 Subject: [PATCH 388/587] Update TS28312_IntentNrm.yaml --- OpenAPI/TS28312_IntentNrm.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OpenAPI/TS28312_IntentNrm.yaml b/OpenAPI/TS28312_IntentNrm.yaml index 23993c8bd..e5d5553dd 100644 --- a/OpenAPI/TS28312_IntentNrm.yaml +++ b/OpenAPI/TS28312_IntentNrm.yaml @@ -151,7 +151,7 @@ components: uniqueItems: true items: $ref: '#/components/schemas/Context' - preferenceWeight: + preferenceWeight: type: integer minimum: 0 maximum: 10 -- GitLab From 8ab4081fcfae39724e0450e1e5c557cfb7ba05b8 Mon Sep 17 00:00:00 2001 From: ruanb Date: Fri, 7 Feb 2025 09:21:20 +0000 Subject: [PATCH 389/587] Rel19_CR1466_TS28.541_add_missing_satelliteCoverageInfoList_for_stage3_OpenAPI --- OpenAPI/TS28541_5GcNrm.yaml | 46 +++++++++++++++++++++++++++++++++---- 1 file changed, 41 insertions(+), 5 deletions(-) diff --git a/OpenAPI/TS28541_5GcNrm.yaml b/OpenAPI/TS28541_5GcNrm.yaml index 7812ed540..a063922dc 100755 --- a/OpenAPI/TS28541_5GcNrm.yaml +++ b/OpenAPI/TS28541_5GcNrm.yaml @@ -178,8 +178,6 @@ components: uniqueItems: true items: $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Tac' - WeightFactor: - type: integer VendorId: type: string description: Vendor ID of the NF Service instance (Private Enterprise Number assigned by IANA) @@ -2675,9 +2673,47 @@ components: blockedLocation: $ref: 'TS28623_ComDefs.yaml#/components/schemas/PlmnId' blockedDurWindow: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/TimeWindow' + type: array + items: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/TimeWindow' blockedSlice: $ref: 'TS28541_NrNrm.yaml#/components/schemas/Snssai' + SatelliteCoverageInfoList: + description: SatelliteCoverageInfoList that relates to NR Satellite RAT type and corresponding information of satellite coverage + type: array + items: + $ref: '#/components/schemas/SatelliteCoverageInfo' + SatelliteCoverageInfo: + description: This datatype defines information related to NR Satellite RAT type and corresponding information of satellite coverage + type: object + properties: + nRSatelliteRATtype: + anyOf: + - type: string + enum: + - NRLEO + - NRMEO + - NRGEO + - NROTHERSAT + - type: string + locationInfo: + type: array + items: + $ref: '#/components/schemas/NtnLocationInfo' + NtnLocationInfo: + description: This datatype defines the information about locations and corresponding time windows + type: object + properties: + location: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/GeoArea' + availabilityWindows: + type: array + items: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/TimeWindow' + nonAvailabilityWindows: + type: array + items: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/TimeWindow' 5GDdnmfInfo: description: Information of an 5G DDNMF NF Instance type: object @@ -3525,8 +3561,6 @@ components: $ref: '#/components/schemas/AmfIdentifier' sBIFqdn: type: string - weightFactor: - $ref: '#/components/schemas/WeightFactor' cNSIIdList: $ref: '#/components/schemas/CNSIIdList' amfSetRef: @@ -3537,6 +3571,8 @@ components: $ref: '#/components/schemas/CommModelList' nTNPLMNRestrictionsList: $ref: '#/components/schemas/NTNPLMNRestrictionsList' + satelliteCoverageInfoList: + $ref: '#/components/schemas/SatelliteCoverageInfoList' amfInfo: $ref: '#/components/schemas/AmfInfo' sliceExpiryInfo: -- GitLab From 547a77e3c6def9ae9bc93b8480ab4d9317dad12a Mon Sep 17 00:00:00 2001 From: shixixi Date: Tue, 14 Jan 2025 02:16:03 +0000 Subject: [PATCH 390/587] Update TS28541_NrNrm.yaml --- OpenAPI/TS28541_NrNrm.yaml | 19 +++++-------------- 1 file changed, 5 insertions(+), 14 deletions(-) diff --git a/OpenAPI/TS28541_NrNrm.yaml b/OpenAPI/TS28541_NrNrm.yaml index 452d843e9..93a21737a 100755 --- a/OpenAPI/TS28541_NrNrm.yaml +++ b/OpenAPI/TS28541_NrNrm.yaml @@ -189,20 +189,11 @@ components: type: integer minimum: 0 maximum: 100 - maxNumberOfPreamblesSent: - type: string - enum: - - n3 - - n4 - - n5 - - n6 - - n7 - - n8 - - n10 - - n20 - - n50 - - n100 - - n200 + NumberOfPreamblesSent: + type: integer + minimum: 0 + maximum: 200 + UeAccDelayProbabilityDist: type: array -- GitLab From a3b9e0b88baf1aa5e38a4ad650046d55c5619801 Mon Sep 17 00:00:00 2001 From: Shitao Li Date: Thu, 20 Feb 2025 08:43:51 +0000 Subject: [PATCH 391/587] Update TS28104_MdaNrm.yaml --- OpenAPI/TS28104_MdaNrm.yaml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/OpenAPI/TS28104_MdaNrm.yaml b/OpenAPI/TS28104_MdaNrm.yaml index 8aefa574d..a36c777d5 100644 --- a/OpenAPI/TS28104_MdaNrm.yaml +++ b/OpenAPI/TS28104_MdaNrm.yaml @@ -203,7 +203,12 @@ components: $ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTime' recommendationFilter: $ref: '#/components/schemas/AnalyticsScopeType' - + performanceThresholdInfo: + type: array + items: + $ref: 'TS28623_ThresholdMonitorNrm.yaml#/components/schemas/ThresholdInfo' + thresholdMonitorRefList: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList' MDAReport-Single: $ref: 'TS28104_MdaReport.yaml#/components/schemas/MDAReport' -- GitLab From 9e15a17d460ab2d95f43ab36cb39bfe7c09e50ad Mon Sep 17 00:00:00 2001 From: shumim Date: Wed, 5 Feb 2025 05:23:53 +0000 Subject: [PATCH 392/587] Add attributes to support 5G Prose multi-hop relay services --- OpenAPI/TS28541_5GcNrm.yaml | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/OpenAPI/TS28541_5GcNrm.yaml b/OpenAPI/TS28541_5GcNrm.yaml index a063922dc..fe2d5d5c1 100755 --- a/OpenAPI/TS28541_5GcNrm.yaml +++ b/OpenAPI/TS28541_5GcNrm.yaml @@ -904,6 +904,33 @@ components: proseL3RemoteUe: type: boolean default: false + proseL2UetoUeRelay: + type: boolean + default: false + proseL3UetoUeRelay: + type: boolean + default: false + proseL2EndUe: + type: boolean + default: false + proseL3EndUe: + type: boolean + default: false + proseL3IntermRelay: + type: boolean + default: false + proseL3MultihopRemote: + type: boolean + default: false + proseL3NetMultihopRelay: + type: boolean + default: false + proseL3UeMultihopRelay: + type: boolean + default: false + proseL3EndUeMultihop: + type: boolean + default: false V2xCapability: type: object properties: -- GitLab From 8870f75778d026ddf5e20cea5429e07836dc4abe Mon Sep 17 00:00:00 2001 From: Shitao Li Date: Fri, 7 Feb 2025 06:41:35 +0000 Subject: [PATCH 393/587] Update TS28538_EdgeNrm.yaml --- OpenAPI/TS28538_EdgeNrm.yaml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/OpenAPI/TS28538_EdgeNrm.yaml b/OpenAPI/TS28538_EdgeNrm.yaml index b4fc616cb..d4ac66e35 100644 --- a/OpenAPI/TS28538_EdgeNrm.yaml +++ b/OpenAPI/TS28538_EdgeNrm.yaml @@ -275,6 +275,10 @@ components: type: boolean default: FALSE - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' + - type: object + properties: + ManagedEdgeNFService: + $ref: '#/components/schemas/ManagedEdgeNFService-Multiple' EASProfile-Single: allOf: - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' -- GitLab From adbaf044f30b662610e4e5ebcc4958cb5e8f7a08 Mon Sep 17 00:00:00 2001 From: shumim Date: Fri, 7 Feb 2025 08:32:51 +0000 Subject: [PATCH 394/587] For Rel19_CR1470_TS28.541_Add_Attributes_to_support_5GS_Functions_Onboard_NTN --- OpenAPI/TS28541_5GcNrm.yaml | 7 ++++++- OpenAPI/TS28541_NrNrm.yaml | 19 +++++++++++++++++-- 2 files changed, 23 insertions(+), 3 deletions(-) diff --git a/OpenAPI/TS28541_5GcNrm.yaml b/OpenAPI/TS28541_5GcNrm.yaml index fe2d5d5c1..c535dc040 100755 --- a/OpenAPI/TS28541_5GcNrm.yaml +++ b/OpenAPI/TS28541_5GcNrm.yaml @@ -3789,7 +3789,12 @@ components: type: array uniqueItems: true items: - $ref: '#/components/schemas/UpfInfo' + $ref: '#/components/schemas/UpfInfo' + isOnboardSatellite: + type: boolean + onboardSatelliteId: + type: string + pattern: '^[0-9]{5}$' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' - $ref: '#/components/schemas/ManagedFunction5GC-nc0' - type: object diff --git a/OpenAPI/TS28541_NrNrm.yaml b/OpenAPI/TS28541_NrNrm.yaml index 93a21737a..8023f5975 100755 --- a/OpenAPI/TS28541_NrNrm.yaml +++ b/OpenAPI/TS28541_NrNrm.yaml @@ -49,6 +49,10 @@ components: type: string pattern: '^[A-Fa-f0-9]{6}$' + SatelliteId: + type: string + pattern: '^[0-9]{5}$' + PlmnIdList: type: array uniqueItems: true @@ -622,8 +626,7 @@ components: - epochTime properties: satelliteId: - type: string - pattern: '^[0-9]{5}$' + $ref: '#/components/schemas/SatelliteId' epochTime: $ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTime' positionVelocity: @@ -853,6 +856,10 @@ components: $ref: '#/components/schemas/GnbId' gnbIdLength: $ref: '#/components/schemas/GnbIdLength' + isOnboardSatellite: + type: boolean + onboardSatelliteId: + $ref: '#/components/schemas/SatelliteId' rimRSReportConf: $ref: '#/components/schemas/RimRSReportConf' configurable5QISetRef: @@ -924,6 +931,10 @@ components: $ref: '#/components/schemas/GnbIdLength' gnbCuUpId: $ref: '#/components/schemas/GnbCuUpId' + isOnboardSatellite: + type: boolean + onboardSatelliteId: + $ref: '#/components/schemas/SatelliteId' plmnInfoList: $ref: '#/components/schemas/PlmnInfoList' configurable5QISetRef: @@ -988,6 +999,10 @@ components: items: $ref: '#/components/schemas/MappingSetIDBackhaulAddress' minItems: 1 + isOnboardSatellite: + type: boolean + onboardSatelliteId: + $ref: '#/components/schemas/SatelliteId' tceIDMappingInfoList: $ref: '#/components/schemas/TceIDMappingInfoList' configurable5QISetRef: -- GitLab From d72a778cd741a801487069efb34b5de50cde7819 Mon Sep 17 00:00:00 2001 From: Zhen Xing Date: Fri, 14 Feb 2025 08:25:22 +0000 Subject: [PATCH 395/587] Update TS28541_NrNrm.yaml --- OpenAPI/TS28541_NrNrm.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/OpenAPI/TS28541_NrNrm.yaml b/OpenAPI/TS28541_NrNrm.yaml index 8023f5975..c177f4e7e 100755 --- a/OpenAPI/TS28541_NrNrm.yaml +++ b/OpenAPI/TS28541_NrNrm.yaml @@ -286,6 +286,7 @@ components: type: string enum: - INITIAL + - INITIAL-REDCAP - OTHER IsESCoveredBy: type: string -- GitLab From eed67f591d3c37ad8d9d8d86625c833d9c08de4c Mon Sep 17 00:00:00 2001 From: Zhen Xing Date: Fri, 14 Feb 2025 08:39:37 +0000 Subject: [PATCH 396/587] Update TS28541_NrNrm.yaml --- OpenAPI/TS28541_NrNrm.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OpenAPI/TS28541_NrNrm.yaml b/OpenAPI/TS28541_NrNrm.yaml index c177f4e7e..acbc1c5ea 100755 --- a/OpenAPI/TS28541_NrNrm.yaml +++ b/OpenAPI/TS28541_NrNrm.yaml @@ -286,7 +286,7 @@ components: type: string enum: - INITIAL - - INITIAL-REDCAP + - INITIAL_REDCAP - OTHER IsESCoveredBy: type: string -- GitLab From f82b399c151ee148ce92b5ef97ade2e324fb12fc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jose=20Antonio=20Ordo=C3=B1ez=20Lucena?= Date: Fri, 31 Jan 2025 12:05:56 +0000 Subject: [PATCH 397/587] Update TS28623_TraceControlNrm.yaml with appropriate ENUM value conventions. --- OpenAPI/TS28623_TraceControlNrm.yaml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/OpenAPI/TS28623_TraceControlNrm.yaml b/OpenAPI/TS28623_TraceControlNrm.yaml index d7ceac452..61ccad6ae 100644 --- a/OpenAPI/TS28623_TraceControlNrm.yaml +++ b/OpenAPI/TS28623_TraceControlNrm.yaml @@ -455,9 +455,9 @@ components: type: string description: Specifies whether file-based or streaming reporting shall be used for this Trace Session. See 3GPP TS 32.422 clause 5.11 for additional details. enum: - - FILE-BASED + - FILE_BASED - STREAMING - default: FILE-BASED + default: FILE_BASED traceTarget-Type: type: object @@ -471,8 +471,8 @@ components: - IMEISV - PUBLIC_ID - UTRAN_CELL - - E-UTRAN_CELL - - NG-RAN_CELL + - E_UTRAN_CELL + - NG_RAN_CELL - ENB - RNC - GNB -- GitLab From f774793e13f8d8bbc2bdd46641950251b6385afb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jose=20Antonio=20Ordo=C3=B1ez=20Lucena?= Date: Fri, 31 Jan 2025 12:12:22 +0000 Subject: [PATCH 398/587] Update TS28623_TraceControlNrm.yaml --- OpenAPI/TS28623_TraceControlNrm.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OpenAPI/TS28623_TraceControlNrm.yaml b/OpenAPI/TS28623_TraceControlNrm.yaml index 61ccad6ae..383e229d8 100644 --- a/OpenAPI/TS28623_TraceControlNrm.yaml +++ b/OpenAPI/TS28623_TraceControlNrm.yaml @@ -4,7 +4,7 @@ info: version: 19.2.0 description: >- OAS 3.0.1 definition of the Trace Control NRM fragment - © 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). + © 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved. externalDocs: description: 3GPP TS 28.623; Generic NRM,Trace Control NRM -- GitLab From f8efb999954e595bab0bbfef120fc1fc4f1e6d30 Mon Sep 17 00:00:00 2001 From: ruiyue Date: Fri, 28 Feb 2025 08:53:09 +0000 Subject: [PATCH 399/587] Code Moderator manually merge MR 1553 --- OpenAPI/TS28541_5GcNrm.yaml | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/OpenAPI/TS28541_5GcNrm.yaml b/OpenAPI/TS28541_5GcNrm.yaml index c535dc040..f154699cb 100755 --- a/OpenAPI/TS28541_5GcNrm.yaml +++ b/OpenAPI/TS28541_5GcNrm.yaml @@ -146,6 +146,24 @@ components: type: array items: $ref: '#/components/schemas/CallbackUriPrefixItem' + supportedFeatures: + type: string + supportedVendorSpecificFeatures: + description: A map (list of key-value pairs) where IANA-assigned "SMI Network Management Private Enterprise Codes" serves as key + type: object + additionalProperties: + type: array + items: + $ref: '#/components/schemas/VendorSpecificFeature' + minItems: 1 + minProperties: 1 + VendorSpecificFeature: + type: object + properties: + featureName: + type: string + featureVersion: + type: string NFStatus: type: string description: any of enumerated value -- GitLab From 96697515c3ffe862bed55b2c042dafa61cb6f4ef Mon Sep 17 00:00:00 2001 From: mcdonnelleo Date: Fri, 31 Jan 2025 11:49:55 +0000 Subject: [PATCH 400/587] Update TS28538_EdgeNrm.yaml --- OpenAPI/TS28538_EdgeNrm.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OpenAPI/TS28538_EdgeNrm.yaml b/OpenAPI/TS28538_EdgeNrm.yaml index d4ac66e35..71eebf1f6 100644 --- a/OpenAPI/TS28538_EdgeNrm.yaml +++ b/OpenAPI/TS28538_EdgeNrm.yaml @@ -445,7 +445,7 @@ components: properties: federationID: type: string - FederationExpiry: + federationExpiry: $ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTime' leadingOPiD: type: string -- GitLab From a06028465439e7d25e128ebf2dd11e31e2ddac8d Mon Sep 17 00:00:00 2001 From: gautamd Date: Wed, 12 Feb 2025 07:15:35 +0000 Subject: [PATCH 401/587] Update TS28541_NrNrm.yaml --- OpenAPI/TS28541_NrNrm.yaml | 55 ++++++++++++++++++++++++++++++++++++-- 1 file changed, 53 insertions(+), 2 deletions(-) diff --git a/OpenAPI/TS28541_NrNrm.yaml b/OpenAPI/TS28541_NrNrm.yaml index acbc1c5ea..8b78ba630 100755 --- a/OpenAPI/TS28541_NrNrm.yaml +++ b/OpenAPI/TS28541_NrNrm.yaml @@ -755,7 +755,47 @@ components: - M8 - M9 - MDT_UE_LOCATION - + URSPInfo: + type: object + properties: + applicationID: + type: integer + destinationIPInfo: + type: integer + destinationIPInfo: + type: integer + nonIPDescriptiors: + type: string + dNNs: + type: string + connectionCapabilities: + type: string + enum: + - IMS + - MMS + - INTERNET + destinationFQDN: + type: string + pINID: + type: string + connectivityGrpId: + type: string + ApplicationID: + type: object + properties: + oSID: + type: string + oSAppId: + type: string + DestinationIPInfo: + type: object + properties: + iPAddress: + type: string + port: + type: string + protocolID: + type: string #-------- Definition of types for name-containments ------ SubNetwork-ncO-NrNrm: type: object @@ -2191,7 +2231,18 @@ components: $ref: 'TS28623_ComDefs.yaml#/components/schemas/AdministrativeState' operationalState: $ref: 'TS28623_ComDefs.yaml#/components/schemas/OperationalState' - + allowedPLMNInfo: + $ref: '#/components/schemas/PlmnInfo' + allowedArea: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/GeoArea' + allowedTime: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTime' + relatedN2URSPInfo: + $ref: '#/components/schemas/PlmnInfo' + relatedN3URSPInfo: + $ref: '#/components/schemas/PlmnInfo' + relatedXnURSPInfo: + $ref: '#/components/schemas/PlmnInfo' NRECMappingRule-Single: allOf: - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' -- GitLab From ec605e6a55a6a981db1a4704e9fb7839bda09389 Mon Sep 17 00:00:00 2001 From: gautamd Date: Wed, 12 Feb 2025 07:18:09 +0000 Subject: [PATCH 402/587] Update TS28541_NrNrm.yaml --- OpenAPI/TS28541_NrNrm.yaml | 2 -- 1 file changed, 2 deletions(-) diff --git a/OpenAPI/TS28541_NrNrm.yaml b/OpenAPI/TS28541_NrNrm.yaml index 8b78ba630..4c33cc5c6 100755 --- a/OpenAPI/TS28541_NrNrm.yaml +++ b/OpenAPI/TS28541_NrNrm.yaml @@ -762,8 +762,6 @@ components: type: integer destinationIPInfo: type: integer - destinationIPInfo: - type: integer nonIPDescriptiors: type: string dNNs: -- GitLab From bd3908a347aa40f3c21b84685b7568c0b41fddc8 Mon Sep 17 00:00:00 2001 From: gautamd Date: Thu, 20 Feb 2025 12:55:43 +0000 Subject: [PATCH 403/587] Update TS28541_NrNrm.yaml --- OpenAPI/TS28541_NrNrm.yaml | 52 +++----------------------------------- 1 file changed, 3 insertions(+), 49 deletions(-) diff --git a/OpenAPI/TS28541_NrNrm.yaml b/OpenAPI/TS28541_NrNrm.yaml index 4c33cc5c6..3d0b1dd69 100755 --- a/OpenAPI/TS28541_NrNrm.yaml +++ b/OpenAPI/TS28541_NrNrm.yaml @@ -755,45 +755,6 @@ components: - M8 - M9 - MDT_UE_LOCATION - URSPInfo: - type: object - properties: - applicationID: - type: integer - destinationIPInfo: - type: integer - nonIPDescriptiors: - type: string - dNNs: - type: string - connectionCapabilities: - type: string - enum: - - IMS - - MMS - - INTERNET - destinationFQDN: - type: string - pINID: - type: string - connectivityGrpId: - type: string - ApplicationID: - type: object - properties: - oSID: - type: string - oSAppId: - type: string - DestinationIPInfo: - type: object - properties: - iPAddress: - type: string - port: - type: string - protocolID: - type: string #-------- Definition of types for name-containments ------ SubNetwork-ncO-NrNrm: type: object @@ -2228,19 +2189,12 @@ components: administrativeState: $ref: 'TS28623_ComDefs.yaml#/components/schemas/AdministrativeState' operationalState: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/OperationalState' - allowedPLMNInfo: - $ref: '#/components/schemas/PlmnInfo' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/OperationalState' allowedArea: $ref: 'TS28623_ComDefs.yaml#/components/schemas/GeoArea' allowedTime: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTime' - relatedN2URSPInfo: - $ref: '#/components/schemas/PlmnInfo' - relatedN3URSPInfo: - $ref: '#/components/schemas/PlmnInfo' - relatedXnURSPInfo: - $ref: '#/components/schemas/PlmnInfo' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTime' + NRECMappingRule-Single: allOf: - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' -- GitLab From c543e5e948a8fcb4fe1356da4912d1ea51da9bbe Mon Sep 17 00:00:00 2001 From: gautamd Date: Thu, 20 Feb 2025 17:27:36 +0000 Subject: [PATCH 404/587] Update TS28541_NrNrm.yaml --- OpenAPI/TS28541_NrNrm.yaml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/OpenAPI/TS28541_NrNrm.yaml b/OpenAPI/TS28541_NrNrm.yaml index 3d0b1dd69..7b49f8f3e 100755 --- a/OpenAPI/TS28541_NrNrm.yaml +++ b/OpenAPI/TS28541_NrNrm.yaml @@ -2191,9 +2191,13 @@ components: operationalState: $ref: 'TS28623_ComDefs.yaml#/components/schemas/OperationalState' allowedArea: + type: array + items: $ref: 'TS28623_ComDefs.yaml#/components/schemas/GeoArea' allowedTime: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTime' + type: array + items: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTime' NRECMappingRule-Single: allOf: -- GitLab From f32df1686785c0aa4f010a210d83926e54c73ef9 Mon Sep 17 00:00:00 2001 From: "U-ERICSSON\\ETHBLL" Date: Mon, 6 Jan 2025 19:57:00 +0100 Subject: [PATCH 405/587] Updated components/schemas/NotificationHeader --- OpenAPI/TS28623_ComDefs.yaml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/OpenAPI/TS28623_ComDefs.yaml b/OpenAPI/TS28623_ComDefs.yaml index d80f95b91..930d64bdf 100755 --- a/OpenAPI/TS28623_ComDefs.yaml +++ b/OpenAPI/TS28623_ComDefs.yaml @@ -409,6 +409,10 @@ components: $ref: '#/components/schemas/DateTime' systemDN: $ref: '#/components/schemas/SystemDN' + sequnceNo: + type: integer + subscriptionId: + type: string required: - href - notificationId -- GitLab From 999b78f0298cafa5df4a1b63e3bee1e0b143f25b Mon Sep 17 00:00:00 2001 From: "U-ERICSSON\\ETHBLL" Date: Tue, 7 Jan 2025 12:09:05 +0100 Subject: [PATCH 406/587] Corrected sequnceNo typo --- OpenAPI/TS28623_ComDefs.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OpenAPI/TS28623_ComDefs.yaml b/OpenAPI/TS28623_ComDefs.yaml index 930d64bdf..b88602da4 100755 --- a/OpenAPI/TS28623_ComDefs.yaml +++ b/OpenAPI/TS28623_ComDefs.yaml @@ -409,7 +409,7 @@ components: $ref: '#/components/schemas/DateTime' systemDN: $ref: '#/components/schemas/SystemDN' - sequnceNo: + sequenceNo: type: integer subscriptionId: type: string -- GitLab From aaa098bdb637183b29d8a15e74b4dd1e9983134d Mon Sep 17 00:00:00 2001 From: ruiyue Date: Fri, 28 Feb 2025 09:15:24 +0000 Subject: [PATCH 407/587] Code Moderator manually merge MR 1535 --- OpenAPI/TS28111_FaultNrm.yaml | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/OpenAPI/TS28111_FaultNrm.yaml b/OpenAPI/TS28111_FaultNrm.yaml index 321b34cc5..ced0e0f82 100644 --- a/OpenAPI/TS28111_FaultNrm.yaml +++ b/OpenAPI/TS28111_FaultNrm.yaml @@ -360,6 +360,8 @@ components: $ref: '#/components/schemas/AlarmType' probableCause: $ref: '#/components/schemas/ProbableCause' + specificProblem: + $ref: '#/components/schemas/SpecificProblem' perceivedSeverity: $ref: '#/components/schemas/PerceivedSeverity' correlatedNotifications: @@ -384,6 +386,8 @@ components: $ref: '#/components/schemas/AlarmType' probableCause: $ref: '#/components/schemas/ProbableCause' + specificProblem: + $ref: '#/components/schemas/SpecificProblem' perceivedSeverity: $ref: '#/components/schemas/PerceivedSeverity' NotifyChangedAlarmGeneral: @@ -393,6 +397,7 @@ components: required: - alarmId - alarmType + - probableCause properties: alarmId: $ref: '#/components/schemas/AlarmId' @@ -435,6 +440,7 @@ components: required: - alarmId - alarmType + - probableCause - serviceUser - serviceProvider - securityAlarmDetector @@ -445,6 +451,8 @@ components: $ref: '#/components/schemas/AlarmType' probableCause: $ref: '#/components/schemas/ProbableCause' + specificProblem: + $ref: '#/components/schemas/SpecificProblem' perceivedSeverity: $ref: '#/components/schemas/PerceivedSeverity' correlatedNotifications: @@ -470,9 +478,17 @@ components: required: - alarmId - correlatedNotifications + - alarmType + - probableCause properties: alarmId: $ref: '#/components/schemas/AlarmId' + alarmType: + $ref: '#/components/schemas/AlarmType' + probableCause: + $ref: '#/components/schemas/ProbableCause' + specificProblem: + $ref: '#/components/schemas/SpecificProblem' correlatedNotifications: $ref: '#/components/schemas/CorrelatedNotifications' rootCauseIndicator: @@ -495,6 +511,8 @@ components: $ref: '#/components/schemas/AlarmType' probableCause: $ref: '#/components/schemas/ProbableCause' + specificProblem: + $ref: '#/components/schemas/SpecificProblem' perceivedSeverity: $ref: '#/components/schemas/PerceivedSeverity' ackState: @@ -520,6 +538,8 @@ components: $ref: '#/components/schemas/AlarmType' probableCause: $ref: '#/components/schemas/ProbableCause' + specificProblem: + $ref: '#/components/schemas/SpecificProblem' perceivedSeverity: $ref: '#/components/schemas/PerceivedSeverity' comments: -- GitLab From 57cfd265bd63513e4b58d753866ac10716bab3d3 Mon Sep 17 00:00:00 2001 From: ruiyue Date: Fri, 28 Feb 2025 09:58:14 +0000 Subject: [PATCH 408/587] Code Moderator update the copyright and version --- OpenAPI/TS28104_MdaNrm.yaml | 4 ++-- OpenAPI/TS28104_MdaReport.yaml | 4 ++-- OpenAPI/TS28105_AiMlNrm.yaml | 4 ++-- OpenAPI/TS28111_FaultNrm.yaml | 4 ++-- OpenAPI/TS28312_IntentExpectations.yaml | 4 ++-- OpenAPI/TS28312_IntentNrm.yaml | 4 ++-- OpenAPI/TS28532_ProvMnS.yaml | 4 ++-- OpenAPI/TS28532_StreamingDataMnS.yaml | 4 ++-- OpenAPI/TS28536_CoslaNrm.yaml | 4 ++-- OpenAPI/TS28538_EdgeNrm.yaml | 4 ++-- OpenAPI/TS28541_5GcNrm.yaml | 4 ++-- OpenAPI/TS28541_NrNrm.yaml | 4 ++-- OpenAPI/TS28541_SliceNrm.yaml | 4 ++-- OpenAPI/TS28550_PerfMeasJobCtrlMnS.yaml | 2 +- OpenAPI/TS28623_ComDefs.yaml | 4 ++-- OpenAPI/TS28623_MnSRegistryNrm.yaml | 4 ++-- OpenAPI/TS28623_QoEMeasurementCollectionNrm.yaml | 2 +- OpenAPI/TS28623_TraceControlNrm.yaml | 2 +- 18 files changed, 33 insertions(+), 33 deletions(-) diff --git a/OpenAPI/TS28104_MdaNrm.yaml b/OpenAPI/TS28104_MdaNrm.yaml index a36c777d5..babe49e8f 100644 --- a/OpenAPI/TS28104_MdaNrm.yaml +++ b/OpenAPI/TS28104_MdaNrm.yaml @@ -1,10 +1,10 @@ openapi: 3.0.1 info: title: MDA NRM - version: 19.0.0 + version: 19.1.0 description: >- OAS 3.0.1 specification of the MDA NRM - © 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). + © 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved. externalDocs: description: 3GPP TS 28.104; MDA diff --git a/OpenAPI/TS28104_MdaReport.yaml b/OpenAPI/TS28104_MdaReport.yaml index 188c222d2..46eaca579 100644 --- a/OpenAPI/TS28104_MdaReport.yaml +++ b/OpenAPI/TS28104_MdaReport.yaml @@ -1,10 +1,10 @@ openapi: 3.0.1 info: title: MDA Report - version: 19.0.0 + version: 19.1.0 description: >- OAS 3.0.1 specification of the MDA Report - © 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). + © 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved. externalDocs: description: 3GPP TS 28.104; MDA Report diff --git a/OpenAPI/TS28105_AiMlNrm.yaml b/OpenAPI/TS28105_AiMlNrm.yaml index 2c690d276..f76a2a491 100644 --- a/OpenAPI/TS28105_AiMlNrm.yaml +++ b/OpenAPI/TS28105_AiMlNrm.yaml @@ -1,10 +1,10 @@ openapi: 3.0.1 info: title: AI/ML NRM - version: 19.1.0 + version: 19.2.0 description: >- OAS 3.0.1 specification of the AI/ML NRM - © 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). + © 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved. externalDocs: description: 3GPP TS 28.105; AI/ML Management diff --git a/OpenAPI/TS28111_FaultNrm.yaml b/OpenAPI/TS28111_FaultNrm.yaml index ced0e0f82..1ea8c64e9 100644 --- a/OpenAPI/TS28111_FaultNrm.yaml +++ b/OpenAPI/TS28111_FaultNrm.yaml @@ -1,10 +1,10 @@ openapi: 3.0.1 info: title: Fault Management NRM - version: 19.0.0 + version: 19.1.0 description: >- OAS 3.0.1 definition of the Fault Supervision MnS - © 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). + © 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved. externalDocs: description: 3GPP TS 28.111; Fault Management diff --git a/OpenAPI/TS28312_IntentExpectations.yaml b/OpenAPI/TS28312_IntentExpectations.yaml index a4be21b9a..85edc5ba7 100644 --- a/OpenAPI/TS28312_IntentExpectations.yaml +++ b/OpenAPI/TS28312_IntentExpectations.yaml @@ -1,10 +1,10 @@ openapi: 3.0.1 info: title: Scenario specific Intent Expectations - version: 19.0.0 + version: 19.1.0 description: >- OAS 3.0.1 definition of scenario specific Intent Expectations - © 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). + © 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved. externalDocs: description: 3GPP TS 28.312; Intent driven management services for mobile networks diff --git a/OpenAPI/TS28312_IntentNrm.yaml b/OpenAPI/TS28312_IntentNrm.yaml index e5d5553dd..a3909ce78 100644 --- a/OpenAPI/TS28312_IntentNrm.yaml +++ b/OpenAPI/TS28312_IntentNrm.yaml @@ -1,10 +1,10 @@ openapi: 3.0.1 info: title: Intent NRM - version: 19.0.0 + version: 19.1.0 description: >- OAS 3.0.1 definition of the Intent NRM - © 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). + © 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved. externalDocs: description: 3GPP TS 28.312; Intent driven management services for mobile networks diff --git a/OpenAPI/TS28532_ProvMnS.yaml b/OpenAPI/TS28532_ProvMnS.yaml index 5ba1b679f..6c23bf257 100755 --- a/OpenAPI/TS28532_ProvMnS.yaml +++ b/OpenAPI/TS28532_ProvMnS.yaml @@ -1,10 +1,10 @@ openapi: 3.0.1 info: title: Provisioning MnS - version: 18.5.0 + version: 19.0.0 description: >- OAS 3.0.1 definition of the Provisioning MnS - © 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). + © 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved. externalDocs: description: 3GPP TS 28.532; Generic management services diff --git a/OpenAPI/TS28532_StreamingDataMnS.yaml b/OpenAPI/TS28532_StreamingDataMnS.yaml index bcac29257..82ce927d5 100755 --- a/OpenAPI/TS28532_StreamingDataMnS.yaml +++ b/OpenAPI/TS28532_StreamingDataMnS.yaml @@ -1,10 +1,10 @@ openapi: 3.0.1 info: title: TS 28.532 Streaming data reporting service - version: 18.1.0 + version: 19.0.0 description: >- OAS 3.0.1 specification for the Streaming data reporting service (Streaming MnS) - © 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). + © 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved. servers: - url: '{MnSRoot}/StreamingDataReportingMnS/{MnSVersion}' diff --git a/OpenAPI/TS28536_CoslaNrm.yaml b/OpenAPI/TS28536_CoslaNrm.yaml index c179fe3b1..47ddfaa2c 100755 --- a/OpenAPI/TS28536_CoslaNrm.yaml +++ b/OpenAPI/TS28536_CoslaNrm.yaml @@ -2,10 +2,10 @@ openapi: 3.0.1 info: title: coslaNrm - version: 19.0.0 + version: 19.1.0 description: >- OAS 3.0.1 specification of the Cosla NRM - © 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). + © 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved. externalDocs: diff --git a/OpenAPI/TS28538_EdgeNrm.yaml b/OpenAPI/TS28538_EdgeNrm.yaml index 71eebf1f6..3aa0bbfa7 100644 --- a/OpenAPI/TS28538_EdgeNrm.yaml +++ b/OpenAPI/TS28538_EdgeNrm.yaml @@ -1,10 +1,10 @@ openapi: 3.0.1 info: title: 3GPP Edge NRM - version: 19.2.0 + version: 19.3.0 description: >- OAS 3.0.1 specification of the Edge NRM - © 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). + © 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved. externalDocs: description: 3GPP TS 28.538; Edge NRM diff --git a/OpenAPI/TS28541_5GcNrm.yaml b/OpenAPI/TS28541_5GcNrm.yaml index f154699cb..0cab03904 100755 --- a/OpenAPI/TS28541_5GcNrm.yaml +++ b/OpenAPI/TS28541_5GcNrm.yaml @@ -1,10 +1,10 @@ openapi: 3.0.1 info: title: 3GPP 5GC NRM - version: 19.2.0 + version: 19.3.0 description: >- OAS 3.0.1 specification of the 5GC NRM - © 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). + © 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved. externalDocs: description: 3GPP TS 28.541; 5G NRM, 5GC NRM diff --git a/OpenAPI/TS28541_NrNrm.yaml b/OpenAPI/TS28541_NrNrm.yaml index 7b49f8f3e..4f85f0025 100755 --- a/OpenAPI/TS28541_NrNrm.yaml +++ b/OpenAPI/TS28541_NrNrm.yaml @@ -1,10 +1,10 @@ openapi: 3.0.1 info: title: NR NRM - version: 19.2.0 + version: 19.3.0 description: >- OAS 3.0.1 specification of the NR NRM - © 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). + © 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved. externalDocs: description: 3GPP TS 28.541; 5G NRM, NR NRM diff --git a/OpenAPI/TS28541_SliceNrm.yaml b/OpenAPI/TS28541_SliceNrm.yaml index 92192eb0c..b65edbc63 100755 --- a/OpenAPI/TS28541_SliceNrm.yaml +++ b/OpenAPI/TS28541_SliceNrm.yaml @@ -1,10 +1,10 @@ openapi: 3.0.1 info: title: Slice NRM - version: 19.2.0 + version: 19.3.0 description: >- OAS 3.0.1 specification of the Slice NRM - @ 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). + @ 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved. externalDocs: description: 3GPP TS 28.541; 5G NRM, Slice NRM diff --git a/OpenAPI/TS28550_PerfMeasJobCtrlMnS.yaml b/OpenAPI/TS28550_PerfMeasJobCtrlMnS.yaml index 1bded8d4c..4dc673d5d 100755 --- a/OpenAPI/TS28550_PerfMeasJobCtrlMnS.yaml +++ b/OpenAPI/TS28550_PerfMeasJobCtrlMnS.yaml @@ -1,7 +1,7 @@ openapi: 3.0.1 info: title: TS 28.550 Performance Measurement Job Control Service - version: 18.1.0 + version: 19.0.0 description: >- OAS 3.0.1 specification of the Performance Measurement Job Control Service @ 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). diff --git a/OpenAPI/TS28623_ComDefs.yaml b/OpenAPI/TS28623_ComDefs.yaml index b88602da4..3742ff064 100755 --- a/OpenAPI/TS28623_ComDefs.yaml +++ b/OpenAPI/TS28623_ComDefs.yaml @@ -1,10 +1,10 @@ openapi: 3.0.1 info: title: Common Type Definitions - version: 19.2.0 + version: 19.3.0 description: >- OAS 3.0.1 specification of common type definitions in the Generic NRM - © 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). + © 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved. externalDocs: description: 3GPP TS 28.623; Generic NRM; Common type definitions diff --git a/OpenAPI/TS28623_MnSRegistryNrm.yaml b/OpenAPI/TS28623_MnSRegistryNrm.yaml index b4e8c68e3..70e245c10 100644 --- a/OpenAPI/TS28623_MnSRegistryNrm.yaml +++ b/OpenAPI/TS28623_MnSRegistryNrm.yaml @@ -1,10 +1,10 @@ openapi: 3.0.1 info: title: MnS Registry NRM - version: 19.2.0 + version: 19.3.0 description: >- OAS 3.0.1 definition of the MnS Registry NRM fragment - © 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). + © 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved. externalDocs: description: 3GPP TS 28.623; Generic NRM, MnS Registry NRM diff --git a/OpenAPI/TS28623_QoEMeasurementCollectionNrm.yaml b/OpenAPI/TS28623_QoEMeasurementCollectionNrm.yaml index 5ac351443..90151f4bf 100644 --- a/OpenAPI/TS28623_QoEMeasurementCollectionNrm.yaml +++ b/OpenAPI/TS28623_QoEMeasurementCollectionNrm.yaml @@ -1,7 +1,7 @@ openapi: 3.0.1 info: title: QoE Measurement Collection NRM - version: 19.2.0 + version: 19.3.0 description: >- OAS 3.0.1 definition of the QoE Measurement Collection NRM © 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). diff --git a/OpenAPI/TS28623_TraceControlNrm.yaml b/OpenAPI/TS28623_TraceControlNrm.yaml index 383e229d8..b335275c8 100644 --- a/OpenAPI/TS28623_TraceControlNrm.yaml +++ b/OpenAPI/TS28623_TraceControlNrm.yaml @@ -1,7 +1,7 @@ openapi: 3.0.1 info: title: Trace Control NRM - version: 19.2.0 + version: 19.3.0 description: >- OAS 3.0.1 definition of the Trace Control NRM fragment © 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). -- GitLab From 936b706a127668c1b76e1b7dc1851f782058f8fc Mon Sep 17 00:00:00 2001 From: sunse Date: Fri, 11 Apr 2025 09:34:40 +0000 Subject: [PATCH 409/587] Rel19 CR1492 TS28.541 correction to inconsistency between stage 2 and stage 3... --- OpenAPI/TS28541_NrNrm.yaml | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/OpenAPI/TS28541_NrNrm.yaml b/OpenAPI/TS28541_NrNrm.yaml index 4f85f0025..de7a1980d 100755 --- a/OpenAPI/TS28541_NrNrm.yaml +++ b/OpenAPI/TS28541_NrNrm.yaml @@ -795,6 +795,10 @@ components: $ref: '#/components/schemas/CCOFunction-Single' NTNFunction: $ref: '#/components/schemas/NTNFunction-Single' + NRECMappingRule: + $ref: '#/components/schemas/NRECMappingRule-Multiple' + MWAB: + $ref: '#/components/schemas/MWAB-Multiple' ManagedElement-ncO-NrNrm: type: object @@ -825,6 +829,10 @@ components: $ref: 'TS28541_5GcNrm.yaml#/components/schemas/Dynamic5QISet-Multiple' NTNFunction: $ref: '#/components/schemas/NTNFunction-Single' + NRECMappingRule: + $ref: '#/components/schemas/NRECMappingRule-Multiple' + MWAB: + $ref: '#/components/schemas/MWAB-Multiple' #-------- Definition of abstract IOCs -------------------------------------------- @@ -2377,6 +2385,10 @@ components: type: array items: $ref: '#/components/schemas/NRECMappingRule-Single' + MWAB-Multiple: + type: array + items: + $ref: '#/components/schemas/MWAB-Single' #-------- Definitions in TS 28.541 for TS 28.532 --------------------------------- -- GitLab From 5c48f506c742c8e5e131fd1b4326d8abdca6a024 Mon Sep 17 00:00:00 2001 From: sunse Date: Fri, 11 Apr 2025 09:38:50 +0000 Subject: [PATCH 410/587] Rel19 CR1495 TS28.541 correction_to_stage_3_of_SatelliteBackhaulInfo Update TS28541_5GcNrm.yaml --- OpenAPI/TS28541_5GcNrm.yaml | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/OpenAPI/TS28541_5GcNrm.yaml b/OpenAPI/TS28541_5GcNrm.yaml index 0cab03904..63f1b0e7d 100755 --- a/OpenAPI/TS28541_5GcNrm.yaml +++ b/OpenAPI/TS28541_5GcNrm.yaml @@ -2644,9 +2644,9 @@ components: description: defines the list of satellite backhaul information type: object properties: - globalRanNodeID: - $ref: '#/components/schemas/GlobalRanNodeID' - SatelliteBackhaulCategory: + nTNGlobalRanNodeID: + $ref: '#/components/schemas/NTNGlobalRanNodeID' + satelliteBackhaulCategory: anyOf: - type: string enum: @@ -2663,7 +2663,7 @@ components: geoSatelliteId: type: string pattern: '^[0-9]{5}$' - GlobalRanNodeID: + NTNGlobalRanNodeID: description: globally identification of an NG-RAN node type: object oneOf: @@ -3622,8 +3622,12 @@ components: $ref: '#/components/schemas/AmfInfo' sliceExpiryInfo: $ref: '#/components/schemas/SliceExpiryInfo' - SatelliteBackhaulInfoList: - $ref: '#/components/schemas/SatelliteBackhaulInfo' + satelliteBackhaulInfoList: + type: array + uniqueItems: true + items: + $ref: '#/components/schemas/SatelliteBackhaulInfo' + minItems: 1 mappedCellIdInfoList: $ref: 'TS28541_NrNrm.yaml#/components/schemas/MappedCellIdInfoList' mdtUserConsentReqList: -- GitLab From c6d3a865aab305bddae554f11747f76789bebf9a Mon Sep 17 00:00:00 2001 From: sunse Date: Fri, 11 Apr 2025 21:21:38 +0000 Subject: [PATCH 411/587] Rel19 CR0108 TS28.538 change_the_dataType_concerning_HostAddr: Update TS28538_EdgeNrm.yaml --- OpenAPI/TS28538_EdgeNrm.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OpenAPI/TS28538_EdgeNrm.yaml b/OpenAPI/TS28538_EdgeNrm.yaml index 3aa0bbfa7..24332bb0a 100644 --- a/OpenAPI/TS28538_EdgeNrm.yaml +++ b/OpenAPI/TS28538_EdgeNrm.yaml @@ -173,7 +173,7 @@ components: type: object properties: host: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/HostAddr' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/Host' port: type: integer Operation: -- GitLab From a5fb761a2e10bd7ed70480926d26f67dcb0a2f12 Mon Sep 17 00:00:00 2001 From: sunse Date: Fri, 11 Apr 2025 21:24:52 +0000 Subject: [PATCH 412/587] Rel19 CR1490 TC28.541 enhancement to Update to ManagedNFProfile: TS28541_5GcNrm.yaml --- OpenAPI/TS28541_5GcNrm.yaml | 118 ++++++++++++++++++++++++++++++++++++ 1 file changed, 118 insertions(+) diff --git a/OpenAPI/TS28541_5GcNrm.yaml b/OpenAPI/TS28541_5GcNrm.yaml index 63f1b0e7d..552ead2d9 100755 --- a/OpenAPI/TS28541_5GcNrm.yaml +++ b/OpenAPI/TS28541_5GcNrm.yaml @@ -340,6 +340,13 @@ components: readOnly: true nfType: $ref: '#/components/schemas/NFType' + collocatedNfInstances: + type: array + uniqueItems: true + items: + $ref: '#/components/schemas/CollocatedNfInstance' + nfInstanceName: + type: string nfStatus: $ref: '#/components/schemas/NFStatus' plmnList: @@ -370,6 +377,11 @@ components: uniqueItems: true items: $ref: '#/components/schemas/SnpnId' + perPlmnSnssaiList: + type: array + uniqueItems: true + items: + $ref: '#/components/schemas/PlmnSnssai' allowedSNPNs: type: array uniqueItems: true @@ -390,10 +402,30 @@ components: uniqueItems: true items: $ref: 'TS28541_NrNrm.yaml#/components/schemas/Snssai' + allowedRuleSet: + description: A map (list of key-value pairs) where a valid JSON pointer Id serves as key + type: object + additionalProperties: + $ref: '#/components/schemas/RuleSet' + minProperties: 1 locality: type: string + extLocality: + description: > + A map (list of key-value pairs) where a (unique) valid JSON string serves + as key representing a type of locality + type: object + additionalProperties: + type: string + minProperties: 1 capacity: type: integer + load: + type: integer + minimum: 0 + maximum: 100 + loadTimeStamp: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTime' nfSetIdList: type: array uniqueItems: true @@ -431,6 +463,14 @@ components: readOnly: true nfProfileChangesSupportInd: type: boolean + nfProfilePartialUpdateChangesSupportInd: + type: boolean + default: false + writeOnly: true + nfProfileChangesInd: + type: boolean + default: false + readOnly: true defaultNotificationSubscriptions: type: array uniqueItems: true @@ -3495,6 +3535,84 @@ components: enum: - REGISTERED - DEREGISTERED + CollocatedNfInstance: + description: Information of an collocated NF Instance registered in the NRF + type: object + required: + - nfInstanceId + - nfType + properties: + nfInstanceId: + $ref: 'TS29571_CommonData.yaml#/components/schemas/NfInstanceId' + nfType: + $ref: '#/components/schemas/NFType' + PlmnSnssai: + description: List of network slices (S-NSSAIs) for a given PLMN ID + type: object + required: + - plmnId + - sNssaiList + properties: + plmnId: + $ref: 'TS29571_CommonData.yaml#/components/schemas/PlmnId' + sNssaiList: + type: array + uniqueItems: true + items: + $ref: 'TS29571_CommonData.yaml#/components/schemas/ExtSnssai' + minItems: 1 + nid: + $ref: 'TS29571_CommonData.yaml#/components/schemas/Nid' + RuleSet: + type: object + required: + - priority + - action + properties: + priority: + type: integer + minimum: 0 + maximum: 65535 + plmns: + type: array + uniqueItems: true + items: + $ref: 'TS29571_CommonData.yaml#/components/schemas/PlmnId' + snpns: + type: array + uniqueItems: true + items: + $ref: 'TS29571_CommonData.yaml#/components/schemas/PlmnIdNid' + nfTypes: + type: array + uniqueItems: true + items: + $ref: '#/components/schemas/NFType' + nfDomains: + type: array + uniqueItems: true + items: + type: string + nssais: + type: array + uniqueItems: true + items: + $ref: 'TS29571_CommonData.yaml#/components/schemas/ExtSnssai' + nfInstances: + type: array + uniqueItems: true + items: + $ref: 'TS29571_CommonData.yaml#/components/schemas/NfInstanceId' + scopes: + type: array + uniqueItems: true + items: + type: string + action: + type: string + enum: + - ALLOW + - DENY #-------- Definition of types for name-containments ------ SubNetwork-ncO-5GcNrm: -- GitLab From 3d80ecd1292d52c3e946c0dd56292d58c5d0ec6a Mon Sep 17 00:00:00 2001 From: sunse Date: Fri, 11 Apr 2025 21:28:08 +0000 Subject: [PATCH 413/587] Rel19 CR1491 TS28.541 change_the_dataType_concerning_HostAddr Update TS28541_5GcNrm.yaml --- OpenAPI/TS28541_5GcNrm.yaml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/OpenAPI/TS28541_5GcNrm.yaml b/OpenAPI/TS28541_5GcNrm.yaml index 552ead2d9..5cbf87998 100755 --- a/OpenAPI/TS28541_5GcNrm.yaml +++ b/OpenAPI/TS28541_5GcNrm.yaml @@ -366,7 +366,7 @@ components: authzInfo: type: string hostAddr: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/HostAddr' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/Host' allowedPLMNs: type: array uniqueItems: true @@ -3433,7 +3433,7 @@ components: type: object properties: host: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/HostAddr' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/Host' port: type: integer NFServiceType: @@ -4369,7 +4369,7 @@ components: supportedFuncList: $ref: '#/components/schemas/SupportedFuncList' address: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/HostAddr' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/Host' scpInfo: $ref: '#/components/schemas/ScpInfo' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' @@ -4926,7 +4926,7 @@ components: remotePlmnId: $ref: 'TS28623_ComDefs.yaml#/components/schemas/PlmnId' remoteSeppAddress: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/HostAddr' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/Host' remoteSeppId: type: integer n32cParas: -- GitLab From 3c68495db6cfe92d7176f13136fa090c7416a87f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jose=20Antonio=20Ordo=C3=B1ez=20Lucena?= Date: Fri, 28 Mar 2025 08:30:59 +0000 Subject: [PATCH 414/587] Update TS28318_DsoNrm.yaml --- OpenAPI/TS28318_DsoNrm.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/OpenAPI/TS28318_DsoNrm.yaml b/OpenAPI/TS28318_DsoNrm.yaml index 06bc702eb..ccc9ea819 100644 --- a/OpenAPI/TS28318_DsoNrm.yaml +++ b/OpenAPI/TS28318_DsoNrm.yaml @@ -17,8 +17,8 @@ components: EnergyServiceLocation: type: object properties: - CGI: - type: string + outageArea: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/AreaOfInterest' energySupplyId: type: string -- GitLab From d4cb663cf715de4c741ba917ea3025d4da2d4c4d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jose=20Antonio=20Ordo=C3=B1ez=20Lucena?= Date: Fri, 28 Mar 2025 16:48:13 +0000 Subject: [PATCH 415/587] Update TS28318_DsoNrm.yaml --- OpenAPI/TS28318_DsoNrm.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OpenAPI/TS28318_DsoNrm.yaml b/OpenAPI/TS28318_DsoNrm.yaml index ccc9ea819..161740415 100644 --- a/OpenAPI/TS28318_DsoNrm.yaml +++ b/OpenAPI/TS28318_DsoNrm.yaml @@ -4,7 +4,7 @@ info: version: 19.0.0 description: >- OAS 3.0.1 specification of the OutageAndRecoveryInfo NRM - © 2024, 3GPP Organizational OutageAndRecoveryInfo Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). + © 2025, 3GPP Organizational OutageAndRecoveryInfo Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved. externalDocs: description: 3GPP TS 28.318; OutageAndRecoveryInfo NRM -- GitLab From 68a0963d7a442388024e6fadf2ac2401e65365fc Mon Sep 17 00:00:00 2001 From: zhaoxxian Date: Mon, 14 Apr 2025 11:38:17 +0000 Subject: [PATCH 416/587] Rel-19 CR1510 TS 28.541 Add AIOTF and ADM IOC to support management of Ambient IoT --- OpenAPI/TS28541_5GcNrm.yaml | 38 ++++++++++++++++++++++++++++++++++++- 1 file changed, 37 insertions(+), 1 deletion(-) diff --git a/OpenAPI/TS28541_5GcNrm.yaml b/OpenAPI/TS28541_5GcNrm.yaml index 5cbf87998..d79871dd7 100755 --- a/OpenAPI/TS28541_5GcNrm.yaml +++ b/OpenAPI/TS28541_5GcNrm.yaml @@ -3706,6 +3706,10 @@ components: $ref: '#/components/schemas/MbUpfFunction-Multiple' MNPFFunction: $ref: '#/components/schemas/MnpfFunction-Multiple' + AiotfFunction: + $ref: '#/components/schemas/AiotfFunction-Multiple' + AdmFunction: + $ref: '#/components/schemas/AdmFunction-Multiple' #-------- Definition of concrete IOCs -------------------------------------------- AmfFunction-Single: @@ -4598,6 +4602,28 @@ components: $ref: 'TS28623_ComDefs.yaml#/components/schemas/FqdnRo' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' - $ref: '#/components/schemas/ManagedFunction5GC-nc0' + AiotfFunction-Single: + allOf: + - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' + - type: object + properties: + attributes: + allOf: + - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-Attr' + - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' + - $ref: '#/components/schemas/ManagedFunction5GC-nc0' + + AdmFunction-Single: + allOf: + - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' + - type: object + properties: + attributes: + allOf: + - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-Attr' + - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' + - $ref: '#/components/schemas/ManagedFunction5GC-nc0' + EP_N2-Single: allOf: - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' @@ -6284,7 +6310,15 @@ components: type: array items: $ref: '#/components/schemas/EASDFFunction-Single' - + AiotfFunction-Multiple: + type: array + items: + $ref: '#/components/schemas/AiotfFunction-Single' + AdmFunction-Multiple: + type: array + items: + $ref: '#/components/schemas/AdmFunction-Single' + EP_N2-Multiple: type: array items: @@ -6761,3 +6795,5 @@ components: - $ref: '#/components/schemas/MbSmfFunction-Single' - $ref: '#/components/schemas/MbUpfFunction-Single' - $ref: '#/components/schemas/MnpfFunction-Single' + - $ref: '#/components/schemas/AiotfFunction-Single' + - $ref: '#/components/schemas/AdmFunction-Single' -- GitLab From cc972412b7e6b36424053d9b71d9fe5345e30669 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Refik=20Fatih=20=C3=9Cstok?= Date: Mon, 14 Apr 2025 11:41:23 +0000 Subject: [PATCH 417/587] 28.312_Rel19_CR0318_Add_stage_3_solution_for_intent_driven_management_of_network_maintenance --- OpenAPI/TS28312_IntentExpectations.yaml | 142 +++++++++++++++++++++++- OpenAPI/TS28312_IntentNrm.yaml | 5 +- 2 files changed, 145 insertions(+), 2 deletions(-) diff --git a/OpenAPI/TS28312_IntentExpectations.yaml b/OpenAPI/TS28312_IntentExpectations.yaml index 85edc5ba7..477d234c5 100644 --- a/OpenAPI/TS28312_IntentExpectations.yaml +++ b/OpenAPI/TS28312_IntentExpectations.yaml @@ -162,7 +162,55 @@ components: - $ref: '#/components/schemas/ResourceSharingLevelContext' - $ref: "TS28312_IntentNrm.yaml#/components/schemas/Context" required: - - expectationId + - expectationId + NetworkMaintenanceExpectation: + description: >- + This data type is the "IntentExpectation" data type with specialisations to represent MnS consumer's expectations for Network Maintenance + type: object + properties: + expectationId: + type: string + expectationVerb: + $ref: "TS28312_IntentNrm.yaml#/components/schemas/ExpectationVerb" + expectationObjects: + type: array + uniqueItems: true + items: + $ref: "#/components/schemas/NetworkMaintenanceExpectationObject" + expectationTargets: + type: array + uniqueItems: true + items: + type: object + oneOf: + - $ref: '#/components/schemas/MaintenanceVersionTarget' + - $ref: '#/components/schemas/WeakRSRPRatioTarget' + - $ref: '#/components/schemas/LowSINRRatioTarget' + - $ref: '#/components/schemas/AveULRANUEThptTarget' + - $ref: '#/components/schemas/AveDLRANUEThptTarget' + - $ref: '#/components/schemas/LowULRANUEThptRatioTarget' + - $ref: '#/components/schemas/LowDLRANUEThptRatioTarget' + - $ref: '#/components/schemas/HighULPrbLoadRatioTarget' + - $ref: '#/components/schemas/HighDLPrbLoadRatioTarget' + - $ref: '#/components/schemas/AveULPrbLoadTarget' + - $ref: '#/components/schemas/AveDLPrbLoadTarget' + - $ref: "#/components/schemas/RANEnergyConsumptionTarget" + - $ref: "#/components/schemas/RANEnergyEfficiencyTarget" + - $ref: "#/components/schemas/MaxNumberofPDUsessionsTarget" + - $ref: "#/components/schemas/MaxNumberofRegisteredsubscribersTarget" + - $ref: "#/components/schemas/IncomingDataTarget" + - $ref: "#/components/schemas/OutgoingDataTarget" + - $ref: "TS28312_IntentNrm.yaml#/components/schemas/ExpectationTarget" + expectationContexts: + type: array + uniqueItems: true + items: + type: object + oneOf: + - $ref: '#/components/schemas/MaintenanceTimeContext' + - $ref: "TS28312_IntentNrm.yaml#/components/schemas/Context" + required: + - expectationId #-------Definition of the IntentExpectation dataType ----------# #-------Definition of the scenario specific ExpectationObject dataType ----------# @@ -258,6 +306,34 @@ components: - $ref: "#/components/schemas/ServingScopeContext" - $ref: "#/components/schemas/DnnContext" - $ref: "TS28312_IntentNrm.yaml#/components/schemas/Context" + NetworkMaintenanceExpectationObject: + description: >- + This data type is the "ExpectationObject" data type with specialisations for NetworkMaintenanceExpectation + type: object + properties: + objectInstance: + $ref: "TS28623_ComDefs.yaml#/components/schemas/Dn" + objectContexts: + type: array + uniqueItems: true + items: + type: object + oneOf: + - $ref: "#/components/schemas/MaintenanceVersionContext" + - $ref: "#/components/schemas/MaintenanceOrderContext" + - $ref: "#/components/schemas/NfTypeContext" + - $ref: "#/components/schemas/NfInstanceLocationContext" + - $ref: "#/components/schemas/PLMNContext" + - $ref: "#/components/schemas/TaiContext" + - $ref: "#/components/schemas/ServingScopeContext" + - $ref: "#/components/schemas/DnnContext" + - $ref: '#/components/schemas/CoverageAreaPolygonContext' + - $ref: '#/components/schemas/CoverageTACContext' + - $ref: '#/components/schemas/PLMNContext' + - $ref: '#/components/schemas/DlFrequencyContext' + - $ref: '#/components/schemas/UlFrequencyContext' + - $ref: '#/components/schemas/RATContext' + - $ref: "TS28312_IntentNrm.yaml#/components/schemas/Context" #-------Definition of the ExpectationObject dataType ----------# @@ -851,6 +927,21 @@ components: - IS_LESS_THAN targetValueRange: type: integer + MaintenanceVersionTarget: + description: >- + This data type is the "ExpectationTarget" data type with specialisations for Maintenance Version Target. It describes the maintenance version target for the network maintenance, such as target version of the maintenance object after maintenance. + type: object + properties: + targetName: + type: string + enum: + - MaintenanceVersion + targetCondition: + type: string + enum: + - IS_EQUAL_TO + targetValueRange: + type: string #-------Definition of the concrete ExpectationTarget dataType----------# @@ -1149,6 +1240,40 @@ components: uniqueItems: true items: type: string + MaintenanceVersionContext: + description: >- + This data type is the "ObjectContext" data type with specialisations for MaintenanceVersionContext. It describes the scope of the maintenance objects based on software version. + type: object + properties: + contextAttribute: + type: string + enum: + - swVersion + contextCondition: + type: string + enum: + - IS_ALL_OF + contextValueRange: + type: array + items: + type: string + MaintenanceOrderContext: + description: >- + This data type is the "ObjectContext" data type with specialisations for MaintenanceOrderContext. It describes describes the list of DNs for NFs/NEs based on their order for maintenance. + type: object + properties: + contextAttribute: + type: string + enum: + - maintenanceOrder + contextCondition: + type: string + enum: + - IS_ALL_OF + contextValueRange: + type: array + items: + type: string #-------Definition of the scenario specific ObjectTarget dataType----------------# #-------Definition of the concrete ExpectationContext dataType----------------# @@ -1295,4 +1420,19 @@ components: - IS_EQUAL_TO contextValueRange: $ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTime' + MaintenanceTimeContext: + description: >- + This data type is the "ExpectationContext" data type with specialisations for MaintenanceTimeContext + type: object + properties: + contextAttribute: + type: string + enum: + - MaintenanceTime + contextCondition: + type: string + enum: + - IS_EQUAL_TO + contextValueRange: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/TimeWindow' #-------Definition of the concrete ExpectionContext dataType----------------# diff --git a/OpenAPI/TS28312_IntentNrm.yaml b/OpenAPI/TS28312_IntentNrm.yaml index 2048c8d88..ab7ff6514 100644 --- a/OpenAPI/TS28312_IntentNrm.yaml +++ b/OpenAPI/TS28312_IntentNrm.yaml @@ -43,6 +43,7 @@ components: - $ref: "TS28312_IntentExpectations.yaml#/components/schemas/EdgeServiceSupportExpectation" - $ref: "TS28312_IntentExpectations.yaml#/components/schemas/5GCNetworkExpectation" - $ref: "TS28312_IntentExpectations.yaml#/components/schemas/RadioServiceExpectation" + - $ref: "TS28312_IntentExpectations.yaml#/components/schemas/NetworkMaintenanceExpectation" intentMgmtPurpose: $ref: "#/components/schemas/IntentMgmtPurpose" contextSelectivity: @@ -173,7 +174,8 @@ components: - RAN_SUBNETWORK #value for Radio Network Expectation--# - EDGE_SERVICE_SUPPORT #value for Edge Service Support Expectation--# - 5GC_SUBNETWORK #value for 5GC Network Expectation--# - - Radio_Service #value for Radio Service Expectation--# + - Radio_Service #value for Radio Service Expectation--# + - SUBNETWORK #value for Network Maintenance Expectation--# objectInstance: $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' objectContexts: @@ -260,6 +262,7 @@ components: enum: - DELIVER - ENSURE + - MAINTAIN description: It describes the characteristic of the intentExpectation and is the property that describes the types of intentExpectations. Vendor extensions are allowed Frequency: description: >- -- GitLab From 560199d627aed53a8572a6efc73b3b83ab8796ee Mon Sep 17 00:00:00 2001 From: Zhen Xing Date: Mon, 14 Apr 2025 12:01:32 +0000 Subject: [PATCH 418/587] 28.312 rel19 cr0316 support mocn undifferentiated radio service in a specified area(251367) --- OpenAPI/TS28312_IntentExpectations.yaml | 38 ++++++++++++++++++++++++- 1 file changed, 37 insertions(+), 1 deletion(-) diff --git a/OpenAPI/TS28312_IntentExpectations.yaml b/OpenAPI/TS28312_IntentExpectations.yaml index 477d234c5..03759545e 100644 --- a/OpenAPI/TS28312_IntentExpectations.yaml +++ b/OpenAPI/TS28312_IntentExpectations.yaml @@ -43,7 +43,9 @@ components: - $ref: '#/components/schemas/AveDLPrbLoadTarget' - $ref: "#/components/schemas/RANEnergyConsumptionTarget" - $ref: "#/components/schemas/RANEnergyEfficiencyTarget" - - $ref: "#/components/schemas/ActiveUEsNumTarget" + - $ref: "#/components/schemas/ActiveUEsNumTarget" + - $ref: '#/components/schemas/PRBsTarget' + - $ref: '#/components/schemas/InterRAThandoverTarget' - $ref: 'TS28312_IntentNrm.yaml#/components/schemas/ExpectationTarget' expectationContexts: type: array @@ -716,6 +718,40 @@ components: type: integer minItems: 1 maxItems: 2 + PRBsTarget: + description: >- + This data type is the "ExpectationTarget" data type with specialisations for PRBsTarget. + It describes total available number of physical resource blocks (PRBs). This target is equal to the difference between the DL total available PRB plus UL total available PRB of operator A and the DL total available PRB plus UL total available PRB of operator B. DL total available PRB and UL total available PRB defined in clause 5.1.1.2.6 and 5.1.1.2.8 of TS 28.552 [12]. + type: object + properties: + targetName: + type: string + enum: + - PRBS + targetCondition: + type: string + enum: + - IS_EQUAL_TO + targetValueRange: + type: integer + InterRAThandoverTarget: + description: >- + This data type is the "ExpectationTarget" data type with specialisations for PRBsTarget. + it shows how often a handover from 5GS to EPS is successful. The InterRAThandover target is equal to the difference between 5GS to EPS handover success rate of operator A and 5GS to EPS handover success rate of operator B. For details see attribute 5GS to EPS handover success rate defined in clause 6.6.4 of TS 28.554 [11]. + type: object + properties: + targetName: + type: string + enum: + - INTERRATHANDOVER + targetCondition: + type: string + enum: + - IS_LESS_THAN + targetValueRange: + type: integer + minimum: 0 + maximum: 100 NumberofUEsTarget: description: >- This data type is the "ExpectationTarget" data type with specialisations for NumberofUEsTarget.It describes -- GitLab From cd3f228a9b855bdd6130bbb21c41dddb4e8a0bf7 Mon Sep 17 00:00:00 2001 From: zhaoxxian Date: Mon, 14 Apr 2025 12:27:40 +0000 Subject: [PATCH 419/587] Rel-19 CR1511 TS 28.541 add YAML stage 3 for NTN time based solution --- OpenAPI/TS28541_NrNrm.yaml | 38 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) diff --git a/OpenAPI/TS28541_NrNrm.yaml b/OpenAPI/TS28541_NrNrm.yaml index de7a1980d..b51c774d1 100755 --- a/OpenAPI/TS28541_NrNrm.yaml +++ b/OpenAPI/TS28541_NrNrm.yaml @@ -755,6 +755,19 @@ components: - M8 - M9 - MDT_UE_LOCATION + + NTNEntityConf: + type: object + properties: + nTNConfEntity: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' + nTNConfList: + type: array + uniqueItems: true + items: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/AttributeNameValuePairSet' + + #-------- Definition of types for name-containments ------ SubNetwork-ncO-NrNrm: type: object @@ -2174,6 +2187,8 @@ components: $ref: '#/components/schemas/NrTacList' ephemerisInfoSet: $ref: '#/components/schemas/EphemerisInfoSet-Multiple' + nTNTimeBasedConfig: + $ref: '#/components/schemas/NTNTimeBasedConfig-Multiple' EphemerisInfoSet-Single: allOf: @@ -2222,6 +2237,24 @@ components: type: integer ecTimeInterval: type: integer + + NTNTimeBasedConfig-Single: + allOf: + - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' + - type: object + properties: + attributes: + allOf: + - type: object + properties: + timeWindow: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/TimeWindow' + nTNEntityConfigList: + type: array + uniqueItems: true + items: + $ref: '#/components/schemas/NTNEntityConf' + minItems: 1 #-------- Definition of JSON arrays for name-contained IOCs ---------------------- @@ -2385,6 +2418,10 @@ components: type: array items: $ref: '#/components/schemas/NRECMappingRule-Single' + NTNTimeBasedConfig-Multiple: + type: array + items: + $ref: '#/components/schemas/NTNTimeBasedConfig-Single' MWAB-Multiple: type: array items: @@ -2458,3 +2495,4 @@ components: - $ref: '#/components/schemas/EphemerisInfoSet-Single' - $ref: '#/components/schemas/MWAB-Single' - $ref: '#/components/schemas/NRECMappingRule-Single' + - $ref: '#/components/schemas/NTNTimeBasedConfig-Single' -- GitLab From 89b248b26117f9d81c2ece0da1121271c088f590 Mon Sep 17 00:00:00 2001 From: shixixi Date: Tue, 25 Mar 2025 08:47:08 +0000 Subject: [PATCH 420/587] Update TS28104_MdaNrm.yaml --- OpenAPI/TS28104_MdaNrm.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/OpenAPI/TS28104_MdaNrm.yaml b/OpenAPI/TS28104_MdaNrm.yaml index babe49e8f..82102436b 100644 --- a/OpenAPI/TS28104_MdaNrm.yaml +++ b/OpenAPI/TS28104_MdaNrm.yaml @@ -33,6 +33,7 @@ components: - RESOURCEANALYTICS_PHYISCALRESOURCEUTILIZATIONANALYSISNF - RESOURCEANALYTICS_5GCCONTROLPLANECONGESTIONANALYSIS - PREDICTIONS_PMDATA + MDATypes: type: array -- GitLab From 4dedbe561c0854e842679cb0ab110f62bdbad69c Mon Sep 17 00:00:00 2001 From: shixixi Date: Tue, 25 Mar 2025 09:14:13 +0000 Subject: [PATCH 421/587] Update TS28104_MdaNrm.yaml --- OpenAPI/TS28104_MdaNrm.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/OpenAPI/TS28104_MdaNrm.yaml b/OpenAPI/TS28104_MdaNrm.yaml index 82102436b..cfcab51c9 100644 --- a/OpenAPI/TS28104_MdaNrm.yaml +++ b/OpenAPI/TS28104_MdaNrm.yaml @@ -33,6 +33,7 @@ components: - RESOURCEANALYTICS_PHYISCALRESOURCEUTILIZATIONANALYSISNF - RESOURCEANALYTICS_5GCCONTROLPLANECONGESTIONANALYSIS - PREDICTIONS_PMDATA + - UETHROUGHPUTANALYTICS_TRAFFICCONGESTIONPROBLEMANALYSIS MDATypes: -- GitLab From b8bfa26143f02cc8f26edb070485e48d6167d06f Mon Sep 17 00:00:00 2001 From: shixixi Date: Fri, 28 Mar 2025 09:18:50 +0000 Subject: [PATCH 422/587] Update TS28104_MdaNrm.yaml --- OpenAPI/TS28104_MdaNrm.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OpenAPI/TS28104_MdaNrm.yaml b/OpenAPI/TS28104_MdaNrm.yaml index cfcab51c9..af908cdce 100644 --- a/OpenAPI/TS28104_MdaNrm.yaml +++ b/OpenAPI/TS28104_MdaNrm.yaml @@ -33,7 +33,7 @@ components: - RESOURCEANALYTICS_PHYISCALRESOURCEUTILIZATIONANALYSISNF - RESOURCEANALYTICS_5GCCONTROLPLANECONGESTIONANALYSIS - PREDICTIONS_PMDATA - - UETHROUGHPUTANALYTICS_TRAFFICCONGESTIONPROBLEMANALYSIS + - UETHROUGHPUTANALYSIS_TRAFFICCONGESTIONPROBLEMANALYSIS MDATypes: -- GitLab From f3b47024e6df771a4c65fa748fd92dcca8e11142 Mon Sep 17 00:00:00 2001 From: ruanb Date: Fri, 28 Mar 2025 17:36:41 +0000 Subject: [PATCH 423/587] Rel19_CR1523_TS28541_Fix_nTNTAClist_for_stage3_OpenAPI --- OpenAPI/TS28541_NrNrm.yaml | 7 ------- 1 file changed, 7 deletions(-) diff --git a/OpenAPI/TS28541_NrNrm.yaml b/OpenAPI/TS28541_NrNrm.yaml index b51c774d1..ea02f7f10 100755 --- a/OpenAPI/TS28541_NrNrm.yaml +++ b/OpenAPI/TS28541_NrNrm.yaml @@ -610,13 +610,6 @@ components: type: integer minValue: type: integer - - NTNTAClist: - type: array - uniqueItems: true - items: - $ref: '#/components/schemas/NrTac' - Ephemeris: type: object oneOf: -- GitLab From e6feba6d2c48808f0be4cbb3836f01f818a95ddc Mon Sep 17 00:00:00 2001 From: ruanb Date: Tue, 15 Apr 2025 10:03:16 +0000 Subject: [PATCH 424/587] Rel19_CR1506_TS28541_Add_attributes_to_support_MEC_deployment_onboard_the_NTN --- OpenAPI/TS28541_5GcNrm.yaml | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/OpenAPI/TS28541_5GcNrm.yaml b/OpenAPI/TS28541_5GcNrm.yaml index d79871dd7..df1cc353d 100755 --- a/OpenAPI/TS28541_5GcNrm.yaml +++ b/OpenAPI/TS28541_5GcNrm.yaml @@ -849,6 +849,10 @@ components: $ref: 'TS29571_CommonData.yaml#/components/schemas/Dnai' minItems: 1 + SatelliteId: + type: string + pattern: '^[0-9]{5}$' + dnaiSatelliteMapping: type: object properties: @@ -859,8 +863,7 @@ components: $ref: 'TS29571_CommonData.yaml#/components/schemas/Dnai' minItems: 1 geoSatelliteId: - type: string - pattern: '^[0-9]{5}$' + $ref: '#/components/schemas/SatelliteId' SnssaiSmfInfoItem: type: object @@ -3937,8 +3940,7 @@ components: isOnboardSatellite: type: boolean onboardSatelliteId: - type: string - pattern: '^[0-9]{5}$' + $ref: '#/components/schemas/SatelliteId' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' - $ref: '#/components/schemas/ManagedFunction5GC-nc0' - type: object @@ -4497,6 +4499,10 @@ components: type: string easdfInfo: $ref: '#/components/schemas/EasdfInfo' + isOnboardSatellite: + type: boolean + onboardSatelliteId: + $ref: '#/components/schemas/SatelliteId' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' - $ref: '#/components/schemas/ManagedFunction5GC-nc0' - type: object -- GitLab From b7ab5832d41097c20e8936a465b60b0fda4ac7cf Mon Sep 17 00:00:00 2001 From: ruiyue Date: Wed, 16 Apr 2025 00:44:31 +0000 Subject: [PATCH 425/587] Rel_19_CR1500_TS_28.541_update_the_naming_convention_in_TS28541_NrNrm_yaml_to_align_with_stage_2_definition --- OpenAPI/TS28541_NrNrm.yaml | 243 +++++++++++++++++++------------------ 1 file changed, 124 insertions(+), 119 deletions(-) diff --git a/OpenAPI/TS28541_NrNrm.yaml b/OpenAPI/TS28541_NrNrm.yaml index ea02f7f10..64413f14c 100755 --- a/OpenAPI/TS28541_NrNrm.yaml +++ b/OpenAPI/TS28541_NrNrm.yaml @@ -73,13 +73,13 @@ components: items: $ref: '#/components/schemas/PlmnInfo' minItems: 1 - NpnIdentityList: + NPNIdentityList: type: array uniqueItems: true items: $ref: 'TS28623_GenericNrm.yaml#/components/schemas/NpnId-Type' minItems: 1 - GGnbId: + GgNBId: type: object properties: plmnId: @@ -88,7 +88,7 @@ components: $ref: '#/components/schemas/GnbIdLength' gnbId: $ref: '#/components/schemas/GnbId' - GEnbId: + GeNBId: type: object properties: plmnId: @@ -98,24 +98,24 @@ components: minimum: 0 maximum: 4194303 - GGnbIdList: + GgNBIdList: type: array uniqueItems: true items: - $ref: '#/components/schemas/GGnbId' + $ref: '#/components/schemas/GgNBId' - GEnbIdList: + GeNBIdList: type: array uniqueItems: true items: - $ref: '#/components/schemas/GEnbId' + $ref: '#/components/schemas/GeNBId' NrPci: type: integer maximum: 503 - NrTac: + NRTAC: $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Tac' - NrTacList: + NRTACList: type: array uniqueItems: true items: @@ -294,18 +294,18 @@ components: - NO - PARTIAL - FULL - RrmPolicyMember: + RRMPolicyMember: type: object properties: plmnId: $ref: 'TS28623_ComDefs.yaml#/components/schemas/PlmnId' snssai: $ref: '#/components/schemas/Snssai' - RrmPolicyMemberList: + RRMPolicyMemberList: type: array uniqueItems: true items: - $ref: '#/components/schemas/RrmPolicyMember' + $ref: '#/components/schemas/RRMPolicyMember' minItems: 1 AddressWithVlan: type: object @@ -610,6 +610,11 @@ components: type: integer minValue: type: integer + NTNTAClist: + type: array + uniqueItems: true + items: + $ref: '#/components/schemas/NRTAC' Ephemeris: type: object oneOf: @@ -767,12 +772,12 @@ components: properties: NRFrequency: $ref: '#/components/schemas/NRFrequency-Multiple' - ExternalGnbCuCpFunction: - $ref: '#/components/schemas/ExternalGnbCuCpFunction-Multiple' - ExternalGnbCuUpFunction: - $ref: '#/components/schemas/ExternalGnbCuUpFunction-Multiple' - ExternalGnbDuFunction: - $ref: '#/components/schemas/ExternalGnbDuFunction-Multiple' + ExternalGNBCUCPFunction: + $ref: '#/components/schemas/GNBCUCPFunction-Multiple' + ExternalGNBCUUPFunction: + $ref: '#/components/schemas/ExternalGNBCUUPFunction-Multiple' + ExternalGNBDUFunction: + $ref: '#/components/schemas/ExternalGNBDUFunction-Multiple' ExternalENBFunction: $ref: '#/components/schemas/ExternalENBFunction-Multiple' EUtranFrequency: @@ -809,12 +814,12 @@ components: ManagedElement-ncO-NrNrm: type: object properties: - GnbDuFunction: - $ref: '#/components/schemas/GnbDuFunction-Multiple' - GnbCuUpFunction: - $ref: '#/components/schemas/GnbCuUpFunction-Multiple' - GnbCuCpFunction: - $ref: '#/components/schemas/GnbCuCpFunction-Multiple' + GNBDUFunction: + $ref: '#/components/schemas/GNBDUFunction-Multiple' + GNBCUUPFunction: + $ref: '#/components/schemas/GNBCUUPFunction-Multiple' + GNBCUCPFunction: + $ref: '#/components/schemas/GNBCUCPFunction-Multiple' DESManagementFunction: $ref: '#/components/schemas/DESManagementFunction-Single' DRACHOptimizationFunction: @@ -842,17 +847,17 @@ components: #-------- Definition of abstract IOCs -------------------------------------------- - RrmPolicy_-Attr: + RRMPolicy_-Attr: type: object properties: resourceType: $ref: '#/components/schemas/ResourceType' - rRMPolicyMemberList: - $ref: '#/components/schemas/RrmPolicyMemberList' + RRMPolicyMemberList: + $ref: '#/components/schemas/RRMPolicyMemberList' #-------- Definition of concrete IOCs -------------------------------------------- - GnbDuFunction-Single: + GNBDUFunction-Single: allOf: - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' - type: object @@ -885,12 +890,12 @@ components: properties: RRMPolicyRatio: $ref: '#/components/schemas/RRMPolicyRatio-Multiple' - NrCellDu: - $ref: '#/components/schemas/NrCellDu-Multiple' - Bwp-Multiple: - $ref: '#/components/schemas/Bwp-Multiple' - NrSectorCarrier-Multiple: - $ref: '#/components/schemas/NrSectorCarrier-Multiple' + NRCellDU: + $ref: '#/components/schemas/NRCellDU-Multiple' + BWP-Multiple: + $ref: '#/components/schemas/BWP-Multiple' + NRSectorCarrier-Multiple: + $ref: '#/components/schemas/NRSectorCarrier-Multiple' EP_F1C: $ref: '#/components/schemas/EP_F1C-Single' EP_F1U: @@ -898,7 +903,7 @@ components: DRACHOptimizationFunction: $ref: '#/components/schemas/DRACHOptimizationFunction-Single' OperatorDU: - $ref: '#/components/schemas/OperatorDu-Multiple' + $ref: '#/components/schemas/OperatorDU-Multiple' BWPSet: $ref: '#/components/schemas/BWPSet-Multiple' Configurable5QISet: @@ -906,7 +911,7 @@ components: Dynamic5QISet: $ref: 'TS28541_5GcNrm.yaml#/components/schemas/Dynamic5QISet-Multiple' - OperatorDu-Single: + OperatorDU-Single: allOf: - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' - type: object @@ -927,9 +932,9 @@ components: dynamic5QISetRef: description: This attribute is condition optional. The condition is NG-RAN Multi-Operator Core Network (NG-RAN MOCN) network sharing with operator specific 5QI is supported. $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnRo' - NrOperatorCellDu: - $ref: '#/components/schemas/NrOperatorCellDu-Multiple' - GnbCuUpFunction-Single: + NROperatorCellDU: + $ref: '#/components/schemas/NROperatorCellDU-Multiple' + GNBCUUPFunction-Single: allOf: - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' - type: object @@ -949,7 +954,7 @@ components: type: boolean onboardSatelliteId: $ref: '#/components/schemas/SatelliteId' - plmnInfoList: + PlmnInfoList: $ref: '#/components/schemas/PlmnInfoList' configurable5QISetRef: $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' @@ -977,7 +982,7 @@ components: Dynamic5QISet: $ref: 'TS28541_5GcNrm.yaml#/components/schemas/Dynamic5QISet-Multiple' - GnbCuCpFunction-Single: + GNBCUCPFunction-Single: allOf: - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' - type: object @@ -996,17 +1001,17 @@ components: plmnId: $ref: 'TS28623_ComDefs.yaml#/components/schemas/PlmnId' x2BlockList: - $ref: '#/components/schemas/GGnbIdList' + $ref: '#/components/schemas/GgNBIdList' xnBlockList: - $ref: '#/components/schemas/GGnbIdList' + $ref: '#/components/schemas/GgNBIdList' x2AllowList: - $ref: '#/components/schemas/GGnbIdList' + $ref: '#/components/schemas/GgNBIdList' xnAllowList: - $ref: '#/components/schemas/GGnbIdList' + $ref: '#/components/schemas/GgNBIdList' x2HOBlockList: - $ref: '#/components/schemas/GEnbIdList' + $ref: '#/components/schemas/GeNBIdList' xnHOBlockList: - $ref: '#/components/schemas/GGnbIdList' + $ref: '#/components/schemas/GgNBIdList' mappingSetIDBackhaulAddressList: type: array uniqueItems: true @@ -1044,8 +1049,8 @@ components: properties: RRMPolicyRatio: $ref: '#/components/schemas/RRMPolicyRatio-Multiple' - NrCellCu: - $ref: '#/components/schemas/NrCellCu-Multiple' + NRCellCU: + $ref: '#/components/schemas/NRCellCU-Multiple' EP_XnC: $ref: '#/components/schemas/EP_XnC-Multiple' EP_E1: @@ -1073,7 +1078,7 @@ components: EUtranNetwork: $ref: '#/components/schemas/EUtraNetwork-Single' - NrCellCu-Single: + NRCellCU-Single: allOf: - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' - type: object @@ -1113,7 +1118,7 @@ components: DPCIConfigurationFunction: $ref: '#/components/schemas/DPCIConfigurationFunction-Single' - NrCellDu-Single: + NRCellDU-Single: allOf: - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' - type: object @@ -1131,13 +1136,13 @@ components: type: integer cellState: $ref: '#/components/schemas/CellState' - plmnInfoList: + plmnInfoInfoList: $ref: '#/components/schemas/PlmnInfoList' - npnIdentityList: - $ref: '#/components/schemas/NpnIdentityList' + nPNIdentityList: + $ref: '#/components/schemas/NPNIdentityList' nrPci: $ref: '#/components/schemas/NrPci' - nrTac: + nRTAC: $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Tac' arfcnDL: type: integer @@ -1173,18 +1178,18 @@ components: enum: - REDCAP_1RX - REDCAP_2RX - nrSectorCarrierRef: + nRSectorCarrierRef: type: array uniqueItems: true items: $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' - bwpRef: + bWPRef: description: "Condition is BWP sets are not supported" type: array uniqueItems: true items: $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' - bwpSetRef: + bWPSetRef: description: "Condition is BWP sets are supported" $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList' rimRSMonitoringStartTime: @@ -1230,7 +1235,7 @@ components: maxItems: 12 - NrOperatorCellDu-Single: + NROperatorCellDU-Single: allOf: - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' - type: object @@ -1241,7 +1246,7 @@ components: $ref: 'TS28623_ComDefs.yaml#/components/schemas/AdministrativeState' plmnInfoList: $ref: '#/components/schemas/PlmnInfoList' - nrTac: + nRTAC: $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Tac' NRFrequency-Single: @@ -1280,7 +1285,7 @@ components: minimum: 1 maximum: 256 - NrSectorCarrier-Single: + NRSectorCarrier-Single: allOf: - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' - type: object @@ -1309,7 +1314,7 @@ components: properties: CommonBeamformingFunction: $ref: '#/components/schemas/CommonBeamformingFunction-Single' - Bwp-Single: + BWP-Single: allOf: - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' - type: object @@ -1402,7 +1407,7 @@ components: properties: attributes: allOf: - - $ref: '#/components/schemas/RrmPolicy_-Attr' + - $ref: '#/components/schemas/RRMPolicy_-Attr' - type: object properties: rRMPolicyMaxRatio: @@ -1816,7 +1821,7 @@ components: nRCellDURefs: $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnListRo' - ExternalGnbDuFunction-Single: + ExternalGNBDUFunction-Single: allOf: - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' - type: object @@ -1844,15 +1849,15 @@ components: properties: NRFrequency: $ref: '#/components/schemas/NRFrequency-Multiple' - ExternalGnbCuCpFunction: - $ref: '#/components/schemas/ExternalGnbCuCpFunction-Multiple' - ExternalGnbCuUpFunction: - $ref: '#/components/schemas/ExternalGnbCuUpFunction-Multiple' - ExternalGnbDuFunction: - $ref: '#/components/schemas/ExternalGnbDuFunction-Multiple' + ExternalGNBCUCPFunction: + $ref: '#/components/schemas/ExternalGNBCUCPFunction-Multiple' + ExternalGNBCUUPFunction: + $ref: '#/components/schemas/ExternalGNBCUUPFunction-Multiple' + ExternalGNBDUFunction: + $ref: '#/components/schemas/ExternalGNBDUFunction-Multiple' - ExternalGnbCuUpFunction-Single: + ExternalGNBCUUPFunction-Single: allOf: - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' - type: object @@ -1875,7 +1880,7 @@ components: $ref: '#/components/schemas/EP_F1U-Multiple' EP_XnU: $ref: '#/components/schemas/EP_XnU-Multiple' - ExternalGnbCuCpFunction-Single: + ExternalGNBCUCPFunction-Single: allOf: - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' - type: object @@ -1895,15 +1900,15 @@ components: - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' - type: object properties: - ExternalNrCellCu: - $ref: '#/components/schemas/ExternalNrCellCu-Multiple' + ExternalNRCellCU: + $ref: '#/components/schemas/ExternalNRCellCU-Multiple' EP_XnC: $ref: '#/components/schemas/EP_XnC-Multiple' EP_E1: $ref: '#/components/schemas/EP_E1-Multiple' EP_F1C: $ref: '#/components/schemas/EP_F1C-Multiple' - ExternalNrCellCu-Single: + ExternalNRCellCU-Single: allOf: - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' - type: object @@ -2124,11 +2129,11 @@ components: properties: cCOControl: type: boolean - cCOWeakCoverageParameters: + CCOWeakCoverageParameters: $ref: '#/components/schemas/CCOWeakCoverageParameters-Single' - cCOPilotPollutionParameters: + CCOPilotPollutionParameters: $ref: '#/components/schemas/CCOPilotPollutionParameters-Single' - cCOOvershootCoverageParameters-Single: + CCOOvershootCoverageParameters-Single: $ref: '#/components/schemas/CCOOvershootCoverageParameters-Single' CCOParameters-Attr: allOf: @@ -2177,8 +2182,8 @@ components: nTNpLMNInfoList: $ref: '#/components/schemas/PlmnInfoList' nTNTAClist: - $ref: '#/components/schemas/NrTacList' - ephemerisInfoSet: + $ref: '#/components/schemas/NRTACList' + EphemerisInfoSet: $ref: '#/components/schemas/EphemerisInfoSet-Multiple' nTNTimeBasedConfig: $ref: '#/components/schemas/NTNTimeBasedConfig-Multiple' @@ -2251,41 +2256,41 @@ components: #-------- Definition of JSON arrays for name-contained IOCs ---------------------- - GnbDuFunction-Multiple: + GNBDUFunction-Multiple: type: array items: - $ref: '#/components/schemas/GnbDuFunction-Single' - OperatorDu-Multiple: + $ref: '#/components/schemas/GNBDUFunction-Single' + OperatorDU-Multiple: type: array items: - $ref: '#/components/schemas/OperatorDu-Single' - GnbCuUpFunction-Multiple: + $ref: '#/components/schemas/OperatorDU-Single' + GNBCUUPFunction-Multiple: type: array items: - $ref: '#/components/schemas/GnbCuUpFunction-Single' - GnbCuCpFunction-Multiple: + $ref: '#/components/schemas/GNBCUUPFunction-Single' + GNBCUCPFunction-Multiple: type: array items: - $ref: '#/components/schemas/GnbCuCpFunction-Single' + $ref: '#/components/schemas/GNBCUCPFunction-Single' BWPSet-Multiple: type: array items: $ref: '#/components/schemas/BWPSet-Single' - NrCellDu-Multiple: + NRCellDU-Multiple: type: array items: - $ref: '#/components/schemas/NrCellDu-Single' + $ref: '#/components/schemas/NRCellDU-Single' - NrOperatorCellDu-Multiple: + NROperatorCellDU-Multiple: type: array items: - $ref: '#/components/schemas/NrOperatorCellDu-Single' + $ref: '#/components/schemas/NROperatorCellDU-Single' - NrCellCu-Multiple: + NRCellCU-Multiple: type: array items: - $ref: '#/components/schemas/NrCellCu-Single' + $ref: '#/components/schemas/NRCellCU-Single' NRFrequency-Multiple: type: array @@ -2298,14 +2303,14 @@ components: items: $ref: '#/components/schemas/EUtranFrequency-Single' - NrSectorCarrier-Multiple: + NRSectorCarrier-Multiple: type: array items: - $ref: '#/components/schemas/NrSectorCarrier-Single' - Bwp-Multiple: + $ref: '#/components/schemas/NRSectorCarrier-Single' + BWP-Multiple: type: array items: - $ref: '#/components/schemas/Bwp-Single' + $ref: '#/components/schemas/BWP-Single' Beam-Multiple: type: array items: @@ -2337,22 +2342,22 @@ components: items: $ref: '#/components/schemas/RimRSSet-Single' - ExternalGnbDuFunction-Multiple: + ExternalGNBDUFunction-Multiple: type: array items: - $ref: '#/components/schemas/ExternalGnbDuFunction-Single' - ExternalGnbCuUpFunction-Multiple: + $ref: '#/components/schemas/ExternalGNBDUFunction-Single' + ExternalGNBCUUPFunction-Multiple: type: array items: - $ref: '#/components/schemas/ExternalGnbCuUpFunction-Single' - ExternalGnbCuCpFunction-Multiple: + $ref: '#/components/schemas/ExternalGNBCUUPFunction-Single' + ExternalGNBCUCPFunction-Multiple: type: array items: - $ref: '#/components/schemas/ExternalGnbCuCpFunction-Single' - ExternalNrCellCu-Multiple: + $ref: '#/components/schemas/ExternalGNBCUCPFunction-Single' + ExternalNRCellCU-Multiple: type: array items: - $ref: '#/components/schemas/ExternalNrCellCu-Single' + $ref: '#/components/schemas/ExternalNRCellCU-Single' ExternalENBFunction-Multiple: type: array @@ -2424,14 +2429,14 @@ components: resources-nrNrm: oneOf: - - $ref: '#/components/schemas/GnbDuFunction-Single' - - $ref: '#/components/schemas/GnbCuUpFunction-Single' - - $ref: '#/components/schemas/GnbCuCpFunction-Single' - - $ref: '#/components/schemas/OperatorDu-Single' + - $ref: '#/components/schemas/GNBDUFunction-Single' + - $ref: '#/components/schemas/GNBCUUPFunction-Single' + - $ref: '#/components/schemas/GNBCUCPFunction-Single' + - $ref: '#/components/schemas/OperatorDU-Single' - - $ref: '#/components/schemas/NrCellCu-Single' - - $ref: '#/components/schemas/NrCellDu-Single' - - $ref: '#/components/schemas/NrOperatorCellDu-Single' + - $ref: '#/components/schemas/NRCellCU-Single' + - $ref: '#/components/schemas/NRCellDU-Single' + - $ref: '#/components/schemas/NROperatorCellDU-Single' - $ref: '#/components/schemas/NRNetwork-Single' - $ref: '#/components/schemas/EUtraNetwork-Single' @@ -2439,8 +2444,8 @@ components: - $ref: '#/components/schemas/NRFrequency-Single' - $ref: '#/components/schemas/EUtranFrequency-Single' - - $ref: '#/components/schemas/NrSectorCarrier-Single' - - $ref: '#/components/schemas/Bwp-Single' + - $ref: '#/components/schemas/NRSectorCarrier-Single' + - $ref: '#/components/schemas/BWP-Single' - $ref: '#/components/schemas/BWPSet-Single' - $ref: '#/components/schemas/CommonBeamformingFunction-Single' - $ref: '#/components/schemas/Beam-Single' @@ -2463,10 +2468,10 @@ components: - $ref: '#/components/schemas/RimRSGlobal-Single' - $ref: '#/components/schemas/RimRSSet-Single' - - $ref: '#/components/schemas/ExternalGnbDuFunction-Single' - - $ref: '#/components/schemas/ExternalGnbCuUpFunction-Single' - - $ref: '#/components/schemas/ExternalGnbCuCpFunction-Single' - - $ref: '#/components/schemas/ExternalNrCellCu-Single' + - $ref: '#/components/schemas/ExternalGNBDUFunction-Single' + - $ref: '#/components/schemas/ExternalGNBCUUPFunction-Single' + - $ref: '#/components/schemas/ExternalGNBCUCPFunction-Single' + - $ref: '#/components/schemas/ExternalNRCellCU-Single' - $ref: '#/components/schemas/ExternalENBFunction-Single' - $ref: '#/components/schemas/ExternalEUTranCell-Single' -- GitLab From 1b1ae1a71938b2e4305df80ed1dcddda3cd0a3b5 Mon Sep 17 00:00:00 2001 From: ruiyue Date: Wed, 26 Mar 2025 03:15:12 +0000 Subject: [PATCH 426/587] Update 2 files - /OpenAPI/TS28312_IntentNrm.yaml - /OpenAPI/TS28312_IntentExpectations.yaml --- OpenAPI/TS28312_IntentExpectations.yaml | 30 +++++++------------------ OpenAPI/TS28312_IntentNrm.yaml | 9 ++++---- 2 files changed, 13 insertions(+), 26 deletions(-) diff --git a/OpenAPI/TS28312_IntentExpectations.yaml b/OpenAPI/TS28312_IntentExpectations.yaml index 03759545e..df861ada0 100644 --- a/OpenAPI/TS28312_IntentExpectations.yaml +++ b/OpenAPI/TS28312_IntentExpectations.yaml @@ -260,8 +260,11 @@ components: type: object oneOf: - $ref: '#/components/schemas/CoverageAreaPolygonContext' + - $ref: '#/components/schemas/DlFrequencyContext' + - $ref: '#/components/schemas/UlFrequencyContext' + - $ref: '#/components/schemas/CellContext' - $ref: '#/components/schemas/ServiceTypeContext' - - $ref: '#/components/schemas/PlmnInfoContext' + - $ref: '#/components/schemas/UEGroupContext' - $ref: 'TS28312_IntentNrm.yaml#/components/schemas/Context' EdgeServiceSupportExpectationObject: description: >- @@ -1020,7 +1023,7 @@ components: CellContext: description: >- This data type is the "ObjectContext" data type with specialisations for CellContext. - It describes the coverage areas for the RAN SubNetwork that the intent expectation is applied + It describes the coverage areas for the RAN SubNetwork or Radio Service that the intent expectation is applied in the form of a list of cells (including E-UTRAN cells identified by E-UTRAN-CGI and NR cells identified by NG-RAN CGI). type: object @@ -1062,7 +1065,7 @@ components: DlFrequencyContext: description: >- This data type is the "Context" data type with specialisations for Object context "DLFrequencyContext". It describes the downlink frequency information (RF reference - frequencies and/ or the frequency operating band) supported by the RAN SubNetwork that the intent expectation is applied. + frequencies and/ or the frequency operating band) supported by the RAN SubNetwork or Radio Service that the intent expectation is applied. type: object properties: contextAttribute: @@ -1081,7 +1084,7 @@ components: UlFrequencyContext: description: >- This data type is the "Context" data type with specialisations for Object context "ULFrequencyContext".It describes the uplink frequency information (RF reference - frequencies and/ or the frequency operating band) supported by the RAN SubNetwork that the intent expectation is applied. + frequencies and/ or the frequency operating band) supported by the RAN SubNetwork or Radio Service that the intent expectation is applied. type: object properties: contextAttribute: @@ -1122,7 +1125,7 @@ components: - NR UEGroupContext: description: >- - This data type is the "ObjectContext" data type with specialisations for UEGroup([5QI, SNSSAI]) + This data type is the "ObjectContext" data type with specialisations for UEGroup([5QI, SNSSAI, pLMNId]) type: object properties: contextAttribute: @@ -1407,23 +1410,6 @@ components: - IS_EQUAL_TO contextValueRange: $ref: "TS28541_NrNrm.yaml#/components/schemas/Sst" - PlmnInfoContext: - description: >- - This data type is the "ExpectationContext" data type with specialisations for PlmnInfoContext.It describes - the PLMN supported by the Radio Service that the intent expectation is applied. In case of network slicing - feature is supported, this also represents the S-NSSAI in the PLMN supported by the Radio Service. - type: object - properties: - contextAttribute: - type: string - enum: - - PlmnInfo - contextCondition: - type: string - enum: - - IS_ALL_OF - contextValueRange: - $ref: "TS28541_NrNrm.yaml#/components/schemas/PlmnInfo" SchedulingTimeContext: description: >- This data type is the "ExpectationContext" data type with specialisations for SchedulingTimeContext.It describes diff --git a/OpenAPI/TS28312_IntentNrm.yaml b/OpenAPI/TS28312_IntentNrm.yaml index ab7ff6514..8a66cce2e 100644 --- a/OpenAPI/TS28312_IntentNrm.yaml +++ b/OpenAPI/TS28312_IntentNrm.yaml @@ -295,14 +295,15 @@ components: - $ref: '#/components/schemas/UEGroup' - $ref: '#/components/schemas/Frequency' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/SchedulingTime' - - $ref: 'TS28541_NrNrm.yaml#/components/schemas/PlmnInfo' UEGroup: description: >- - It describes the UE Group, which is - represented by specific 5QI, specific S-NSSAI, or a specific combination - of S-NSSAI and 5QI + It describes the UE Group, + which is represented by specific 5QI, specific S-NSSAI, specific PLMNId or + a specific combination of S-NSSAI, 5QI and PLMNId. type: object properties: + pLMNId: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/PlmnId' fiveQI: type: integer minimum: 0 -- GitLab From 7295d2e94ed25149f80e1296ab65fa9def0ccadf Mon Sep 17 00:00:00 2001 From: ruiyue Date: Thu, 27 Mar 2025 12:28:03 +0000 Subject: [PATCH 427/587] Update file TS28312_IntentExpectations.yaml --- OpenAPI/TS28312_IntentExpectations.yaml | 27 +++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/OpenAPI/TS28312_IntentExpectations.yaml b/OpenAPI/TS28312_IntentExpectations.yaml index df861ada0..8f49b6b62 100644 --- a/OpenAPI/TS28312_IntentExpectations.yaml +++ b/OpenAPI/TS28312_IntentExpectations.yaml @@ -235,6 +235,7 @@ components: oneOf: - $ref: '#/components/schemas/CoverageAreaPolygonContext' - $ref: '#/components/schemas/CoverageTACContext' + - $ref: '#/components/schemas/TimeBasedAreaContext' - $ref: '#/components/schemas/CellContext' - $ref: '#/components/schemas/PLMNContext' - $ref: '#/components/schemas/DlFrequencyContext' @@ -1044,6 +1045,32 @@ components: oneOf: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/EutraCellId' - $ref: 'TS28623_ComDefs.yaml#/components/schemas/NrCellId' + TimeBasedAreaContext: + description: >- + This data type is the "ObjectContext" data type with specialisations for TimeBasedAreaContext. + It describes the areas for specific times for the RAN SubNetwork that the intent expectation is + applied in the form of a list. + type: object + properties: + contextAttribute: + type: string + enum: + - TimeBasedArea + contextCondition: + type: string + enum: + - IS_ALL_OF + contextValueRange: + type: array + items: + $ref: "#/components/schemas/TimeBasedArea" + TimeBasedArea: + type: object + properties: + geoArea: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/GeoArea' + timeWindow: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/TimeWindow' PLMNContext: description: >- This data type is the "ObjectContext" data type with specialisations for PLMNContext -- GitLab From f4bb9f8631c72d986079af1fe8fc79cd7bbafb06 Mon Sep 17 00:00:00 2001 From: ruiyue Date: Wed, 26 Mar 2025 14:09:21 +0000 Subject: [PATCH 428/587] Update file TS28312_IntentNrm.yaml --- OpenAPI/TS28312_IntentNrm.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/OpenAPI/TS28312_IntentNrm.yaml b/OpenAPI/TS28312_IntentNrm.yaml index 8a66cce2e..b451403a2 100644 --- a/OpenAPI/TS28312_IntentNrm.yaml +++ b/OpenAPI/TS28312_IntentNrm.yaml @@ -217,6 +217,7 @@ components: - FEASIBILITYCHECK - FULFILMENT - EXPLORATION + - FULFILMENT_WITH_NEGOTIATION default: FULFILMENT FulfilmentStatus: type: string -- GitLab From b97b346c361bdacf5133b57a0cca508eeb84685e Mon Sep 17 00:00:00 2001 From: ruiyue Date: Tue, 8 Apr 2025 19:05:43 +0000 Subject: [PATCH 429/587] Update file TS28312_IntentNrm.yaml --- OpenAPI/TS28312_IntentNrm.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/OpenAPI/TS28312_IntentNrm.yaml b/OpenAPI/TS28312_IntentNrm.yaml index b451403a2..c95e1aeb2 100644 --- a/OpenAPI/TS28312_IntentNrm.yaml +++ b/OpenAPI/TS28312_IntentNrm.yaml @@ -215,10 +215,10 @@ components: type: string enum: - FEASIBILITYCHECK - - FULFILMENT + - FULFILMENT_WITHOUT_NEGOTIATION - EXPLORATION - FULFILMENT_WITH_NEGOTIATION - default: FULFILMENT + default: FULFILMENT_WITHOUT_NEGOTIATION FulfilmentStatus: type: string readOnly: true -- GitLab From 40f625841f19ca0e8797444ca4198576bb6d7ef5 Mon Sep 17 00:00:00 2001 From: ruiyue Date: Tue, 25 Mar 2025 12:50:16 +0000 Subject: [PATCH 430/587] Update file TS28623_GenericNrm.yaml --- OpenAPI/TS28623_GenericNrm.yaml | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/OpenAPI/TS28623_GenericNrm.yaml b/OpenAPI/TS28623_GenericNrm.yaml index 89d1d35e8..cd0002be6 100755 --- a/OpenAPI/TS28623_GenericNrm.yaml +++ b/OpenAPI/TS28623_GenericNrm.yaml @@ -16,7 +16,7 @@ components: #-------- Definition of types----------------------------------------------------- - VnfParameter: + VnfParameters: type: object properties: vnfInstanceId: @@ -27,7 +27,7 @@ components: type: string autoScalable: type: boolean - PeeParameter: + PeeParameters: type: object properties: siteIdentification: @@ -41,13 +41,14 @@ components: siteAltitude: type: number format: float + siteDescription: + type: string equipmentType: type: string environmentType: type: string powerInterface: type: string - TransportProtocol: anyOf: - type: string @@ -414,12 +415,12 @@ components: type: array uniqueItems: true items: - $ref: '#/components/schemas/VnfParameter' + $ref: '#/components/schemas/VnfParameters' peeParametersList: type: array uniqueItems: true items: - $ref: '#/components/schemas/PeeParameter' + $ref: '#/components/schemas/PeeParameters' priorityLabel: type: integer supportedPerfMetricGroups: -- GitLab From 936640aefe39e145939a7358e3408001f624d634 Mon Sep 17 00:00:00 2001 From: ruiyue Date: Tue, 25 Mar 2025 12:54:34 +0000 Subject: [PATCH 431/587] Update file TS28623_GenericNrm.yaml --- OpenAPI/TS28623_GenericNrm.yaml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/OpenAPI/TS28623_GenericNrm.yaml b/OpenAPI/TS28623_GenericNrm.yaml index cd0002be6..177cccc19 100755 --- a/OpenAPI/TS28623_GenericNrm.yaml +++ b/OpenAPI/TS28623_GenericNrm.yaml @@ -17,6 +17,8 @@ components: VnfParameters: + description: -> + This <> represents the parameter set of the VNF instance(s) corresponding to an NE. type: object properties: vnfInstanceId: @@ -28,12 +30,12 @@ components: autoScalable: type: boolean PeeParameters: + description: -> + This <> represents the parameter list for the control and monitoring of power, energy and environmental parameters. type: object properties: siteIdentification: type: string - siteDescription: - type: string siteLatitude: $ref: 'TS28623_ComDefs.yaml#/components/schemas/Latitude' siteLongitude: -- GitLab From b0659e161fe0619e5a95dfd9a583382f773b5c68 Mon Sep 17 00:00:00 2001 From: ruiyue Date: Wed, 9 Apr 2025 15:03:45 +0000 Subject: [PATCH 432/587] Update file TS28623_GenericNrm.yaml --- OpenAPI/TS28623_GenericNrm.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/OpenAPI/TS28623_GenericNrm.yaml b/OpenAPI/TS28623_GenericNrm.yaml index 177cccc19..3aa14f00f 100755 --- a/OpenAPI/TS28623_GenericNrm.yaml +++ b/OpenAPI/TS28623_GenericNrm.yaml @@ -29,6 +29,7 @@ components: type: string autoScalable: type: boolean + default: FALSE PeeParameters: description: -> This <> represents the parameter list for the control and monitoring of power, energy and environmental parameters. -- GitLab From d496cf5f8f6f67e8043a5444780aa64fb0a53ebb Mon Sep 17 00:00:00 2001 From: ruiyue Date: Mon, 24 Mar 2025 07:56:13 +0000 Subject: [PATCH 433/587] Update file TS28623_SubscriptionControlNrm.yaml --- OpenAPI/TS28623_SubscriptionControlNrm.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OpenAPI/TS28623_SubscriptionControlNrm.yaml b/OpenAPI/TS28623_SubscriptionControlNrm.yaml index 83b75c6b6..a12682a94 100644 --- a/OpenAPI/TS28623_SubscriptionControlNrm.yaml +++ b/OpenAPI/TS28623_SubscriptionControlNrm.yaml @@ -83,7 +83,7 @@ components: triggerHeartbeatNtf: type: boolean default: FALSE - + writeOnly: true #-------- Definition of YAML arrays for name-contained IOCs ---------------------- NtfSubscriptionControl-Multiple: type: array -- GitLab From cbc60e62bf926796dd64dc10e9e39bada4356aa8 Mon Sep 17 00:00:00 2001 From: ruiyue Date: Sun, 23 Mar 2025 07:51:38 +0000 Subject: [PATCH 434/587] Update file TS28312_IntentNrm.yaml --- OpenAPI/TS28312_IntentNrm.yaml | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) diff --git a/OpenAPI/TS28312_IntentNrm.yaml b/OpenAPI/TS28312_IntentNrm.yaml index c95e1aeb2..41c5b355c 100644 --- a/OpenAPI/TS28312_IntentNrm.yaml +++ b/OpenAPI/TS28312_IntentNrm.yaml @@ -112,12 +112,6 @@ components: minItems: 1 items: $ref: '#/components/schemas/IntentHandlingCapability' - supportedExpectationTargetInfo: - type: array - items: - $ref: '#/components/schemas/SupportedExpectationTargetInfo' - uniqueItems: true - minItems: 1 Intent: $ref: '#/components/schemas/Intent-Multiple' IntentReport: @@ -630,20 +624,18 @@ components: - Radio_Service readOnly: true description: It describes the expectation object type which can be supported by a specific intent handling function of MnS producer. - supportedExpectationTargetNames: + supportedExpectationTargetInfos: type: array + items: + $ref: '#/components/schemas/SupportedExpectationTargetInfo' uniqueItems: true minItems: 1 - items: - type: string - readOnly: true - description: It describes the supported expectation targets for the supported expectation object type. SupportedExpectationTargetInfo: description: >- It indicates the detailed information about what the intent driven MnS producer supports for a given supportedExpectationObjectType. type: object properties: - supportedExpectationTargetName: + supportedTargetName: type: string readOnly: true supportedTargetCondition: -- GitLab From 568328ddab63bfb2ce7586cced51ceb3c7f5360e Mon Sep 17 00:00:00 2001 From: ruiyue Date: Tue, 8 Apr 2025 19:52:24 +0000 Subject: [PATCH 435/587] Update file TS28312_IntentNrm.yaml --- OpenAPI/TS28312_IntentNrm.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OpenAPI/TS28312_IntentNrm.yaml b/OpenAPI/TS28312_IntentNrm.yaml index 41c5b355c..c8e988e12 100644 --- a/OpenAPI/TS28312_IntentNrm.yaml +++ b/OpenAPI/TS28312_IntentNrm.yaml @@ -624,7 +624,7 @@ components: - Radio_Service readOnly: true description: It describes the expectation object type which can be supported by a specific intent handling function of MnS producer. - supportedExpectationTargetInfos: + supportedExpectationTargetInfoList: type: array items: $ref: '#/components/schemas/SupportedExpectationTargetInfo' -- GitLab From 3e95f8af9e5418cf2c49910f46420f81e9aaff3a Mon Sep 17 00:00:00 2001 From: ruiyue Date: Sun, 23 Mar 2025 06:34:15 +0000 Subject: [PATCH 436/587] Update file TS28623_MnSRegistryNrm.yaml --- OpenAPI/TS28623_MnSRegistryNrm.yaml | 24 +++++++++++++++++++----- 1 file changed, 19 insertions(+), 5 deletions(-) diff --git a/OpenAPI/TS28623_MnSRegistryNrm.yaml b/OpenAPI/TS28623_MnSRegistryNrm.yaml index 70e245c10..4c525b6c3 100644 --- a/OpenAPI/TS28623_MnSRegistryNrm.yaml +++ b/OpenAPI/TS28623_MnSRegistryNrm.yaml @@ -53,15 +53,29 @@ components: $ref: 'TS28623_ComDefs.yaml#/components/schemas/UriRo' mnsScope: description: >- - List of the managed object instances that can be accessed using the MnS. - If a complete SubNetwork can be accessed using the MnS, this attribute may - contain the DN of the SubNetwork instead of the DNs of the individual managed - entities within the SubNetwork. + It is used to provide information about the management scope of the Management Service. The management scope is + used to represent the set of managed object instances that can be accessed using the Management Service. type: array uniqueItems: true items: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' + $ref: '#/components/schemas/MnsScope' minItems: 1 + MnsScope: + description: -> + It defines the information about the management scope of the Management Service. + oneOf: + - type: array + uniqueItems: true + items: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' + - type: array + uniqueItems: true + items: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/GeoArea' + - type: array + uniqueItems: true + items: + $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Tai' #-------- Definition of YAML arrays for name-contained IOCs ---------------------- -- GitLab From bf4b041fef4259da1c0d636903090eda509a2a97 Mon Sep 17 00:00:00 2001 From: ruiyue Date: Sun, 23 Mar 2025 07:21:42 +0000 Subject: [PATCH 437/587] Update file TS28623_MnSRegistryNrm.yaml --- OpenAPI/TS28623_MnSRegistryNrm.yaml | 40 ++++++++++++++++++++++++++++- 1 file changed, 39 insertions(+), 1 deletion(-) diff --git a/OpenAPI/TS28623_MnSRegistryNrm.yaml b/OpenAPI/TS28623_MnSRegistryNrm.yaml index 4c525b6c3..e2db3186f 100644 --- a/OpenAPI/TS28623_MnSRegistryNrm.yaml +++ b/OpenAPI/TS28623_MnSRegistryNrm.yaml @@ -22,7 +22,38 @@ components: #-------Definition of generic IOCs ----------# #-------- Definition of types----------------------------------------------------- - + MnsCapability: + type: string + enum: + - NR_PROVISIONING + - 5GC_PROVISIONING + - NETWORK_SLICING_PROVISIONING + - EDGE_COMPUTING_PROVISIONING + - PERFORMANCE_METRIC_COLLECTION_CONTROL + - PERFORMANCE_METRIC_DATA_REPORT + - PERFORMANCE_METRIC_THRESHOLD_MONITOR_CONTROL + - PERFORMANCE_METRIC_THRESHOLD_NOTIFICATION + - FAULT_CONTROL + - FAULT_NOTIFICATION + - TRACE_MDT_DATA_COLLECTION_CONTROL + - TRACE_MDT_DATA_REPORT + - QOE_DATA_COLLECTION_CONTROL + - QOE_DATA_REPORT + - FILE_RETRIEVAL + - FILE_DOWNLOAD + - SUBSCRIPTION_CONTROL + - HEARTBEAT_CONTROL + - HEARTBEAT_NOTIFICATION + - ML_MODEL_MANAGEMENT + - MANAGEMENT DATA ANALYTIC + - RANSC_MANAGEMENT + - SON_POLICY + - COMMUNICATION_SERVICE_ASSURANCE_CONTROL + - INTENT_DRIVEN_MANAGEMENT + - ML_MODEL_MANAGEMENT + - MNS_REGISTRY_AND_DISCOVERY + - MNS_ACCESS_CONTROL_MANAGEMENT + - DSO_RAPID_RECOVERY_AND_THRESHOLD MONITORING #-------- Definition of concrete IOCs -------------------------------------------- MnsRegistry-Single: allOf: @@ -51,6 +82,13 @@ components: mnsAddress: description: Resource URI as defined in the relevant Technical Specification $ref: 'TS28623_ComDefs.yaml#/components/schemas/UriRo' + mnsCapability: + description: >- + It describes the types of management capabilities of the MnS instance provided by the MnS producer. + type: array + uniqueItems: true + items: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/MnsCapability' mnsScope: description: >- It is used to provide information about the management scope of the Management Service. The management scope is -- GitLab From 48c5a4b0f57e6c5784a8509e320322802759c053 Mon Sep 17 00:00:00 2001 From: ruiyue Date: Sun, 23 Mar 2025 07:24:28 +0000 Subject: [PATCH 438/587] Update file TS28623_MnSRegistryNrm.yaml --- OpenAPI/TS28623_MnSRegistryNrm.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OpenAPI/TS28623_MnSRegistryNrm.yaml b/OpenAPI/TS28623_MnSRegistryNrm.yaml index e2db3186f..a8f703886 100644 --- a/OpenAPI/TS28623_MnSRegistryNrm.yaml +++ b/OpenAPI/TS28623_MnSRegistryNrm.yaml @@ -88,7 +88,7 @@ components: type: array uniqueItems: true items: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/MnsCapability' + $ref: '#/components/schemas/MnsCapability' mnsScope: description: >- It is used to provide information about the management scope of the Management Service. The management scope is -- GitLab From fc67eb36e31dd91aab1a8a84be3932a8ee9ae9e1 Mon Sep 17 00:00:00 2001 From: ruiyue Date: Wed, 9 Apr 2025 09:50:58 +0000 Subject: [PATCH 439/587] Update file TS28623_MnSRegistryNrm.yaml --- OpenAPI/TS28623_MnSRegistryNrm.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OpenAPI/TS28623_MnSRegistryNrm.yaml b/OpenAPI/TS28623_MnSRegistryNrm.yaml index a8f703886..07f286080 100644 --- a/OpenAPI/TS28623_MnSRegistryNrm.yaml +++ b/OpenAPI/TS28623_MnSRegistryNrm.yaml @@ -82,7 +82,7 @@ components: mnsAddress: description: Resource URI as defined in the relevant Technical Specification $ref: 'TS28623_ComDefs.yaml#/components/schemas/UriRo' - mnsCapability: + mnsCapabilities: description: >- It describes the types of management capabilities of the MnS instance provided by the MnS producer. type: array -- GitLab From 949d52955a31248e9db505fd0571a3c9e6923289 Mon Sep 17 00:00:00 2001 From: ruiyue Date: Thu, 10 Apr 2025 06:05:50 +0000 Subject: [PATCH 440/587] Update file TS28623_MnSRegistryNrm.yaml --- OpenAPI/TS28623_MnSRegistryNrm.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OpenAPI/TS28623_MnSRegistryNrm.yaml b/OpenAPI/TS28623_MnSRegistryNrm.yaml index 07f286080..a8f703886 100644 --- a/OpenAPI/TS28623_MnSRegistryNrm.yaml +++ b/OpenAPI/TS28623_MnSRegistryNrm.yaml @@ -82,7 +82,7 @@ components: mnsAddress: description: Resource URI as defined in the relevant Technical Specification $ref: 'TS28623_ComDefs.yaml#/components/schemas/UriRo' - mnsCapabilities: + mnsCapability: description: >- It describes the types of management capabilities of the MnS instance provided by the MnS producer. type: array -- GitLab From 603548060e53abf8e9af2db16655ba0b372c1d5c Mon Sep 17 00:00:00 2001 From: Jan Groenendijk Date: Wed, 26 Mar 2025 17:05:04 +0000 Subject: [PATCH 441/587] Update TS28541_5GcNrm with additional pccRuleSet attributes --- OpenAPI/TS28541_5GcNrm.yaml | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/OpenAPI/TS28541_5GcNrm.yaml b/OpenAPI/TS28541_5GcNrm.yaml index df1cc353d..6dddac95e 100755 --- a/OpenAPI/TS28541_5GcNrm.yaml +++ b/OpenAPI/TS28541_5GcNrm.yaml @@ -751,6 +751,19 @@ components: $ref: 'TS29514_Npcf_PolicyAuthorization.yaml#/components/schemas/TscaiInputContainer' tscaiInputUl: $ref: 'TS29514_Npcf_PolicyAuthorization.yaml#/components/schemas/TscaiInputContainer' + easRedisInd: + type: boolean + default: false + tscaiTimeDom: + type: integer + capBatAdaptation: + type: boolean + default: false + disUeNotif: + type: boolean + default: false + packFiltAllPrec: + type: integer SnssaiInfo: type: object -- GitLab From 8c22b39573a9ff132929e3172dd68146d687de6a Mon Sep 17 00:00:00 2001 From: scottma Date: Wed, 16 Apr 2025 12:52:10 +0000 Subject: [PATCH 442/587] Rel19_CR0379_TS28.532_Enhance_notifyFilePreparationError_definition_yaml --- OpenAPI/TS28532_FileDataReportingMnS.yaml | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/OpenAPI/TS28532_FileDataReportingMnS.yaml b/OpenAPI/TS28532_FileDataReportingMnS.yaml index 4138a3c11..7a324b4a2 100644 --- a/OpenAPI/TS28532_FileDataReportingMnS.yaml +++ b/OpenAPI/TS28532_FileDataReportingMnS.yaml @@ -203,6 +203,17 @@ components: type: string fileDataType: $ref: '#/components/schemas/FileDataType' + jobId: + type: string + FileCreationErrorInfoList: + type: object + properties: + fileLocation: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/Uri' + fileDataType: + $ref: '#/components/schemas/FileDataType' + jobId: + type: string NotifyFileReady: allOf: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/NotificationHeader' @@ -222,7 +233,7 @@ components: fileInfoList: type: array items: - $ref: '#/components/schemas/FileInfo' + $ref: '#/components/schemas/FileCreationErrorInfoList' reason: type: string additionalText: -- GitLab From abefe0a80772f4112c850f8da96bf93608b965b9 Mon Sep 17 00:00:00 2001 From: sunse Date: Fri, 9 May 2025 17:02:46 +0800 Subject: [PATCH 443/587] Rel19 CR1528 TS 28.541 NRM enhancement cleanup --- OpenAPI/TS28541_5GcNrm.yaml | 2 ++ OpenAPI/TS28541_NrNrm.yaml | 4 +++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/OpenAPI/TS28541_5GcNrm.yaml b/OpenAPI/TS28541_5GcNrm.yaml index 6dddac95e..d588396cc 100755 --- a/OpenAPI/TS28541_5GcNrm.yaml +++ b/OpenAPI/TS28541_5GcNrm.yaml @@ -162,8 +162,10 @@ components: properties: featureName: type: string + readOnly: true featureVersion: type: string + readOnly: true NFStatus: type: string description: any of enumerated value diff --git a/OpenAPI/TS28541_NrNrm.yaml b/OpenAPI/TS28541_NrNrm.yaml index 64413f14c..99bb35ef4 100755 --- a/OpenAPI/TS28541_NrNrm.yaml +++ b/OpenAPI/TS28541_NrNrm.yaml @@ -2210,13 +2210,15 @@ components: administrativeState: $ref: 'TS28623_ComDefs.yaml#/components/schemas/AdministrativeState' operationalState: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/OperationalState' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/OperationalState' allowedArea: type: array + uniqueItems: true items: $ref: 'TS28623_ComDefs.yaml#/components/schemas/GeoArea' allowedTime: type: array + uniqueItems: true items: $ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTime' -- GitLab From 112445d6125c74099c3bc6d99a94755d48121e59 Mon Sep 17 00:00:00 2001 From: sunse Date: Fri, 23 May 2025 11:31:11 +0800 Subject: [PATCH 444/587] Rel19 CR0125 TS28.104 adding the new MDAType and correct the value format --- OpenAPI/TS28104_MdaNrm.yaml | 42 +++++++++++++++++++++---------------- 1 file changed, 24 insertions(+), 18 deletions(-) diff --git a/OpenAPI/TS28104_MdaNrm.yaml b/OpenAPI/TS28104_MdaNrm.yaml index af908cdce..4577e1a28 100644 --- a/OpenAPI/TS28104_MdaNrm.yaml +++ b/OpenAPI/TS28104_MdaNrm.yaml @@ -17,24 +17,30 @@ components: MDAType: type: string enum: - - COVERAGEANALYTICS_COVERAGEPROBLEMANALYSIS - - COVERAGEANALYTICS_PAGINGOPTIMIZATION - - SLSANALYSIS_SERVICEEXPERIENCEANALYSIS - - SLSANALYSIS_NETWORKSLICETHROUGHPUTANALYSIS - - SLSANALYSIS_NETWORKSLICETRAFFICANALYSIS - - SLSANALYSIS_E2ELATENCYANALYSIS - - SLSANALYSIS_NETWORKSLICELOADANALYSIS - - MDAASSISTEDFAULTMANAGEMENT_FAILUREPREDICTION - - MDAASSISTEDENERGYSAVING_ENERGYSAVINGANALYSIS - - MOBILITYMANAGEMENTANALYTICS_MOBILITYPERFORMANCEANALYSIS - - MOBILITYMANAGEMENTANALYTICS_HANDOVEROPTIMIZATION - - MAINTENANCE_MAINTENANCEANALYTICS - - RESOURCEANALYTICS_VIRTUALIZEDRESOURCEUTILIZATIONANALYSISNF - - RESOURCEANALYTICS_PHYISCALRESOURCEUTILIZATIONANALYSISNF - - RESOURCEANALYTICS_5GCCONTROLPLANECONGESTIONANALYSIS - - PREDICTIONS_PMDATA - - UETHROUGHPUTANALYSIS_TRAFFICCONGESTIONPROBLEMANALYSIS - + - COVERAGE_ANALYTICS_COVERAGE_PROBLEM_ANALYSIS + - COVERAGE_ANALYTICS_PAGING_OPTIMIZATION + - SLS_ANALYSIS_SERVICE_EXPERIENCE_ANALYSIS + - SLS_ANALYSIS_NETWORK_SLICE_THROUGHPUT_ANALYSIS + - SLS_ANALYSIS_NETWORK_SLICE_TRAFFIC_ANALYSIS + - SLS_ANALYSIS_E2E_LATENCY_ANALYSIS + - SLS_ANALYSIS_NETWORK_SLICE_LOAD_ANALYSIS + - SLS_ANALYSIS_EDGE_APPLICATION_DEPLOYMENT_LOCATION_ANALYSIS + - SLS_ANALYSIS_EDGE_COMPUTING_PERFORMANCE_ANALYSIS + - SLS_ANALYSIS_TRAFFIC_CONGESTION_PREDICTION_ANALYSIS + - MDA_ASSISTED_FAULT_MANAGEMENT_FAILURE_PREDICTION + - MDA_ASSISTED_ENERGY_SAVING_ENERGY_SAVING_ANALYSIS + - MOBILITY_MANAGEMENT_ANALYTICS_MOBILITY_PERFORMANCE_ANALYSIS + - MOBILITY_MANAGEMENT_ANALYTICS_HANDOVER_OPTIMIZATION + - MAINTENANCE_MAINTENANCE_ANALYTICS + - MAINTENANCE_SOFTWARE_UPGRADE_VALIDATION_ANALYTICS + - RESOURCE_ANALYTICS_VIRTUALIZED_RESOURCE_UTILIZATION_ANALYSIS_NF + - RESOURCE_ANALYTICS_PHYSICAL_RESOURCE_UTILIZATION_ANALYSIS_NF + - RESOURCE_ANALYTICS_5GC_CONTROL_PLANE_CONGESTION_ANALYSIS + - PREDICTIONS_PM_DATA + - UE_THROUGHPUT_ANALYSIS_TRAFFIC_CONGESTION_PROBLEM_ANALYSIS + - CORRELATION_ANALYTICS_TRAINING_DATA_ANALYSIS + - CORRELATION_ANALYTICS_NF_SCALING_DIMENSIONING_DATA_ANALYSIS + MDATypes: type: array -- GitLab From 8916d73aa627f4d2a43b42107443aac1163800f4 Mon Sep 17 00:00:00 2001 From: sunse Date: Fri, 23 May 2025 11:33:47 +0800 Subject: [PATCH 445/587] Rel19 CR0214 TS28.104 enhancement to stage 2 and stage 3 for clause 8 --- OpenAPI/TS28104_MdaReport.yaml | 34 ++++++++++++++++++++++++++++++---- 1 file changed, 30 insertions(+), 4 deletions(-) diff --git a/OpenAPI/TS28104_MdaReport.yaml b/OpenAPI/TS28104_MdaReport.yaml index 46eaca579..942a1cb6f 100644 --- a/OpenAPI/TS28104_MdaReport.yaml +++ b/OpenAPI/TS28104_MdaReport.yaml @@ -14,6 +14,30 @@ components: schemas: #-------- Definition of types----------------------------------------------------- + ProjectionDuration: + type: object + properties: + fromTime: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTime' + toTime: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTime' + PagingOptimizationAnalysisOutput: + type: object + properties: + oOCDuration: + $ref: '#/components/schemas/ProjectionDuration' + oOCLocation: + type: array + uniqueItems: true + items: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/GeoCoordinate' + minItems: 1 + oOCMap: + type: array + uniqueItems: true + items: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/GeoArea' + minItems: 1 MDAOutputs: type: object @@ -21,10 +45,12 @@ components: mDAType: $ref: 'TS28104_MdaNrm.yaml#/components/schemas/MDAType' mDAOutputList: - type: array - uniqueItems: true - items: - $ref: '#/components/schemas/MDAOutputEntry' + oneOf: + - $ref: '#/components/schemas/PagingOptimizationAnalysisOutput' + - type: array + uniqueItems: true + items: + $ref: '#/components/schemas/MDAOutputEntry' analyticsWindow: $ref: 'TS28623_ComDefs.yaml#/components/schemas/TimeWindowRo' confidenceDegree: -- GitLab From 4a16c6ad37415a18551077fda9263de26e1f2912 Mon Sep 17 00:00:00 2001 From: Pengxiang Xie Date: Sat, 24 May 2025 07:37:05 +0800 Subject: [PATCH 446/587] Rel19_CR1531_TS_28.541_Enhancements_on_NRFFunction_to_support_hierarchical_NRF_scenario --- OpenAPI/TS28541_5GcNrm.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/OpenAPI/TS28541_5GcNrm.yaml b/OpenAPI/TS28541_5GcNrm.yaml index d588396cc..706292303 100755 --- a/OpenAPI/TS28541_5GcNrm.yaml +++ b/OpenAPI/TS28541_5GcNrm.yaml @@ -4170,6 +4170,8 @@ components: $ref: '#/components/schemas/NFProfileList' nrfInfo: $ref: '#/components/schemas/NrfInfo' + managedNFProfile: + $ref: '#/components/schemas/ManagedNFProfile' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' - $ref: '#/components/schemas/ManagedFunction5GC-nc0' - type: object -- GitLab From f6bfd745999d31fb4a16fbc3ee3b643e28a8b55f Mon Sep 17 00:00:00 2001 From: ruiyue Date: Thu, 8 May 2025 05:29:15 +0000 Subject: [PATCH 447/587] Update file TS28532_ProvMnS.yaml --- OpenAPI/TS28532_ProvMnS.yaml | 35 +++++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) diff --git a/OpenAPI/TS28532_ProvMnS.yaml b/OpenAPI/TS28532_ProvMnS.yaml index 6c23bf257..c8fcab2e0 100755 --- a/OpenAPI/TS28532_ProvMnS.yaml +++ b/OpenAPI/TS28532_ProvMnS.yaml @@ -357,6 +357,41 @@ paths: application/json: schema: $ref: 'TS28623_ComDefs.yaml#/components/schemas/ErrorResponseDefault' + '/{URI-LDN-first-part}': + parameters: + - name: URI-LDN-first-part + in: path + required: true + schema: + type: string + post: + summary: Creates a complete single resource + description: >- + With HTTP POST a complete single resource is created. The identifier of the new + resource is assigned by the MnS producer. + requestBody: + required: true + content: + application/json: + schema: + $ref: '#/components/schemas/Resource' + responses: + '201': + description: >- + Success case ("201 Created"). + This status code shall be returned when the resource is created. + The representation of the created resource is returned in the response + message body. + content: + application/json: + schema: + $ref: '#/components/schemas/Resource' + default: + description: Error case. + content: + application/json: + schema: + $ref: 'comDefs.yaml#/components/schemas/ErrorResponse' components: schemas: CmNotificationTypes: -- GitLab From 1941137a0c1cd6260f51b179dbf900b97b407779 Mon Sep 17 00:00:00 2001 From: ruiyue Date: Thu, 8 May 2025 05:34:43 +0000 Subject: [PATCH 448/587] Update file TS28532_ProvMnS.yaml --- OpenAPI/TS28532_ProvMnS.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OpenAPI/TS28532_ProvMnS.yaml b/OpenAPI/TS28532_ProvMnS.yaml index c8fcab2e0..314e23377 100755 --- a/OpenAPI/TS28532_ProvMnS.yaml +++ b/OpenAPI/TS28532_ProvMnS.yaml @@ -391,7 +391,7 @@ paths: content: application/json: schema: - $ref: 'comDefs.yaml#/components/schemas/ErrorResponse' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/ErrorResponseDefault' components: schemas: CmNotificationTypes: -- GitLab From aeae71abc5aa6330270a6e62ded4138aa536defb Mon Sep 17 00:00:00 2001 From: ruiyue Date: Wed, 7 May 2025 03:59:39 +0000 Subject: [PATCH 449/587] Update file TS28541_NrNrm.yaml --- OpenAPI/TS28541_NrNrm.yaml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/OpenAPI/TS28541_NrNrm.yaml b/OpenAPI/TS28541_NrNrm.yaml index 99bb35ef4..fbae5ac5a 100755 --- a/OpenAPI/TS28541_NrNrm.yaml +++ b/OpenAPI/TS28541_NrNrm.yaml @@ -2216,11 +2216,13 @@ components: uniqueItems: true items: $ref: 'TS28623_ComDefs.yaml#/components/schemas/GeoArea' + uniqueItems: true allowedTime: type: array uniqueItems: true items: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTime' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/TimeWindow' + uniqueItems: true NRECMappingRule-Single: allOf: -- GitLab From b347221ef1057d101bd9b29c1c723ddfb9b08c3c Mon Sep 17 00:00:00 2001 From: ruiyue Date: Mon, 26 May 2025 03:48:45 +0000 Subject: [PATCH 450/587] Update file TS28541_NrNrm.yaml --- OpenAPI/TS28541_NrNrm.yaml | 2 -- 1 file changed, 2 deletions(-) diff --git a/OpenAPI/TS28541_NrNrm.yaml b/OpenAPI/TS28541_NrNrm.yaml index fbae5ac5a..fb17b0687 100755 --- a/OpenAPI/TS28541_NrNrm.yaml +++ b/OpenAPI/TS28541_NrNrm.yaml @@ -2216,13 +2216,11 @@ components: uniqueItems: true items: $ref: 'TS28623_ComDefs.yaml#/components/schemas/GeoArea' - uniqueItems: true allowedTime: type: array uniqueItems: true items: $ref: 'TS28623_ComDefs.yaml#/components/schemas/TimeWindow' - uniqueItems: true NRECMappingRule-Single: allOf: -- GitLab From 7466b056c91dc37e13135b4387dd3bad2e289129 Mon Sep 17 00:00:00 2001 From: ruiyue Date: Tue, 6 May 2025 12:23:31 +0000 Subject: [PATCH 451/587] Update file TS28623_ComDefs.yaml --- OpenAPI/TS28623_ComDefs.yaml | 46 +++++++++++------------------------- 1 file changed, 14 insertions(+), 32 deletions(-) diff --git a/OpenAPI/TS28623_ComDefs.yaml b/OpenAPI/TS28623_ComDefs.yaml index 3742ff064..a07f5c6ca 100755 --- a/OpenAPI/TS28623_ComDefs.yaml +++ b/OpenAPI/TS28623_ComDefs.yaml @@ -128,39 +128,21 @@ components: type: string pattern: '^[A-Fa-f0-9]{9}$' TimeWindow: - description: This datatype is used for writable attribute - oneOf: - - type: object - properties: - startTime: - $ref: '#/components/schemas/DateTime' - endTime: - $ref: '#/components/schemas/DateTime' - - type: object - properties: - startTime: - $ref: '#/components/schemas/DateTime' - - type: object - properties: - endTime: - $ref: '#/components/schemas/DateTime' + description: This datatype is used for writable attribute + type: object + properties: + startTime: + $ref: '#/components/schemas/DateTime' + endTime: + $ref: '#/components/schemas/DateTime' TimeWindowRo: - description: This datatype is used for readOnly attribute - oneOf: - - type: object - properties: - startTime: - $ref: '#/components/schemas/DateTimeRo' - endTime: - $ref: '#/components/schemas/DateTimeRo' - - type: object - properties: - startTime: - $ref: '#/components/schemas/DateTimeRo' - - type: object - properties: - endTime: - $ref: '#/components/schemas/DateTimeRo' + description: This datatype is used for readOnly attribute + type: object + properties: + startTime: + $ref: '#/components/schemas/DateTimeRo' + endTime: + $ref: '#/components/schemas/DateTimeRo' GeoCoordinate: type: object properties: -- GitLab From f91dd98ed22d3f96a61ad1f73be7c64680055f39 Mon Sep 17 00:00:00 2001 From: ruiyue Date: Tue, 6 May 2025 01:52:30 +0000 Subject: [PATCH 452/587] Update 2 files - /OpenAPI/TS28312_IntentNrm.yaml - /OpenAPI/TS28312_IntentExpectations.yaml --- OpenAPI/TS28312_IntentExpectations.yaml | 12 ++++++------ OpenAPI/TS28312_IntentNrm.yaml | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/OpenAPI/TS28312_IntentExpectations.yaml b/OpenAPI/TS28312_IntentExpectations.yaml index 8f49b6b62..b482c1bc3 100644 --- a/OpenAPI/TS28312_IntentExpectations.yaml +++ b/OpenAPI/TS28312_IntentExpectations.yaml @@ -224,7 +224,7 @@ components: objectType: type: string enum: - - RAN_SubNetwork + - RAN_SUBNETWORK objectInstance: $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' objectContexts: @@ -251,7 +251,7 @@ components: objectType: type: string enum: - - Radio_Service + - RADIO_SERVICE objectInstance: $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' objectContexts: @@ -275,7 +275,7 @@ components: objectType: type: string enum: - - EdgeService_Support #value for Edge Service Support Expectation--# + - EDGE_SERVICE_SUPPORT #value for Edge Service Support Expectation--# objectInstance: $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' objectContexts: @@ -296,7 +296,7 @@ components: objectType: type: string enum: - - 5GC_SubNetwork #value for 5GC Network Expectation--# + - 5GC_SUBNETWORK #value for 5GC Network Expectation--# objectInstance: $ref: "TS28623_ComDefs.yaml#/components/schemas/Dn" objectContexts: @@ -787,7 +787,7 @@ components: enum: - IS_GREATER_THAN targetValueRange: - $ref: 'TS28541_SliceNrm.yaml#/components/schemas/XLThpt' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/Float' ULThptPerUETarget: description: >- This data type is the "ExpectationTarget" data type with specialisations for ULThptPerUETarget.It describes the UL throughput target by the per UE for the edge @@ -803,7 +803,7 @@ components: enum: - IS_GREATER_THAN targetValueRange: - $ref: 'TS28541_SliceNrm.yaml#/components/schemas/XLThpt' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/Float' DLLatencyTarget: description: >- This data type is the "ExpectationTarget" data type with specialisations for DLLatencyTarget.It describes the DL latency target for the edge service supporting or radio service diff --git a/OpenAPI/TS28312_IntentNrm.yaml b/OpenAPI/TS28312_IntentNrm.yaml index c8e988e12..cc076da9f 100644 --- a/OpenAPI/TS28312_IntentNrm.yaml +++ b/OpenAPI/TS28312_IntentNrm.yaml @@ -168,7 +168,7 @@ components: - RAN_SUBNETWORK #value for Radio Network Expectation--# - EDGE_SERVICE_SUPPORT #value for Edge Service Support Expectation--# - 5GC_SUBNETWORK #value for 5GC Network Expectation--# - - Radio_Service #value for Radio Service Expectation--# + - RADIO_SERVICE #value for Radio Service Expectation--# - SUBNETWORK #value for Network Maintenance Expectation--# objectInstance: $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' @@ -621,7 +621,7 @@ components: - RAN_SUBNETWORK - EDGE_SERVICE_SUPPORT - 5GC_SUBNETWORK - - Radio_Service + - RADIO_SERVICE readOnly: true description: It describes the expectation object type which can be supported by a specific intent handling function of MnS producer. supportedExpectationTargetInfoList: -- GitLab From 35cb7832907cfeba90114f7cee95cf0bdfd78d9f Mon Sep 17 00:00:00 2001 From: ruiyue Date: Fri, 9 May 2025 06:10:20 +0000 Subject: [PATCH 453/587] Update file TS28312_IntentExpectations.yaml --- OpenAPI/TS28312_IntentExpectations.yaml | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/OpenAPI/TS28312_IntentExpectations.yaml b/OpenAPI/TS28312_IntentExpectations.yaml index b482c1bc3..d1279f2b4 100644 --- a/OpenAPI/TS28312_IntentExpectations.yaml +++ b/OpenAPI/TS28312_IntentExpectations.yaml @@ -266,6 +266,7 @@ components: - $ref: '#/components/schemas/CellContext' - $ref: '#/components/schemas/ServiceTypeContext' - $ref: '#/components/schemas/UEGroupContext' + - $ref: '#/components/schemas/GeoCoordinateContext' - $ref: 'TS28312_IntentNrm.yaml#/components/schemas/Context' EdgeServiceSupportExpectationObject: description: >- @@ -1089,6 +1090,22 @@ components: uniqueItems: true items: $ref: 'TS28623_ComDefs.yaml#/components/schemas/PlmnId' + GeoCoordinateContext: + description: >- + This data type is the "ObjectContext" data type with specialisations for GeoCoordinateContext. + It describes the location (i.e. geocoordinate) that radio service intent is applied. + type: object + properties: + contextAttribute: + type: string + enum: + - GeoCoordinate + contextCondition: + type: string + enum: + - IS_EQUAL_TO + contextValueRange: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/GeoCoordinate' DlFrequencyContext: description: >- This data type is the "Context" data type with specialisations for Object context "DLFrequencyContext". It describes the downlink frequency information (RF reference -- GitLab From 0b60fb99037ee236f49d6cb05d306d2fafa23e4a Mon Sep 17 00:00:00 2001 From: ruiyue Date: Tue, 29 Apr 2025 04:14:39 +0000 Subject: [PATCH 454/587] Update file TS28312_IntentNrm.yaml --- OpenAPI/TS28312_IntentNrm.yaml | 92 ++++++++++++++++++++++++++++++++++ 1 file changed, 92 insertions(+) diff --git a/OpenAPI/TS28312_IntentNrm.yaml b/OpenAPI/TS28312_IntentNrm.yaml index cc076da9f..b64160b6f 100644 --- a/OpenAPI/TS28312_IntentNrm.yaml +++ b/OpenAPI/TS28312_IntentNrm.yaml @@ -94,6 +94,8 @@ components: $ref: '#/components/schemas/IntentFeasibilityCheckReport' intentExplorationReport: $ref: '#/components/schemas/IntentExplorationReport' + intentFulfilmentNegotiationReport: + $ref: '#/components/schemas/IntentFulfilmentNegotiationReport' lastUpdatedTime: $ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTimeRo' intentReference: @@ -605,6 +607,96 @@ components: minItems: 1 #-------Definition of the generic IntentExplorationReport dataType----------------# + + + #-------Definition of the generic IntentFulfilmentNegotiationReport dataType----------------# + IntentFulfilmentNegotiationReport: + description: >- + It represents the intent negotiation information during fulfilment phase + This attribute shall be supported when intent fulfilment negotiation information is supported by IntentReport + type: object + properties: + possibleIntentOutcomeList: + type: array + items: + $ref: '#/components/schemas/PossibleIntentOutcome' + uniqueItems: true + minItems: 1 + intentFulfilmentNegotiationConsumerFeedback: + $ref: '#/components/schemas/IntentFulfilmentNegotiationFeedback' + implicitIntent: + $ref: '#/components/schemas/ImplicitIntent' + PossibleIntentOutcome: + description: >- + It represents a single outcome evaluated by the MnS producer + type: object + properties: + possibleIntentOutcomeId: + type: integer + readOnly: true + intentFulfilmentInfo: + type: array + items: + $ref: '#/components/schemas/FulfilmentInfo' + uniqueItems: true + minItems: 1 + expectationFulfilmentResults: + type: array + items: + $ref: '#/components/schemas/ExpectationFulfilmentResult' + uniqueItems: true + minItems: 1 + possibleImpact: + type: array + items: + $ref: '#/components/schemas/PossibleImpact' + uniqueItems: true + minItems: 1 + PossibleImpact: + description: >- + It represents the possible impact of the possible outcome + type: object + properties: + impactedObjects: + type: array + items: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnRo' + uniqueItems: true + minItems: 1 + impactedAttributes: + type: array + items: + $ref: 'S28623_ComDefs.yaml#/components/schemas/AttributeNameValuePairSet' + uniqueItems: true + minItems: 1 + IntentFulfilmentNegotiationFeedback: + description: >- + It represents the feedback information that the MnS consumer provides to the + MnS producer as response during intent fulfilment Negotiation. + type: object + properties: + referredIntentOutcomeId: + type: integer + consumerSatisfactionIndex: + type: integer + ImplicitIntent: + description: >- + It represents the implicit intent which includes the information + that MnS consumers have not explicitly pointed out in its intent. + type: object + properties: + implicitIntentExpectations: + type: array + items: + $ref: '#/components/schemas/IntentExpectation' + implicitIntentContexts: + type: array + items: + $ref: '#/components/schemas/Context' + + #-------Definition of the generic IntentFulfilmentNegotiationReport dataType----------------# + + #-------Definition of the generic IntentHandlingCapability dataType----------------# IntentHandlingCapability: description: >- -- GitLab From f32637c160cae4245cc04c74798794310bae4a7d Mon Sep 17 00:00:00 2001 From: ruiyue Date: Tue, 29 Apr 2025 04:18:01 +0000 Subject: [PATCH 455/587] Update file TS28312_IntentNrm.yaml --- OpenAPI/TS28312_IntentNrm.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OpenAPI/TS28312_IntentNrm.yaml b/OpenAPI/TS28312_IntentNrm.yaml index b64160b6f..3cdce9b9c 100644 --- a/OpenAPI/TS28312_IntentNrm.yaml +++ b/OpenAPI/TS28312_IntentNrm.yaml @@ -666,7 +666,7 @@ components: impactedAttributes: type: array items: - $ref: 'S28623_ComDefs.yaml#/components/schemas/AttributeNameValuePairSet' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/AttributeNameValuePairSet' uniqueItems: true minItems: 1 IntentFulfilmentNegotiationFeedback: -- GitLab From de3a5452f111e19cbd9c01adbf721de85fcfd36d Mon Sep 17 00:00:00 2001 From: ruiyue Date: Wed, 30 Apr 2025 01:51:38 +0000 Subject: [PATCH 456/587] Update file TS28312_IntentNrm.yaml --- OpenAPI/TS28312_IntentNrm.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/OpenAPI/TS28312_IntentNrm.yaml b/OpenAPI/TS28312_IntentNrm.yaml index 3cdce9b9c..f345e4cbe 100644 --- a/OpenAPI/TS28312_IntentNrm.yaml +++ b/OpenAPI/TS28312_IntentNrm.yaml @@ -662,13 +662,13 @@ components: items: $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnRo' uniqueItems: true - minItems: 1 + minItems: 1 impactedAttributes: type: array items: $ref: 'TS28623_ComDefs.yaml#/components/schemas/AttributeNameValuePairSet' uniqueItems: true - minItems: 1 + minItems: 1 IntentFulfilmentNegotiationFeedback: description: >- It represents the feedback information that the MnS consumer provides to the -- GitLab From e85c758f780e6e8ff840334254417431e3328337 Mon Sep 17 00:00:00 2001 From: ruiyue Date: Fri, 16 May 2025 00:41:10 +0000 Subject: [PATCH 457/587] Update file TS28312_IntentNrm.yaml --- OpenAPI/TS28312_IntentNrm.yaml | 26 ++++++++++---------------- 1 file changed, 10 insertions(+), 16 deletions(-) diff --git a/OpenAPI/TS28312_IntentNrm.yaml b/OpenAPI/TS28312_IntentNrm.yaml index f345e4cbe..be7cb9710 100644 --- a/OpenAPI/TS28312_IntentNrm.yaml +++ b/OpenAPI/TS28312_IntentNrm.yaml @@ -620,8 +620,8 @@ components: type: array items: $ref: '#/components/schemas/PossibleIntentOutcome' - uniqueItems: true - minItems: 1 + uniqueItems: true + minItems: 1 intentFulfilmentNegotiationConsumerFeedback: $ref: '#/components/schemas/IntentFulfilmentNegotiationFeedback' implicitIntent: @@ -635,23 +635,19 @@ components: type: integer readOnly: true intentFulfilmentInfo: - type: array - items: - $ref: '#/components/schemas/FulfilmentInfo' - uniqueItems: true - minItems: 1 + $ref: '#/components/schemas/FulfilmentInfo' expectationFulfilmentResults: type: array items: $ref: '#/components/schemas/ExpectationFulfilmentResult' - uniqueItems: true - minItems: 1 - possibleImpact: + uniqueItems: true + minItems: 1 + possibleImpacts: type: array items: $ref: '#/components/schemas/PossibleImpact' - uniqueItems: true - minItems: 1 + uniqueItems: true + minItems: 1 PossibleImpact: description: >- It represents the possible impact of the possible outcome @@ -661,14 +657,12 @@ components: type: array items: $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnRo' - uniqueItems: true - minItems: 1 + minItems: 1 impactedAttributes: type: array items: $ref: 'TS28623_ComDefs.yaml#/components/schemas/AttributeNameValuePairSet' - uniqueItems: true - minItems: 1 + minItems: 1 IntentFulfilmentNegotiationFeedback: description: >- It represents the feedback information that the MnS consumer provides to the -- GitLab From a658a5e3ae1267ed50982efdfc75c3062c0997f6 Mon Sep 17 00:00:00 2001 From: zhaoxxian Date: Fri, 9 May 2025 00:29:02 +0000 Subject: [PATCH 458/587] add AIOTReader IOC --- OpenAPI/TS28541_NrNrm.yaml | 37 +++++++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) diff --git a/OpenAPI/TS28541_NrNrm.yaml b/OpenAPI/TS28541_NrNrm.yaml index fb17b0687..205dc122b 100755 --- a/OpenAPI/TS28541_NrNrm.yaml +++ b/OpenAPI/TS28541_NrNrm.yaml @@ -910,6 +910,8 @@ components: $ref: 'TS28541_5GcNrm.yaml#/components/schemas/Configurable5QISet-Multiple' Dynamic5QISet: $ref: 'TS28541_5GcNrm.yaml#/components/schemas/Dynamic5QISet-Multiple' + AIOTReader: + $ref: '#/components/schemas/AIOTReader-Multiple' OperatorDU-Single: allOf: @@ -2255,6 +2257,36 @@ components: items: $ref: '#/components/schemas/NTNEntityConf' minItems: 1 + AIOTReader-Single: + allOf: + - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' + - type: object + properties: + attributes: + allOf: + - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-Attr' + - type: object + properties: + readerId: + type: integer + administrativeState: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/AdministrativeState' + supportedAIOTServices: + type: array + uniqueItems: true + items: + type: string + enum: + - INVENTORY + - COMMAND + plmnId: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/PlmnId' + nRSectorCarrierRef: + type: array + uniqueItems: true + items: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' + #-------- Definition of JSON arrays for name-contained IOCs ---------------------- @@ -2426,6 +2458,10 @@ components: type: array items: $ref: '#/components/schemas/MWAB-Single' + AIOTReader-Multiple: + type: array + items: + $ref: '#/components/schemas/AIOTReader-Single' #-------- Definitions in TS 28.541 for TS 28.532 --------------------------------- @@ -2496,3 +2532,4 @@ components: - $ref: '#/components/schemas/MWAB-Single' - $ref: '#/components/schemas/NRECMappingRule-Single' - $ref: '#/components/schemas/NTNTimeBasedConfig-Single' + - $ref: '#/components/schemas/AIOTReader-Single' -- GitLab From 298211d9105448a68af640c8b9c6719091025b7f Mon Sep 17 00:00:00 2001 From: zhaoxxian Date: Fri, 9 May 2025 01:03:23 +0000 Subject: [PATCH 459/587] Add EP_AIOTx IOCs --- OpenAPI/TS28541_5GcNrm.yaml | 179 +++++++++++++++++++++++++++++++++++- 1 file changed, 176 insertions(+), 3 deletions(-) diff --git a/OpenAPI/TS28541_5GcNrm.yaml b/OpenAPI/TS28541_5GcNrm.yaml index 706292303..6e01e2d64 100755 --- a/OpenAPI/TS28541_5GcNrm.yaml +++ b/OpenAPI/TS28541_5GcNrm.yaml @@ -3811,6 +3811,8 @@ components: $ref: '#/components/schemas/EP_N89-Multiple' EP_N11mb: $ref: '#/components/schemas/EP_N11mb-Multiple' + EP_AIOT3: + $ref: '#/components/schemas/EP_AIOT3-Multiple' AmfSet-Single: allOf: - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' @@ -4129,7 +4131,11 @@ components: udrInfo: $ref: '#/components/schemas/UdrInfo' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' - - $ref: '#/components/schemas/ManagedFunction5GC-nc0' + - $ref: '#/components/schemas/ManagedFunction5GC-nc0' + - type: object + properties: + EP_AIOT7: + $ref: '#/components/schemas/EP_AIOT7-Multiple' UdsfFunction-Single: allOf: - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' @@ -4182,6 +4188,8 @@ components: $ref: '#/components/schemas/EP_N96-Multiple' EP_SM14: $ref: '#/components/schemas/EP_SM14-Multiple' + EP_AIOT5: + $ref: '#/components/schemas/EP_AIOT5-Multiple' NssfFunction-Single: allOf: - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' @@ -4438,6 +4446,10 @@ components: $ref: '#/components/schemas/EP_N62-Multiple' EP_N63: $ref: '#/components/schemas/EP_N63-Multiple' + EP_AIOT4: + $ref: '#/components/schemas/EP_AIOT4-Multiple' + EP_AIOT8: + $ref: '#/components/schemas/EP_AIOT8-Multiple' NsacfFunction-Single: allOf: @@ -4634,7 +4646,19 @@ components: allOf: - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-Attr' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' - - $ref: '#/components/schemas/ManagedFunction5GC-nc0' + - $ref: '#/components/schemas/ManagedFunction5GC-nc0' + - type: object + properties: + EP_AIOT2: + $ref: '#/components/schemas/EP_AIOT2-Multiple' + EP_AIOT3: + $ref: '#/components/schemas/EP_AIOT3-Multiple' + EP_AIOT4: + $ref: '#/components/schemas/EP_AIOT4-Multiple' + EP_AIOT5: + $ref: '#/components/schemas/EP_AIOT5-Multiple' + EP_AIOT6: + $ref: '#/components/schemas/EP_AIOT6-Multiple' AdmFunction-Single: allOf: @@ -4646,6 +4670,14 @@ components: - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-Attr' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' - $ref: '#/components/schemas/ManagedFunction5GC-nc0' + - type: object + properties: + EP_AIOT6: + $ref: '#/components/schemas/EP_AIOT6-Multiple' + EP_AIOT7: + $ref: '#/components/schemas/EP_AIOT7-Multiple' + EP_AIOT8: + $ref: '#/components/schemas/EP_AIOT8-Multiple' EP_N2-Single: allOf: @@ -5279,7 +5311,112 @@ components: $ref: 'TS28541_NrNrm.yaml#/components/schemas/LocalAddress' remoteAddress: $ref: 'TS28541_NrNrm.yaml#/components/schemas/RemoteAddress' - + + EP_AIOT2-Single: + allOf: + - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' + - type: object + properties: + attributes: + allOf: + - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/EP_RP-Attr' + - type: object + properties: + localAddress: + $ref: 'TS28541_NrNrm.yaml#/components/schemas/LocalAddress' + remoteAddress: + $ref: 'TS28541_NrNrm.yaml#/components/schemas/RemoteAddress' + + EP_AIOT3-Single: + allOf: + - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' + - type: object + properties: + attributes: + allOf: + - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/EP_RP-Attr' + - type: object + properties: + localAddress: + $ref: 'TS28541_NrNrm.yaml#/components/schemas/LocalAddress' + remoteAddress: + $ref: 'TS28541_NrNrm.yaml#/components/schemas/RemoteAddress' + + EP_AIOT4-Single: + allOf: + - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' + - type: object + properties: + attributes: + allOf: + - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/EP_RP-Attr' + - type: object + properties: + localAddress: + $ref: 'TS28541_NrNrm.yaml#/components/schemas/LocalAddress' + remoteAddress: + $ref: 'TS28541_NrNrm.yaml#/components/schemas/RemoteAddress' + + EP_AIOT5-Single: + allOf: + - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' + - type: object + properties: + attributes: + allOf: + - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/EP_RP-Attr' + - type: object + properties: + localAddress: + $ref: 'TS28541_NrNrm.yaml#/components/schemas/LocalAddress' + remoteAddress: + $ref: 'TS28541_NrNrm.yaml#/components/schemas/RemoteAddress' + + EP_AIOT6-Single: + allOf: + - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' + - type: object + properties: + attributes: + allOf: + - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/EP_RP-Attr' + - type: object + properties: + localAddress: + $ref: 'TS28541_NrNrm.yaml#/components/schemas/LocalAddress' + remoteAddress: + $ref: 'TS28541_NrNrm.yaml#/components/schemas/RemoteAddress' + + EP_AIOT7-Single: + allOf: + - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' + - type: object + properties: + attributes: + allOf: + - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/EP_RP-Attr' + - type: object + properties: + localAddress: + $ref: 'TS28541_NrNrm.yaml#/components/schemas/LocalAddress' + remoteAddress: + $ref: 'TS28541_NrNrm.yaml#/components/schemas/RemoteAddress' + + EP_AIOT8-Single: + allOf: + - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' + - type: object + properties: + attributes: + allOf: + - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/EP_RP-Attr' + - type: object + properties: + localAddress: + $ref: 'TS28541_NrNrm.yaml#/components/schemas/LocalAddress' + remoteAddress: + $ref: 'TS28541_NrNrm.yaml#/components/schemas/RemoteAddress' + FiveQiDscpMappingSet-Single: allOf: - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' @@ -6614,6 +6751,34 @@ components: type: array items: $ref: '#/components/schemas/EP_SM14-Single' + EP_AIOT2-Multiple: + type: array + items: + $ref: '#/components/schemas/EP_AIOT2-Single' + EP_AIOT3-Multiple: + type: array + items: + $ref: '#/components/schemas/EP_AIOT3-Single' + EP_AIOT4-Multiple: + type: array + items: + $ref: '#/components/schemas/EP_AIOT4-Single' + EP_AIOT5-Multiple: + type: array + items: + $ref: '#/components/schemas/EP_AIOT5-Single' + EP_AIOT6-Multiple: + type: array + items: + $ref: '#/components/schemas/EP_AIOT6-Single' + EP_AIOT7-Multiple: + type: array + items: + $ref: '#/components/schemas/EP_AIOT7-Single' + EP_AIOT8-Multiple: + type: array + items: + $ref: '#/components/schemas/EP_AIOT8-Single' Configurable5QISet-Multiple: type: array items: @@ -6799,6 +6964,14 @@ components: - $ref: '#/components/schemas/EP_SM12-Single' - $ref: '#/components/schemas/EP_SM13-Single' - $ref: '#/components/schemas/EP_SM14-Single' + + - $ref: '#/components/schemas/EP_AIOT2-Single' + - $ref: '#/components/schemas/EP_AIOT3-Single' + - $ref: '#/components/schemas/EP_AIOT4-Single' + - $ref: '#/components/schemas/EP_AIOT5-Single' + - $ref: '#/components/schemas/EP_AIOT6-Single' + - $ref: '#/components/schemas/EP_AIOT7-Single' + - $ref: '#/components/schemas/EP_AIOT8-Single' - $ref: '#/components/schemas/Configurable5QISet-Single' - $ref: '#/components/schemas/FiveQiDscpMappingSet-Single' -- GitLab From 1146d2ff5d0ac828249b5c3de9916ee9fae5d6c1 Mon Sep 17 00:00:00 2001 From: zhaoxxian Date: Fri, 9 May 2025 01:33:07 +0000 Subject: [PATCH 460/587] Update file TS28541_5GcNrm.yaml --- OpenAPI/TS28541_5GcNrm.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OpenAPI/TS28541_5GcNrm.yaml b/OpenAPI/TS28541_5GcNrm.yaml index 6e01e2d64..cc50d2289 100755 --- a/OpenAPI/TS28541_5GcNrm.yaml +++ b/OpenAPI/TS28541_5GcNrm.yaml @@ -5327,7 +5327,7 @@ components: remoteAddress: $ref: 'TS28541_NrNrm.yaml#/components/schemas/RemoteAddress' - EP_AIOT3-Single: + EP_AIOT3-Single: allOf: - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' - type: object -- GitLab From 3251d555ee05c3ae7d78d0f41c66099341135dea Mon Sep 17 00:00:00 2001 From: zhaoxxian Date: Fri, 9 May 2025 02:26:09 +0000 Subject: [PATCH 461/587] Update file TS28541_5GcNrm.yaml --- OpenAPI/TS28541_5GcNrm.yaml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/OpenAPI/TS28541_5GcNrm.yaml b/OpenAPI/TS28541_5GcNrm.yaml index cc50d2289..2ea31906c 100755 --- a/OpenAPI/TS28541_5GcNrm.yaml +++ b/OpenAPI/TS28541_5GcNrm.yaml @@ -4645,6 +4645,14 @@ components: attributes: allOf: - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-Attr' + - type: object + properties: + plmnId: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/PlmnId' + sBIFqdn: + type: string + managedNFProfile: + $ref: '#/components/schemas/ManagedNFProfile' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' - $ref: '#/components/schemas/ManagedFunction5GC-nc0' - type: object @@ -4668,6 +4676,14 @@ components: attributes: allOf: - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-Attr' + - type: object + properties: + plmnId: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/PlmnId' + sBIFqdn: + type: string + managedNFProfile: + $ref: '#/components/schemas/ManagedNFProfile' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' - $ref: '#/components/schemas/ManagedFunction5GC-nc0' - type: object -- GitLab From d7c7ee7037e4d16aaadb00985e901f433ea9ce43 Mon Sep 17 00:00:00 2001 From: shixixi Date: Fri, 9 May 2025 01:18:35 +0000 Subject: [PATCH 462/587] Edit TS28541_5GcNrm.yaml --- OpenAPI/TS28541_5GcNrm.yaml | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/OpenAPI/TS28541_5GcNrm.yaml b/OpenAPI/TS28541_5GcNrm.yaml index 2ea31906c..8296d442e 100755 --- a/OpenAPI/TS28541_5GcNrm.yaml +++ b/OpenAPI/TS28541_5GcNrm.yaml @@ -922,6 +922,15 @@ components: $ref: 'TS28623_ComDefs.yaml#/components/schemas/HostRo' uPFRef: $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnRo' + + UPFCapabilities: + type: object + properties: + nonStandardizedFeature: + type: string + standardizedFeature: + type: string + SnssaiList: type: array uniqueItems: true @@ -3958,6 +3967,8 @@ components: type: boolean onboardSatelliteId: $ref: '#/components/schemas/SatelliteId' + uPFCapabilities: + $ref: '#/components/schemas/UPFCapabilities' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' - $ref: '#/components/schemas/ManagedFunction5GC-nc0' - type: object -- GitLab From b52c31e8e892c6f8287ee8b3d2290945cdcba821 Mon Sep 17 00:00:00 2001 From: shixixi Date: Thu, 22 May 2025 06:50:25 +0000 Subject: [PATCH 463/587] Edit TS28541_5GcNrm.yaml --- OpenAPI/TS28541_5GcNrm.yaml | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/OpenAPI/TS28541_5GcNrm.yaml b/OpenAPI/TS28541_5GcNrm.yaml index 8296d442e..bc2507f96 100755 --- a/OpenAPI/TS28541_5GcNrm.yaml +++ b/OpenAPI/TS28541_5GcNrm.yaml @@ -924,12 +924,7 @@ components: $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnRo' UPFCapabilities: - type: object - properties: - nonStandardizedFeature: - type: string - standardizedFeature: - type: string + type: string SnssaiList: type: array -- GitLab From a9fd53d2b6324a624a8babddaf126b6174bd22a5 Mon Sep 17 00:00:00 2001 From: shixixi Date: Thu, 22 May 2025 10:02:44 +0000 Subject: [PATCH 464/587] Edit TS28541_5GcNrm.yaml --- OpenAPI/TS28541_5GcNrm.yaml | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/OpenAPI/TS28541_5GcNrm.yaml b/OpenAPI/TS28541_5GcNrm.yaml index bc2507f96..b1a9f1397 100755 --- a/OpenAPI/TS28541_5GcNrm.yaml +++ b/OpenAPI/TS28541_5GcNrm.yaml @@ -922,9 +922,6 @@ components: $ref: 'TS28623_ComDefs.yaml#/components/schemas/HostRo' uPFRef: $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnRo' - - UPFCapabilities: - type: string SnssaiList: type: array @@ -3963,7 +3960,7 @@ components: onboardSatelliteId: $ref: '#/components/schemas/SatelliteId' uPFCapabilities: - $ref: '#/components/schemas/UPFCapabilities' + type: String - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' - $ref: '#/components/schemas/ManagedFunction5GC-nc0' - type: object -- GitLab From ac8d05b9d7058c27a7393ee5eae73c1ac9a0793b Mon Sep 17 00:00:00 2001 From: shixixi Date: Mon, 26 May 2025 06:54:01 +0000 Subject: [PATCH 465/587] Edit TS28541_5GcNrm.yaml --- OpenAPI/TS28541_5GcNrm.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OpenAPI/TS28541_5GcNrm.yaml b/OpenAPI/TS28541_5GcNrm.yaml index b1a9f1397..0558126fd 100755 --- a/OpenAPI/TS28541_5GcNrm.yaml +++ b/OpenAPI/TS28541_5GcNrm.yaml @@ -3960,7 +3960,7 @@ components: onboardSatelliteId: $ref: '#/components/schemas/SatelliteId' uPFCapabilities: - type: String + type: string - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' - $ref: '#/components/schemas/ManagedFunction5GC-nc0' - type: object -- GitLab From c1921ec2b4308470dfdf2ac5f307ef30eb8a9c61 Mon Sep 17 00:00:00 2001 From: shixixi Date: Tue, 27 May 2025 14:25:44 +0000 Subject: [PATCH 466/587] Rel-19 CR0218 TS 28.104 add stage3 solution for mobility performance analysis and coverage problem analysis --- OpenAPI/TS28104_MdaReport.yaml | 311 ++++++++++++++++++++++++++++++++- 1 file changed, 310 insertions(+), 1 deletion(-) diff --git a/OpenAPI/TS28104_MdaReport.yaml b/OpenAPI/TS28104_MdaReport.yaml index 942a1cb6f..ba2f51e3c 100644 --- a/OpenAPI/TS28104_MdaReport.yaml +++ b/OpenAPI/TS28104_MdaReport.yaml @@ -45,7 +45,13 @@ components: mDAType: $ref: 'TS28104_MdaNrm.yaml#/components/schemas/MDAType' mDAOutputList: - oneOf: + oneOf: + - $ref: '#/components/schemas/CoverageProblemAnalysisoutput' + - $ref: '#/components/schemas/MobilityPerformanceAnalysisoutput' + - $ref: '#/components/schemas/TrainingDataAnalysisOutput' + - $ref: '#/components/schemas/NFScalingDimensioningDataAnalysisOutput' + - $ref: '#/components/schemas/PMDataOutput' + - $ref: '#/components/schemas/FailurePredictionOutput' - $ref: '#/components/schemas/PagingOptimizationAnalysisOutput' - type: array uniqueItems: true @@ -86,3 +92,306 @@ components: $ref: '#/components/schemas/MDAOutputs' mDARequestRef: $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnRo' + +#-------- Definition of recommended action -------------------------------------------- + Recommended3GPPAction: + type: object + properties: + mOInstance: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' + path: + type: string + op: + type: string + enum: + - ADD + - REMOVE + - REPLACE + value: + type: array + uniqueItems: true + items: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/AttributeNameValuePairSet' + additionalText: + type: array + items: + type: string + + RecommendedAction: + type: object + properties: + recommended3GPPActions: + type: array + uniqueItems: true + items: + $ref: '#/components/schemas/Recommended3GPPAction' + recommendedNon3GPPActions: + type: array + uniqueItems: true + items: + type: string + recommendedHumanReadableActions: + type: array + uniqueItems: true + items: + type: string + actionInterval: + type: integer + timeWindow: + type: array + uniqueItems: false + items: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/TimeWindow' + + + +#-------- Definition of specific MobilityPerformanceAnalysis MDAoutput ----------------------------- + MobilityPerformanceAnalysisoutput: + type: object + properties: + mobilityPerformanceIssueIdentifier: + type: integer + mobilityPerformanceIssueRootCause: + type: string + enum: + - TooLongMobilityInterruptionTime + - PoorCoverageOfTheCelledge + - InappropriateHandoverParameters + - Other + mobilityPerformanceIssueLocation: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/GeoArea' + +#-------- Definition of specific CoverageProblemAnalysis MDAoutput ----------------------------- + CoverageProblemAnalysisoutput: + type: object + properties: + coverageProblemId: + type: string + coverageProblemType: + type: string + enum: + - WEAK_COVERAGE + - COVERAGE_HOLE + - PILOT_POLLUTION + - OVERSHOOT_COVERAGE + - DL_ULCHANNEL_COVERAGE_MISMATCH + - Other + coverageProblemAreas: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/GeoArea' + problematicCells: + type: integer + recommendedActions: + type: array + uniqueItems: true + items: + $ref: '#/components/schemas/RecommendedAction' + radioEnvironmentMap: + type: array + uniqueItems: true + items: + $ref: '#/components/schemas/RadioEnvironmentMap' + cellConfigurations: + description: A map (list of key-value pairs) + $ref: 'TS28623_ComDefs.yaml#/components/schemas/AttributeNameValuePairSet' + + RadioEnvironmentMap: + type: object + properties: + geoCoordinate: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/GeoArea' + coverageCharacterization: + $ref: '#/components/schemas/CoverageCharacterization' + + CoverageCharacterization: + type: object + properties: + rsrp: + type: number + format: float + sinr: + type: number + format: float + +#-------- Definition of specific TrainingDataAnalysis MDAoutput ----------------------------- + + TrainingDataAnalysisOutput: + type: object + properties: + measurementDataCorrelationRecommendation: + type: array + uniqueItems: true + items: + $ref: '#/components/schemas/MeasurementDataCorrelationRecommendation' + + MeasurementDataCorrelationRecommendation: + type: object + properties: + recommendedMeasurementDataToCollect: + type: array + uniqueItems: true + items: + type: string + recommendedMeasurementDataNotToCollect: + type: array + uniqueItems: true + items: + type: string + modelPerformanceImpact: + type: integer + minimum: 0 + maximum: 100 + + + + +#-------- Definition of specific NFScalingDimensioningDataAnalysis MDAoutput ----------------------------- + + NFScalingDimensioningDataAnalysisOutput: + type: object + properties: + recommendedActions: + type: array + uniqueItems: true + items: + $ref: '#/components/schemas/RecommendedAction' + + + + + +#-------- Definition of specific PMData MDAoutput ----------------------------- + PMDataOutput: + type: object + properties: + pmPredictions: + type: array + uniqueItems: true + items: + $ref: '#/components/schemas/PmPrediction' + minItems: 1 + thresholdAssessment: + type: array + uniqueItems: true + items: + $ref: '#/components/schemas/ThresholdAssessment' + thresholdAdjustmentRecommendations: + type: array + uniqueItems: true + items: + $ref: '#/components/schemas/RecommendedAction' + + PmPrediction: + type: object + properties: + pmName: + type: string + pmPredictedValue: + description: >- + This specifies the predicted value of the PM specified by “pmName” + attribute. + oneOf: + - type: integer + - type: number + format: float + + thresholdAssessment: + $ref: '#/components/schemas/ThresholdAssessment' + + ThresholdAssessment: + type: object + properties: + performanceMetrics: + description: >- + It indicates list of performance metrics with threshold + configuration issue. + Performance metrics include measurements defined in TS 28.552 + and KPIs defined in TS 28.554. + For non-3GPP specified measurements the name is defined elsewhere. + type: array + uniqueItems: true + items: + type: string + timeWindow: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/TimeWindow' + confidenceScore: + type: number + format: float + + +#-------- Definition of specific FailurePrediction MDAoutput ----------------------------- + + FailurePredictionOutput: + type: object + properties: + failurePredictionObject: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList' + potentialFailureType: + type: string + potentialFailureCause: + oneOf: + - type: integer + - type: string + eventTime: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTime' + issueID: + type: string + issueDomain: + type: string + enum: + - RAN_ISSUE + - CN_ISSUE + - UNKNOWN + perceivedSeverity: + type: string + enum: + - CRITICAL + - MAJOR + - MINOR + - WARNING + - INTERMEDIATE + - CLEARED + trendIndication: + type: string + enum: + - MORE_SEVERE + - NO_CHANGE + - LESS_SEVERE + predictedFailureEndTime: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTime' + statisticsInfoList: + type: array + items: + type: integer + managementDataCollectionRecommendations: + type: array + uniqueItems: true + items: + $ref: '#/components/schemas/ManagementDataCollectionInfo' + recommendedActions: + type: array + uniqueItems: true + items: + $ref: '#/components/schemas/RecommendedAction' + + ManagementDataCollectionInfo: + type: object + properties: + managementDataType: + type: string + enum: + - MEASUREMENT + - KPI + - TRACE_MDT + - QOE + managementData: + $ref: 'TS28623_ManagementDataCollectionNrm.yaml#/components/schemas/ManagementData' + targetEntities: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList' + collectionDuration: + type: array + items: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/TimeWindow' + + + + -- GitLab From 980c90c7354f4960ae9d852d0f85615d041dbe83 Mon Sep 17 00:00:00 2001 From: shumim Date: Tue, 27 May 2025 14:30:14 +0000 Subject: [PATCH 467/587] Rel_19_CR_TS_28541_CR1543_Add_NRM_solution_on_broadcasting_multiple_TACs_for_NTN --- OpenAPI/TS28541_NrNrm.yaml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/OpenAPI/TS28541_NrNrm.yaml b/OpenAPI/TS28541_NrNrm.yaml index 205dc122b..a5723e176 100755 --- a/OpenAPI/TS28541_NrNrm.yaml +++ b/OpenAPI/TS28541_NrNrm.yaml @@ -1146,6 +1146,13 @@ components: $ref: '#/components/schemas/NrPci' nRTAC: $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Tac' + nTNTAClist: + type: array + uniqueItems: true + items: + $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Tac' + minItems: 1 + maxItems: 12 arfcnDL: type: integer arfcnUL: -- GitLab From 39a1be3f08947e4238152aed0648d1a4ea8cfa56 Mon Sep 17 00:00:00 2001 From: Pengxiang Xie Date: Tue, 20 May 2025 14:01:29 +0800 Subject: [PATCH 468/587] Edit TS28541_5GcNrm.yaml --- OpenAPI/TS28541_5GcNrm.yaml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/OpenAPI/TS28541_5GcNrm.yaml b/OpenAPI/TS28541_5GcNrm.yaml index 0558126fd..da1f2560e 100755 --- a/OpenAPI/TS28541_5GcNrm.yaml +++ b/OpenAPI/TS28541_5GcNrm.yaml @@ -4276,7 +4276,11 @@ components: trpInfoList: $ref: '#/components/schemas/TrpInfoList' mappedCellIdInfoList: - $ref: 'TS28541_NrNrm.yaml#/components/schemas/MappedCellIdInfoList' + $ref: 'TS28541_NrNrm.yaml#/components/schemas/MappedCellIdInfoList' + mLModelRefList: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnListRo' + aIMLInferenceFunctionRef: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnRo' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' - $ref: '#/components/schemas/ManagedFunction5GC-nc0' - type: object -- GitLab From 79e84ace35f334b1439bf9c13af778f974d166ab Mon Sep 17 00:00:00 2001 From: Pengxiang Xie Date: Tue, 27 May 2025 22:44:40 +0800 Subject: [PATCH 469/587] Rel19_CR1533_TS_28.541_NRM_enhancements_on_ManagedNFProfile --- OpenAPI/TS28541_5GcNrm.yaml | 129 +++++++++++++++++++++++++++++++++++- 1 file changed, 128 insertions(+), 1 deletion(-) diff --git a/OpenAPI/TS28541_5GcNrm.yaml b/OpenAPI/TS28541_5GcNrm.yaml index da1f2560e..e6af55243 100755 --- a/OpenAPI/TS28541_5GcNrm.yaml +++ b/OpenAPI/TS28541_5GcNrm.yaml @@ -405,7 +405,8 @@ components: items: $ref: 'TS28541_NrNrm.yaml#/components/schemas/Snssai' allowedRuleSet: - description: A map (list of key-value pairs) where a valid JSON pointer Id serves as key + description: > + A map (list of key-value pairs) where a valid JSON pointer Id serves as key type: object additionalProperties: $ref: '#/components/schemas/RuleSet' @@ -492,6 +493,132 @@ components: uniqueItems: true items: $ref: '#/components/schemas/NFService' + supportedVendorSpecificFeatures: + description: > + A map (list of key-value pairs) where IANA-assigned "SMI Network Management Private Enterprise Codes" serves as key + type: object + additionalProperties: + type: array + items: + $ref: '#/components/schemas/VendorSpecificFeature' + minItems: 1 + minProperties: 1 + canaryRelease: + type: boolean + default: false + exclusiveCanaryReleaseSelection: + type: boolean + default: false + sharedProfileDataId: + type: string + shutdownTime: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTime' + supportedRcfs: + type: array + uniqueItems: true + items: + type: string + minItems: 1 + canaryPrecedenceOverPreferred: + type: boolean + default: false + selectionConditions: + description: > + conditions under which an NF Instance shall be selected by an NF Service Consumer. + type: array + items: + $ref: '#/components/schemas/SelectionConditions' + minItems: 1 + SelectionConditions: + description: > + It contains the set of conditions that shall be evaluated to determine whether a consumer + shall select a given producer. The producer shall only be selected if the evaluation of + the conditions is . The set of conditions can be represented by a single + ConditionItem or by a ConditionGroup, where the latter contains a (recursive) list of + conditions joined by the "and" or "or" logical relationships. + oneOf: + - $ref: '#/components/schemas/ConditionItem' + - $ref: '#/components/schemas/ConditionGroup' + ConditionGroup: + description: > + List (array) of conditions (joined by the "and" or "or" logical relationship), + under which an NF Instance with an NFStatus or NFServiceStatus value set to, + "CANARY_RELEASE", or with a "canaryRelease" attribute set to true, + shall be selected by an NF Service Consumer. + type: object + oneOf: + - required: [ and ] + - required: [ or ] + properties: + and: + type: array + items: + $ref: '#/components/schemas/SelectionConditions' + minItems: 1 + or: + type: array + items: + $ref: '#/components/schemas/SelectionConditions' + minItems: 1 + ConditionItem: + description: > + A ConditionItem consists of a number of attributes representing individual conditions + (e.g. a SUPI range, or a TAI list). If several attributes/conditions are present, + the evaluation of the ConditionItem is if all attributes/conditions are evaluated + as (i.e., it follows the AND logical relationship). + type: object + allOf: + - not: + required: [ and ] + - not: + required: [ or ] + properties: + consumerNfTypes: + type: array + items: + $ref: '#/components/schemas/NFType' + minItems: 1 + serviceFeature: + type: integer + minimum: 1 + vsServiceFeature: + type: integer + minimum: 1 + supiRangeList: + type: array + items: + $ref: '#/components/schemas/SupiRange' + minItems: 1 + gpsiRangeList: + type: array + items: + $ref: '#/components/schemas/IdentityRange' + minItems: 1 + impuRangeList: + type: array + items: + $ref: '#/components/schemas/IdentityRange' + minItems: 1 + impiRangeList: + type: array + items: + $ref: '#/components/schemas/IdentityRange' + minItems: 1 + peiList: + type: array + items: + $ref: 'TS29571_CommonData.yaml#/components/schemas/Pei' + minItems: 1 + taiRangeList: + type: array + items: + $ref: '#/components/schemas/TaiRange' + minItems: 1 + dnnList: + type: array + items: + $ref: 'TS29571_CommonData.yaml#/components/schemas/Dnn' + minItems: 1 SEPPType: type: string readOnly: true -- GitLab From 4159357b256077c815d5e613fa97799413906f0f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Refik=20Fatih=20=C3=9Cstok?= Date: Wed, 28 May 2025 02:24:41 +0000 Subject: [PATCH 470/587] 28.312_Rel19_CR0352_Enhance_the_solution_for_network_maintenance_expectation --- OpenAPI/TS28312_IntentExpectations.yaml | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/OpenAPI/TS28312_IntentExpectations.yaml b/OpenAPI/TS28312_IntentExpectations.yaml index d1279f2b4..7b922fdbb 100644 --- a/OpenAPI/TS28312_IntentExpectations.yaml +++ b/OpenAPI/TS28312_IntentExpectations.yaml @@ -328,6 +328,7 @@ components: oneOf: - $ref: "#/components/schemas/MaintenanceVersionContext" - $ref: "#/components/schemas/MaintenanceOrderContext" + - $ref: "#/components/schemas/MaintenanceTypeContext" - $ref: "#/components/schemas/NfTypeContext" - $ref: "#/components/schemas/NfInstanceLocationContext" - $ref: "#/components/schemas/PLMNContext" @@ -1357,6 +1358,27 @@ components: type: array items: type: string + MaintenanceTypeContext: + description: >- + This data type is the "ObjectContext" data type with specialisations for MaintenanceTypeContext. It describes the type of maintenance expected for the maintenance object. + type: object + properties: + contextAttribute: + type: string + enum: + - maintenanceType + contextCondition: + type: string + enum: + - IS_EQUAL_TO + contextValueRange: + type: array + uniqueItems: true + items: + type: string + enum: + - UPGRADE + - DOWNGRADE #-------Definition of the scenario specific ObjectTarget dataType----------------# #-------Definition of the concrete ExpectationContext dataType----------------# -- GitLab From e2eb841b41b5efe52a9ebcfe21073320f52e818c Mon Sep 17 00:00:00 2001 From: zhaoxxian Date: Wed, 28 May 2025 02:37:35 +0000 Subject: [PATCH 471/587] Rel19_CR0047_TS_28.111_Stage_3_YAML_for_ThresholdCrossing_dataType --- OpenAPI/TS28111_FaultNrm.yaml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/OpenAPI/TS28111_FaultNrm.yaml b/OpenAPI/TS28111_FaultNrm.yaml index 1ea8c64e9..4f754b148 100644 --- a/OpenAPI/TS28111_FaultNrm.yaml +++ b/OpenAPI/TS28111_FaultNrm.yaml @@ -107,7 +107,7 @@ components: properties: down: $ref: '#/components/schemas/ThresholdHysteresis' - ThresholdInfo: + ThresholdCrossing: type: object properties: observedMeasurement: @@ -178,7 +178,7 @@ components: trendIndication: $ref: '#/components/schemas/TrendIndication' thresholdinfo: - $ref: '#/components/schemas/ThresholdInfo' + $ref: '#/components/schemas/ThresholdCrossing' correlatedNotifications: $ref: '#/components/schemas/CorrelatedNotifications' stateChangeDefinition: @@ -292,7 +292,7 @@ components: trendIndication: $ref: '#/components/schemas/TrendIndication' thresholdInfo: - $ref: '#/components/schemas/ThresholdInfo' + $ref: '#/components/schemas/ThresholdCrossing' correlatedNotifications: $ref: '#/components/schemas/CorrelatedNotifications' stateChangeDefinition: @@ -418,7 +418,7 @@ components: trendIndication: $ref: '#/components/schemas/TrendIndication' thresholdInfo: - $ref: '#/components/schemas/ThresholdInfo' + $ref: '#/components/schemas/ThresholdCrossing' stateChangeDefinition: $ref: 'TS28623_ComDefs.yaml#/components/schemas/AttributeValueChangeSet' monitoredAttributes: -- GitLab From 4863caa19fe2248d4f6ca32c9f0dd9ac12aaaa19 Mon Sep 17 00:00:00 2001 From: srinivasaraj Date: Wed, 28 May 2025 02:52:09 +0000 Subject: [PATCH 472/587] Rel_19_CR0078_TS_28.310_CR0544_TS_28.623_Introduce_energy_related_information_NRM --- OpenAPI/README.md | 3 + OpenAPI/TS28310_EnergyInformationNrm.yaml | 95 +++++++++++++++++++++++ OpenAPI/TS28623_FeatureNrm.yaml | 1 + OpenAPI/TS28623_GenericNrm.yaml | 2 +- 4 files changed, 100 insertions(+), 1 deletion(-) create mode 100644 OpenAPI/TS28310_EnergyInformationNrm.yaml diff --git a/OpenAPI/README.md b/OpenAPI/README.md index c0e969a34..8be2519a3 100644 --- a/OpenAPI/README.md +++ b/OpenAPI/README.md @@ -103,6 +103,9 @@ The links below will open the Swagger Editor/UI and auto-load the OpenAPI YAML f ([Editor](https://forge.3gpp.org/swagger/tools/loader.html?yaml=OpenAPI/TS28318_DsoNrm.yaml)) ([UI](https://forge.3gpp.org/swagger/tools/loader.html?action=ui&yaml=OpenAPI/TS28318_DsoNrm.yaml)) +* Energy Information NRM (TS 28.310) +([Editor](https://forge.3gpp.org/swagger/tools/loader.html?yaml=OpenAPI/TS28310_EnergyInformationNrm.yaml)) +([UI](https://forge.3gpp.org/swagger/tools/loader.html?action=ui&yaml=OpenAPI/TS28310_EnergyInformationNrm.yaml)) ## Management Services (MnS) diff --git a/OpenAPI/TS28310_EnergyInformationNrm.yaml b/OpenAPI/TS28310_EnergyInformationNrm.yaml new file mode 100644 index 000000000..496cb7c0e --- /dev/null +++ b/OpenAPI/TS28310_EnergyInformationNrm.yaml @@ -0,0 +1,95 @@ +openapi: 3.0.1 +info: + title: Energy Information NRM + version: 19.0.0 + description: >- + OAS 3.0.1 specification of the Energy Information NRM + © 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). + All rights reserved. +externalDocs: + description: 3GPP TS 28.310; Energy Information NRM + url: http://www.3gpp.org/ftp/Specs/archive/28_series/28.310/ +paths: {} +components: + schemas: + +#-------- Definition of types----------------------------------------------------- + EnergySourceInfo: + type: object + properties: + energySourceType: + type: string + energySourceCef: + type: number + format: float + minimum: 0 + renewableEnergy: + type: boolean + energyCompositionPercentage: + type: number + format: float + default: 100 + minimum: 1 + maximum: 100 + EnergySupplyMode: + type: string + enum: + - GRID_ELECTRICITY + - BACKUP_ENERGY + - LOCALLY_GENERATED_ENERGY + +#-------- Definition of concrete IOCs -------------------------------------------- + SubNetwork-ncO-EnergyInformationNrm: + type: object + properties: + EnergySupplyInfo: + $ref: '#/components/schemas/EnergySupplyInfo-Multiple' + EnergyInfoGroup: + $ref: '#/components/schemas/EnergyInfoGroup-Multiple' + + EnergySupplyInfo-Single: + allOf: + - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' + - type: object + properties: + attributes: + type: object + properties: + energySupplyMode: + $ref: '#/components/schemas/EnergySupplyMode' + energySourceList: + type: array + uniqueItems: true + minItems: 1 + items: + $ref: '#/components/schemas/EnergySourceInfo' + EnergyInfoGroup-Single: + allOf: + - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' + - type: object + properties: + attributes: + type: object + properties: + energySupplyModeRefList: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList' + memberDNList: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList' + +#-------- Definition of JSON arrays for name-contained IOCs ---------------------- + + EnergySupplyInfo-Multiple: + type: array + items: + $ref: '#/components/schemas/EnergySupplyInfo-Single' + EnergyInfoGroup-Multiple: + type: array + items: + $ref: '#/components/schemas/EnergyInfoGroup-Single' + +#--------------------------------- Definition ------------------------------------ + + resources-energyInformationNrm: + oneOf: + - $ref: '#/components/schemas/EnergySupplyInfo-Single' + - $ref: '#/components/schemas/EnergyInfoGroup-Single' diff --git a/OpenAPI/TS28623_FeatureNrm.yaml b/OpenAPI/TS28623_FeatureNrm.yaml index 3171f4557..cb4a79611 100644 --- a/OpenAPI/TS28623_FeatureNrm.yaml +++ b/OpenAPI/TS28623_FeatureNrm.yaml @@ -36,5 +36,6 @@ components: - $ref: 'TS28623_SubscriptionControlNrm.yaml#/components/schemas/resources-subscriptionControlNrm' - $ref: 'TS28623_ThresholdMonitorNrm.yaml#/components/schemas/resources-thresholdMonitorNrm' - $ref: 'TS28623_TraceControlNrm.yaml#/components/schemas/resources-traceControlNrm' + - $ref: 'TS28310_EnergyInformationNrm.yaml#/components/schemas/resources-energyInformationNrm' #----- Definitions in TS 28.623 for TS 28.532 --------------------------# diff --git a/OpenAPI/TS28623_GenericNrm.yaml b/OpenAPI/TS28623_GenericNrm.yaml index 3aa14f00f..c9b1c9b45 100755 --- a/OpenAPI/TS28623_GenericNrm.yaml +++ b/OpenAPI/TS28623_GenericNrm.yaml @@ -608,7 +608,7 @@ components: - $ref: 'TS28541_NrNrm.yaml#/components/schemas/SubNetwork-ncO-NrNrm' - $ref: 'TS28541_5GcNrm.yaml#/components/schemas/SubNetwork-ncO-5GcNrm' - $ref: 'TS28318_DsoNrm.yaml#/components/schemas/SubNetwork-ncO-DsoNrm' - + - $ref: 'TS28310_EnergyInformationNrm.yaml#/components/schemas/SubNetwork-ncO-EnergyInformationNrm' ManagedElement-Single: allOf: -- GitLab From 61a3961649eccd00f1eb45fc227d87c0025ebff8 Mon Sep 17 00:00:00 2001 From: ruanb Date: Fri, 9 May 2025 21:33:33 +0000 Subject: [PATCH 473/587] Rel19_CR1545_28.541_Fix_stage3_related_to_DnnUpfInfo --- OpenAPI/TS28541_5GcNrm.yaml | 8 -------- 1 file changed, 8 deletions(-) diff --git a/OpenAPI/TS28541_5GcNrm.yaml b/OpenAPI/TS28541_5GcNrm.yaml index e6af55243..9787c9b82 100755 --- a/OpenAPI/TS28541_5GcNrm.yaml +++ b/OpenAPI/TS28541_5GcNrm.yaml @@ -3435,49 +3435,41 @@ components: uniqueItems: true items: $ref: 'TS29571_CommonData.yaml#/components/schemas/Dnai' - minItems: 1 pduSessionTypes: type: array uniqueItems: true items: $ref: 'TS29571_CommonData.yaml#/components/schemas/PduSessionType' - minItems: 1 ipv4AddressRanges: type: array uniqueItems: true items: $ref: '#/components/schemas/Ipv4AddressRange' - minItems: 1 ipv6PrefixRanges: type: array uniqueItems: true items: $ref: '#/components/schemas/Ipv6PrefixRange' - minItems: 1 natedIpv4AddressRanges: type: array uniqueItems: true items: $ref: '#/components/schemas/Ipv4AddressRange' - minItems: 1 natedIpv6PrefixRanges: type: array uniqueItems: true items: $ref: '#/components/schemas/Ipv6PrefixRange' - minItems: 1 ipv4IndexList: type: array uniqueItems: true items: $ref: '#/components/schemas/IpIndex' - minItems: 1 ipv6IndexList: type: array uniqueItems: true items: $ref: '#/components/schemas/IpIndex' - minItems: 1 networkInstance: description: > The N6 Network Instance associated with the S-NSSAI and DNN. -- GitLab From 37715c62c9091f3c156e6f984d8c48192e8f3ece Mon Sep 17 00:00:00 2001 From: lengyelb Date: Wed, 28 May 2025 04:59:53 +0200 Subject: [PATCH 474/587] 28.111_CR0043_Rel19_Add_alarmType_other_YAML into Integration --- OpenAPI/TS28111_FaultNrm.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/OpenAPI/TS28111_FaultNrm.yaml b/OpenAPI/TS28111_FaultNrm.yaml index 4f754b148..241b9a4bf 100644 --- a/OpenAPI/TS28111_FaultNrm.yaml +++ b/OpenAPI/TS28111_FaultNrm.yaml @@ -40,6 +40,7 @@ components: - PHYSICAL_VIOLATION - SECURITY_SERVICE_OR_MECHANISM_VIOLATION - TIME_DOMAIN_VIOLATION + - OTHER readOnly: true ProbableCause: description: >- -- GitLab From c6c0dd33afe59e88ab912e8655ba6096d286b204 Mon Sep 17 00:00:00 2001 From: sunse Date: Fri, 9 May 2025 22:26:22 +0800 Subject: [PATCH 475/587] Rel19 CR0344 TS 28312 correct TargetAchievedValue data Type --- OpenAPI/TS28312_IntentNrm.yaml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/OpenAPI/TS28312_IntentNrm.yaml b/OpenAPI/TS28312_IntentNrm.yaml index be7cb9710..2bac76afe 100644 --- a/OpenAPI/TS28312_IntentNrm.yaml +++ b/OpenAPI/TS28312_IntentNrm.yaml @@ -476,11 +476,10 @@ components: targetFulfilmentInfo: $ref: '#/components/schemas/FulfilmentInfo' targetAchievedValue: - type: number description: >- It describes the value that has been achieved for the expectation target at the time at which the report is generated. - readOnly: true + $ref: "#/components/schemas/ValueRangeType" targetContexts: type: array uniqueItems: true -- GitLab From b68ee56bbbb93de1ba5ccd0ee7c087bc8a4923e1 Mon Sep 17 00:00:00 2001 From: lengyelb Date: Wed, 28 May 2025 05:09:02 +0200 Subject: [PATCH 476/587] 28.532_Rel19_CR0381_Add_new_notifications_for_reliability into Integration --- OpenAPI/TS28532_ProvMnS.yaml | 58 ++++++++++++++++++++++++++++++++++++ 1 file changed, 58 insertions(+) diff --git a/OpenAPI/TS28532_ProvMnS.yaml b/OpenAPI/TS28532_ProvMnS.yaml index 314e23377..815bdd49a 100755 --- a/OpenAPI/TS28532_ProvMnS.yaml +++ b/OpenAPI/TS28532_ProvMnS.yaml @@ -192,6 +192,48 @@ paths: application/json: schema: $ref: 'TS28623_ComDefs.yaml#/components/schemas/ErrorResponse' + notifyPotentialFaultyDataNodeTree: + '{request.body#/notificationRecipientAddress}': + post: + requestBody: + required: true + content: + application/json: + schema: + $ref: '#/components/schemas/NotifyPotentialFaultyDataNodeTree' + responses: + '204': + description: >- + Success case ("204 No Content"). + The notification is successfully delivered. The response + has no message body. + default: + description: Error case. + content: + application/json: + schema: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/ErrorResponse' + notifyDataNodeTreeSyncRecommended: + '{request.body#/notificationRecipientAddress}': + post: + requestBody: + required: true + content: + application/json: + schema: + $ref: '#/components/schemas/NotifyDataNodeTreeSyncRecommended' + responses: + '204': + description: >- + Success case ("204 No Content"). + The notification is successfully delivered. The response + has no message body. + default: + description: Error case. + content: + application/json: + schema: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/ErrorResponse' get: summary: Reads one or multiple resources description: >- @@ -402,6 +444,8 @@ components: - notifyMOIAttributeValueChanges - notifyEvent - notifyMOIChanges + - notifyPotentialFaultyDataNodeTree + - notifyDataNodeTreeSyncRecommended SourceIndicator: type: string enum: @@ -570,6 +614,20 @@ components: $ref: '#/components/schemas/MoiChange' required: - moiChanges + NotifyPotentialFaultyDataNodeTree: + allOf: + - $ref: 'TS28623_ComDefs.yaml#/components/schemas/NotificationHeader' + - type: object + properties: + scope: + $ref: 'TS28623_SubscriptionControlNrm.yaml#/components/schemas/Scope' + NotifyDataNodeTreeSyncRecommended: + allOf: + - $ref: 'TS28623_ComDefs.yaml#/components/schemas/NotificationHeader' + - type: object + properties: + scope: + $ref: 'TS28623_SubscriptionControlNrm.yaml#/components/schemas/Scope' PatchItem: type: object properties: -- GitLab From 973b5e6fa77cff622e856ec7b2a3adb027ab0490 Mon Sep 17 00:00:00 2001 From: sabater Date: Wed, 21 May 2025 09:29:35 +0000 Subject: [PATCH 477/587] Rel19_CR1554_TS28541_SliceNrm.yaml Adding renewableEnergyPct attribute --- OpenAPI/TS28541_SliceNrm.yaml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/OpenAPI/TS28541_SliceNrm.yaml b/OpenAPI/TS28541_SliceNrm.yaml index b65edbc63..2fa712e57 100755 --- a/OpenAPI/TS28541_SliceNrm.yaml +++ b/OpenAPI/TS28541_SliceNrm.yaml @@ -456,6 +456,10 @@ components: uniqueItems: true items: $ref: 'TS28623_GenericNrm.yaml#/components/schemas/SchedulingTime' + renewableEnergyPct: + type: integer + minimum: 0 + maximum: 100 RANSliceSubnetProfile: type: object @@ -529,6 +533,10 @@ components: $ref: '#/components/schemas/Float' uLPktDelayVariation: $ref: '#/components/schemas/Float' + renewableEnergyPct: + type: integer + minimum: 0 + maximum: 100 TopSliceSubnetProfile: type: object @@ -617,6 +625,10 @@ components: uniqueItems: true items: $ref: 'TS28623_GenericNrm.yaml#/components/schemas/SchedulingTime' + renewableEnergyPct: + type: integer + minimum: 0 + maximum: 100 ServiceProfile: type: object @@ -718,6 +730,10 @@ components: uniqueItems: true items: $ref: 'TS28623_GenericNrm.yaml#/components/schemas/SchedulingTime' + renewableEnergyPct: + type: integer + minimum: 0 + maximum: 100 SliceProfile: type: object -- GitLab From e410375e9ea8a0d4e52df34a8d85a1613d028518 Mon Sep 17 00:00:00 2001 From: scottma Date: Wed, 28 May 2025 03:22:44 +0000 Subject: [PATCH 478/587] CR0356 28.312 update intent reporting to support utility function --- OpenAPI/TS28312_IntentNrm.yaml | 110 ++++++++++++++++++++++++++++++++- 1 file changed, 107 insertions(+), 3 deletions(-) diff --git a/OpenAPI/TS28312_IntentNrm.yaml b/OpenAPI/TS28312_IntentNrm.yaml index 2bac76afe..0ce0ea96d 100644 --- a/OpenAPI/TS28312_IntentNrm.yaml +++ b/OpenAPI/TS28312_IntentNrm.yaml @@ -48,6 +48,8 @@ components: $ref: "#/components/schemas/IntentMgmtPurpose" contextSelectivity: $ref: "#/components/schemas/Selectivity" + consumerSatisfactionIndexThreshold: + type: integer expectationSelectivity: $ref: "#/components/schemas/Selectivity" intentContexts: @@ -77,6 +79,8 @@ components: $ref: '#/components/schemas/IntentReportControl' intentReportReference: $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnRo' + intentUtilityFormulaRef: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnRo' IntentReport-Single: description: It represents intent report information from MnS producer to MnS consumer. allOf: @@ -94,6 +98,8 @@ components: $ref: '#/components/schemas/IntentFeasibilityCheckReport' intentExplorationReport: $ref: '#/components/schemas/IntentExplorationReport' + intentUtilityReport: + $ref: '#/components/schemas/IntentUtilityReport' intentFulfilmentNegotiationReport: $ref: '#/components/schemas/IntentFulfilmentNegotiationReport' lastUpdatedTime: @@ -114,11 +120,44 @@ components: minItems: 1 items: $ref: '#/components/schemas/IntentHandlingCapability' + supportedExpectationTargetInfo: + type: array + items: + $ref: '#/components/schemas/SupportedExpectationTargetInfo' + uniqueItems: true + minItems: 1 Intent: $ref: '#/components/schemas/Intent-Multiple' IntentReport: - $ref: '#/components/schemas/IntentReport-Multiple' - + $ref: '#/components/schemas/IntentReport-Multiple' + supportedUtilityList: + type: array + items: + $ref: '#/components/schemas/UtilityDefinition' + uniqueItems: true + IntentUtilityFormula-Single: + description: >- + It represents an intent utility function instance. + allOf: + - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' + - type: object + properties: + utilityFunctionId: + type: string + uniqueItems: true + minItems: 1 + utilityParameterList: + type: array + items: + $ref: '#/components/schemas/UtilityParameter' + uniqueItems: true + minItems: 1 + utilityScale: + type: number + minItems: 1 + utilityOffset: + type: number + minItems: 1 #-------Definition of generic IOCs ----------# #-------Definition of the generic IntentExpectation dataType ----------# @@ -388,6 +427,7 @@ components: - INTENT_FULFILMENT_REPORT - INTENT_CONFLICT_REPORT - INTENT_FEASIBILITY_CHECK_REPORT + - INTENT_UTILITY_REPORT reportingConditions: description: >- It indicates the specified conditions for intent reporting. @@ -527,6 +567,20 @@ components: #-------Definition of the concrete IntentConflictReport dataType----------------# + +#-------Definition of the generic IntentUtilityReport dataType----------------# + IntentUtilityReport: + description: >- + It represents the utility function results. + type: object + properties: + utilityResultList: + type: array + uniqueItems: true + items: + $ref: '#/components/schemas/UtilityResult' + #-------Definition of the concrete IntentUtilityReport dataType----------------# + #-------Definition of the generic IntentFeasibilityCheckReport dataType----------------# IntentFeasibilityCheckReport: description: >- @@ -735,6 +789,51 @@ components: - $ref: '#/components/schemas/ValueRangeType' #-------Definition of the concrete IntentHandlingCapability dataType----------------# + + #-------Definition of the generic UtilityParameter dataType----------------# + UtilityParameter: + description: >- + It represents the inputs for the specified Intent Utility Function. + type: object + properties: + parameterName: + type: string + parameterWeight: + type: number + #-------Definition of the concrete UtilityParameter dataType----------------# + + #-------Definition of the generic UtilityResult dataType----------------# + UtilityResult: + description: >- + It represents the inputs for the specified Intent Utility Function. + type: object + properties: + utilityFunctionId: + type: string + utilityResult: + type: number + #-------Definition of the concrete UtilityResult dataType----------------# + + #-------Definition of the generic UtilityDefinition dataType----------------# + UtilityDefinition: + description: >- + It represents the inputs for the specified Intent Utility Function. + type: object + properties: + utilityDefinitionId: + type: string + utilityDescription: + type: string + utilityParameterList: + oneOf: + - type: array + uniqueItems: true + minItems: 1 + items: + $ref: '#/components/schemas/UtilityParameter' + - $ref: '#/components/schemas/UtilityParameter' + #-------Definition of the concrete UtilityDefinition dataType----------------# + #------Definition of JSON arrays for name-contained IOCs ---------------# Intent-Multiple: @@ -752,6 +851,10 @@ components: items: $ref: '#/components/schemas/IntentHandlingFunction-Single' + IntentUtilityFormula-Multiple: + type: array + items: + $ref: '#/components/schemas/IntentUtilityFormula-Single' #------Definition of JSON arrays for name-contained IOCs ---------------# @@ -760,6 +863,7 @@ components: oneOf: - $ref: '#/components/schemas/IntentHandlingFunction-Single' - $ref: '#/components/schemas/Intent-Single' - - $ref: '#/components/schemas/IntentReport-Single' + - $ref: '#/components/schemas/IntentReport-Single' + - $ref: '#/components/schemas/IntentUtilityFormula-Single' #----- Definitions in TS 28.312 for TS 28.532 --------------------------# -- GitLab From 60cd8bc2cb82994e8cdf53a57c96ccee32cd18fc Mon Sep 17 00:00:00 2001 From: gautamd Date: Wed, 28 May 2025 03:28:42 +0000 Subject: [PATCH 479/587] Edit TS28541_NrNrm.yaml --- OpenAPI/TS28541_NrNrm.yaml | 23 ++++++++++++++++++++++- 1 file changed, 22 insertions(+), 1 deletion(-) diff --git a/OpenAPI/TS28541_NrNrm.yaml b/OpenAPI/TS28541_NrNrm.yaml index a5723e176..4d83d88ba 100755 --- a/OpenAPI/TS28541_NrNrm.yaml +++ b/OpenAPI/TS28541_NrNrm.yaml @@ -796,6 +796,8 @@ components: $ref: '#/components/schemas/CPCIConfigurationFunction-Single' CESManagementFunction: $ref: '#/components/schemas/CESManagementFunction-Single' + RedCapAccessCriteria: + $ref: '#/components/schemas/RedCapAccessCriteria-Single' Configurable5QISet: $ref: 'TS28541_5GcNrm.yaml#/components/schemas/Configurable5QISet-Multiple' RimRSGlobal: @@ -1203,6 +1205,8 @@ components: $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList' rimRSMonitoringStartTime: $ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTime' + redCapAccessCriteriaRef: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' rimRSMonitoringStopTime: $ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTime' rimRSMonitoringWindowDuration: @@ -1814,7 +1818,18 @@ components: $ref: '#/components/schemas/TimeDomainPara' RimRSSet: $ref: '#/components/schemas/RimRSSet-Multiple' - + RedCapAccessCriteria-Single: + allOf: + - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' + - type: object + properties: + attributes: + type: object + properties: + nRCellDURef: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList' + criteriaConditonRef: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' RimRSSet-Single: allOf: - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' @@ -2421,6 +2436,10 @@ components: type: array items: $ref: '#/components/schemas/EP_F1C-Single' + RedCapAccessCriteria-Multiple: + type: array + items: + $ref: '#/components/schemas/RedCapAccessCriteria-Single' EP_NgC-Multiple: type: array items: @@ -2539,4 +2558,6 @@ components: - $ref: '#/components/schemas/MWAB-Single' - $ref: '#/components/schemas/NRECMappingRule-Single' - $ref: '#/components/schemas/NTNTimeBasedConfig-Single' + - $ref: '#/components/schemas/RedCapAccessCriteria-Single' - $ref: '#/components/schemas/AIOTReader-Single' + -- GitLab From 201cb579669e44aa57b3015e5fc2c393a3c89c1a Mon Sep 17 00:00:00 2001 From: sunse Date: Wed, 28 May 2025 12:59:12 +0800 Subject: [PATCH 480/587] Rel19_CR1534_TS_28.541_NRM_enhancements_on_NFService for MR!1737 --- OpenAPI/TS28541_5GcNrm.yaml | 49 +++++++++++++++++++++++++++++++++++++ 1 file changed, 49 insertions(+) diff --git a/OpenAPI/TS28541_5GcNrm.yaml b/OpenAPI/TS28541_5GcNrm.yaml index 9787c9b82..7f4be521f 100755 --- a/OpenAPI/TS28541_5GcNrm.yaml +++ b/OpenAPI/TS28541_5GcNrm.yaml @@ -157,6 +157,55 @@ components: $ref: '#/components/schemas/VendorSpecificFeature' minItems: 1 minProperties: 1 + allowedScopesRuleSet: + description: A map (list of key-value pairs) where a valid JSON pointer Id serves as key + type: object + additionalProperties: + $ref: '#/components/schemas/RuleSet' + minProperties: 1 + nfServiceSetIdList: + description: This attribute represents a list of NF Service Set ID. + type: array + items: + type: string + perPlmnSnssaiList: + type: array + uniqueItems: true + items: + $ref: '#/components/schemas/PlmnSnssai' + load: + type: integer + minimum: 0 + maximum: 100 + loadTimeStamp: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTime' + canaryRelease: + type: boolean + default: false + exclusiveCanaryReleaseSelection: + type: boolean + default: false + shutdownTime: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTime' + canaryPrecedenceOverPreferred: + type: boolean + default: false + perPlmnOauth2ReqList: + $ref: '#/components/schemas/PlmnOauth2' + PlmnOauth2: + description: Oauth2.0 required indication for a given PLMN ID + type: object + properties: + oauth2RequiredPlmnIdList: + type: array + items: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/PlmnId' + minItems: 1 + oauth2NotRequiredPlmnIdList: + type: array + items: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/PlmnId' + minItems: 1 VendorSpecificFeature: type: object properties: -- GitLab From 72a83d2b58565f610a62ad5fbe20e9648895cf9f Mon Sep 17 00:00:00 2001 From: sunse Date: Wed, 28 May 2025 13:08:57 +0800 Subject: [PATCH 481/587] Replace MR !1766 -- Rel19 cr1520 ts 28.541 align predefined pcc rule set attributes with the definitions in ts 29.512 --- OpenAPI/TS28541_5GcNrm.yaml | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) diff --git a/OpenAPI/TS28541_5GcNrm.yaml b/OpenAPI/TS28541_5GcNrm.yaml index 7f4be521f..f285295d0 100755 --- a/OpenAPI/TS28541_5GcNrm.yaml +++ b/OpenAPI/TS28541_5GcNrm.yaml @@ -881,6 +881,14 @@ components: items: $ref: '#/components/schemas/TrafficControlData' + ServiceFeatureMap: + type: object + properties: + featureList: + type: string + serviceName: + type: string + PccRule: type: object properties: @@ -929,19 +937,24 @@ components: $ref: 'TS29514_Npcf_PolicyAuthorization.yaml#/components/schemas/TscaiInputContainer' tscaiInputUl: $ref: 'TS29514_Npcf_PolicyAuthorization.yaml#/components/schemas/TscaiInputContainer' - easRedisInd: + easRedisIndRequired: type: boolean default: false tscaiTimeDom: type: integer - capBatAdaptation: + batNotificationCapable: type: boolean default: false - disUeNotif: + uENotifEnabled: type: boolean default: false packFiltAllPrec: type: integer + nscSupportedFeats: + type: array + uniqueItems: true + items: + $ref: '#/components/schemas/ServiceFeatureMap' SnssaiInfo: type: object -- GitLab From 8522f0c0c565b6a0078b89ddc4c24daa622a4856 Mon Sep 17 00:00:00 2001 From: sunse Date: Wed, 28 May 2025 14:13:15 +0800 Subject: [PATCH 482/587] Update versions to be aligned with the version of word spec for SA plenary#108 --- OpenAPI/TS28104_MdaNrm.yaml | 2 +- OpenAPI/TS28104_MdaReport.yaml | 2 +- OpenAPI/TS28111_FaultNrm.yaml | 2 +- OpenAPI/TS28312_IntentExpectations.yaml | 2 +- OpenAPI/TS28312_IntentNrm.yaml | 2 +- OpenAPI/TS28318_DsoNrm.yaml | 2 +- OpenAPI/TS28532_FileDataReportingMnS.yaml | 4 ++-- OpenAPI/TS28532_ProvMnS.yaml | 2 +- OpenAPI/TS28538_EdgeNrm.yaml | 2 +- OpenAPI/TS28541_5GcNrm.yaml | 2 +- OpenAPI/TS28541_NrNrm.yaml | 2 +- OpenAPI/TS28541_SliceNrm.yaml | 2 +- OpenAPI/TS28623_ComDefs.yaml | 2 +- OpenAPI/TS28623_FeatureNrm.yaml | 2 +- OpenAPI/TS28623_GenericNrm.yaml | 4 ++-- OpenAPI/TS28623_MnSRegistryNrm.yaml | 2 +- OpenAPI/TS28623_SubscriptionControlNrm.yaml | 4 ++-- 17 files changed, 20 insertions(+), 20 deletions(-) diff --git a/OpenAPI/TS28104_MdaNrm.yaml b/OpenAPI/TS28104_MdaNrm.yaml index 4577e1a28..4839ffc8e 100644 --- a/OpenAPI/TS28104_MdaNrm.yaml +++ b/OpenAPI/TS28104_MdaNrm.yaml @@ -1,7 +1,7 @@ openapi: 3.0.1 info: title: MDA NRM - version: 19.1.0 + version: 19.2.0 description: >- OAS 3.0.1 specification of the MDA NRM © 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). diff --git a/OpenAPI/TS28104_MdaReport.yaml b/OpenAPI/TS28104_MdaReport.yaml index ba2f51e3c..3244b9f61 100644 --- a/OpenAPI/TS28104_MdaReport.yaml +++ b/OpenAPI/TS28104_MdaReport.yaml @@ -1,7 +1,7 @@ openapi: 3.0.1 info: title: MDA Report - version: 19.1.0 + version: 19.2.0 description: >- OAS 3.0.1 specification of the MDA Report © 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). diff --git a/OpenAPI/TS28111_FaultNrm.yaml b/OpenAPI/TS28111_FaultNrm.yaml index 241b9a4bf..13a6967dd 100644 --- a/OpenAPI/TS28111_FaultNrm.yaml +++ b/OpenAPI/TS28111_FaultNrm.yaml @@ -1,7 +1,7 @@ openapi: 3.0.1 info: title: Fault Management NRM - version: 19.1.0 + version: 19.2.0 description: >- OAS 3.0.1 definition of the Fault Supervision MnS © 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). diff --git a/OpenAPI/TS28312_IntentExpectations.yaml b/OpenAPI/TS28312_IntentExpectations.yaml index 7b922fdbb..e0ef86a29 100644 --- a/OpenAPI/TS28312_IntentExpectations.yaml +++ b/OpenAPI/TS28312_IntentExpectations.yaml @@ -1,7 +1,7 @@ openapi: 3.0.1 info: title: Scenario specific Intent Expectations - version: 19.1.0 + version: 19.2.0 description: >- OAS 3.0.1 definition of scenario specific Intent Expectations © 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). diff --git a/OpenAPI/TS28312_IntentNrm.yaml b/OpenAPI/TS28312_IntentNrm.yaml index 0ce0ea96d..c0242f0a3 100644 --- a/OpenAPI/TS28312_IntentNrm.yaml +++ b/OpenAPI/TS28312_IntentNrm.yaml @@ -1,7 +1,7 @@ openapi: 3.0.1 info: title: Intent NRM - version: 19.1.0 + version: 19.2.0 description: >- OAS 3.0.1 definition of the Intent NRM © 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). diff --git a/OpenAPI/TS28318_DsoNrm.yaml b/OpenAPI/TS28318_DsoNrm.yaml index 161740415..5f7901bd3 100644 --- a/OpenAPI/TS28318_DsoNrm.yaml +++ b/OpenAPI/TS28318_DsoNrm.yaml @@ -1,7 +1,7 @@ openapi: 3.0.1 info: title: 3GPP NRM - version: 19.0.0 + version: 19.1.0 description: >- OAS 3.0.1 specification of the OutageAndRecoveryInfo NRM © 2025, 3GPP Organizational OutageAndRecoveryInfo Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). diff --git a/OpenAPI/TS28532_FileDataReportingMnS.yaml b/OpenAPI/TS28532_FileDataReportingMnS.yaml index 7a324b4a2..033a67bc5 100644 --- a/OpenAPI/TS28532_FileDataReportingMnS.yaml +++ b/OpenAPI/TS28532_FileDataReportingMnS.yaml @@ -1,10 +1,10 @@ openapi: 3.0.1 info: title: File Data Reporting MnS - version: 18.2.0 + version: 19.1.0 description: >- OAS 3.0.1 definition of the File Data Reporting MnS - © 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). + © 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved. externalDocs: description: 3GPP TS 28.532; Generic management services diff --git a/OpenAPI/TS28532_ProvMnS.yaml b/OpenAPI/TS28532_ProvMnS.yaml index 815bdd49a..e24a69104 100755 --- a/OpenAPI/TS28532_ProvMnS.yaml +++ b/OpenAPI/TS28532_ProvMnS.yaml @@ -1,7 +1,7 @@ openapi: 3.0.1 info: title: Provisioning MnS - version: 19.0.0 + version: 19.1.0 description: >- OAS 3.0.1 definition of the Provisioning MnS © 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). diff --git a/OpenAPI/TS28538_EdgeNrm.yaml b/OpenAPI/TS28538_EdgeNrm.yaml index 24332bb0a..90eb86cef 100644 --- a/OpenAPI/TS28538_EdgeNrm.yaml +++ b/OpenAPI/TS28538_EdgeNrm.yaml @@ -1,7 +1,7 @@ openapi: 3.0.1 info: title: 3GPP Edge NRM - version: 19.3.0 + version: 19.4.0 description: >- OAS 3.0.1 specification of the Edge NRM © 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). diff --git a/OpenAPI/TS28541_5GcNrm.yaml b/OpenAPI/TS28541_5GcNrm.yaml index f285295d0..b99e102d0 100755 --- a/OpenAPI/TS28541_5GcNrm.yaml +++ b/OpenAPI/TS28541_5GcNrm.yaml @@ -1,7 +1,7 @@ openapi: 3.0.1 info: title: 3GPP 5GC NRM - version: 19.3.0 + version: 19.4.0 description: >- OAS 3.0.1 specification of the 5GC NRM © 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). diff --git a/OpenAPI/TS28541_NrNrm.yaml b/OpenAPI/TS28541_NrNrm.yaml index 4d83d88ba..30b636f3c 100755 --- a/OpenAPI/TS28541_NrNrm.yaml +++ b/OpenAPI/TS28541_NrNrm.yaml @@ -1,7 +1,7 @@ openapi: 3.0.1 info: title: NR NRM - version: 19.3.0 + version: 19.4.0 description: >- OAS 3.0.1 specification of the NR NRM © 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). diff --git a/OpenAPI/TS28541_SliceNrm.yaml b/OpenAPI/TS28541_SliceNrm.yaml index 2fa712e57..d062e7bfd 100755 --- a/OpenAPI/TS28541_SliceNrm.yaml +++ b/OpenAPI/TS28541_SliceNrm.yaml @@ -1,7 +1,7 @@ openapi: 3.0.1 info: title: Slice NRM - version: 19.3.0 + version: 19.4.0 description: >- OAS 3.0.1 specification of the Slice NRM @ 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). diff --git a/OpenAPI/TS28623_ComDefs.yaml b/OpenAPI/TS28623_ComDefs.yaml index a07f5c6ca..7d4cb0b61 100755 --- a/OpenAPI/TS28623_ComDefs.yaml +++ b/OpenAPI/TS28623_ComDefs.yaml @@ -1,7 +1,7 @@ openapi: 3.0.1 info: title: Common Type Definitions - version: 19.3.0 + version: 19.4.0 description: >- OAS 3.0.1 specification of common type definitions in the Generic NRM © 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). diff --git a/OpenAPI/TS28623_FeatureNrm.yaml b/OpenAPI/TS28623_FeatureNrm.yaml index cb4a79611..7a37deb97 100644 --- a/OpenAPI/TS28623_FeatureNrm.yaml +++ b/OpenAPI/TS28623_FeatureNrm.yaml @@ -1,7 +1,7 @@ openapi: 3.0.1 info: title: NRM Feautres - version: 19.0.0 + version: 19.4.0 description: >- OAS 3.0.1 definition of the Features of NRM © 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). diff --git a/OpenAPI/TS28623_GenericNrm.yaml b/OpenAPI/TS28623_GenericNrm.yaml index c9b1c9b45..8d054aa95 100755 --- a/OpenAPI/TS28623_GenericNrm.yaml +++ b/OpenAPI/TS28623_GenericNrm.yaml @@ -1,10 +1,10 @@ openapi: 3.0.1 info: title: Generic NRM - version: 19.2.0 + version: 19.4.0 description: >- OAS 3.0.1 definition of the Generic NRM - © 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). + © 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved. externalDocs: description: 3GPP TS 28.623; Generic NRM diff --git a/OpenAPI/TS28623_MnSRegistryNrm.yaml b/OpenAPI/TS28623_MnSRegistryNrm.yaml index a8f703886..6c10f9b5f 100644 --- a/OpenAPI/TS28623_MnSRegistryNrm.yaml +++ b/OpenAPI/TS28623_MnSRegistryNrm.yaml @@ -1,7 +1,7 @@ openapi: 3.0.1 info: title: MnS Registry NRM - version: 19.3.0 + version: 19.4.0 description: >- OAS 3.0.1 definition of the MnS Registry NRM fragment © 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). diff --git a/OpenAPI/TS28623_SubscriptionControlNrm.yaml b/OpenAPI/TS28623_SubscriptionControlNrm.yaml index a12682a94..3e82a68ed 100644 --- a/OpenAPI/TS28623_SubscriptionControlNrm.yaml +++ b/OpenAPI/TS28623_SubscriptionControlNrm.yaml @@ -1,10 +1,10 @@ openapi: 3.0.1 info: title: Subscription Control NRM - version: 19.2.0 + version: 19.4.0 description: >- OAS 3.0.1 definition of the Subscription Control NRM fragment - © 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). + © 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved. externalDocs: description: 3GPP TS 28.623; Generic NRM, Subscription Control NRM -- GitLab From 479e526c954829407fc05145cfd53e373cd74c6d Mon Sep 17 00:00:00 2001 From: potherakallo Date: Thu, 29 May 2025 05:51:12 +0000 Subject: [PATCH 483/587] 28.623_Rel-19_CR0542 --- .../TS28623_ManagementDataCollectionNrm.yaml | 67 ++++++++++++++- OpenAPI/TS28623_MnSRegistryNrm.yaml | 82 +++++++++++++++++++ 2 files changed, 147 insertions(+), 2 deletions(-) diff --git a/OpenAPI/TS28623_ManagementDataCollectionNrm.yaml b/OpenAPI/TS28623_ManagementDataCollectionNrm.yaml index 9424693be..37b48a01a 100644 --- a/OpenAPI/TS28623_ManagementDataCollectionNrm.yaml +++ b/OpenAPI/TS28623_ManagementDataCollectionNrm.yaml @@ -4,7 +4,7 @@ info: version: 19.0.0 description: >- OAS 3.0.1 definition of the Management Data Collection NRM fragment - © 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). + © 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved. externalDocs: description: 3GPP TS 28.623; Generic NRM, Management Data Collection NRM @@ -18,6 +18,8 @@ components: properties: ManagementDataCollection: $ref: '#/components/schemas/ManagementDataCollection-Multiple' + ExternalDataType: + $ref: '#/components/schemas/ExternalDataType-Multiple' #-------Definition of generic IOCs ----------# @@ -54,6 +56,31 @@ components: - UP sst: type: integer + objectInstances: + type: array + uniqueItems: true + items: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' + + ExternalDataScope: + type: object + properties: + geoAreas: + type: array + uniqueItems: true + items: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/GeoArea' + objectInstancesIncluded: + type: array + uniqueItems: true + items: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' + objectInstancesExcluded: + type: array + uniqueItems: true + items: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' + #-------- Definition of concrete IOCs -------------------------------------------- ManagementDataCollection-Single: @@ -78,16 +105,52 @@ components: - SNSSAI - 5QI - PLMN + condition: + type: string + processMonitor: + $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ProcessMonitor' + consolidateOutput: + type: boolean + jobId: + type: string + + ExternalDataType-Single: + allOf: + - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' + - type: object + properties: + attributes: + type: object + properties: + externalDataType: + type: string + mediaLocation: + type: array + uniqueItems: true + items: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/Uri' + externalDataTypeSchema: + type: string + externalDataScope: + type: array + uniqueItems: true + items: + $ref: '#/components/schemas/ExternalDataScope' #-------- Definition of YAML arrays for name-contained IOCs ---------------------- ManagementDataCollection-Multiple: type: array items: $ref: '#/components/schemas/ManagementDataCollection-Single' - + + ExternalDataType-Multiple: + type: array + items: + $ref: '#/components/schemas/ExternalDataType-Single' #-------- Definitions in TS 28.623 for TS 28.532 --------------------------------- resources-mgmtDataCollectionNrm: oneOf: - $ref: '#/components/schemas/ManagementDataCollection-Single' + - $ref: '#/components/schemas/ExternalDataType-Single' diff --git a/OpenAPI/TS28623_MnSRegistryNrm.yaml b/OpenAPI/TS28623_MnSRegistryNrm.yaml index 6c10f9b5f..cfaceb325 100644 --- a/OpenAPI/TS28623_MnSRegistryNrm.yaml +++ b/OpenAPI/TS28623_MnSRegistryNrm.yaml @@ -62,6 +62,8 @@ components: properties: MnsInfo: $ref: '#/components/schemas/MnsInfo-Multiple' + MgmtDataInfo: + $ref: '#/components/schemas/MgmtDataInfo-Multiple' MnsInfo-Single: allOf: @@ -98,6 +100,16 @@ components: items: $ref: '#/components/schemas/MnsScope' minItems: 1 + mgmtDataInfoRef: + description: >- + List of DN of MgmtDataInfo instance(s) which are associated the MnSInfo which represent a + management service instance + type: array + items: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' + uniqueItems: true + minItems: 1 + MnsScope: description: -> It defines the information about the management scope of the Management Service. @@ -115,6 +127,71 @@ components: items: $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Tai' + MgmtDataInfo-Single: + allOf: + - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' + - type: object + properties: + supportedManagementData: + description: >- + It defines the list of management data that can be supported. + type: array + uniqueItems: true + items: + $ref: 'TS28623_ManagementDataCollectionNrm.yaml#/components/schemas/ManagementData' + supportedGranularityPeriods: + description: >- + Granularity periods supported for the production of associated management data. + The period is defined in seconds. + type: array + items: + type: integer + uniqueItems: true + supportedReportingPeriods: + description: >- + Reporting periods supported for the associated management data. + The period is defined in seconds. + type: array + items: + type: integer + uniqueItems: true + historicalDataPeriod: + description: >- + This attribute describes the maximum period of the requested + historical data. + The period is defined in seconds. + When the value of this attribute is NULL, which means the + capability of querying historical data is not supported. + type: integer + supportedReportingMethod: + description: >- + List of supported reporting methods for the associated + management data. + type: array + uniqueItems: true + items: + type: string + enum: + - FILE + - STREAM + minItems: 1 + supportedDataScope: + description: >- + List of supported sub counter capabilities for the associated management data. + type: array + uniqueItems: true + items: + type: string + enum: + - SNSSAI + - 5QI + - PLMN + minItems: 1 + supportedDataRequestMnSRef: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList' + supportedDataReportingMnSRef: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList' + #-------- Definition of YAML arrays for name-contained IOCs ---------------------- MnsInfo-Multiple: @@ -122,9 +199,14 @@ components: items: $ref: '#/components/schemas/MnsInfo-Single' + MgmtDataInfo-Multiple: + type: array + items: + $ref: '#/components/schemas/MgmtDataInfo-Single' #-------- Definitions in TS 28.623 for TS 28.532 --------------------------------- resources-mnSRegistryNrm: oneOf: - $ref: '#/components/schemas/MnsInfo-Single' - $ref: '#/components/schemas/MnsRegistry-Single' + - $ref: '#/components/schemas/MgmtDataInfo-Single' \ No newline at end of file -- GitLab From 4f5c37e4fc567e6fdb0cf04b64ec844604695e58 Mon Sep 17 00:00:00 2001 From: sunse Date: Thu, 29 May 2025 14:01:26 +0800 Subject: [PATCH 484/587] Update versions to be aligned with the version of word spec for SA plenary#108 --- OpenAPI/TS28623_ManagementDataCollectionNrm.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OpenAPI/TS28623_ManagementDataCollectionNrm.yaml b/OpenAPI/TS28623_ManagementDataCollectionNrm.yaml index 37b48a01a..5f3a20de4 100644 --- a/OpenAPI/TS28623_ManagementDataCollectionNrm.yaml +++ b/OpenAPI/TS28623_ManagementDataCollectionNrm.yaml @@ -1,7 +1,7 @@ openapi: 3.0.1 info: title: Management Data Collection NRM - version: 19.0.0 + version: 19.4.0 description: >- OAS 3.0.1 definition of the Management Data Collection NRM fragment © 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). -- GitLab From a82aec7e223fb697d647fc5940e1c34f65cc1317 Mon Sep 17 00:00:00 2001 From: lengyelb Date: Tue, 17 Jun 2025 04:11:57 +0200 Subject: [PATCH 485/587] Integration_Rel19_SA5_161_YANG_Helper into Rel-19 --- yang-models/_3gpp-5g-common-yang-types.yang | 47 +- yang-models/_3gpp-5gc-nrm-amffunction.yang | 24 +- yang-models/_3gpp-5gc-nrm-dynamic5qiset.yang | 40 +- yang-models/_3gpp-5gc-nrm-gmlcfunction.yang | 114 +++++ yang-models/_3gpp-5gc-nrm-lmffunction.yang | 8 +- yang-models/_3gpp-5gc-nrm-neffunction.yang | 7 +- yang-models/_3gpp-5gc-nrm-nfprofile.yang | 484 +++++++++++++++--- yang-models/_3gpp-5gc-nrm-nwdaffunction.yang | 6 +- .../_3gpp-5gc-nrm-predefinedpccruleset.yang | 31 +- yang-models/_3gpp-5gc-nrm-stmfunction.yang | 103 ---- yang-models/_3gpp-common-antennafunction.yang | 196 +++++++ yang-models/_3gpp-common-files.yang | 12 +- yang-models/_3gpp-common-fm.yang | 155 +++++- yang-models/_3gpp-common-managed-element.yang | 18 +- .../_3gpp-common-managed-function.yang | 279 +++++----- yang-models/_3gpp-common-measurements.yang | 3 +- yang-models/_3gpp-common-mecontext.yang | 8 +- .../_3gpp-common-sectorequipmentfunction.yang | 88 ++++ yang-models/_3gpp-common-subnetwork.yang | 47 +- .../_3gpp-common-subscription-control.yang | 144 +++++- yang-models/_3gpp-common-trace.yang | 158 +++--- yang-models/_3gpp-common-yang-types.yang | 1 + .../_3gpp-engy-nrm-energyinformation.yang | 196 +++++++ .../_3gpp-nr-nrm-danrmanagementfunction.yang | 4 +- ...3gpp-nr-nrm-drachoptimizationfunction.yang | 11 +- yang-models/_3gpp-nr-nrm-ecmappingrule.yang | 10 +- yang-models/_3gpp-nr-nrm-ep.yang | 79 ++- yang-models/_3gpp-nr-nrm-eutranetwork.yang | 57 +-- yang-models/_3gpp-nr-nrm-eutranfrequency.yang | 32 +- .../_3gpp-nr-nrm-externalamffunction.yang | 16 +- .../_3gpp-nr-nrm-externalenbfunction.yang | 32 +- .../_3gpp-nr-nrm-externaleutrancell.yang | 35 +- .../_3gpp-nr-nrm-externalgnbcucpfunction.yang | 48 +- .../_3gpp-nr-nrm-externalgnbcuupfunction.yang | 48 +- .../_3gpp-nr-nrm-externalgnbdufunction.yang | 58 ++- .../_3gpp-nr-nrm-externalnrcellcu.yang | 66 +-- ...3gpp-nr-nrm-externalservinggwfunction.yang | 8 +- .../_3gpp-nr-nrm-externalupffunction.yang | 12 +- yang-models/_3gpp-nr-nrm-gnbcucpfunction.yang | 22 +- yang-models/_3gpp-nr-nrm-gnbdufunction.yang | 14 +- yang-models/_3gpp-nr-nrm-mwab.yang | 76 +++ yang-models/_3gpp-nr-nrm-nrfrequency.yang | 40 +- yang-models/_3gpp-nr-nrm-nrnetwork.yang | 39 +- .../_3gpp-nr-nrm-nroperatorcelldu.yang | 4 +- yang-models/_3gpp-nr-nrm-ntnfunction.yang | 5 +- yang-models/_3gpp-nr-nrm-operatordu.yang | 13 +- yang-models/_3gpp-nr-nrm-rrmpolicy.yang | 16 +- yang-models/_3gpp-stm-nrm-stmfunction.yang | 191 +++++++ 48 files changed, 2343 insertions(+), 762 deletions(-) create mode 100644 yang-models/_3gpp-5gc-nrm-gmlcfunction.yang delete mode 100644 yang-models/_3gpp-5gc-nrm-stmfunction.yang create mode 100644 yang-models/_3gpp-common-antennafunction.yang create mode 100644 yang-models/_3gpp-common-sectorequipmentfunction.yang create mode 100644 yang-models/_3gpp-engy-nrm-energyinformation.yang create mode 100644 yang-models/_3gpp-nr-nrm-mwab.yang create mode 100644 yang-models/_3gpp-stm-nrm-stmfunction.yang diff --git a/yang-models/_3gpp-5g-common-yang-types.yang b/yang-models/_3gpp-5g-common-yang-types.yang index 421940541..0fd31f956 100755 --- a/yang-models/_3gpp-5g-common-yang-types.yang +++ b/yang-models/_3gpp-5g-common-yang-types.yang @@ -10,10 +10,11 @@ module _3gpp-5g-common-yang-types { contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464"; description "The model defines common types for 5G networks and network slicing. - Copyright 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + Copyright 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved."; reference "3GPP TS 28.541"; + revision 2025-03-25 { reference CR-1489 ; } revision 2024-11-01 { reference CR-1405; } revision 2024-10-06 { reference CR-1389; } revision 2024-05-24 { reference CR-1273 ; } @@ -192,6 +193,50 @@ module _3gpp-5g-common-yang-types { type string; } } + grouping TaiRangeGrp { + list plmnId { + description "PLMN ID related to the TacRange."; + min-elements 1; + max-elements 1; + key "mcc mnc"; + uses types3gpp:PLMNId; + } + + list tacRangeList { + description "The range of the TACs."; + min-elements 1; + key "start end"; + uses TacRange; + } + } + + grouping TacRange { + leaf start { + description "First value identifying the start of a TAC range, + to be used when the range of TAC's can be represented + as a hexadecimal range (e.g., TAC ranges)."; + type string { + pattern '^([A-Fa-f0-9]{4}|[A-Fa-f0-9]{6}$)'; + } + } + + leaf end { + description "Last value identifying the end of a TAC range, + to be used when the range of TAC's can be represented as + a hexadecimal range (e.g. TAC ranges)."; + type string { + pattern '^([A-Fa-f0-9]{4}|[A-Fa-f0-9]{6})$'; + } + } + + leaf nRTACpattern { + description "Pattern (regular expression according to the ECMA-262) + representing the set of TAC's belonging to this range. + A TAC value is considered part of the range if and only if the + TAC string fully matches the regular expression."; + type string; + } + } grouping SupportedFunc { leaf function { diff --git a/yang-models/_3gpp-5gc-nrm-amffunction.yang b/yang-models/_3gpp-5gc-nrm-amffunction.yang index cf6b290f2..4fe06e700 100755 --- a/yang-models/_3gpp-5gc-nrm-amffunction.yang +++ b/yang-models/_3gpp-5gc-nrm-amffunction.yang @@ -10,15 +10,17 @@ module _3gpp-5gc-nrm-amffunction { import ietf-inet-types { prefix inet; } import ietf-yang-types { prefix yang; } import _3gpp-common-top { prefix top3gpp; } - import _3gpp-5gc-nrm-nfprofile { prefix nfp3gpp; } + import _3gpp-nr-nrm-ntnfunction { prefix ntn3gpp; } + organization "3gpp SA5"; contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464"; description "AMFFunction derived from basic ManagedFunction. - Copyright 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + Copyright 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved."; reference "3GPP TS 28.541 5G Network Resource Model (NRM)"; - + + revision 2025-03-25 { reference "CR-1489 CR-1512" ; } revision 2024-11-01 { reference CR-1405; } revision 2024-10-06 { reference CR-1389; } revision 2024-04-04 { reference CR-1139; } @@ -392,7 +394,7 @@ module _3gpp-5gc-nrm-amffunction { description "The range of TAIs."; key "idx"; leaf idx { type uint32 ; } - uses nfp3gpp:TaiRangeGrp; + uses types5g3gpp:TaiRangeGrp; } list gUAMIdList { @@ -454,7 +456,10 @@ module _3gpp-5gc-nrm-amffunction { } grouping AMFFunctionGrp { - description "Represents the AMFFunction IOC"; + description "Represents the AMFFunction IOC. + This IOC contains instances of NTNTimeBasedConfig to support + time-based configuration of the following NTN related entities: + AMFFunction and EP_N2."; uses mf3gpp:ManagedFunctionGrp; list pLMNInfoList { @@ -580,6 +585,15 @@ module _3gpp-5gc-nrm-amffunction { type types3gpp:DistinguishedName; description "This is the DN of AMFSet"; } + + list NTNTimeBasedConfig { + description "This is the NTN time-based configuration."; + key id; + uses top3gpp:Top_Grp; + container attributes { + uses ntn3gpp:NTNTimeBasedConfigGrp; + } + } } augment "/me3gpp:ManagedElement" { diff --git a/yang-models/_3gpp-5gc-nrm-dynamic5qiset.yang b/yang-models/_3gpp-5gc-nrm-dynamic5qiset.yang index 12ef3c65c..9e3a4a1c0 100755 --- a/yang-models/_3gpp-5gc-nrm-dynamic5qiset.yang +++ b/yang-models/_3gpp-5gc-nrm-dynamic5qiset.yang @@ -6,16 +6,20 @@ module _3gpp-5gc-nrm-dynamic5qiset { import _3gpp-common-top { prefix top3gpp; } import _3gpp-common-subnetwork { prefix subnet3gpp; } import _3gpp-common-managed-element { prefix me3gpp; } + import _3gpp-nr-nrm-gnbdufunction { prefix gnbdu3gpp; } + import _3gpp-nr-nrm-gnbcucpfunction { prefix gnbcucp3gpp; } + import _3gpp-nr-nrm-gnbcuupfunction { prefix gnbcuup3gpp; } import _3gpp-5gc-nrm-configurable5qiset { prefix Conf5QIs3gpp; } organization "3gpp SA5"; contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464"; description "This IOC represents the dynamic 5QIs including their QoS characteristics. - Copyright 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + Copyright 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved."; reference "3GPP TS 28.541"; + revision 2025-03-25 { reference CR-1489 ; } revision 2023-09-18 { reference CR-1043 ; } revision 2022-07-28 { reference "CR-0770"; } revision 2022-01-07 { reference CR-0643; } @@ -52,11 +56,43 @@ module _3gpp-5gc-nrm-dynamic5qiset { } } - augment "/subnet3gpp:SubNetwork" { + feature Dynamic5QISetUnderSubNetwork { + description "Dynamic5QISet shall be contained under SubNetwork."; + } + augment "/subnet3gpp:SubNetwork" { + if-feature Dynamic5QISetUnderSubNetwork; uses Dynamic5QISetSubtree; } + feature Dynamic5QISetUnderManagedElement { + description "Dynamic5QISet shall be contained under ManagedElement."; + } augment "/me3gpp:ManagedElement" { + if-feature Dynamic5QISetUnderManagedElement; + uses Dynamic5QISetSubtree; + } + + feature Dynamic5QISetUnderGNBDUFunction { + description "Dynamic5QISet shall be contained under GNBDUFunction."; + } + augment "/me3gpp:ManagedElement/gnbdu3gpp:GNBDUFunction" { + if-feature Dynamic5QISetUnderGNBDUFunction; + uses Dynamic5QISetSubtree; + } + + feature Dynamic5QISetUnderGNBCUCPFunction { + description "Dynamic5QISet shall be contained under GNBCUCPFunction."; + } + augment "/me3gpp:ManagedElement/gnbcucp3gpp:GNBCUCPFunction" { + if-feature Dynamic5QISetUnderGNBCUCPFunction; + uses Dynamic5QISetSubtree; + } + + feature Dynamic5QISetUnderGNBCUUPFunction { + description "Dynamic5QISet shall be contained under GNBCUUPFunction."; + } + augment "/me3gpp:ManagedElement/gnbcuup3gpp:GNBCUUPFunction" { + if-feature Dynamic5QISetUnderGNBCUUPFunction; uses Dynamic5QISetSubtree; } } \ No newline at end of file diff --git a/yang-models/_3gpp-5gc-nrm-gmlcfunction.yang b/yang-models/_3gpp-5gc-nrm-gmlcfunction.yang new file mode 100644 index 000000000..f516d33f7 --- /dev/null +++ b/yang-models/_3gpp-5gc-nrm-gmlcfunction.yang @@ -0,0 +1,114 @@ +module _3gpp-5gc-nrm-gmlcfunction { + yang-version 1.1; + namespace "urn:3gpp:sa5:_3gpp-5gc-nrm-gmlcfunction"; + prefix gmlc3gpp; + + import _3gpp-common-managed-function { prefix mf3gpp; } + import _3gpp-common-managed-element { prefix me3gpp; } + import _3gpp-common-yang-types { prefix types3gpp; } + import _3gpp-5g-common-yang-types { prefix types5g3gpp; } + import _3gpp-common-top { prefix top3gpp; } + + organization "3GPP SA5"; + contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464"; + description "This module defines the GMLC Function IOC per 3GPP TS 28.541. + Copyright 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + TTA, TTC). All rights reserved."; + reference "3GPP TS 28.541"; + + revision 2025-03-25 { reference CR-1489 ; } + revision 2025-03-25 { + description "Initial revision."; + reference "3GPP TS 28.541"; + } + + grouping GmlcInfoGrp { + description "Information of a GMLC NF Instance (see TS 29.510, clause 6.1.6.2.41)."; + + leaf servingClientTypes { + description "Identity of the GMLC group that is served by the GMLC instance."; + type enumeration { + enum EMERGENCY_SERVICES { + description "External client for emergency services"; + } + enum VALUE_ADDED_SERVICES { + description "External client for value added services"; + } + enum PLMN_OPERATOR_SERVICES { + description "External client for PLMN operator services"; + } + enum LAWFUL_INTERCEPT_SERVICES { + description "External client for Lawful Intercept services"; + } + enum EXTERNAL_CLIENT_FOR_LAWFUL_INTERCEPT_SERVICES { + description "External client for PLMN Operator Broadcast services"; + } + enum PLMN_OPERATOR_OM { + description "External client for PLMN Operator O&M"; + } + enum PLMN_OPERATOR_ANONYMOUS_STATISTICS { + description "External client for PLMN Operator anonymous statistics"; + } + enum PLMN_OPERATOR_TARGET_MS_SERVICE_SUPPORT { + description "External client for PLMN Operator target MS service support"; + } + } + + } + leaf gmlcNumbers{ + type string{ + pattern "^[0-9]{5,15}$"; + } + description "This attribute represents each item of the array + shall carry an OctetString indicating the ISDN number of the GMLC in + international number format as described in ITU-T Rec. E.164 [94] and + shall be encoded as a TBCD-string."; + + } + } + + grouping GMLCFunctionGrp { + description "GMLC Function IOC grouping."; + uses mf3gpp:ManagedFunctionGrp; + + list pLMNInfoList { + key "idx"; + leaf idx { type uint32; } + min-elements 1; + uses types3gpp:PLMNId; + uses types5g3gpp:SNssai; + } + leaf sBIFqdn { + type string; + description "FQDN of the registered NF instance in the service-based interface."; + } + list managedNFProfile { + description "This parameter defines profile for managed NF. See TS 23.501"; + key idx; + min-elements 1; + uses types3gpp:ManagedNFProfile; + } + list commModelList { + key "groupId"; + min-elements 1; + uses types5g3gpp:CommModel; + } + list gmlcInfo { + key "idx"; + leaf idx { type uint32; } + max-elements 1; + uses GmlcInfoGrp; + } + } + augment "/me3gpp:ManagedElement" { + list GMLCFunction { + description "5G Core LMF Function defined in TS 23.501"; + key id; + uses top3gpp:Top_Grp; + container attributes { + uses GMLCFunctionGrp; + } + uses mf3gpp:ManagedFunctionContainedClasses; + } + } +} \ No newline at end of file diff --git a/yang-models/_3gpp-5gc-nrm-lmffunction.yang b/yang-models/_3gpp-5gc-nrm-lmffunction.yang index 2a612372f..b7b954153 100755 --- a/yang-models/_3gpp-5gc-nrm-lmffunction.yang +++ b/yang-models/_3gpp-5gc-nrm-lmffunction.yang @@ -9,16 +9,16 @@ module _3gpp-5gc-nrm-lmffunction { import _3gpp-common-yang-types { prefix types3gpp; } import _3gpp-5g-common-yang-types { prefix types5g3gpp; } import _3gpp-common-top { prefix top3gpp; } - import _3gpp-5gc-nrm-nfprofile { prefix nfp3gpp; } import _3gpp-nr-nrm-ntnfunction { prefix ntn3gpp; } organization "3gpp SA5"; contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464"; description "This IOC represents the LMF function defined in 3GPP TS 23.501. - Copyright 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + Copyright 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved."; reference "3GPP TS 28.541"; - + + revision 2025-03-25 { reference CR-1489 ; } revision 2024-11-01 { reference CR-1405 ; } revision 2023-09-18 { reference CR-1043 ; } revision 2019-10-25 { reference "S5-194457 S5193518"; } @@ -125,7 +125,7 @@ module _3gpp-5gc-nrm-lmffunction { min-elements 1; key idx; leaf idx { type uint32; } - uses nfp3gpp:TaiRangeGrp; + uses types5g3gpp:TaiRangeGrp; } leaf-list supportedGADShapes { diff --git a/yang-models/_3gpp-5gc-nrm-neffunction.yang b/yang-models/_3gpp-5gc-nrm-neffunction.yang index 1c48c30c8..8b65a1276 100755 --- a/yang-models/_3gpp-5gc-nrm-neffunction.yang +++ b/yang-models/_3gpp-5gc-nrm-neffunction.yang @@ -20,13 +20,14 @@ module _3gpp-5gc-nrm-neffunction { Copyright 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved."; reference "3GPP TS 28.541"; - + + revision 2025-03-25 { reference CR-1489 ; } revision 2025-01-25 { reference CR-1442 ; } revision 2024-05-18 { reference CR-1273 ; } revision 2024-04-12 { reference CR-1218 ; } revision 2023-09-18 { reference CR-1103 ; } revision 2023-09-18 { reference CR-1043 ; } - revision 2023-04-26 { reference CR-0916; } + revision 2023-04-26 { reference CR-0916 ; } revision 2022-01-07 { reference CR-0643; } revision 2020-11-06 { reference CR-0412 ; } revision 2019-10-20 { reference "initial revision"; } @@ -164,7 +165,7 @@ module _3gpp-5gc-nrm-neffunction { yext3gpp:notNotifyable; key idx; leaf idx { type uint32 ; } - uses nfp3gpp:TaiRangeGrp; + uses types5g3gpp:TaiRangeGrp; } leaf nefId { diff --git a/yang-models/_3gpp-5gc-nrm-nfprofile.yang b/yang-models/_3gpp-5gc-nrm-nfprofile.yang index 35ed626ff..354d8b8ac 100755 --- a/yang-models/_3gpp-5gc-nrm-nfprofile.yang +++ b/yang-models/_3gpp-5gc-nrm-nfprofile.yang @@ -8,14 +8,19 @@ module _3gpp-5gc-nrm-nfprofile { import ietf-inet-types { prefix inet; } import ietf-yang-types { prefix yang; } import _3gpp-5gc-nrm-nfservice { prefix nfs3gpp; } - + import _3gpp-5g-common-yang-types { prefix types5g3gpp; } + import _3gpp-5gc-nrm-nwdaffunction { prefix nwdaf3gpp; } + import _3gpp-5gc-nrm-lmffunction {prefix lmf3gpp; } + import _3gpp-5gc-nrm-gmlcfunction {prefix gmlc3gpp; } + organization "3gpp SA5"; contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464"; description "NF profile class. Copyright 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved."; reference "3GPP TS 29.510"; - + + revision 2025-03-25 { reference CR-1489 ; } revision 2025-01-25 { reference CR-1442 ; } revision 2024-04-12 { reference CR-1218 ; } revision 2023-11-18 { reference CR-1103 ; } @@ -267,7 +272,7 @@ module _3gpp-5gc-nrm-nfprofile { type string; } } - + grouping ausfInfo { leaf groupId { @@ -340,7 +345,7 @@ module _3gpp-5gc-nrm-nfprofile { min-elements 1; key idx; leaf idx { type uint32; } - uses TaiRangeGrp; + uses types5g3gpp:TaiRangeGrp; } list backupInfoAmfFailure { @@ -411,7 +416,7 @@ module _3gpp-5gc-nrm-nfprofile { min-elements 1; key idx; leaf idx { type uint32; } - uses TaiRangeGrp; + uses types5g3gpp:TaiRangeGrp; } leaf pgwFqdn { @@ -481,7 +486,76 @@ module _3gpp-5gc-nrm-nfprofile { type PduSessionType; } } - + grouping ProSeCapability { + leaf proseDirectDiscovery { + type boolean; + description "Indicates support for ProSe Direct Discovery."; + } + leaf proseDirectCommunication { + type boolean; + description "Indicates support for ProSe Direct Communication."; + } + leaf proseL2UetoNetworkRelay { + type boolean; + description "Indicates support for ProSe Layer-2 + UE-to-Network Relay.."; + } + leaf proseL3UetoNetworkRelay { + type boolean; + description "Indicates support for ProSe Layer-3 + UE-to-Network Relay."; + } + leaf proseL2RemoteUe { + type boolean; + description "Indicates support for ProSe Layer-2 + Remote UE."; + } + leaf proseL3RemoteUe { + type boolean; + description "Indicates support for ProSe Layer-3 + Remote UE."; + } + leaf proseL2UetoUeRelay { + type boolean; + description "Indicates support for ProSe Layer-2 + UE-to-UE Relay."; + } + leaf proseL3UetoUeRelay { + type boolean; + description "Indicates support for ProSe Layer-3 + UE-to-UE Relay."; + } + leaf proseL2EndUe { + type boolean; + description "Indicates support for ProSe Layer-2 End UE."; + } + leaf proseL3EndUe { + type boolean; + description "Indicates support for ProSe Layer-3 End UE."; + } + leaf proseL3IntermRelay { + type boolean; + description "Indicates support for ProSe Layer-3 + Intermediate Relay."; + } + leaf proseL3MultihopRemote { + type boolean; + description "Indicates support for ProSe Layer-3 Multihop Remote."; + } + leaf proseL3NetMultihopRelay { + type boolean; + description "Indicates support for ProSe Layer-3 Network Multihop + Relay."; + } + leaf proseL3UeMultihopRelay { + type boolean; + description "Indicates support for ProSe Layer-3 UE Multihop Relay."; + } + leaf proseL3EndUeMultihop { + type boolean; + description "Indicates support for ProSe Layer-3 End UE Multihop."; + } + } grouping pcfInfo { leaf-list dnnList { @@ -517,6 +591,11 @@ module _3gpp-5gc-nrm-nfprofile { type string; } + list proseCapability { + description "It indicates the supported ProSe Capability by the PCF."; + uses ProSeCapability; + config false; + } } grouping bsfInfo { @@ -580,7 +659,181 @@ module _3gpp-5gc-nrm-nfprofile { uses types3gpp:PLMNId; } } - + grouping pcscfInfo { + description "This data type represents the information of a P-CSCF NF Instance. + For more information, see clause 6.1.6.2.53 of TS 29.510."; + + leaf-list accessType { + description "It provides the condition of access type of the UE when + the session AMBR shall be enforced, see TS 29.512 [60].If this + attribute is included in SmfInfo, it shall contain the access type + (3GPP_ACCESS and/or NON_3GPP_ACCESS) supported by the SMF.If not + included, it shall be assumed the both access types are supported."; + type enumeration { + enum 3GPP_ACCESS; + enum NON_3GPP_ACCESS; + } + min-elements 1; + max-elements 2; + } + leaf-list dnnList { + description "It represents the DNNs supported by the PCF. The DNN, + as defined in clause 9A of TS 23.003 [13], shall contain the Network + Identifier and it may additionally contain an Operator Identifier, + as specified in TS 23.003 [13] clause 9.1.1 and 9.1.2. If the Operator + Identifier is not included, the DNN is supported for all the PLMNs in + the plmnList of the NF Profile.If not provided, the PCF can serve any + DNN."; + min-elements 1; + type string; + } + leaf-list gmFqdn { + description "This attribute represents FQDN of the P-CSCF for the Gm + interface.."; + max-elements 1; + type string; + } + leaf-list gmIpv4Addresses { + description "This attribute represents list of IPv4 addresses of of + the P-CSCF for the Gm interface."; + type inet:ipv4-address; + } + leaf-list gmIpv6Addresses { + description "This attribute represents list of IPv6 addresses of of the + P-CSCF for the Gm interface."; + type inet:ipv6-address; + } + leaf mwFqdn { + description "This attribute represents FQDN of the P-CSCF for the Mw + interface."; + type string; + } + leaf-list mwIpv4Addresses { + description "List of ranges of PLMNs (including the PLMN + IDs of the CHF instance) that can be served by the CHF instance. + If not provided, the CHF can serve any PLMN."; + type inet:ipv4-address; + } + leaf-list mwIpv6Addresses { + description "This attribute represents list of IPv4 addresses of + the P-CSCF for the Mw interface."; + type inet:ipv6-address; + } + list servedIpv4AddressRanges { + description "List of ranges of PLMNs (including the PLMN + IDs of the CHF instance) that can be served by the CHF instance. + If not provided, the CHF can serve any PLMN."; + + min-elements 1; + key "mcc mnc"; + uses types3gpp:PLMNId; + } + } + grouping HssInfoGrp { + description " Information of an HSS NF Instance"; + leaf groupID{ + description "This attribute defines the identity of the HSS group + that is served by the HSS instance.If not provided, the HSS instance + does not pertain to any HSS group."; + type string; + } + list imsiRanges { + description "This attribute defines the list of ranges of IMSIs whose + profile data is available in the HSS instance."; + min-elements 1; + key "id"; + leaf id { + description "Unique identifier for the IMSI range."; + type string; + } + uses ImsiRange; + } + list imsPrivateIdentityRanges{ + description "This attribute defines the list of ranges of IMS Private + Identities whose profile data is available in the HSS instance."; + min-elements 1; + key "id"; + leaf id { + description "Unique identifier for the IMSI range."; + type string; + } + uses IdentityRange; + } + list imsPublicIdentityRanges{ + description "This attribute defines the list of ranges of MSISDNs whose + profile data is available in the HSS instance. "; + min-elements 1; + key "id"; + leaf id { + description "Unique identifier for the IMSI range."; + type string; + } + uses IdentityRange; + } + list msisdnRanges{ + description "This attribute defines the list of ranges of IMS Public + Identities whose profile data is available in the HSS instance "; + min-elements 1; + key "id"; + leaf id { + description "Unique identifier for the IMSI range."; + type string; + } + uses IdentityRange; + } + list externalGroupIdentifiersRanges{ + description "This attribute defines the list of ranges of external + group IDs that can be served by this HSS instance.If not provided, + the HSS instance does not serve any external groups. "; + min-elements 1; + key "id"; + leaf id { + description "Unique identifier for the IMSI range."; + type string; + } + uses IdentityRange; + } + list hssDiameterAddress{ + description "This attribute defines the Diameter Address of the HSS "; + max-elements 1; + key "id"; + leaf id { + description "Unique identifier for the IMSI range."; + type string; + } + uses NetworkNodeDiameterAddress; + } + list additionalDiamAddresses{ + description "This attribute defines the Additional Diameter Addresses + of the HSS;may be present if hssDiameterAddress is present "; + min-elements 1; + key "id"; + leaf id { + description "Unique identifier for the IMSI range."; + type string; + } + uses NetworkNodeDiameterAddress; + } + + list dnnUpfInfoList { + description "List of parameters supported by the UPF per DNN."; + min-elements 1; + key dnn; + uses DnnUpfInfoItem; + } + } + grouping FiveGDdnmfInfo { + description "This data type represents the specific data for the 5G DDMF NF. + See clause 6.1.6.2.74 of TS 29.510."; + list plmnId { + description "PLMN ID for which list of supported S-NSSAI(s) + is provided."; + min-elements 1; + max-elements 1; + key "mcc mnc"; + uses types3gpp:PLMNId; + } + } grouping nrfInfoGrp { list servedUdrInfo { @@ -726,8 +979,108 @@ module _3gpp-5gc-nrm-nfprofile { min-elements 1; uses chfInfo; } + + list servedNwdafInfo { + description "This attribute contains all the nwdafInfo attributes + locally configured in the NRF or the NRF received during NF + registration. The key of the map is the nfInstanceId of which + the nwdafInfo belongs to."; + + key nfInstanceId; + leaf nfInstanceId { + description "String uniquely identifying a NF instance."; + type string; + } + + min-elements 1; + uses nwdaf3gpp:NwdafInfoGrp; + } + list servedPcscfInfoList { + description "This attribute contains all the pcscfInfo attributes + locally configured in the NRF or the NRF received during NF + registration. The key of the map is the nfInstanceId to which + the map entry belongs to."; + + key nfInstanceId; + leaf nfInstanceId { + description "String uniquely identifying a NF instance."; + type string; + } + + min-elements 1; + uses pcscfInfo; + } + list servedGmlcInfo { + description "This attribute contains all the gmlcInfo attributes + locally configured in the NRF or the NRF received during NF + registration. The key of the map is the nfInstanceId of which + the nefInfo belongs to."; + key nfInstanceId; + leaf nfInstanceId { + description "String uniquely identifying a NF instance."; + type string; + } + + min-elements 1; + uses gmlc3gpp:GmlcInfoGrp; + } + list servedLmfInfo { + description "This attribute contains all the lmfInfo attributes + locally configured in the NRF or the NRF received during NF + registration. The key of the map is the nfInstanceId of which + the lmfInfo belongs to."; + key nfInstanceId; + leaf nfInstanceId { + description "String uniquely identifying a NF instance."; + type string; + } + + min-elements 1; + uses lmf3gpp:LmfInfoGrp; + } + list servedNfInfo { + description "This attribute contains information of other NFs + without corresponding NF type specific Info extensions locally + configured in the NRF or the NRF received during NF registration. + The key of the map is the nfInstanceId of the NF. The map entry + is the NfInfo as defined in clause 5.3.229 representing the + information of a generic NF instance."; + key nfInstanceId; + leaf nfInstanceId { + description "String uniquely identifying a NF instance."; + type string; + } + + min-elements 1; + uses nfInfoGrp; + } + list servedHssInfoList { + description "This attribute contains list of HssInfo attribute + locally configured in the NRF or that the NRF received during NF + registration. The key of the map is the nfInstanceId to which the + map entry belongs to."; + key nfInstanceId; + leaf nfInstanceId { + description "String uniquely identifying a NF instance."; + type string; + } + min-elements 1; + uses HssInfoGrp; + } + list served5gDdnmfInfo { + description "This attribute contains all the 5gDdnmfInfo + attribute locally configured in the NRF or that the NRF + received during NF registration. The key of the map is + the nfInstanceId to which the map entry belongs to."; + key nfInstanceId; + leaf nfInstanceId { + description "String uniquely identifying a NF instance."; + type string; + } + min-elements 1; + uses FiveGDdnmfInfo ; + } } - list nrfInfo { description "nrfinfo"; key idx; @@ -735,6 +1088,21 @@ module _3gpp-5gc-nrm-nfprofile { max-elements 1; uses nrfInfoGrp; } + list nfInfo { + description "nrfinfo"; + key idx; + leaf idx { type uint32; } + max-elements 1; + uses nfInfoGrp; + } + grouping nfInfoGrp { + description "This data type represents the information of a + generic NF Instance. (See clause 6.1.6.2.56 TS 29.510 [23])."; + leaf nfType { + description "This parameter defines type of Network Function"; + type uint16; + } + } leaf customInfo { description "Specific data for custom Network Functions."; @@ -887,34 +1255,6 @@ module _3gpp-5gc-nrm-nfprofile { } } - grouping TacRange { - leaf start { - description "First value identifying the start of a TAC range, - to be used when the range of TAC's can be represented - as a hexadecimal range (e.g., TAC ranges)."; - type string { - pattern '^([A-Fa-f0-9]{4}|[A-Fa-f0-9]{6}$)'; - } - } - - leaf end { - description "Last value identifying the end of a TAC range, - to be used when the range of TAC's can be represented as - a hexadecimal range (e.g. TAC ranges)."; - type string { - pattern '^([A-Fa-f0-9]{4}|[A-Fa-f0-9]{6})$'; - } - } - - leaf nRTACpattern { - description "Pattern (regular expression according to the ECMA-262) - representing the set of TAC's belonging to this range. - A TAC value is considered part of the range if and only if the - TAC string fully matches the regular expression."; - type string; - } - } - grouping SnssaiUpfInfoItem { list sNssai { description "Supported S-NSSAI."; @@ -923,15 +1263,8 @@ module _3gpp-5gc-nrm-nfprofile { key "sst sd"; uses Snssai; } - - list dnnUpfInfoList { - description "List of parameters supported by the UPF per DNN."; - min-elements 1; - key dnn; - uses DnnUpfInfoItem; - } } - + grouping DnnUpfInfoItem { leaf dnn { description "String representing a Data Network."; @@ -1056,24 +1389,7 @@ module _3gpp-5gc-nrm-nfprofile { enum N9; } } - - grouping TaiRangeGrp { - list plmnId { - description "PLMN ID related to the TacRange."; - min-elements 1; - max-elements 1; - key "mcc mnc"; - uses types3gpp:PLMNId; - } - - list tacRangeList { - description "The range of the TACs."; - min-elements 1; - key "start end"; - uses TacRange; - } - } - + typedef AccessType { type enumeration { enum 3GPP_ACCESS; @@ -1158,4 +1474,48 @@ module _3gpp-5gc-nrm-nfprofile { uses Snssai; } } + grouping ImsiRange{ + leaf start{ + description "This attribute indicates the first value identifying + the start of a IMSI range. "; + type string{ + pattern "^[0-9]+$"; + } + } + leaf end{ + description "This attribute indicates the last value identifying + the end of a IMSI range."; + type string{ + pattern "^[0-9]+$"; + } + } + leaf pattern{ + description "This attribute indicates pattern (regular expression + according to the ECMA-262 dialect [75]) representing the set of + IMSIs belonging to this range. An IMSI value is considered part + of the range if and only if the IMSI string fully matches the + regular expression.Either the start and end attributes, or the + pattern attribute, shall be present."; + type string; + } + } + grouping NetworkNodeDiameterAddress { + leaf-list name{ + description "This attribute indicates the Diameter + name of the network node diameter address."; + reference " See TS 29.571 [61]. String contains a Diameter Identity + (FQDN)."; + type string; + min-elements 1; + max-elements 1; + } + leaf-list realm{ + description "This attribute indicates the Diameter realm of the + network node diameter addres. See TS 29.571 [61]. String contains + a Diameter Identity (FQDN)."; + type string; + min-elements 1; + max-elements 1; + } + } } diff --git a/yang-models/_3gpp-5gc-nrm-nwdaffunction.yang b/yang-models/_3gpp-5gc-nrm-nwdaffunction.yang index be566c2b3..3ed04046e 100755 --- a/yang-models/_3gpp-5gc-nrm-nwdaffunction.yang +++ b/yang-models/_3gpp-5gc-nrm-nwdaffunction.yang @@ -11,16 +11,16 @@ module _3gpp-5gc-nrm-nwdaffunction { import _3gpp-common-yang-extensions { prefix yext3gpp; } import _3gpp-5g-common-yang-types { prefix types5g3gpp; } import _3gpp-common-top { prefix top3gpp; } - import _3gpp-5gc-nrm-nfprofile { prefix nfp3gpp; } organization "3gpp SA5"; contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464"; description "This IOC represents the NWDAF function in 5GC. For more information about the NWDAF, see 3GPP TS 23.501. - Copyright 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + Copyright 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved."; reference "3GPP TS 28.541"; + revision 2025-03-25 { reference CR-1489 ; } revision 2024-08-07 { reference CR-1329; } revision 2024-04-12 { reference CR-1218; } revision 2023-09-18 { reference CR-1043; } @@ -203,7 +203,7 @@ module _3gpp-5gc-nrm-nwdaffunction { key idx ; leaf idx { type uint32; } description "The range of TAIs."; - uses nfp3gpp:TaiRangeGrp; + uses types5g3gpp:TaiRangeGrp; } list nwdafCapability { diff --git a/yang-models/_3gpp-5gc-nrm-predefinedpccruleset.yang b/yang-models/_3gpp-5gc-nrm-predefinedpccruleset.yang index ca2dc8cbc..34db5ada0 100755 --- a/yang-models/_3gpp-5gc-nrm-predefinedpccruleset.yang +++ b/yang-models/_3gpp-5gc-nrm-predefinedpccruleset.yang @@ -14,10 +14,12 @@ module _3gpp-5gc-nrm-predefinedpccruleset { contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464"; description "This IOC represents the predefined PCC rules, which are configured to SMF and referenced by PCF. - Copyright 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + Copyright 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved."; reference "3GPP TS 28.541"; + revision 2025-04-25 { reference CR-1520 ; } + revision 2025-03-25 { reference CR-1489 ; } revision 2023-09-18 { reference CR-1043 ; } revision 2023-04-26 { reference CR-0916; } revision 2020-10-04 { reference "CR-0393"; } @@ -608,6 +610,33 @@ module _3gpp-5gc-nrm-predefinedpccruleset { description "It contains transports TSCAI input parameters for TSC traffic at the ingress of the NW-TT (downlink flow direction)."; uses TscaiInputContainer; } + leaf easRedisIndRequired { + type boolean; + default false; + description "Indicates whether the EAS rediscovery is required for the application."; + } + leaf tscaiTimeDom { + type uint32; + description "Indicates the (g)PTP domain that the (TSN)AF is located in."; + } + leaf capBatNotificationCapable { + type boolean; + default false; + description "Indicates the capability for AF to adjust the burst sending time."; + } + leaf ueNotifEnabled { + type boolean; + default false; + description "Indicates whether QoS flow parameter signalling to the UE is enabled (TRUE), when the SMF is notified by the NG-RAN of changes in the fulfilled QoS situation,"; + } + leaf packFiltAllPrec { + type uint32; + description "Determines the order of TFT packet filter allocation for PCC rules."; + } + leaf nscSupportedFeats { + type uint32; + description "Indicates the Network Function Service Consumer features supported per service."; + } } grouping PredefinedPccRuleSetGrp { diff --git a/yang-models/_3gpp-5gc-nrm-stmfunction.yang b/yang-models/_3gpp-5gc-nrm-stmfunction.yang deleted file mode 100644 index 5ad40a9c2..000000000 --- a/yang-models/_3gpp-5gc-nrm-stmfunction.yang +++ /dev/null @@ -1,103 +0,0 @@ -module _3gpp-5gc-nrm-stmfunction { - yang-version 1.1; - - namespace urn:3gpp:sa5:_3gpp-5gc-nrm-stmfunction; - prefix stm3gpp; - - import _3gpp-common-top { prefix top3gpp; } - 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 STM function defined in 3GPP TS 28.abc. - Copyright 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, - TTA, TTC). All rights reserved."; - reference "3GPP TS 28.abc - Signalling traffic monitoring management"; - - revision 2024-11-07 { reference "S5-247077"; } - - grouping StmCtrlGrp { - description "Represents the StmCtrl IOC."; - - leaf-list reportingNFList { - type types3gpp:DistinguishedName; - description "List of Network Function Distinguished Name, which - specifies the target network interface type to be monitored. If - this parameter is not present or it is empty, then all applicable - interface types from the target NF shall be monitored"; - } - - leaf-list networkInterfaceTypeList { - type enumeration { - enum ALL; - enum N4; - enum N5; - enum N7; - enum N8; - enum N10; - enum N11; - enum N12; - enum N13; - enum N14; - enum N15; - enum N22; - enum N58; - enum N59; - enum N80; - enum N81; - } - default ALL; - description "List of network interface type. it specifies the network - function whose signalling traffic is to be monitored. If this - parameter is not present or it is empty, then all Network Functions - within the SubNetwork or ManagedElement shall be monitored. This - parameter shall be omitted if the STM control object is specified - under a ManagedFunction. "; - reference "Clause 4.2.3 of 3GPP TS 23.501 for details on the - allowed values."; - } - - leaf stmTargetUri { - type inet:uri; - mandatory true; - description "It specifies the Uniform Resource Identifier (URI) of the STM - consumer that shall receive the monitored signalling message copies "; - reference "Clause 4.4 of 3GPP TS 32.158"; - } - - leaf administrativeState { - default LOCKED; - type types3gpp:BasicAdministrativeState ; - description "It is used by the STM consumer to lock or unlock the - StmCtrl instance in order to stop or start the signalling traffic - monitoring"; - } - - leaf operationalState { - config false; - mandatory true; - type types3gpp:OperationalState ; - description "It is used by STM consumer to report its working state"; - } - } - - grouping StmCtrlSubTree { - description "Contains classes that manage Signalling traffic monitoring - management"; - - list StmCtrl { - description "This IOC represents the STM Control and Configuration - parameters of a particular STM controlling. It can be - name-contained by SubNetwork, ManagedElement, or ManagedFunction."; - - key id; - uses top3gpp:Top_Grp ; - container attributes { - uses StmCtrlGrp ; - } - - } - } -} \ No newline at end of file diff --git a/yang-models/_3gpp-common-antennafunction.yang b/yang-models/_3gpp-common-antennafunction.yang new file mode 100644 index 000000000..330c5c748 --- /dev/null +++ b/yang-models/_3gpp-common-antennafunction.yang @@ -0,0 +1,196 @@ +module _3gpp-common-antennafunction { + yang-version 1.1; + namespace "urn:3gpp:sa5:_3gpp-common-antennafunction"; + prefix "antfunc3gpp"; + + import _3gpp-common-yang-types { prefix types3gpp; } + import _3gpp-common-managed-function { prefix mf3gpp; } + import _3gpp-common-managed-element { prefix me3gpp; } + import _3gpp-common-top { prefix top3gpp; } + + organization "3GPP SA5"; + contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464"; + description "Defines the YANG mapping of the Antenna Function Information + Object Class (IOC) that is part of the Generic Network Resource Model (NRM). + Copyright 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + TTA, TTC). All rights reserved."; + reference "3GPP TS 28.662 Generic Network Resource Model (NRM)"; + + revision 2025-05-01 { description "Initial revision"; + } + grouping AntennaFunctionGrp { + description "Represents the AntennaFunction."; + uses mf3gpp:ManagedFunctionGrp; + + leaf beamTilt { + description "The beam tilt of the wanted antenna beam + in the vertical plane. A positive value on the + beamtilt indicates an antenna beam direction below the + vertical plane."; + units degree; + type types3gpp:TenthOfDegrees; + } + + leaf bearing { + description "The bearing in degrees that the antenna is pointing in. + AllowedValues: See \"Antenna bearing\" in 3GPP TS 25.463."; + reference "3GPP TS 25.463, UTRAN Iuant interface: + Remote Electrical Tilting (RET) + antennas Application Part (RETAP) signalling"; + type types3gpp:TenthOfDegrees; + } + + leaf elevation { + description "The elevation the antenna function should have, + based on World Geodetic System (1984 version) global + reference frame (WGS 84). Positive values correspond to + meters above sea level, negative values correspond to meters + below sea level. If empty, value is not defined."; + type types3gpp:Altitude; + } + + leaf horizBeamWidth { + description "The 3 dB power beamwidth of the antenna pattern + in the horizontal plane. + A value of 360 indicates an omnidirectional antenna. + Note: The value of this attribute has no operational impact + on the network, e.g. the NE behaviour is not affected by the + value setting of this attribute. + Note as well that this attribute is not supported over the + Iuant interface according to 3GPP TS37.466. + A single integral value corresponding to an angle in degrees + between 0 and 360."; + reference "3GPP TS 37.466, Iuant interface: Application part"; + type types3gpp:TenthOfDegrees; + } + + leaf latitude { + description "Latitude of transmitter antenna position. + Positive value means north, negative value means south. + + Specification: WGS 84 + Allowed Values: { -90.000000..90.000000 }"; + units degree; + type types3gpp:Latitude; + } + + leaf longititude { + description "Longitude of transmitter antenna position. + Positive value means east, negative value means west. + Specification: WGS 84 + Allowed Values: { -180.000000..180.000000 }"; + units degree; + type types3gpp:Longitude; + } + + leaf maxAzimuthValue { + description "The maximum amount of change of azimuth the RET + system can support. This is the change in degrees clockwise + from bearing. + Note: The value of this attribute has no operational impact + on the network, e.g. the NE behaviour is not affected by the + value setting of this attribute. + Note as well that this attribute is not supported over the + Iuant interface according to Ref. 3GPP TS 37.466. + A single decimal value corresponding to an angle in degrees + between 0 and 360 with a resolution of 0.1 degrees."; + reference "3GPP TS 37.466, Iuant interface: Application part"; + units degree; + type decimal64 { + range "0..360"; + fraction-digits 1; + } + } + leaf minAzimuthValue { + description "The minimum amount of change of azimuth the RET + system can support. This is the change in degrees clockwise + from bearing. + Note: The value of this attribute has no operational impact + on the network, e.g. the NE behaviour is not affected by the + value setting of this attribute. + Note as well that this attribute is not supported over the + Iuant interface according to Ref. 3GPP TS 37.466. + A single decimal value corresponding to an angle in degrees + between 0 and 360 with a resolution of 0.1 degrees."; + reference "3GPP TS 37.466, Iuant interface: Application part"; + units degree; + type decimal64 { + range "0..360"; + fraction-digits 1; + } + } + + leaf-list referencedBy { + description "This attribute contains the DNs of one or more objects + that refer to this object. + + In the case of AntennaFunction, these referring objects may + include DNs of SectorEquipmentFunction instances if associations + between them and the AntennaFunction exist. + + Note: referencedBy is a DN datatype and so can reference an MOI + under a different ME"; + config false; + type types3gpp:DistinguishedName; + } + + + leaf retGroupName { + description "The group name is a textual, alpha-numeric string to + define a logical grouping of antennas which may be in different cells. + + This attribute permits the definition of a logical grouping + of the antennas. This may be defined either at + installation time, or by management activity"; + type string; + } + + leaf retTiltValue { + description "The electrical tilt setting of the antenna, \"Tilt value\" in + 3GPP TS 37.466."; + reference "3GPP TS 37.466, Iuant interface: Application part"; + type types3gpp:TenthOfDegrees; + } + + leaf vertBeamWidth { + description "The 3 dB power beamwidth of the antenna pattern in + the vertical plane. + The value of this attribute has no operational impact on + the network, e.g. the NE behaviour is not affected by the + value setting of this attribute. + This attribute is not supported over the Iuant interface + according to Ref. 3GPP TS 37.466."; + reference "3GPP TS 37.466, Iuant interface: Application part"; + units degree; + type uint32 { + range "0..180"; + } + } + + leaf-list theCellList { + description "This attribute contains the DNs of EUtranGenericCell + or UtranGenericCell if associations between them exist. + This attribute contains the DNs of GSMCellPart if association + between them exist. "; + config false; + status deprecated; + type types3gpp:DistinguishedName; + } + + } + + augment "/me3gpp:ManagedElement" { + + list AntennaFunction { + key id; + uses top3gpp:Top_Grp; + description "This MOI represents an array of radiating elements that + may be tilted to adjust the RF coverage of a cell(s)."; + + container attributes { + uses AntennaFunctionGrp; + } + uses mf3gpp:ManagedFunctionContainedClasses; + } + } +} diff --git a/yang-models/_3gpp-common-files.yang b/yang-models/_3gpp-common-files.yang index 726292a70..cc0ba8f55 100644 --- a/yang-models/_3gpp-common-files.yang +++ b/yang-models/_3gpp-common-files.yang @@ -25,7 +25,7 @@ module _3gpp-common-files { Integration Reference Point (IRP); Information Service (IS)"; - revision 2024-05-11 { reference CR-0362 ; } + revision 2024-05-25 { reference CR-0362 ; } revision 2023-09-18 { reference CR-0271 ; } revision 2022-09-28 { reference CR-0191; } @@ -313,9 +313,13 @@ module _3gpp-common-files { the file data reporting MnS. When the file is not created at all or deleted, the 'objectClass' and 'objectInstance' parameters of the notification header are populated as described in 3GPP TS 28.532, - clause 11.6.1.1.1. Note that to receive 'notifyFilePreparationError' - in that case the notification subscription needs to include these - objects in its scope."; + clause 11.6.1.1.1. The parameter 'fileCreationErrorInfoList' + shall provide details about files and job which failed to create them. + The error information about such files shall only be emitted once, + at the time the MnS producer fails to create them, to inform the MnS + consumer about files which the node could not create. Note that to + receive 'notifyFilePreparationError' in that case the notification + subscription needs to include these objects in its scope."; key id; uses top3gpp:Top_Grp ; container attributes { diff --git a/yang-models/_3gpp-common-fm.yang b/yang-models/_3gpp-common-fm.yang index da5d3eaee..b067ace3f 100755 --- a/yang-models/_3gpp-common-fm.yang +++ b/yang-models/_3gpp-common-fm.yang @@ -7,7 +7,6 @@ module _3gpp-common-fm { import _3gpp-common-top { prefix top3gpp; } import _3gpp-common-yang-types { prefix types3gpp; } import _3gpp-common-yang-extensions { prefix yext3gpp; } - import _3gpp-common-measurements { prefix meas3gpp; } organization "3GPP SA5"; contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464"; @@ -17,10 +16,10 @@ module _3gpp-common-fm { TTA, TTC). All rights reserved."; reference "3GPP TS 28.111"; - revision 2025-02-07 { reference CR-0022 ; } + revision 2025-05-01 { reference "CR-0042 CR-0043"; } // common for R18, R19 + revision 2025-03-25 { reference "CR-0025 CR-0026"; } revision 2024-05-12 { - description "The definition of the module was moved from TS 28.623 to - TS 28.111"; + description "The definition of the module was from TS 28.623 to TS 28.111"; reference CR-0008 ; } revision 2024-03-06 { reference CR-0333 ; } @@ -44,6 +43,10 @@ module _3gpp-common-fm { typedef eventType { type enumeration { + enum OTHER { + value 1; + } + enum COMMUNICATIONS_ALARM { value 2; } @@ -106,12 +109,14 @@ module _3gpp-common-fm { type yang:date-and-time; config false; mandatory true; + yext3gpp:inVariant; description "Date and Time the comment was created."; } leaf commentUserId { type string; mandatory true; + yext3gpp:inVariant; description "It carries the identification of the user who made the comment."; } @@ -119,6 +124,7 @@ module _3gpp-common-fm { leaf commentSystemId { type string; mandatory true; + yext3gpp:inVariant; description "It carries the identification of the system ( Management System) from which the comment is made. That system supports the user that made the comment."; @@ -127,10 +133,146 @@ module _3gpp-common-fm { leaf commentText { type string; mandatory true; + yext3gpp:inVariant; description "It carries the textual comment."; } } + grouping ThresholdHysteresisGrp { + description "The ThresholdHysteresis defines the threshold boundaries to + control the hysteresis mechanism. + + The high attribute of ThresholdHysteresis identifies the higher value of + a threshold with hysteris, the integer type is used for counter + thresholds and the float type for gauge thresholds. The low attribute + of ThresholdHysteresis identifies the lower value of a threshold with + hysteresis, applicable only to gauge thresholds."; + + leaf high { + type union { + type int64; + type decimal64 { + fraction-digits 7; + } + } + mandatory true; + description "Higher value of a threshold with hysteris, the integer type + is used for counter thresholds and the float type for gauge + thresholds."; + } + + leaf low { + type decimal64 { + fraction-digits 7; + } + description "Lower value of a threshold with hysteresis, applicable + only to gauge thresholds."; + } + } + + grouping ThresholdLevelIndGrp { + description "The up attribute indicates for counter and gauge thresholds + that the threshold crossing occurred when going up. The down attribute + only indicates for gauge thresholds that the threshold crossing occurred + when going down, applicable only to gauge thresholds."; + + list up { + description "Indicates for counter and gauge thresholds that the + threshold crossing occurred when going up."; + max-elements 1; + key idx; + leaf idx { type int32; } + uses ThresholdHysteresisGrp; + } + + list down { + description "Indicates for gauge thresholds that the threshold crossing + occurred when going down, applicable only to gauge thresholds."; + max-elements 1; + key idx; + leaf idx { type int32; } + uses ThresholdHysteresisGrp; + } + } + + grouping ThresholdCrossingGrp { + description "The datatype indicates the crossed threshold + information regardless of the gauge threshold, which represents an + instantaneous value that changes over time, or the counter threshold, + which represents monotonically increasing cumulative quantity. + + The observedMeasurement attribute of TheresholdInfo specifies the name + of the monitored measurement that crossed the threshold and that + caused the notification (Rec. ITU-T X. 733[8]). The observedValue + attribute indicates the value of the gauge or counter which crossed + the threshold. This may be different from the threshold value if, for + example, the gauge may only take on discrete values. Integer values + are used for counters and float values for gauges (Rec. ITU-T X. 733). + Note that a 'number' type property can contain both integers and + floating point numbers. + + For the thresholdLevel attribute, in the case of a gauge, it specifies + a pair of threshold values, the first being the value of the crossed + threshold and the second, its corresponding hysteresis; in the case of + a counter, it specifies only the threshold value (Rec. ITU-T X. 733). + + For the armTime attribute, for a gauge threshold, it specifies the + time at which the threshold was last re-armed, namely the time after + the previous threshold crossing at which the hysteresis value of the + threshold was exceeded thus again permitting generation of + notifications when the threshold is crossed; for a counter threshold, + the later of the time at which the threshold offset was last applied, + or the time at which the counter was last initialized (for resettable + counters) (Rec. ITU-T X. 733)."; + + leaf observedMeasurement { + type string; + mandatory true; + description "The name of the monitored measurement that crossed the + threshold and that caused the notification (Rec. ITU-T X. 733 "; + } + + leaf observedValue { + type union { + type int64; + type decimal64 { + fraction-digits 7; + } + } + mandatory true; + description "The value of the gauge or counter which crossed the + threshold. This may be different from the threshold value if, for + example, the gauge may only take on discrete values. + Integer values are used for counters and float values for gauges + (Rec. ITU-T X. 733). Note that a 'number' type property can contain + both integers and floating point numbers."; + } + + list thresholdLevel { + description "In the case of a gauge the threshold level specifies + a pair of threshold values, the first being the value of the crossed + threshold and the second, its corresponding hysteresis; in the case + of a counter the threshold level specifies only the threshold value + (Rec. ITU-T X. 733)."; + max-elements 1; + key idx; + leaf idx { type int32; } + uses ThresholdLevelIndGrp; + } + + leaf armTime { + type yang:date-and-time; + description "For a gauge threshold, the time at which the threshold + was last re-armed, namely the time after the previous threshold + crossing at which the hysteresis value of the threshold was + exceeded thus again permitting generation of notifications when the + threshold is crossed. For a counter threshold, the later of the time + at which the threshold offset was last applied, or the time at + which the counter was last initialized (for resettable counters) + (Rec. ITU-T X. 733)"; + } + } + grouping AlarmRecordGrp { description "Contains alarm information of an alarmed object instance. A new record is created in the alarm list when an alarmed object @@ -262,7 +404,9 @@ module _3gpp-common-fm { config false ; yext3gpp:notNotifyable; description "Indicates the crossed threshold"; - uses meas3gpp:ThresholdInfoGrp; + key idx; + leaf idx { type int32; } + uses ThresholdCrossingGrp; } list stateChangeDefinition { @@ -344,7 +488,6 @@ module _3gpp-common-fm { } list comments { - yext3gpp:inVariant; yext3gpp:notNotifyable; description "List of comments and data about the comments."; key idx; diff --git a/yang-models/_3gpp-common-managed-element.yang b/yang-models/_3gpp-common-managed-element.yang index d8ab19d68..70e53be99 100755 --- a/yang-models/_3gpp-common-managed-element.yang +++ b/yang-models/_3gpp-common-managed-element.yang @@ -4,6 +4,7 @@ module _3gpp-common-managed-element { prefix "me3gpp"; import _3gpp-common-yang-types { prefix types3gpp ; } + import _3gpp-common-yang-extensions { prefix yext3gpp ; } import _3gpp-common-top { prefix top3gpp; } import _3gpp-common-measurements { prefix meas3gpp; } import _3gpp-common-subscription-control { prefix subscr3gpp; } @@ -13,14 +14,15 @@ module _3gpp-common-managed-element { import _3gpp-5gc-nrm-configurable5qiset { prefix fiveqi3gpp; } import _3gpp-5gc-nrm-ecmconnectioninfo { prefix econn3gpp ; } import _3gpp-nr-nrm-ecmappingrule { prefix ecmap3gpp ; } - import _3gpp-5gc-nrm-stmfunction { prefix stm3gpp; } + 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"; description "Defines ManagedElement which will be augmented by other IOCs - Copyright 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + Copyright 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved."; reference "3GPP TS 28.623 Generic Network Resource Model (NRM) @@ -35,7 +37,8 @@ module _3gpp-common-managed-element { 3GPP TS 28.620 Umbrella Information Model (UIM)"; - revision 2024-11-19 { reference "Add STM"; } + revision 2025-04-25 { reference "CR-0532 CR0541" ; } + revision 2025-03-25 { reference "CR-0516"; } revision 2024-10-01 { reference "CR-0437,CR-0438" ; } revision 2024-01-30 { reference CR-0328 ; } revision 2023-11-14 { reference CR-0305 ; } @@ -132,6 +135,10 @@ module _3gpp-common-managed-element { description "The StmCtrlSubtree shall be contained under ManagedElement"; } + feature MWABUnderManagedElement { + description "The MWAB shall be contained under ManagedElement"; + } + grouping ManagedElement_Grp { description "Abstract class representing telecommunications resources. An ME communicates with a manager (directly or indirectly) for the @@ -147,6 +154,7 @@ module _3gpp-common-managed-element { A Distingushed Name(DN) is defined by 3GPP TS 32.300, which splits the DN into a DN Prefix and Local DN"; type types3gpp:DistinguishedName; + yext3gpp:inVariant; } leaf userLabel { @@ -324,5 +332,9 @@ module _3gpp-common-managed-element { uses stm3gpp:StmCtrlSubTree { if-feature StmCtrlUnderManagedElement ; } + + uses mwab3gpp:MWABSubTree { + if-feature MWABUnderManagedElement ; + } } } diff --git a/yang-models/_3gpp-common-managed-function.yang b/yang-models/_3gpp-common-managed-function.yang index 8a012d09a..2bffe8a90 100755 --- a/yang-models/_3gpp-common-managed-function.yang +++ b/yang-models/_3gpp-common-managed-function.yang @@ -8,13 +8,13 @@ module _3gpp-common-managed-function { import _3gpp-common-top { prefix top3gpp; } import _3gpp-common-measurements { prefix meas3gpp; } import _3gpp-common-trace { prefix trace3gpp; } - import _3gpp-5gc-nrm-stmfunction { prefix stm3gpp; } + import _3gpp-stm-nrm-stmfunction { prefix stm3gpp; } organization "3GPP SA5"; contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464"; description "The module defines a base class/grouping for major 3GPP functions. - Copyright 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + Copyright 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved."; reference "3GPP TS 28.622 @@ -25,6 +25,7 @@ module _3gpp-common-managed-function { 3GPP TS 28.620 Umbrella Information Model (UIM)"; + revision 2025-04-19 { reference "CR-0541"; } revision 2024-11-19 { reference "Add STM"; } revision 2024-02-24 { reference CR-0346; } revision 2023-09-18 { reference CR-0271; } @@ -161,7 +162,131 @@ module _3gpp-common-managed-function { description "A user-friendly (and user assignable) name of this object."; } } - + grouping VnfParametersGrp { + description "This <> represents the parameter set of the VNF + instance(s) corresponding to an NE."; + + leaf vnfInstanceId { + type string ; + description "VNF instance identifier"; + reference "ETSI GS NFV-IFA 008 v2.1.1: + Network Functions Virtualisation (NFV); Management and Orchestration; + Ve-Vnfm reference point - Interface and Information Model Specification + section 9.4.2 + + ETSI GS NFV-IFA 015 v2.1.2: Network Functions Virtualisation (NFV); + Management and Orchestration; Report on NFV Information Model + section B2.4.2.1.2.3"; + } + + leaf vnfdId { + type string ; + description "Identifier of the VNFD on which the VNF instance is based. + The absence of the leaf or a string length of zero for vnfInstanceId + means the VNF instance(s) does not exist (e.g. has not been + instantiated yet, has already been terminated)."; + reference "ETSI GS NFV-IFA 008 v2.1.1: + Network Functions Virtualisation (NFV); Management and Orchestration; + Ve-Vnfm reference point - Interface and Information Model Specification + section 9.4.2"; + } + + leaf flavourId { + type string ; + description "Identifier of the VNF Deployment Flavour applied to this + VNF instance."; + reference "ETSI GS NFV-IFA 008 v2.1.1: + Network Functions Virtualisation (NFV) Management and Orchestration"; + } + + leaf autoScalable { + type boolean ; + mandatory true; + description "Indicator of whether the auto-scaling of this + VNF instance is enabled or disabled."; + } + } + + grouping PeeParametersGrp { + description "This <> represents the parameter list for the + control and monitoring of power, energy and environmental parameters + of ManagedFunction instance(s)."; + leaf idx { type uint32; } + leaf siteIdentification { + type string; + mandatory true; + description "The identification of the site where the + ManagedFunction resides."; + } + + leaf siteLatitude { + type decimal64 { + fraction-digits 4; + range "-90.0000..+90.0000"; + } + description "The latitude of the site where the ManagedFunction + instance resides, based on World Geodetic System (1984 version) + global reference frame (WGS 84). Positive values correspond to + the northern hemisphere. This attribute is optional + for BTSFunction, RNCFunction, GNBDUFunction and + NRSectorCarrier instance(s)."; + } + + leaf siteLongitude { + type decimal64 { + fraction-digits 4; + range "-180.0000..+180.0000"; + } + description "The longitude of the site where the ManagedFunction + instance resides, based on World Geodetic System (1984 version) + global reference frame (WGS 84). Positive values correspond to + degrees east of 0 degrees longitude. This attribute is optional + for BTSFunction, RNCFunction, GNBDUFunction and + NRSectorCarrier + instance(s)."; + } + + leaf siteAltitude { + type decimal64 { + fraction-digits 4; + } + description "The altitude of the site where the ManagedFunction + instance resides, in the unit of meter. This attribute is + optional for BTSFunction, RNCFunction, GNBDUFunction and + NRSectorCarrier instance(s)."; + } + + leaf siteDescription { + type string; + mandatory true; + description "An operator defined description of the site where + the ManagedFunction instance resides."; + } + + leaf equipmentType { + type string; + mandatory true; + description "The type of equipment where the managedFunction + instance resides."; + reference "clause 4.4.1 of ETSI ES 202 336-12"; + } + + leaf environmentType { + type string; + mandatory true; + description "The type of environment where the managedFunction + instance resides."; + reference "clause 4.4.1 of ETSI ES 202 336-12"; + } + + leaf powerInterface { + type string; + mandatory true; + description "The type of power."; + reference "clause 4.4.1 of ETSI ES 202 336-12"; + } + } + grouping ManagedFunctionGrp { description "Abstract root class to be inherited/reused by classes representing 3GPP functions. @@ -178,145 +303,23 @@ module _3gpp-common-managed-function { "; uses Function_Grp; - list vnfParametersList { - key vnfInstanceId; - description "Contains the parameter set of the VNF - instance(s) corresponding to an NE. - The presence of this list indicates that the ManagedFunction - represented is realized by one or more VNF instance(s). Otherwise it - shall be absent. - The presence of a vnfParametersList entry, whose vnfInstanceId with a - string length of zero, in createMO operation can trigger the - instantiation of the related VNF/VNFC instances."; - - leaf vnfInstanceId { - type string ; - description "VNF instance identifier"; - reference "ETSI GS NFV-IFA 008 v2.1.1: - Network Functions Virtualisation (NFV); Management and Orchestration; - Ve-Vnfm reference point - Interface and Information Model Specification - section 9.4.2 - - ETSI GS NFV-IFA 015 v2.1.2: Network Functions Virtualisation (NFV); - Management and Orchestration; Report on NFV Information Model - section B2.4.2.1.2.3"; - } - - leaf vnfdId { - type string ; - description "Identifier of the VNFD on which the VNF instance is based. - The absence of the leaf or a string length of zero for vnfInstanceId - means the VNF instance(s) does not exist (e.g. has not been - instantiated yet, has already been terminated)."; - reference "ETSI GS NFV-IFA 008 v2.1.1: - Network Functions Virtualisation (NFV); Management and Orchestration; - Ve-Vnfm reference point - Interface and Information Model Specification - section 9.4.2"; - } - - leaf flavourId { - type string ; - description "Identifier of the VNF Deployment Flavour applied to this - VNF instance."; - reference "ETSI GS NFV-IFA 008 v2.1.1: - Network Functions Virtualisation (NFV) Management and Orchestration"; - } - - leaf autoScalable { - type boolean ; - mandatory true; - description "Indicator of whether the auto-scaling of this - VNF instance is enabled or disabled."; - } + key "vnfInstanceId"; + uses VnfParametersGrp; + description "This attribute contains the parameter set of the VNF + instance(s) corresponding to an NE. The presence of this attribute + indicates that the ManagedFunction represented by the MOI is a + virtualized function "; } - - list peeParametersList { - key idx; - description "Contains the parameter set for the control - and monitoring of power, energy and environmental parameters of - ManagedFunction instance(s)."; - - leaf idx { type uint32; } - - leaf siteIdentification { - type string; - mandatory true; - description "The identification of the site where the - ManagedFunction resides."; - } - - leaf siteLatitude { - type decimal64 { - fraction-digits 4; - range "-90.0000..+90.0000"; - } - description "The latitude of the site where the ManagedFunction - instance resides, based on World Geodetic System (1984 version) - global reference frame (WGS 84). Positive values correspond to - the northern hemisphere. This attribute is optional - for BTSFunction, RNCFunction, GNBDUFunction and - NRSectorCarrier instance(s)."; - } - - leaf siteLongitude { - type decimal64 { - fraction-digits 4; - range "-180.0000..+180.0000"; - } - description "The longitude of the site where the ManagedFunction - instance resides, based on World Geodetic System (1984 version) - global reference frame (WGS 84). Positive values correspond to - degrees east of 0 degrees longitude. This attribute is optional - for BTSFunction, RNCFunction, GNBDUFunction and - NRSectorCarrier - instance(s)."; - } - - leaf siteAltitude { - type decimal64 { - fraction-digits 4; - } - description "The altitude of the site where the ManagedFunction - instance resides, in the unit of meter. This attribute is - optional for BTSFunction, RNCFunction, GNBDUFunction and - NRSectorCarrier instance(s)."; - } - - - leaf siteDescription { - type string; - mandatory true; - description "An operator defined description of the site where - the ManagedFunction instance resides."; - } - - leaf equipmentType { - type string; - mandatory true; - description "The type of equipment where the managedFunction - instance resides."; - reference "clause 4.4.1 of ETSI ES 202 336-12"; - } - - leaf environmentType { - type string; - mandatory true; - description "The type of environment where the managedFunction - instance resides."; - reference "clause 4.4.1 of ETSI ES 202 336-12"; - } - - leaf powerInterface { - type string; - mandatory true; - description "The type of power."; - reference "clause 4.4.1 of ETSI ES 202 336-12"; - } + list peeParameterslist{ + key "idx"; + uses PeeParametersGrp; + description "This attribute contains the parameter list for the control + and monitoring of power, energy and environmental parameters of + ManagedFunction instance(s). "; } - + leaf priorityLabel { - mandatory true; type uint32; } diff --git a/yang-models/_3gpp-common-measurements.yang b/yang-models/_3gpp-common-measurements.yang index 02df31bf7..27541b18e 100755 --- a/yang-models/_3gpp-common-measurements.yang +++ b/yang-models/_3gpp-common-measurements.yang @@ -43,7 +43,7 @@ module _3gpp-common-measurements { Measurements can be contained under ManagedElement, SubNetwork, or any list representing a class inheriting from Subnetwork or - ManagedFunction. Note: KPIs will only be supported under SubNetwork + ManagedFunction. Copyright 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved."; reference "3GPP TS 28.623 @@ -56,6 +56,7 @@ module _3gpp-common-measurements { Integration Reference Point (IRP); Information Service (IS)"; + revision 2025-05-19 { reference CR-0532; } revision 2025-02-07 { reference CR-0461; } revision 2025-01-29 { reference CR-0512; } revision 2024-11-01 { reference CR-0488; } diff --git a/yang-models/_3gpp-common-mecontext.yang b/yang-models/_3gpp-common-mecontext.yang index ed183f1a7..9f5dceae0 100644 --- a/yang-models/_3gpp-common-mecontext.yang +++ b/yang-models/_3gpp-common-mecontext.yang @@ -4,6 +4,7 @@ module _3gpp-common-mecontext { prefix "mectx3gpp"; import _3gpp-common-yang-types { prefix types3gpp; } + import _3gpp-common-yang-extensions { prefix yext3gpp ; } import _3gpp-common-top { prefix top3gpp; } import _3gpp-common-subnetwork { prefix subnet3gpp; } import ietf-yang-schema-mount { prefix yangmnt; } @@ -12,7 +13,7 @@ module _3gpp-common-mecontext { contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464"; description "Defines basic MeContext which will be augmented by other IOCs - Copyright 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + Copyright 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved."; reference "3GPP TS 28.623 Generic Network Resource Model (NRM) @@ -24,6 +25,8 @@ module _3gpp-common-mecontext { Integration Reference Point (IRP); Information Service (IS)"; + revision 2025-03-25 { reference "CR-00525"; } + revision 2025-03-24 { reference "CR-0517 CR-0516"; } revision 2024-07-17 { reference "CR-0381 CR-0382 CR-0383"; } grouping MeContextGrp { @@ -31,6 +34,7 @@ module _3gpp-common-mecontext { leaf dnPrefix { type types3gpp:DistinguishedName; + yext3gpp:inVariant; description "It carries the DN Prefix information or no information. The instance of MeContext is the local root instance of the MIB. Otherwise the attribute shall be absent or carry no information."; @@ -39,7 +43,7 @@ module _3gpp-common-mecontext { } augment "/subnet3gpp:SubNetwork" { - list Mecontext { + list MeContext { description "This IOC is introduced for naming purposes. It may support creation of unique DNs in scenarios when some MEs have the same RDNs due to the fact that they have been manufacturer pre-configured. diff --git a/yang-models/_3gpp-common-sectorequipmentfunction.yang b/yang-models/_3gpp-common-sectorequipmentfunction.yang new file mode 100644 index 000000000..985e77639 --- /dev/null +++ b/yang-models/_3gpp-common-sectorequipmentfunction.yang @@ -0,0 +1,88 @@ +module _3gpp-common-sectorequipmentfunction { + yang-version 1.1; + namespace "urn:3gpp:sa5:_3gpp-common-sectorequipmentfunction"; + prefix "scteqpfun3gpp"; + + import _3gpp-common-yang-types { prefix types3gpp; } + import _3gpp-common-managed-function { prefix mf3gpp; } + import _3gpp-common-managed-element { prefix me3gpp; } + import _3gpp-common-top { prefix top3gpp; } + + organization "3GPP SA5"; + contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464"; + description "Defines the YANG mapping of the Sector Equipment Function + Information Object Class (IOC) that is part of the Generic Network Resource + Model (NRM). + Copyright 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + TTA, TTC). All rights reserved."; + reference "3GPP TS 28.662 Generic Network Resource Model (NRM)"; + + revision 2025-05-01 { description "Initial revision"; } + + grouping SectorEquipmentFunctionGrp { + description "Represents the SectorEquipmentFunction."; + uses mf3gpp:ManagedFunctionGrp; + + leaf confOutputPower { + description "It defines the allowed total power to use for all + cells together in this sector. + It may be set by the operator and/or limited by HW limitation + or licensed power, e.g.: 20, 40, 60, 80,120 watts"; + type uint32; + } + + leaf-list fqBandList { + description "The list of frequency bands/ranges supported by the + hardware associated with the SectorEquipmentFunction. The + earfcnDl and earfcnUl or earfcn of cells associated with the + SectorEquipmentFunction must be assigned one of the specified + frequency range values within the supported range. + + Valid frequency bands/ranges may be found in 3GPP TS 25.104 (UTRA), + 36.104 (E-UTRA) and 38.104 (NR). + + AllowedValues: + Operating band id or supported frequency tuple + expressed as a string. + + Examples for NR: + Bands: {'n1', 'n12'} + Frequencies: {'1920–1980, 2110–2170, FDD', '699–716, 729–746, FDD'}"; + config false; + type string; + } + + leaf-list referencedBy { + description "This attribute contains the DNs of one or more objects + that refer to this object. + + In the case of SectorEquipmentFunction , these referring objects + may include Cells, NRSectorCarriers if associations between them + and the SectorEquipmentFunction exist. + + Note: referencedBy is a DN datatype and so can reference an MOI + under a different ME"; + config false; + type types3gpp:DistinguishedName; + } + } + + augment "/me3gpp:ManagedElement" { + list SectorEquipmentFunction { + key id; + uses top3gpp:Top_Grp; + description "This IOC represents a set of cells within a geographical + area that has common functions relating to AntennaFunction, TMAFunction + and supporting equipment, such as power amplifier."; + + must 'id != ""' { + error-message "Empty id value is not allowed."; + } + + container attributes { + uses SectorEquipmentFunctionGrp; + } + uses mf3gpp:ManagedFunctionContainedClasses; + } +} +} \ No newline at end of file diff --git a/yang-models/_3gpp-common-subnetwork.yang b/yang-models/_3gpp-common-subnetwork.yang index 59868e1c6..c94f40638 100755 --- a/yang-models/_3gpp-common-subnetwork.yang +++ b/yang-models/_3gpp-common-subnetwork.yang @@ -4,6 +4,7 @@ module _3gpp-common-subnetwork { prefix "subnet3gpp"; import _3gpp-common-yang-types { prefix types3gpp; } + import _3gpp-common-yang-extensions { prefix yext3gpp ; } import _3gpp-common-top { prefix top3gpp; } import _3gpp-common-measurements { prefix meas3gpp; } import _3gpp-common-subscription-control { prefix subscr3gpp; } @@ -14,13 +15,14 @@ module _3gpp-common-subnetwork { import _3gpp-5gc-nrm-configurable5qiset { prefix fiveqi3gpp; } import _3gpp-5gc-nrm-ecmconnectioninfo { prefix econn3gpp ; } import _3gpp-nr-nrm-ecmappingrule { prefix ecmap3gpp ; } - import _3gpp-5gc-nrm-stmfunction { prefix stm3gpp; } + 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"; description "Defines basic SubNetwork which will be augmented by other IOCs - Copyright 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + Copyright 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved."; reference "3GPP TS 28.623 Generic Network Resource Model (NRM) @@ -35,6 +37,8 @@ module _3gpp-common-subnetwork { 3GPP TS 28.620 Umbrella Information Model (UIM)"; + revision 2025-04-25 { reference "CR-0532 CR0541" ; } + revision 2025-03-25 { reference "CR-0516 CR-0527"; } revision 2024-11-19 { reference "Add STM"; } revision 2024-01-30 { reference CR-1337 ; } revision 2024-01-30 { reference CR-0328 ; } @@ -148,6 +152,10 @@ module _3gpp-common-subnetwork { description "The StmCtrlSubtree shall be contained under SubNetwork"; } + feature MWABUnderSubNetwork { + description "The MWAB shall be contained under SubNetwork"; + } + grouping Domain_Grp { description "A domain is a partition of instances of managed entities such that : @@ -158,6 +166,7 @@ module _3gpp-common-subnetwork { leaf dnPrefix { type types3gpp:DistinguishedName; + yext3gpp:inVariant; reference "Annex C of 32.300 "; } @@ -214,34 +223,13 @@ module _3gpp-common-subnetwork { list SubNetwork { key id; - description "Represents a set of managed entities"; + description "Represents a set of managed entities + Contained ManagedElements and SubNetworks shall be connected via + YANG Schema-mount."; uses top3gpp:Top_Grp; container attributes { uses SubNetworkGrp; - leaf-list parents { - description "Reference to all containg SubNetwork instances - in strict order from the root subnetwork down to the immediate - parent subnetwork. - If subnetworks form a containment hierarchy this is - modeled using references between the child SubNetwork and the parent - SubNetworks. - This reference MUST NOT be present for the top level SubNetwork and - MUST be present for other SubNetworks."; - type leafref { - path "../../../SubNetwork/id"; - } - } - - leaf-list containedChildren{ - description "Reference to all directly contained SubNetwork instances. - If subnetworks form a containment hierarchy this is - modeled using references between the child SubNetwork and the parent - SubNetwork."; - type leafref { - path "../../../SubNetwork/id"; - } - } } uses meas3gpp:MeasurementSubtree { @@ -284,8 +272,13 @@ module _3gpp-common-subnetwork { if-feature StmCtrlUnderManagedSubNetwork ; } + + uses mwab3gpp:MWABSubTree { + if-feature MWABUnderSubNetwork ; + } + yangmnt:mount-point children-of-SubNetwork { - description "Mountpoint for ManagedElement"; + description "Mountpoint for contained ManagedElements and SubNetworks"; reference "RFC8528 YANG Schema Mount"; } // augment external parts here diff --git a/yang-models/_3gpp-common-subscription-control.yang b/yang-models/_3gpp-common-subscription-control.yang index b637e1ff5..fcc5451e6 100755 --- a/yang-models/_3gpp-common-subscription-control.yang +++ b/yang-models/_3gpp-common-subscription-control.yang @@ -5,12 +5,14 @@ module _3gpp-common-subscription-control { import _3gpp-common-top { prefix top3gpp; } import _3gpp-common-yang-extensions { prefix yext3gpp; } - + import _3gpp-common-yang-types { prefix types3gpp; } + import ietf-yang-types { prefix yang; } + organization "3GPP SA5"; contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464"; description "Defines IOCs for subscription and heartbeat control. - Copyright 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + Copyright 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved."; reference "3GPP TS 28.623 Generic Network Resource Model (NRM) @@ -18,6 +20,8 @@ module _3gpp-common-subscription-control { Solution Set (SS) definitions 3GPP TS 28.623"; + revision 2025-05-13 { reference "CR-0548" ; } + revision 2025-03-24 { reference "CR-0516 0518" ; } revision 2024-05-18 { reference CR-0359 ; } revision 2024-01-18 { reference "CR-0309 CR-0329" ; } revision 2023-09-18 { reference CR-0271 ; } @@ -84,16 +88,59 @@ module _3gpp-common-subscription-control { } } case dataNodeSelector { - leaf dataNodeSelector { - type string; + container dataNodeSelector { description "The value shall follow the rules of RFC 8641 filter-spec"; - reference "RFC 8641 section 5."; + reference "RFC 8641 section 5. and ietf-yang-push.yang"; + choice dataNodeSelector { + anydata datastore-subtree-filter { + description "Subtree filter"; + reference + "RFC 6241: Network Configuration Protocol (NETCONF), Section 6"; + } + leaf datastore-xpath-filter { + type yang:xpath1.0; + description "XPath-filter"; + reference + "XML Path Language (XPath) Version 1.0 + (https://www.w3.org/TR/1999/REC-xpath-19991116) + RFC 7950: The YANG 1.1 Data Modeling Language, + Section 10"; + } + } } } } } + typedef NotificationTypes { + description "An extensible enumeration of notification types"; + type union { + type enumeration { + enum notifyMOICreation; + enum notifyMOIDeletion; + enum notifyMOIAttributeValueChanges; + enum notifyMOIChanges; + enum notifyEvent; + enum notifyNewAlarm; + enum notifyChangedAlarm; + enum notifyAckStateChanged; + enum notifyComments; + enum notifyCorrelatedNotificationChanged; + enum notifyChangedAlarmGeneral; + enum notifyClearedAlarm; + enum notifyAlarmListRebuilt; + enum notifyPotentialFaultyAlarmList; + enum notifyFileReady; + enum notifyFilePreparationError; + enum notifyThresholdCrossing ; + enum notifyPotentialFaultyDataNodeTree; + enum notifyDataNodeTreeSyncRecommended; + } + type string; + } + } + grouping NtfSubscriptionControlGrp { description "Attributes of a specific notification subscription"; @@ -103,7 +150,7 @@ module _3gpp-common-subscription-control { } leaf-list notificationTypes { - type string; + type NotificationTypes; description "Defines the types of notifications that are candidates for being forwarded to the notification recipient. If the notificationTypes attribute is not supported or not present @@ -114,7 +161,7 @@ module _3gpp-common-subscription-control { list scope { description "Scopes (selects) data nodes in an object tree."; key idx; - max-elements 8; + max-elements 1; leaf idx { type string; } uses ScopeGrp; } @@ -132,6 +179,32 @@ module _3gpp-common-subscription-control { JSON expressions (Jex) 'JexConditionsExpr'"; reference "3GPP TS 32.161"; } + + leaf lastSequenceNo { + type uint64; + config false; + mandatory true; + description "The sequence number of the last notification that was sent + by a 'NtfSubscriptionControl' instance."; + } + + leaf operationalState { + type types3gpp:OperationalState; + config false; + mandatory true; + description "Operational state of manged object instance. + The operational state describes if an object instance is operable + ('ENABLED') or inoperable ('DISABLED'). + This state is set by the object instance or the MnS producer and + is hence READ-ONLY."; + } + + leaf-list availabilityStatus { + type types3gpp:AvailabilityStatus; + config false; + description "The availability status provides additional information + about the operational state"; + } } grouping HeartbeatControlGrp { @@ -210,19 +283,68 @@ module _3gpp-common-subscription-control { When a MnS consumer does not wish to receive notifications any more the MnS consumer shall delete the corresponding NtfSubscriptionControl instance. - + When a subscription is created and the notification scope inludes the created subscription object and the subscribed notification types include notifications reporting object creation (notifyMOICreation or notifyMOIChanges), the first notification sent related to the new subscription shall report the creation of the NtfSubscriptionControl instance. Likewise, when a subscription is - deleted and the notification scope inludes the deleted subscription + deleted and the notification scope includes the deleted subscription object and the subscribed notification types include notifications reporting object deletion (notifyMOIDeletion or notifyMOIChanges), the last notification sent related to the subscription shall report the deletion of the NtfSubscriptionControl instance. - + + If multiple NtfSubscriptionControl instances are configured to send + the same notification to the same notificationRecipientAddress, then + a separate notification message shall be sent for each such + NtfSubscriptionControl instance. + + A 'NtfSubscriptionControl' class optionally supports adding a sequence + number parameter to the notification header. For each notification + sent from a 'NtfSubscriptionControl' instance to the configured + notification recipient, the sequence number is increased by one. + This allows the notification recipient to detect notifications lost or + reordered in transit. The sequence number sent last is reflected in + the 'lastSequenceNo' attribute. This allows the MnS consumer to check + if he missed notifications in situations where he did not receive + any notification for some time. + + The 'operationalState' attribute represents the operability of the + subscription. The 'availabilityStatus' further qualifies the + opertational state. Both attributes are set by the MnS producer. + + If the 'operationalState' is set to 'ENABLED' and 'availabilityStatus' + has no value the subscription process is fully operational and + notifications are forwarded to the subscribed consumer. + + If the 'operationalState' is set to 'ENABLED' and 'availabilityStatus' + is set to 'DEGRADED' the subscription process is degraded. There is + no guarantee that all notifications, that should be forwarded to the + notification recipient, are forwarded. + + If the 'operationalState' is set to 'DISABLED' and 'availabilityStatus' + is set to 'FAILED' the subscription process is not operational, and + no notifications are sent to the notification recipient. + + If the 'operationalState' is set to 'DISABLED' and 'availabilityStatus' + is set to 'DEPENDENCY' the subscription process itself has no problems + but some other process on which it depends such as downstream + processes in the event channel that feeds events into the subscription + process. As a result, events are not delivered to the subscription + process and no notifications are sent to the notification recipient. + + When the subscription process is disabled or degraded and becomes + fully operational again, the MnS producer sends- the related data node + tree change notifications to subscribed MnS consumers. The MnS consumer + may use the reception of these notifications as a trigger to synchronize + his data node tree with the data node tree on the MnS producer. + However, the state change notifications contain no information about + which part of the data node tree should be synchronized. For this + purpose the 'notifyDataNodeTreeSyncRecommended' (TS 28.532 [27]) and + 'alarmListRebuilt' (TS 28.111 [58]) notifications are provided. + Creation and deletion of NtfSubscriptionControl instances by MnS consumers is optional; when not supported, the NtfSubscriptionControl instances may be created and deleted by the system or be @@ -289,7 +411,7 @@ module _3gpp-common-subscription-control { description "Attributes of SupportedNotifications."; leaf-list notificationTypes { - type string; + type NotificationTypes; config false; description "List of notification types supported by the MnS producer"; } diff --git a/yang-models/_3gpp-common-trace.yang b/yang-models/_3gpp-common-trace.yang index a989450d9..bec576ffc 100755 --- a/yang-models/_3gpp-common-trace.yang +++ b/yang-models/_3gpp-common-trace.yang @@ -20,15 +20,15 @@ module _3gpp-common-trace { Generic Network Resource Model (NRM) Integration Reference Point (IRP); Solution Set (SS) definitions - 3GPP TS 28.622 Generic Network Resource Model (NRM) Integration Reference Point (IRP); Information Service (IS)" ; - revision 2025-02-07 { reference "CR-0504"; } + revision 2025-05-07 { reference "CR-0532 CR-0536 CR-0540" ; } + revision 2025-02-07 { reference "CR-0504" ; } revision 2025-02-05 { reference "CR-0461" ; } - revision 2024-11-25 { reference CR-0492; } + revision 2024-11-25 { reference "CR-0492" ; } revision 2024-11-07 { reference "CR-0480"; } revision 2024-10-01 { reference "CR-0457"; } revision 2024-08-13 { reference "CR-0387 CR-0377"; } @@ -1479,16 +1479,6 @@ module _3gpp-common-trace { reference "clause 5.10.38 of TS 32.422"; } - list plmnList { - when '../../../jobType = "LOGGED_MDT_ONLY"'; - key "mcc mnc"; - uses types3gpp:PLMNId; - max-elements 16; - description "It indicates the PLMNs where measurement collection, status - indication and log reporting is allowed."; - reference "Clause 5.10.24 of 3GPP TS 32.422."; - } - list areaConfigurationForNeighCells { when '../../../jobType = "LOGGED_MDT_ONLY"'; key "idx"; @@ -1599,6 +1589,15 @@ module _3gpp-common-trace { both MN and SN. The value TRUE means the MDT configuration is for MN only."; } + + list plmnList { + key "mcc mnc"; + uses types3gpp:PLMNId; + max-elements 16; + description "It indicates the PLMNs where measurement collection, status + indication and log reporting is allowed."; + reference "Clause 5.10.24 of 3GPP TS 32.422."; + } } grouping UECoreMeasConfigGrp { @@ -1750,7 +1749,6 @@ module _3gpp-common-trace { type string; yext3gpp:inVariant; description "Identifier of a TraceJob"; - yext3gpp:inVariant; } leaf traceReportingFormat { @@ -1765,8 +1763,14 @@ module _3gpp-common-trace { } list traceTarget { - key "targetIdType targetIdValue"; + key "targetIdType"; max-elements 1; + description "It specifies the target object of the Trace, MDT and + 5GC UE level measurements collection. The attribute is applicable for + Trace, MDT, and 5GC UE level measurements collection. + In case of management based Immediate MDT, RLF reporting, RCEF + reporting or RRC reposring, the traceTarget attribute shall be null + value."; leaf targetIdType { type enumeration { @@ -1781,73 +1785,75 @@ module _3gpp-common-trace { enum RNC; enum GNB; enum SUPI; + enum N4_SESSION_ID; } + description "It specifies the target object of the Trace, MDT and + 5GC UE level measurements collection. The attribute is applicable for + Trace, MDT, and 5GC UE level measurements collection. + + The targetIdType shall be PUBLIC_ID in case of a Management Based + Activation is done to an SCSCFFunction (Serving Call Session Control + Function) or PCSCFFunction (Proxy Call Session Control Function) + + The targetIdType shall be UTRAN_CELL only in case of + UTRAN cell traffic trace function. + + The targetIdType shall be E-UTRAN_CELL only in case of E-UTRAN cell + traffic trace function. + + The targetIdType shall be NG-RAN_CELL only in case of NR cell + traffic trace function. + + The targetIdType shall be either IMSI, IMEI or + IMEISV if the Trace Session is activated to any of the following + ManagedEntity(ies): + - HssFunction + - MscServerFunction + - SgsnFunction + - GgsnFunction + - BmscFunction + - RncFunction + - MmeFunction + - ServingGWFunction + - PGWFunction + + The targetIdType shall be either SUPI or IMEISV if the Trace Session + is activated to any of the following ManagedEntity(ies): + - AFFunction + - AMFFunction + - AUSFunction + - NEFFunction + - NRFFunction + - NSSFFunction + - PCFFunction + - SMFFunction + - UPFFunction + - UDMFunction + + In case of signalling based MDT, the targetIdType shall be + able to carry PUBLIC_ID, IMSI, IMEI, IMEISV or SUPI. + + In case of management based Logged MDT, the targetIdType + shall carry an eNB or a gNB or an RNC. + The Logged MDT should be initiated on the specified eNB/gNB/RNC in + targetIdValueList. + + In case of signalling based 5GC UE level measurements collection, + the targetIdTypee shall be able to carry IMEISV or SUPI. + + In case of management based 5GC UE level measurements collection, + the targetIdType shall be able to carry the corresponding + Measured UE Identifier as defined by the bullet g) of the 5GC UE + level measurements (see TS 28.558) when the TraceJob is created at + the subject ManagedEntity."; } - leaf targetIdValue { + leaf-list targetIdValueList { type string; + description "It specifies the ID value(s) of the target object defined + by traceTargetType"; } - description "Specifies the target object of the Trace and MDT. The - attribute is applicable for both Trace and MDT. This attribute - includes the ID type of the target as an enumeration and the ID value. - - The traceTarget shall be 'PUBLIC_ID' in case of a Management Based - Activation is done to an SCSCFFunction (Serving Call - Session Control Function) - or PCSCFFunction (Proxy Call Session Control Function). - The traceTarget shall be 'UTRAN_CELL' only in case of the UTRAN - cell traffic trace function. - - The traceTarget shall be 'E-UTRAN_CELL' only in case of E-UTRAN cell - traffic trace function. - - The traceTarget shall be 'NG-RAN_CELL' only in case of NR cell - traffic trace function. - - The traceTarget shall be either 'IMSI', 'IMEI' or - 'IMEISV' if the Trace Session is activated to any of the following - ManagedEntity(ies): - - HssFunction - - MscServerFunction - - SgsnFunction - - GgsnFunction - - BmscFunction - - RncFunction - - MmeFunction - - ServingGWFunction - - PGWFunction - - The traceTarget shall be either 'SUPI' or 'IMEISV' if the Trace Session - is activated to any of the followed ManagedEntity(ies): - - AFFunction - - AMFFunction - - AUSFFunction - - NEFFunction - - NRFFunction - - NSSFFunction - - PCSCFFunction - - SMFFunction - - UPFFunction - - UDMFunction - - In case of signalling based MDT, the traceTarget attribute should - be able to carry 'PUBLIC_ID', 'IMSI', 'IMEI', 'IMEISV' or 'SUPI'. - - In case of management based Immediate MDT, the traceTarget attribute - shall be null value. In case of management based Logged MDT, the - traceTarget attribute shall carry an 'eNB' or a 'gNB' or an 'RNC'. - The Logged MDT should be initiated on the specified - eNB/gNB/RNC in traceTarget. - - In case of RLF reporting, or RCEF reporting, or RRC reporting, the - traceTarget attribute shall be null value. - - In case of signalling based GC UE level measurements collection, - the traceTarget attribute shall be able to carry the corresponding - Measured UE Identifier as defined by the bullet g) of the 5GC UE - level measurements (see TS 28.558) when the TraceJob is created - at the subject ManagedEntity."; reference "3GPP TS 32.422"; } diff --git a/yang-models/_3gpp-common-yang-types.yang b/yang-models/_3gpp-common-yang-types.yang index 7590af02d..e060a1203 100755 --- a/yang-models/_3gpp-common-yang-types.yang +++ b/yang-models/_3gpp-common-yang-types.yang @@ -16,6 +16,7 @@ module _3gpp-common-yang-types { TTA, TTC). All rights reserved."; reference "3GPP TS 28.623"; + revision 2025-02-19 { reference CR-0512; } revision 2025-02-07 { reference CR-0492; } revision 2024-11-25 { reference CR-1442; } diff --git a/yang-models/_3gpp-engy-nrm-energyinformation.yang b/yang-models/_3gpp-engy-nrm-energyinformation.yang new file mode 100644 index 000000000..38b72c25e --- /dev/null +++ b/yang-models/_3gpp-engy-nrm-energyinformation.yang @@ -0,0 +1,196 @@ +module _3gpp-engy-nrm-energyinformation { + yang-version 1.1; + + namespace urn:3gpp:sa5:_3gpp-engy-nrm-energyinformation; + prefix engyinfo3gpp; + + import _3gpp-common-managed-element { prefix me3gpp; } + import _3gpp-common-subnetwork { prefix subnet3gpp; } + 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 Energy Information NRM. + Copyright 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, + TSDSI, TTA, TTC). All rights reserved."; + reference "3GPP TS 28.310"; + + revision 2025-05-07 { reference CR-0082 ; } + + + feature energyinformationUnderSubNetwork { + description "The energyinformation shall be contained under SubNetwork"; + } + + feature energyinformationUnderManagedElement { + description "The energyrelatedinformation shall be contained under + ManagedElement"; + } + + grouping EnergySourceInfoGrp { + description "This data type defines the information related to a type + of energy source. This information is configured by the operator with + the information obtained from sources external to 3GPP. The attribute + energySourceType is used to indicate the type of energy source used by + an energy supply mode to produce the energy. The attribute energySourceCef + is used to indicate the carbon emission factor of the energy source. + The attribute renewableEnergy is used to indicate if the energy source + is renewable or non-renewable. The attribute energyCompositionPercentage + is used to indicate the percentage of energy source used to produce the + energy."; + + leaf energySourceType { + type string; + mandatory true; + description "The attribute is used to indicate the type of energy source + used by an energy supply mode to produce the energy."; + } + + leaf energySourceCef { + type decimal64 { + fraction-digits 2; + } + mandatory true; + units "kg CO2eq/kWh"; + description "The attribute is used to indicate the Carbon Emission Factor + of a type of energy source. Its unit is kg CO2eq / kWh."; + } + + leaf renewableEnergy { + description "This attribute represents if the energy source is renewable + or non-renewable. This information is configured by the operator with the + information obtained from external sources."; + type boolean; + mandatory true; + } + + leaf energyCompositionPercentage { + type uint8 { + range 0..100; + } + default 100; + description "The attribute is used to indicate the percentage of energy + source type used by the energy supply mode."; + } + + } + + grouping EnergyInfoGroupGrp { + + leaf energySupplyModeRefList { + description "The list of energy supply modes for the Network Elements + of the group. This information is configured by the operator with the + information obtained from external sources."; + type types3gpp:DistinguishedName; + } + + leaf memberDNList { + description "This attribute contains the DNs of managed entities + that are members of the energy info group."; + type types3gpp:DistinguishedName; + } + + } + + grouping EnergySupplyInfoGrp { + + leaf energySupplyMode { + description "The mode by which energy is supplied to a Network Element. + This information is configured by the operator with the information + obtained from external sources.The mode can be one of the following: + GRID_ELECTRICITY: Energy from local grid electricity + (See Grid electricity in clause 6 of ITU-T Recommendation L.1333 [D]) + BACKUP_ENERGY: Energy from backup diesel or other types (from battery + banks/UPS), or from generators such as solar panels. (See Backup energy + in clause 6 of ITU-T Recommendation L.1333[D]) LOCALLY_GENERATED_ENERGY: + Energy provided by local generators not used for backup functionality, + e.g., solar panels, wind generator etc. (See Locally generated energy + in clause 6 of ITU-T Recommendation L.1333[D])"; + mandatory true; + type enumeration { + enum GRID_ELECTRICITY; + enum BACKUP_ENERGY; + enum LOCALLY_GENERATED_ENERGY; + } + } + + list energySourceList { + description "This attribute represents the list of sources used to + produce the energy by the supplier. This includes energy related + information i.e., carbon emission and renewable energy related + information, and the percentage of the energy produced using the + source."; + min-elements 1; + key idx; + leaf idx { type uint32; } + uses EnergySourceInfoGrp; + } + } + + augment "/subnet3gpp:SubNetwork" { + if-feature energyinformationUnderSubNetwork; + list EnergyInfoGroup { + description "This IOC represents a group of Network Elements, represented + by ManagedElement IOC and information related to the energy supply modes + that are used to power them. This information is configured by the + operator. Attribute memberDNList can be configured with the DNs of + ManagedElement or DNs of SubNetwork. This attribute provides the list + of Network Elements in the group, represented using ManagedElement MOIs + or represented using SubNetwork MOIs. In the case, memberDNList is + configured by DN of SubNetwork, then all the ManagedElement MOIs that + are name-contained by the SubNetwork MOI are part of the group. Attribute + energySupplyModeRefList is used to indicate the mode of energy supply + for powering the Network Elements of the group."; + key id; + uses top3gpp:Top_Grp; + container attributes { + uses EnergyInfoGroupGrp; + } + } + list EnergySupplyInfo { + description "This IOC defines the information related to energy supply + and the sources used to produce the energy. This information is configured + by the operator with the information obtained from sources external to + 3GPP e.g an energy supplier. "; + key id; + uses top3gpp:Top_Grp; + container attributes { + uses EnergyInfoGroupGrp; + } + } + } + + augment "/me3gpp:ManagedElement" { + if-feature energyinformationUnderManagedElement; + list EnergyInfoGroup { + description "This IOC represents a group of Network Elements, represented + by ManagedElement IOC and information related to the energy supply modes + that are used to power them. This information is configured by the + operator. Attribute memberDNList can be configured with the DNs of + ManagedElement or DNs of SubNetwork. This attribute provides the list + of Network Elements in the group, represented using ManagedElement MOIs + or represented using SubNetwork MOIs. In the case, memberDNList is + configured by DN of SubNetwork, then all the ManagedElement MOIs that + are name-contained by the SubNetwork MOI are part of the group. Attribute + energySupplyModeRefList is used to indicate the mode of energy supply + for powering the Network Elements of the group."; + key id; + uses top3gpp:Top_Grp; + container attributes { + uses EnergyInfoGroupGrp; + } + } + list EnergySupplyInfo { + description "This IOC defines the information related to energy supply + and the sources used to produce the energy. This information is configured + by the operator with the information obtained from sources external to + 3GPP e.g an energy supplier. "; + key id; + uses top3gpp:Top_Grp; + container attributes { + uses EnergyInfoGroupGrp; + } + } + } +} \ No newline at end of file diff --git a/yang-models/_3gpp-nr-nrm-danrmanagementfunction.yang b/yang-models/_3gpp-nr-nrm-danrmanagementfunction.yang index 3260d3646..5dbbc4e4f 100755 --- a/yang-models/_3gpp-nr-nrm-danrmanagementfunction.yang +++ b/yang-models/_3gpp-nr-nrm-danrmanagementfunction.yang @@ -11,10 +11,11 @@ module _3gpp-nr-nrm-danrmanagementfunction { contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464"; description "Defines the YANG mapping of the DANRManagementFunction IOC that is part of the NR Network Resource Model (NRM). - Copyright 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + Copyright 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved."; reference "3GPP TS 28.541 5G Network Resource Model (NRM)"; + revision 2025-05-06 { reference "CR-1526 CR-1527" ; } // common for R18, R19 revision 2024-08-19 { reference CR-1314 ; } revision 2023-09-18 { reference CR-1043 ; } revision 2020-05-08 { reference S5-203316; } @@ -40,6 +41,7 @@ module _3gpp-nr-nrm-danrmanagementfunction { description "This IOC contains attributes to support the D-SON function of ANR Management (See clause 6.4.1.3 in TS 28.313 ."; key id; + max-elements 1; uses top3gpp:Top_Grp; container attributes { uses DANRManagementFunctionGrp; diff --git a/yang-models/_3gpp-nr-nrm-drachoptimizationfunction.yang b/yang-models/_3gpp-nr-nrm-drachoptimizationfunction.yang index 399bd2bfd..6b4ac81bb 100755 --- a/yang-models/_3gpp-nr-nrm-drachoptimizationfunction.yang +++ b/yang-models/_3gpp-nr-nrm-drachoptimizationfunction.yang @@ -14,10 +14,11 @@ module _3gpp-nr-nrm-drachoptimizationfunction { description "Defines the YANG mapping of the DRACHOptimizationFunction Information Object Class (IOC) that is part of the NR Network Resource Model (NRM). - Copyright 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + Copyright 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved."; reference "3GPP TS 28.541 5G Network Resource Model (NRM)"; + revision 2025-03-25 { reference CR-1504 ; } revision 2023-09-18 { reference CR-1043 ; } revision 2021-08-05 { reference S5-214053/CR-0518; } revision 2021-01-25 { reference CR-0454 ; } @@ -52,7 +53,13 @@ module _3gpp-nr-nrm-drachoptimizationfunction { type TargetProbabilityT; } leaf numberofpreamblessent { - description "This attribute determines the number of preambles sent."; + description "This attribute indicates the number of preambles sent + used to configure a wanted distribution of RACH preambles in a + vendor implemented DRACH optimisation function. + Note: The DRACH optimization function may configure preambleTransMax + as defined in TS 38.331 [54]. The allowed values for preambleTransMax + are 3, 4, 5, 6, 7, 8, 10, 20, 50, 100, 200 (see 38.331 [54], + subclause 6.3.2)."; mandatory true; type NumberofpreamblessentT; } diff --git a/yang-models/_3gpp-nr-nrm-ecmappingrule.yang b/yang-models/_3gpp-nr-nrm-ecmappingrule.yang index ac5fbfe30..00f44bc9a 100644 --- a/yang-models/_3gpp-nr-nrm-ecmappingrule.yang +++ b/yang-models/_3gpp-nr-nrm-ecmappingrule.yang @@ -13,7 +13,8 @@ module _3gpp-nr-nrm-ecmappingrule { TTA, TTC). All rights reserved."; reference "3GPP TS 28.541"; - revision 2024-08-21 { reference CR-1337 ; } + revision 2025-05-06 { reference "CR-1526 CR-1527" ; } // common for R18, R19 + revision 2024-08-12 { reference "CR-1336 CR-1337"; } grouping NRECMappingRuleGrp { description "Represents the unified mapping rule to support Energy Cost Mapping @@ -43,11 +44,16 @@ module _3gpp-nr-nrm-ecmappingrule { grouping NRECMappingRuleSubtree { description "Helps augmenting NRECMappingRule into multiple places."; list NRECMappingRule { + description "Represents the unified mapping rule, applicable for the + group of gNBs (within a certain area), for the calculation of the + energy cost (see TS 34.423). + + NRECMappingRule can be name-contained by SubNetwork or ManagedElement. + It applies to all ManagedEntity contained by the parent."; key id; uses top3gpp:Top_Grp; min-elements 1; max-elements 1; - leaf idx { type uint32; } container attributes { uses NRECMappingRuleGrp; } diff --git a/yang-models/_3gpp-nr-nrm-ep.yang b/yang-models/_3gpp-nr-nrm-ep.yang index 927bc49b1..60bc8091f 100755 --- a/yang-models/_3gpp-nr-nrm-ep.yang +++ b/yang-models/_3gpp-nr-nrm-ep.yang @@ -15,10 +15,11 @@ module _3gpp-nr-nrm-ep { description "Defines the YANG mapping of the NR related endpoint Information Object Classes (IOCs) that are part of the NR Network Resource Model (NRM). - Copyright 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + Copyright 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved."; reference "3GPP TS 28.541 5G Network Resource Model (NRM)"; + revision 2025-05-06 { reference "CR-1526 CR-1527" ; } // common for R18, R19 revision 2023-09-18 { reference CR-1043 ; } revision 2022-01-07 { reference CR-0643; } revision 2021-05-01 { reference CR-0490; } @@ -46,16 +47,30 @@ module _3gpp-nr-nrm-ep { uses eprp3gpp:EP_Common; } - grouping EP_F1CGrp { - description "Represents the EP_F1C IOC."; - reference "3GPP TS 28.541, 3GPP TS 38.470"; - uses eprp3gpp:EP_Common; + grouping EP_F1CSubtree { + list EP_F1C { + description "Represents the local end point of the control plane + interface (F1-C) between the gNB-DU and gNB-CU or gNB-CU-CP."; + reference "3GPP TS 28.541, 3GPP TS 38.470"; + key id; + uses top3gpp:Top_Grp; + container attributes { + uses eprp3gpp:EP_Common; + } + } } - grouping EP_F1UGrp { - description "Represents the EP_F1U IOC."; - reference "3GPP TS 28.541, 3GPP TS 38.470"; - uses eprp3gpp:EP_Common; + grouping EP_F1USubtree { + list EP_F1U { + description "Represents the local end point of the user plane + interface (F1-U) between the gNB-DU and gNB-CU or gNB-CU-UP."; + reference "3GPP TS 28.541, 3GPP TS 38.470"; + key id; + uses top3gpp:Top_Grp; + container attributes { + uses eprp3gpp:EP_Common; + } + } } grouping EP_XnCGrp { @@ -114,16 +129,7 @@ module _3gpp-nr-nrm-ep { } } - list EP_F1C { - description "Represents the local end point of the control plane - interface (F1-C) between the gNB-DU and gNB-CU or gNB-CU-CP."; - reference "3GPP TS 28.541, 3GPP TS 38.470"; - key id; - uses top3gpp:Top_Grp; - container attributes { - uses EP_F1CGrp; - } - } + uses EP_F1CSubtree; list EP_NgC { description "Represents the local end point of the control plane @@ -176,16 +182,7 @@ module _3gpp-nr-nrm-ep { } } - list EP_F1U { - description "Represents the local end point of the user plane - interface (F1-U) between the gNB-DU and gNB-CU or gNB-CU-UP."; - reference "3GPP TS 28.541, 3GPP TS 38.470"; - key id; - uses top3gpp:Top_Grp; - container attributes { - uses EP_F1UGrp; - } - } + uses EP_F1USubtree; list EP_NgU { description "Represents the local end point of the NG user plane @@ -236,26 +233,12 @@ module _3gpp-nr-nrm-ep { augment "/me3gpp:ManagedElement/gnbdu3gpp:GNBDUFunction" { if-feature EPClassesUnderGNBDUFunction; - list EP_F1C { - description "Represents the local end point of the control plane - interface (F1-C) between the DU and CU or CU-CP."; - reference "3GPP TS 28.541, 3GPP TS 38.470"; - key id; - uses top3gpp:Top_Grp; - container attributes { - uses EP_F1CGrp; - } - } - - list EP_F1U { - description "Represents the local end point of the user plane - interface (F1-U) between the DU and CU or CU-UP."; - reference "3GPP TS 28.541, 3GPP TS 38.470"; - key id; - uses top3gpp:Top_Grp; - container attributes { - uses EP_F1UGrp; + uses EP_F1CSubtree { + refine EP_F1C { + max-elements 1; } } + + uses EP_F1USubtree; } } \ No newline at end of file diff --git a/yang-models/_3gpp-nr-nrm-eutranetwork.yang b/yang-models/_3gpp-nr-nrm-eutranetwork.yang index 3958b9c1a..ab7dc74f8 100755 --- a/yang-models/_3gpp-nr-nrm-eutranetwork.yang +++ b/yang-models/_3gpp-nr-nrm-eutranetwork.yang @@ -3,62 +3,35 @@ module _3gpp-nr-nrm-eutranetwork { namespace "urn:3gpp:sa5:_3gpp-nr-nrm-eutranetwork"; prefix "eutranet3gpp"; - import _3gpp-common-subnetwork { prefix subnet3gpp; } + import _3gpp-common-managed-element { prefix me3gpp; } + import _3gpp-nr-nrm-gnbcucpfunction { prefix gnbcucp3gpp; } import _3gpp-common-top { prefix top3gpp; } organization "3GPP SA5"; + contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464"; description "Defines the YANG mapping of the EUtraNetwork Information Object Class (IOC) that is part of the NR Network Resource Model (NRM). Copyright 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved."; reference "3GPP TS 28.541 5G Network Resource Model (NRM)"; + revision 2025-04-25 { reference "CR-1526 CR-1527" ; } // common for r18, r19 revision 2023-09-18 { reference CR-1043 ; } - revision 2019-06-17 { - description "Initial revision"; - } - - feature ExternalsUnderEUtraNetwork { - description "Classes representing external entities like EUtranFrequency, - ExternalENBFunction are contained under a EUtraNetwork list/class."; - } + revision 2019-06-17 {reference "Initial revision"; } grouping EUtraNetworkGrp { - description "Represents the EUtraNetwork IOC."; - reference "3GPP TS 28.541"; - uses subnet3gpp:SubNetworkGrp; + description "Represents the EUtraNetwork IOC. + Contains no additiona attributes."; } - list EUtraNetwork { - description "A subnetwork containing gNB external E-UTRAN entities."; - reference "3GPP TS 28.541"; - key id; - uses top3gpp:Top_Grp; - container attributes { - uses EUtraNetworkGrp; - leaf-list parents { - description "Reference to all containg EUtraNetwork instances - in strict order from the root EUtraNetwork down to the immediate - parent EUtraNetwork. - If EUtraNetworks form a containment hierarchy this is - modeled using references between the child EUtraNetwork and the parent - EUtraNetworks. - This reference MUST NOT be present for the top level EUtraNetwork and - MUST be present for other EUtraNetworks."; - type leafref { - path "../../../EUtraNetwork/id"; - } - } - - leaf-list containedChildren{ - description "Reference to all directly contained EUtraNetwork instances. - If EUtraNetworks form a containment hierarchy this is - modeled using references between the child EUtraNetwork and the parent - EUtraNetwork."; - type leafref { - path "../../../EUtraNetwork/id"; - } - } + augment /me3gpp:ManagedElement/gnbcucp3gpp:GNBCUCPFunction { + list EUtraNetwork { + description "A subnetwork containing gNB external E-UTRAN entities."; + key id; + uses top3gpp:Top_Grp; + container attributes { + uses EUtraNetworkGrp; + } } } } \ No newline at end of file diff --git a/yang-models/_3gpp-nr-nrm-eutranfrequency.yang b/yang-models/_3gpp-nr-nrm-eutranfrequency.yang index 0698485b4..70508b134 100755 --- a/yang-models/_3gpp-nr-nrm-eutranfrequency.yang +++ b/yang-models/_3gpp-nr-nrm-eutranfrequency.yang @@ -3,29 +3,29 @@ module _3gpp-nr-nrm-eutranfrequency { namespace "urn:3gpp:sa5:_3gpp-nr-nrm-eutranfrequency"; prefix "eutraneteutranfreq3gpp"; - import _3gpp-common-managed-function { prefix mf3gpp; } + import _3gpp-common-managed-element { prefix me3gpp; } + import _3gpp-nr-nrm-gnbcucpfunction { prefix gnbcucp3gpp; } import _3gpp-nr-nrm-eutranetwork { prefix eutranet3gpp; } import _3gpp-common-subnetwork { prefix subnet3gpp; } import _3gpp-common-top { prefix top3gpp; } organization "3GPP SA5"; + contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464"; description "Defines the YANG mapping of the EUtranFrequency Information Object Class (IOC), that is part of the NR Network Resource Model (NRM). - Copyright 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + Copyright 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved."; reference "3GPP TS 28.541 5G Network Resource Model (NRM), 3GPP TS 28.658 (E-UTRAN) Network Resource Model (NRM)"; + revision 2025-04-25 { reference "CR-1526 CR-1527" ; } // common for r18, r19 revision 2023-09-18 { reference CR-1043 ; } revision 2019-10-28 { reference S5-193518 ; } - revision 2019-06-17 { - description "Initial revision"; - } + revision 2019-06-17 { reference "Initial revision"; } grouping EUtranFrequencyGrp { description "Represents the EUtranFrequency IOC."; reference "3GPP TS 28.541"; - uses mf3gpp:ManagedFunctionGrp; leaf earfcnDL { description "Specifies the channel number for the central DL frequency."; @@ -51,17 +51,25 @@ module _3gpp-nr-nrm-eutranfrequency { container attributes { uses EUtranFrequencyGrp; } - uses mf3gpp:ManagedFunctionContainedClasses; } } + feature EUtranFrequencyUnderSubNetwork { + description "The EUtranFrequency shall be contained under SubNetwork"; + } + augment "/subnet3gpp:SubNetwork" { - if-feature subnet3gpp:ExternalsUnderSubNetwork ; - uses EUtranFrequencyWrapper ; + if-feature EUtranFrequencyUnderSubNetwork ; + uses EUtranFrequencyWrapper; } - augment "/eutranet3gpp:EUtraNetwork" { - if-feature eutranet3gpp:ExternalsUnderEUtraNetwork; - uses EUtranFrequencyWrapper ; + feature EUtranFrequencyUnderEUtraNetwork { + description "The EUtranFrequency shall be contained under EUtraNetwork"; + } + + augment "/me3gpp:ManagedElement/gnbcucp3gpp:GNBCUCPFunction/" + + "eutranet3gpp:EUtraNetwork" { + if-feature EUtranFrequencyUnderEUtraNetwork; + uses EUtranFrequencyWrapper; } } \ No newline at end of file diff --git a/yang-models/_3gpp-nr-nrm-externalamffunction.yang b/yang-models/_3gpp-nr-nrm-externalamffunction.yang index eb0547390..f74c5d3a0 100755 --- a/yang-models/_3gpp-nr-nrm-externalamffunction.yang +++ b/yang-models/_3gpp-nr-nrm-externalamffunction.yang @@ -5,26 +5,24 @@ module _3gpp-nr-nrm-externalamffunction { import _3gpp-common-managed-function { prefix mf3gpp; } import _3gpp-common-subnetwork { prefix subnet3gpp; } - import _3gpp-nr-nrm-nrnetwork { prefix nrnet3gpp; } import _3gpp-common-top { prefix top3gpp; } import _3gpp-common-yang-types { prefix types3gpp; } organization "3GPP SA5"; + contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464"; description "Defines the YANG mapping of the ExternalAMFFunction Information Object Class (IOC) that is part of the NR Network Resource Model (NRM). - Copyright 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + Copyright 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved."; reference "3GPP TS 28.541 5G Network Resource Model (NRM)"; + revision 2025-04-25 { reference "CR-1526 CR-1527" ; } // common for r18, r19 revision 2023-09-18 { reference CR-1043 ; } revision 2019-10-28 { reference S5-193518 ; } - revision 2019-06-17 { - description "Initial revision"; - } + revision 2019-06-17 { reference "Initial revision"; } grouping ExternalAMFFunctionGrp { description "Represents the ExternalAMFFunction IOC."; - reference "3GPP TS 28.541"; uses mf3gpp:ManagedFunctionGrp; list pLMNIdList { @@ -61,12 +59,6 @@ module _3gpp-nr-nrm-externalamffunction { } augment "/subnet3gpp:SubNetwork" { - if-feature subnet3gpp:ExternalsUnderSubNetwork ; - uses ExternalAMFFunctionWrapper; - } - - augment "/nrnet3gpp:NRNetwork" { - if-feature nrnet3gpp:ExternalsUnderNRNetwork; uses ExternalAMFFunctionWrapper; } } \ No newline at end of file diff --git a/yang-models/_3gpp-nr-nrm-externalenbfunction.yang b/yang-models/_3gpp-nr-nrm-externalenbfunction.yang index cdb1611c4..ed8cb6683 100755 --- a/yang-models/_3gpp-nr-nrm-externalenbfunction.yang +++ b/yang-models/_3gpp-nr-nrm-externalenbfunction.yang @@ -4,24 +4,27 @@ module _3gpp-nr-nrm-externalenbfunction { prefix "extenb3gpp"; import _3gpp-common-managed-function { prefix mf3gpp; } - import _3gpp-nr-nrm-eutranetwork { prefix eutranet3gpp; } import _3gpp-common-subnetwork { prefix subnet3gpp; } + import _3gpp-common-managed-element { prefix me3gpp; } + import _3gpp-nr-nrm-gnbcucpfunction { prefix gnbcucp3gpp; } + import _3gpp-nr-nrm-eutranetwork { prefix eutranet3gpp; } + import _3gpp-nr-nrm-externaleutrancell { prefix exteutrancell3gpp; } import _3gpp-common-top { prefix top3gpp; } organization "3GPP SA5"; + contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464"; description "Defines the YANG mapping of the ExternalENBFunction Information Object Class (IOC) that is part of the NR Network Resource Model (NRM). - Copyright 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + Copyright 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved."; reference "3GPP TS 28.541 5G Network Resource Model (NRM), 3GPP TS 28.658 (E-UTRAN) Network Resource Model (NRM)"; + revision 2025-04-25 { reference "CR-1526 CR-1527" ; } // common for r18, r19 revision 2023-09-18 { reference CR-1043 ; } revision 2019-10-28 { reference S5-193518 ; } - revision 2019-06-17 { - description "Initial revision"; - } + revision 2019-06-17 { reference "Initial revision"; } grouping ExternalENBFunctionGrp { description "Represets the ExternalENBFunction IOC."; @@ -48,16 +51,29 @@ module _3gpp-nr-nrm-externalenbfunction { uses ExternalENBFunctionGrp; } uses mf3gpp:ManagedFunctionContainedClasses; + uses exteutrancell3gpp:ExternalEUtranCellFDDSubtree; + uses exteutrancell3gpp:ExternalEUtranCellTDDSubtree; } } + feature ExternalENBFunctionUnderSubNetwork { + description "The ExternalENBFunction shall be contained under + SubNetwork"; + } + augment "/subnet3gpp:SubNetwork" { - if-feature subnet3gpp:ExternalsUnderSubNetwork ; + if-feature ExternalENBFunctionUnderSubNetwork ; uses ExternalENBFunctionWrapper; } - augment "/eutranet3gpp:EUtraNetwork" { - if-feature eutranet3gpp:ExternalsUnderEUtraNetwork; + feature ExternalENBFunctionUnderEUtraNetwork { + description "The ExternalENBFunction shall be contained under + EUtraNetwork"; + } + + augment "/me3gpp:ManagedElement/gnbcucp3gpp:GNBCUCPFunction/" + + "eutranet3gpp:EUtraNetwork" { + if-feature ExternalENBFunctionUnderEUtraNetwork; uses ExternalENBFunctionWrapper; } } \ No newline at end of file diff --git a/yang-models/_3gpp-nr-nrm-externaleutrancell.yang b/yang-models/_3gpp-nr-nrm-externaleutrancell.yang index d3306bc8c..2a5ff1f39 100755 --- a/yang-models/_3gpp-nr-nrm-externaleutrancell.yang +++ b/yang-models/_3gpp-nr-nrm-externaleutrancell.yang @@ -5,25 +5,22 @@ module _3gpp-nr-nrm-externaleutrancell { import _3gpp-common-yang-types { prefix types3gpp; } import _3gpp-common-managed-function { prefix mf3gpp; } - import _3gpp-common-subnetwork { prefix subnet3gpp; } - import _3gpp-nr-nrm-eutranetwork { prefix eutranet3gpp; } - import _3gpp-nr-nrm-externalenbfunction { prefix extenb3gpp; } import _3gpp-common-top { prefix top3gpp; } organization "3GPP SA5"; + contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464"; description "Defines the YANG mapping of the ExternalEUtranCellFDD and ExternalEUtranCellTDD Information Object Classes (IOCs) that are part of the NR Network Resource Model (NRM). - Copyright 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + Copyright 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved."; reference "3GPP TS 28.541 5G Network Resource Model (NRM), 3GPP TS 28.658 (E-UTRAN) Network Resource Model (NRM)"; + revision 2025-04-25 { reference "CR-1526 CR-1527" ; } // common for r18, r19 revision 2023-09-18 { reference CR-1043 ; } revision 2019-10-28 { reference S5-193518 ; } - revision 2019-06-17 { - description "Initial revision"; - } + revision 2019-06-17 { reference "Initial revision"; } grouping ExternalEUtranGenericCellGrp { description "Represents the ExternalEUtranGenericCell IOC."; @@ -106,7 +103,7 @@ module _3gpp-nr-nrm-externaleutrancell { } } - grouping ExternalEUtranCellFDDWrapper { + grouping ExternalEUtranCellFDDSubtree { list ExternalEUtranCellFDD { description "Represents the common properties of external E-UTRAN FDD cell provided by eNB or NG-RAN FDD cell provided by ng-eNB."; @@ -120,7 +117,7 @@ module _3gpp-nr-nrm-externaleutrancell { } } - grouping ExternalEUtranCellTDDWrapper { + grouping ExternalEUtranCellTDDSubtree { list ExternalEUtranCellTDD { description "Represents the common properties of external E-UTRAN cell TDD provided by eNB or NG-RAN TDD cell provided by ng-eNB."; @@ -133,24 +130,4 @@ module _3gpp-nr-nrm-externaleutrancell { uses mf3gpp:ManagedFunctionContainedClasses; } } - - augment "/subnet3gpp:SubNetwork/extenb3gpp:ExternalENBFunction" { - if-feature subnet3gpp:ExternalsUnderSubNetwork; - uses ExternalEUtranCellFDDWrapper; - } - - augment "/eutranet3gpp:EUtraNetwork/extenb3gpp:ExternalENBFunction" { - if-feature eutranet3gpp:ExternalsUnderEUtraNetwork; - uses ExternalEUtranCellFDDWrapper; - } - - augment "/subnet3gpp:SubNetwork/extenb3gpp:ExternalENBFunction" { - if-feature subnet3gpp:ExternalsUnderSubNetwork; - uses ExternalEUtranCellTDDWrapper; - } - - augment "/eutranet3gpp:EUtraNetwork/extenb3gpp:ExternalENBFunction" { - if-feature eutranet3gpp:ExternalsUnderEUtraNetwork; - uses ExternalEUtranCellTDDWrapper; - } } \ No newline at end of file diff --git a/yang-models/_3gpp-nr-nrm-externalgnbcucpfunction.yang b/yang-models/_3gpp-nr-nrm-externalgnbcucpfunction.yang index cbe2baff3..ff466a30b 100755 --- a/yang-models/_3gpp-nr-nrm-externalgnbcucpfunction.yang +++ b/yang-models/_3gpp-nr-nrm-externalgnbcucpfunction.yang @@ -5,40 +5,44 @@ module _3gpp-nr-nrm-externalgnbcucpfunction { import _3gpp-common-yang-types { prefix types3gpp; } import _3gpp-common-managed-function { prefix mf3gpp; } + import _3gpp-common-managed-element { prefix me3gpp; } + import _3gpp-nr-nrm-gnbcucpfunction { prefix gnbcucp3gpp; } import _3gpp-nr-nrm-nrnetwork { prefix nrnet3gpp; } import _3gpp-common-subnetwork { prefix subnet3gpp; } + import _3gpp-nr-nrm-externalnrcellcu { prefix extnrcellcu3gpp; } import _3gpp-common-top { prefix top3gpp; } organization "3GPP SA5"; + contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464"; description "Defines the YANG mapping of the ExternalGNBCUCPFunction Information Object Class (IOC), that is part of the NR Network Resource Model (NRM). - Copyright 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + Copyright 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved."; reference "3GPP TS 28.541 5G Network Resource Model (NRM)"; + revision 2025-04-25 { reference "CR-1526 CR-1527" ; } // common for r18, r19 revision 2023-09-18 { reference CR-1043 ; } revision 2019-10-28 { reference S5-193518 ; } - revision 2019-06-17 { - description "Initial revision"; - } + revision 2019-06-17 { reference "Initial revision"; } grouping ExternalGNBCUCPFunctionGrp { description "Represets the ExternalGNBCUCPFunction IOC."; - reference "3GPP TS 28.541"; uses mf3gpp:ManagedFunctionGrp; leaf gNBId { - description "Identifies a gNB within a PLMN."; - reference "gNB Identifier (gNB ID) in 3GPP TS 38.300, Global gNB ID - in 3GPP TS 38.413"; + description "Identifies a gNB within a PLMN. + The gNB ID is part of the NR Cell Identifier (NCI) of the gNB cells. + + See 'gNB Identifier (gNB ID)' of subclause 8.2 of TS 38.300. + See 'Global gNB ID' in subclause 9.3.1.6 of TS 38.413"; mandatory true; - type int64 { range "0..4294967295"; } + type uint32 { range "0..4294967295"; } } leaf gNBIdLength { description "Indicates the number of bits for encoding the gNB ID."; - reference "gNB ID in 3GPP TS 38.300, Global gNB ID in 3GPP TS 38.413"; + reference "'Global gNB ID' in subclause 9.3.1.6 of TS 38.413"; mandatory true; type int32 { range "22..32"; } } @@ -57,23 +61,35 @@ module _3gpp-nr-nrm-externalgnbcucpfunction { list ExternalGNBCUCPFunction { description "Represents the properties, known by the management function, of a GNBCUCPFunction managed by another management function."; - reference "3GPP TS 28.541"; key id; uses top3gpp:Top_Grp; container attributes { uses ExternalGNBCUCPFunctionGrp; } uses mf3gpp:ManagedFunctionContainedClasses; + + uses extnrcellcu3gpp:ExternalNRCellCUSubtree; } } - augment "/subnet3gpp:SubNetwork" { - if-feature subnet3gpp:ExternalsUnderSubNetwork ; + feature ExternalGNBCUCPFunctionUnderNRNetwork { + description "The ExternalGNBCUCPFunction shall be contained under + NRNetwork"; + } + + augment "/me3gpp:ManagedElement/gnbcucp3gpp:GNBCUCPFunction/" + + "nrnet3gpp:NRNetwork" { + if-feature ExternalGNBCUCPFunctionUnderNRNetwork; uses ExternalGNBCUCPFunctionWrapper; } - augment "/nrnet3gpp:NRNetwork" { - if-feature nrnet3gpp:ExternalsUnderNRNetwork; + feature ExternalGNBCUCPFunctionUnderSubNetwork { + description "The ExternalGNBCUCPFunction shall be contained under + SubNetwork"; + } + + augment "/subnet3gpp:SubNetwork" { + if-feature ExternalGNBCUCPFunctionUnderSubNetwork ; uses ExternalGNBCUCPFunctionWrapper; - } + } } \ No newline at end of file diff --git a/yang-models/_3gpp-nr-nrm-externalgnbcuupfunction.yang b/yang-models/_3gpp-nr-nrm-externalgnbcuupfunction.yang index 2445a1e99..41ac84351 100755 --- a/yang-models/_3gpp-nr-nrm-externalgnbcuupfunction.yang +++ b/yang-models/_3gpp-nr-nrm-externalgnbcuupfunction.yang @@ -4,11 +4,14 @@ module _3gpp-nr-nrm-externalgnbcuupfunction { prefix "extgnbcuup3gpp"; import _3gpp-common-managed-function { prefix mf3gpp; } + import _3gpp-common-managed-element { prefix me3gpp; } + import _3gpp-nr-nrm-gnbcucpfunction { prefix gnbcucp3gpp; } import _3gpp-nr-nrm-nrnetwork { prefix nrnet3gpp; } import _3gpp-common-subnetwork { prefix subnet3gpp; } import _3gpp-common-top { prefix top3gpp; } organization "3GPP SA5"; + contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464"; description "Defines the YANG mapping of the ExternalGNBCUUPFunction Information Object Class (IOC), that is part of the NR Network Resource Model (NRM). @@ -16,11 +19,10 @@ module _3gpp-nr-nrm-externalgnbcuupfunction { TTA, TTC). All rights reserved."; reference "3GPP TS 28.541 5G Network Resource Model (NRM)"; + revision 2025-04-25 { reference "CR-1526 CR-1527" ; } // common for r18, r19 revision 2023-09-18 { reference CR-1043 ; } revision 2019-10-28 { reference S5-193518 ; } - revision 2019-06-17 { - description "Initial revision"; - } + revision 2019-06-17 { reference "Initial revision"; } grouping ExternalGNBCUUPFunctionGrp { description "Represets the ExternalGNBCUUPFunction IOC."; @@ -28,26 +30,27 @@ module _3gpp-nr-nrm-externalgnbcuupfunction { uses mf3gpp:ManagedFunctionGrp; leaf gNBId { - description "Identifies a gNB within a PLMN."; - reference "gNB Identifier (gNB ID) in 3GPP TS 38.300, Global gNB ID - in 3GPP TS 38.413"; + description "Identifies a gNB within a PLMN. + The gNB ID is part of the NR Cell Identifier (NCI) of the gNB cells. + + See 'gNB Identifier (gNB ID)' of subclause 8.2 of TS 38.300. + See 'Global gNB ID' in subclause 9.3.1.6 of TS 38.413"; mandatory true; - type int64 { range "0..4294967295"; } + type uint32 { range "0..4294967295"; } } leaf gNBIdLength { description "Indicates the number of bits for encoding the gNB ID."; - reference "gNB ID in 3GPP TS 38.300, Global gNB ID in 3GPP TS 38.413"; + reference "'Global gNB ID' in subclause 9.3.1.6 of TS 38.413"; mandatory true; type int32 { range "22..32"; } } } - grouping ExternalGNBCUUPFunctionWrapper { + grouping ExternalGNBCUUPFunctionSubtree { list ExternalGNBCUUPFunction { description "Represents the properties, known by the management function, of a GNBCUUPFunction managed by another management function."; - reference "3GPP TS 28.541"; key id; uses top3gpp:Top_Grp; container attributes { @@ -57,13 +60,24 @@ module _3gpp-nr-nrm-externalgnbcuupfunction { } } - augment "/subnet3gpp:SubNetwork" { - if-feature subnet3gpp:ExternalsUnderSubNetwork ; - uses ExternalGNBCUUPFunctionWrapper; + feature ExternalGNBCUUPFunctionUnderNRNetwork { + description "The ExternalGNBCUUPFunction shall be contained under + NRNetwork"; + } + + augment "/me3gpp:ManagedElement/gnbcucp3gpp:GNBCUCPFunction/" + + "nrnet3gpp:NRNetwork" { + if-feature ExternalGNBCUUPFunctionUnderNRNetwork; + uses ExternalGNBCUUPFunctionSubtree; } - augment "/nrnet3gpp:NRNetwork" { - if-feature nrnet3gpp:ExternalsUnderNRNetwork; - uses ExternalGNBCUUPFunctionWrapper; - } + feature ExternalGNBCUUPFunctionUnderSubNetwork { + description "The ExternalGNBCUUPFunction shall be contained under + SubNetwork"; + } + + augment "/subnet3gpp:SubNetwork" { + if-feature ExternalGNBCUUPFunctionUnderSubNetwork ; + uses ExternalGNBCUUPFunctionSubtree; + } } \ No newline at end of file diff --git a/yang-models/_3gpp-nr-nrm-externalgnbdufunction.yang b/yang-models/_3gpp-nr-nrm-externalgnbdufunction.yang index 064b98db3..115fdf6c8 100755 --- a/yang-models/_3gpp-nr-nrm-externalgnbdufunction.yang +++ b/yang-models/_3gpp-nr-nrm-externalgnbdufunction.yang @@ -3,26 +3,27 @@ module _3gpp-nr-nrm-externalgnbdufunction { namespace "urn:3gpp:sa5:_3gpp-nr-nrm-externalgnbdufunction"; prefix "extgnbdu3gpp"; - import _3gpp-common-yang-types { prefix types3gpp; } import _3gpp-common-yang-extensions { prefix yext3gpp; } import _3gpp-common-managed-function { prefix mf3gpp; } + import _3gpp-common-managed-element { prefix me3gpp; } + import _3gpp-nr-nrm-gnbcucpfunction { prefix gnbcucp3gpp; } import _3gpp-nr-nrm-nrnetwork { prefix nrnet3gpp; } import _3gpp-common-subnetwork { prefix subnet3gpp; } import _3gpp-common-top { prefix top3gpp; } organization "3GPP SA5"; + contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464"; description "Defines the YANG mapping of the ExternalGNBDUFunction Information Object Class (IOC) that is part of the NR Network Resource Model (NRM). - Copyright 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + Copyright 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved."; reference "3GPP TS 28.541 5G Network Resource Model (NRM)"; + revision 2025-04-25 { reference "CR-1526 CR-1527" ; } // common for r18, r19 revision 2023-09-18 { reference CR-1043 ; } revision 2019-10-28 { reference S5-193518 ; } - revision 2019-06-17 { - description "Initial revision"; - } + revision 2019-06-17 { reference "Initial revision"; } grouping ExternalGNBDUFunctionGrp { description "Represets the ExternalGNBDUFunction IOC."; @@ -30,36 +31,28 @@ module _3gpp-nr-nrm-externalgnbdufunction { uses mf3gpp:ManagedFunctionGrp; leaf gNBId { - description "Identifies a gNB within a PLMN."; - reference "gNB Identifier (gNB ID) in 3GPP TS 38.300, Global gNB ID - in 3GPP TS 38.413"; + description "Identifies a gNB within a PLMN. + The gNB ID is part of the NR Cell Identifier (NCI) of the gNB cells. + + See 'gNB Identifier (gNB ID)' of subclause 8.2 of TS 38.300. + See 'Global gNB ID' in subclause 9.3.1.6 of TS 38.413"; mandatory true; - type int64 { range "0..4294967295"; } + type uint32 { range "0..4294967295"; } yext3gpp:inVariant; } leaf gNBIdLength { description "Indicates the number of bits for encoding the gNB ID."; - reference "gNB ID in 3GPP TS 38.300, Global gNB ID in 3GPP TS 38.413"; + reference "'Global gNB ID' in subclause 9.3.1.6 of TS 38.413"; mandatory true; type int32 { range "22..32"; } } - - list pLMNId { - description "Specifies the PLMN identifier to be used as part of the - global RAN node identity."; - key "mcc mnc"; - min-elements 1; - max-elements 1; - uses types3gpp:PLMNId; - } } - grouping ExternalGNBDUFunctionWrapper { + grouping ExternalGNBDUFunctionSubtree { list ExternalGNBDUFunction { description "Represents the properties, known by the management function, of a GNBDUFunction managed by another management function."; - reference "3GPP TS 28.541"; key id; uses top3gpp:Top_Grp; container attributes { @@ -69,13 +62,24 @@ module _3gpp-nr-nrm-externalgnbdufunction { } } - augment "/subnet3gpp:SubNetwork" { - if-feature subnet3gpp:ExternalsUnderSubNetwork ; - uses ExternalGNBDUFunctionWrapper; + feature ExternalGNBDUFunctionUnderNRNetwork { + description "The ExternalGNBDUFunction shall be contained under + NRNetwork"; + } + + augment "/me3gpp:ManagedElement/gnbcucp3gpp:GNBCUCPFunction/" + + "nrnet3gpp:NRNetwork" { + if-feature ExternalGNBDUFunctionUnderNRNetwork; + uses ExternalGNBDUFunctionSubtree; } - augment "/nrnet3gpp:NRNetwork" { - if-feature nrnet3gpp:ExternalsUnderNRNetwork; - uses ExternalGNBDUFunctionWrapper; + feature ExternalGNBDUFunctionUnderSubNetwork { + description "The ExternalGNBDUFunction shall be contained under + SubNetwork"; + } + + augment "/subnet3gpp:SubNetwork" { + if-feature ExternalGNBDUFunctionUnderSubNetwork ; + uses ExternalGNBDUFunctionSubtree; } } \ No newline at end of file diff --git a/yang-models/_3gpp-nr-nrm-externalnrcellcu.yang b/yang-models/_3gpp-nr-nrm-externalnrcellcu.yang index b982aa12c..1586cad43 100755 --- a/yang-models/_3gpp-nr-nrm-externalnrcellcu.yang +++ b/yang-models/_3gpp-nr-nrm-externalnrcellcu.yang @@ -5,43 +5,57 @@ module _3gpp-nr-nrm-externalnrcellcu { import _3gpp-common-yang-types { prefix types3gpp; } import _3gpp-common-managed-function { prefix mf3gpp; } - import _3gpp-nr-nrm-nrnetwork { prefix nrnet3gpp; } - import _3gpp-common-subnetwork { prefix subnet3gpp; } - import _3gpp-nr-nrm-externalgnbcucpfunction { prefix extgnbcucp3gpp; } import _3gpp-common-top { prefix top3gpp; } organization "3GPP SA5"; + contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464"; description "Defines the YANG mapping of the ExternalNRCellCU Information Object Class (IOC), that is part of the NR Network Resource Model (NRM). - Copyright 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + Copyright 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved."; reference "3GPP TS 28.541 5G Network Resource Model (NRM)"; + revision 2025-04-25 { reference "CR-1526 CR-1527" ; } // common for r18, r19 revision 2023-09-18 { reference CR-1043 ; } revision 2019-10-28 { reference S5-193518 ; } - - revision 2019-06-17 { - description "Initial revision"; - } + revision 2019-06-17 { reference "Initial revision"; } grouping ExternalNRCellCUGrp { description "Represents the ExternalNRCellCU IOC."; - reference "3GPP TS 28.541"; uses mf3gpp:ManagedFunctionGrp; - leaf cellLocalId { - description "Identifies an NR cell of a gNB. Together with corresponding - gNB ID it forms the NR Cell Identifier (NCI)."; - reference "NCI in 3GPP TS 38.300"; + leaf cellLocalId { + description "It identifies a NR cell of a gNB. + + It, together with the gNB Identifier (using gNBId of the parent + GNBCUCPFunction or GNBDUFunction or OperatorDU (for MOCN network + sharing scenario) or ExternalCUCPFunction), identifies a NR cell within + a PLMN. This is the NR Cell Identity(NCI). See subclause 8.2 of TS38.300. + + The NCI can be constructed by encoding the gNB Identifier using gNBId + (of the parent GNBCUCPFunction or GNBDUFunction or OperatorDU + (for MOCN network sharing scenario) or ExternalCUCPFunction) and + cellLocalId where the gNB Identifier field is of length specified by + gNBIdLength (of the parent GNBCUCPFunction or GNBDUFunction or + ExternalCUCPFunction). See 'Global gNB ID' in subclause 9.3.1.6 of + TS 38.413. + + The NR Cell Global identifier (NCGI) is constructed from the + PLMN identity the cell belongs to and the NR Cell Identifier (NCI) of + the cell. + + See relation between NCI and NCGI subclause 8.2 of TS 38.300 "; mandatory true; - type int32 {range "0..16383"; } + type int32; } leaf nRPCI { - description "The Physical Cell Identity (PCI) of the NR cell."; - reference "3GPP TS 36.211"; + description "This holds the Physical Cell Identity (PCI) of the NR cell. + + allowedValues: + See 3GPP TS 36.211 subclause 6.11 for legal values of pci."; mandatory true; - type int32 { range "0..1007"; } + type int64; } list pLMNIdList { @@ -62,11 +76,11 @@ module _3gpp-nr-nrm-externalnrcellcu { } } - grouping ExternalNRCellCUWrapper { + grouping ExternalNRCellCUSubtree { list ExternalNRCellCU { - description "Represents the properties of an NRCellCU controlled by - another Management Service Provider."; - reference "3GPP TS 28.541"; + description "This IOC contains necessary attributes for inter-system + and intra-system handover. It also contains a subset of the attributes + of related IOCs controlled by Management Service Provider."; key id; uses top3gpp:Top_Grp; container attributes { @@ -75,14 +89,4 @@ module _3gpp-nr-nrm-externalnrcellcu { uses mf3gpp:ManagedFunctionContainedClasses; } } - - augment "/subnet3gpp:SubNetwork/extgnbcucp3gpp:ExternalGNBCUCPFunction" { - if-feature subnet3gpp:ExternalsUnderSubNetwork ; - uses ExternalNRCellCUWrapper; - } - - augment "/nrnet3gpp:NRNetwork/extgnbcucp3gpp:ExternalGNBCUCPFunction" { - if-feature nrnet3gpp:ExternalsUnderNRNetwork; - uses ExternalNRCellCUWrapper; - } } \ No newline at end of file diff --git a/yang-models/_3gpp-nr-nrm-externalservinggwfunction.yang b/yang-models/_3gpp-nr-nrm-externalservinggwfunction.yang index 1fd046946..dcaba95b4 100755 --- a/yang-models/_3gpp-nr-nrm-externalservinggwfunction.yang +++ b/yang-models/_3gpp-nr-nrm-externalservinggwfunction.yang @@ -4,8 +4,7 @@ module _3gpp-nr-nrm-externalservinggwfunction { prefix "extservgw3gpp"; import _3gpp-common-managed-function { prefix mf3gpp; } - import _3gpp-common-subnetwork { prefix subnet3gpp; } - import _3gpp-nr-nrm-eutranetwork { prefix eutranet3gpp; } + //import _3gpp-common-subnetwork { prefix subnet3gpp; } import _3gpp-common-top { prefix top3gpp; } organization "3GPP SA5"; @@ -16,6 +15,7 @@ module _3gpp-nr-nrm-externalservinggwfunction { TTA, TTC). All rights reserved."; reference "3GPP TS 28.541 5G Network Resource Model (NRM)"; + revision 2025-04-25 { reference "CR-1526 CR-1527" ; } // common for r18, r19 revision 2023-09-18 { reference CR-1043 ; } revision 2019-10-28 { reference S5-193518 ; } revision 2019-06-17 { @@ -43,7 +43,7 @@ module _3gpp-nr-nrm-externalservinggwfunction { } } - augment "/subnet3gpp:SubNetwork" { + /*augment "/subnet3gpp:SubNetwork" { if-feature subnet3gpp:ExternalsUnderSubNetwork ; uses ExternalServingGWFunctionWrapper; } @@ -51,5 +51,5 @@ module _3gpp-nr-nrm-externalservinggwfunction { augment "/eutranet3gpp:EUtraNetwork" { if-feature eutranet3gpp:ExternalsUnderEUtraNetwork; uses ExternalServingGWFunctionWrapper; - } + }*/ } \ No newline at end of file diff --git a/yang-models/_3gpp-nr-nrm-externalupffunction.yang b/yang-models/_3gpp-nr-nrm-externalupffunction.yang index 11e924dab..abe82b6c8 100755 --- a/yang-models/_3gpp-nr-nrm-externalupffunction.yang +++ b/yang-models/_3gpp-nr-nrm-externalupffunction.yang @@ -4,17 +4,19 @@ module _3gpp-nr-nrm-externalupffunction { prefix "extupf3gpp"; import _3gpp-common-managed-function { prefix mf3gpp; } - import _3gpp-common-subnetwork { prefix subnet3gpp; } - import _3gpp-nr-nrm-nrnetwork { prefix nrnet3gpp; } + /*import _3gpp-common-subnetwork { prefix subnet3gpp; } + import _3gpp-nr-nrm-nrnetwork { prefix nrnet3gpp; }*/ import _3gpp-common-top { prefix top3gpp; } organization "3GPP SA5"; + contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464"; description "Defines the YANG mapping of the ExternalUPFFunction Information Object Class (IOC) that is part of the NR Network Resource Model (NRM). - Copyright 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + Copyright 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved."; reference "3GPP TS 28.541 5G Network Resource Model (NRM)"; + revision 2025-04-25 { reference "CR-1526 CR-1527" ; } // common for r18, r19 revision 2023-09-18 { reference CR-1043 ; } revision 2019-10-28 { reference S5-193518 ; } revision 2019-06-17 { @@ -42,7 +44,7 @@ module _3gpp-nr-nrm-externalupffunction { } } - augment "/subnet3gpp:SubNetwork" { + /*augment "/subnet3gpp:SubNetwork" { if-feature subnet3gpp:ExternalsUnderSubNetwork ; uses ExternalUPFFunctionWrapper; } @@ -50,5 +52,5 @@ module _3gpp-nr-nrm-externalupffunction { augment "/nrnet3gpp:NRNetwork" { if-feature nrnet3gpp:ExternalsUnderNRNetwork; uses ExternalUPFFunctionWrapper; - } + }*/ } \ No newline at end of file diff --git a/yang-models/_3gpp-nr-nrm-gnbcucpfunction.yang b/yang-models/_3gpp-nr-nrm-gnbcucpfunction.yang index b7c05dddd..d776bf37a 100755 --- a/yang-models/_3gpp-nr-nrm-gnbcucpfunction.yang +++ b/yang-models/_3gpp-nr-nrm-gnbcucpfunction.yang @@ -20,6 +20,9 @@ module _3gpp-nr-nrm-gnbcucpfunction { TTA, TTC). All rights reserved."; reference "3GPP TS 28.541 5G Network Resource Model (NRM)"; + revision 2025-05-25 { reference "CR-1527" ; } + revision 2025-05-07 { reference "CR-1548"; } + revision 2025-03-25 { reference "CR-1509"; } revision 2025-01-25 { reference "CR-1442"; } revision 2024-11-07 { reference "CR-1443"; } revision 2024-08-19 { reference "CR-1405"; } @@ -288,13 +291,28 @@ module _3gpp-nr-nrm-gnbcucpfunction { leaf idx { type uint32; } uses types5g3gpp:MappedCellIdInfoGrp; } - + leaf configurable5QISetRef { type types3gpp:DistinguishedName; description "DN of the Configurable5QISet that the GNBCUCPFunction supports (is associated to)."; } + leaf isOnboardSatellite { + type boolean; + default false; + description "This attribute indicates whether the function is + on board the satellite."; + } + + leaf onboardSatelliteId { + type string; + config false; + description "This attribute indicates the onboard satellite Id. + It shall be formatted as a fixed 5-digit string, padding with + leading digits '0' to complete a 5-digit length."; + } + leaf dynamic5QISetRef { type types3gpp:DistinguishedName; description "DN of the Dynamic5QISet that the GNBCUCPFunction supports @@ -349,7 +367,7 @@ module _3gpp-nr-nrm-gnbcucpfunction { leaf gnbIdLength { type int32 {range "22..32";} - mandatory true; + mandatory true; description "This indicates the number of bits for encoding the gNB ID. See 'Global gNB ID' in subclause 9.3.1.6 of TS 38.413"; } diff --git a/yang-models/_3gpp-nr-nrm-gnbdufunction.yang b/yang-models/_3gpp-nr-nrm-gnbdufunction.yang index 4932b44d8..5f9de8da5 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-05-07 { reference "CR-1527 CR-1548"; } revision 2025-02-05 { reference CR-1441; } revision 2024-02-24 { reference CR-1218; } revision 2023-09-18 { reference CR-1043 ; } @@ -185,7 +186,18 @@ module _3gpp-nr-nrm-gnbdufunction { information derived from the detected RIM-RS to OAM."; uses RimRSReportConfGrp; } - + leaf isOnboardSatellite { + type boolean; + default false; + description "This attribute indicates whether the function is + on board the satellite."; + } + leaf onboardSatelliteId { + type string; + description "This attribute indicates the onboard satellite Id. + It shall be formatted as a fixed 5-digit string, padding with + leading digits “0” to complete a 5-digit length."; + } leaf configurable5QISetRef { type types3gpp:DistinguishedName; description "DN of the Configurable5QISet that the GNBDUFunction supports diff --git a/yang-models/_3gpp-nr-nrm-mwab.yang b/yang-models/_3gpp-nr-nrm-mwab.yang new file mode 100644 index 000000000..e57a85bf1 --- /dev/null +++ b/yang-models/_3gpp-nr-nrm-mwab.yang @@ -0,0 +1,76 @@ +module _3gpp-nr-nrm-mwab { + yang-version 1.1; + namespace "urn:3gpp:sa5:_3gpp-nr-nrm-mwab"; + prefix "mwab3gpp"; + + import ietf-yang-types { prefix yang; } + 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 "Defines the YANG mapping of the ExternalGNBCUCPFunction + Information Object Class (IOC), that is part of the NR Network Resource + Model (NRM). + Copyright 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + TTA, TTC). All rights reserved."; + reference "3GPP TS 28.541 5G Network Resource Model (NRM)"; + + revision 2025-04-25 { reference CR-1527 ; } + + grouping MWABGrp { + description "Represets the ExternalENBFunction IOC."; + + leaf operationalState { + description "It indicates the operational state of the MWAB instance. + It describes whether the resource is installed and partially or fully + operable (Enabled) or the resource is not installed or not + operable (Disabled)."; + mandatory true; + config false; + type types3gpp:OperationalState; + } + + leaf administrativeState { + description "It indicates the administrative state of the MWAB instance. + It describes the permission to use or prohibition against using the + MWAB functionalities, imposed through the OAM services."; + default LOCKED; + type types3gpp:AdministrativeState; + } + + list allowedArea { + description "This specifies the area where the MWAB can act as MWAB-gNB. + If the OAM indicates that the MWAB can act as MWAB-gNB is allowed areas, + it acts as MWAB-gNB only on the allowed area only. + (See sub clause 5.49 TS 28.662)."; + key idx; + leaf idx { type uint32; } + uses types3gpp:GeoAreaGrp; + } + + leaf-list allowedTime { + description "This species the time window for which the MWAB can act as + MWAB-gNB. If the allowed time window/validity indicates 20th June, + 10 am to 5 pm of the day, the MWAB acts as an MWAB g-NB only during + 20th June, 10 am to 5 pm of the day, and does not act as MWAB-gNB for + any other time. (See sub clause 5.49 TS 28.662)."; + type yang:date-and-time; + } + } + + grouping MWABSubTree { + list MWAB { + description "MWAB provides an NR access link to UEs in proximity and + connects to the 5GC serving the UE through an IP connectivity provided + by a Backhaul PDU session(s). The MWAB consists of a gNB component + (MWAB-gNB) and a UE component (MWAB-UE). This IOC defines the + configuration information for the MWAB-gNB."; + key id; + uses top3gpp:Top_Grp; + container attributes { + uses MWABGrp; + } + } + } +} diff --git a/yang-models/_3gpp-nr-nrm-nrfrequency.yang b/yang-models/_3gpp-nr-nrm-nrfrequency.yang index 5564721df..734a4da74 100755 --- a/yang-models/_3gpp-nr-nrm-nrfrequency.yang +++ b/yang-models/_3gpp-nr-nrm-nrfrequency.yang @@ -3,7 +3,8 @@ module _3gpp-nr-nrm-nrfrequency { namespace "urn:3gpp:sa5:_3gpp-nr-nrm-nrfrequency"; prefix "nrfreq3gpp"; - import _3gpp-common-managed-function { prefix mf3gpp; } + import _3gpp-common-managed-element { prefix me3gpp; } + import _3gpp-nr-nrm-gnbcucpfunction { prefix gnbcucp3gpp; } import _3gpp-nr-nrm-nrnetwork { prefix nrnet3gpp; } import _3gpp-common-subnetwork { prefix subnet3gpp; } import _3gpp-common-top { prefix top3gpp; } @@ -16,18 +17,14 @@ module _3gpp-nr-nrm-nrfrequency { TTA, TTC). All rights reserved."; reference "3GPP TS 28.541 5G Network Resource Model (NRM)"; + revision 2025-04-25 { reference CR-1527 ; } revision 2025-01-25 { reference CR-1442 ; } revision 2023-09-18 { reference CR-1043 ; } revision 2019-10-28 { reference S5-193518 ; } - revision 2019-06-17 { - reference "Initial version"; - description "Initial revision"; - } + revision 2019-06-17 { reference "Initial version"; } grouping NRFrequencyGrp { description "Represents the NRFrequency IOC."; - reference "3GPP TS 28.541"; - uses mf3gpp:ManagedFunctionGrp; leaf absoluteFrequencySSB { description "The absolute frequency applicable for a downlink NR carrier @@ -37,17 +34,19 @@ module _3gpp-nr-nrm-nrfrequency { } leaf ssBSubCarrierSpacing { - description "Sub-carrier spacing of the SSB."; + description "Sub-carrier spacing of the SSB. + Note that the allowed values of SSB used for representing data, + by e.g. a BWP, are: 15, 30, 60 and 120 in units of kHz."; mandatory true; - type uint8 { range "15 | 30 | 60 | 120"; } + type uint8 { range "15 | 30 | 60 | 120 | 240"; } units "kHz"; } - leaf-list multiFrequencyBandListNR { + leaf multiFrequencyBandListNR { description "List of additional frequency bands the frequency belongs to. The list is automatically set by the gNB."; + mandatory true; config false; - min-elements 1; type uint16 { range "1..256"; } } } @@ -55,23 +54,30 @@ module _3gpp-nr-nrm-nrfrequency { grouping NRFrequencyWrapper { list NRFrequency { description "Represents certain NR frequency properties."; - reference "3GPP TS 28.541"; key id; uses top3gpp:Top_Grp; container attributes { uses NRFrequencyGrp; } - uses mf3gpp:ManagedFunctionContainedClasses; } } - augment "/subnet3gpp:SubNetwork" { - if-feature subnet3gpp:ExternalsUnderSubNetwork ; + feature NRFrequencyUnderNRNetwork { + description "NRFrequency shall be contained under NRNetwork"; + } + + augment "/me3gpp:ManagedElement/gnbcucp3gpp:GNBCUCPFunction/" + + "nrnet3gpp:NRNetwork" { + if-feature NRFrequencyUnderNRNetwork; uses NRFrequencyWrapper; } - augment "/nrnet3gpp:NRNetwork" { - if-feature nrnet3gpp:ExternalsUnderNRNetwork; + feature NRFrequencyUnderSubNetwork { + description "NRFrequency shall be contained under SubNetwork"; + } + + augment "/subnet3gpp:SubNetwork" { + if-feature NRFrequencyUnderSubNetwork; uses NRFrequencyWrapper; } } \ No newline at end of file diff --git a/yang-models/_3gpp-nr-nrm-nrnetwork.yang b/yang-models/_3gpp-nr-nrm-nrnetwork.yang index 9e622884d..044c2d0db 100755 --- a/yang-models/_3gpp-nr-nrm-nrnetwork.yang +++ b/yang-models/_3gpp-nr-nrm-nrnetwork.yang @@ -3,40 +3,37 @@ module _3gpp-nr-nrm-nrnetwork { namespace "urn:3gpp:sa5:_3gpp-nr-nrm-nrnetwork"; prefix "nrnet3gpp"; - import _3gpp-common-subnetwork { prefix subnet3gpp; } + import _3gpp-common-managed-element { prefix me3gpp; } + import _3gpp-nr-nrm-gnbcucpfunction { prefix gnbcucp3gpp; } import _3gpp-common-top { prefix top3gpp; } organization "3GPP SA5"; + contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464"; description "Defines the YANG mapping of the NRNetwork Information Object Class (IOC) that is part of the NR Network Resource Model (NRM). - Copyright 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + Copyright 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved."; reference "3GPP TS 28.541 5G Network Resource Model (NRM)"; + revision 2025-04-25 { reference "CR-1526 CR-1527" ; } // common r17, r18 revision 2023-09-18 { reference CR-1043 ; } - revision 2019-06-17 { - description "Initial revision"; - } - - feature ExternalsUnderNRNetwork { - description "Classes representing external entities like NRFrequency, - ExternalGNBCUCPFunction, ExternalGNBDUFunction - are contained under a NRNetwork list/class."; - } + revision 2019-06-17 { reference "Initial revision"; } grouping NRNetworkGrp { - description "Represents the NRNetwork IOC."; - reference "3GPP TS 28.541"; - uses subnet3gpp:SubNetworkGrp; + description "Represents the NRNetwork IOC. + Contains no additiona attributes."; } - list NRNetwork { - description "A subnetwork containing gNB external NR entities."; - reference "3GPP TS 28.541"; - key id; - uses top3gpp:Top_Grp; - container attributes { - uses NRNetworkGrp; + augment /me3gpp:ManagedElement/gnbcucp3gpp:GNBCUCPFunction { + list NRNetwork { + description "Represents a set of NR frequencies and external NR entities + (e.g. ExternalGNBCUCPFunction). This is used to differentiate these + entities and frequencies from those in EUTRAN."; + key id; + uses top3gpp:Top_Grp; + container attributes { + uses NRNetworkGrp; + } } } } \ No newline at end of file diff --git a/yang-models/_3gpp-nr-nrm-nroperatorcelldu.yang b/yang-models/_3gpp-nr-nrm-nroperatorcelldu.yang index 42afcf248..b4d490fbb 100755 --- a/yang-models/_3gpp-nr-nrm-nroperatorcelldu.yang +++ b/yang-models/_3gpp-nr-nrm-nroperatorcelldu.yang @@ -14,10 +14,11 @@ module _3gpp-nr-nrm-nroperatorcelldu { contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464"; description "Defines the YANG mapping of the OperatorDU Information Object Class (IOC) that is part of the NR Network Resource Model (NRM). - Copyright 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + Copyright 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved."; reference "3GPP TS 28.541 5G Network Resource Model (NRM)"; + revision 2025-05-06 { reference "CR-1526 CR-1527" ; } // common for R18, R19 revision 2024-05-24 { reference CR-1273 ; } revision 2023-09-18 { reference CR-1043 ; } revision 2021-10-01 { reference "Initial revision"; } @@ -79,7 +80,6 @@ module _3gpp-nr-nrm-nroperatorcelldu { container attributes { uses NROperatorCellDUGrp; } - uses gnbdu3gpp:GNBDUFunctionGrp; } } } \ No newline at end of file diff --git a/yang-models/_3gpp-nr-nrm-ntnfunction.yang b/yang-models/_3gpp-nr-nrm-ntnfunction.yang index 20dd62cf4..43e2a86eb 100644 --- a/yang-models/_3gpp-nr-nrm-ntnfunction.yang +++ b/yang-models/_3gpp-nr-nrm-ntnfunction.yang @@ -19,6 +19,7 @@ module _3gpp-nr-nrm-ntnfunction { TTA, TTC). All rights reserved."; reference "3GPP TS 28.541"; + revision 2025-03-27 { reference CR-1512; } revision 2025-02-17 { reference CR-1479 ; } revision 2024-05-24 { reference CR-1273 ; } @@ -326,7 +327,9 @@ module _3gpp-nr-nrm-ntnfunction { NR access. This IOC contains instances of NTNTimeBasedConfig to support time-based configuration of the following NTN related entities: EP_NgC, NRCellCU, NRCellDU, NRSectorCarrier, SectorEquipmentFunction, - and NRCellRelation."; + and NRCellRelation. The IP Configuration of the feeder links may be + configured via IP Autoconfiguration services [x] and/or configured via + instances of NTNTimeBasedConfig in anticipation of feeder link switchovers."; key id; max-elements 1; uses top3gpp:Top_Grp; diff --git a/yang-models/_3gpp-nr-nrm-operatordu.yang b/yang-models/_3gpp-nr-nrm-operatordu.yang index 98a702b77..f50f7873a 100755 --- a/yang-models/_3gpp-nr-nrm-operatordu.yang +++ b/yang-models/_3gpp-nr-nrm-operatordu.yang @@ -7,15 +7,17 @@ module _3gpp-nr-nrm-operatordu { import _3gpp-common-managed-element { prefix me3gpp; } import _3gpp-nr-nrm-gnbdufunction {prefix gnbdu3gpp; } import _3gpp-common-yang-types { prefix types3gpp; } + import _3gpp-nr-nrm-ep { prefix ep3gpp; } organization "3GPP SA5"; contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464"; description "Defines the YANG mapping of the OperatorDU Information Object Class (IOC) that is part of the NR Network Resource Model (NRM). - Copyright 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + Copyright 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved."; reference "3GPP TS 28.541 5G Network Resource Model (NRM)"; + revision 2025-05-06 { reference "CR-1526 CR-1527" ; } // common for R18, R19 revision 2024-02-24 { reference CR-1218; } revision 2023-11-14 { reference "CR1136"; } revision 2023-09-30 { reference "CR1048"; } @@ -76,7 +78,14 @@ module _3gpp-nr-nrm-operatordu { container attributes { uses OperatorDUGrp; } - uses gnbdu3gpp:GNBDUFunctionGrp; + + uses ep3gpp:EP_F1CSubtree { + refine EP_F1C { + max-elements 1; + } + } + + uses ep3gpp:EP_F1USubtree; } } } \ No newline at end of file diff --git a/yang-models/_3gpp-nr-nrm-rrmpolicy.yang b/yang-models/_3gpp-nr-nrm-rrmpolicy.yang index aad5c5e9f..0d89212f6 100755 --- a/yang-models/_3gpp-nr-nrm-rrmpolicy.yang +++ b/yang-models/_3gpp-nr-nrm-rrmpolicy.yang @@ -26,7 +26,7 @@ module _3gpp-nr-nrm-rrmpolicy { revision 2020-04-28 { reference "CR0285"; } revision 2020-02-14 { reference "Initial revision"; } - grouping rRMPolicyMemberGrp { + grouping RRMPolicyMemberGrp { description "This data type represents an RRM Policy member that will be part of a rRMPolicyMemberList. A RRMPolicyMember is defined by its pLMNId and sNSSAI (S-NSSAI). @@ -70,7 +70,7 @@ module _3gpp-nr-nrm-rrmpolicy { the PLMNId <> and S-NSSAI <>." ; min-elements 1; key "mcc mnc sd sst"; - uses rRMPolicyMemberGrp; + uses RRMPolicyMemberGrp; } } // grouping @@ -114,7 +114,7 @@ module _3gpp-nr-nrm-rrmpolicy { } } - grouping RrmPolicySubtree { + grouping RRMPolicySubtree { description "Contains RrmPolicy related classes. Should be used in all classes (or classes inheriting from) - NRCellCU, NRCellDU, GNBCUUPFunction, GNBCUCPFunction, GNBDUFunction @@ -179,24 +179,24 @@ module _3gpp-nr-nrm-rrmpolicy { augment "/me3gpp:ManagedElement/gnbcucp3gpp:GNBCUCPFunction/" + "nrcellcu3gpp:NRCellCU" { - uses RrmPolicySubtree; + uses RRMPolicySubtree; } augment "/me3gpp:ManagedElement/gnbdu3gpp:GNBDUFunction/" + "nrcelldu3gpp:NRCellDU" { - uses RrmPolicySubtree; + uses RRMPolicySubtree; } augment "/me3gpp:ManagedElement/gnbcuup3gpp:GNBCUUPFunction" { - uses RrmPolicySubtree; + uses RRMPolicySubtree; } augment "/me3gpp:ManagedElement/gnbcucp3gpp:GNBCUCPFunction" { - uses RrmPolicySubtree; + uses RRMPolicySubtree; } augment "/me3gpp:ManagedElement/gnbdu3gpp:GNBDUFunction" { - uses RrmPolicySubtree; + uses RRMPolicySubtree; } } \ No newline at end of file diff --git a/yang-models/_3gpp-stm-nrm-stmfunction.yang b/yang-models/_3gpp-stm-nrm-stmfunction.yang new file mode 100644 index 000000000..b26ef7fb2 --- /dev/null +++ b/yang-models/_3gpp-stm-nrm-stmfunction.yang @@ -0,0 +1,191 @@ +module _3gpp-stm-nrm-stmfunction { + yang-version 1.1; + + namespace urn:3gpp:sa5:_3gpp-stm-nrm-stmfunction; + prefix stm3gpp; + + import _3gpp-common-top { prefix top3gpp; } + 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 STM function defined in 3GPP TS 28.560. + Copyright 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + TTA, TTC). All rights reserved."; + reference "3GPP TS 28.abc + Signalling traffic monitoring management"; + + revision 2025-05-07 { reference "CR-0009"; } + revision 2025-04-19 { reference "CR-0010"; } + revision 2024-11-07 { reference "S5-247077"; } + + grouping NetworkInterfaceGrp { + description "Represents the network interfaces for which signalling + traffic messages are to be copied and sent to the external entity. + The attribute networkInterfaceType specifies the network interface type + to be monitored. The optional attribute networkInterfaceInstanceList + specifies the network interface instances to be monitored. It is a list + of applicable network interface instances of the network interface type + specified by networkInterfaceType. The optional attribute + serviceOperationList specifies the service operations to be monitored. + It is a list of applicable service operations exchanged over the network + interface instances specified by networkInterfaceInstanceList, or, if + networkInterfaceInstanceList is not present, it is list of applicable + service operations exchanged over the network interface type specified + by networkInterfaceType."; + + leaf networkInterfaceType { + type enumeration { + enum ALL; + enum N2; + enum N4; + enum N5; + enum N7; + enum N8; + enum N10; + enum N11; + enum N12; + enum N13; + enum N14; + enum N15; + enum N16; + enum N17; + enum N18; + enum N20; + enum N21; + enum N22; + enum N23; + enum N26; + enum N28; + enum N29; + enum N30; + enum N33; + enum N34; + enum N35; + enum N36; + enum N37; + enum N40; + enum N41; + enum N42; + enum N51; + enum N52; + enum N58; + enum N59; + enum N60; + enum N61; + enum N62; + enum N63; + enum N80; + enum N81; + enum N82; + enum N83; + enum N84; + enum N85; + enum N86; + enum N87; + enum N88; + enum N89; + enum N96; + enum NL1; + enum NL2; + enum NL5; + enum NL6; + enum NL8; + enum NL9; + } + description "List of network interface type to be monitored. The + applicable network interface type names are specified based on + subclause 4.2.3 of 3GPP TS 23.501 and clause 4.2.1 of 3GPP + TS 23.273. + The value ALL is specified for the case if all the applicable + interface type of the network function shall be monitored."; + reference "Clause 4.2.3 of 3GPP TS 23.501 and clause 4.2.1 of + 3GPP TS 23.273 for details on the allowed values."; + } + + leaf-list networkInterfaceInstanceList { + type types3gpp:DistinguishedName; + description "The list of applicable network interface instances, for + which the monitoring is to be performed, of the network interface + type specified by networkInterfaceType."; + reference "allowedValues: DN of the following MOIs as specified + in subclause 5.2.1 of 3GPP TS 28.541"; + } + + leaf-list serviceOperationList { + type string; + description "The list of applicable service operations exchanged + over the network interface instances specified by + networkInterfaceInstanceList, that needs to be monitored. Or, + If networkInterfaceInstanceList is not present, the list of + applicable service operations exchanged over the network + interface type specified by networkInterfaceType."; + reference "allowedValues: refer to subclause 5.2 of 3GPP + TS 23.502"; + } + } + + grouping StmCtrlGrp { + description "Represents the StmCtrl IOC."; + + leaf-list reportingNFList { + type types3gpp:DistinguishedName; + description "List of Network Function Distinguished Name, which + specifies the target network interface type to be monitored. If + this parameter is not present or it is empty, then all applicable + interface types from the target NF shall be monitored"; + } + + list targetInterfaceInfoList { + uses NetworkInterfaceGrp; + key "networkInterfaceType"; + description "List of network interface to be monitored. If this + parameter is not present or it is empty, then all Network Functions + within the SubNetwork or ManagedElement shall be monitored. This + parameter shall be omitted if the STM control object is specified + under a ManagedFunction. "; + } + + leaf stmTargetUri { + type inet:uri; + mandatory true; + description "It specifies the Uniform Resource Identifier (URI) of the STM + consumer that shall receive the monitored signalling message copies "; + reference "Clause 4.4 of 3GPP TS 32.158"; + } + + leaf administrativeState { + default LOCKED; + type types3gpp:BasicAdministrativeState ; + description "It is used by the STM consumer to lock or unlock the + StmCtrl instance in order to stop or start the signalling traffic + monitoring"; + } + + leaf operationalState { + config false; + mandatory true; + type types3gpp:OperationalState ; + description "It is used by STM consumer to report its working state"; + } + } + + grouping StmCtrlSubTree { + description "Contains classes that manage Signalling traffic monitoring + management"; + + list StmCtrl { + description "This IOC represents the STM Control and Configuration + parameters of a particular STM controlling. It can be + name-contained by SubNetwork, ManagedElement, or ManagedFunction."; + + key id; + uses top3gpp:Top_Grp ; + container attributes { + uses StmCtrlGrp ; + } + + } + } +} \ No newline at end of file -- GitLab From ee0c86655d28106599caf3685cb043f093b22adc Mon Sep 17 00:00:00 2001 From: ruiyue Date: Thu, 31 Jul 2025 03:43:36 +0000 Subject: [PATCH 486/587] Edit _3gpp-common-measurements.yang --- yang-models/_3gpp-common-measurements.yang | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/yang-models/_3gpp-common-measurements.yang b/yang-models/_3gpp-common-measurements.yang index 27541b18e..e103dc8fe 100755 --- a/yang-models/_3gpp-common-measurements.yang +++ b/yang-models/_3gpp-common-measurements.yang @@ -248,7 +248,7 @@ module _3gpp-common-measurements { description "Represents the attributes of the IOC PerfMetricJob"; leaf administrativeState { - default UNLOCKED; + default LOCKED; type types3gpp:BasicAdministrativeState ; description "Enable or disables production of the metrics"; } @@ -339,7 +339,7 @@ module _3gpp-common-measurements { to monitor."; leaf administrativeState { - default UNLOCKED; + default LOCKED; type types3gpp:BasicAdministrativeState ; description "Enables or disables the ThresholdMonitor."; } -- GitLab From 03bac82be5cf7837f2c327e3999fd71a67cac11a Mon Sep 17 00:00:00 2001 From: ruiyue Date: Wed, 27 Aug 2025 21:40:40 +0000 Subject: [PATCH 487/587] Update file _3gpp-common-measurements.yang --- yang-models/_3gpp-common-measurements.yang | 1 + 1 file changed, 1 insertion(+) diff --git a/yang-models/_3gpp-common-measurements.yang b/yang-models/_3gpp-common-measurements.yang index e103dc8fe..0b30fc294 100755 --- a/yang-models/_3gpp-common-measurements.yang +++ b/yang-models/_3gpp-common-measurements.yang @@ -56,6 +56,7 @@ module _3gpp-common-measurements { Integration Reference Point (IRP); Information Service (IS)"; + revision 2025-07-31 { reference CR-0554; } revision 2025-05-19 { reference CR-0532; } revision 2025-02-07 { reference CR-0461; } revision 2025-01-29 { reference CR-0512; } -- GitLab From 6f45f422b82ab849c1b5eb12918f14ade485906a Mon Sep 17 00:00:00 2001 From: lengyelb Date: Wed, 3 Sep 2025 19:34:42 +0200 Subject: [PATCH 488/587] Revert "Merge branch..." This reverts merge request !1813 --- yang-models/_3gpp-common-measurements.yang | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/yang-models/_3gpp-common-measurements.yang b/yang-models/_3gpp-common-measurements.yang index 0b30fc294..27541b18e 100755 --- a/yang-models/_3gpp-common-measurements.yang +++ b/yang-models/_3gpp-common-measurements.yang @@ -56,7 +56,6 @@ module _3gpp-common-measurements { Integration Reference Point (IRP); Information Service (IS)"; - revision 2025-07-31 { reference CR-0554; } revision 2025-05-19 { reference CR-0532; } revision 2025-02-07 { reference CR-0461; } revision 2025-01-29 { reference CR-0512; } @@ -249,7 +248,7 @@ module _3gpp-common-measurements { description "Represents the attributes of the IOC PerfMetricJob"; leaf administrativeState { - default LOCKED; + default UNLOCKED; type types3gpp:BasicAdministrativeState ; description "Enable or disables production of the metrics"; } @@ -340,7 +339,7 @@ module _3gpp-common-measurements { to monitor."; leaf administrativeState { - default LOCKED; + default UNLOCKED; type types3gpp:BasicAdministrativeState ; description "Enables or disables the ThresholdMonitor."; } -- GitLab From ca845082e5be338c773a044ea729440c5fcb436d Mon Sep 17 00:00:00 2001 From: "U-ERICSSON\\ETHBLL" Date: Fri, 20 Jun 2025 14:28:51 +0200 Subject: [PATCH 489/587] updated revision dates to avoid duplicate dates --- yang-models/_3gpp-5gc-nrm-predefinedpccruleset.yang | 1 + yang-models/_3gpp-nr-nrm-rrmpolicy.yang | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/yang-models/_3gpp-5gc-nrm-predefinedpccruleset.yang b/yang-models/_3gpp-5gc-nrm-predefinedpccruleset.yang index 34db5ada0..5489a5413 100755 --- a/yang-models/_3gpp-5gc-nrm-predefinedpccruleset.yang +++ b/yang-models/_3gpp-5gc-nrm-predefinedpccruleset.yang @@ -18,6 +18,7 @@ module _3gpp-5gc-nrm-predefinedpccruleset { TTA, TTC). All rights reserved."; reference "3GPP TS 28.541"; + revision 2025-05-01 { reference CR-xxxx ; } revision 2025-04-25 { reference CR-1520 ; } revision 2025-03-25 { reference CR-1489 ; } revision 2023-09-18 { reference CR-1043 ; } diff --git a/yang-models/_3gpp-nr-nrm-rrmpolicy.yang b/yang-models/_3gpp-nr-nrm-rrmpolicy.yang index 0d89212f6..3f3f5e61b 100755 --- a/yang-models/_3gpp-nr-nrm-rrmpolicy.yang +++ b/yang-models/_3gpp-nr-nrm-rrmpolicy.yang @@ -20,7 +20,7 @@ module _3gpp-nr-nrm-rrmpolicy { TTA, TTC). All rights reserved."; reference "3GPP TS 28.541 5G Network Resource Model (NRM)"; - revision 2023-09-18 { reference CR-1043 ; } + revision 2023-09-19 { reference CR-1043 ; } //date updated; it was already used in R18 revision 2022-07-28 { reference "CR-0770"; } revision 2020-11-05 { reference CR-0412 ; } revision 2020-04-28 { reference "CR0285"; } -- GitLab From 5a7d0bcdb45fea411d957945c70f624f1b7163af Mon Sep 17 00:00:00 2001 From: "U-ERICSSON\\ETHBLL" Date: Fri, 20 Jun 2025 16:54:33 +0200 Subject: [PATCH 490/587] corrected duplicate revision dates and CR numbers --- yang-models/_3gpp-nr-nrm-ecmappingrule.yang | 2 +- yang-models/_3gpp-nr-nrm-nrfrequency.yang | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/yang-models/_3gpp-nr-nrm-ecmappingrule.yang b/yang-models/_3gpp-nr-nrm-ecmappingrule.yang index 00f44bc9a..f971ade81 100644 --- a/yang-models/_3gpp-nr-nrm-ecmappingrule.yang +++ b/yang-models/_3gpp-nr-nrm-ecmappingrule.yang @@ -9,7 +9,7 @@ module _3gpp-nr-nrm-ecmappingrule { contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464"; description "This IOC represents the unified mapping rule input to support Energy Cost Index Mapping when Energy Cost Reporting. - Copyright 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + Copyright 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved."; reference "3GPP TS 28.541"; diff --git a/yang-models/_3gpp-nr-nrm-nrfrequency.yang b/yang-models/_3gpp-nr-nrm-nrfrequency.yang index 734a4da74..6f5d07659 100755 --- a/yang-models/_3gpp-nr-nrm-nrfrequency.yang +++ b/yang-models/_3gpp-nr-nrm-nrfrequency.yang @@ -17,8 +17,7 @@ module _3gpp-nr-nrm-nrfrequency { TTA, TTC). All rights reserved."; reference "3GPP TS 28.541 5G Network Resource Model (NRM)"; - revision 2025-04-25 { reference CR-1527 ; } - revision 2025-01-25 { reference CR-1442 ; } + revision 2025-04-25 { "CR-1526 CR-1527"; } // common for r18, r19 revision 2023-09-18 { reference CR-1043 ; } revision 2019-10-28 { reference S5-193518 ; } revision 2019-06-17 { reference "Initial version"; } -- GitLab From b456fee5c8b4eca4fe15979152440f2827a38ee7 Mon Sep 17 00:00:00 2001 From: "U-ERICSSON\\ETHBLL" Date: Fri, 20 Jun 2025 16:57:37 +0200 Subject: [PATCH 491/587] yang fault correction --- yang-models/_3gpp-nr-nrm-nrfrequency.yang | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/yang-models/_3gpp-nr-nrm-nrfrequency.yang b/yang-models/_3gpp-nr-nrm-nrfrequency.yang index 6f5d07659..bd045b52d 100755 --- a/yang-models/_3gpp-nr-nrm-nrfrequency.yang +++ b/yang-models/_3gpp-nr-nrm-nrfrequency.yang @@ -17,7 +17,7 @@ module _3gpp-nr-nrm-nrfrequency { TTA, TTC). All rights reserved."; reference "3GPP TS 28.541 5G Network Resource Model (NRM)"; - revision 2025-04-25 { "CR-1526 CR-1527"; } // common for r18, r19 + revision 2025-04-25 { reference "CR-1526 CR-1527"; } // common for r18, r19 revision 2023-09-18 { reference CR-1043 ; } revision 2019-10-28 { reference S5-193518 ; } revision 2019-06-17 { reference "Initial version"; } -- GitLab From c73f2097c6ff39dad21a7923fd90c8af03ce6a13 Mon Sep 17 00:00:00 2001 From: rosabolzek Date: Tue, 22 Jul 2025 12:12:27 +0200 Subject: [PATCH 492/587] Aliging yaml CR S5-253105 Rel-19 CR TS 28.541 Enhancing NR NRM to control RedCap and e-RedCap UEs access --- yang-models/_3gpp-nr-nrm-nrcelldu.yang | 7 ++ yang-models/_3gpp-nr-nrm-redcapaccess.yang | 82 ++++++++++++++++++++++ 2 files changed, 89 insertions(+) create mode 100755 yang-models/_3gpp-nr-nrm-redcapaccess.yang diff --git a/yang-models/_3gpp-nr-nrm-nrcelldu.yang b/yang-models/_3gpp-nr-nrm-nrcelldu.yang index 392b11cd2..fd30c8da0 100755 --- a/yang-models/_3gpp-nr-nrm-nrcelldu.yang +++ b/yang-models/_3gpp-nr-nrm-nrcelldu.yang @@ -19,6 +19,7 @@ module _3gpp-nr-nrm-nrcelldu { TTA, TTC). All rights reserved."; reference "3GPP TS 28.541 5G Network Resource Model (NRM)"; + revision 2025-07-25 { reference CR-; } revision 2025-02-07 { reference CR-1442; } revision 2024-05-25 { reference CR-1412 ; } revision 2024-05-24 { reference CR-1273 ; } @@ -362,6 +363,12 @@ module _3gpp-nr-nrm-nrcelldu { mandatory true; description "DN of an aggressor Set (RimRSSet)"; } + + leaf redCapAccessCriteriaRef { + type types3gpp:DistinguishedName; + mandatory true; + description "This attribute contains the DN of the redCapAccessCriteria MOI "; + } } augment "/me3gpp:ManagedElement/gnbdu3gpp:GNBDUFunction" { diff --git a/yang-models/_3gpp-nr-nrm-redcapaccess.yang b/yang-models/_3gpp-nr-nrm-redcapaccess.yang new file mode 100755 index 000000000..0cfa19be1 --- /dev/null +++ b/yang-models/_3gpp-nr-nrm-redcapaccess.yang @@ -0,0 +1,82 @@ +module _3gpp-nr-nrm-redcapaccess { + yang-version 1.1; + namespace "urn:3gpp:sa5:_3gpp-nr-nrm-redcapacess"; + prefix "redcapaccess"; + + import _3gpp-common-yang-types { prefix types3gpp; } + import _3gpp-common-subnetwork { prefix subnet3gpp; } + import _3gpp-common-top { prefix top3gpp; } + + organization "3GPP SA5"; + contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464"; + description "Defines the YANG mapping of the NRCellDU Information Object + Class (IOC) that is part of the NR Network Resource Model (NRM). + Copyright 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + TTA, TTC). All rights reserved."; + reference "3GPP TS 28.541 5G Network Resource Model (NRM)"; + + revision 2025-07-07 { reference CR-; } + + feature redcapaccesscriteriasubnertwork { + description "The RedCap acsess criterea shall be contained under + SubNetwork"; + } + + + grouping RedCapAccessCriteriaGrp { + description "Represents the RedCapAccessCriteria <> "; + + leaf nRCellDURef { + type types3gpp:DistinguishedName; + mandatory true; + description "This attribute contains the DN of a NR Cell (NRCellDU) "; + } + + leaf criteriaConditionRef { + type types3gpp:DistinguishedName; + mandatory true; + description "This specifies the DN of the ConditionMonitor MOI.The + attribute condition will contain information on the condition to be + satisfied to restrict Redcap UE access. This means that the value of + attribute “uECellBarredAccess” of NRCellDU IOC will be set to + REDCAP_1RX and REDCAP_2RX if this condition is met.The condition + will be created providing following information: + The performance metrics (KPIs and performance measurements) that are + to be considered in the criteria for deciding whether the cell in a + RAN node is barred or allowed for RedCap/eRedCap UEs + The direction (up and down) that is to be considered for crossing + the threshold value of the given performance metrics for taking a + decision whether the RAN node is barred or allowed for + RedCap/eRedCap UEs. + The threshold level of performance metrics value which when crossed + the RAN node is barred or allowed for RedCap/eRedCap UEs"; + } + + + } + + augment "/subnet3gpp:SubNetwork" { + if-feature redcapaccesscriteriasubnertwork; //Optional support + list RedCapAccessCriteria { + description "The RedCapAccessCriteria <> contains attributes + to support the controlling of RedCap access in a NR Cell. + It provides information of a condition (for example, KPIs such as + Total DRB accessibility, DRB Retainability , Utilization KPI, + NG-RAN data Energy Efficiency, Downlink/Uplink delay in gNB-DU etc. + and Performance measurements such as DL/UL Total PRB Usage, + Average DL/UL UE throughput in gNB etc.) which can be used to + control decision of barring or allowing access of RedCap/eRedCap + UEs to a NR Cell. This information can be used to decide whether + RedCap/eRedCap UEs are barred or allowed at the time of new UE + access attempt in NR cell during applicable RAN procedures."; + + key id; + max-elements 1; + uses top3gpp:Top_Grp; + container attributes { + uses RedCapAccessCriteriaGrp; + } + } + } + +} \ No newline at end of file -- GitLab From de915e76cdcf363e760c72f0ae76b86faa4ce145 Mon Sep 17 00:00:00 2001 From: rosabolzek Date: Tue, 22 Jul 2025 12:13:24 +0200 Subject: [PATCH 493/587] Aliging yaml CR S5-253105 Rel-19 CR TS 28.541 Enhancing NR NRM to control RedCap and e-RedCap UEs access --- yang-models/_3gpp-nr-nrm-redcapaccess.yang | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/yang-models/_3gpp-nr-nrm-redcapaccess.yang b/yang-models/_3gpp-nr-nrm-redcapaccess.yang index 0cfa19be1..9ea7e151f 100755 --- a/yang-models/_3gpp-nr-nrm-redcapaccess.yang +++ b/yang-models/_3gpp-nr-nrm-redcapaccess.yang @@ -56,7 +56,7 @@ module _3gpp-nr-nrm-redcapaccess { } augment "/subnet3gpp:SubNetwork" { - if-feature redcapaccesscriteriasubnertwork; //Optional support + if-feature redcapaccesscriteriasubnertwork; list RedCapAccessCriteria { description "The RedCapAccessCriteria <> contains attributes to support the controlling of RedCap access in a NR Cell. -- GitLab From 917cd17275b3bc7cd9c3384fd59c48dfddbcd80f Mon Sep 17 00:00:00 2001 From: rosabolzek Date: Tue, 22 Jul 2025 14:22:23 +0200 Subject: [PATCH 494/587] correct lint errors --- yang-models/_3gpp-nr-nrm-redcapaccess.yang | 162 ++++++++++----------- 1 file changed, 81 insertions(+), 81 deletions(-) diff --git a/yang-models/_3gpp-nr-nrm-redcapaccess.yang b/yang-models/_3gpp-nr-nrm-redcapaccess.yang index 9ea7e151f..06d94b853 100755 --- a/yang-models/_3gpp-nr-nrm-redcapaccess.yang +++ b/yang-models/_3gpp-nr-nrm-redcapaccess.yang @@ -1,82 +1,82 @@ -module _3gpp-nr-nrm-redcapaccess { - yang-version 1.1; - namespace "urn:3gpp:sa5:_3gpp-nr-nrm-redcapacess"; - prefix "redcapaccess"; - - import _3gpp-common-yang-types { prefix types3gpp; } - import _3gpp-common-subnetwork { prefix subnet3gpp; } - import _3gpp-common-top { prefix top3gpp; } - - organization "3GPP SA5"; - contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464"; - description "Defines the YANG mapping of the NRCellDU Information Object - Class (IOC) that is part of the NR Network Resource Model (NRM). - Copyright 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, - TTA, TTC). All rights reserved."; - reference "3GPP TS 28.541 5G Network Resource Model (NRM)"; - - revision 2025-07-07 { reference CR-; } - - feature redcapaccesscriteriasubnertwork { - description "The RedCap acsess criterea shall be contained under - SubNetwork"; - } - - - grouping RedCapAccessCriteriaGrp { - description "Represents the RedCapAccessCriteria <> "; - - leaf nRCellDURef { - type types3gpp:DistinguishedName; - mandatory true; - description "This attribute contains the DN of a NR Cell (NRCellDU) "; - } - - leaf criteriaConditionRef { - type types3gpp:DistinguishedName; - mandatory true; - description "This specifies the DN of the ConditionMonitor MOI.The - attribute condition will contain information on the condition to be - satisfied to restrict Redcap UE access. This means that the value of - attribute “uECellBarredAccess” of NRCellDU IOC will be set to - REDCAP_1RX and REDCAP_2RX if this condition is met.The condition - will be created providing following information: - The performance metrics (KPIs and performance measurements) that are - to be considered in the criteria for deciding whether the cell in a - RAN node is barred or allowed for RedCap/eRedCap UEs - The direction (up and down) that is to be considered for crossing - the threshold value of the given performance metrics for taking a - decision whether the RAN node is barred or allowed for - RedCap/eRedCap UEs. - The threshold level of performance metrics value which when crossed - the RAN node is barred or allowed for RedCap/eRedCap UEs"; - } - - - } - - augment "/subnet3gpp:SubNetwork" { - if-feature redcapaccesscriteriasubnertwork; - list RedCapAccessCriteria { - description "The RedCapAccessCriteria <> contains attributes - to support the controlling of RedCap access in a NR Cell. - It provides information of a condition (for example, KPIs such as - Total DRB accessibility, DRB Retainability , Utilization KPI, - NG-RAN data Energy Efficiency, Downlink/Uplink delay in gNB-DU etc. - and Performance measurements such as DL/UL Total PRB Usage, - Average DL/UL UE throughput in gNB etc.) which can be used to - control decision of barring or allowing access of RedCap/eRedCap - UEs to a NR Cell. This information can be used to decide whether - RedCap/eRedCap UEs are barred or allowed at the time of new UE - access attempt in NR cell during applicable RAN procedures."; - - key id; - max-elements 1; - uses top3gpp:Top_Grp; - container attributes { - uses RedCapAccessCriteriaGrp; - } - } - } - +module _3gpp-nr-nrm-redcapaccess { + yang-version 1.1; + namespace "urn:3gpp:sa5:_3gpp-nr-nrm-redcapaccess"; + prefix "redcapaccess3gpp"; + import _3gpp-common-yang-types { prefix types3gpp; } + import _3gpp-common-subnetwork { prefix subnet3gpp; } + import _3gpp-common-top { prefix top3gpp; } + + organization "3GPP SA5"; + contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464"; + description "Defines the YANG mapping of the NRCellDU Information Object + Class (IOC) that is part of the NR Network Resource Model (NRM). + Copyright 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + TTA, TTC). All rights reserved."; + + reference "3GPP TS 28.541 5G Network Resource Model (NRM)"; + + revision 2025-07-07 { reference CR-; } + + feature redcapaccesscriteriasubnertwork { + description "The RedCap acsess criterea shall be contained under + SubNetwork"; + } + + + grouping RedCapAccessCriteriaGrp { + description "Represents the RedCapAccessCriteria <> "; + + leaf nRCellDURef { + type types3gpp:DistinguishedName; + mandatory true; + description "This attribute contains the DN of a NR Cell (NRCellDU) "; + } + + leaf criteriaConditionRef { + type types3gpp:DistinguishedName; + mandatory true; + description "This specifies the DN of the ConditionMonitor MOI.The + attribute condition will contain information on the condition to be + satisfied to restrict Redcap UE access. This means that the value of + attribute uECellBarredAccess of NRCellDU IOC will be set to + REDCAP_1RX and REDCAP_2RX if this condition is met.The condition + will be created providing following information: + The performance metrics (KPIs and performance measurements) that are + to be considered in the criteria for deciding whether the cell in a + RAN node is barred or allowed for RedCap/eRedCap UEs + The direction (up and down) that is to be considered for crossing + the threshold value of the given performance metrics for taking a + decision whether the RAN node is barred or allowed for + RedCap/eRedCap UEs. + The threshold level of performance metrics value which when crossed + the RAN node is barred or allowed for RedCap/eRedCap UEs"; + } + + + } + + augment "/subnet3gpp:SubNetwork" { + if-feature redcapaccesscriteriasubnertwork; + list RedCapAccessCriteria { + description "The RedCapAccessCriteria <> contains attributes + to support the controlling of RedCap access in a NR Cell. + It provides information of a condition (for example, KPIs such as + Total DRB accessibility, DRB Retainability , Utilization KPI, + NG-RAN data Energy Efficiency, Downlink/Uplink delay in gNB-DU etc. + and Performance measurements such as DL/UL Total PRB Usage, + Average DL/UL UE throughput in gNB etc.) which can be used to + control decision of barring or allowing access of RedCap/eRedCap + UEs to a NR Cell. This information can be used to decide whether + RedCap/eRedCap UEs are barred or allowed at the time of new UE + access attempt in NR cell during applicable RAN procedures."; + + key id; + max-elements 1; + uses top3gpp:Top_Grp; + container attributes { + uses RedCapAccessCriteriaGrp; + } + } + } + } \ No newline at end of file -- GitLab From 9a59bfb8412676ec83f919bb6421c6fd4439cb55 Mon Sep 17 00:00:00 2001 From: rosabolzek Date: Tue, 22 Jul 2025 14:25:41 +0200 Subject: [PATCH 495/587] corect lint errors --- yang-models/_3gpp-nr-nrm-redcapaccess.yang | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/yang-models/_3gpp-nr-nrm-redcapaccess.yang b/yang-models/_3gpp-nr-nrm-redcapaccess.yang index 06d94b853..77914ad37 100755 --- a/yang-models/_3gpp-nr-nrm-redcapaccess.yang +++ b/yang-models/_3gpp-nr-nrm-redcapaccess.yang @@ -1,7 +1,7 @@ module _3gpp-nr-nrm-redcapaccess { yang-version 1.1; namespace "urn:3gpp:sa5:_3gpp-nr-nrm-redcapaccess"; - prefix "redcapaccess3gpp"; + prefix "redcap3gpp"; import _3gpp-common-yang-types { prefix types3gpp; } import _3gpp-common-subnetwork { prefix subnet3gpp; } import _3gpp-common-top { prefix top3gpp; } -- GitLab From 928df793a2cea4444cdcbc54a7e40347502c8b70 Mon Sep 17 00:00:00 2001 From: rosabolzek Date: Tue, 22 Jul 2025 14:52:25 +0200 Subject: [PATCH 496/587] aligne correct S5-252333 Rel-19 CR TS 28.541 Correct stage2 and stage3 definition for attribute allowedTime in MWAB --- yang-models/_3gpp-nr-nrm-gnbcucpfunction.yang | 3 +++ yang-models/_3gpp-nr-nrm-mwab.yang | 17 +++++++++-------- 2 files changed, 12 insertions(+), 8 deletions(-) diff --git a/yang-models/_3gpp-nr-nrm-gnbcucpfunction.yang b/yang-models/_3gpp-nr-nrm-gnbcucpfunction.yang index d776bf37a..335eb3c16 100755 --- a/yang-models/_3gpp-nr-nrm-gnbcucpfunction.yang +++ b/yang-models/_3gpp-nr-nrm-gnbcucpfunction.yang @@ -333,6 +333,9 @@ module _3gpp-nr-nrm-gnbcucpfunction { leaf mWABRef { type types3gpp:DistinguishedName; + description "This attribute represents the MWAB functionality + (See sub clause 5.49 [11]). This attribute contains the DN of the + referenced MWAB."; } } diff --git a/yang-models/_3gpp-nr-nrm-mwab.yang b/yang-models/_3gpp-nr-nrm-mwab.yang index e57a85bf1..ab4791037 100644 --- a/yang-models/_3gpp-nr-nrm-mwab.yang +++ b/yang-models/_3gpp-nr-nrm-mwab.yang @@ -3,7 +3,6 @@ module _3gpp-nr-nrm-mwab { namespace "urn:3gpp:sa5:_3gpp-nr-nrm-mwab"; prefix "mwab3gpp"; - import ietf-yang-types { prefix yang; } import _3gpp-common-yang-types { prefix types3gpp; } import _3gpp-common-top { prefix top3gpp; } @@ -49,13 +48,15 @@ module _3gpp-nr-nrm-mwab { uses types3gpp:GeoAreaGrp; } - leaf-list allowedTime { - description "This species the time window for which the MWAB can act as - MWAB-gNB. If the allowed time window/validity indicates 20th June, - 10 am to 5 pm of the day, the MWAB acts as an MWAB g-NB only during - 20th June, 10 am to 5 pm of the day, and does not act as MWAB-gNB for - any other time. (See sub clause 5.49 TS 28.662)."; - type yang:date-and-time; + list allowedTime { + description "This specifies the time window for which the MWAB can act + as MWAB-gNB. If the allowed time window/ validity indicates 20th June, + 10 am to 5 pm of the day, the MWAB acts as an MWAB g-NB only during 20th + June, 10 am to 5 pm of the day, and does not act as MWAB-gNB for any + other time. (See sub clause 5.49 [11])."; + key idx; + leaf idx { type uint32 ; } + uses types3gpp:TimeWindowGrp; } } -- GitLab From cec0dcd00e17dd45ea9daeab481b2ec69e984be9 Mon Sep 17 00:00:00 2001 From: rosabolzek Date: Tue, 22 Jul 2025 16:04:57 +0200 Subject: [PATCH 497/587] aligne yang with yaml from CR S5-252933 Enhancements on NRFFunction to support hierarchical NRF scenario --- yang-models/_3gpp-5gc-nrm-nrffunction.yang | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/yang-models/_3gpp-5gc-nrm-nrffunction.yang b/yang-models/_3gpp-5gc-nrm-nrffunction.yang index e8a8ff3bc..ad84040eb 100755 --- a/yang-models/_3gpp-5gc-nrm-nrffunction.yang +++ b/yang-models/_3gpp-5gc-nrm-nrffunction.yang @@ -76,6 +76,14 @@ module _3gpp-5gc-nrm-nrffunction { key nfInstanceId; uses nfp3gpp:NFProfileGrp; } + list managedNFProfile { + key idx; + min-elements 1; + max-elements 1; + uses types3gpp:ManagedNFProfile; + description "This parameter defines profile for managed NF"; + reference "3gpp TS 23.501"; + } } augment "/me3gpp:ManagedElement" { -- GitLab From a4de3e966adb46d681452942b58fe26e6cb6a23e Mon Sep 17 00:00:00 2001 From: rosabolzek Date: Tue, 22 Jul 2025 22:56:10 +0200 Subject: [PATCH 498/587] make VnfParameter. autoScalable attribute nulable in order to align with CR S5-251976 --- yang-models/_3gpp-common-managed-function.yang | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/yang-models/_3gpp-common-managed-function.yang b/yang-models/_3gpp-common-managed-function.yang index 2bffe8a90..f7a5a379f 100755 --- a/yang-models/_3gpp-common-managed-function.yang +++ b/yang-models/_3gpp-common-managed-function.yang @@ -25,6 +25,7 @@ module _3gpp-common-managed-function { 3GPP TS 28.620 Umbrella Information Model (UIM)"; + revision 2025-07-25 { reference "CR-"; } revision 2025-04-19 { reference "CR-0541"; } revision 2024-11-19 { reference "Add STM"; } revision 2024-02-24 { reference CR-0346; } @@ -201,7 +202,6 @@ module _3gpp-common-managed-function { leaf autoScalable { type boolean ; - mandatory true; description "Indicator of whether the auto-scaling of this VNF instance is enabled or disabled."; } -- GitLab From 1b696c6d021deb3d33fb0d1a3b8a803ff382e1bf Mon Sep 17 00:00:00 2001 From: "U-ERICSSON\\ETHBLL" Date: Wed, 23 Jul 2025 15:32:10 +0200 Subject: [PATCH 499/587] CR S5-252889 --- yang-models/_3gpp-nr-nrm-gnbdufunction.yang | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/yang-models/_3gpp-nr-nrm-gnbdufunction.yang b/yang-models/_3gpp-nr-nrm-gnbdufunction.yang index 5f9de8da5..19b3c3138 100755 --- a/yang-models/_3gpp-nr-nrm-gnbdufunction.yang +++ b/yang-models/_3gpp-nr-nrm-gnbdufunction.yang @@ -18,10 +18,11 @@ module _3gpp-nr-nrm-gnbdufunction { TTA, TTC). All rights reserved."; reference "3GPP TS 28.541 5G Network Resource Model (NRM)"; + revision 2025-07-19 { reference CR-1558; } revision 2025-05-07 { reference "CR-1527 CR-1548"; } revision 2025-02-05 { reference CR-1441; } - revision 2024-02-24 { reference CR-1218; } - revision 2023-09-18 { reference CR-1043 ; } + revision 2024-02-24 { reference CR-1218; } + revision 2023-09-18 { reference CR-1043 ; } revision 2023-04-26 { reference CR-0916; } revision 2022-11-02 { reference "CR-0753"; } revision 2022-07-28 { reference "CR-0770"; } @@ -187,17 +188,18 @@ module _3gpp-nr-nrm-gnbdufunction { uses RimRSReportConfGrp; } leaf isOnboardSatellite { - type boolean; + type boolean; default false; + config false; description "This attribute indicates whether the function is on board the satellite."; } leaf onboardSatelliteId { - type string; + type string; description "This attribute indicates the onboard satellite Id. It shall be formatted as a fixed 5-digit string, padding with - leading digits “0” to complete a 5-digit length."; - } + leading digits '0' to complete a 5-digit length."; + } leaf configurable5QISetRef { type types3gpp:DistinguishedName; description "DN of the Configurable5QISet that the GNBDUFunction supports -- GitLab From 2f0e544376539549f9ad9d5d355361656aae9585 Mon Sep 17 00:00:00 2001 From: "U-ERICSSON\\ETHBLL" Date: Wed, 23 Jul 2025 15:34:49 +0200 Subject: [PATCH 500/587] trace clarification --- yang-models/_3gpp-common-trace.yang | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/yang-models/_3gpp-common-trace.yang b/yang-models/_3gpp-common-trace.yang index bec576ffc..ffef34021 100755 --- a/yang-models/_3gpp-common-trace.yang +++ b/yang-models/_3gpp-common-trace.yang @@ -25,6 +25,7 @@ module _3gpp-common-trace { Integration Reference Point (IRP); Information Service (IS)" ; + revision 2025-06-25 { reference "CR-xxxx" ; } revision 2025-05-07 { reference "CR-0532 CR-0536 CR-0540" ; } revision 2025-02-07 { reference "CR-0504" ; } revision 2025-02-05 { reference "CR-0461" ; } @@ -202,10 +203,13 @@ module _3gpp-common-trace { uses types3gpp:PLMNId; // mcc+mnc leaf traceId { - type string; + type string { + pattern "[0-9a-fA-F]{6}"; + } mandatory true; description "An identifier, which identifies the Trace - (together with MCC and MNC). This is a 3 byte Octet String."; + (together with MCC and MNC). This is a 3 byte Octet String, + expressed in hexadecimal form e.g., '1a7b3d')."; } } -- GitLab From 0f1212a15a4c178a7f27ca51f38d681411e6c168 Mon Sep 17 00:00:00 2001 From: "U-ERICSSON\\ETHBLL" Date: Wed, 23 Jul 2025 15:40:16 +0200 Subject: [PATCH 501/587] trace clarification --- yang-models/_3gpp-common-trace.yang | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/yang-models/_3gpp-common-trace.yang b/yang-models/_3gpp-common-trace.yang index ffef34021..8e94b81ef 100755 --- a/yang-models/_3gpp-common-trace.yang +++ b/yang-models/_3gpp-common-trace.yang @@ -25,7 +25,7 @@ module _3gpp-common-trace { Integration Reference Point (IRP); Information Service (IS)" ; - revision 2025-06-25 { reference "CR-xxxx" ; } + revision 2025-06-25 { reference "CR-0551" ; } revision 2025-05-07 { reference "CR-0532 CR-0536 CR-0540" ; } revision 2025-02-07 { reference "CR-0504" ; } revision 2025-02-05 { reference "CR-0461" ; } -- GitLab From fe36e7ba0b74e2b12e0950c809e2a669f9ae593e Mon Sep 17 00:00:00 2001 From: "U-ERICSSON\\ETHBLL" Date: Wed, 23 Jul 2025 16:40:50 +0200 Subject: [PATCH 502/587] removed notifyChangedAlarm --- yang-models/_3gpp-common-subscription-control.yang | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/yang-models/_3gpp-common-subscription-control.yang b/yang-models/_3gpp-common-subscription-control.yang index fcc5451e6..471d19c54 100755 --- a/yang-models/_3gpp-common-subscription-control.yang +++ b/yang-models/_3gpp-common-subscription-control.yang @@ -20,11 +20,12 @@ module _3gpp-common-subscription-control { Solution Set (SS) definitions 3GPP TS 28.623"; - revision 2025-05-13 { reference "CR-0548" ; } - revision 2025-03-24 { reference "CR-0516 0518" ; } - revision 2024-05-18 { reference CR-0359 ; } - revision 2024-01-18 { reference "CR-0309 CR-0329" ; } - revision 2023-09-18 { reference CR-0271 ; } + revision 2025-07-19 { reference CR-0551; } + revision 2025-05-13 { reference "CR-0548"; } + revision 2025-03-24 { reference "CR-0516 0518"; } + revision 2024-05-18 { reference CR-0359; } + revision 2024-01-18 { reference "CR-0309 CR-0329"; } + revision 2023-09-18 { reference CR-0271; } revision 2023-08-10 { reference "CR0257 CR0260"; } revision 2022-10-20 { reference CR-0196; } revision 2021-01-16 { reference "CR-0120"; } @@ -123,7 +124,6 @@ module _3gpp-common-subscription-control { enum notifyMOIChanges; enum notifyEvent; enum notifyNewAlarm; - enum notifyChangedAlarm; enum notifyAckStateChanged; enum notifyComments; enum notifyCorrelatedNotificationChanged; -- GitLab From 84e0ece8d03dc99848fbee4025369a17cb2d789d Mon Sep 17 00:00:00 2001 From: "U-ERICSSON\\ETHBLL" Date: Wed, 23 Jul 2025 22:31:38 +0200 Subject: [PATCH 503/587] S5-252275 --- yang-models/_3gpp-common-externaldata.yang | 135 ++++++++ ..._3gpp-common-managementdatacollection.yang | 293 +++++++++++++----- yang-models/_3gpp-common-mnsregistry.yang | 189 +++++++++-- 3 files changed, 516 insertions(+), 101 deletions(-) create mode 100644 yang-models/_3gpp-common-externaldata.yang diff --git a/yang-models/_3gpp-common-externaldata.yang b/yang-models/_3gpp-common-externaldata.yang new file mode 100644 index 000000000..63700caf8 --- /dev/null +++ b/yang-models/_3gpp-common-externaldata.yang @@ -0,0 +1,135 @@ +module _3gpp-common-externaldata { + yang-version 1.1; + namespace "urn:3gpp:sa5:_3gpp-common-externaldata"; + prefix "exdata3gpp"; + + import _3gpp-common-subnetwork { prefix subnet3gpp; } + import _3gpp-common-top { prefix top3gpp; } + import _3gpp-common-yang-types { prefix types3gpp; } + import ietf-inet-types { prefix inet; } + + organization "3GPP SA5"; + contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464"; + description "Defines the YANG mapping of the external data. + Copyright 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + TTA, TTC). All rights reserved."; + reference "3GPP TS 28.623 Generic Network Resource Model (NRM)"; + + revision 2025-07-19 { reference CR-0551; } + + grouping ExternalDataScopeGrp { + list geoAreas { + description "It describes the concrete geographical area(s)"; + key idx; + leaf idx { type uint32; } + uses types3gpp:GeoAreaGrp; + } + + leaf-list objectInstancesIncluded { + type types3gpp:DistinguishedName; + description "List of managed object instances to which the described + data are related. Each object instance is identified by its DN."; + } + + leaf-list objectInstancesExcluded { + type types3gpp:DistinguishedName; + description "List of managed object instances which are not considered + in relation to the described data. Each object instance is identified + by its DN."; + } + } + + grouping ExternalDataTypeGrp { + description "Represents the IOC ExternalDataType"; + + leaf externalDataType { + type string; + mandatory true; + description "Type of external management data as defined by the + implementation. + + Examples: 'Electronic Map', 'Camara Data', 'UE path', 'Camera Photo', + 'Event Schedule”"; + } + + leaf-list mediaLocation { + type inet:uri; + description "URI of the media which includes the transfer protocol. + + Examples: + sftp://companyA.com/datastore/fileName.xml + https://companyA.com/ManagedElement=1/Files=1/File=1"; + } + + leaf externalDataTypeSchema { + type inet:uri; + mandatory true; + description "URI of the schema to parse a type of external management data. + The detailed schema definition for the different types of external + management data is out of scope of this specification."; + } + + list externalDataScope { + description "It describes the concrete scope which the external management + data is applicable."; + key idx; + leaf idx { type uint32; } + uses ExternalDataScopeGrp; + } + } + + augment /subnet3gpp:SubNetwork { + list ExternalDataType { + description "This IOC specifies a type of external management data and + the associated meta data. + + External management data is data which enrich 3GPP specified management + data and management data specified based on 3GPP defined management data + definition templates and frameworks. External management data can be + produced by data sources of different nature (e.g. sensors) with different + formats. Details see clause 6.4.1 in TS 28.537. + + MnS producer may use this IOC to describe external management data. + + For example, MnS producer publishes all external management data which + are available. + + MnS consumer may use this IOC to configure, discover or request external + management data. For example, MnS consumer discovers and requests certain + types of external management data. + + The ExternalDataType IOC can be name-contained by SubNetwork. + + Attribute externalDataType defines the type of external management data. + + Attribute mediaLocation indicates the address from which the described + external management data can be retrieved. + + The value of mediaLocation, if present, can provide one or several + directories or the address where the described external management data + can be retrieved. The different directories can be used to group the + external management data, e.g., one directory per geographical area or + per time period. For example, the value of the mediaLocation attribute + can be given by + + sftp://companyA.com/datastore/weatherforecasts/ + + In this case a potential file with name 'weatherforecastMunicht0.xml' + needs to be retrieved using 'sftp' from + + sftp://companyA.com/datastore/weatherforecasts/weatherforecastMunicht0.xml. + + Attribute externalDataTypeSchema indicates the URI where the MnS consumer + can get the schema to parse the external management data. + + Attribute externalDataScope is used to describe the concrete scope (e.g., + geographical areas) which the external management data is applicable."; + + key id; + uses top3gpp:Top_Grp; + container attributes { + uses ExternalDataTypeGrp; + } + } + } +} \ No newline at end of file diff --git a/yang-models/_3gpp-common-managementdatacollection.yang b/yang-models/_3gpp-common-managementdatacollection.yang index 68e8a3ad8..04e52aa0f 100644 --- a/yang-models/_3gpp-common-managementdatacollection.yang +++ b/yang-models/_3gpp-common-managementdatacollection.yang @@ -24,6 +24,7 @@ module _3gpp-common-managementdatacollection { Integration Reference Point (IRP); Information Service (IS)"; + revision 2025-07-19 { reference CR-0551; } revision 2025-02-07 { reference "CR-0461 CR-0505"; } revision 2024-04-12 { reference CR-0346; } revision 2023-11-18 { reference CR-0299 ; } @@ -32,6 +33,82 @@ module _3gpp-common-managementdatacollection { revision 2023-02-14 { reference "CR-0234"; } revision 2022-11-04 { reference "CR-0194"; } + grouping ManagementDataGrp { + description "This <> defines the management data which is + requested. It is a choice between + - a list of data categories (attribute mgtDataCategory) This may include + 'COVERAGE', 'CAPACITY', 'MOBILITY', 'ENERGY_EFFICIENCY', 'ACCESSIBILITY' + etc. The mapping of exact measurement with the requested category will be + done at the producer and is implementation specific. + - a list of management data identified with their name (attribute + 'mgtDataName'). The management data name presents a specific single + measurement (e.g. by selecting 'RRU.PrbTotDl', see TS 28.552 or + 'immediateMdt.nr.m1', see TS 32.422) or a set of measurements (e.g. + measurement families such as RRU (radio resource utilization) or + MM (mobility management) in case of PM, see TS 28.552 [20], or group of + measurements such as 'immediateMdt.nr' in case of MDT, see TS 32.422)."; + choice managementData { + case mgtDataCategory { + leaf-list category { + type mgtDataCategoryType; + min-elements 1; + max-elements 5; // The ENUM contains 5 possible values + description "This attributes defines the type of management data that + are requested. + + Allowed values for data category are COVERAGE, CAPACITY, + ENERGY_EFFICIENCY, MOBILITY, ACCESSIBILITY. The data categories + will map to certain measurement families defined in TS 28.552, see + below. In addition to the below mappings, MnS producer may map the + provided categories to any additional proprietary management data, + as appropriate. + + - The COVERAGE category will map to measurement families of MR + (measurements related to Measurement Report) and L1M (measurements + related to Layer 1 Measurement). + + - The CAPACITY category will map to measurement family RRU + (measurements related to Radio Resource Utilization). + + - The ENERGY_EFFICIENCY category will map to measurement family PEE + (measurements related to Power, Energy and Environment). + + - The MOBILITY category will map to measurement family MM + (measurements related to Mobility Management). + + - The ACCESSIBILITY category will map to measurement family CE + (measurements related to Connection Establishment)."; + } + } + case mgtDataName { + leaf-list name { + type string; + min-elements 1; + description "List of management data identified by name. + + The list may include metrics or set of metrics defined + in TS 28.552, TS 28.554 and TS 32.422. + + The metrics are identified with their names/identifiers. + For performance measurements defined in TS 28.552 the name is + constructed as the bullet e) of the measurement definition. + + For KPIs defined in TS 28.554 the name is defined according to the + KPI definitions template as the component designated with a). + + For trace metrics (including trace messages, MDT measurements + (Immediate MDT, Logged MDT, Logged MBSFN MDT), RRC, RLF and RCEF + reports) defined in TS 32.422, the name (metric identifier) is + defined in clause 10 of TS 32.422. + + For non-3GPP specified managment data the name is defined + elsewhere."; + } + } + mandatory true; + } + } + grouping GeoAreaToCellMappingGrp { description "Represents the GeoAreaToCellMapping data type. @@ -155,6 +232,13 @@ module _3gpp-common-managementdatacollection { subnet should be targeted. Please refer to 3GPP TS 23.501: 'System Architecture for the 5G System'"; } + + leaf-list objectInstances { + type types3gpp:DistinguishedName; + yext3gpp:inVariant; + description "List of managed object instances. Each object instance is + identified by its DN."; + } } typedef mgtDataCategoryType { @@ -170,65 +254,9 @@ module _3gpp-common-managementdatacollection { grouping ManagementDataCollectionGrp { - choice managementData { - case mgtDataCategory { - leaf-list category { - type mgtDataCategoryType; - min-elements 1; - max-elements 5; // The ENUM contains 5 possible values - description "This attributes defines the type of management data that - are requested. - - Allowed values for data category are COVERAGE, CAPACITY, - ENERGY_EFFICIENCY, MOBILITY, ACCESSIBILITY. The data categories - will map to certain measurement families defined in TS 28.552, see - below. In addition to the below mappings, MnS producer may map the - provided categories to any additional proprietary management data, - as appropriate. - - - The COVERAGE category will map to measurement families of MR - (measurements related to Measurement Report) and L1M (measurements - related to Layer 1 Measurement). - - - The CAPACITY category will map to measurement family RRU - (measurements related to Radio Resource Utilization). - - - The ENERGY_EFFICIENCY category will map to measurement family PEE - (measurements related to Power, Energy and Environment). - - - The MOBILITY category will map to measurement family MM - (measurements related to Mobility Management). - - - The ACCESSIBILITY category will map to measurement family CE - (measurements related to Connection Establishment)."; - } - } - case mgtDataName { - leaf-list name { - type string; - min-elements 1; - description "List of management data identified by name. - - The list may include metrics or set of metrics defined - in TS 28.552, TS 28.554 and TS 32.422. - - The metrics are identified with their names/identifiers. - For performance measurements defined in TS 28.552 the name is - constructed as the bullet e) of the measurement definition. - - For KPIs defined in TS 28.554 the name is defined according to the - KPI definitions template as the component designated with a). - - For trace metrics (including trace messages, MDT measurements - (Immediate MDT, Logged MDT, Logged MBSFN MDT), RRC, RLF and RCEF - reports) defined in TS 32.422, the name (metric identifier) is - defined in clause 10 of TS 32.422. - - For non-3GPP specified managment data the name is defined - elsewhere."; - } - } - mandatory true; + uses ManagementDataGrp { + description "This attribute defines the list of management data that are + requested."; } list targetNodeFilter { @@ -271,6 +299,48 @@ module _3gpp-common-managementdatacollection { description "It specifies whether the required data is reported per S-NSSAI or per 5QI."; } + + leaf condition { + type string; + mandatory true; + yext3gpp:inVariant; + description "Logical expression of one or several condition(s). + + The actual syntax and capabilities of condition is SS specific. However, + each SS should support condition consisting of one or several assertions + that may be grouped using the logical operators AND, OR and NOT. Only if + the whole expression of condition evaluates TRUE, the attribute + conditionStatus will be TRUE. + + Each assertion is a pointer to a Boolean parameter or a logical + expression of attribute existence or attribute value comparison + ('equal to X, less than Y' etc.). + + An empty string is not allowed."; + } + + list processMonitor { + config false; + min-elements 1; + max-elements 1; + key idx; + leaf idx { type string; } + description "Indicates the process of the ManagementDataCollection MOI."; + } + + leaf consolidateOutput { + type boolean; + mandatory true; + yext3gpp:inVariant; + description "Indicates whether the management data collection output will + be consolidated into a single file per reporting period."; + } + + leaf jobId { + type string; + yext3gpp:inVariant; + description "Identifier of a PerfMetricJob, a TraceJob or a QMCJob."; + } } augment /subnet3gpp:SubNetwork { @@ -282,16 +352,18 @@ module _3gpp-common-managementdatacollection { uses ManagementDataCollectionGrp; } description "This IOC represents a management data collection request - job. The requested data could be of kind Trace, MDT (Minimization + job. The requested data is of kind Trace, MDT (Minimization of Drive Test), RLF (Radio Link Failure) report, RCEF (RRC Connection Establishment Failure) report, RRC report, PM (performance measurements), KPI (end-to-end key performance indicators) or a combination of these. - The attribute 'managementData' defines the management data which shall + The attribute managementData defines the management data which shall be reported. This may either include a list of data categories or a list of management data identified with their name. For further details - see TS 28.622 clause 4.3.50. The 'targetNodeFilter' attribute can be + see TS 28.622 clause 4.3.50. + + The targetNodeFilter attribute can be used to target object instance(s) producing the required management data. It is assumed that the consumer may not have detailed knowledge of the network and hence may not identify the exact object instance @@ -302,27 +374,82 @@ module _3gpp-common-managementdatacollection { function. To activate the production of the requested data, a MnS consumer has to - create a 'ManagementDataCollection' object instance on the MnS producer. - - The MnS producer will derive multiple jobs ('PerfMetricJob', - 'TraceJob') from a single 'ManagementDataCollection' job for collecting - the required management data. Once it receives the measurement from - multiple sources, it consolidates the data into a set of management data - for reporting. - - The attribute 'collectionTimeWindow' specifies the time window for which - the management data should be reported. - - The attribute 'reportingCtrl' specifies the method and associated - control parameters for reporting the produced management data to MnS - consumers. Three methods are available: file-based reporting with - selection of the file location by the MnS producer, file-based - reporting with selection of the file location by the MnS consumer and - stream-based reporting. - - The attribute 'dataScope' configures, whether the management data - should be reported per S-NSSAI or per 5QI, if applicable."; + create a ManagementDataCollection object instance on the MnS producer. + + The attribute jobId is used to identify a management data collection + request. + + The production and reporting of the management data can be constrained + by conditions such that only when the conditions are satisfied shall + management data collection be enabled. For example, a MnS consumer can + request to create two ManagementDataCollection instances. One can be + configured with high data producing and reporting period on a set of + conditions (e.g, to reduce transmission cost when network performance + metric is in normal range). Another can be configured with low data + producing and reporting period on another set of conditions (e.g. to + enable network optimization when network performance metric is in + abnormal range). + + The MnS producer may derive multiple jobs (PerfMetricJob, TraceJob) + from a single ManagementDataCollection job for collecting the required + management data. The jobId of the request is used to identify the + output. The value is also used to correlate the derived jobs which + will have the same jobId value as the ManagementDataCollection. + + If the MnS producer receives the collected data from multiple sources, + it will consolidate the data into a set of management data for + reporting based on the value of the attribute consolidateOutput. + + For consolidation of file-based management data the attribute + consolidateOutput controls: + - True: the MnS Producer will combine the file output from jobs used + to collect the required management data into a single output file as + follows: + - File is in compressed format, i.e. zip. + - File shall contain individual output files from each configured job + - Each file retains its original filename + - Each file retains it original content + - Consolidated filename uses naming convention defined in, + TS 28.532 clause 11.3.2.1.4 with the following: + - is a combination of the management data types included in + the consolidated output + - is omitted + - False: the MnS Producer will not combine the output from jobs used to collect the required management data. The MnS Consumer will receive separate output from the derived jobs. + + Subject to the reporting method, the MnS Consumer may receive file + related notifications. When consolidated output is selected the + MnS Producer will create file notifications for the consolidated files. + When consolidated output is not selected, the MnS Producer will create + the notification subscriptions on behalf of the MnS Consumer and the + MnS Consumer will receive notifications directly from the derived jobs. + + The attribute collectionTimeWindow specifies the time window for which + the management data should be reported. The attributes startTime and + the endTime can be in the past, present or in the future. + + The attribute reportingCtrl specifies the method and associated control + parameters for reporting the produced management data to MnS consumers. + Three methods are available: file-based reporting with selection of the + file location by the MnS producer, file-based reporting with selection + of the file location by the MnS consumer and stream-based reporting. + + The attribute dataScope configures, whether the management data should + be reported per S-NSSAI or per 5QI or per PLMN, if applicable. + + The attribute processMonitor allows the MnS consumer to monitor the + status of the management data collection represented by the object + ManagementDataCollection. + + The MnS producer indicates in the attribute progressStateInfo the + state of the management data collection: + - NOT_STARTED + - RUNNING + - CANCELING + and indicates in the attribute resultStateInfo: + - FINISHED + - FAILED + - PARTIALLY_FAILED + - CANCELLED"; } } - } diff --git a/yang-models/_3gpp-common-mnsregistry.yang b/yang-models/_3gpp-common-mnsregistry.yang index 4e9ae225e..7b03dbc8a 100755 --- a/yang-models/_3gpp-common-mnsregistry.yang +++ b/yang-models/_3gpp-common-mnsregistry.yang @@ -6,15 +6,18 @@ module _3gpp-common-mnsregistry { import _3gpp-common-subnetwork { prefix subnet3gpp; } import _3gpp-common-top { prefix top3gpp; } import _3gpp-common-yang-types { prefix types3gpp; } + import _3gpp-common-yang-extensions { prefix yext3gpp; } + import _3gpp-common-managementdatacollection { prefix mgtdatcol3gpp; } organization "3GPP SA5"; contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464"; - description "Defines the YANG mapping of the MNSRegistry Information Object - Class (IOC) that is part of the Generic Network Resource Model (NRM). - Copyright 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + description "Defines the YANG mapping of the MNSRegistry IOC and its + contained classes that ares part of the Generic Network Resource Model (NRM). + Copyright 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved."; reference "3GPP TS 28.623 Generic Network Resource Model (NRM)"; + revision 2025-07-19 { reference CR-0551; } revision 2023-09-30 { reference CR-0278; } revision 2023-09-18 { reference CR-0271 ; } revision 2023-05-10 { reference CR-0243; } @@ -22,6 +25,135 @@ module _3gpp-common-mnsregistry { revision 2021-11-23 { reference "S5-216090"; } revision 2021-10-18 { reference "S5-215263"; } revision 2021-08-29 { reference "Initial revision, S5-214388"; } + + grouping MgmtDataInfoGrp { + description "Represents the MgmtDataInfo IOC."; + + uses mgtdatcol3gpp:ManagementDataGrp { + description "Defines the list of management data that can be supported. + + The management data is a choice between: + - a list of data categories (attribute mgtDataCategory) + - a list of management data identified with their name + (attribute 'mgtDataName')."; + } + + leaf-list supportedGranularityPeriods { + type int32; + units seconds; + description "Granularity periods supported for the production of + associated management data. The period is defined in seconds."; + } + + leaf-list supportedReportingPeriods { + type uint32; + units seconds; + description "Reporting periods supported for the associated management + data. The period is defined in seconds."; + } + + leaf historicalDataPeriod { + type uint64; + units seconds; + description "This attribute describes the maximum period of the requested + historical data. The period is defined in seconds. + When the value of this attribute is NULL, which means the capability of + querying historical data is not supported."; + } + + leaf-list supportedReportingMethod { + type enumeration { + enum FILE; + enum STREAM; + } + min-elements 1; + description "List of supported reporting methods for the associated + management data."; + } + + leaf-list supportedDataScope { + type enumeration { + enum SNSSAI; + enum 5QI; + enum PLMN; + } + min-elements 1; + description "List of supported sub counter capabilities for the associated + management data"; + } + + leaf-list supportedDataRequestMnSRef { + type types3gpp:DistinguishedName; + min-elements 1; + description "List of DN of MnSInfo for the MnS instance(s) which can be + used to request the associated management data"; + } + + leaf-list supportedDataReportingMnSRef { + type types3gpp:DistinguishedName; + min-elements 1; + description "List of DN of MnSInfo for the MnS instance(s) which can be + used to report the associated management data"; + } + } + + grouping MnsScopeGrp { + description "This <> specifies the list of managed object instances + that can be accessed using the Management Service. These managed object + instances can be represented with one of the following options: + + - A list of DNs, i.e. representing managed object instances identified + by the DN. + + - A list of GeoAreas, i.e. representing managed object instances covered + by the specified geographical areas. In the present document, the + geoAreasList is only used for MnS consumer to retrieve MnS + scope of the specified MnS instance. + + - A list of TAIs, i.e. representing managed object instances covered + by the specified TAIs."; + + choice MnsScope { + mandatory true; + leaf-list objectInstanceList { + type types3gpp:DistinguishedName; + yext3gpp:inVariant; + yext3gpp:notNotifyable; + description "This attribute describes list of DNs for the managed + object instances that can be accessed using the Management Service. + If a complete SubNetwork can be accessed using the Management Service, + this attribute may contain the DN of the SubNetwork instead of the + DNs of the individual managed entities within the SubNetwork. + + If a complete ManagedElement can be accessed using the Management + Service, this attribute may contain the DN of the ManagedElement + instead of the DNs of the individual managed entities within the + ManagedElement."; + } + + list geoAreasList { + yext3gpp:inVariant; + yext3gpp:notNotifyable; + description "This attribute describes geographical areas for the + managed object instances that can be accessed using the Management + Service."; + key idx; + leaf idx { type uint32; } + uses types3gpp:GeoAreaGrp; + } + + list taiList { + yext3gpp:inVariant; + yext3gpp:notNotifyable; + description "This attribute describes the list of Tracking Area + Identities (TAI) for the managed object instances that can be accessed + using the Management Service."; + key idx; + leaf idx { type uint32; } + uses types3gpp:TaiGrp; + } + } + } grouping MnsInfoGrp { description "Represents the MnsInfo IOC."; @@ -52,16 +184,24 @@ module _3gpp-common-mnsregistry { type string; } - leaf-list mnsScope { - description "List of the managed object instances that can be accessed - using the MnS. If a complete SubNetwork can be accessed using the MnS, - this attribute may contain the DN of the SubNetwork instead of the - DNs of the individual managed entities within the SubNetwork. If a - complete ManagedElement can be accessed using the MnS, - this attribute may contain the DN of the ManagedElement instead of the - DNs of the individual managed entities within the ManagedElement."; + list mnsScope { + description "This attribute defines the information about the + management scope of the Management Service. The management scope is + used to represent the set of managed object instances that can be + accessed using the Management Service."; min-elements 1; + key idx; + leaf idx { type uint32; } + uses MnsScopeGrp; + } + + leaf-list mgmtDataInfoRef { type types3gpp:DistinguishedName; + yext3gpp:notNotifyable; + min-elements 1; + description "List of DN of MgmtDataInfo instance(s) which are associated + the MnSInfo which represent a management service instance"; + } } @@ -87,9 +227,6 @@ module _3gpp-common-mnsregistry { and provides the data required to support its discovery. It is name-contained by MnsRegistry. - This specification does not specify how 'MnsInfo' objects are - created and maintained. - This information is used by the consumer to discover the producers of specific Management Services and to derive the addresses of the Management Service. @@ -100,10 +237,10 @@ module _3gpp-common-mnsregistry { Attribute mnsAddress is used to provide addressing information for the Management Service operations. - Attribute mnsScope is used to provide information about the - management scope of the Management Service. The management scope is - defined as the set of managed object instances that can be accessed - using the Management Service."; + Attribute mnsScope is used to provide information about the + management scope of the Management Service. The management scope + is used to represent the set of managed object instances that can + be accessed using the Management Service."; key id; uses top3gpp:Top_Grp; @@ -111,6 +248,22 @@ module _3gpp-common-mnsregistry { uses MnsInfoGrp; } } + + list MgmtDataInfo { + description "Describes the management capabilities for a set of + management data, which can be used for management data discovery. + MgmtDataInfo is contained by MnSRegistry and associated to MnSInfo. + + Multiple MgmtDataInfo instances maybe created for different sets of + management data, it is MnS producer’s decision."; + + key id; + uses top3gpp:Top_Grp; + container attributes { + uses MgmtDataInfoGrp; + } + } + } } } \ No newline at end of file -- GitLab From cd0cdeafd683a90c128c4f45d3a4c8d3740e05e2 Mon Sep 17 00:00:00 2001 From: "U-ERICSSON\\ETHBLL" Date: Wed, 23 Jul 2025 22:46:23 +0200 Subject: [PATCH 504/587] CR S5-251931 --- yang-models/_3gpp-common-mnsregistry.yang | 41 +++++++++++++++++++++++ 1 file changed, 41 insertions(+) diff --git a/yang-models/_3gpp-common-mnsregistry.yang b/yang-models/_3gpp-common-mnsregistry.yang index 7b03dbc8a..de83f1403 100755 --- a/yang-models/_3gpp-common-mnsregistry.yang +++ b/yang-models/_3gpp-common-mnsregistry.yang @@ -183,6 +183,47 @@ module _3gpp-common-mnsregistry { mandatory true; type string; } + + leaf-list mnsCapability { + type union { + type enumeration { + enum NR_PROVISIONING; + enum 5GC_PROVISIONING; + enum NETWORK_SLICING_PROVISIONING; + enum EDGE_COMPUTING_PROVISIONING; + enum PERFORMANCE_METRIC_COLLECTION_CONTROL; + enum PERFORMANCE_METRIC_DATA_REPORT; + enum PERFORMANCE_METRIC_THRESHOLD_MONITOR_CONTROL; + enum PERFORMANCE_METRIC_THRESHOLD_NOTIFICATION; + enum FAULT_CONTROL; + enum FAULT_NOTIFICATION; + enum TRACE_MDT_DATA_COLLECTION_CONTROL; + enum TRACE_MDT_DATA_REPORT; + enum QOE_DATA_COLLECTION_CONTROL; + enum QOE_DATA_REPORT; + enum FILE_RETRIEVAL; + enum FILE_DOWNLOAD; + enum SUBSCRIPTION_CONTROL; + enum HEARTBEAT_CONTROL; + enum HEARTBEAT_NOTIFICATION; + enum ML_MODEL_MANAGEMENT; + enum MANAGEMENT_DATA_ANALYTIC; + enum RANSC_MANAGEMENT; + enum SON_POLICY; + enum COMMUNICATION_SERVICE_ASSURANCE_CONTROL; + enum INTENT_DRIVEN_MANAGEMENT; + enum MNS_REGISTRY_AND_DISCOVERY; + enum MNS_ACCESS_CONTROL_MANAGEMENT; + enum DSO_RAPID_RECOVERY_AND_THRESHOLD_MONITORING; + } + type string; + } + description "It describes the types of management capabilities of the + MnS instance provided by the MnS producer. The detailed description for + above enum values see Annex F in TS 28.533. + Note: vendor extension values are allowed for the attribute + 'mnsCapability'"; + } list mnsScope { description "This attribute defines the information about the -- GitLab From 58c22221a09c0c2bfa2afefbde42c4fe1cd10f03 Mon Sep 17 00:00:00 2001 From: "U-ERICSSON\\ETHBLL" Date: Thu, 24 Jul 2025 11:17:16 +0200 Subject: [PATCH 505/587] CR S5-253090 --- yang-models/_3gpp-5gc-nrm-lmffunction.yang | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/yang-models/_3gpp-5gc-nrm-lmffunction.yang b/yang-models/_3gpp-5gc-nrm-lmffunction.yang index b7b954153..63b80fa99 100755 --- a/yang-models/_3gpp-5gc-nrm-lmffunction.yang +++ b/yang-models/_3gpp-5gc-nrm-lmffunction.yang @@ -18,6 +18,7 @@ module _3gpp-5gc-nrm-lmffunction { TTA, TTC). All rights reserved."; reference "3GPP TS 28.541"; + revision 2025-07-25 { reference CR-1558 ; } revision 2025-03-25 { reference CR-1489 ; } revision 2024-11-01 { reference CR-1405 ; } revision 2023-09-18 { reference CR-1043 ; } @@ -276,11 +277,27 @@ module _3gpp-5gc-nrm-lmffunction { leaf idx { type uint32; } uses TrpInfoGrp; } + + leaf-list mLModelRefList { + type types3gpp:DistinguishedName; + config false; + description "This attribute holds a DN list of MLModel. See TS 28.105"; + } + + leaf-list aIMLInferenceFunctionRef { + type types3gpp:DistinguishedName; + config false; + description "This attribute holds a DN list of AIMLInferenceFunction. + See TS 28.105"; + } } augment "/me3gpp:ManagedElement" { list LMFFunction { - description "5G Core LMF Function defined in TS 23.501"; + description "5G Core LMF Function defined in TS 23.501. + Attribute mLModelRefList indicates that AI/ML is supported for LMF for + UE positioning. Attribute aIMLInferenceFunctionRefList indicates that + AI/ML Inference Function is supported for LMF for UE positioning."; key id; uses top3gpp:Top_Grp; container attributes { -- GitLab From 90382aa3d45d0beae63e913b9decc6b4783002d8 Mon Sep 17 00:00:00 2001 From: "U-ERICSSON\\ETHBLL" Date: Thu, 24 Jul 2025 12:22:28 +0200 Subject: [PATCH 506/587] S5-252956 --- yang-models/_3gpp-nr-nrm-nrcelldu.yang | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/yang-models/_3gpp-nr-nrm-nrcelldu.yang b/yang-models/_3gpp-nr-nrm-nrcelldu.yang index fd30c8da0..7b417f63a 100755 --- a/yang-models/_3gpp-nr-nrm-nrcelldu.yang +++ b/yang-models/_3gpp-nr-nrm-nrcelldu.yang @@ -19,7 +19,7 @@ module _3gpp-nr-nrm-nrcelldu { TTA, TTC). All rights reserved."; reference "3GPP TS 28.541 5G Network Resource Model (NRM)"; - revision 2025-07-25 { reference CR-; } + revision 2025-07-25 { reference CR-1558 ; } revision 2025-02-07 { reference CR-1442; } revision 2024-05-25 { reference CR-1412 ; } revision 2024-05-24 { reference CR-1273 ; } @@ -123,6 +123,15 @@ module _3gpp-nr-nrm-nrcelldu { type types5g3gpp:NRTAC; } + leaf-list nTNTAClist { + type string; + min-elements 1; + max-elements 12; + description "It is the list of Tracking Area Codes which is only present + in an NTN cell. If this field is present, network does not configure + trackingAreaCode, see TS 38.331)."; + } + leaf arfcnDL { description "NR Absolute Radio Frequency Channel Number (NR-ARFCN) for downlink."; @@ -375,7 +384,7 @@ module _3gpp-nr-nrm-nrcelldu { list NRCellDU { description "This IOC represents the part of NR cell information that - describes s the specific resources instances. + describes the specific resources instances. An NR cell transmits SS/PBCH block and always requires downlink transmission at a certain carrier frequency with a certain channel @@ -403,7 +412,16 @@ module _3gpp-nr-nrm-nrcelldu { UEs during and immediately after initial access. Additional BWPs can be either configured or calculated by gNB internally and be applied to UEs dynamically by gNB based on e.g. UE capability and bandwidth need of - each UE."; + each UE. + + BWPs are configured individually (bWPRef) or via sets (bWPSetRef). + + An NTN NR cell can be configured with list of Tracking Areas to support + broadcast multiple Tracking Area Codes per PLMN ID. Given that the + related TAIs broadcast may change with a foot print moving on earth, + which is predictable, time windows per TAList can be derived and + configured for NTN cell. These time windows define the specific periods + during which the satellite coverage will be available for the location."; key id; uses top3gpp:Top_Grp; container attributes { -- GitLab From 6bff134b4f6916fba55a9f7be9891a0045bfcb66 Mon Sep 17 00:00:00 2001 From: "U-ERICSSON\\ETHBLL" Date: Thu, 24 Jul 2025 12:30:45 +0200 Subject: [PATCH 507/587] yang formatting --- yang-models/_3gpp-nr-nrm-nrcelldu.yang | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/yang-models/_3gpp-nr-nrm-nrcelldu.yang b/yang-models/_3gpp-nr-nrm-nrcelldu.yang index 7b417f63a..e7cbfb51e 100755 --- a/yang-models/_3gpp-nr-nrm-nrcelldu.yang +++ b/yang-models/_3gpp-nr-nrm-nrcelldu.yang @@ -376,7 +376,8 @@ module _3gpp-nr-nrm-nrcelldu { leaf redCapAccessCriteriaRef { type types3gpp:DistinguishedName; mandatory true; - description "This attribute contains the DN of the redCapAccessCriteria MOI "; + description "This attribute contains the DN of the redCapAccessCriteria + MOI "; } } -- GitLab From 218b3f4b4d1d541862901d481a45d41629ab5dca Mon Sep 17 00:00:00 2001 From: "U-ERICSSON\\ETHBLL" Date: Thu, 24 Jul 2025 13:51:05 +0200 Subject: [PATCH 508/587] S5-252939 --- yang-models/_3gpp-5gc-nrm-upffunction.yang | 159 ++++++++++++++++++++- 1 file changed, 156 insertions(+), 3 deletions(-) diff --git a/yang-models/_3gpp-5gc-nrm-upffunction.yang b/yang-models/_3gpp-5gc-nrm-upffunction.yang index 0c4a89df4..71235749b 100755 --- a/yang-models/_3gpp-5gc-nrm-upffunction.yang +++ b/yang-models/_3gpp-5gc-nrm-upffunction.yang @@ -8,14 +8,16 @@ module _3gpp-5gc-nrm-upffunction { import _3gpp-common-yang-types { prefix types3gpp; } import _3gpp-5g-common-yang-types { prefix types5g3gpp; } import _3gpp-common-top { prefix top3gpp; } + import _3gpp-common-yang-extensions { prefix yext3gpp; } organization "3GPP SA5"; contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464"; description "UPFFunction derived from basic ManagedFunction. - Copyright 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + Copyright 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved."; reference "3GPP TS 28.541 5G Network Resource Model (NRM)"; + revision 2025-07-25 { reference CR-1558 ; } revision 2024-05-24 { reference CR-1273 ; } revision 2023-09-18 { reference CR-1043 ; } revision 2023-04-26 { reference CR-0916; } @@ -24,6 +26,82 @@ module _3gpp-5gc-nrm-upffunction { revision 2019-05-31 { reference "Ericsson refactoring."; } revision 2018-08-07 { reference "Initial revision"; } + grouping UpfInfoGrp { + description "Represents datatype UpfInfo"; + + /*sNssaiUpfInfoList { + description ""; + } + + smfServingAreat { + description ""; + } + + interfaceUpfInfoListt { + description ""; + } + + iwkEpsIndt { + description ""; + } + + pduSessionTypest { + description ""; + } + + atsssCapabilityt { + description ""; + } + + ueIpAddrIndt { + description ""; + } + + taiListt { + description ""; + } + + taiRangeListt { + description ""; + } + + wAgfInfot { + description ""; + } + + tngfInfot { + description ""; + } + + twifInfot { + description ""; + } + + priorityt { + description ""; + } + + redundantGtput { + description ""; + } + + ipupst { + description ""; + } + + dataForwardingt { + description ""; + } + + supportedPfcpFeaturest { + description ""; + } + + sxaIndt { + description ""; + }*/ + } + grouping UPFFunctionGrp { description "Represents the UPFFunction IOC"; uses mf3gpp:ManagedFunctionGrp; @@ -45,7 +123,45 @@ module _3gpp-5gc-nrm-upffunction { type types5g3gpp:NRTAC; } - list sNSSAIList { + leaf-list cNSIIdList { + type string; + description "It is a set of NSI ID. NSI ID is an identifier for + identifying the Core Network part of a Network Slice instance when + multiple Network Slice instances of the same Network Slice are deployed, + and there is a need to differentiate between them in the 5GC. + See NSI ID definition in clause 3.1 of TS 23.501 and + subclause 6.1.6.2.7 of TS 29.531. "; + } + leaf energySavingControl { + type enumeration { + enum TO_BE_ENERGYSAVING; + enum TO_BE_NOT_ENERGYSAVING; + } + mandatory true; + description "This attribute allows management system to initiate energy + saving activation or deactivation for the edge UPF."; + } + + leaf energySavingState { + type enumeration { + enum IS_NOT_ENERGYSAVING; + enum IS_ENERGYSAVING; + } + mandatory true; + config false; + description "This attribute specifies the status regarding the energy + saving in the edge UPF. + + If the value of energySavingControl is TO_BE_ENERGYSAVING, then it + shall be tried to achieve the value IS_ENERGYSAVING for the + energySavingState. + + If the value of energySavingControl is TO_BE_NOT_ENERGYSAVING, then + it shall be tried to achieve the value IS_NOT_ENERGYSAVING for the + energySavingState. "; + } + + /*list sNSSAIList { ??? not visible in stage 2 description "List of S-NSSAIs the managed object is capable of supporting. (Single Network Slice Selection Assistance Information) An S-NSSAI has an SST (Slice/Service type) and an optional SD @@ -53,7 +169,7 @@ module _3gpp-5gc-nrm-upffunction { reference "3GPP TS 23.003"; key "sd sst"; uses types5g3gpp:SNssai; - } + }*/ list managedNFProfile { key idx; @@ -68,6 +184,43 @@ module _3gpp-5gc-nrm-upffunction { description "List of supported BMOs (Bridge Managed Objects) required for integration with TSN system."; } + + list upfInfo { + description "This attribute represents information of an UPF NF Instance. + Multiple upfInfo may be allowed to define different TAI list for each + supported S-NSSAI"; + key idx; + leaf idx { type uint32; } + uses UpfInfoGrp; + } + + leaf isOnboardSatellite { + type boolean; + default false; + config false; + yext3gpp:inVariant; + description "This attribute indicates whether the function is + on board the satellite."; + } + + leaf onboardSatelliteId { + type string { + pattern "[0-9]{5}" ; + } + config false; + yext3gpp:inVariant; + description "This attribute indicates the onboard satellite Id. + It shall be formatted as a fixed 5-digit string, padding with + leading digits '0' to complete a 5-digit length."; + } + + leaf uPFCapabilities { + type string; + yext3gpp:inVariant; + description "It indicates the operator configurable capability supported + by the UPF. (see clause 5.8.2.21 in TS 23.501, clause 5.4.2 + in TS 29.571)"; + } } augment /me3gpp:ManagedElement { -- GitLab From acf95ad1f2e4712d768508a0a6aea3a545ba336a Mon Sep 17 00:00:00 2001 From: "U-ERICSSON\\ETHBLL" Date: Thu, 24 Jul 2025 18:11:50 +0200 Subject: [PATCH 509/587] nef minor correction; add to 5g-types: SdRangeGrp, SnssaiExtensionGrp, ExtSnssaiGrp --- yang-models/_3gpp-5g-common-yang-types.yang | 61 +++++++++++++++++++++ 1 file changed, 61 insertions(+) diff --git a/yang-models/_3gpp-5g-common-yang-types.yang b/yang-models/_3gpp-5g-common-yang-types.yang index 0fd31f956..cda65493b 100755 --- a/yang-models/_3gpp-5g-common-yang-types.yang +++ b/yang-models/_3gpp-5g-common-yang-types.yang @@ -14,6 +14,7 @@ module _3gpp-5g-common-yang-types { TTA, TTC). All rights reserved."; reference "3GPP TS 28.541"; + revision 2025-07-25 { reference CR-1558 ; } revision 2025-03-25 { reference CR-1489 ; } revision 2024-11-01 { reference CR-1405; } revision 2024-10-06 { reference CR-1389; } @@ -24,6 +25,66 @@ module _3gpp-5g-common-yang-types { revision 2020-11-05 { reference CR-0412 ; } revision 2019-10-20 { reference "Initial version."; } + grouping SdRangeGrp { + leaf start { + type string { + pattern "[A-Fa-f0-9]{6}"; + } + mandatory true; + description "First value identifying the start of an SD range. + This string shall be formatted as specified for the sd attribute of the + Snssai data type in clause 5.4.4.2 of TS 29.571."; + } + + leaf end { + type string { + pattern "[A-Fa-f0-9]{6}"; + } + mandatory true; + description "Last value identifying the end of an SD range. + This string shall be formatted as specified for the sd attribute of the + Snssai data type in clause 5.4.4.2 in TS 29.571"; + } + } + + grouping SnssaiExtensionGrp { + list sdRanges { + min-elements 1; + key "start end"; + description "It shall contain the range(s) of Slice Differentiator values + supported for the Slice/Service Type value indicated in the sst + attribute of the Snssai data type (see clause 5.4.4.2 in TS 29.571)."; + uses SdRangeGrp; + } + + leaf wildcardSd { + type boolean; + default false; + description "It indicates that all SD values are supported for the + Slice/Service Type value indicated in the sst attribute of the Snssai + data type (see clause 5.4.4.2 in TS 29.571)."; + } + } + + grouping ExtSnssaiGrp { + list snssai { + description "It represents the S-NSSAI the NetworkSlice managed object + is supporting. The S-NSSAI is defined in TS 23.003 "; + min-elements 1; + max-elements 1; + key "sd sst"; + uses SNssai; + } + + list snssaiExtension { + description "It represents extensions to the Snssai."; + min-elements 1; + key idx; + leaf idx { type uint32; } + uses SnssaiExtensionGrp; + } + } + grouping MappedCellIdInfoGrp { description "This data type represents the mapping relationship between Mapped Cell IDs and geographical areas (see clause 16.14.5 of TS 38.300"; -- GitLab From 5d379f3b211038ddaedb9e1385453b93b7b84805 Mon Sep 17 00:00:00 2001 From: "U-ERICSSON\\ETHBLL" Date: Thu, 24 Jul 2025 18:14:33 +0200 Subject: [PATCH 510/587] small description correction --- yang-models/_3gpp-5gc-nrm-neffunction.yang | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/yang-models/_3gpp-5gc-nrm-neffunction.yang b/yang-models/_3gpp-5gc-nrm-neffunction.yang index 8b65a1276..a2cf56f95 100755 --- a/yang-models/_3gpp-5gc-nrm-neffunction.yang +++ b/yang-models/_3gpp-5gc-nrm-neffunction.yang @@ -21,6 +21,7 @@ module _3gpp-5gc-nrm-neffunction { TTA, TTC). All rights reserved."; reference "3GPP TS 28.541"; + revision 2025-07-25 { reference CR-1558 ; } revision 2025-03-25 { reference CR-1489 ; } revision 2025-01-25 { reference CR-1442 ; } revision 2024-05-18 { reference CR-1273 ; } @@ -39,11 +40,16 @@ module _3gpp-5gc-nrm-neffunction { leaf dnn { type string; mandatory true; - description "It represents supported DNN or Wildcard DNN if the NF - supports all DNNs for the related S-NSSAI. The DNN shall contain the - Network Identifier and it may additionally contain an Operator - Identifier. If the Operator Identifier is not included, the DNN is - supported for all the PLMNs in the plmnList of the NF Profile."; + description "String representing a Data Network as defined in clause 9A + of 3GPP TS 23.003; it shall contain either a DNN Network Identifier, + or a full DNN with both the Network Identifier and Operator Identifier, + as specified in 3GPP TS 23.003 clause 9.1.1 and 9.1.2. It shall be + coded as string in which the labels are separated by dots + (e.g. 'Label1.Label2.Label3'). + + Whether the dnn data type contains just the DNN Network Identifier, or + the Network Identifier plus the Operator Identifier, shall be + documented in each API where this data type is used."; } } -- GitLab From cf346f4390de24dc2ac8f31e531799d285a9d8b3 Mon Sep 17 00:00:00 2001 From: rosabolzek Date: Thu, 24 Jul 2025 23:10:56 +0200 Subject: [PATCH 511/587] aligne stage 2 to 3 and create new managednfprofile --- .../_3gpp-5gc-nrm-managed-nfprofile.yang | 636 ++++++++++++++++++ 1 file changed, 636 insertions(+) create mode 100755 yang-models/_3gpp-5gc-nrm-managed-nfprofile.yang diff --git a/yang-models/_3gpp-5gc-nrm-managed-nfprofile.yang b/yang-models/_3gpp-5gc-nrm-managed-nfprofile.yang new file mode 100755 index 000000000..20cc20eaa --- /dev/null +++ b/yang-models/_3gpp-5gc-nrm-managed-nfprofile.yang @@ -0,0 +1,636 @@ +module _3gpp-5gc-nrm-managed-nfprofile { + yang-version 1.1; + + namespace urn:3gpp-5gc-nrm-managed-nfprofile; + prefix magtnfp3gpp; + + import _3gpp-common-yang-types { prefix types3gpp; } + import ietf-inet-types { prefix inet; } + import ietf-yang-types { prefix yang; } + import _3gpp-5gc-nrm-nfservice { prefix nfs3gpp; } + import _3gpp-5g-common-yang-types { prefix types5g3gpp; } + + organization "3gpp SA5"; + contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464"; + description "NF profile class. + Copyright 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + TTA, TTC). All rights reserved."; + reference "3GPP TS 29.510"; + + revision 2025-07-25 { reference "initial revision"; } + + grouping SPNInfoIdGrp { + description "This data type represents the SNPN identification consisting + of MCC, MNC, and optionally NID."; + leaf mcc { + type string; + description "Mobile Country Code (MCC) of the SNPN."; + } + + leaf mnc { + type string; + description "Mobile Network Code (MNC) of the SNPN."; + } + + leaf nId { + type string; + description "Network Identifier (NID) of the SNPN."; + } + } + grouping CollocatedNfInstanceGrp { + description "This data type represents the SNPN identification consisting + of MCC, MNC, and optionally NID."; + leaf nfInstanceId { + description "String uniquely identifying a NF instance."; + mandatory true; + type string; + } + + leaf nfType { + description "Type of Network Function."; + mandatory true; + type types3gpp:NfType; + } + } + grouping SupiRange { + leaf start { + description "First value identifying the start ofa SUPI range.To be + used when the range of SUPI's can be represented as a numeric range + (e.g., IMSI ranges)."; + type string { + pattern '^[0-9]+$'; + } + } + + leaf end { + description "Last value identifying the end of a SUPI range.To be + used when the range of SUPI's can be represented as a numeric range + (e.g. IMSI ranges)."; + type string { + pattern '^[0-9]+$'; + } + } + + leaf pattern { + description "Pattern representing the set of SUPI's belonging to + this range.A SUPI value is considered part of the range if and + only if the SUPI string fully matches the regular expression."; + type string; + } + } + + grouping ConditionItemGrp { + description "This data type represents a single condition item that + shall be evaluated to determine whether a discovered NF (Service) + Instance shall be selected."; + + leaf consumerNfTypes { + description "It represents the NF types of the consumers for + which the conditions included in this ConditionItem apply. + If this attribute is absent, the conditions are applicable + to all NF consumer types."; + type types3gpp:NfType; + } + leaf serviceFeature { + description "It represents a feature number of that NF Service + Instance,under CANARY_RELEASE status. This attribute only + applies when the selectionConditions, where this + ConditionItem is included, is included in a NF Service Instance + This condition is evaluated to when the service requests + froma consumer of this NF Service Instance require the support + of the indicated feature on the NF Service Instance."; + type uint32; // positive integer, 0 excluded by context + } + leaf vsServiceFeature { + description "It represents a Vendor-Specific feature + number of thatNF Service Instance, under CANARY_RELEASE + status. This attribute only applies when the + selectionConditions, where this ConditionItem is included, + is included in a NF Service Instance.This condition is + evaluated to “true” when the service requests from a + consumer of this NF Service Instance require the support + of the indicated Vendor-Specific feature on the NF + Service Instance."; + type uint32; + } + list supiRangeList { + description "It represents a set of SUPIs for which + the NF (Service) instance under CANARY_RELEASE status shall + be selected."; + uses SupiRange; + } + list gpsiRangeList { + description "It represents a set of GPSIs for which the NF + (Service) + instance under CANARY_RELEASE status shall be selected"; + min-elements 1; + uses IdentityRange; + } + list impuRangeList { + description "It represents a set of IMS Public Identities + for which the NF (Service) instance under CANARY_RELEASE + status shall be selected"; + min-elements 1; + uses IdentityRange; + } + list impiRangeList { + description "It represents a set of IMS Private Identities + for which theNF (Service) instance under + CANARY_RELEASE status shall be selected."; + min-elements 1; + uses IdentityRange; + } + leaf peiList { + description "It represents a set of PEIs of the UEs for + which the NF(Service) instance under CANARY_RELEASE status + shall be selected"; + type string; + } + list taiRangeList { + description "It represents a set of TAIs where the + NF(Service) instance under CANARY_RELEASE status shall + be selected for a certain UE"; + min-elements 1; + key idx; + leaf idx { type uint32; } + uses types5g3gpp:TaiRangeGrp; + } + leaf dnnList { + description " It represents a set of TAIs where the NF + (Service) instance under CANARY_RELEASE status shall be + selected for a certain UE"; + type string; + } + } + grouping PlmnSnssai { + list plmnId { + description "PLMN ID for which list of supported S-NSSAI(s) + is provided."; + min-elements 1; + max-elements 1; + key "mcc mnc"; + uses types3gpp:PLMNId; + } + list sNssaiList { + description "The specific list of S-NSSAIs supported + by the given PLMN."; + min-elements 1; + key "sst sd"; + uses types5g3gpp:SNssai; + } + } + + grouping ConditionGroupGrp { + description "This <> represents a group of conditions that + shall be evaluated to determine whether a discovered NF (Service) + Instanceshall be selected. (See clause 6.1.6.2.125 TS 29.510 [23])."; + + container and { + description "It represents a list of conditions where the overall + evaluation is “true” only if all the conditions in the list are + evaluated as “true”."; + uses SelectionConditionsGrp; + } + + container or { + description "It represents a list of conditions where the overall + evaluation is “true” if at least one of the conditions in the list + is evaluated as “true”"; + uses SelectionConditionsGrp; + } + } + + grouping SelectionConditionsGrp { + description "This data type represents the list of conditions that + shall be selected by an NF Service Consumer."; + reference "(See clause 6.1.6.2.123 TS 29.510 [23])"; + + list conditionItem{ + key "id"; + description "It represent a single condition item that shall be + evaluated Instance shall be selected."; + leaf id{ + type string; + } + uses ConditionItemGrp; + } + // circular dependency for grouping "ConditionGroupGrp" introduced in stage 2 + // container conditionGroup{ + // description "It represents a group of conditions + // that shall be evaluated"; + // uses ConditionGroupGrp; + // } + } + + grouping IdentityRange { + leaf start { + description "First value identifying the start of an identity range. + To be used when the range of identities can be represented + as a numeric range (e.g., MSISDN ranges)."; + type string { + pattern '^[0-9]+$'; + } + } + } + +grouping ManagedNFProfileGrp { + + leaf nfInstanceId { + description "String uniquely identifying a NF instance."; + mandatory true; + type string; + } + + leaf nfType { + description "Type of Network Function."; + mandatory true; + type types3gpp:NfType; + } + + leaf nfStatus { + description "Status of the NF Instance."; + mandatory true; + type NFStatus; + } + list collocatedNfInstances { + description "It represents information related to collocated NF + type(s) and corresponding NF Instances when the NF is collocated + with NFs supporting other NF types."; + key "nfInstanceId"; + uses CollocatedNfInstanceGrp; + } + leaf nfInstanceName { + description "It represents human readable name of the NF Instance"; + type string; + } + + leaf heartBeatTimer { + description "Time in seconds expected between 2 consecutive + heart-beat messages from an NF Instance to the NRF. + It may be included in the registration request. + When present in the request it shall contain the + heartbeat time proposed by the NF service consumer."; + type uint16; + } + + list plmnList { + description "PLMN(s) of the Network Function. + This IE shall be present if this information + is available for the NF. If not provided, PLMN ID(s) + of the PLMN of the NRF are assumed for the NF."; + min-elements 1; + key "mcc mnc"; + uses types3gpp:PLMNId; + } + + list sNssais { + description "S-NSSAIs of the Network Function. If not + provided, the NF can serve any S-NSSAI. When present + this IE represents the list of S-NSSAIs supported in + all the PLMNs listed in the plmnList IE."; + min-elements 1; + key "sst sd"; + uses types5g3gpp:SNssai; + } + + leaf fqdn { + description "FQDN of the Network Function. For AMF, the + FQDN registered with the NRF shall be that of the AMF Name."; + type inet:domain-name; + } + + leaf hostAddr { + mandatory true; + type inet:host ; + description "Host address of a NF"; + } + + leaf authzInfo { + description "This parameter defines NF Specific Service authorization + information. It shall include the NF type (s) and NF realms/origins + allowed to consume NF Service(s) of NF Service Producer "; + reference "TS 23.501"; + type string; + } + + list allowedPlmns { + description "PLMNs allowed to access the NF instance. + If not provided, any PLMN is allowed to access the NF."; + min-elements 1; + key "mcc mnc"; + uses types3gpp:PLMNId; + } + + list sNPNList { + key "mcc mnc nId"; + description "SNPN(s) of the Network Function. This attributeIE shall be + present if the NF pertains to one or more SNPNs."; + reference "TS 29.510"; + uses SPNInfoIdGrp; + } + + list perPlmnSnssaiList { + description "It includes the S-NSSAIs supported by the Network Function + for each PLMN supported by the Network Function. When present, it shall + override sNssais IE.If the perPlmnSnssaiList attribute is provided in + at least one NF Service, the S-NSSAIs supported per PLMN in the + NF Profile shall be the set or a superset of the perPlmnSnssaiList + of the NFService(s)."; + key "mcc mnc nId"; + leaf idx { type uint32; } + uses PlmnSnssai; + } + + list allowedSNPNs { + description "SNPNs allowed to access the NF instance. + The absence of this attribute in the NF profile indicates that no SNPN, + other than the SNPN(s) registered in the snpnList attribute of the + NF Profile, is allowed to access the service instance"; + key "mcc mnc"; + uses nfs3gpp:SNPNIdGrp; + } + + leaf-list allowedNfTypes { + description "Type of the NFs allowed to access the NF instance. + If not provided, any NF type is allowed to access the NF."; + min-elements 1; + type types3gpp:NfType; + } + + leaf-list allowedNfDomains { + description "Pattern (regular expression according to the ECMA-262 + dialect [75]) representing the NF domain names within the PLMN of + the NRF allowed to access the NF instance If not provided, + any NF domain is allowed to access the NF."; + type string; + } + + list allowedNSSAIs { + description "S-NSSAI of the allowed slices to access the NF instance. + If not provided, any slice is allowed to access the NF."; + key "sst sd"; + uses types5g3gpp:SNssai; + } + + // list allowedRuleSet { + // description "S-NSSAI of the allowed slices to access the NF instance. + // If not provided, any slice is allowed to access the NF."; + // key "sst sd"; + // uses RuleSet;? +// } + leaf locality { + description "Operator defined information about the location + of the NF instance (e.g. geographic location, data center)."; + type string; + } + leaf extLocality { + description "It indicates the operator defined information about the + location of the NF instance. The key of the map shall be a (unique) + valid JSON string per clause 7 of IETF RFC 8259 [92], with a maximum + of 32 characters, representing a type of locality as defined in + clause 6.1.6.3.18."; + type string; + } + + leaf capacity { + description "Static capacity information in the range of 0-65535, + expressed as a weight relative to other NF instances of + the same type; if capacity is also present in the nfServiceList + parameters, those will have precedence over this value."; + type uint16; + } + + leaf load { + description "Dynamic load information, ranged from 0 to 100, + indicates the current load percentage of the NF."; + type types3gpp:Load; + } + leaf loadTimeStamp { + description "It indicates the point in time in which the latest load + information (sent by the NF in the load attribute of the NF Profile) + was generated at the NF Instance.If the NF did not provide a timestamp, + the NRF should set it to the instant when the NRF received the message + where the NF provided the latest load information."; + type yang:date-and-time ; + } + + leaf-list recoveryTime { + description "Timestamp when the NF was (re)started. The NRF shall notify + NFs subscribed to receiving notifications of changes of the NF profile, + if the NF recoveryTime is changed"; + type yang:date-and-time; + } + leaf nfServicePersistence { + description "This parameter indicates whether the different service + instances of a same NF Service in the NF instance, supporting a same + API version, are capable to persist their resource state in shared + storage and therefore these resources are available after a new NF + service instance supporting the same API version is selected by a NF + Service Consumer "; + reference "TS 29.510"; + type boolean; + } + leaf-list nfSetIdList { + type string ; + min-elements 1; + description "A NF Set Identifier is a globally unique identifier of + a set of equivalent and interchangeable CP NFs from a given network + that provide distribution, redundancy and scalability + (see clause 5.21.3 of 3GPP TS 23.501 [2]).An NF Set Identifier shall + be constructed from the MCC, MNC, NID (for SNPN), NF type and a Set ID. + A NF Set Identifier shall be formatted as the following string: + set.set.5gc.mnc.mcc for a NF Set in a PLMN, or + set.set.5gc.nid.mnc.mcc for a NF Set + in a SNPN.At most one NF Set ID shall be indicated per PLMN-ID or SNPN + of the NF."; + } + leaf-list nfProfileChangesSupportInd { + description "This parameter indicates if the NF Service Consumer supports + or does not support receiving NF Profile Changes. It may be present in + the NFRegister or NFUpdate (NF Profile Complete Replacement) request and + shall be absent in the response (see Annex B 3GPP TS 29.510 [23]). "; + max-elements 1; + type boolean; + } + leaf-list nfProfilePartialUpdateChangesSupportInd { + description "It represents NF Profile Partial Update Changes Support + Indicator. TRUE: the NF Service Consumer supports receiving NF Profile + Changes in the response to an NF Profile Partial Update operation. + FALSE (default): the NF Service Consumer does not support receiving + NF Profile Changes in the response to an NF Profile Partial Update + operation"; + max-elements 1; + type boolean; + } + leaf-list nfProfileChangesInd { + description "NF Profile Changes Indicator. This IE shall be absent + in the request to the NRF and may be included by the NRF + in NFRegister or NFUpdate (NF Profile Complete Replacement) response. + true: the NF Profile contains NF Profile changes. + false (default): complete NF Profile."; + + type boolean; + max-elements 1; + } + list defaultNotificationSubscriptions { + description "Notification endpoints for different notification types. + This attribute may contain multiple default subscriptions for a same + notification type; in that case, those default subscriptions are used + as alternative notification endpoints."; + key notificationType; + min-elements 1; + uses types3gpp:DefaultNotificationSubscription; + } + leaf servingScope { + description "This parameter indicates the served geographical areas + of a NF instance."; + type string; + } + leaf-list lcHSupportInd { + description "This parameter indicates whether the NF supports or does + not support Load Control based on LCI Header."; + reference "clause 6.3 of 3gpp TS 29.500"; + max-elements 1; + type boolean; + } + leaf-list olcHSupportInd { + description "This parameter indicates whether the NF supports or does + not support Overload Control based on OCI Header ."; + reference "clause 6.4 of 3gpp TS 29.500"; + max-elements 1; + type boolean; + } + leaf-list nfSetRecoveryTimeList { + description "This parameter contains the recovery time of NF Set(s) + indicated by the NfSetId, where the NF instance belongs."; + type yang:date-and-time ; + max-elements 1; + } + leaf-list serviceSetRecoveryTimeList { + description "This parameter contains the recovery time of NF Service + Set(s) configured in the NF instance, which are indicated by the + NfServiceSetId"; + type yang:date-and-time ; + max-elements 1; + } + leaf scpDomains { + description "This parameter shall carry the list of SCP domains the + SCP belongs to, or the SCP domain the NF (other than SCP) or the SEPP + belongs to.."; + type string; + } + leaf vendorId { + description "Vendor ID of the NF instance, according to the + IANA-assigned SMI Network Management Private Enterprise Codes [77]. + allowedValues: 6 decimal digits; if the SMI code has less than + 6 digits, it shall be padded with leading digits 0 to complete + a 6-digit string value."; + type string; + } + leaf hniList { + description "Identifications of Credentials Holder or Default Credentials + Server. It is an array of FQDN."; + type string; + } + leaf-list interPlmnFqdn { + description "If the NF needs to be discoverable by other + NFs in a different PLMN, then an FQDN that is used + for inter-PLMN routing is specified."; + type inet:domain-name; + } + list nfServices { + description "List of NF Service Instances. It shall include + the services produced by the NF that can be + discovered by other NFs."; + key serviceInstanceID; + min-elements 1; + uses nfs3gpp:NFServiceGrp; + } + // leaf supportedVendorSpecificFeatures { + // description "It indicates a map of Vendor-Specific features, where the + // key of the map is the IANA-assigned SMI Network Management Private + // Enterprise Codes and the value of each entry of the map shall be + // a list (array) of VendorSpecificFeature objects as defined + // in the clause 5.3.247."; + // type string; + // min-elements 1; + // } attributeValuePair with no defintion anywhere + + list selectionConditions { + description "Identifications of Credentials Holder or Default Credentials + Server. It is an array of FQDN."; + key "idx"; + uses SelectionConditionsGrp; + } + leaf-list canaryRelease { + description "This attribute indicates whether an NF instance whose + nfStatus is set to REGISTERED is in Canary Release condition, + i.e. it should only be selected by NF Service Consumers under the + conditions indicated by the selectionConditions attribute. + True: the NF is under Canary Release condition, even if the + nfStatus is set to REGISTERED + False: the NF instance indicates its Canary Release condition + via the nfStatus attribute"; + max-elements 1; + type boolean; + } + leaf-list exclusiveCanaryReleaseSelection { + description "This attribute indicates whether an NF Service + Consumer should only select an NF Service Producer in Canary + Release condition. + True: the consumer shall only select producers in Canary Release + condition + False: the consumer may select producers not in Canary Release + condition"; + max-elements 1; + type boolean; + } + leaf sharedProfileDataId { + description "This attribute indicates a string uniquely identifying + Shared Profile Data. The format of the sharedProfileDataId shall be + a Universally Unique Identifier (UUID) version 4, as described in + IETF RFC 4122 [44]. The hexadecimal letters should be formatted as + lower-case characters by the sender, and they shall be handled as + case-insensitive by the receiver. + Example: 4ace9d34-2c69-4f99-92d5-a73a3fe8e23b"; + type string; + } + leaf-list shutdownTime { + description "It indicates the timestamp when the NF Instance is + planned to be shut down. This attribute may be present if the + nfStatus is set to UNDISCOVERABLE due to scheduled shutdown"; + type yang:date-and-time ; + max-elements 1; + } + leaf supportedRcfs { + description "It represents a list of Resource Content Filter IDs"; + type string; + } + leaf canaryPrecedenceOverPreferred { + description "ManagedNFProfile.canaryPrecedenceOverPreferred This + attribute indicates whether the NRF shall prioritize the NF Service + Producer in Canary Release condition over the preferences + (preferred-xxx, ext-preferred-xxx) present in NF discovery requests. + allowedValues: + - True: NRF shall prioritize NF Service Producers in Canary Release + condition at NF discovery requests, i.e. NF Service Producers + determined according to preferred-xxx and/or ext-preferred-xxx + shall be prioritized after the NF Service Producers in Canary + Release condition. The associated NF (service) priorities for Service + Producers in Canary Release condition shall not be modified by NRF. + - False: NRF shall prioritize the NF Service Producers according to + preferred-xxx and/or ext-preferred-xxx (i.e. Canary Release condition + in NF Service Producers shall not be prioritized over NF Service + Consumer preferences at NF discovery requests)"; + type boolean; + } + typedef NFStatus { + type enumeration { + enum REGISTERED; + enum SUSPENDED; + } + } + +} +} + -- GitLab From 7ab3800dac6d6986c5240e7214b738c1d783b177 Mon Sep 17 00:00:00 2001 From: rosabolzek Date: Thu, 24 Jul 2025 23:22:50 +0200 Subject: [PATCH 512/587] correct lint --- .../_3gpp-5gc-nrm-managed-nfprofile.yang | 1273 +++++++++-------- 1 file changed, 637 insertions(+), 636 deletions(-) diff --git a/yang-models/_3gpp-5gc-nrm-managed-nfprofile.yang b/yang-models/_3gpp-5gc-nrm-managed-nfprofile.yang index 20cc20eaa..5e1c8ea9b 100755 --- a/yang-models/_3gpp-5gc-nrm-managed-nfprofile.yang +++ b/yang-models/_3gpp-5gc-nrm-managed-nfprofile.yang @@ -1,636 +1,637 @@ -module _3gpp-5gc-nrm-managed-nfprofile { - yang-version 1.1; - - namespace urn:3gpp-5gc-nrm-managed-nfprofile; - prefix magtnfp3gpp; - - import _3gpp-common-yang-types { prefix types3gpp; } - import ietf-inet-types { prefix inet; } - import ietf-yang-types { prefix yang; } - import _3gpp-5gc-nrm-nfservice { prefix nfs3gpp; } - import _3gpp-5g-common-yang-types { prefix types5g3gpp; } - - organization "3gpp SA5"; - contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464"; - description "NF profile class. - Copyright 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, - TTA, TTC). All rights reserved."; - reference "3GPP TS 29.510"; - - revision 2025-07-25 { reference "initial revision"; } - - grouping SPNInfoIdGrp { - description "This data type represents the SNPN identification consisting - of MCC, MNC, and optionally NID."; - leaf mcc { - type string; - description "Mobile Country Code (MCC) of the SNPN."; - } - - leaf mnc { - type string; - description "Mobile Network Code (MNC) of the SNPN."; - } - - leaf nId { - type string; - description "Network Identifier (NID) of the SNPN."; - } - } - grouping CollocatedNfInstanceGrp { - description "This data type represents the SNPN identification consisting - of MCC, MNC, and optionally NID."; - leaf nfInstanceId { - description "String uniquely identifying a NF instance."; - mandatory true; - type string; - } - - leaf nfType { - description "Type of Network Function."; - mandatory true; - type types3gpp:NfType; - } - } - grouping SupiRange { - leaf start { - description "First value identifying the start ofa SUPI range.To be - used when the range of SUPI's can be represented as a numeric range - (e.g., IMSI ranges)."; - type string { - pattern '^[0-9]+$'; - } - } - - leaf end { - description "Last value identifying the end of a SUPI range.To be - used when the range of SUPI's can be represented as a numeric range - (e.g. IMSI ranges)."; - type string { - pattern '^[0-9]+$'; - } - } - - leaf pattern { - description "Pattern representing the set of SUPI's belonging to - this range.A SUPI value is considered part of the range if and - only if the SUPI string fully matches the regular expression."; - type string; - } - } - - grouping ConditionItemGrp { - description "This data type represents a single condition item that - shall be evaluated to determine whether a discovered NF (Service) - Instance shall be selected."; - - leaf consumerNfTypes { - description "It represents the NF types of the consumers for - which the conditions included in this ConditionItem apply. - If this attribute is absent, the conditions are applicable - to all NF consumer types."; - type types3gpp:NfType; - } - leaf serviceFeature { - description "It represents a feature number of that NF Service - Instance,under CANARY_RELEASE status. This attribute only - applies when the selectionConditions, where this - ConditionItem is included, is included in a NF Service Instance - This condition is evaluated to when the service requests - froma consumer of this NF Service Instance require the support - of the indicated feature on the NF Service Instance."; - type uint32; // positive integer, 0 excluded by context - } - leaf vsServiceFeature { - description "It represents a Vendor-Specific feature - number of thatNF Service Instance, under CANARY_RELEASE - status. This attribute only applies when the - selectionConditions, where this ConditionItem is included, - is included in a NF Service Instance.This condition is - evaluated to “true” when the service requests from a - consumer of this NF Service Instance require the support - of the indicated Vendor-Specific feature on the NF - Service Instance."; - type uint32; - } - list supiRangeList { - description "It represents a set of SUPIs for which - the NF (Service) instance under CANARY_RELEASE status shall - be selected."; - uses SupiRange; - } - list gpsiRangeList { - description "It represents a set of GPSIs for which the NF - (Service) - instance under CANARY_RELEASE status shall be selected"; - min-elements 1; - uses IdentityRange; - } - list impuRangeList { - description "It represents a set of IMS Public Identities - for which the NF (Service) instance under CANARY_RELEASE - status shall be selected"; - min-elements 1; - uses IdentityRange; - } - list impiRangeList { - description "It represents a set of IMS Private Identities - for which theNF (Service) instance under - CANARY_RELEASE status shall be selected."; - min-elements 1; - uses IdentityRange; - } - leaf peiList { - description "It represents a set of PEIs of the UEs for - which the NF(Service) instance under CANARY_RELEASE status - shall be selected"; - type string; - } - list taiRangeList { - description "It represents a set of TAIs where the - NF(Service) instance under CANARY_RELEASE status shall - be selected for a certain UE"; - min-elements 1; - key idx; - leaf idx { type uint32; } - uses types5g3gpp:TaiRangeGrp; - } - leaf dnnList { - description " It represents a set of TAIs where the NF - (Service) instance under CANARY_RELEASE status shall be - selected for a certain UE"; - type string; - } - } - grouping PlmnSnssai { - list plmnId { - description "PLMN ID for which list of supported S-NSSAI(s) - is provided."; - min-elements 1; - max-elements 1; - key "mcc mnc"; - uses types3gpp:PLMNId; - } - list sNssaiList { - description "The specific list of S-NSSAIs supported - by the given PLMN."; - min-elements 1; - key "sst sd"; - uses types5g3gpp:SNssai; - } - } - - grouping ConditionGroupGrp { - description "This <> represents a group of conditions that - shall be evaluated to determine whether a discovered NF (Service) - Instanceshall be selected. (See clause 6.1.6.2.125 TS 29.510 [23])."; - - container and { - description "It represents a list of conditions where the overall - evaluation is “true” only if all the conditions in the list are - evaluated as “true”."; - uses SelectionConditionsGrp; - } - - container or { - description "It represents a list of conditions where the overall - evaluation is “true” if at least one of the conditions in the list - is evaluated as “true”"; - uses SelectionConditionsGrp; - } - } - - grouping SelectionConditionsGrp { - description "This data type represents the list of conditions that - shall be selected by an NF Service Consumer."; - reference "(See clause 6.1.6.2.123 TS 29.510 [23])"; - - list conditionItem{ - key "id"; - description "It represent a single condition item that shall be - evaluated Instance shall be selected."; - leaf id{ - type string; - } - uses ConditionItemGrp; - } - // circular dependency for grouping "ConditionGroupGrp" introduced in stage 2 - // container conditionGroup{ - // description "It represents a group of conditions - // that shall be evaluated"; - // uses ConditionGroupGrp; - // } - } - - grouping IdentityRange { - leaf start { - description "First value identifying the start of an identity range. - To be used when the range of identities can be represented - as a numeric range (e.g., MSISDN ranges)."; - type string { - pattern '^[0-9]+$'; - } - } - } - -grouping ManagedNFProfileGrp { - - leaf nfInstanceId { - description "String uniquely identifying a NF instance."; - mandatory true; - type string; - } - - leaf nfType { - description "Type of Network Function."; - mandatory true; - type types3gpp:NfType; - } - - leaf nfStatus { - description "Status of the NF Instance."; - mandatory true; - type NFStatus; - } - list collocatedNfInstances { - description "It represents information related to collocated NF - type(s) and corresponding NF Instances when the NF is collocated - with NFs supporting other NF types."; - key "nfInstanceId"; - uses CollocatedNfInstanceGrp; - } - leaf nfInstanceName { - description "It represents human readable name of the NF Instance"; - type string; - } - - leaf heartBeatTimer { - description "Time in seconds expected between 2 consecutive - heart-beat messages from an NF Instance to the NRF. - It may be included in the registration request. - When present in the request it shall contain the - heartbeat time proposed by the NF service consumer."; - type uint16; - } - - list plmnList { - description "PLMN(s) of the Network Function. - This IE shall be present if this information - is available for the NF. If not provided, PLMN ID(s) - of the PLMN of the NRF are assumed for the NF."; - min-elements 1; - key "mcc mnc"; - uses types3gpp:PLMNId; - } - - list sNssais { - description "S-NSSAIs of the Network Function. If not - provided, the NF can serve any S-NSSAI. When present - this IE represents the list of S-NSSAIs supported in - all the PLMNs listed in the plmnList IE."; - min-elements 1; - key "sst sd"; - uses types5g3gpp:SNssai; - } - - leaf fqdn { - description "FQDN of the Network Function. For AMF, the - FQDN registered with the NRF shall be that of the AMF Name."; - type inet:domain-name; - } - - leaf hostAddr { - mandatory true; - type inet:host ; - description "Host address of a NF"; - } - - leaf authzInfo { - description "This parameter defines NF Specific Service authorization - information. It shall include the NF type (s) and NF realms/origins - allowed to consume NF Service(s) of NF Service Producer "; - reference "TS 23.501"; - type string; - } - - list allowedPlmns { - description "PLMNs allowed to access the NF instance. - If not provided, any PLMN is allowed to access the NF."; - min-elements 1; - key "mcc mnc"; - uses types3gpp:PLMNId; - } - - list sNPNList { - key "mcc mnc nId"; - description "SNPN(s) of the Network Function. This attributeIE shall be - present if the NF pertains to one or more SNPNs."; - reference "TS 29.510"; - uses SPNInfoIdGrp; - } - - list perPlmnSnssaiList { - description "It includes the S-NSSAIs supported by the Network Function - for each PLMN supported by the Network Function. When present, it shall - override sNssais IE.If the perPlmnSnssaiList attribute is provided in - at least one NF Service, the S-NSSAIs supported per PLMN in the - NF Profile shall be the set or a superset of the perPlmnSnssaiList - of the NFService(s)."; - key "mcc mnc nId"; - leaf idx { type uint32; } - uses PlmnSnssai; - } - - list allowedSNPNs { - description "SNPNs allowed to access the NF instance. - The absence of this attribute in the NF profile indicates that no SNPN, - other than the SNPN(s) registered in the snpnList attribute of the - NF Profile, is allowed to access the service instance"; - key "mcc mnc"; - uses nfs3gpp:SNPNIdGrp; - } - - leaf-list allowedNfTypes { - description "Type of the NFs allowed to access the NF instance. - If not provided, any NF type is allowed to access the NF."; - min-elements 1; - type types3gpp:NfType; - } - - leaf-list allowedNfDomains { - description "Pattern (regular expression according to the ECMA-262 - dialect [75]) representing the NF domain names within the PLMN of - the NRF allowed to access the NF instance If not provided, - any NF domain is allowed to access the NF."; - type string; - } - - list allowedNSSAIs { - description "S-NSSAI of the allowed slices to access the NF instance. - If not provided, any slice is allowed to access the NF."; - key "sst sd"; - uses types5g3gpp:SNssai; - } - - // list allowedRuleSet { - // description "S-NSSAI of the allowed slices to access the NF instance. - // If not provided, any slice is allowed to access the NF."; - // key "sst sd"; - // uses RuleSet;? -// } - leaf locality { - description "Operator defined information about the location - of the NF instance (e.g. geographic location, data center)."; - type string; - } - leaf extLocality { - description "It indicates the operator defined information about the - location of the NF instance. The key of the map shall be a (unique) - valid JSON string per clause 7 of IETF RFC 8259 [92], with a maximum - of 32 characters, representing a type of locality as defined in - clause 6.1.6.3.18."; - type string; - } - - leaf capacity { - description "Static capacity information in the range of 0-65535, - expressed as a weight relative to other NF instances of - the same type; if capacity is also present in the nfServiceList - parameters, those will have precedence over this value."; - type uint16; - } - - leaf load { - description "Dynamic load information, ranged from 0 to 100, - indicates the current load percentage of the NF."; - type types3gpp:Load; - } - leaf loadTimeStamp { - description "It indicates the point in time in which the latest load - information (sent by the NF in the load attribute of the NF Profile) - was generated at the NF Instance.If the NF did not provide a timestamp, - the NRF should set it to the instant when the NRF received the message - where the NF provided the latest load information."; - type yang:date-and-time ; - } - - leaf-list recoveryTime { - description "Timestamp when the NF was (re)started. The NRF shall notify - NFs subscribed to receiving notifications of changes of the NF profile, - if the NF recoveryTime is changed"; - type yang:date-and-time; - } - leaf nfServicePersistence { - description "This parameter indicates whether the different service - instances of a same NF Service in the NF instance, supporting a same - API version, are capable to persist their resource state in shared - storage and therefore these resources are available after a new NF - service instance supporting the same API version is selected by a NF - Service Consumer "; - reference "TS 29.510"; - type boolean; - } - leaf-list nfSetIdList { - type string ; - min-elements 1; - description "A NF Set Identifier is a globally unique identifier of - a set of equivalent and interchangeable CP NFs from a given network - that provide distribution, redundancy and scalability - (see clause 5.21.3 of 3GPP TS 23.501 [2]).An NF Set Identifier shall - be constructed from the MCC, MNC, NID (for SNPN), NF type and a Set ID. - A NF Set Identifier shall be formatted as the following string: - set.set.5gc.mnc.mcc for a NF Set in a PLMN, or - set.set.5gc.nid.mnc.mcc for a NF Set - in a SNPN.At most one NF Set ID shall be indicated per PLMN-ID or SNPN - of the NF."; - } - leaf-list nfProfileChangesSupportInd { - description "This parameter indicates if the NF Service Consumer supports - or does not support receiving NF Profile Changes. It may be present in - the NFRegister or NFUpdate (NF Profile Complete Replacement) request and - shall be absent in the response (see Annex B 3GPP TS 29.510 [23]). "; - max-elements 1; - type boolean; - } - leaf-list nfProfilePartialUpdateChangesSupportInd { - description "It represents NF Profile Partial Update Changes Support - Indicator. TRUE: the NF Service Consumer supports receiving NF Profile - Changes in the response to an NF Profile Partial Update operation. - FALSE (default): the NF Service Consumer does not support receiving - NF Profile Changes in the response to an NF Profile Partial Update - operation"; - max-elements 1; - type boolean; - } - leaf-list nfProfileChangesInd { - description "NF Profile Changes Indicator. This IE shall be absent - in the request to the NRF and may be included by the NRF - in NFRegister or NFUpdate (NF Profile Complete Replacement) response. - true: the NF Profile contains NF Profile changes. - false (default): complete NF Profile."; - - type boolean; - max-elements 1; - } - list defaultNotificationSubscriptions { - description "Notification endpoints for different notification types. - This attribute may contain multiple default subscriptions for a same - notification type; in that case, those default subscriptions are used - as alternative notification endpoints."; - key notificationType; - min-elements 1; - uses types3gpp:DefaultNotificationSubscription; - } - leaf servingScope { - description "This parameter indicates the served geographical areas - of a NF instance."; - type string; - } - leaf-list lcHSupportInd { - description "This parameter indicates whether the NF supports or does - not support Load Control based on LCI Header."; - reference "clause 6.3 of 3gpp TS 29.500"; - max-elements 1; - type boolean; - } - leaf-list olcHSupportInd { - description "This parameter indicates whether the NF supports or does - not support Overload Control based on OCI Header ."; - reference "clause 6.4 of 3gpp TS 29.500"; - max-elements 1; - type boolean; - } - leaf-list nfSetRecoveryTimeList { - description "This parameter contains the recovery time of NF Set(s) - indicated by the NfSetId, where the NF instance belongs."; - type yang:date-and-time ; - max-elements 1; - } - leaf-list serviceSetRecoveryTimeList { - description "This parameter contains the recovery time of NF Service - Set(s) configured in the NF instance, which are indicated by the - NfServiceSetId"; - type yang:date-and-time ; - max-elements 1; - } - leaf scpDomains { - description "This parameter shall carry the list of SCP domains the - SCP belongs to, or the SCP domain the NF (other than SCP) or the SEPP - belongs to.."; - type string; - } - leaf vendorId { - description "Vendor ID of the NF instance, according to the - IANA-assigned SMI Network Management Private Enterprise Codes [77]. - allowedValues: 6 decimal digits; if the SMI code has less than - 6 digits, it shall be padded with leading digits 0 to complete - a 6-digit string value."; - type string; - } - leaf hniList { - description "Identifications of Credentials Holder or Default Credentials - Server. It is an array of FQDN."; - type string; - } - leaf-list interPlmnFqdn { - description "If the NF needs to be discoverable by other - NFs in a different PLMN, then an FQDN that is used - for inter-PLMN routing is specified."; - type inet:domain-name; - } - list nfServices { - description "List of NF Service Instances. It shall include - the services produced by the NF that can be - discovered by other NFs."; - key serviceInstanceID; - min-elements 1; - uses nfs3gpp:NFServiceGrp; - } - // leaf supportedVendorSpecificFeatures { - // description "It indicates a map of Vendor-Specific features, where the - // key of the map is the IANA-assigned SMI Network Management Private - // Enterprise Codes and the value of each entry of the map shall be - // a list (array) of VendorSpecificFeature objects as defined - // in the clause 5.3.247."; - // type string; - // min-elements 1; - // } attributeValuePair with no defintion anywhere - - list selectionConditions { - description "Identifications of Credentials Holder or Default Credentials - Server. It is an array of FQDN."; - key "idx"; - uses SelectionConditionsGrp; - } - leaf-list canaryRelease { - description "This attribute indicates whether an NF instance whose - nfStatus is set to REGISTERED is in Canary Release condition, - i.e. it should only be selected by NF Service Consumers under the - conditions indicated by the selectionConditions attribute. - True: the NF is under Canary Release condition, even if the - nfStatus is set to REGISTERED - False: the NF instance indicates its Canary Release condition - via the nfStatus attribute"; - max-elements 1; - type boolean; - } - leaf-list exclusiveCanaryReleaseSelection { - description "This attribute indicates whether an NF Service - Consumer should only select an NF Service Producer in Canary - Release condition. - True: the consumer shall only select producers in Canary Release - condition - False: the consumer may select producers not in Canary Release - condition"; - max-elements 1; - type boolean; - } - leaf sharedProfileDataId { - description "This attribute indicates a string uniquely identifying - Shared Profile Data. The format of the sharedProfileDataId shall be - a Universally Unique Identifier (UUID) version 4, as described in - IETF RFC 4122 [44]. The hexadecimal letters should be formatted as - lower-case characters by the sender, and they shall be handled as - case-insensitive by the receiver. - Example: 4ace9d34-2c69-4f99-92d5-a73a3fe8e23b"; - type string; - } - leaf-list shutdownTime { - description "It indicates the timestamp when the NF Instance is - planned to be shut down. This attribute may be present if the - nfStatus is set to UNDISCOVERABLE due to scheduled shutdown"; - type yang:date-and-time ; - max-elements 1; - } - leaf supportedRcfs { - description "It represents a list of Resource Content Filter IDs"; - type string; - } - leaf canaryPrecedenceOverPreferred { - description "ManagedNFProfile.canaryPrecedenceOverPreferred This - attribute indicates whether the NRF shall prioritize the NF Service - Producer in Canary Release condition over the preferences - (preferred-xxx, ext-preferred-xxx) present in NF discovery requests. - allowedValues: - - True: NRF shall prioritize NF Service Producers in Canary Release - condition at NF discovery requests, i.e. NF Service Producers - determined according to preferred-xxx and/or ext-preferred-xxx - shall be prioritized after the NF Service Producers in Canary - Release condition. The associated NF (service) priorities for Service - Producers in Canary Release condition shall not be modified by NRF. - - False: NRF shall prioritize the NF Service Producers according to - preferred-xxx and/or ext-preferred-xxx (i.e. Canary Release condition - in NF Service Producers shall not be prioritized over NF Service - Consumer preferences at NF discovery requests)"; - type boolean; - } - typedef NFStatus { - type enumeration { - enum REGISTERED; - enum SUSPENDED; - } - } - -} -} - +module _3gpp-5gc-nrm-managed-nfprofile { + yang-version 1.1; + + namespace urn:3gpp-5gc-nrm-managed-nfprofile; + prefix mnfp3gpp; + + import _3gpp-common-yang-types { prefix types3gpp; } + import ietf-inet-types { prefix inet; } + import ietf-yang-types { prefix yang; } + import _3gpp-5gc-nrm-nfservice { prefix nfs3gpp; } + import _3gpp-5g-common-yang-types { prefix types5g3gpp; } + +organization "3gpp SA5"; +contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464"; +description "NF profile class. +Copyright 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, +TTA, TTC). All rights reserved."; + reference "3GPP TS 29.510"; + + revision 2025-07-25 { reference "initial revision"; } + + grouping SPNInfoIdGrp { + description "This data type represents the SNPN identification + consisting of MCC, MNC, and optionally NID."; + leaf mcc { + type string; + description "Mobile Country Code (MCC) of the SNPN."; + } + + leaf mnc { + type string; + description "Mobile Network Code (MNC) of the SNPN."; + } + + leaf nId { + type string; + description "Network Identifier (NID) of the SNPN."; + } + } + grouping CollocatedNfInstanceGrp { + description "This data type represents the SNPN identification + consisting of MCC, MNC, and optionally NID."; + leaf nfInstanceId { + description "String uniquely identifying a NF instance."; + mandatory true; + type string; + } + + leaf nfType { + description "Type of Network Function."; + mandatory true; + type types3gpp:NfType; + } + } + grouping SupiRange { + leaf start { + description "First value identifying the start ofa SUPI range.To be + used when the range of SUPI's can be represented as a numeric range + (e.g., IMSI ranges)."; + type string { + pattern '^[0-9]+$'; + } + } + + leaf end { + description "Last value identifying the end of a SUPI range.To be + used when the range of SUPI's can be represented as a numeric range + (e.g. IMSI ranges)."; + type string { + pattern '^[0-9]+$'; + } + } + + leaf pattern { + description "Pattern representing the set of SUPI's belonging to + this range.A SUPI value is considered part of the range if and + only if the SUPI string fully matches the regular expression."; + type string; + } + } + + grouping ConditionItemGrp { + description "This data type represents a single condition item that + shall be evaluated to determine whether a discovered NF (Service) + Instance shall be selected."; + + leaf consumerNfTypes { + description "It represents the NF types of the consumers for + which the conditions included in this ConditionItem apply. + If this attribute is absent, the conditions are applicable + to all NF consumer types."; + type types3gpp:NfType; + } + leaf serviceFeature { + description "It represents a feature number of that NF Service + Instance,under CANARY_RELEASE status. This attribute only + applies when the selectionConditions, where this + ConditionItem is included, is included in a NF Service Instance + This condition is evaluated to when the service requests + froma consumer of this NF Service Instance require the support + of the indicated feature on the NF Service Instance."; + type uint32; // positive integer, 0 excluded by context + } + leaf vsServiceFeature { + description "It represents a Vendor-Specific feature + number of thatNF Service Instance, under CANARY_RELEASE + status. This attribute only applies when the + selectionConditions, where this ConditionItem is included, + is included in a NF Service Instance.This condition is + evaluated to true when the service requests from a + consumer of this NF Service Instance require the support + of the indicated Vendor-Specific feature on the NF + Service Instance."; + type uint32; + } + list supiRangeList { + description "It represents a set of SUPIs for which + the NF (Service) instance under CANARY_RELEASE status shall + be selected."; + uses SupiRange; + } + list gpsiRangeList { + description "It represents a set of GPSIs for which the NF + (Service) + instance under CANARY_RELEASE status shall be selected"; + min-elements 1; + uses IdentityRange; + } + list impuRangeList { + description "It represents a set of IMS Public Identities + for which the NF (Service) instance under CANARY_RELEASE + status shall be selected"; + min-elements 1; + uses IdentityRange; + } + list impiRangeList { + description "It represents a set of IMS Private Identities + for which theNF (Service) instance under + CANARY_RELEASE status shall be selected."; + min-elements 1; + uses IdentityRange; + } + leaf peiList { + description "It represents a set of PEIs of the UEs for + which the NF(Service) instance under CANARY_RELEASE status + shall be selected"; + type string; + } + list taiRangeList { + description "It represents a set of TAIs where the + NF(Service) instance under CANARY_RELEASE status shall + be selected for a certain UE"; + min-elements 1; + key idx; + leaf idx { type uint32; } + uses types5g3gpp:TaiRangeGrp; + } + leaf dnnList { + description " It represents a set of TAIs where the NF + (Service) instance under CANARY_RELEASE status shall be + selected for a certain UE"; + type string; + } + } + grouping PlmnSnssai { + list plmnId { + description "PLMN ID for which list of supported S-NSSAI(s) + is provided."; + min-elements 1; + max-elements 1; + key "mcc mnc"; + uses types3gpp:PLMNId; + } + list sNssaiList { + description "The specific list of S-NSSAIs supported + by the given PLMN."; + min-elements 1; + key "sst sd"; + uses types5g3gpp:SNssai; + } + } + + grouping ConditionGroupGrp { + description "This <> represents a group of conditions that + shall be evaluated to determine whether a discovered NF (Service) + Instanceshall be selected. (See clause 6.1.6.2.125 TS 29.510 [23])."; + + container and { + description "It represents a list of conditions where the overall + evaluation is true only if all the conditions in the list are + evaluated as true."; + uses SelectionConditionsGrp; + } + + container or { + description "It represents a list of conditions where the overall + evaluation is true if at least one of the conditions in the list + is evaluated as true"; + uses SelectionConditionsGrp; + } + } + + grouping SelectionConditionsGrp { + description "This data type represents the list of conditions that + shall be selected by an NF Service Consumer."; + reference "(See clause 6.1.6.2.123 TS 29.510 [23])"; + + list conditionItem{ + key "id"; + description "It represent a single condition item that shall be + evaluated Instance shall be selected."; + leaf id{ + type string; + } + uses ConditionItemGrp; + } + // circular dependency for grouping "ConditionGroupGrp" introduced in + //stage 2 + // container conditionGroup{ + // description "It represents a group of conditions + // that shall be evaluated"; + // uses ConditionGroupGrp; + // } + } + + grouping IdentityRange { + leaf start { + description "First value identifying the start of an identity range. + To be used when the range of identities can be represented + as a numeric range (e.g., MSISDN ranges)."; + type string { + pattern '^[0-9]+$'; + } + } + } + +grouping ManagedNFProfileGrp { + + leaf nfInstanceId { + description "String uniquely identifying a NF instance."; + mandatory true; + type string; + } + + leaf nfType { + description "Type of Network Function."; + mandatory true; + type types3gpp:NfType; + } + + leaf nfStatus { + description "Status of the NF Instance."; + mandatory true; + type NFStatus; + } + list collocatedNfInstances { + description "It represents information related to collocated NF + type(s) and corresponding NF Instances when the NF is collocated + with NFs supporting other NF types."; + key "nfInstanceId"; + uses CollocatedNfInstanceGrp; + } + leaf nfInstanceName { + description "It represents human readable name of the NF Instance"; + type string; + } + + leaf heartBeatTimer { + description "Time in seconds expected between 2 consecutive + heart-beat messages from an NF Instance to the NRF. + It may be included in the registration request. + When present in the request it shall contain the + heartbeat time proposed by the NF service consumer."; + type uint16; + } + + list plmnList { + description "PLMN(s) of the Network Function. + This IE shall be present if this information + is available for the NF. If not provided, PLMN ID(s) + of the PLMN of the NRF are assumed for the NF."; + min-elements 1; + key "mcc mnc"; + uses types3gpp:PLMNId; + } + + list sNssais { + description "S-NSSAIs of the Network Function. If not + provided, the NF can serve any S-NSSAI. When present + this IE represents the list of S-NSSAIs supported in + all the PLMNs listed in the plmnList IE."; + min-elements 1; + key "sst sd"; + uses types5g3gpp:SNssai; + } + + leaf fqdn { + description "FQDN of the Network Function. For AMF, the + FQDN registered with the NRF shall be that of the AMF Name."; + type inet:domain-name; + } + + leaf hostAddr { + mandatory true; + type inet:host ; + description "Host address of a NF"; + } + + leaf authzInfo { + description "This parameter defines NF Specific Service authorization + information. It shall include the NF type (s) and NF realms/origins + allowed to consume NF Service(s) of NF Service Producer "; + reference "TS 23.501"; + type string; + } + + list allowedPlmns { + description "PLMNs allowed to access the NF instance. + If not provided, any PLMN is allowed to access the NF."; + min-elements 1; + key "mcc mnc"; + uses types3gpp:PLMNId; + } + + list sNPNList { + key "mcc mnc nId"; + description "SNPN(s) of the Network Function. This attributeIE shall be + present if the NF pertains to one or more SNPNs."; + reference "TS 29.510"; + uses SPNInfoIdGrp; + } + + list perPlmnSnssaiList { + description "It includes the S-NSSAIs supported by the Network Function + for each PLMN supported by the Network Function. When present, it shall + override sNssais IE.If the perPlmnSnssaiList attribute is provided in + at least one NF Service, the S-NSSAIs supported per PLMN in the + NF Profile shall be the set or a superset of the perPlmnSnssaiList + of the NFService(s)."; + key "mcc mnc nId"; + leaf idx { type uint32; } + uses PlmnSnssai; + } + + list allowedSNPNs { + description "SNPNs allowed to access the NF instance. + The absence of this attribute in the NF profile indicates that no SNPN, + other than the SNPN(s) registered in the snpnList attribute of the + NF Profile, is allowed to access the service instance"; + key "mcc mnc"; + uses nfs3gpp:SNPNIdGrp; + } + + leaf-list allowedNfTypes { + description "Type of the NFs allowed to access the NF instance. + If not provided, any NF type is allowed to access the NF."; + min-elements 1; + type types3gpp:NfType; + } + + leaf-list allowedNfDomains { + description "Pattern (regular expression according to the ECMA-262 + dialect [75]) representing the NF domain names within the PLMN of + the NRF allowed to access the NF instance If not provided, + any NF domain is allowed to access the NF."; + type string; + } + + list allowedNSSAIs { + description "S-NSSAI of the allowed slices to access the NF instance. + If not provided, any slice is allowed to access the NF."; + key "sst sd"; + uses types5g3gpp:SNssai; + } + + // list allowedRuleSet { + // description "S-NSSAI of the allowed slices to access the NF instance. + // If not provided, any slice is allowed to access the NF."; + // key "sst sd"; + // uses RuleSet;? +// } + leaf locality { + description "Operator defined information about the location + of the NF instance (e.g. geographic location, data center)."; + type string; + } + leaf extLocality { + description "It indicates the operator defined information about the + location of the NF instance. The key of the map shall be a (unique) + valid JSON string per clause 7 of IETF RFC 8259 [92], with a maximum + of 32 characters, representing a type of locality as defined in + clause 6.1.6.3.18."; + type string; + } + + leaf capacity { + description "Static capacity information in the range of 0-65535, + expressed as a weight relative to other NF instances of + the same type; if capacity is also present in the nfServiceList + parameters, those will have precedence over this value."; + type uint16; + } + + leaf load { + description "Dynamic load information, ranged from 0 to 100, + indicates the current load percentage of the NF."; + type types3gpp:Load; + } + leaf loadTimeStamp { + description "It indicates the point in time in which the latest load + information (sent by the NF in the load attribute of the NF Profile) + was generated at the NF Instance.If the NF did not provide a timestamp, + the NRF should set it to the instant when the NRF received the message + where the NF provided the latest load information."; + type yang:date-and-time ; + } + + leaf-list recoveryTime { + description "Timestamp when the NF was (re)started. The NRF shall notify + NFs subscribed to receiving notifications of changes of the NF profile, + if the NF recoveryTime is changed"; + type yang:date-and-time; + } + leaf nfServicePersistence { + description "This parameter indicates whether the different service + instances of a same NF Service in the NF instance, supporting a same + API version, are capable to persist their resource state in shared + storage and therefore these resources are available after a new NF + service instance supporting the same API version is selected by a NF + Service Consumer "; + reference "TS 29.510"; + type boolean; + } + leaf-list nfSetIdList { + type string ; + min-elements 1; + description "A NF Set Identifier is a globally unique identifier of + a set of equivalent and interchangeable CP NFs from a given network + that provide distribution, redundancy and scalability + (see clause 5.21.3 of 3GPP TS 23.501 [2]).An NF Set Identifier shall + be constructed from the MCC, MNC, NID (for SNPN), NF type and a Set ID. + A NF Set Identifier shall be formatted as the following string: + set.set.5gc.mnc.mcc for a NF Set in a PLMN, or + set.set.5gc.nid.mnc.mcc for a NF Set + in a SNPN.At most one NF Set ID shall be indicated per PLMN-ID or SNPN + of the NF."; + } + leaf-list nfProfileChangesSupportInd { + description "This parameter indicates if the NF Service Consumer supports + or does not support receiving NF Profile Changes. It may be present in + the NFRegister or NFUpdate (NF Profile Complete Replacement) request and + shall be absent in the response (see Annex B 3GPP TS 29.510 [23]). "; + max-elements 1; + type boolean; + } + leaf-list nfProfilePartialUpdateChangesSupportInd { + description "It represents NF Profile Partial Update Changes Support + Indicator. TRUE: the NF Service Consumer supports receiving NF Profile + Changes in the response to an NF Profile Partial Update operation. + FALSE (default): the NF Service Consumer does not support receiving + NF Profile Changes in the response to an NF Profile Partial Update + operation"; + max-elements 1; + type boolean; + } + leaf-list nfProfileChangesInd { + description "NF Profile Changes Indicator. This IE shall be absent + in the request to the NRF and may be included by the NRF + in NFRegister or NFUpdate (NF Profile Complete Replacement) response. + true: the NF Profile contains NF Profile changes. + false (default): complete NF Profile."; + + type boolean; + max-elements 1; + } + list defaultNotificationSubscriptions { + description "Notification endpoints for different notification types. + This attribute may contain multiple default subscriptions for a same + notification type; in that case, those default subscriptions are used + as alternative notification endpoints."; + key notificationType; + min-elements 1; + uses types3gpp:DefaultNotificationSubscription; + } + leaf servingScope { + description "This parameter indicates the served geographical areas + of a NF instance."; + type string; + } + leaf-list lcHSupportInd { + description "This parameter indicates whether the NF supports or does + not support Load Control based on LCI Header."; + reference "clause 6.3 of 3gpp TS 29.500"; + max-elements 1; + type boolean; + } + leaf-list olcHSupportInd { + description "This parameter indicates whether the NF supports or does + not support Overload Control based on OCI Header ."; + reference "clause 6.4 of 3gpp TS 29.500"; + max-elements 1; + type boolean; + } + leaf-list nfSetRecoveryTimeList { + description "This parameter contains the recovery time of NF Set(s) + indicated by the NfSetId, where the NF instance belongs."; + type yang:date-and-time ; + max-elements 1; + } + leaf-list serviceSetRecoveryTimeList { + description "This parameter contains the recovery time of NF Service + Set(s) configured in the NF instance, which are indicated by the + NfServiceSetId"; + type yang:date-and-time ; + max-elements 1; + } + leaf scpDomains { + description "This parameter shall carry the list of SCP domains the + SCP belongs to, or the SCP domain the NF (other than SCP) or the SEPP + belongs to.."; + type string; + } + leaf vendorId { + description "Vendor ID of the NF instance, according to the + IANA-assigned SMI Network Management Private Enterprise Codes [77]. + allowedValues: 6 decimal digits; if the SMI code has less than + 6 digits, it shall be padded with leading digits 0 to complete + a 6-digit string value."; + type string; + } + leaf hniList { + description "Identifications of Credentials Holder or Default Credentials + Server. It is an array of FQDN."; + type string; + } + leaf-list interPlmnFqdn { + description "If the NF needs to be discoverable by other + NFs in a different PLMN, then an FQDN that is used + for inter-PLMN routing is specified."; + type inet:domain-name; + } + list nfServices { + description "List of NF Service Instances. It shall include + the services produced by the NF that can be + discovered by other NFs."; + key serviceInstanceID; + min-elements 1; + uses nfs3gpp:NFServiceGrp; + } + // leaf supportedVendorSpecificFeatures { + // description "It indicates a map of Vendor-Specific features, where the + // key of the map is the IANA-assigned SMI Network Management Private + // Enterprise Codes and the value of each entry of the map shall be + // a list (array) of VendorSpecificFeature objects as defined + // in the clause 5.3.247."; + // type string; + // min-elements 1; + // } attributeValuePair with no defintion anywhere + + list selectionConditions { + description "Identifications of Credentials Holder or Default Credentials + Server. It is an array of FQDN."; + key "idx"; + uses SelectionConditionsGrp; + } + leaf-list canaryRelease { + description "This attribute indicates whether an NF instance whose + nfStatus is set to REGISTERED is in Canary Release condition, + i.e. it should only be selected by NF Service Consumers under the + conditions indicated by the selectionConditions attribute. + True: the NF is under Canary Release condition, even if the + nfStatus is set to REGISTERED + False: the NF instance indicates its Canary Release condition + via the nfStatus attribute"; + max-elements 1; + type boolean; + } + leaf-list exclusiveCanaryReleaseSelection { + description "This attribute indicates whether an NF Service + Consumer should only select an NF Service Producer in Canary + Release condition. + True: the consumer shall only select producers in Canary Release + condition + False: the consumer may select producers not in Canary Release + condition"; + max-elements 1; + type boolean; + } + leaf sharedProfileDataId { + description "This attribute indicates a string uniquely identifying + Shared Profile Data. The format of the sharedProfileDataId shall be + a Universally Unique Identifier (UUID) version 4, as described in + IETF RFC 4122 [44]. The hexadecimal letters should be formatted as + lower-case characters by the sender, and they shall be handled as + case-insensitive by the receiver. + Example: 4ace9d34-2c69-4f99-92d5-a73a3fe8e23b"; + type string; + } + leaf-list shutdownTime { + description "It indicates the timestamp when the NF Instance is + planned to be shut down. This attribute may be present if the + nfStatus is set to UNDISCOVERABLE due to scheduled shutdown"; + type yang:date-and-time ; + max-elements 1; + } + leaf supportedRcfs { + description "It represents a list of Resource Content Filter IDs"; + type string; + } + leaf canaryPrecedenceOverPreferred { + description "ManagedNFProfile.canaryPrecedenceOverPreferred This + attribute indicates whether the NRF shall prioritize the NF Service + Producer in Canary Release condition over the preferences + (preferred-xxx, ext-preferred-xxx) present in NF discovery requests. + allowedValues: + True NRF shall prioritize NF Service Producers in Canary Release + condition at NF discovery requests, i.e. NF Service Producers + determined according to preferred-xxx and/or ext-preferred-xxx + shall be prioritized after the NF Service Producers in Canary + Release condition. The associated NF (service) priorities for Service + Producers in Canary Release condition shall not be modified by NRF. + False NRF shall prioritize the NF Service Producers according to + preferred-xxx and/or ext-preferred-xxx (i.e. Canary Release condition + in NF Service Producers shall not be prioritized over NF Service + Consumer preferences at NF discovery requests)"; + type boolean; + } + typedef NFStatus { + type enumeration { + enum REGISTERED; + enum SUSPENDED; + } + } + +} +} + -- GitLab From 8d6a5110ab8729cc7044654380c7183962ff62e1 Mon Sep 17 00:00:00 2001 From: rosabolzek Date: Thu, 24 Jul 2025 23:39:11 +0200 Subject: [PATCH 513/587] correct liting errors --- .../_3gpp-5gc-nrm-managed-nfprofile.yang | 39 ++++++++++++------- 1 file changed, 24 insertions(+), 15 deletions(-) diff --git a/yang-models/_3gpp-5gc-nrm-managed-nfprofile.yang b/yang-models/_3gpp-5gc-nrm-managed-nfprofile.yang index 5e1c8ea9b..63e9cedc4 100755 --- a/yang-models/_3gpp-5gc-nrm-managed-nfprofile.yang +++ b/yang-models/_3gpp-5gc-nrm-managed-nfprofile.yang @@ -1,7 +1,7 @@ module _3gpp-5gc-nrm-managed-nfprofile { yang-version 1.1; - namespace urn:3gpp-5gc-nrm-managed-nfprofile; + namespace urn:_3gpp-5gc-nrm-managed-nfprofile; prefix mnfp3gpp; import _3gpp-common-yang-types { prefix types3gpp; } @@ -185,19 +185,26 @@ TTA, TTC). All rights reserved."; shall be evaluated to determine whether a discovered NF (Service) Instanceshall be selected. (See clause 6.1.6.2.125 TS 29.510 [23])."; - container and { - description "It represents a list of conditions where the overall - evaluation is true only if all the conditions in the list are - evaluated as true."; - uses SelectionConditionsGrp; - } - - container or { - description "It represents a list of conditions where the overall - evaluation is true if at least one of the conditions in the list - is evaluated as true"; - uses SelectionConditionsGrp; - } + choice LogicalOperator{ + case and { + container and { + description "It represents a list of conditions where the + overall evaluation is true only if all the conditions + in the list are evaluated as true."; + uses SelectionConditionsGrp; + } + + } + case or{ + container or { + description "It represents a list of conditions where the + overall evaluation is true if at least one of the conditions + in the list evaluated as true"; + uses SelectionConditionsGrp; + } + } + } + } grouping SelectionConditionsGrp { @@ -214,6 +221,7 @@ TTA, TTC). All rights reserved."; } uses ConditionItemGrp; } + // circular dependency for grouping "ConditionGroupGrp" introduced in //stage 2 // container conditionGroup{ @@ -221,6 +229,7 @@ TTA, TTC). All rights reserved."; // that shall be evaluated"; // uses ConditionGroupGrp; // } + } grouping IdentityRange { @@ -608,7 +617,7 @@ grouping ManagedNFProfileGrp { type string; } leaf canaryPrecedenceOverPreferred { - description "ManagedNFProfile.canaryPrecedenceOverPreferred This + description "ManagedNFProfile.canaryPrecedenceOverPreferred This attribute indicates whether the NRF shall prioritize the NF Service Producer in Canary Release condition over the preferences (preferred-xxx, ext-preferred-xxx) present in NF discovery requests. -- GitLab From 99fe3b9d34e08d598b50af641654884d70da8736 Mon Sep 17 00:00:00 2001 From: "U-ERICSSON\\ETHBLL" Date: Fri, 25 Jul 2025 03:39:34 +0200 Subject: [PATCH 514/587] moved and updated UpfInfo --- yang-models/_3gpp-5g-common-yang-types.yang | 22 ++ .../_3gpp-5gc-nrm-managed-nfprofile.yang | 2 + yang-models/_3gpp-5gc-nrm-neffunction.yang | 6 +- yang-models/_3gpp-5gc-nrm-upffunction.yang | 327 ++++++++++++++++-- 4 files changed, 316 insertions(+), 41 deletions(-) diff --git a/yang-models/_3gpp-5g-common-yang-types.yang b/yang-models/_3gpp-5g-common-yang-types.yang index cda65493b..e81cd0f83 100755 --- a/yang-models/_3gpp-5g-common-yang-types.yang +++ b/yang-models/_3gpp-5g-common-yang-types.yang @@ -4,6 +4,7 @@ module _3gpp-5g-common-yang-types { prefix "types5g3gpp"; import ietf-yang-types { prefix yang; } + import ietf-inet-types { prefix inet; } import _3gpp-common-yang-types { prefix types3gpp; } organization "3GPP SA5"; @@ -25,6 +26,27 @@ module _3gpp-5g-common-yang-types { revision 2020-11-05 { reference CR-0412 ; } revision 2019-10-20 { reference "Initial version."; } + grouping IpInterfaceGrp { + leaf-list ipv4EndpointAddresses { + description "Available endpoint IPv4 address(es) of + the User Plane interface."; + type inet:ipv4-address; + must '../ipv4EndpointAddresses or ../ipv6EndpointAddresses or ../fqdn'; + } + + leaf-list ipv6EndpointAddresses { + description "Available endpoint IPv6 address(es) of + the User Plane interface."; + type inet:ipv6-address; + must '../ipv4EndpointAddresses or ../ipv6EndpointAddresses or ../fqdn'; } + + leaf fqdn { + description "This parameter defines FQDN of the Network Function + (See TS 23.003)."; + type inet:domain-name; + must '../ipv4EndpointAddresses or ../ipv6EndpointAddresses or ../fqdn'; } + } + grouping SdRangeGrp { leaf start { type string { diff --git a/yang-models/_3gpp-5gc-nrm-managed-nfprofile.yang b/yang-models/_3gpp-5gc-nrm-managed-nfprofile.yang index 63e9cedc4..394fbe911 100755 --- a/yang-models/_3gpp-5gc-nrm-managed-nfprofile.yang +++ b/yang-models/_3gpp-5gc-nrm-managed-nfprofile.yang @@ -241,6 +241,8 @@ TTA, TTC). All rights reserved."; pattern '^[0-9]+$'; } } + leaf end {type string; } // dummy + leaf pattern {type string; } // dummy } grouping ManagedNFProfileGrp { diff --git a/yang-models/_3gpp-5gc-nrm-neffunction.yang b/yang-models/_3gpp-5gc-nrm-neffunction.yang index a2cf56f95..a1034491b 100755 --- a/yang-models/_3gpp-5gc-nrm-neffunction.yang +++ b/yang-models/_3gpp-5gc-nrm-neffunction.yang @@ -11,7 +11,7 @@ module _3gpp-5gc-nrm-neffunction { import _3gpp-common-yang-extensions { prefix yext3gpp; } import _3gpp-common-top { prefix top3gpp; } import _3gpp-5g-common-yang-types { prefix types5g3gpp; } - import _3gpp-5gc-nrm-nfprofile { prefix nfp3gpp; } + import _3gpp-5gc-nrm-managed-nfprofile { prefix mnfp3gpp; } organization "3gpp SA5"; contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464"; @@ -212,7 +212,7 @@ module _3gpp-5gc-nrm-neffunction { min-elements 1; key idx; leaf idx { type uint32 ; } - uses nfp3gpp:IdentityRange; + uses mnfp3gpp:IdentityRange; } list externalGroupIdentifiersRanges { @@ -221,7 +221,7 @@ module _3gpp-5gc-nrm-neffunction { min-elements 1; key idx; leaf idx { type uint32 ; } - uses nfp3gpp:IdentityRange; + uses mnfp3gpp:IdentityRange; } leaf-list servedFqdnList { diff --git a/yang-models/_3gpp-5gc-nrm-upffunction.yang b/yang-models/_3gpp-5gc-nrm-upffunction.yang index 71235749b..226b892d4 100755 --- a/yang-models/_3gpp-5gc-nrm-upffunction.yang +++ b/yang-models/_3gpp-5gc-nrm-upffunction.yang @@ -9,6 +9,8 @@ module _3gpp-5gc-nrm-upffunction { import _3gpp-5g-common-yang-types { prefix types5g3gpp; } import _3gpp-common-top { prefix top3gpp; } import _3gpp-common-yang-extensions { prefix yext3gpp; } + import _3gpp-5gc-nrm-neffunction { prefix nef3gpp; } + import ietf-inet-types { prefix inet; } organization "3GPP SA5"; contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464"; @@ -26,80 +28,329 @@ module _3gpp-5gc-nrm-upffunction { revision 2019-05-31 { reference "Ericsson refactoring."; } revision 2018-08-07 { reference "Initial revision"; } + grouping SnssaiUpfInfoItemGrp { + list sNssai { + description "Supported S-NSSAI."; + min-elements 1; + max-elements 1; + key idx; + leaf idx { type uint32; } + uses types5g3gpp:ExtSnssaiGrp; + } + + list dnnUpfInfoList { + description "It represents list of parameters supported by the UPF + per DNN."; + min-elements 1; + key dnn; + uses nef3gpp:DnnInfoItemGrp; + } + + leaf redundantTransport { + type boolean; + default false; + description "This attribute indicates whether the UPF supports redundant + transport path on the transport layer in the corresponding network + slice. + true: supported + false: not supported"; + } + } + + typedef UPInterfaceType { + type enumeration { + enum N3; + enum N6; + enum N9; + enum DATA_FORWARDING; + enum N6MB; + enum N19MB; + enum N3MB; + enum NMB9; + enum S1U; + enum S5U; + enum S8U; + enum S11U; + enum S12; + enum S2AU; + enum S2BU; + enum N3TRUSTEDN3GPP; + enum N3UNTRUSTEDN3GPP; + enum N9ROAMING; + enum SGI; + enum N19; + enum SXAU; + enum SXBU; + enum N4U; + } + } + + grouping InterfaceUpfInfoItemGrp { + leaf interfaceType { + description "User Plane interface type. + See TS 29.510[23] clause 6.1.6.3.9"; + mandatory true; + type UPInterfaceType; + must '../ipv4EndpointAddresses or ../ipv6EndpointAddresses or ../fqdn'; + } + + leaf-list ipv4EndpointAddresses { + description "Available endpoint IPv4 address(es) of + the User Plane interface."; + type inet:ipv4-address; + } + + leaf-list ipv6EndpointAddresses { + description "Available endpoint IPv6 address(es) of + the User Plane interface."; + type inet:ipv6-address; + } + + leaf fqdn { + description "This parameter defines FQDN of the Network Function + (See TS 23.003)."; + type inet:domain-name; + } + + leaf networkInstance { + description "Network Instance (See TS 29.244) associated to the User + Plane interface"; + type string; + mandatory true; + } + } + + grouping AtsssCapabilityGrp { + leaf atsssLL { + description "Indicates the ATSSS-LL capability to support procedures + related to Access Traffic Steering, Switching, Splitting + (see clauses 4.2.10, 5.32 of TS 23.501). + true: Supported + false: Not Supported"; + type boolean; + default false; + } + + leaf mptcp { + description "Indicates the MPTCP capability to support procedures related + to Access Traffic Steering, Switching, Splitting + (see clauses 4.2.10, 5.32 of TS 23.501). + true: Supported + false: Not Supported"; + type boolean; + default false; + } + + leaf rttWithoutPmf { + description "Indicates whether the UPF supports RTT measurement without + PMF (see clauses 5.32.2, 6.3.3.3 of TS 23.501). + true: Supported + false: Not Supported"; + type boolean; + default false; + } + } + grouping UpfInfoGrp { - description "Represents datatype UpfInfo"; + description "Represents datatype UpfInfo. This data type represents + information of an UPF Instance"; - /*sNssaiUpfInfoList { - description ""; + list sNssaiUpfInfoList { + description "This attribute represents a list of parameters supported by + the UPF per S-NSSAI."; + min-elements 1; + key idx; + leaf idx { type uint32; } + uses SnssaiUpfInfoItemGrp; } - smfServingAreat { - description ""; + leaf-list smfServingArea { + type string; + min-elements 1; + description "The SMF service area(s) the UPF can serve. See TS 29.510. + If not provided, the UPF can serve any SMF service area."; } - interfaceUpfInfoListt { - description ""; + list interfaceUpfInfoList { + description "List of User Plane interfaces configured on the UPF. When + this parameter is provided in the NF Discovery response, the NF Service + Consumer (e.g., SMF) may use this information for UPF selection."; + min-elements 1; + key idx; + leaf idx { type uint32; } + uses InterfaceUpfInfoItemGrp; } - iwkEpsIndt { - description ""; + leaf iwkEpsInd { + type boolean; + mandatory true; + config false; + description "Indicates whether interworking with EPS is supported by + the UPF. + True: Supported + False: Not Supported"; } - pduSessionTypest { - description ""; + leaf-list pduSessionTypes { + type enumeration { + enum IPV4; + enum IPV6; + enum IPV4V6; + enum UNSTRUCTURED; + enum ETHERNET; + } + config false; + min-elements 1; + description "Indicates the type(s) of a PDU session."; } - atsssCapabilityt { - description ""; + list atsssCapability { + config false; + description "Indicate the ATSSS capability of the UPF"; + min-elements 1; + max-elements 1; + key idx; + leaf idx { type uint32; } + uses AtsssCapabilityGrp; } - ueIpAddrIndt { - description ""; + leaf ueIpAddrInd { + type boolean; + config false; + default false; + description "Indicates whether the UPF supports allocating UE IP + addresses/prefixes. + true: supported + false: not supported"; } - taiListt { - description ""; + list taiList { + description "The list of TAIs."; + min-elements 1; + key idx; + leaf idx { type uint32; } + uses types3gpp:TaiGrp; } - taiRangeListt { - description ""; + list taiRangeList { + description "The range of TAIs."; + min-elements 1; + key idx; + leaf idx { type uint32; } + uses types5g3gpp:TaiRangeGrp; } - wAgfInfot { - description ""; + list wAgfInfo { + description "Indicate that the UPF is collocated with W-AGF. If not + present, the UPF is not collocated with Wireline Access Gateway + Function (W-AGF)."; + min-elements 1; + max-elements 1; + key idx; + leaf idx { type uint32; } + uses types5g3gpp:IpInterfaceGrp; } - tngfInfot { - description ""; + list tngfInfo { + description "Indicate that the UPF is collocated with TNGF. If not + present, the UPF is not collocated with Trusted Non-3GPP Gateway + Function (TNGF)."; + min-elements 1; + max-elements 1; + key idx; + leaf idx { type uint32; } + uses types5g3gpp:IpInterfaceGrp; } - twifInfot { - description ""; + list twifInfo { + description "Indicate that the UPF is collocated with TWIF. If not + present, the UPF is not collocated with Trusted WLAN Interworking + Function (TWIF)."; + min-elements 1; + max-elements 1; + key idx; + leaf idx { type uint32; } + uses types5g3gpp:IpInterfaceGrp; } - priorityt { - description ""; + leaf priority { + type uint16; + mandatory true; + description "This parameter defines Priority (relative to other NFs of + the same type) in the range of 0-65535, to be used for NF selection; + lower values indicate a higher priority. If priority is also present + in the nfServiceList parameters, those will have precedence over + this value (See TS 29.510)."; } - redundantGtput { - description ""; + leaf redundantGtpu { + type boolean; + default false; + config false; + description "Indicates whether the UPF supports redundant GTP-U path. + true: supported + false: not supported"; } - ipupst { - description ""; + leaf ipups { + type boolean; + default false; + description "Indicates whether the UPF is configured for Inter-PLMN User + Plane Security (IPUPS). Any UPF can support the IPUPS functionality. + In network deployments where specific UPFs are used to provide IPUPS, + UPFs configured for providing IPUPS services shall be selected. + true: The UPF is configured for IPUPS. + false: The UPF is not configured for IPUPS"; } - dataForwardingt { - description ""; + leaf dataForwarding { + type boolean; + default false; + description "Indicates whether the UPF is configured for data forwarding. + Based on operator policies, if dedicated UPFs are preferred to be used + for indirect data forwarding during handover scenarios, when setting + up the indirect data forwarding tunnel, the SMF should preferably + select a UPF configured for data forwarding and use the network + instance indicated in the Network Instance ID associated to the + DATA_FORWARDING interface type in the interfaceUpfInfoList attribute. + true: the UPF is configured for data forwarding + false: the UPF is not configured for data forwarding + + If the UPF is configured for data forwarding, it shall support UP + network interface with type 'DATA_FORWARDING'."; } - supportedPfcpFeaturest { - description ""; + leaf supportedPfcpFeatures { + type string; + config false; + description "Supported Packet Forwarding Control Protocol (PFCP) Features. + A string used to indicate the PFCP features supported by the UPF, + which encodes the 'UP Function Features' as specified in + Table 8.2.25-1 of TS 29.244 (starting from Octet 5), in hexadecimal + representation. + + Each character in the string shall take a value of '0' to '9', 'a' + to 'f' or 'A' to 'F' and each two characters shall represent one octet + of 'UP Function Features' (starting from Octet 5, to higher octets). + For each two characters representing one octet, the first character + representing the 4 most significant bits of the octet and the second + character the 4 least significant bits of the octet. + + The supported PFCP features shall be provisioned in addition and be + consistent with the existing UPF features (atsssCapability, ueIpAddrInd, + redundantGtpu and ipups), e.g., if the ueIpAddrInd is set to 'true', + then the UEIP flag shall also be set to '1' in the supported PFCP + features."; } - sxaIndt { - description ""; - }*/ + leaf sxaInd { + type boolean; + config false; + description "This attribute indicates whether the UPF is configured to + support Sxa interface. + true: Supported + false: Not Supported"; + } } grouping UPFFunctionGrp { -- GitLab From c6c5b865d0fae5bbab6a981ceb3e8ff6218bb244 Mon Sep 17 00:00:00 2001 From: rosabolzek Date: Fri, 25 Jul 2025 11:43:45 +0200 Subject: [PATCH 515/587] move udrinfo from nfprofile to _3gpp-5gc-nrm-udrfunction and correct error --- .../_3gpp-5gc-nrm-managed-nfprofile.yang | 23 ++++++- yang-models/_3gpp-5gc-nrm-nrffunction.yang | 11 +--- yang-models/_3gpp-5gc-nrm-udrfunction.yang | 61 +++++++++++++++++-- 3 files changed, 80 insertions(+), 15 deletions(-) diff --git a/yang-models/_3gpp-5gc-nrm-managed-nfprofile.yang b/yang-models/_3gpp-5gc-nrm-managed-nfprofile.yang index 394fbe911..e278e345b 100755 --- a/yang-models/_3gpp-5gc-nrm-managed-nfprofile.yang +++ b/yang-models/_3gpp-5gc-nrm-managed-nfprofile.yang @@ -1,7 +1,7 @@ module _3gpp-5gc-nrm-managed-nfprofile { yang-version 1.1; - namespace urn:_3gpp-5gc-nrm-managed-nfprofile; + namespace urn:3gpp:sa5:_3gpp-5gc-nrm-managed-nfprofile; prefix mnfp3gpp; import _3gpp-common-yang-types { prefix types3gpp; } @@ -117,6 +117,8 @@ TTA, TTC). All rights reserved."; description "It represents a set of SUPIs for which the NF (Service) instance under CANARY_RELEASE status shall be selected."; + key idx; + leaf idx { type uint32; } uses SupiRange; } list gpsiRangeList { @@ -124,6 +126,8 @@ TTA, TTC). All rights reserved."; (Service) instance under CANARY_RELEASE status shall be selected"; min-elements 1; + key idx; + leaf idx { type uint32; } uses IdentityRange; } list impuRangeList { @@ -131,6 +135,8 @@ TTA, TTC). All rights reserved."; for which the NF (Service) instance under CANARY_RELEASE status shall be selected"; min-elements 1; + key idx; + leaf idx { type uint32; } uses IdentityRange; } list impiRangeList { @@ -138,6 +144,8 @@ TTA, TTC). All rights reserved."; for which theNF (Service) instance under CANARY_RELEASE status shall be selected."; min-elements 1; + key idx; + leaf idx { type uint32; } uses IdentityRange; } leaf peiList { @@ -175,9 +183,17 @@ TTA, TTC). All rights reserved."; description "The specific list of S-NSSAIs supported by the given PLMN."; min-elements 1; + max-elements 1; key "sst sd"; uses types5g3gpp:SNssai; } + leaf nid { + description "Network Identity; Shall be present if PlmnIdNid + identifies an SNPN "; + reference "see clauses 5.30.2.3, 5.30.2.9, 6.3.4, + and 6.3.8 in 3GPP TS 23.501 "; + type string; + } } grouping ConditionGroupGrp { @@ -348,7 +364,7 @@ grouping ManagedNFProfileGrp { at least one NF Service, the S-NSSAIs supported per PLMN in the NF Profile shall be the set or a superset of the perPlmnSnssaiList of the NFService(s)."; - key "mcc mnc nId"; + key idx; leaf idx { type uint32; } uses PlmnSnssai; } @@ -358,7 +374,7 @@ grouping ManagedNFProfileGrp { The absence of this attribute in the NF profile indicates that no SNPN, other than the SNPN(s) registered in the snpnList attribute of the NF Profile, is allowed to access the service instance"; - key "mcc mnc"; + key "mCC mNC"; uses nfs3gpp:SNPNIdGrp; } @@ -571,6 +587,7 @@ grouping ManagedNFProfileGrp { list selectionConditions { description "Identifications of Credentials Holder or Default Credentials Server. It is an array of FQDN."; + leaf idx { type uint32; } key "idx"; uses SelectionConditionsGrp; } diff --git a/yang-models/_3gpp-5gc-nrm-nrffunction.yang b/yang-models/_3gpp-5gc-nrm-nrffunction.yang index ad84040eb..f38772db5 100755 --- a/yang-models/_3gpp-5gc-nrm-nrffunction.yang +++ b/yang-models/_3gpp-5gc-nrm-nrffunction.yang @@ -8,9 +8,9 @@ module _3gpp-5gc-nrm-nrffunction { import _3gpp-common-managed-element { prefix me3gpp; } import ietf-inet-types { prefix inet; } import _3gpp-common-yang-types { prefix types3gpp; } - import _3gpp-5gc-nrm-nfprofile { prefix nfp3gpp; } import _3gpp-common-top { prefix top3gpp; } import _3gpp-5g-common-yang-types { prefix types5g3gpp; } + import _3gpp-5gc-nrm-managed-nfprofile { prefix mnfp3gpp; } organization "3gpp SA5"; contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464"; @@ -70,17 +70,12 @@ module _3gpp-5gc-nrm-nrffunction { uses types5g3gpp:SNssai; } - list nFProfileList { - description "Set of NFProfile(s) to be registered in the NRF instance."; - //optional support - key nfInstanceId; - uses nfp3gpp:NFProfileGrp; - } list managedNFProfile { key idx; + leaf idx { type uint32; } min-elements 1; max-elements 1; - uses types3gpp:ManagedNFProfile; + uses mnfp3gpp:ManagedNFProfileGrp; description "This parameter defines profile for managed NF"; reference "3gpp TS 23.501"; } diff --git a/yang-models/_3gpp-5gc-nrm-udrfunction.yang b/yang-models/_3gpp-5gc-nrm-udrfunction.yang index 1118fd143..a1a37c312 100755 --- a/yang-models/_3gpp-5gc-nrm-udrfunction.yang +++ b/yang-models/_3gpp-5gc-nrm-udrfunction.yang @@ -10,22 +10,65 @@ module _3gpp-5gc-nrm-udrfunction { import _3gpp-common-yang-types { prefix types3gpp; } import _3gpp-common-top { prefix top3gpp; } import _3gpp-5g-common-yang-types { prefix types5g3gpp; } - + import _3gpp-5gc-nrm-managed-nfprofile { prefix mnfp3gpp; } + organization "3gpp SA5"; contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464"; description "This IOC represents the UDR function in 5GC. For more information about the UDR, see 3GPP TS 23.501. - Copyright 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + Copyright 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved."; reference "3GPP TS 28.541"; + revision 2025-07-25 { reference CR-1558 ; } revision 2023-09-18 { reference CR-1043 ; } revision 2023-04-26 { reference CR-0916; } revision 2020-11-08 { reference CR-0412 ; } revision 2019-10-25 { reference "S5-194457 S5-195427 S5-193518"; } revision 2019-05-22 {reference "initial revision"; } - + + grouping udrInfo { + + leaf groupId { + description "Identity of the UDR group that is served + by the UDR instance. + If not provided, the UDR instance does not pertain + to any UDR group."; + type string; + } + + list supiRanges { + description "List of ranges of SUPI's whose profile data + is available in the UDR instance."; + key "start end pattern"; + min-elements 1; + uses mnfp3gpp:SupiRange; + } + + list gpsiRanges { + description "List of ranges of GPSIs whose profile data is + available in the UDR instance."; + key "start end pattern"; + min-elements 1; + uses mnfp3gpp:IdentityRange; + } + + list externalGroupIdentifiersRanges { + description "List of ranges of external groups whose profile + data is available in the UDR instance."; + key "start end pattern"; + min-elements 1; + uses mnfp3gpp:IdentityRange; + } + + leaf-list supportedDataSets { + description "List of supported data sets in the UDR instance. + If not provided, the UDR supports all data sets."; + min-elements 1; + type DataSetId; + } + } grouping UDRFuntionGrp { description "Representse the UDRFuntion IOC"; uses mf3gpp:ManagedFunctionGrp; @@ -61,10 +104,20 @@ module _3gpp-5gc-nrm-udrfunction { list managedNFProfile { key idx; + leaf idx { type uint32; } min-elements 1; max-elements 1; description "Profile definition of a Managed NF (See TS 23.501)"; - uses types3gpp:ManagedNFProfile; + uses mnfp3gpp:ManagedNFProfileGrp; + } + } + + typedef DataSetId { + type enumeration { + enum SUBSCRIPTION; + enum POLICY; + enum EXPOSURE; + enum APPLICATION; } } -- GitLab From a81157ae38f4a2883de3ef073069c07965e72f76 Mon Sep 17 00:00:00 2001 From: rosabolzek Date: Fri, 25 Jul 2025 11:50:27 +0200 Subject: [PATCH 516/587] file to be removed --- yang-models/_3gpp-5gc-nrm-nfprofile.yang | 681 ++++++++++++----------- 1 file changed, 341 insertions(+), 340 deletions(-) diff --git a/yang-models/_3gpp-5gc-nrm-nfprofile.yang b/yang-models/_3gpp-5gc-nrm-nfprofile.yang index 354d8b8ac..20714945d 100755 --- a/yang-models/_3gpp-5gc-nrm-nfprofile.yang +++ b/yang-models/_3gpp-5gc-nrm-nfprofile.yang @@ -28,206 +28,207 @@ module _3gpp-5gc-nrm-nfprofile { revision 2023-02-14 { reference CR-0891; } revision 2019-06-17 { reference "initial revision"; } - grouping NFProfileGrp { - leaf nfInstanceId { - description "String uniquely identifying a NF instance."; - mandatory true; - type string; - } - - leaf nfType { - description "Type of Network Function."; - mandatory true; - type types3gpp:NfType; - } - - leaf nfStatus { - description "Status of the NF Instance."; - mandatory true; - type NFStatus; - } - - leaf heartBeatTimer { - description "Time in seconds expected between 2 consecutive - heart-beat messages from an NF Instance to the NRF. - It may be included in the registration request. - When present in the request it shall contain the - heartbeat time proposed by the NF service consumer."; - type uint16; - } - - list plmnList { - description "PLMN(s) of the Network Function. - This IE shall be present if this information - is available for the NF. If not provided, PLMN ID(s) - of the PLMN of the NRF are assumed for the NF."; - - min-elements 1; - key "mcc mnc"; - uses types3gpp:PLMNId; - } - - list sNssais { - description "S-NSSAIs of the Network Function. If not - provided, the NF can serve any S-NSSAI. When present - this IE represents the list of S-NSSAIs supported in - all the PLMNs listed in the plmnList IE."; - min-elements 1; - key "sst sd"; - uses Snssai; - } - - list perPlmnSnssaiList { - description "This IE may be included when the list of - S-NSSAIs supported by the NF for each PLMN it is supporting - is different. When present, this IE shall include the S-NSSAIs - supported by the Network Function for each PLMN supported by - the Network Function. When present, this IE shall - override sNssais IE."; - min-elements 1; - key idx; - leaf idx { type uint32; } - uses PlmnSnssai; - } - - leaf-list nsiList { - description "NSI identities of the Network Function. - If not provided, the NF can serve any NSI."; - min-elements 1; - type string; - } - - leaf fqdn { - description "FQDN of the Network Function. For AMF, the - FQDN registered with the NRF shall be that of the AMF Name."; - type inet:domain-name; - } - - leaf interPlmnFqdn { - description "If the NF needs to be discoverable by other - NFs in a different PLMN, then an FQDN that is used - for inter-PLMN routing is specified."; - type inet:domain-name; - } - - leaf-list ipv4Addresses { - description "IPv4 address(es) of the Network Function."; - min-elements 1; - type inet:ipv4-address; - } +//Moved to managed_nfprofile +// grouping NFProfileGrp { +// leaf nfInstanceId { +// description "String uniquely identifying a NF instance."; +// mandatory true; +// type string; +// } - leaf-list ipv6Addresses { - description "IPv6 address(es) of the Network Function."; - min-elements 1; - type inet:ipv6-address; - } - - list allowedPlmns { - description "PLMNs allowed to access the NF instance. - If not provided, any PLMN is allowed to access the NF."; - - min-elements 1; - key "mcc mnc"; - uses types3gpp:PLMNId; - } +// leaf nfType { +// description "Type of Network Function."; +// mandatory true; +// type types3gpp:NfType; +// } +// +// leaf nfStatus { +// description "Status of the NF Instance."; +// mandatory true; +// type NFStatus; +// } - leaf-list allowedNfTypes { - description "Type of the NFs allowed to access the NF instance. - If not provided, any NF type is allowed to access the NF."; - min-elements 1; - type types3gpp:NfType; - } +// leaf heartBeatTimer { +// description "Time in seconds expected between 2 consecutive +// heart-beat messages from an NF Instance to the NRF. +// It may be included in the registration request. +// When present in the request it shall contain the +// heartbeat time proposed by the NF service consumer."; +// type uint16; +// } - leaf-list allowedNfDomains { - description "Pattern representing the NF domain names allowed - to access the NF instance. If not provided, - any NF domain is allowed to access the NF."; - min-elements 1; - type string; - } +// list plmnList { +// description "PLMN(s) of the Network Function. +// This IE shall be present if this information +// is available for the NF. If not provided, PLMN ID(s) +// of the PLMN of the NRF are assumed for the NF."; +// +// min-elements 1; +// key "mcc mnc"; +// uses types3gpp:PLMNId; +// } +// +// list sNssais { +// description "S-NSSAIs of the Network Function. If not +// provided, the NF can serve any S-NSSAI. When present +// this IE represents the list of S-NSSAIs supported in +// all the PLMNs listed in the plmnList IE."; +// min-elements 1; +// key "sst sd"; +// uses Snssai; +// } - list allowedNssais { - description "S-NSSAI of the allowed slices to access the NF instance. - If not provided, any slice is allowed to access the NF."; - min-elements 1; - key "sst sd"; - uses Snssai; - } +// list perPlmnSnssaiList { +// description "This IE may be included when the list of +// S-NSSAIs supported by the NF for each PLMN it is supporting +// is different. When present, this IE shall include the S-NSSAIs +// supported by the Network Function for each PLMN supported by +// the Network Function. When present, this IE shall +// override sNssais IE."; +// min-elements 1; +// // key idx; +// leaf idx { type uint32; } +// uses PlmnSnssai; +// } +v +// leaf-list nsiList { +// description "NSI identities of the Network Function. +// If not provided, the NF can serve any NSI."; +// min-elements 1; +// type string; + // } + // +// leaf fqdn { +// description "FQDN of the Network Function. For AMF, the +// FQDN registered with the NRF shall be that of the AMF Name."; +// type inet:domain-name; +// } +// +// leaf interPlmnFqdn { +// description "If the NF needs to be discoverable by other +// NFs in a different PLMN, then an FQDN that is used +// for inter-PLMN routing is specified."; +// type inet:domain-name; +// } +// Remove not used in stage 3 or stage 2 +// leaf-list ipv4Addresses { +// description "IPv4 address(es) of the Network Function."; +// min-elements 1; +// type inet:ipv4-address; +// } +// +// leaf-list ipv6Addresses { +// description "IPv6 address(es) of the Network Function."; +// min-elements 1; +// type inet:ipv6-address; +// } +// +// list allowedPlmns { +// description "PLMNs allowed to access the NF instance. +// If not provided, any PLMN is allowed to access the NF."; +// +// min-elements 1; +// key "mcc mnc"; +// uses types3gpp:PLMNId; +// } - leaf priority { - description "Priority (relative to other NFs of the same type) - in the range of 0-65535, to be used for NF selection; - lower values indicate a higher priority. - If priority is also present in the nfServiceList - parameters, - those will have precedence over this value. - The NRF may overwrite the received priority value - when exposing - an NFProfile with the Nnrf_NFDiscovery service."; - type uint16; - } +// leaf-list allowedNfTypes { +// description "Type of the NFs allowed to access the NF instance. +// If not provided, any NF type is allowed to access the NF."; +// min-elements 1; +// type types3gpp:NfType; +// } - leaf capacity { - description "Static capacity information in the range of 0-65535, - expressed as a weight relative to other NF instances of - the same type; if capacity is also present in the nfServiceList - parameters, those will have precedence over this value."; - type uint16; - } +// leaf-list allowedNfDomains { +// description "Pattern representing the NF domain names allowed +// to access the NF instance. If not provided, +// any NF domain is allowed to access the NF."; + // min-elements 1; + // type string; +// } +// +// list allowedNssais { +// description "S-NSSAI of the allowed slices to access the NF instance. +// If not provided, any slice is allowed to access the NF."; +// min-elements 1; +// key "sst sd"; +// uses Snssai; +// } +// +// leaf priority { +// description "Priority (relative to other NFs of the same type) +// in the range of 0-65535, to be used for NF selection; +// lower values indicate a higher priority. +// If priority is also present in the nfServiceList +// parameters, +// those will have precedence over this value. +// The NRF may overwrite the received priority value +// when exposing +// an NFProfile with the Nnrf_NFDiscovery service."; +// type uint16; +// } - leaf load { - description "Dynamic load information, ranged from 0 to 100, - indicates the current load percentage of the NF."; - type types3gpp:Load; - } - - leaf locality { - description "Operator defined information about the location - of the NF instance (e.g. geographic location, data center)."; - type string; - } - - grouping udrInfo { - - leaf groupId { - description "Identity of the UDR group that is served - by the UDR instance. - If not provided, the UDR instance does not pertain - to any UDR group."; - type string; - } - - list supiRanges { - description "List of ranges of SUPI's whose profile data - is available in the UDR instance."; - key "start end pattern"; - min-elements 1; - uses SupiRange; - } - - list gpsiRanges { - description "List of ranges of GPSIs whose profile data is - available in the UDR instance."; - key "start end pattern"; - min-elements 1; - uses IdentityRange; - } - - list externalGroupIdentifiersRanges { - description "List of ranges of external groups whose profile - data is available in the UDR instance."; - key "start end pattern"; - min-elements 1; - uses IdentityRange; - } - - leaf-list supportedDataSets { - description "List of supported data sets in the UDR instance. - If not provided, the UDR supports all data sets."; - min-elements 1; - type DataSetId; - } - } +// leaf capacity { +// description "Static capacity information in the range of 0-65535, +// expressed as a weight relative to other NF instances of +// the same type; if capacity is also present in the nfServiceList +// parameters, those will have precedence over this value."; +// type uint16; +// } +// +// leaf load { +// description "Dynamic load information, ranged from 0 to 100, +// indicates the current load percentage of the NF."; +// type types3gpp:Load; +// } +// +// leaf locality { +// description "Operator defined information about the location +// of the NF instance (e.g. geographic location, data center)."; +// type string; +// } +// +// grouping udrInfo { +// +// leaf groupId { +// description "Identity of the UDR group that is served +// by the UDR instance. +// If not provided, the UDR instance does not pertain +// to any UDR group."; +// type string; +// } +// +// list supiRanges { +// description "List of ranges of SUPI's whose profile data +// is available in the UDR instance."; + // key "start end pattern"; +// min-elements 1; +// uses SupiRange; +// } +// +// list gpsiRanges { +// description "List of ranges of GPSIs whose profile data is +// available in the UDR instance."; +// key "start end pattern"; +// min-elements 1; +// uses IdentityRange; +// } +// +// list externalGroupIdentifiersRanges { +// description "List of ranges of external groups whose profile +// data is available in the UDR instance."; +// key "start end pattern"; +// min-elements 1; +// uses IdentityRange; +// } +// +// leaf-list supportedDataSets { +// description "List of supported data sets in the UDR instance. +// If not provided, the UDR supports all data sets."; +// min-elements 1; +// type DataSetId; +// } +// } grouping udmInfo { @@ -1109,72 +1110,72 @@ module _3gpp-5gc-nrm-nfprofile { type string; } - leaf recoveryTime { - description "Timestamp when the NF was (re)started."; - type yang:date-and-time; - } - - leaf nfServicePersistence { - description "If present, and set to true, it indicates that - the different - service instances of a same NF Service - in this NF instance, - - supporting a same API version, are capable to persist - their resource state in shared storage and - therefore these resources - are available after a new NF service - instance supporting - the same API version is selected by a NF - Service Consumer (see 3GPP TS 23.527). - Otherwise, it indicates that the NF Service - Instances of - a same NF Service are not capable to share - resource state inside the NF Instance."; - - type boolean; - } +// leaf recoveryTime { +// description "Timestamp when the NF was (re)started."; +// type yang:date-and-time; +// } - list nfServices { - description "List of NF Service Instances. It shall include - the services produced by the NF that can be - discovered by other NFs."; - key serviceInstanceID; - min-elements 1; - uses nfs3gpp:NFServiceGrp; - } +// leaf nfServicePersistence { +// description "If present, and set to true, it indicates that +// the different +// service instances of a same NF Service +// in this NF instance, +// +// supporting a same API version, are capable to persist +// their resource state in shared storage and +// therefore these resources +// are available after a new NF service +// instance supporting +// the same API version is selected by a NF +// Service Consumer (see 3GPP TS 23.527). +// Otherwise, it indicates that the NF Service +// Instances of +// a same NF Service are not capable to share +// resource state inside the NF Instance."; + // + // type boolean; +// } +// +// list nfServices { +// description "List of NF Service Instances. It shall include +// the services produced by the NF that can be +// discovered by other NFs."; +// key serviceInstanceID; +// min-elements 1; +// uses nfs3gpp:NFServiceGrp; +// } - leaf nfProfileChangesSupportInd { - description "NF Profile Changes Support Indicator. - This IE may be present - in the NFRegister or NFUpdate (NF Profile Complete - Replacement) request - and shall be absent in the response. - true: the NF Service Consumer supports receiving NF Profile - Changes in the response. - false (default): the NF Service Consumer does not support - receiving NF Profile Changes in the response."; - - type boolean; - } - - leaf nfProfileChangesInd { - description "NF Profile Changes Indicator. This IE shall be absent - in the request to the NRF and may be included by the NRF - in NFRegister or NFUpdate (NF Profile Complete Replacement) response. - true: the NF Profile contains NF Profile changes. - false (default): complete NF Profile."; - - type boolean; - } - - list defaultNotificationSubscriptions { - description "Notification endpoints for different notification types."; - key notificationType; - min-elements 1; - uses types3gpp:DefaultNotificationSubscription; - } - } +// leaf nfProfileChangesSupportInd { +// description "NF Profile Changes Support Indicator. +// This IE may be present +// in the NFRegister or NFUpdate (NF Profile Complete +// Replacement) request +// and shall be absent in the response. +// true: the NF Service Consumer supports receiving NF Profile +// Changes in the response. +// false (default): the NF Service Consumer does not support +// receiving NF Profile Changes in the response."; +// +// type boolean; +// } +// +// leaf nfProfileChangesInd { +// description "NF Profile Changes Indicator. This IE shall be absent +// in the request to the NRF and may be included by the NRF +// in NFRegister or NFUpdate (NF Profile Complete Replacement) response. +// true: the NF Profile contains NF Profile changes. +// false (default): complete NF Profile."; +// +// type boolean; +// } +// +// list defaultNotificationSubscriptions { +// description "Notification endpoints for different notification types."; +// key notificationType; +// min-elements 1; +// uses types3gpp:DefaultNotificationSubscription; +// } +// } typedef NFStatus { type enumeration { @@ -1191,40 +1192,40 @@ module _3gpp-5gc-nrm-nfprofile { enum APPLICATION; } } - - grouping SupiRange { - leaf start { - description "First value identifying the start of - a SUPI range. - To be used when the range of SUPI's can be - represented - as a numeric range (e.g., IMSI ranges)."; - type string { - pattern '^[0-9]+$'; - } - } - - leaf end { - description "Last value identifying the end of - a SUPI range. - To be used when the range of SUPI's can be - represented - as a numeric range (e.g. IMSI ranges)."; - type string { - pattern '^[0-9]+$'; - } - } - - leaf pattern { - description "Pattern representing the set of SUPI's belonging - to this range. - A SUPI value is considered part - of the range - if and only if the SUPI string - fully matches the regular expression."; - type string; - } - } +//moved to managed-nfprofile +// grouping SupiRange { +// leaf start { +// description "First value identifying the start of +// a SUPI range. +// To be used when the range of SUPI's can be +// represented +// as a numeric range (e.g., IMSI ranges)."; +// type string { +// pattern '^[0-9]+$'; +// } +// } +// +// leaf end { +// description "Last value identifying the end of +// a SUPI range. +// To be used when the range of SUPI's can be +// represented +// as a numeric range (e.g. IMSI ranges)."; +// type string { +// pattern '^[0-9]+$'; +// } +// } +// +// leaf pattern { +// description "Pattern representing the set of SUPI's belonging +// to this range. +// A SUPI value is considered part +// of the range +// if and only if the SUPI string +// fully matches the regular expression."; +// type string; +// } +// } grouping IdentityRange { leaf start { @@ -1254,16 +1255,16 @@ module _3gpp-5gc-nrm-nfprofile { type string; } } - - grouping SnssaiUpfInfoItem { - list sNssai { - description "Supported S-NSSAI."; - min-elements 1; - max-elements 1; - key "sst sd"; - uses Snssai; - } - } +// move to UPFInfo +// grouping SnssaiUpfInfoItem { +// list sNssai { +// description "Supported S-NSSAI."; +// min-elements 1; +// max-elements 1; +// key "sst sd"; +// uses Snssai; +// } +// } grouping DnnUpfInfoItem { leaf dnn { @@ -1290,27 +1291,27 @@ module _3gpp-5gc-nrm-nfprofile { type PduSessionType; } } - - grouping Snssai { - leaf sst { - description "Unsigned integer, within the range 0 to 255, - representing the Slice/Service Type. - It indicates the expected Network Slice behaviour - in terms of features and services."; - mandatory true; - type uint32; - } - - leaf sd { - description "3-octet string, representing the Slice Differentiator, - in hexadecimal representation."; - type string { - pattern '^[A-Fa-f0-9]{6}$'; - } - } - - reference "3GPP TS 29.571"; - } +// Moved to common type +// grouping Snssai { +// leaf sst { +// description "Unsigned integer, within the range 0 to 255, +// representing the Slice/Service Type. +// It indicates the expected Network Slice behaviour +// in terms of features and services."; +// mandatory true; +// type uint32; +// } +// +// leaf sd { +// description "3-octet string, representing the Slice Differentiator, +// in hexadecimal representation."; +// type string { +// pattern '^[A-Fa-f0-9]{6}$'; +// } +// } +// +// reference "3GPP TS 29.571"; +// } typedef PduSessionType { type enumeration { @@ -1456,24 +1457,24 @@ module _3gpp-5gc-nrm-nfprofile { } } - grouping PlmnSnssai { - list plmnId { - description "PLMN ID for which list of supported S-NSSAI(s) - is provided."; - min-elements 1; - max-elements 1; - key "mcc mnc"; - uses types3gpp:PLMNId; - } - - list sNssaiList { - description "The specific list of S-NSSAIs supported - by the given PLMN."; - min-elements 1; - key "sst sd"; - uses Snssai; - } - } +// grouping PlmnSnssai { +// list plmnId { +// description "PLMN ID for which list of supported S-NSSAI(s) +// is provided."; +// min-elements 1; +// max-elements 1; +// key "mcc mnc"; +// uses types3gpp:PLMNId; +// } +// +// list sNssaiList { +// description "The specific list of S-NSSAIs supported +// by the given PLMN."; +// min-elements 1; +// key "sst sd"; +// uses Snssai; +// } +// } grouping ImsiRange{ leaf start{ description "This attribute indicates the first value identifying -- GitLab From 55883cee956215a51fc164a41fadb7f8f32e8e78 Mon Sep 17 00:00:00 2001 From: rosabolzek Date: Fri, 25 Jul 2025 18:25:27 +0200 Subject: [PATCH 517/587] move from nfprofile --- yang-models/_3gpp-5g-common-yang-types.yang | 34 +- yang-models/_3gpp-5gc-nrm-ausffunction.yang | 4 +- yang-models/_3gpp-5gc-nrm-nfprofile.yang | 681 ++++++++++---------- yang-models/_3gpp-5gc-nrm-smffunction.yang | 136 +++- yang-models/_3gpp-5gc-nrm-udmfunction.yang | 118 +++- 5 files changed, 614 insertions(+), 359 deletions(-) diff --git a/yang-models/_3gpp-5g-common-yang-types.yang b/yang-models/_3gpp-5g-common-yang-types.yang index e81cd0f83..2225efcf1 100755 --- a/yang-models/_3gpp-5g-common-yang-types.yang +++ b/yang-models/_3gpp-5g-common-yang-types.yang @@ -106,6 +106,23 @@ module _3gpp-5g-common-yang-types { uses SnssaiExtensionGrp; } } + grouping sNssaiSmfInfoItem { + list sNssai { + description "Supported S-NSSAI."; + min-elements 1; + max-elements 1; + key "sst sd"; + uses types5g3gpp:SNssai; + } + + list dnnSmfInfoList { + description "List of parameters supported by the SMF per DNN. + The absence indicates the DNN can be selected for any DNAI."; + min-elements 1; + key dnn; + uses DnnSmfInfoItem; + } + } grouping MappedCellIdInfoGrp { description "This data type represents the mapping relationship between @@ -319,7 +336,22 @@ module _3gpp-5g-common-yang-types { TAC string fully matches the regular expression."; type string; } - } + } + grouping DnnSmfInfoItem { + leaf dnn { + description "Supported DNN."; + mandatory true; + type string; + } + + leaf-list dnaiList { + description "List of Data network access identifiers supported by + the SMF for this DNN. The absence of this attribute indicates that + the SMF can be selected for this DNN for any DNAI."; + min-elements 1; + type string; + } + } grouping SupportedFunc { leaf function { diff --git a/yang-models/_3gpp-5gc-nrm-ausffunction.yang b/yang-models/_3gpp-5gc-nrm-ausffunction.yang index e2648cdd3..cf478f26f 100755 --- a/yang-models/_3gpp-5gc-nrm-ausffunction.yang +++ b/yang-models/_3gpp-5gc-nrm-ausffunction.yang @@ -11,7 +11,7 @@ module _3gpp-5gc-nrm-ausffunction { import _3gpp-common-yang-types { prefix types3gpp; } import _3gpp-common-yang-extensions { prefix yext3gpp; } import _3gpp-common-top { prefix top3gpp; } - import _3gpp-5gc-nrm-nfprofile { prefix nfp3gpp; } + import _3gpp-5gc-nrm-managed-nfprofile { prefix mnfp3gpp; } organization "3gpp SA5"; contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464"; @@ -68,7 +68,7 @@ module _3gpp-5gc-nrm-ausffunction { by the PCF instance."; key idx; leaf idx { type uint32 ; } - uses nfp3gpp:SupiRange; + uses mnfp3gpp:SupiRange; } leaf-list routingIndicators { diff --git a/yang-models/_3gpp-5gc-nrm-nfprofile.yang b/yang-models/_3gpp-5gc-nrm-nfprofile.yang index 20714945d..354d8b8ac 100755 --- a/yang-models/_3gpp-5gc-nrm-nfprofile.yang +++ b/yang-models/_3gpp-5gc-nrm-nfprofile.yang @@ -28,207 +28,206 @@ module _3gpp-5gc-nrm-nfprofile { revision 2023-02-14 { reference CR-0891; } revision 2019-06-17 { reference "initial revision"; } -//Moved to managed_nfprofile -// grouping NFProfileGrp { -// leaf nfInstanceId { -// description "String uniquely identifying a NF instance."; -// mandatory true; -// type string; -// } + grouping NFProfileGrp { + leaf nfInstanceId { + description "String uniquely identifying a NF instance."; + mandatory true; + type string; + } + + leaf nfType { + description "Type of Network Function."; + mandatory true; + type types3gpp:NfType; + } + + leaf nfStatus { + description "Status of the NF Instance."; + mandatory true; + type NFStatus; + } + + leaf heartBeatTimer { + description "Time in seconds expected between 2 consecutive + heart-beat messages from an NF Instance to the NRF. + It may be included in the registration request. + When present in the request it shall contain the + heartbeat time proposed by the NF service consumer."; + type uint16; + } + + list plmnList { + description "PLMN(s) of the Network Function. + This IE shall be present if this information + is available for the NF. If not provided, PLMN ID(s) + of the PLMN of the NRF are assumed for the NF."; + + min-elements 1; + key "mcc mnc"; + uses types3gpp:PLMNId; + } + + list sNssais { + description "S-NSSAIs of the Network Function. If not + provided, the NF can serve any S-NSSAI. When present + this IE represents the list of S-NSSAIs supported in + all the PLMNs listed in the plmnList IE."; + min-elements 1; + key "sst sd"; + uses Snssai; + } + + list perPlmnSnssaiList { + description "This IE may be included when the list of + S-NSSAIs supported by the NF for each PLMN it is supporting + is different. When present, this IE shall include the S-NSSAIs + supported by the Network Function for each PLMN supported by + the Network Function. When present, this IE shall + override sNssais IE."; + min-elements 1; + key idx; + leaf idx { type uint32; } + uses PlmnSnssai; + } + + leaf-list nsiList { + description "NSI identities of the Network Function. + If not provided, the NF can serve any NSI."; + min-elements 1; + type string; + } + + leaf fqdn { + description "FQDN of the Network Function. For AMF, the + FQDN registered with the NRF shall be that of the AMF Name."; + type inet:domain-name; + } + + leaf interPlmnFqdn { + description "If the NF needs to be discoverable by other + NFs in a different PLMN, then an FQDN that is used + for inter-PLMN routing is specified."; + type inet:domain-name; + } + + leaf-list ipv4Addresses { + description "IPv4 address(es) of the Network Function."; + min-elements 1; + type inet:ipv4-address; + } -// leaf nfType { -// description "Type of Network Function."; -// mandatory true; -// type types3gpp:NfType; -// } -// -// leaf nfStatus { -// description "Status of the NF Instance."; -// mandatory true; -// type NFStatus; -// } + leaf-list ipv6Addresses { + description "IPv6 address(es) of the Network Function."; + min-elements 1; + type inet:ipv6-address; + } + + list allowedPlmns { + description "PLMNs allowed to access the NF instance. + If not provided, any PLMN is allowed to access the NF."; + + min-elements 1; + key "mcc mnc"; + uses types3gpp:PLMNId; + } -// leaf heartBeatTimer { -// description "Time in seconds expected between 2 consecutive -// heart-beat messages from an NF Instance to the NRF. -// It may be included in the registration request. -// When present in the request it shall contain the -// heartbeat time proposed by the NF service consumer."; -// type uint16; -// } + leaf-list allowedNfTypes { + description "Type of the NFs allowed to access the NF instance. + If not provided, any NF type is allowed to access the NF."; + min-elements 1; + type types3gpp:NfType; + } -// list plmnList { -// description "PLMN(s) of the Network Function. -// This IE shall be present if this information -// is available for the NF. If not provided, PLMN ID(s) -// of the PLMN of the NRF are assumed for the NF."; -// -// min-elements 1; -// key "mcc mnc"; -// uses types3gpp:PLMNId; -// } -// -// list sNssais { -// description "S-NSSAIs of the Network Function. If not -// provided, the NF can serve any S-NSSAI. When present -// this IE represents the list of S-NSSAIs supported in -// all the PLMNs listed in the plmnList IE."; -// min-elements 1; -// key "sst sd"; -// uses Snssai; -// } + leaf-list allowedNfDomains { + description "Pattern representing the NF domain names allowed + to access the NF instance. If not provided, + any NF domain is allowed to access the NF."; + min-elements 1; + type string; + } -// list perPlmnSnssaiList { -// description "This IE may be included when the list of -// S-NSSAIs supported by the NF for each PLMN it is supporting -// is different. When present, this IE shall include the S-NSSAIs -// supported by the Network Function for each PLMN supported by -// the Network Function. When present, this IE shall -// override sNssais IE."; -// min-elements 1; -// // key idx; -// leaf idx { type uint32; } -// uses PlmnSnssai; -// } -v -// leaf-list nsiList { -// description "NSI identities of the Network Function. -// If not provided, the NF can serve any NSI."; -// min-elements 1; -// type string; - // } - // -// leaf fqdn { -// description "FQDN of the Network Function. For AMF, the -// FQDN registered with the NRF shall be that of the AMF Name."; -// type inet:domain-name; -// } -// -// leaf interPlmnFqdn { -// description "If the NF needs to be discoverable by other -// NFs in a different PLMN, then an FQDN that is used -// for inter-PLMN routing is specified."; -// type inet:domain-name; -// } -// Remove not used in stage 3 or stage 2 -// leaf-list ipv4Addresses { -// description "IPv4 address(es) of the Network Function."; -// min-elements 1; -// type inet:ipv4-address; -// } -// -// leaf-list ipv6Addresses { -// description "IPv6 address(es) of the Network Function."; -// min-elements 1; -// type inet:ipv6-address; -// } -// -// list allowedPlmns { -// description "PLMNs allowed to access the NF instance. -// If not provided, any PLMN is allowed to access the NF."; -// -// min-elements 1; -// key "mcc mnc"; -// uses types3gpp:PLMNId; -// } + list allowedNssais { + description "S-NSSAI of the allowed slices to access the NF instance. + If not provided, any slice is allowed to access the NF."; + min-elements 1; + key "sst sd"; + uses Snssai; + } -// leaf-list allowedNfTypes { -// description "Type of the NFs allowed to access the NF instance. -// If not provided, any NF type is allowed to access the NF."; -// min-elements 1; -// type types3gpp:NfType; -// } + leaf priority { + description "Priority (relative to other NFs of the same type) + in the range of 0-65535, to be used for NF selection; + lower values indicate a higher priority. + If priority is also present in the nfServiceList + parameters, + those will have precedence over this value. + The NRF may overwrite the received priority value + when exposing + an NFProfile with the Nnrf_NFDiscovery service."; + type uint16; + } -// leaf-list allowedNfDomains { -// description "Pattern representing the NF domain names allowed -// to access the NF instance. If not provided, -// any NF domain is allowed to access the NF."; - // min-elements 1; - // type string; -// } -// -// list allowedNssais { -// description "S-NSSAI of the allowed slices to access the NF instance. -// If not provided, any slice is allowed to access the NF."; -// min-elements 1; -// key "sst sd"; -// uses Snssai; -// } -// -// leaf priority { -// description "Priority (relative to other NFs of the same type) -// in the range of 0-65535, to be used for NF selection; -// lower values indicate a higher priority. -// If priority is also present in the nfServiceList -// parameters, -// those will have precedence over this value. -// The NRF may overwrite the received priority value -// when exposing -// an NFProfile with the Nnrf_NFDiscovery service."; -// type uint16; -// } + leaf capacity { + description "Static capacity information in the range of 0-65535, + expressed as a weight relative to other NF instances of + the same type; if capacity is also present in the nfServiceList + parameters, those will have precedence over this value."; + type uint16; + } -// leaf capacity { -// description "Static capacity information in the range of 0-65535, -// expressed as a weight relative to other NF instances of -// the same type; if capacity is also present in the nfServiceList -// parameters, those will have precedence over this value."; -// type uint16; -// } -// -// leaf load { -// description "Dynamic load information, ranged from 0 to 100, -// indicates the current load percentage of the NF."; -// type types3gpp:Load; -// } -// -// leaf locality { -// description "Operator defined information about the location -// of the NF instance (e.g. geographic location, data center)."; -// type string; -// } -// -// grouping udrInfo { -// -// leaf groupId { -// description "Identity of the UDR group that is served -// by the UDR instance. -// If not provided, the UDR instance does not pertain -// to any UDR group."; -// type string; -// } -// -// list supiRanges { -// description "List of ranges of SUPI's whose profile data -// is available in the UDR instance."; - // key "start end pattern"; -// min-elements 1; -// uses SupiRange; -// } -// -// list gpsiRanges { -// description "List of ranges of GPSIs whose profile data is -// available in the UDR instance."; -// key "start end pattern"; -// min-elements 1; -// uses IdentityRange; -// } -// -// list externalGroupIdentifiersRanges { -// description "List of ranges of external groups whose profile -// data is available in the UDR instance."; -// key "start end pattern"; -// min-elements 1; -// uses IdentityRange; -// } -// -// leaf-list supportedDataSets { -// description "List of supported data sets in the UDR instance. -// If not provided, the UDR supports all data sets."; -// min-elements 1; -// type DataSetId; -// } -// } + leaf load { + description "Dynamic load information, ranged from 0 to 100, + indicates the current load percentage of the NF."; + type types3gpp:Load; + } + + leaf locality { + description "Operator defined information about the location + of the NF instance (e.g. geographic location, data center)."; + type string; + } + + grouping udrInfo { + + leaf groupId { + description "Identity of the UDR group that is served + by the UDR instance. + If not provided, the UDR instance does not pertain + to any UDR group."; + type string; + } + + list supiRanges { + description "List of ranges of SUPI's whose profile data + is available in the UDR instance."; + key "start end pattern"; + min-elements 1; + uses SupiRange; + } + + list gpsiRanges { + description "List of ranges of GPSIs whose profile data is + available in the UDR instance."; + key "start end pattern"; + min-elements 1; + uses IdentityRange; + } + + list externalGroupIdentifiersRanges { + description "List of ranges of external groups whose profile + data is available in the UDR instance."; + key "start end pattern"; + min-elements 1; + uses IdentityRange; + } + + leaf-list supportedDataSets { + description "List of supported data sets in the UDR instance. + If not provided, the UDR supports all data sets."; + min-elements 1; + type DataSetId; + } + } grouping udmInfo { @@ -1110,72 +1109,72 @@ v type string; } -// leaf recoveryTime { -// description "Timestamp when the NF was (re)started."; -// type yang:date-and-time; -// } + leaf recoveryTime { + description "Timestamp when the NF was (re)started."; + type yang:date-and-time; + } + + leaf nfServicePersistence { + description "If present, and set to true, it indicates that + the different + service instances of a same NF Service + in this NF instance, + + supporting a same API version, are capable to persist + their resource state in shared storage and + therefore these resources + are available after a new NF service + instance supporting + the same API version is selected by a NF + Service Consumer (see 3GPP TS 23.527). + Otherwise, it indicates that the NF Service + Instances of + a same NF Service are not capable to share + resource state inside the NF Instance."; + + type boolean; + } -// leaf nfServicePersistence { -// description "If present, and set to true, it indicates that -// the different -// service instances of a same NF Service -// in this NF instance, -// -// supporting a same API version, are capable to persist -// their resource state in shared storage and -// therefore these resources -// are available after a new NF service -// instance supporting -// the same API version is selected by a NF -// Service Consumer (see 3GPP TS 23.527). -// Otherwise, it indicates that the NF Service -// Instances of -// a same NF Service are not capable to share -// resource state inside the NF Instance."; - // - // type boolean; -// } -// -// list nfServices { -// description "List of NF Service Instances. It shall include -// the services produced by the NF that can be -// discovered by other NFs."; -// key serviceInstanceID; -// min-elements 1; -// uses nfs3gpp:NFServiceGrp; -// } + list nfServices { + description "List of NF Service Instances. It shall include + the services produced by the NF that can be + discovered by other NFs."; + key serviceInstanceID; + min-elements 1; + uses nfs3gpp:NFServiceGrp; + } -// leaf nfProfileChangesSupportInd { -// description "NF Profile Changes Support Indicator. -// This IE may be present -// in the NFRegister or NFUpdate (NF Profile Complete -// Replacement) request -// and shall be absent in the response. -// true: the NF Service Consumer supports receiving NF Profile -// Changes in the response. -// false (default): the NF Service Consumer does not support -// receiving NF Profile Changes in the response."; -// -// type boolean; -// } -// -// leaf nfProfileChangesInd { -// description "NF Profile Changes Indicator. This IE shall be absent -// in the request to the NRF and may be included by the NRF -// in NFRegister or NFUpdate (NF Profile Complete Replacement) response. -// true: the NF Profile contains NF Profile changes. -// false (default): complete NF Profile."; -// -// type boolean; -// } -// -// list defaultNotificationSubscriptions { -// description "Notification endpoints for different notification types."; -// key notificationType; -// min-elements 1; -// uses types3gpp:DefaultNotificationSubscription; -// } -// } + leaf nfProfileChangesSupportInd { + description "NF Profile Changes Support Indicator. + This IE may be present + in the NFRegister or NFUpdate (NF Profile Complete + Replacement) request + and shall be absent in the response. + true: the NF Service Consumer supports receiving NF Profile + Changes in the response. + false (default): the NF Service Consumer does not support + receiving NF Profile Changes in the response."; + + type boolean; + } + + leaf nfProfileChangesInd { + description "NF Profile Changes Indicator. This IE shall be absent + in the request to the NRF and may be included by the NRF + in NFRegister or NFUpdate (NF Profile Complete Replacement) response. + true: the NF Profile contains NF Profile changes. + false (default): complete NF Profile."; + + type boolean; + } + + list defaultNotificationSubscriptions { + description "Notification endpoints for different notification types."; + key notificationType; + min-elements 1; + uses types3gpp:DefaultNotificationSubscription; + } + } typedef NFStatus { type enumeration { @@ -1192,40 +1191,40 @@ v enum APPLICATION; } } -//moved to managed-nfprofile -// grouping SupiRange { -// leaf start { -// description "First value identifying the start of -// a SUPI range. -// To be used when the range of SUPI's can be -// represented -// as a numeric range (e.g., IMSI ranges)."; -// type string { -// pattern '^[0-9]+$'; -// } -// } -// -// leaf end { -// description "Last value identifying the end of -// a SUPI range. -// To be used when the range of SUPI's can be -// represented -// as a numeric range (e.g. IMSI ranges)."; -// type string { -// pattern '^[0-9]+$'; -// } -// } -// -// leaf pattern { -// description "Pattern representing the set of SUPI's belonging -// to this range. -// A SUPI value is considered part -// of the range -// if and only if the SUPI string -// fully matches the regular expression."; -// type string; -// } -// } + + grouping SupiRange { + leaf start { + description "First value identifying the start of + a SUPI range. + To be used when the range of SUPI's can be + represented + as a numeric range (e.g., IMSI ranges)."; + type string { + pattern '^[0-9]+$'; + } + } + + leaf end { + description "Last value identifying the end of + a SUPI range. + To be used when the range of SUPI's can be + represented + as a numeric range (e.g. IMSI ranges)."; + type string { + pattern '^[0-9]+$'; + } + } + + leaf pattern { + description "Pattern representing the set of SUPI's belonging + to this range. + A SUPI value is considered part + of the range + if and only if the SUPI string + fully matches the regular expression."; + type string; + } + } grouping IdentityRange { leaf start { @@ -1255,16 +1254,16 @@ v type string; } } -// move to UPFInfo -// grouping SnssaiUpfInfoItem { -// list sNssai { -// description "Supported S-NSSAI."; -// min-elements 1; -// max-elements 1; -// key "sst sd"; -// uses Snssai; -// } -// } + + grouping SnssaiUpfInfoItem { + list sNssai { + description "Supported S-NSSAI."; + min-elements 1; + max-elements 1; + key "sst sd"; + uses Snssai; + } + } grouping DnnUpfInfoItem { leaf dnn { @@ -1291,27 +1290,27 @@ v type PduSessionType; } } -// Moved to common type -// grouping Snssai { -// leaf sst { -// description "Unsigned integer, within the range 0 to 255, -// representing the Slice/Service Type. -// It indicates the expected Network Slice behaviour -// in terms of features and services."; -// mandatory true; -// type uint32; -// } -// -// leaf sd { -// description "3-octet string, representing the Slice Differentiator, -// in hexadecimal representation."; -// type string { -// pattern '^[A-Fa-f0-9]{6}$'; -// } -// } -// -// reference "3GPP TS 29.571"; -// } + + grouping Snssai { + leaf sst { + description "Unsigned integer, within the range 0 to 255, + representing the Slice/Service Type. + It indicates the expected Network Slice behaviour + in terms of features and services."; + mandatory true; + type uint32; + } + + leaf sd { + description "3-octet string, representing the Slice Differentiator, + in hexadecimal representation."; + type string { + pattern '^[A-Fa-f0-9]{6}$'; + } + } + + reference "3GPP TS 29.571"; + } typedef PduSessionType { type enumeration { @@ -1457,24 +1456,24 @@ v } } -// grouping PlmnSnssai { -// list plmnId { -// description "PLMN ID for which list of supported S-NSSAI(s) -// is provided."; -// min-elements 1; -// max-elements 1; -// key "mcc mnc"; -// uses types3gpp:PLMNId; -// } -// -// list sNssaiList { -// description "The specific list of S-NSSAIs supported -// by the given PLMN."; -// min-elements 1; -// key "sst sd"; -// uses Snssai; -// } -// } + grouping PlmnSnssai { + list plmnId { + description "PLMN ID for which list of supported S-NSSAI(s) + is provided."; + min-elements 1; + max-elements 1; + key "mcc mnc"; + uses types3gpp:PLMNId; + } + + list sNssaiList { + description "The specific list of S-NSSAIs supported + by the given PLMN."; + min-elements 1; + key "sst sd"; + uses Snssai; + } + } grouping ImsiRange{ leaf start{ description "This attribute indicates the first value identifying diff --git a/yang-models/_3gpp-5gc-nrm-smffunction.yang b/yang-models/_3gpp-5gc-nrm-smffunction.yang index ca37a43d4..8349d68b6 100755 --- a/yang-models/_3gpp-5gc-nrm-smffunction.yang +++ b/yang-models/_3gpp-5gc-nrm-smffunction.yang @@ -9,6 +9,7 @@ module _3gpp-5gc-nrm-smffunction { import _3gpp-5g-common-yang-types { prefix types5g3gpp; } import ietf-inet-types { prefix inet; } import _3gpp-common-top { prefix top3gpp; } + import _3gpp-5gc-nrm-managed-nfprofile { prefix mnfp3gpp; } organization "3gpp SA5"; contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464"; @@ -27,6 +28,117 @@ module _3gpp-5gc-nrm-smffunction { revision 2019-05-31 {reference "Ericsson refactoring."; } revision 2018-08-07 { reference "Initial revision";} + + grouping smfInfo { + + list sNssaiSmfInfoList { + description "List of parameters supported by the SMF per S-NSSAI."; + min-elements 1; + key idx; + leaf idx { type uint32; } + uses types5g3gpp:sNssaiSmfInfoItem; + } + + list taiList { + description "The list of TAIs the SMF can serve. + It may contain the non-3GPP access TAI. + The absence of this attribute and the taiRangeList + attribute indicate that + the SMF can be selected for any TAI + in the serving network."; + + key idx; + leaf idx { type uint32; } + + min-elements 1; + uses types3gpp:TaiGrp; + } + + list taiRangeList { + description "The range of TAIs the SMF can serve. + The absence of this attribute and the taiList + attribute indicate that the SMF can be selected + for any TAI in the serving network."; + min-elements 1; + key idx; + leaf idx { type uint32; } + uses types5g3gpp:TaiRangeGrp; + } + + leaf pgwFqdn { + description "The FQDN of the PGW if the SMF is a combined SMF/PGW-C."; + type inet:domain-name; + } + leaf-list accessType { + description "If included, this IE shall contain the access type + (3GPP_ACCESS and/or NON_3GPP_ACCESS) supported by the SMF. + If not included, it shall be assumed the both + access types are supported."; + + min-elements 1; + max-elements 2; + type AccessType; + } + leaf priority { + description "This parameter defines Priority (relative to other + NFs of the same type) in the range of 0-65535, to be used for + NF selection; lower values indicate a higher priority. If + priority is also present in the nfServiceList parameters, + those will have precedence over this value "; + type uint16; + } + leaf-list vsmfSupportInd { + description "Used by an SMF to explicitly indicate the support of + V-SMF capability and its preference to be selected as V-SMF. + When present it indicate whether the V-SMF capability is supported + by the SMF: + - true: V-SMF capability supported by the SMF + - false: V-SMF capability not supported by the SMF. + When absent the V-SMF capability support of the SMF is not specified."; + type boolean; + + } + leaf pgwFqdnList { + description "When present, this attribute provides additional FQDNs + to the FQDN indicated in the pgwFqdn attribute. + The pgwFqdnList attribute may be present if the pgwFqdn attribute + is present."; + type string; + } + leaf-list ismfSupportInd { + description "This attribute may be used by an SMF to explicitly + indicate the support of I-SMF capability and its preference to be + selected as I-SMF. When present, this attribute shall indicate + whether the I-SMF capability are supported by the SMF: + - TRUE: I-SMF capability supported by the SMF + - FALSE: I-SMF capability not supported by the SMF. Absence of this + attribute indicates the I-SMF capability support of the SMF is not + specified."; + max-elements 1; + type boolean; + } + leaf-list smfOnboardingCapability { + description "This attribute indicates the SMF supports SNPN + Onboarding capability and User Plane Remote Provisioning. This + is used for the case of Onboarding of UEs for SNPNs + (see TS 23.501 [2], clauses 5.30.2.10 and 6.2.6.2). + - FALSE: SMF does not support SNPN Onboarding; + - TRUE: SMF supports SNPN Onboarding."; + type boolean; + max-elements 1; + } + leaf-list smfUPRPCapability { + description "This attribute IE indicates the SMF supports User + Plane Remote Provisioning (UPRP) capability. This is used for + the case of Onboarding of UEs for SNPNs , + clauses 5.30.2.10 and 6.2.6.2). + - FALSE: SMF does not support UPRP; + - TRUE: SMF supports UPRP."; + reference "see TS 23.501 [2]"; + type boolean; + } + } + grouping SMFFunctionGrp { description "Represents the SMFFuntion IOC"; uses mf3gpp:ManagedFunctionGrp; @@ -39,11 +151,10 @@ module _3gpp-5gc-nrm-smffunction { uses types3gpp:PLMNId; } - leaf-list nRTACList { + leaf nRTACList { description "List of Tracking Area Codes (legacy TAC or extended TAC) where the represented management function is serving."; reference "TS 38.413 clause 9.3.3.10"; - min-elements 1; config false; type types5g3gpp:NRTAC; } @@ -53,23 +164,14 @@ module _3gpp-5gc-nrm-smffunction { interface."; type inet:domain-name; } - - list sNSSAIList { - description "List of S-NSSAIs the managed object is capable of supporting. - (Single Network Slice Selection Assistance Information) - An S-NSSAI has an SST (Slice/Service type) and an optional SD - (Slice Differentiator) field."; - reference "3GPP TS 23.003"; - key "sd sst"; - uses types5g3gpp:SNssai; - } - + list managedNFProfile { key idx; + leaf idx { type uint32; } min-elements 1; max-elements 1; description "Profile definition of a Managed NF (See TS 23.501)"; - uses types3gpp:ManagedNFProfile; + uses mnfp3gpp:ManagedNFProfileGrp; } list commModelList { @@ -115,6 +217,12 @@ module _3gpp-5gc-nrm-smffunction { } } + typedef AccessType { + type enumeration { + enum 3GPP_ACCESS; + enum NON_3GPP_ACCESS; + } + } augment "/me3gpp:ManagedElement" { list SMFFunction { description "5G Core SMF Function"; diff --git a/yang-models/_3gpp-5gc-nrm-udmfunction.yang b/yang-models/_3gpp-5gc-nrm-udmfunction.yang index 319015d16..c91967e05 100755 --- a/yang-models/_3gpp-5gc-nrm-udmfunction.yang +++ b/yang-models/_3gpp-5gc-nrm-udmfunction.yang @@ -10,6 +10,7 @@ module _3gpp-5gc-nrm-udmfunction { import _3gpp-common-yang-types { prefix types3gpp; } import _3gpp-5g-common-yang-types { prefix types5g3gpp; } import _3gpp-common-top { prefix top3gpp; } + import _3gpp-5gc-nrm-managed-nfprofile { prefix mnfp3gpp; } organization "3gpp SA5"; contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464"; @@ -26,6 +27,113 @@ module _3gpp-5gc-nrm-udmfunction { revision 2019-10-25 { reference "S5-194457 S5-195427 S5-193518"; } revision 2019-05-22 { reference "initial revision";} + grouping InternalGroupIdRangeGrp { + + leaf start { + description "It indicates first value identifying the start of an + identity range, to be used when the range of identities can be + represented as a consecutive numeric range."; + type string; + } + + leaf end{ + description "It indicates last value identifying the end of an + identity range, to be used when the range of identities can be + represented as a consecutive numeric range."; + type string; + } + leaf pattern { + description "It indicates pattern (regular expression according + to the ECMA-262 dialect [75]) representing the set of identities + belonging to this range. An identity value is considered part of + the range if and only if the identity string fully matches the + regular expression."; + type string; + } + } + grouping SuciInfoGrp { + description "This data type represents SUCI information containing + Routing Indicator and Home Network Public Key ID. (See TS 29.510)"; + + leaf-list routingInds { + type string; + min-elements 1; + description "It indicates served Routing Indicator (see TS 23.003, + clause 2.2B). If not provided, the AUSF/UDM + can serve any Routing Indicator."; + } + + leaf-list hNwPubKeyIds { + type int64; + min-elements 1; + description "It indicating served Home Network Public Key + (see TS 23.003, clause 2.2B). If not provided, the AUSF/UDM + can serve any public key."; + } + } + grouping UdmInfoGrp { + + leaf groupId { + description "Identity of the UDM group that is served by the + UDM instance. If not provided, the UDM instance does + not pertain to any UDM group."; + type string; + } + + list supiRanges { + description "List of ranges of SUPI's whose profile data is + available in the UDM instance."; + key "start end pattern"; + min-elements 1; + uses mnfp3gpp:SupiRange; + } + + list gpsiRanges { + description "List of ranges of GPSIs whose profile data is + available in the UDM instance."; + key "start end pattern"; + min-elements 1; + uses mnfp3gpp:IdentityRange; + } + + list externalGroupIdentifiersRanges { + description "List of ranges of external groups whose profile + data is available in the UDM instance."; + key "start end pattern"; + min-elements 1; + uses mnfp3gpp:IdentityRange; + } + + leaf-list routingIndicators { + description "List of Routing Indicator information that allows + to route network signalling with SUCI + to the UDM instance. If not provided, + the UDM can serve any Routing Indicator. + Pattern: '^[0-9]{1,4}$'."; + min-elements 1; + type string; + } + + list internalGroupIdentifiersRanges{ + description "It represents list of ranges of Internal Group + Identifiers whose profile data is available in the UDM instance. + If not provided, it does not imply that the UDM supports all + internal groups."; + key idx; + leaf idx { type uint32; } + uses InternalGroupIdRangeGrp; + } + list suciInfos { + description "It represents list of SuciInfo. A SUCI that matches + this information can be served by the UDM .A SUCI that matches + all attributes of at least one entry in this array shall be + considered as a match of this information"; + key idx; + leaf idx { type uint32; } + uses SuciInfoGrp; + } + } + grouping UDMFuntionGrp { description "Represents the UDMFuntion IOC"; uses mf3gpp:ManagedFunctionGrp; @@ -61,10 +169,11 @@ module _3gpp-5gc-nrm-udmfunction { list managedNFProfile { key idx; + leaf idx { type uint32; } min-elements 1; max-elements 1; description "Profile definition of a Managed NF (See TS 23.501)"; - uses types3gpp:ManagedNFProfile; + uses mnfp3gpp:ManagedNFProfileGrp; } list commModelList { @@ -76,6 +185,13 @@ module _3gpp-5gc-nrm-udmfunction { uses types5g3gpp:CommModel; } + container udmInfo { + description "This attribute represents the information of an UDM NF + Instance "; + reference "TS 29.510 "; + uses UdmInfoGrp; + } + leaf-list mdtUserConsentReqList { type enumeration { enum M1; -- GitLab From 9e62a5ef6831c0488ef7ce7b7175d0aae3394240 Mon Sep 17 00:00:00 2001 From: rosabolzek Date: Fri, 25 Jul 2025 18:43:17 +0200 Subject: [PATCH 518/587] correct linting errors --- yang-models/_3gpp-5g-common-yang-types.yang | 6 ++- yang-models/_3gpp-5gc-nrm-ausffunction.yang | 4 +- yang-models/_3gpp-5gc-nrm-ep.yang | 6 +-- yang-models/_3gpp-5gc-nrm-seppfunction.yang | 2 +- yang-models/_3gpp-5gc-nrm-smffunction.yang | 8 ++-- yang-models/_3gpp-common-ep-rp.yang | 2 +- ..._3gpp-common-managementdatacollection.yang | 28 ++++++------- yang-models/_3gpp-common-mnsregistry.yang | 6 +-- .../_3gpp-nr-nrm-eutrancellrelation.yang | 2 +- .../_3gpp-nr-nrm-externaleutrancell.yang | 4 +- yang-models/_3gpp-nr-nrm-nrcellrelation.yang | 40 +++++++++---------- yang-models/_3gpp-nr-nrm-nrfreqrelation.yang | 4 +- yang-models/_3gpp-nr-nrm-nrfrequency.yang | 4 +- yang-models/_3gpp-nr-nrm-nrsectorcarrier.yang | 4 +- yang-models/_3gpp-ns-nrm-sliceprofile.yang | 18 ++++----- 15 files changed, 70 insertions(+), 68 deletions(-) diff --git a/yang-models/_3gpp-5g-common-yang-types.yang b/yang-models/_3gpp-5g-common-yang-types.yang index 2225efcf1..f16c83e5c 100755 --- a/yang-models/_3gpp-5g-common-yang-types.yang +++ b/yang-models/_3gpp-5g-common-yang-types.yang @@ -38,13 +38,15 @@ module _3gpp-5g-common-yang-types { description "Available endpoint IPv6 address(es) of the User Plane interface."; type inet:ipv6-address; - must '../ipv4EndpointAddresses or ../ipv6EndpointAddresses or ../fqdn'; } + must '../ipv4EndpointAddresses or ../ipv6EndpointAddresses or ../fqdn'; + } leaf fqdn { description "This parameter defines FQDN of the Network Function (See TS 23.003)."; type inet:domain-name; - must '../ipv4EndpointAddresses or ../ipv6EndpointAddresses or ../fqdn'; } + must '../ipv4EndpointAddresses or ../ipv6EndpointAddresses or ../fqdn'; + } } grouping SdRangeGrp { diff --git a/yang-models/_3gpp-5gc-nrm-ausffunction.yang b/yang-models/_3gpp-5gc-nrm-ausffunction.yang index cf478f26f..95e2baa16 100755 --- a/yang-models/_3gpp-5gc-nrm-ausffunction.yang +++ b/yang-models/_3gpp-5gc-nrm-ausffunction.yang @@ -55,7 +55,6 @@ module _3gpp-5gc-nrm-ausffunction { leaf nFSrvGroupId { type string; - mandatory false; config false; yext3gpp:inVariant; yext3gpp:notNotifyable; @@ -116,9 +115,10 @@ module _3gpp-5gc-nrm-ausffunction { list managedNFProfile { key idx; + leaf idx { type uint32 ; } min-elements 1; max-elements 1; - uses types3gpp:ManagedNFProfile; + uses mnfp3gpp:ManagedNFProfileGrp; } list commModelList { diff --git a/yang-models/_3gpp-5gc-nrm-ep.yang b/yang-models/_3gpp-5gc-nrm-ep.yang index 73854e5d4..175fa05a0 100755 --- a/yang-models/_3gpp-5gc-nrm-ep.yang +++ b/yang-models/_3gpp-5gc-nrm-ep.yang @@ -137,13 +137,13 @@ module _3gpp-5gc-nrm-ep { The PLMN Identifier is composed of a Mobile Country Code (MCC) and a Mobile Network Code (MNC)."; uses types3gpp:PLMNId; } - - leaf remoteSeppAddress { + + leaf remoteSeppAddress { description "The host address of the SEPP."; type inet:host; } - leaf remoteSeppId { + leaf remoteSeppId { type uint16; } diff --git a/yang-models/_3gpp-5gc-nrm-seppfunction.yang b/yang-models/_3gpp-5gc-nrm-seppfunction.yang index b85cdb7aa..3be7623d4 100755 --- a/yang-models/_3gpp-5gc-nrm-seppfunction.yang +++ b/yang-models/_3gpp-5gc-nrm-seppfunction.yang @@ -88,7 +88,7 @@ module _3gpp-5gc-nrm-seppfunction { yext3gpp:inVariant; uses types3gpp:PLMNId; } - + leaf sEPPType { type sepp3gpp:SEPPType; yext3gpp:inVariant; diff --git a/yang-models/_3gpp-5gc-nrm-smffunction.yang b/yang-models/_3gpp-5gc-nrm-smffunction.yang index 8349d68b6..19d9ea5fe 100755 --- a/yang-models/_3gpp-5gc-nrm-smffunction.yang +++ b/yang-models/_3gpp-5gc-nrm-smffunction.yang @@ -122,8 +122,8 @@ module _3gpp-5gc-nrm-smffunction { Onboarding capability and User Plane Remote Provisioning. This is used for the case of Onboarding of UEs for SNPNs (see TS 23.501 [2], clauses 5.30.2.10 and 6.2.6.2). - - FALSE: SMF does not support SNPN Onboarding; - - TRUE: SMF supports SNPN Onboarding."; + - FALSE: SMF does not support SNPN Onboarding; + - TRUE: SMF supports SNPN Onboarding."; type boolean; max-elements 1; } @@ -132,8 +132,8 @@ module _3gpp-5gc-nrm-smffunction { Plane Remote Provisioning (UPRP) capability. This is used for the case of Onboarding of UEs for SNPNs , clauses 5.30.2.10 and 6.2.6.2). - - FALSE: SMF does not support UPRP; - - TRUE: SMF supports UPRP."; + - FALSE: SMF does not support UPRP; + - TRUE: SMF supports UPRP."; reference "see TS 23.501 [2]"; type boolean; } diff --git a/yang-models/_3gpp-common-ep-rp.yang b/yang-models/_3gpp-common-ep-rp.yang index 0005480f3..1b12d4c19 100755 --- a/yang-models/_3gpp-common-ep-rp.yang +++ b/yang-models/_3gpp-common-ep-rp.yang @@ -35,7 +35,7 @@ module _3gpp-common-ep-rp { across a reference point between two network entities. For naming the subclasses of EP_RP, the following rules shall apply: - - The name of the subclassed IOC shall have the form 'EP_', + - The name of the subclassed IOC shall have the form 'EP_', where is a string that represents the name of the reference point. Thus, two valid examples of EP_RP subclassed IOC names would be: EP_S1 and EP_X2."; diff --git a/yang-models/_3gpp-common-managementdatacollection.yang b/yang-models/_3gpp-common-managementdatacollection.yang index 04e52aa0f..bd15c8a0e 100644 --- a/yang-models/_3gpp-common-managementdatacollection.yang +++ b/yang-models/_3gpp-common-managementdatacollection.yang @@ -36,11 +36,11 @@ module _3gpp-common-managementdatacollection { grouping ManagementDataGrp { description "This <> defines the management data which is requested. It is a choice between - - a list of data categories (attribute mgtDataCategory) This may include + - a list of data categories (attribute mgtDataCategory) This may include 'COVERAGE', 'CAPACITY', 'MOBILITY', 'ENERGY_EFFICIENCY', 'ACCESSIBILITY' etc. The mapping of exact measurement with the requested category will be done at the producer and is implementation specific. - - a list of management data identified with their name (attribute + - a list of management data identified with their name (attribute 'mgtDataName'). The management data name presents a specific single measurement (e.g. by selecting 'RRU.PrbTotDl', see TS 28.552 or 'immediateMdt.nr.m1', see TS 32.422) or a set of measurements (e.g. @@ -402,19 +402,19 @@ module _3gpp-common-managementdatacollection { For consolidation of file-based management data the attribute consolidateOutput controls: - - True: the MnS Producer will combine the file output from jobs used + - True: the MnS Producer will combine the file output from jobs used to collect the required management data into a single output file as follows: - File is in compressed format, i.e. zip. - - File shall contain individual output files from each configured job + - File shall contain individual output files from each configured job - Each file retains its original filename - - Each file retains it original content - - Consolidated filename uses naming convention defined in, + - Each file retains it original content + - Consolidated filename uses naming convention defined in, TS 28.532 clause 11.3.2.1.4 with the following: - - is a combination of the management data types included in + - is a combination of the management data types included in the consolidated output - - is omitted - - False: the MnS Producer will not combine the output from jobs used to collect the required management data. The MnS Consumer will receive separate output from the derived jobs. + - is omitted + - False: the MnS Producer will not combine the output from jobs used to collect the required management data. The MnS Consumer will receive separate output from the derived jobs. Subject to the reporting method, the MnS Consumer may receive file related notifications. When consolidated output is selected the @@ -442,14 +442,14 @@ module _3gpp-common-managementdatacollection { The MnS producer indicates in the attribute progressStateInfo the state of the management data collection: - - NOT_STARTED + - NOT_STARTED - RUNNING - CANCELING and indicates in the attribute resultStateInfo: - - FINISHED - - FAILED - - PARTIALLY_FAILED - - CANCELLED"; + - FINISHED + - FAILED + - PARTIALLY_FAILED + - CANCELLED"; } } } diff --git a/yang-models/_3gpp-common-mnsregistry.yang b/yang-models/_3gpp-common-mnsregistry.yang index de83f1403..a3464b212 100755 --- a/yang-models/_3gpp-common-mnsregistry.yang +++ b/yang-models/_3gpp-common-mnsregistry.yang @@ -102,15 +102,15 @@ module _3gpp-common-mnsregistry { that can be accessed using the Management Service. These managed object instances can be represented with one of the following options: - - A list of DNs, i.e. representing managed object instances identified + - A list of DNs, i.e. representing managed object instances identified by the DN. - - A list of GeoAreas, i.e. representing managed object instances covered + - A list of GeoAreas, i.e. representing managed object instances covered by the specified geographical areas. In the present document, the geoAreasList is only used for MnS consumer to retrieve MnS scope of the specified MnS instance. - - A list of TAIs, i.e. representing managed object instances covered + - A list of TAIs, i.e. representing managed object instances covered by the specified TAIs."; choice MnsScope { diff --git a/yang-models/_3gpp-nr-nrm-eutrancellrelation.yang b/yang-models/_3gpp-nr-nrm-eutrancellrelation.yang index 8f7d24596..015b86206 100755 --- a/yang-models/_3gpp-nr-nrm-eutrancellrelation.yang +++ b/yang-models/_3gpp-nr-nrm-eutrancellrelation.yang @@ -151,7 +151,7 @@ module _3gpp-nr-nrm-eutrancellrelation { list EUtranCellRelation { description "Represents a relation between an NR cell and an E-UTRAN cell."; - reference "3GPP TS 28.541"; + reference "3GPP TS 28.541"; key id; uses top3gpp:Top_Grp; container attributes { diff --git a/yang-models/_3gpp-nr-nrm-externaleutrancell.yang b/yang-models/_3gpp-nr-nrm-externaleutrancell.yang index 2a5ff1f39..e6f97092e 100755 --- a/yang-models/_3gpp-nr-nrm-externaleutrancell.yang +++ b/yang-models/_3gpp-nr-nrm-externaleutrancell.yang @@ -53,10 +53,10 @@ module _3gpp-nr-nrm-externaleutrancell { uses types3gpp:PLMNId; } - leaf cellLocalId { + leaf cellLocalId { description "Unambiguously identifies a cell within an eNodeB."; reference "NCI defined in 3GPP TS 38.300"; - type int32 {range "0..255"; } + type int32 {range "0..255"; } } leaf eNBId { diff --git a/yang-models/_3gpp-nr-nrm-nrcellrelation.yang b/yang-models/_3gpp-nr-nrm-nrcellrelation.yang index 67d764326..b6bc8290b 100755 --- a/yang-models/_3gpp-nr-nrm-nrcellrelation.yang +++ b/yang-models/_3gpp-nr-nrm-nrcellrelation.yang @@ -39,11 +39,11 @@ module _3gpp-nr-nrm-nrcellrelation { description "Represents the NRCellRelation IOC."; reference "3GPP TS 28.541"; - leaf nRTCI { + leaf nRTCI { description "Target NR Cell Identifier. It consists of NR Cell Identifier (NCI) and Physical Cell Identifier of the target NR cell (nRPCI)."; - type uint64; + type uint64; } container cellIndividualOffset { @@ -53,64 +53,64 @@ module _3gpp-nr-nrm-nrcellrelation { sinrOffsetCSI-RS."; reference "cellIndividualOffset in MeasObjectNR in 3GPP TS 38.331"; - leaf rsrpOffsetSsb { + leaf rsrpOffsetSsb { description "Offset value of rsrpOffsetSSB."; default 0; - type types3gpp:QOffsetRange; + type types3gpp:QOffsetRange; } - leaf rsrqOffsetSsb{ + leaf rsrqOffsetSsb{ description "Offset value of rsrqOffsetSSB."; default 0; - type types3gpp:QOffsetRange; + type types3gpp:QOffsetRange; } - leaf sinrOffsetSsb { + leaf sinrOffsetSsb { description "Offset value of sinrOffsetSSB."; default 0; - type types3gpp:QOffsetRange; + type types3gpp:QOffsetRange; } - leaf rsrpOffsetCsiRs{ + leaf rsrpOffsetCsiRs{ description "Offset value of rsrpOffsetCSI-RS."; default 0; - type types3gpp:QOffsetRange; + type types3gpp:QOffsetRange; } - leaf rsrqOffsetCsiRs { + leaf rsrqOffsetCsiRs { description "Offset value of rsrqOffsetCSI-RS."; default 0; - type types3gpp:QOffsetRange; + type types3gpp:QOffsetRange; } - leaf sinrOffsetCsiRs { + leaf sinrOffsetCsiRs { description "Offset value of sinrOffsetCSI-RS."; default 0; - type types3gpp:QOffsetRange; + type types3gpp:QOffsetRange; } } - leaf nRFreqRelationRef { + leaf nRFreqRelationRef { description "Reference to a corresponding NRFreqRelation instance."; mandatory true; type types3gpp:DistinguishedName; } - leaf adjacentNRCellRef { + leaf adjacentNRCellRef { description "Reference to an adjacent NR cell (NRCellCU or ExternalNRCellCU)."; mandatory true; type types3gpp:DistinguishedName; } - leaf isRemoveAllowed { - type boolean; + leaf isRemoveAllowed { + type boolean; default true; description "True if the ANR function in the node is allowed to remove this relation."; } - leaf isHOAllowed { - type boolean; + leaf isHOAllowed { + type boolean; default true; description "True if handovers are allowed over this relation."; } diff --git a/yang-models/_3gpp-nr-nrm-nrfreqrelation.yang b/yang-models/_3gpp-nr-nrm-nrfreqrelation.yang index f3f80a3d9..4472165a6 100755 --- a/yang-models/_3gpp-nr-nrm-nrfreqrelation.yang +++ b/yang-models/_3gpp-nr-nrm-nrfreqrelation.yang @@ -194,7 +194,7 @@ module _3gpp-nr-nrm-nrfreqrelation { units dB; } - leaf tReselectionNR { + leaf tReselectionNR { description "Cell reselection timer for NR."; reference "TreselectionRAT for NR in 3GPP TS 38.331"; mandatory true; @@ -213,7 +213,7 @@ module _3gpp-nr-nrm-nrfreqrelation { units %; } - leaf tReselectionNRSfMedium { + leaf tReselectionNRSfMedium { description "The attribute tReselectionNr (parameter TreselectionNR in 3GPP TS 38.304) multiplied with this scaling factor if the UE is in medium mobility state."; diff --git a/yang-models/_3gpp-nr-nrm-nrfrequency.yang b/yang-models/_3gpp-nr-nrm-nrfrequency.yang index bd045b52d..91b01d3d4 100755 --- a/yang-models/_3gpp-nr-nrm-nrfrequency.yang +++ b/yang-models/_3gpp-nr-nrm-nrfrequency.yang @@ -62,7 +62,7 @@ module _3gpp-nr-nrm-nrfrequency { } feature NRFrequencyUnderNRNetwork { - description "NRFrequency shall be contained under NRNetwork"; + description "NRFrequency shall be contained under NRNetwork"; } augment "/me3gpp:ManagedElement/gnbcucp3gpp:GNBCUCPFunction/" @@ -72,7 +72,7 @@ module _3gpp-nr-nrm-nrfrequency { } feature NRFrequencyUnderSubNetwork { - description "NRFrequency shall be contained under SubNetwork"; + description "NRFrequency shall be contained under SubNetwork"; } augment "/subnet3gpp:SubNetwork" { diff --git a/yang-models/_3gpp-nr-nrm-nrsectorcarrier.yang b/yang-models/_3gpp-nr-nrm-nrsectorcarrier.yang index 9df2e6d5d..7c48e5965 100755 --- a/yang-models/_3gpp-nr-nrm-nrsectorcarrier.yang +++ b/yang-models/_3gpp-nr-nrm-nrsectorcarrier.yang @@ -101,8 +101,8 @@ module _3gpp-nr-nrm-nrsectorcarrier { instance."; reference "3GPP TS 23.622"; mandatory true; - type types3gpp:DistinguishedName; - } + type types3gpp:DistinguishedName; + } } augment "/me3gpp:ManagedElement/gnbdu3gpp:GNBDUFunction" { diff --git a/yang-models/_3gpp-ns-nrm-sliceprofile.yang b/yang-models/_3gpp-ns-nrm-sliceprofile.yang index 6ba9a70cb..bc6578ef3 100755 --- a/yang-models/_3gpp-ns-nrm-sliceprofile.yang +++ b/yang-models/_3gpp-ns-nrm-sliceprofile.yang @@ -348,7 +348,7 @@ submodule _3gpp-ns-nrm-sliceprofile { } leaf serviceType { description "An attribute specifies the standardized network slice type. - allowedValues: eMBB, URLLC, MIoT, V2X."; + allowedValues: eMBB, URLLC, MIoT, V2X."; type ServiceType-enum; } list deterministicComm { @@ -653,7 +653,7 @@ submodule _3gpp-ns-nrm-sliceprofile { type uint32; } uses ns3cmn3gpp:XLThptGrp; - } + } list dLThptPerUE { description "This attribute defines data rate supported by the network slice per UE, refer NG.116."; @@ -836,7 +836,7 @@ submodule _3gpp-ns-nrm-sliceprofile { } leaf serviceType { description "An attribute specifies the standardized network slice type. - allowedValues: eMBB, URLLC, MIoT, V2X."; + allowedValues: eMBB, URLLC, MIoT, V2X."; type ServiceType-enum; } list deterministicComm { @@ -971,36 +971,36 @@ submodule _3gpp-ns-nrm-sliceprofile { } list CNSliceSubnetProfile { description " This represents the requirements for the top slice associated with the - network slice. "; + network slice. "; key idx; max-elements 1; leaf idx { description "Synthetic index for the element."; type uint32; } - uses TopSliceSubnetProfileGrp; + uses TopSliceSubnetProfileGrp; } list RANSliceSubnetProfile { description " This represents the requirements for the top slice associated with the - network slice. "; + network slice. "; key idx; max-elements 1; leaf idx { description "Synthetic index for the element."; type uint32; } - uses TopSliceSubnetProfileGrp; + uses TopSliceSubnetProfileGrp; } list TopSliceSubnetProfile { description " This represents the requirements for the top slice associated with the - network slice. "; + network slice. "; key idx; max-elements 1; leaf idx { description "Synthetic index for the element."; type uint32; } - uses TopSliceSubnetProfileGrp; + uses TopSliceSubnetProfileGrp; } } } \ No newline at end of file -- GitLab From ed327d25c66c0a34cd671283f2db687ffbb91b83 Mon Sep 17 00:00:00 2001 From: rosabolzek Date: Fri, 25 Jul 2025 19:01:41 +0200 Subject: [PATCH 519/587] move PcfInfo and ProSeCapability to _3gpp-5gc-nrm-pcffunction --- yang-models/_3gpp-5gc-nrm-ausffunction.yang | 1 - yang-models/_3gpp-5gc-nrm-pcffunction.yang | 131 +++++++++++++++++++- 2 files changed, 129 insertions(+), 3 deletions(-) diff --git a/yang-models/_3gpp-5gc-nrm-ausffunction.yang b/yang-models/_3gpp-5gc-nrm-ausffunction.yang index 95e2baa16..15efda5ce 100755 --- a/yang-models/_3gpp-5gc-nrm-ausffunction.yang +++ b/yang-models/_3gpp-5gc-nrm-ausffunction.yang @@ -8,7 +8,6 @@ module _3gpp-5gc-nrm-ausffunction { import _3gpp-common-managed-element { prefix me3gpp; } import ietf-inet-types { prefix inet; } import _3gpp-5g-common-yang-types { prefix types5g3gpp; } - import _3gpp-common-yang-types { prefix types3gpp; } import _3gpp-common-yang-extensions { prefix yext3gpp; } import _3gpp-common-top { prefix top3gpp; } import _3gpp-5gc-nrm-managed-nfprofile { prefix mnfp3gpp; } diff --git a/yang-models/_3gpp-5gc-nrm-pcffunction.yang b/yang-models/_3gpp-5gc-nrm-pcffunction.yang index 673c13acc..725bdbc2e 100755 --- a/yang-models/_3gpp-5gc-nrm-pcffunction.yang +++ b/yang-models/_3gpp-5gc-nrm-pcffunction.yang @@ -10,15 +10,17 @@ module _3gpp-5gc-nrm-pcffunction { import _3gpp-common-yang-types { prefix types3gpp; } import _3gpp-5g-common-yang-types { prefix types5g3gpp; } import _3gpp-common-top { prefix top3gpp; } + import _3gpp-5gc-nrm-managed-nfprofile { prefix mnfp3gpp; } organization "3gpp SA5"; contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464"; description "This IOC represents the PCF function in 5GC. For more information about the PCF, see 3GPP TS 23.501. - Copyright 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + Copyright 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved."; reference "3GPP TS 28.541"; + revision 2025-07-25 { reference CR-1558 ; } revision 2024-05-24 { reference CR-1273 ; } revision 2023-09-18 { reference CR-1043 ; } revision 2023-04-26 { reference CR-0916; } @@ -28,6 +30,117 @@ module _3gpp-5gc-nrm-pcffunction { revision 2019-10-25 { reference "S5-194457 S5-193518"; } revision 2019-05-22 { reference "initial revision"; } + grouping ProSeCapabilityGrp { + leaf proseDirectDiscovery { + type boolean; + description "Indicates support for ProSe Direct Discovery."; + } + leaf proseDirectCommunication { + type boolean; + description "Indicates support for ProSe Direct Communication."; + } + leaf proseL2UetoNetworkRelay { + type boolean; + description "Indicates support for ProSe Layer-2 + UE-to-Network Relay.."; + } + leaf proseL3UetoNetworkRelay { + type boolean; + description "Indicates support for ProSe Layer-3 + UE-to-Network Relay."; + } + leaf proseL2RemoteUe { + type boolean; + description "Indicates support for ProSe Layer-2 + Remote UE."; + } + leaf proseL3RemoteUe { + type boolean; + description "Indicates support for ProSe Layer-3 + Remote UE."; + } + leaf proseL2UetoUeRelay { + type boolean; + description "Indicates support for ProSe Layer-2 + UE-to-UE Relay."; + } + leaf proseL3UetoUeRelay { + type boolean; + description "Indicates support for ProSe Layer-3 + UE-to-UE Relay."; + } + leaf proseL2EndUe { + type boolean; + description "Indicates support for ProSe Layer-2 End UE."; + } + leaf proseL3EndUe { + type boolean; + description "Indicates support for ProSe Layer-3 End UE."; + } + leaf proseL3IntermRelay { + type boolean; + description "Indicates support for ProSe Layer-3 + Intermediate Relay."; + } + leaf proseL3MultihopRemote { + type boolean; + description "Indicates support for ProSe Layer-3 Multihop Remote."; + } + leaf proseL3NetMultihopRelay { + type boolean; + description "Indicates support for ProSe Layer-3 Network Multihop + Relay."; + } + leaf proseL3UeMultihopRelay { + type boolean; + description "Indicates support for ProSe Layer-3 UE Multihop Relay."; + } + leaf proseL3EndUeMultihop { + type boolean; + description "Indicates support for ProSe Layer-3 End UE Multihop."; + } + } + grouping pcfInfoGrp { + + leaf-list dnnList { + description "DNNs supported by the PCF. + If not provided, the PCF can serve any DNN."; + + min-elements 1; + type string; + } + + list supiRanges { + description "List of ranges of SUPIs that can be served by + the PCF instance. If not provided, the PCF can serve any SUPI."; + key "start end pattern"; + min-elements 1; + uses mnfp3gpp:SupiRange; + } + + leaf rxDiamHost { + description "This IE shall be present if the PCF supports Rx interface. + When present, this IE shall indicate the Diameter host + of the Rx interface for the PCF. + Pattern: '^([A-Za-z0-9]+(-[A-Za-z0-9]+).)+[a-z]{2,}$'."; + + type string; + } + + leaf rxDiamRealm { + description "This IE shall be present if the PCF supports Rx interface. + When present, this IE shall indicate the Diameter realm + of the Rx interface for the PCF. + Pattern: '^([A-Za-z0-9]+(-[A-Za-z0-9]+).)+[a-z]{2,}$'."; + + type string; + } + list proseCapability { + description "It indicates the supported ProSe Capability by the PCF."; + uses ProSeCapabilityGrp; + config false; + } + } grouping PCFFunctionGrp { description "Represents the PCFFunction IOC"; uses mf3gpp:ManagedFunctionGrp; @@ -63,10 +176,11 @@ module _3gpp-5gc-nrm-pcffunction { list managedNFProfile { key idx; + leaf idx { type uint32; } min-elements 1; max-elements 1; description "Profile definition of a Managed NF (See TS 23.501)"; - uses types3gpp:ManagedNFProfile; + uses mnfp3gpp:ManagedNFProfileGrp; } list commModelList { min-elements 1; @@ -76,6 +190,19 @@ module _3gpp-5gc-nrm-pcffunction { reference "3GPP TS 23.501"; uses types5g3gpp:CommModel; } + leaf supportedBMOList { + description "It is used to indicate the list of supported BMOs + (Bridge Managed Objects) required for integration with TSN system."; + type string; + } + list pcfInfo { + description "This attribute represents information of a PCF NF Instance. + Multiple pcfInfo may be allowed to define different DNN list for each + supiranges."; + key idx; + leaf idx { type uint32; } + uses pcfInfoGrp; + } leaf dynamic5QISetRef { type types3gpp:DistinguishedName; description "DN of the Dynamic5QISet that the PCFFunction supports -- GitLab From 96814f4fdaa43efaf02aaf4660f1c96e643b93d9 Mon Sep 17 00:00:00 2001 From: rosabolzek Date: Fri, 25 Jul 2025 19:14:28 +0200 Subject: [PATCH 520/587] correct linting errors --- yang-models/_3gpp-5gc-nrm-ausffunction.yang | 2 ++ 1 file changed, 2 insertions(+) diff --git a/yang-models/_3gpp-5gc-nrm-ausffunction.yang b/yang-models/_3gpp-5gc-nrm-ausffunction.yang index 15efda5ce..a47aa8831 100755 --- a/yang-models/_3gpp-5gc-nrm-ausffunction.yang +++ b/yang-models/_3gpp-5gc-nrm-ausffunction.yang @@ -113,6 +113,8 @@ module _3gpp-5gc-nrm-ausffunction { } list managedNFProfile { + description "This data type represents a Profile definition + of a Managed NF"; key idx; leaf idx { type uint32 ; } min-elements 1; -- GitLab From 4ad1556cd4e55b11c0d7b69bdff2767320b5a03f Mon Sep 17 00:00:00 2001 From: "U-ERICSSON\\ETHBLL" Date: Sat, 26 Jul 2025 01:56:36 +0200 Subject: [PATCH 521/587] updated DnnUpfInfoItemGrp and PduSessionType --- yang-models/_3gpp-5gc-nrm-upffunction.yang | 110 ++++++++++++++++++++- 1 file changed, 108 insertions(+), 2 deletions(-) diff --git a/yang-models/_3gpp-5gc-nrm-upffunction.yang b/yang-models/_3gpp-5gc-nrm-upffunction.yang index 226b892d4..afef56593 100755 --- a/yang-models/_3gpp-5gc-nrm-upffunction.yang +++ b/yang-models/_3gpp-5gc-nrm-upffunction.yang @@ -9,7 +9,6 @@ module _3gpp-5gc-nrm-upffunction { import _3gpp-5g-common-yang-types { prefix types5g3gpp; } import _3gpp-common-top { prefix top3gpp; } import _3gpp-common-yang-extensions { prefix yext3gpp; } - import _3gpp-5gc-nrm-neffunction { prefix nef3gpp; } import ietf-inet-types { prefix inet; } organization "3GPP SA5"; @@ -28,6 +27,113 @@ module _3gpp-5gc-nrm-upffunction { revision 2019-05-31 { reference "Ericsson refactoring."; } revision 2018-08-07 { reference "Initial revision"; } + typedef PduSessionType { + type enumeration { + enum IPV4; + enum IPV6; + enum IPV4V6; + enum UNSTRUCTURED; + enum ETHERNET; + } + } + + grouping DnnUpfInfoItemGrp { + leaf dnn { + description "String representing a Data Network."; + mandatory true; + type string; + } + + leaf-list dnaiList { + description "List of Data network access identifiers supported + by the UPF for this DNN. + The absence of this attribute indicates that the UPF + can be selected for this DNN for any DNAI."; + min-elements 1; + type string; //dnai is the type but its only a string with + //desc: DNAI (Data network access identifier), + //is this needed as its own typedef or string is ok + } + + leaf-list pduSessionTypes { + description "List of PDU session type(s) supported by + the UPF for a specific DNN."; + min-elements 1; + type PduSessionType; + } + + list ipv4AddressRanges { + description "This attribute represents a list of ranges of IPv4 addresses + handled by UPF. "; + key idx; + leaf idx { type uint32; } + uses types3gpp:Ipv4AddressRange; + } + + list ipv6PrefixRanges { + description "This attribute represents a list of ranges of IPv6 prefixes + handled by the UPF. "; + key idx; + leaf idx { type uint32; } + uses types3gpp:Ipv6PrefixRange; } + + list natedIpv4AddressRanges { + description "This attribute represents a list of ranges of NATed IPv4 + addresses."; + key idx; + leaf idx { type uint32; } + uses types3gpp:Ipv4AddressRange; + } + + list natedIpv6PrefixRanges { + description "This attribute represents a list of ranges of NATed IPv6 + prefixes."; + key idx; + leaf idx { type uint32; } + uses types3gpp:Ipv6PrefixRange; + } + + leaf-list ipv4IndexList { + type union { + type int32; + type string; + } + description "This attribute represents a list of Ipv4 Index supported by + the UPF. + This <> represents the IP Index to be sent from UDM to the SMF. + (See clause 6.1.6.2.77 TS 29.503) + It is a list of non-exclusive alternatives (Integer or String)."; + } + + leaf-list ipv6IndexList { + type union { + type int32; + type string; + } + description "This attribute represents a list of Ipv6 Index supported + by the UPF. + This <> represents the IP Index to be sent from UDM to the SMF. + (See clause 6.1.6.2.77 TS 29.503) + It is a list of non-exclusive alternatives (Integer or String)."; + } + + leaf networkInstance { + type string; + description "This attribute represents the N6 Network Instance + (See TS 29.244) associated with the S-NSSAI and DNN."; + } + + leaf-list dnaiNwInstanceList { + type string; + description "This attribute represents a map of a network instance per + DNAI for the DNN, where the key of the map is the DNAI (Data network + access identifier), see TS 23.501. + + When present, the value of each entry of the map shall contain a N6 + network instance that is configured for the DNAI indicated by the key."; + } + } + grouping SnssaiUpfInfoItemGrp { list sNssai { description "Supported S-NSSAI."; @@ -43,7 +149,7 @@ module _3gpp-5gc-nrm-upffunction { per DNN."; min-elements 1; key dnn; - uses nef3gpp:DnnInfoItemGrp; + uses DnnUpfInfoItemGrp; } leaf redundantTransport { -- GitLab From bf101b7da4e4f36417865519e240c6b2fef48bb8 Mon Sep 17 00:00:00 2001 From: "U-ERICSSON\\ETHBLL" Date: Mon, 4 Aug 2025 18:48:57 +0200 Subject: [PATCH 522/587] removed thresholdinfo.thresholdlevel --- yang-models/_3gpp-common-measurements.yang | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/yang-models/_3gpp-common-measurements.yang b/yang-models/_3gpp-common-measurements.yang index 27541b18e..2c23d8b18 100755 --- a/yang-models/_3gpp-common-measurements.yang +++ b/yang-models/_3gpp-common-measurements.yang @@ -56,6 +56,7 @@ module _3gpp-common-measurements { Integration Reference Point (IRP); Information Service (IS)"; + revision 2025-08-01 { reference CR-0551; } revision 2025-05-19 { reference CR-0532; } revision 2025-02-07 { reference CR-0461; } revision 2025-01-29 { reference CR-0512; } @@ -103,13 +104,6 @@ module _3gpp-common-measurements { group of vendor specific performance metrics."; } - leaf thresholdLevel { - type uint64; - mandatory true; - description "Number (key) for a single threshold in the threshold list - applicable to the monitored performance metric."; - } - leaf thresholdDirection { type enumeration { enum UP; -- GitLab From c568824ba410aa7254fe28bde130a9eb91ee4b3a Mon Sep 17 00:00:00 2001 From: "U-ERICSSON\\ETHBLL" Date: Mon, 4 Aug 2025 19:57:54 +0200 Subject: [PATCH 523/587] trace small corrections --- yang-models/_3gpp-common-trace.yang | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/yang-models/_3gpp-common-trace.yang b/yang-models/_3gpp-common-trace.yang index 8e94b81ef..bab202a41 100755 --- a/yang-models/_3gpp-common-trace.yang +++ b/yang-models/_3gpp-common-trace.yang @@ -1483,7 +1483,7 @@ module _3gpp-common-trace { reference "clause 5.10.38 of TS 32.422"; } - list areaConfigurationForNeighCells { + list areaConfigurationForNeighCell { when '../../../jobType = "LOGGED_MDT_ONLY"'; key "idx"; leaf idx { type uint32 ; } @@ -1536,7 +1536,7 @@ module _3gpp-common-trace { immediateMdtConfig is applicable. In case of LOGGED_MDT_ONLY or LOGGED_MBSFN_MDT the attribute loggedMdtConfig is applicable."; - leaf anonymizationOfMDTData { + leaf anonymizationOfMdtData { when ../areaScope ; type enumeration { enum NO_IDENTITY; -- GitLab From 604dbe1c91fb54032911fe90df6c686b2c7dbd71 Mon Sep 17 00:00:00 2001 From: "U-ERICSSON\\ETHBLL" Date: Mon, 4 Aug 2025 23:32:24 +0200 Subject: [PATCH 524/587] trace small corrections --- yang-models/_3gpp-common-trace.yang | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/yang-models/_3gpp-common-trace.yang b/yang-models/_3gpp-common-trace.yang index bab202a41..e39fc0f8e 100755 --- a/yang-models/_3gpp-common-trace.yang +++ b/yang-models/_3gpp-common-trace.yang @@ -1767,7 +1767,7 @@ module _3gpp-common-trace { } list traceTarget { - key "targetIdType"; + key "traceTargetType"; max-elements 1; description "It specifies the target object of the Trace, MDT and 5GC UE level measurements collection. The attribute is applicable for @@ -1776,7 +1776,7 @@ module _3gpp-common-trace { reporting or RRC reposring, the traceTarget attribute shall be null value."; - leaf targetIdType { + leaf traceTargetType { type enumeration { enum IMSI; enum IMEI; @@ -1852,7 +1852,7 @@ module _3gpp-common-trace { the subject ManagedEntity."; } - leaf-list targetIdValueList { + leaf-list traceTargetValueList { type string; description "It specifies the ID value(s) of the target object defined by traceTargetType"; -- GitLab From aeac78ffa4546b53e104f9897cbc844762727d04 Mon Sep 17 00:00:00 2001 From: rosabolzek Date: Tue, 5 Aug 2025 15:13:00 +0200 Subject: [PATCH 525/587] move nrf udr and smf from nfprofile --- yang-models/_3gpp-5gc-nrm-nrffunction.yang | 270 ++++++++++++++++++++- yang-models/_3gpp-5gc-nrm-smffunction.yang | 2 +- yang-models/_3gpp-5gc-nrm-udrfunction.yang | 2 +- 3 files changed, 270 insertions(+), 4 deletions(-) diff --git a/yang-models/_3gpp-5gc-nrm-nrffunction.yang b/yang-models/_3gpp-5gc-nrm-nrffunction.yang index f38772db5..83017f42a 100755 --- a/yang-models/_3gpp-5gc-nrm-nrffunction.yang +++ b/yang-models/_3gpp-5gc-nrm-nrffunction.yang @@ -11,7 +11,9 @@ module _3gpp-5gc-nrm-nrffunction { import _3gpp-common-top { prefix top3gpp; } import _3gpp-5g-common-yang-types { prefix types5g3gpp; } import _3gpp-5gc-nrm-managed-nfprofile { prefix mnfp3gpp; } - + import _3gpp-5gc-nrm-udrfunction { prefix udr3gpp; } + import _3gpp-5gc-nrm-udmfunction { prefix udm3gpp; } + import _3gpp-5gc-nrm-ausffunction { prefix ausf3gpp; } organization "3gpp SA5"; contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464"; description "This IOC represents the NRF function in 5GC. @@ -28,6 +30,254 @@ module _3gpp-5gc-nrm-nrffunction { revision 2019-10-28 { reference S5-193518 ; } revision 2019-05-15 { reference "initial revision"; } + grouping NrfInfoGrp { + + list servedUdrInfo { + description "This attribute contains all the udrInfo + attributes + locally configured in the NRF or the NRF received + during NF registration."; + + key nfInstanceId; + leaf nfInstanceId { + description "String uniquely identifying a NF instance."; + type string; + } + + min-elements 1; + uses udr3gpp:UdrInfoGrp; + } + + list servedUdmInfo { + description "This attribute contains all the udmInfo + attributes + locally configured in the NRF or the NRF + received during NF registration."; + + key nfInstanceId; + leaf nfInstanceId { + description "String uniquely identifying a NF instance."; + type string; + } + + min-elements 1; + uses udm3gpp:UdmInfoGrp; + } + + list servedAusfInfo { + description "This attribute contains all the + ausfInfo attributes + locally configured in the NRF or the NRF + received during NF registration."; + + key nfInstanceId; + leaf nfInstanceId { + description "String uniquely identifying a NF instance."; + type string; + } + + min-elements 1; + uses AusfInfoGrp; + } + + list servedAmfInfo { + description "This attribute contains all the amfInfo + attributes + locally configured in the NRF or the NRF received + during NF registration."; + + key nfInstanceId; + leaf nfInstanceId { + description "String uniquely identifying a NF instance."; + type string; + } + + min-elements 1; + uses amfInfo; + } + + list servedSmfInfo { + description "This attribute contains all the smfInfo + attributes + locally configured in the NRF or the NRF received + during NF registration."; + + key nfInstanceId; + leaf nfInstanceId { + description "String uniquely identifying a NF instance."; + type string; + } + + min-elements 1; + uses SmfInfoGrp; + } + + list servedUpfInfo { + description "This attribute contains all the upfInfo + attributes + locally configured in the NRF or the NRF received + during NF registration."; + + key nfInstanceId; + leaf nfInstanceId { + description "String uniquely identifying a NF instance."; + type string; + } + + min-elements 1; + uses upfInfo; + } + + list servedPcfInfo { + description "This attribute contains all the pcfInfo + attributes + locally configured in the NRF or the NRF received + during NF registration."; + + key nfInstanceId; + leaf nfInstanceId { + description "String uniquely identifying a NF instance."; + type string; + } + + min-elements 1; + uses pcfInfo; + } + + list servedBsfInfo { + description "This attribute contains all the bsfInfo + attributes + locally configured in the NRF or the NRF received + during NF registration."; + + key nfInstanceId; + leaf nfInstanceId{ + description "String uniquely identifying a NF instance."; + type string; + } + + min-elements 1; + uses bsfInfo; + } + + list servedChfInfo { + description "This attribute contains all the bsfInfo + attributes + locally configured in the NRF or the NRF received + during NF registration."; + + key nfInstanceId; + leaf nfInstanceId { + description "String uniquely identifying a NF instance."; + type string; + } + + min-elements 1; + uses chfInfo; + } + + list servedNwdafInfo { + description "This attribute contains all the nwdafInfo attributes + locally configured in the NRF or the NRF received during NF + registration. The key of the map is the nfInstanceId of which + the nwdafInfo belongs to."; + + key nfInstanceId; + leaf nfInstanceId { + description "String uniquely identifying a NF instance."; + type string; + } + + min-elements 1; + uses nwdaf3gpp:NwdafInfoGrp; + } + list servedPcscfInfoList { + description "This attribute contains all the pcscfInfo attributes + locally configured in the NRF or the NRF received during NF + registration. The key of the map is the nfInstanceId to which + the map entry belongs to."; + + key nfInstanceId; + leaf nfInstanceId { + description "String uniquely identifying a NF instance."; + type string; + } + + min-elements 1; + uses pcscfInfo; + } + list servedGmlcInfo { + description "This attribute contains all the gmlcInfo attributes + locally configured in the NRF or the NRF received during NF + registration. The key of the map is the nfInstanceId of which + the nefInfo belongs to."; + key nfInstanceId; + leaf nfInstanceId { + description "String uniquely identifying a NF instance."; + type string; + } + + min-elements 1; + uses gmlc3gpp:GmlcInfoGrp; + } + list servedLmfInfo { + description "This attribute contains all the lmfInfo attributes + locally configured in the NRF or the NRF received during NF + registration. The key of the map is the nfInstanceId of which + the lmfInfo belongs to."; + key nfInstanceId; + leaf nfInstanceId { + description "String uniquely identifying a NF instance."; + type string; + } + + min-elements 1; + uses lmf3gpp:LmfInfoGrp; + } + list servedNfInfo { + description "This attribute contains information of other NFs + without corresponding NF type specific Info extensions locally + configured in the NRF or the NRF received during NF registration. + The key of the map is the nfInstanceId of the NF. The map entry + is the NfInfo as defined in clause 5.3.229 representing the + information of a generic NF instance."; + key nfInstanceId; + leaf nfInstanceId { + description "String uniquely identifying a NF instance."; + type string; + } + + min-elements 1; + uses nfInfoGrp; + } + list servedHssInfoList { + description "This attribute contains list of HssInfo attribute + locally configured in the NRF or that the NRF received during NF + registration. The key of the map is the nfInstanceId to which the + map entry belongs to."; + key nfInstanceId; + leaf nfInstanceId { + description "String uniquely identifying a NF instance."; + type string; + } + min-elements 1; + uses HssInfoGrp; + } + list served5gDdnmfInfo { + description "This attribute contains all the 5gDdnmfInfo + attribute locally configured in the NRF or that the NRF + received during NF registration. The key of the map is + the nfInstanceId to which the map entry belongs to."; + key nfInstanceId; + leaf nfInstanceId { + description "String uniquely identifying a NF instance."; + type string; + } + min-elements 1; + uses FiveGDdnmfInfo ; + } + } + grouping NRFFunctionGrp { description "Represents the NRFFunction IOC"; uses mf3gpp:ManagedFunctionGrp; @@ -69,7 +319,23 @@ module _3gpp-5gc-nrm-nrffunction { key "sd sst"; uses types5g3gpp:SNssai; } - + list nrfInfo { + description ""; + key idx; + leaf idx {type uint32;} + uses NrfInfoGrp; + } + list nFProfileList { + description "It is a set of NFProfile(s) to be registered in the NRF + instance. NFProfile is defined in 3GPP TS 29.510 "; + key idx; + leaf idx { type uint32; } + min-elements 1; + max-elements 1; + uses mnfp3gpp:ManagedNFProfileGrp; + description "This parameter defines profile for managed NF"; + reference "3gpp TS 23.501"; + } list managedNFProfile { key idx; leaf idx { type uint32; } diff --git a/yang-models/_3gpp-5gc-nrm-smffunction.yang b/yang-models/_3gpp-5gc-nrm-smffunction.yang index 19d9ea5fe..4a943bdf8 100755 --- a/yang-models/_3gpp-5gc-nrm-smffunction.yang +++ b/yang-models/_3gpp-5gc-nrm-smffunction.yang @@ -29,7 +29,7 @@ module _3gpp-5gc-nrm-smffunction { revision 2018-08-07 { reference "Initial revision";} - grouping smfInfo { + grouping SmfInfoGrp { list sNssaiSmfInfoList { description "List of parameters supported by the SMF per S-NSSAI."; diff --git a/yang-models/_3gpp-5gc-nrm-udrfunction.yang b/yang-models/_3gpp-5gc-nrm-udrfunction.yang index a1a37c312..071eb6df8 100755 --- a/yang-models/_3gpp-5gc-nrm-udrfunction.yang +++ b/yang-models/_3gpp-5gc-nrm-udrfunction.yang @@ -28,7 +28,7 @@ module _3gpp-5gc-nrm-udrfunction { revision 2019-05-22 {reference "initial revision"; } - grouping udrInfo { + grouping UdrInfoGrp { leaf groupId { description "Identity of the UDR group that is served -- GitLab From 76ce2f334d29802b74706075da22504385f34da8 Mon Sep 17 00:00:00 2001 From: rosabolzek Date: Tue, 5 Aug 2025 21:26:29 +0200 Subject: [PATCH 526/587] correct pyang errors --- yang-models/_3gpp-5gc-nrm-nrffunction.yang | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/yang-models/_3gpp-5gc-nrm-nrffunction.yang b/yang-models/_3gpp-5gc-nrm-nrffunction.yang index 83017f42a..a82e3a5f1 100755 --- a/yang-models/_3gpp-5gc-nrm-nrffunction.yang +++ b/yang-models/_3gpp-5gc-nrm-nrffunction.yang @@ -14,6 +14,12 @@ module _3gpp-5gc-nrm-nrffunction { import _3gpp-5gc-nrm-udrfunction { prefix udr3gpp; } import _3gpp-5gc-nrm-udmfunction { prefix udm3gpp; } import _3gpp-5gc-nrm-ausffunction { prefix ausf3gpp; } + import _3gpp-5gc-nrm-amffunction { prefix amf3gpp;} + import _3gpp-5gc-nrm-smffunction { prefix smf3gpp;} + import _3gpp-5gc-nrm-upffunction { prefix upf3gpp;} + import _3gpp-5gc-nrm-pcffunction { prefix pcf3gpp;} + + organization "3gpp SA5"; contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464"; description "This IOC represents the NRF function in 5GC. @@ -77,7 +83,7 @@ module _3gpp-5gc-nrm-nrffunction { } min-elements 1; - uses AusfInfoGrp; + uses ausf3gpp:AusfInfoGrp; } list servedAmfInfo { @@ -93,7 +99,7 @@ module _3gpp-5gc-nrm-nrffunction { } min-elements 1; - uses amfInfo; + uses amf3gpp:AmfInfoGrp; } list servedSmfInfo { @@ -109,7 +115,7 @@ module _3gpp-5gc-nrm-nrffunction { } min-elements 1; - uses SmfInfoGrp; + uses smf3gpp:SmfInfoGrp; } list servedUpfInfo { @@ -125,7 +131,7 @@ module _3gpp-5gc-nrm-nrffunction { } min-elements 1; - uses upfInfo; + uses upf3gpp:UpfInfoGrp; } list servedPcfInfo { @@ -141,7 +147,7 @@ module _3gpp-5gc-nrm-nrffunction { } min-elements 1; - uses pcfInfo; + uses pcf3gpp:pcfInfoGrp; } list servedBsfInfo { -- GitLab From 33c5c4dac0e9ec1c2026901a9d613d0e82a2a539 Mon Sep 17 00:00:00 2001 From: rosabolzek Date: Tue, 5 Aug 2025 22:23:04 +0200 Subject: [PATCH 527/587] moving from nfprofile to nrffunction nd correcting pyang an lint errors --- yang-models/_3gpp-5g-common-yang-types.yang | 192 ++--- .../_3gpp-5gc-nrm-FiveQiDscpMappingSet.yang | 22 +- ...-5gc-nrm-GtpUPathQoSMonitoringControl.yang | 52 +- .../_3gpp-5gc-nrm-QFQoSMonitoringControl.yang | 44 +- yang-models/_3gpp-5gc-nrm-affunction.yang | 16 +- yang-models/_3gpp-5gc-nrm-amffunction.yang | 250 +++--- yang-models/_3gpp-5gc-nrm-amfregion.yang | 30 +- yang-models/_3gpp-5gc-nrm-amfset.yang | 34 +- yang-models/_3gpp-5gc-nrm-anlffunction.yang | 22 +- yang-models/_3gpp-5gc-nrm-ausffunction.yang | 86 +-- .../_3gpp-5gc-nrm-configurable5qiset.yang | 38 +- yang-models/_3gpp-5gc-nrm-dnfunction.yang | 16 +- yang-models/_3gpp-5gc-nrm-dynamic5qiset.yang | 46 +- .../_3gpp-5gc-nrm-ecmconnectioninfo.yang | 140 ++-- yang-models/_3gpp-5gc-nrm-ep.yang | 184 ++--- .../_3gpp-5gc-nrm-externalnrffunction.yang | 16 +- .../_3gpp-5gc-nrm-externalnssffunction.yang | 16 +- .../_3gpp-5gc-nrm-externalseppfunction.yang | 24 +- yang-models/_3gpp-5gc-nrm-gmlcfunction.yang | 226 +++--- yang-models/_3gpp-5gc-nrm-lmffunction.yang | 112 +-- .../_3gpp-5gc-nrm-managed-nfprofile.yang | 282 +++---- yang-models/_3gpp-5gc-nrm-n3iwffunction.yang | 18 +- yang-models/_3gpp-5gc-nrm-neffunction.yang | 178 ++--- yang-models/_3gpp-5gc-nrm-nfprofile.yang | 654 ++++++++-------- yang-models/_3gpp-5gc-nrm-nfservice.yang | 132 ++-- yang-models/_3gpp-5gc-nrm-ngeirfunction.yang | 32 +- yang-models/_3gpp-5gc-nrm-nrffunction.yang | 507 +++++++++++-- yang-models/_3gpp-5gc-nrm-nssffunction.yang | 44 +- yang-models/_3gpp-5gc-nrm-nwdaffunction.yang | 250 +++--- yang-models/_3gpp-5gc-nrm-pcffunction.yang | 87 +-- .../_3gpp-5gc-nrm-predefinedpccruleset.yang | 108 +-- yang-models/_3gpp-5gc-nrm-scpfunction.yang | 24 +- yang-models/_3gpp-5gc-nrm-seppfunction.yang | 58 +- yang-models/_3gpp-5gc-nrm-smffunction.yang | 88 +-- yang-models/_3gpp-5gc-nrm-smsffunction.yang | 28 +- yang-models/_3gpp-5gc-nrm-udmfunction.yang | 94 +-- yang-models/_3gpp-5gc-nrm-udrfunction.yang | 48 +- yang-models/_3gpp-5gc-nrm-udsffunction.yang | 36 +- yang-models/_3gpp-5gc-nrm-upffunction.yang | 282 +++---- yang-models/_3gpp-common-antennafunction.yang | 392 +++++----- yang-models/_3gpp-common-ep-rp.yang | 42 +- yang-models/_3gpp-common-externaldata.yang | 86 +-- yang-models/_3gpp-common-filemanagement.yang | 28 +- yang-models/_3gpp-common-files.yang | 250 +++--- yang-models/_3gpp-common-fm.yang | 190 ++--- yang-models/_3gpp-common-managed-element.yang | 162 ++-- .../_3gpp-common-managed-function.yang | 226 +++--- yang-models/_3gpp-common-management-node.yang | 54 +- ..._3gpp-common-managementdatacollection.yang | 216 +++--- yang-models/_3gpp-common-measurements.yang | 36 +- yang-models/_3gpp-common-mecontext.yang | 4 +- yang-models/_3gpp-common-mnsagent.yang | 44 +- yang-models/_3gpp-common-mnsregistry.yang | 136 ++-- yang-models/_3gpp-common-qmcjob.yang | 116 +-- .../_3gpp-common-sectorequipmentfunction.yang | 174 ++--- yang-models/_3gpp-common-subnetwork.yang | 124 +-- .../_3gpp-common-subscription-control.yang | 344 ++++----- yang-models/_3gpp-common-top.yang | 30 +- yang-models/_3gpp-common-trace.yang | 718 +++++++++--------- yang-models/_3gpp-common-util.yang | 142 ++-- yang-models/_3gpp-common-yang-extensions.yang | 72 +- yang-models/_3gpp-common-yang-types.yang | 608 +++++++-------- .../_3gpp-engy-nrm-energyinformation.yang | 96 +-- yang-models/_3gpp-nr-nrm-beam.yang | 4 +- yang-models/_3gpp-nr-nrm-bwp.yang | 8 +- yang-models/_3gpp-nr-nrm-bwpset.yang | 10 +- yang-models/_3gpp-nr-nrm-cco.yang | 92 +-- .../_3gpp-nr-nrm-cesmanagementfunction.yang | 158 ++-- ...3gpp-nr-nrm-commonbeamformingfunction.yang | 30 +- ...3gpp-nr-nrm-cpciconfigurationfunction.yang | 32 +- .../_3gpp-nr-nrm-danrmanagementfunction.yang | 14 +- .../_3gpp-nr-nrm-desmanagementfunction.yang | 70 +- yang-models/_3gpp-nr-nrm-dlbofunction.yang | 36 +- yang-models/_3gpp-nr-nrm-dmrofunction.yang | 40 +- ...3gpp-nr-nrm-dpciconfigurationfunction.yang | 26 +- ...3gpp-nr-nrm-drachoptimizationfunction.yang | 48 +- yang-models/_3gpp-nr-nrm-ecmappingrule.yang | 38 +- yang-models/_3gpp-nr-nrm-ep.yang | 46 +- .../_3gpp-nr-nrm-eutrancellrelation.yang | 22 +- yang-models/_3gpp-nr-nrm-eutranetwork.yang | 8 +- .../_3gpp-nr-nrm-eutranfreqrelation.yang | 16 +- yang-models/_3gpp-nr-nrm-eutranfrequency.yang | 12 +- .../_3gpp-nr-nrm-externalamffunction.yang | 16 +- .../_3gpp-nr-nrm-externalenbfunction.yang | 12 +- .../_3gpp-nr-nrm-externaleutrancell.yang | 16 +- .../_3gpp-nr-nrm-externalgnbcucpfunction.yang | 20 +- .../_3gpp-nr-nrm-externalgnbcuupfunction.yang | 24 +- .../_3gpp-nr-nrm-externalgnbdufunction.yang | 24 +- .../_3gpp-nr-nrm-externalnrcellcu.yang | 44 +- ...3gpp-nr-nrm-externalservinggwfunction.yang | 10 +- .../_3gpp-nr-nrm-externalupffunction.yang | 10 +- yang-models/_3gpp-nr-nrm-gnbcucpfunction.yang | 120 +-- yang-models/_3gpp-nr-nrm-gnbcuupfunction.yang | 34 +- yang-models/_3gpp-nr-nrm-gnbdufunction.yang | 12 +- yang-models/_3gpp-nr-nrm-mwab.yang | 40 +- yang-models/_3gpp-nr-nrm-nrcellcu.yang | 18 +- yang-models/_3gpp-nr-nrm-nrcelldu.yang | 212 +++--- yang-models/_3gpp-nr-nrm-nrcellrelation.yang | 50 +- yang-models/_3gpp-nr-nrm-nrfreqrelation.yang | 40 +- yang-models/_3gpp-nr-nrm-nrfrequency.yang | 16 +- yang-models/_3gpp-nr-nrm-nrnetwork.yang | 8 +- .../_3gpp-nr-nrm-nroperatorcelldu.yang | 30 +- yang-models/_3gpp-nr-nrm-nrsectorcarrier.yang | 30 +- yang-models/_3gpp-nr-nrm-ntnfunction.yang | 188 ++--- yang-models/_3gpp-nr-nrm-operatordu.yang | 42 +- yang-models/_3gpp-nr-nrm-redcapaccess.yang | 48 +- yang-models/_3gpp-nr-nrm-rimrsset.yang | 288 +++---- yang-models/_3gpp-nr-nrm-rrmpolicy.yang | 134 ++-- yang-models/_3gpp-ns-nrm-common.yang | 22 +- yang-models/_3gpp-ns-nrm-networkslice.yang | 32 +- .../_3gpp-ns-nrm-networkslicesubnet.yang | 140 ++-- yang-models/_3gpp-ns-nrm-serviceprofile.yang | 152 ++-- yang-models/_3gpp-ns-nrm-sliceprofile.yang | 320 ++++---- yang-models/_3gpp-stm-nrm-stmfunction.yang | 98 +-- 114 files changed, 6054 insertions(+), 5712 deletions(-) diff --git a/yang-models/_3gpp-5g-common-yang-types.yang b/yang-models/_3gpp-5g-common-yang-types.yang index f16c83e5c..59ddcb2c3 100755 --- a/yang-models/_3gpp-5g-common-yang-types.yang +++ b/yang-models/_3gpp-5g-common-yang-types.yang @@ -2,16 +2,16 @@ module _3gpp-5g-common-yang-types { yang-version 1.1; namespace "urn:3gpp:sa5:_3gpp-5g-common-yang-types"; prefix "types5g3gpp"; - + import ietf-yang-types { prefix yang; } import ietf-inet-types { prefix inet; } import _3gpp-common-yang-types { prefix types3gpp; } organization "3GPP SA5"; contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464"; - description "The model defines common types for 5G networks and + description "The model defines common types for 5G networks and network slicing. - Copyright 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + Copyright 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved."; reference "3GPP TS 28.541"; @@ -19,13 +19,13 @@ module _3gpp-5g-common-yang-types { revision 2025-03-25 { reference CR-1489 ; } revision 2024-11-01 { reference CR-1405; } revision 2024-10-06 { reference CR-1389; } - revision 2024-05-24 { reference CR-1273 ; } - revision 2023-09-18 { reference CR-1043 ; } + revision 2024-05-24 { reference CR-1273 ; } + revision 2023-09-18 { reference CR-1043 ; } revision 2023-05-10 { reference CR-0916; } revision 2021-08-05 { reference S5-214053/CR-0518; } revision 2020-11-05 { reference CR-0412 ; } revision 2019-10-20 { reference "Initial version."; } - + grouping IpInterfaceGrp { leaf-list ipv4EndpointAddresses { description "Available endpoint IPv4 address(es) of @@ -38,17 +38,17 @@ module _3gpp-5g-common-yang-types { description "Available endpoint IPv6 address(es) of the User Plane interface."; type inet:ipv6-address; - must '../ipv4EndpointAddresses or ../ipv6EndpointAddresses or ../fqdn'; + must '../ipv4EndpointAddresses or ../ipv6EndpointAddresses or ../fqdn'; } leaf fqdn { - description "This parameter defines FQDN of the Network Function + description "This parameter defines FQDN of the Network Function (See TS 23.003)."; type inet:domain-name; - must '../ipv4EndpointAddresses or ../ipv6EndpointAddresses or ../fqdn'; - } + must '../ipv4EndpointAddresses or ../ipv6EndpointAddresses or ../fqdn'; + } } - + grouping SdRangeGrp { leaf start { type string { @@ -56,50 +56,50 @@ module _3gpp-5g-common-yang-types { } mandatory true; description "First value identifying the start of an SD range. - This string shall be formatted as specified for the sd attribute of the + This string shall be formatted as specified for the sd attribute of the Snssai data type in clause 5.4.4.2 of TS 29.571."; } - + leaf end { type string { pattern "[A-Fa-f0-9]{6}"; } mandatory true; description "Last value identifying the end of an SD range. - This string shall be formatted as specified for the sd attribute of the + This string shall be formatted as specified for the sd attribute of the Snssai data type in clause 5.4.4.2 in TS 29.571"; } } - + grouping SnssaiExtensionGrp { list sdRanges { min-elements 1; key "start end"; - description "It shall contain the range(s) of Slice Differentiator values - supported for the Slice/Service Type value indicated in the sst + description "It shall contain the range(s) of Slice Differentiator values + supported for the Slice/Service Type value indicated in the sst attribute of the Snssai data type (see clause 5.4.4.2 in TS 29.571)."; uses SdRangeGrp; } - + leaf wildcardSd { type boolean; default false; - description "It indicates that all SD values are supported for the - Slice/Service Type value indicated in the sst attribute of the Snssai + description "It indicates that all SD values are supported for the + Slice/Service Type value indicated in the sst attribute of the Snssai data type (see clause 5.4.4.2 in TS 29.571)."; } } - + grouping ExtSnssaiGrp { list snssai { - description "It represents the S-NSSAI the NetworkSlice managed object + description "It represents the S-NSSAI the NetworkSlice managed object is supporting. The S-NSSAI is defined in TS 23.003 "; min-elements 1; - max-elements 1; + max-elements 1; key "sd sst"; uses SNssai; } - + list snssaiExtension { description "It represents extensions to the Snssai."; min-elements 1; @@ -109,15 +109,15 @@ module _3gpp-5g-common-yang-types { } } grouping sNssaiSmfInfoItem { - list sNssai { + list sNssai { description "Supported S-NSSAI."; min-elements 1; max-elements 1; key "sst sd"; uses types5g3gpp:SNssai; } - - list dnnSmfInfoList { + + list dnnSmfInfoList { description "List of parameters supported by the SMF per DNN. The absence indicates the DNN can be selected for any DNAI."; min-elements 1; @@ -125,13 +125,13 @@ module _3gpp-5g-common-yang-types { uses DnnSmfInfoItem; } } - + grouping MappedCellIdInfoGrp { - description "This data type represents the mapping relationship between + description "This data type represents the mapping relationship between Mapped Cell IDs and geographical areas (see clause 16.14.5 of TS 38.300"; - + list ntnGeoArea { - description "This attribute indicates a specific geographical location + description "This attribute indicates a specific geographical location mapped to Mapped Cell ID(s)."; min-elements 1; max-elements 1; @@ -139,9 +139,9 @@ module _3gpp-5g-common-yang-types { leaf idx { type uint32; } uses types3gpp:GeoAreaGrp; } - + list mappedCellId { - description "This attribute is in format of NCGI to indicate a fixed + description "This attribute is in format of NCGI to indicate a fixed geographical area (See subclause 16.14.5 in TS 38.300)"; min-elements 1; max-elements 1; @@ -150,66 +150,66 @@ module _3gpp-5g-common-yang-types { uses NcgiGrp; } } - + grouping NcgiGrp { description "Represents the Ncgi datatype"; - + list plmnId { description "This attribute represents a PLMN Identity."; min-elements 1; max-elements 1; key "idx"; leaf idx { type uint32 ; } - uses types3gpp:PLMNId ; + uses types3gpp:PLMNId ; } - + leaf nrCellId { type string; mandatory true; description "This attribute represents NR Cell Identity. - It's a 36-bit string identifying an NR Cell Id as specified in - clause 9.3.1.7 of TS 38.413, in hexadecimal representation. Each - character in the string shall take a value of - '0' to '9', 'a' to 'f' or 'A' to 'F' and shall represent 4 bits. - The most significant character representing the 4 most significant - bits of the Cell Id shall appear first in the string, and the - character representing the 4 least significant bit of the + It's a 36-bit string identifying an NR Cell Id as specified in + clause 9.3.1.7 of TS 38.413, in hexadecimal representation. Each + character in the string shall take a value of + '0' to '9', 'a' to 'f' or 'A' to 'F' and shall represent 4 bits. + The most significant character representing the 4 most significant + bits of the Cell Id shall appear first in the string, and the + character representing the 4 least significant bit of the Cell Id shall appear last in the string. - Pattern: '^[A-Fa-f0-9]{9}$' + Pattern: '^[A-Fa-f0-9]{9}$' Example: An NR Cell Id 0x225BD6007 shall be encoded as '225BD6007'."; } - + leaf nId { type string; mandatory true; - description "Network Identity; Shall be present if PlmnIdNid identifies - an SNPN (see clauses 5.30.2.3, 5.30.2.9, 6.3.4, and 6.3.8 in + description "Network Identity; Shall be present if PlmnIdNid identifies + an SNPN (see clauses 5.30.2.3, 5.30.2.9, 6.3.4, and 6.3.8 in 3GPP TS 23.501."; } } - + typedef NRTAC { type string; - description "This holds the identity of the common Tracking Area Code - for the PLMNs. + description "This holds the identity of the common Tracking Area Code + for the PLMNs. allowedValues: - a) It is the TAC or Extended-TAC. - b) A cell can only broadcast one TAC or Extended-TAC. See TS 36.300, + a) It is the TAC or Extended-TAC. + b) A cell can only broadcast one TAC or Extended-TAC. See TS 36.300, subclause 10.1.7 (PLMNID and TAC relation). c) TAC is defined in subclause 19.4.2.3 of 3GPP TS 23.003 and Extended-TAC is defined in subclause 9.3.1.29 of 3GPP TS 38.473. d) For a 5G SA (Stand Alone), it has a non-null value."; } - + grouping SNssai { - description + description "Single Network Slice Selection Assistance Information(S-NSSAI)"; reference "3GPP TS 23.003"; - + leaf sd { description "Slice Differentiator If not needed, the value can be set to ff:ff:ff."; @@ -218,35 +218,35 @@ module _3gpp-5g-common-yang-types { } reference "3GPP TS 23.003"; } - + leaf sst { type uint8; description "Slice/Service Type. - Values 0 to 127 belong to standardized SST range and are defined in + Values 0 to 127 belong to standardized SST range and are defined in 3GPP TS 23.501. Values 128 to 255 belong to operator-specific range."; } } - + grouping PlmnIdNid { - description "Represents the SCP domain specific information as defined + description "Represents the SCP domain specific information as defined in TS 29.510 "; uses types3gpp:PLMNId; - + leaf nid { type string; - description "This attribute represents network Identity; - Shall be present if PlmnIdNid identifies an SNPN. + description "This attribute represents network Identity; + Shall be present if PlmnIdNid identifies an SNPN. (see clauses 5.30.2.3, 5.30.2.9, 6.3.4, and 6.3.8 in TS 23.501"; } } grouping PLMNInfo { - description "The PLMNInfo data type define a S-NSSAI member in a specific - PLMNId, and it have two attributes PLMNId and S-NSSAI (PLMNId, S-NSSAI). - The PLMNId represents a data type that is comprised of mcc - (mobile country code) and mnc (mobile network code), (See TS 23.003 - subclause 2.2 and 12.1) and S-NSSAI represents an data type, that is - comprised of an SST (Slice/Service type) and an optional + description "The PLMNInfo data type define a S-NSSAI member in a specific + PLMNId, and it have two attributes PLMNId and S-NSSAI (PLMNId, S-NSSAI). + The PLMNId represents a data type that is comprised of mcc + (mobile country code) and mnc (mobile network code), (See TS 23.003 + subclause 2.2 and 12.1) and S-NSSAI represents an data type, that is + comprised of an SST (Slice/Service type) and an optional SD (Slice Differentiator) field"; uses types3gpp:PLMNId; uses SNssai; @@ -262,38 +262,38 @@ module _3gpp-5g-common-yang-types { enum DIRECT_COMMUNICATION_WITH_NRF { value 1; - description "Directly communicate to other NF service discovered + description "Directly communicate to other NF service discovered by NRF."; } enum INDIRECT_COMMUNICATION_WO_DEDICATED_DISCOVERY { value 2; - description "Communicate to pre-configured other NF service through + description "Communicate to pre-configured other NF service through SCP as a proxy."; } enum INDIRECT_COMMUNICATION_WITH_DEDICATED_DISCOVERY { value 3; - description "Communication to NF service discovered by NRF through SCP + description "Communication to NF service discovered by NRF through SCP as a proxy."; } } } - + grouping CommModel { leaf groupId { - type uint16; + type uint16; } leaf commModelType { type CommModelType; - } - leaf-list targetNFServiceList { - type types3gpp:DistinguishedName; + } + leaf-list targetNFServiceList { + type types3gpp:DistinguishedName; } leaf commModelConfiguration { type string; - } + } } grouping TaiRangeGrp { list plmnId { @@ -303,8 +303,8 @@ module _3gpp-5g-common-yang-types { key "mcc mnc"; uses types3gpp:PLMNId; } - - list tacRangeList { + + list tacRangeList { description "The range of the TACs."; min-elements 1; key "start end"; @@ -314,31 +314,31 @@ module _3gpp-5g-common-yang-types { grouping TacRange { leaf start { - description "First value identifying the start of a TAC range, + description "First value identifying the start of a TAC range, to be used when the range of TAC's can be represented as a hexadecimal range (e.g., TAC ranges)."; type string { pattern '^([A-Fa-f0-9]{4}|[A-Fa-f0-9]{6}$)'; } } - + leaf end { - description "Last value identifying the end of a TAC range, + description "Last value identifying the end of a TAC range, to be used when the range of TAC's can be represented as a hexadecimal range (e.g. TAC ranges)."; type string { pattern '^([A-Fa-f0-9]{4}|[A-Fa-f0-9]{6})$'; } } - + leaf nRTACpattern { - description "Pattern (regular expression according to the ECMA-262) - representing the set of TAC's belonging to this range. - A TAC value is considered part of the range if and only if the + description "Pattern (regular expression according to the ECMA-262) + representing the set of TAC's belonging to this range. + A TAC value is considered part of the range if and only if the TAC string fully matches the regular expression."; type string; } - } + } grouping DnnSmfInfoItem { leaf dnn { description "Supported DNN."; @@ -347,21 +347,21 @@ module _3gpp-5g-common-yang-types { } leaf-list dnaiList { - description "List of Data network access identifiers supported by + description "List of Data network access identifiers supported by the SMF for this DNN. The absence of this attribute indicates that the SMF can be selected for this DNN for any DNAI."; min-elements 1; type string; } - } - + } + grouping SupportedFunc { leaf function { - type string; + type string; } leaf policy { type string; - } + } } typedef EnergySavingLoadThresholdT { @@ -379,14 +379,14 @@ module _3gpp-5g-common-yang-types { } typedef PhysCellID { - type uint32 { - range "0..1007"; + type uint32 { + range "0..1007"; } reference "clause 7.4.2 of TS 38.211"; } typedef UTC24TimeOfDayT { - description "Time of day in HH:MM or H:MM 24-hour format per UTC + description "Time of day in HH:MM or H:MM 24-hour format per UTC time zone."; type string { pattern "(([01]?[0-9])|(2[0-3])):([0-5][0-9])"; diff --git a/yang-models/_3gpp-5gc-nrm-FiveQiDscpMappingSet.yang b/yang-models/_3gpp-5gc-nrm-FiveQiDscpMappingSet.yang index 0a1adaef4..03dbf5acb 100755 --- a/yang-models/_3gpp-5gc-nrm-FiveQiDscpMappingSet.yang +++ b/yang-models/_3gpp-5gc-nrm-FiveQiDscpMappingSet.yang @@ -1,22 +1,22 @@ module _3gpp-5gc-nrm-FiveQiDscpMappingSet { yang-version 1.1; - + namespace urn:3gpp:sa5:_3gpp-5gc-nrm-FiveQiDscpMappingSet; prefix FiveQiDscpMapping3gpp; - + import _3gpp-common-top { prefix top3gpp; } import _3gpp-common-managed-element { prefix me3gpp; } import _3gpp-5gc-nrm-smffunction { prefix smf3gpp; } - + organization "3gpp SA5"; contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464"; description " This IOC represents the set of mapping between 5QIs and DSCP. - Copyright 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + Copyright 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved."; reference "3GPP TS 28.541"; - revision 2025-01-25 { reference CR-1442 ; } - revision 2023-09-18 { reference CR-1043 ; } + revision 2025-01-25 { reference CR-1442 ; } + revision 2023-09-18 { reference CR-1043 ; } revision 2020-08-03 { reference "CR-0321"; } revision 2020-05-27 { reference "CR-0287"; } @@ -28,7 +28,7 @@ module _3gpp-5gc-nrm-FiveQiDscpMappingSet { min-elements 1; description " Identifies the 5QI values that are mapped to a same DSCP"; } - + leaf dscp { type uint32 { range 0..255 ; @@ -44,7 +44,7 @@ module _3gpp-5gc-nrm-FiveQiDscpMappingSet { key "dscp"; uses FiveQiDscpMapping; } - } + } grouping FiveQiDscpMappingSetSubtree { list FiveQiDscpMappingSet { @@ -54,10 +54,10 @@ module _3gpp-5gc-nrm-FiveQiDscpMappingSet { container attributes { uses FiveQiDscpMappingSetGrp; } - } + } } - + augment "/me3gpp:ManagedElement/smf3gpp:SMFFunction" { uses FiveQiDscpMappingSetSubtree; - } + } } \ No newline at end of file diff --git a/yang-models/_3gpp-5gc-nrm-GtpUPathQoSMonitoringControl.yang b/yang-models/_3gpp-5gc-nrm-GtpUPathQoSMonitoringControl.yang index b649d0bb0..d7d2c1217 100755 --- a/yang-models/_3gpp-5gc-nrm-GtpUPathQoSMonitoringControl.yang +++ b/yang-models/_3gpp-5gc-nrm-GtpUPathQoSMonitoringControl.yang @@ -1,30 +1,30 @@ module _3gpp-5gc-nrm-GtpUPathQoSMonitoringControl { yang-version 1.1; - + namespace urn:3gpp:sa5:_3gpp-5gc-nrm-GtpUPathQoSMonitoringControl; prefix gtpUPathQMCtrl3gpp; - + import _3gpp-common-managed-element { prefix me3gpp; } import _3gpp-5g-common-yang-types { prefix types5g3gpp; } import _3gpp-5gc-nrm-smffunction { prefix smf3gpp; } 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 capabilities and properties for control + description "This IOC represents the capabilities and properties for control of GTP-U path QoS monitoring defined in 3GPP TS 23.501. - Copyright 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + Copyright 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved."; reference "3GPP TS 28.541"; - revision 2023-09-18 { reference CR-1043 ; } + revision 2023-09-18 { reference CR-1043 ; } revision 2020-11-05 { reference CR-0412 ; } revision 2020-09-30 { reference "CR-0393"; } revision 2020-08-03 { reference "CR-0321"; } revision 2020-04-10 { reference "S5-202103"; } grouping GtpUPathDelayThresholdsType { - description "Thresholds for reporting the packet delay for GTP-U path QoS + description "Thresholds for reporting the packet delay for GTP-U path QoS monitoring "; reference "3GPP TS 29.244"; leaf n3AveragePacketDelayThreshold { @@ -64,22 +64,22 @@ module _3gpp-5gc-nrm-GtpUPathQoSMonitoringControl { enum DISABLED; } } - + list gtpUPathMonitoredSNSSAIs { key "sd sst"; - description "The S-NSSAIs for which the the GTP-U path QoS monitoring is + description "The S-NSSAIs for which the the GTP-U path QoS monitoring is to be performed."; reference "3GPP TS 23.003"; uses types5g3gpp:SNssai; } - + leaf-list monitoredDSCPs { description "The DSCPs for which the GTP-U path QoS monitoring is to be performed."; reference "3GPP TS 29.244"; type uint32; } - + leaf isEventTriggeredGtpUPathMonitoringSupported { description "It indicates whether the event triggered GTP-U path QoS monitoring reporting based on thresholds is supported."; @@ -87,52 +87,52 @@ module _3gpp-5gc-nrm-GtpUPathQoSMonitoringControl { reference "3GPP TS 29.244"; type boolean; } - + leaf isPeriodicGtpUMonitoringSupported { - description "It indicates whether the periodic GTP-U path QoS monitoring + description "It indicates whether the periodic GTP-U path QoS monitoring reporting is supported."; mandatory true; reference "3GPP TS 29.244"; type boolean; } - + leaf isImmediateGtpUMonitoringSupported { - description "It indicates whether the immediate GTP-U path QoS monitoring + description "It indicates whether the immediate GTP-U path QoS monitoring reporting is supported."; mandatory true; reference "3GPP TS 29.244"; type boolean; } - + list gtpUPathDelayThresholds { - key n3AveragePacketDelayThreshold; + key n3AveragePacketDelayThreshold; // if max-elements is increased later, the key may need to be modified min-elements 1; max-elements 1; - description "It specifies the thresholds for reporting the packet delay + description "It specifies the thresholds for reporting the packet delay for the GTO-U path QoS monitoring."; uses GtpUPathDelayThresholdsType; } - + leaf gtpUPathMinimumWaitTime { - description "It specifies the minimum waiting time (in seconds) between - two consecutive reports for event triggered GTP-U path QoS monitoring + description "It specifies the minimum waiting time (in seconds) between + two consecutive reports for event triggered GTP-U path QoS monitoring reporting."; type uint32; } - + leaf gtpUPathMeasurementPeriod { - description "It specifies the period (in seconds) for reporting the packet + description "It specifies the period (in seconds) for reporting the packet delay for GTP-U path QoS monitoring."; type uint32; } - } + } augment "/me3gpp:ManagedElement/smf3gpp:SMFFunction" { list GtpUPathQoSMonitoringControl { - description "Specifies the capabilities and properties for control of - GTP-U path QoS monitoring. For more information about the GTP-U path + description "Specifies the capabilities and properties for control of + GTP-U path QoS monitoring. For more information about the GTP-U path QoS monitoring."; reference "3GPP TS 23.501"; key id; diff --git a/yang-models/_3gpp-5gc-nrm-QFQoSMonitoringControl.yang b/yang-models/_3gpp-5gc-nrm-QFQoSMonitoringControl.yang index 3294c01f8..964dfc475 100755 --- a/yang-models/_3gpp-5gc-nrm-QFQoSMonitoringControl.yang +++ b/yang-models/_3gpp-5gc-nrm-QFQoSMonitoringControl.yang @@ -1,25 +1,25 @@ module _3gpp-5gc-nrm-QFQoSMonitoringControl { yang-version 1.1; - + namespace urn:3gpp:sa5:_3gpp-5gc-nrm-QFQoSMonitoringControl; prefix qFQMCtrl3gpp; - + import _3gpp-common-managed-element { prefix me3gpp; } import _3gpp-5gc-nrm-smffunction { prefix smf3gpp; } import _3gpp-common-top { prefix top3gpp; } import _3gpp-5g-common-yang-types { prefix types5g3gpp; } - organization "3gpp SA5"; + organization "3gpp SA5"; contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464"; - description "This IOC represents the capabilities and properties for control - of QoS monitoring per QoS flow per UE for URLLC service defined - + description "This IOC represents the capabilities and properties for control + of QoS monitoring per QoS flow per UE for URLLC service defined + in 3GPP TS 23.501. - Copyright 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + Copyright 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved."; reference "3GPP TS 28.541"; - revision 2023-09-18 { reference CR-1043 ; } + revision 2023-09-18 { reference CR-1043 ; } revision 2023-04-26 { reference CR-0916; } revision 2020-11-08 { reference CR-0412 ; } revision 2020-08-03 { reference "CR-0321"; } @@ -58,41 +58,41 @@ in 3GPP TS 23.501. enum DISABLED; } } - + list qFMonitoredSNSSAIs { description "The S-NSSAIs for which the QoS monitoring per QoS flow per UE is to be performed."; reference "3GPP TS 23.003"; key "sd sst"; uses types5g3gpp:SNssai;} - + leaf-list qFMonitored5QIs { - description "The 5QIs for which the QoS monitoring per QoS flow + description "The 5QIs for which the QoS monitoring per QoS flow per UE is to be performed."; reference "3GPP TS 23.501"; type uint32 { range "0..255"; } } - + leaf isEventTriggeredQFMonitoringSupported { - description "It indicates whether the event based QoS monitoring + description "It indicates whether the event based QoS monitoring reporting per QoS flow per UE is supported."; mandatory true; reference "3GPP TS 29.244"; type boolean; } - + leaf isPeriodicQFMonitoringSupported { - description "It indicates whether the periodic QoS monitoring reporting + description "It indicates whether the periodic QoS monitoring reporting per QoS flow per UE is supported."; mandatory true; reference "3GPP TS 29.244"; type boolean; } - + leaf isSessionReleasedQFMonitoringSupported { - description "It indicates whether the session release based QoS monitoring + description "It indicates whether the session release based QoS monitoring reporting per QoS flow per UE is supported."; mandatory true; reference "3GPP TS 29.244"; @@ -103,7 +103,7 @@ in 3GPP TS 23.501. key "idx"; min-elements 1; max-elements 1; - description "It specifies the thresholds for reporting the packet delay + description "It specifies the thresholds for reporting the packet delay between PSA and UE for QoS monitoring per QoS flow per UE."; leaf idx { type uint32 ; } @@ -112,17 +112,17 @@ in 3GPP TS 23.501. leaf qFMinimumWaitTime { description "It specifies the minimum waiting time (in seconds) between - two consecutive reports for event triggered QoS monitoring reporting + two consecutive reports for event triggered QoS monitoring reporting per QoS flow per UE."; type uint32; } - + leaf qFMeasurementPeriod { - description "It specifies the period (in seconds) for reporting the + description "It specifies the period (in seconds) for reporting the packet delay for QoS monitoring per QoS flow per UE."; type uint32; } - } + } augment "/me3gpp:ManagedElement/smf3gpp:SMFFunction" { diff --git a/yang-models/_3gpp-5gc-nrm-affunction.yang b/yang-models/_3gpp-5gc-nrm-affunction.yang index f3ec73762..2cc577c4b 100755 --- a/yang-models/_3gpp-5gc-nrm-affunction.yang +++ b/yang-models/_3gpp-5gc-nrm-affunction.yang @@ -1,31 +1,31 @@ module _3gpp-5gc-nrm-affunction { yang-version 1.1; - + namespace urn:3gpp:sa5:_3gpp-5gc-nrm-affunction; prefix af3gpp; - + import _3gpp-common-managed-function { prefix mf3gpp; } import _3gpp-common-managed-element { prefix me3gpp; } 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 is defined only to describe the IOCs representing its interaction interface with 5GC (i.e. EP_Rx and EP_N5). It has no attributes defined. - Copyright 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + Copyright 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved."; reference "3GPP TS 28.541"; - - revision 2023-09-18 { reference CR-1043 ; } + + revision 2023-09-18 { reference CR-1043 ; } revision 2023-04-26 { reference CR-0916; } revision 2019-10-28 { reference S5-193518 ; } revision 2019-05-15 {reference "initial revision"; } - + grouping AFFunctionGrp { uses mf3gpp:ManagedFunctionGrp; } - + augment "/me3gpp:ManagedElement" { list AFFunction { description "5G Core AF Function"; diff --git a/yang-models/_3gpp-5gc-nrm-amffunction.yang b/yang-models/_3gpp-5gc-nrm-amffunction.yang index 4fe06e700..92fd61bbb 100755 --- a/yang-models/_3gpp-5gc-nrm-amffunction.yang +++ b/yang-models/_3gpp-5gc-nrm-amffunction.yang @@ -11,38 +11,38 @@ module _3gpp-5gc-nrm-amffunction { import ietf-yang-types { prefix yang; } import _3gpp-common-top { prefix top3gpp; } import _3gpp-nr-nrm-ntnfunction { prefix ntn3gpp; } - + organization "3gpp SA5"; contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464"; description "AMFFunction derived from basic ManagedFunction. - Copyright 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + Copyright 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved."; reference "3GPP TS 28.541 5G Network Resource Model (NRM)"; - revision 2025-03-25 { reference "CR-1489 CR-1512" ; } + revision 2025-03-25 { reference "CR-1489 CR-1512" ; } revision 2024-11-01 { reference CR-1405; } revision 2024-10-06 { reference CR-1389; } revision 2024-04-04 { reference CR-1139; } - revision 2023-09-18 { reference CR-1043 ; } + revision 2023-09-18 { reference CR-1043 ; } revision 2022-01-07 { reference CR-0643; } revision 2020-11-06 { reference CR-0412 ; } revision 2019-10-25 { reference "S5-194457 S5-193518"; } revision 2019-05-31 { reference "Ericsson refactoring."; } revision 2018-08-07 { reference "Initial revision"; } - + grouping NTNGlobalRanNodeIDGrp{ - + list pLMNId { description "The PLMN Identifier is composed of - a Mobile Country Code (MCC) and + a Mobile Country Code (MCC) and a Mobile Network Code (MNC)."; min-elements 1; max-elements 1; key "mcc mnc"; uses types3gpp:PLMNId; } - + choice GlobalRanNodeID{ description "Unique identifier of an NG-RAN node."; reference "3GPP TS 38.413"; @@ -64,7 +64,7 @@ module _3gpp-5gc-nrm-amffunction { -[A-Fa-f0-9]{5})$'; } description "This represents the identifier of - the ng-eNB ID as specified in + the ng-eNB ID as specified in clause 9.3.1.8 of 3GPP TS 38.413."; mandatory true; } @@ -75,12 +75,12 @@ module _3gpp-5gc-nrm-amffunction { type string{ pattern '^[A-Fa-f0-9]+$'; } - description "This IE shall contain the N3IWF + description "This IE shall contain the N3IWF identifier received over NGAP and - shall be encoded as a string of + shall be encoded as a string of hexadecimal characters."; mandatory true; - } + } } case TNGF{ @@ -95,7 +95,7 @@ module _3gpp-5gc-nrm-amffunction { mandatory true; } } - + case TWIF{ leaf TWIFID{ type string; @@ -113,7 +113,7 @@ module _3gpp-5gc-nrm-amffunction { } description "This represents the identifier of the W-AGF ID as specified in - clause 9.3.1.162 of 3GPP TS 38.413 + clause 9.3.1.162 of 3GPP TS 38.413 in hexadecimal representation."; mandatory true; } @@ -167,72 +167,72 @@ module _3gpp-5gc-nrm-amffunction { grouping GUAMInfoGrp { description "Represents the GUAMInfo datatype."; - + list pLMNId { description "This attribute represents a PLMN Identity."; min-elements 1; max-elements 1; key "idx"; leaf idx { type uint32 ; } - uses types3gpp:PLMNId ; + uses types3gpp:PLMNId ; } - + leaf aMFIdentifier { type int64; - description "The AMFI is constructed from an AMF Region ID, an - AMF Set ID and an AMF Pointer. The AMF Region ID identifies the region, - the AMF Set ID uniquely identifies the AMF Set within the AMF Region, - and the AMF Pointer uniquely identifies the AMF within the AMF Set. + description "The AMFI is constructed from an AMF Region ID, an + AMF Set ID and an AMF Pointer. The AMF Region ID identifies the region, + the AMF Set ID uniquely identifies the AMF Set within the AMF Region, + and the AMF Pointer uniquely identifies the AMF within the AMF Set. (Ref. 3GPP TS 23.003)"; } } grouping N2InterfaceAmfInfoGrp { description "Represents the N2InterfaceAmfInfo datatype."; - + leaf-list ipv4EndpointAddress { type inet:ipv4-address; min-elements 1; - description "This attribute represents available AMF endpoint + description "This attribute represents available AMF endpoint IPv4 address(es) for N2."; } - + leaf-list ipv6EndpointAddress { type inet:ipv6-address; min-elements 1; - description "This attribute represents available AMF endpoint + description "This attribute represents available AMF endpoint IPv6 address(es) for N2."; } - + leaf amfName { type inet:host-name; - description "This attribute represents AMF Name FQDN as defined in + description "This attribute represents AMF Name FQDN as defined in clause 28.3.2.5 of TS 23.003."; - } + } } - + grouping BlockedLocationInfoGrp { description "Repreasents the datatype BlockedLocationInfo"; - + list blockedLocation { - description "This provides the geographical location at which the PLMN + description "This provides the geographical location at which the PLMN are not allowed in case of NTN."; min-elements 1; max-elements 1; key "mnc mcc"; - uses types3gpp:PLMNId ; + uses types3gpp:PLMNId ; } - + list blockedDurWindow { - description "This provides the time durations for which the PLMN are + description "This provides the time durations for which the PLMN are not allowed at a given location in case of NTN"; key idx; leaf idx { type uint32 ; } uses types3gpp:TimeWindowGrp; } - + list blockedSlice { - description "This provides the slice for which the access is + description "This provides the slice for which the access is not allowed at a given location in case of NTN. "; max-elements 1; key idx; @@ -241,60 +241,60 @@ module _3gpp-5gc-nrm-amffunction { uses types5g3gpp:SNssai; } } - + grouping NTNPLMNRestrictionsInfoGrp { description "Represents the datatype NTNPLMNRestrictionsInfo"; - + list pLMNId { description "This attribute represents a PLMN Identity."; min-elements 1; max-elements 1; key "mnc mcc"; - uses types3gpp:PLMNId ; + uses types3gpp:PLMNId ; } - + list blockedLocationInfoList { - description "This defines the information related with the location + description "This defines the information related with the location for which the access restrictions are to be applied in case of NTN."; key "idx"; leaf idx { type uint32 ; } uses BlockedLocationInfoGrp; } } - + grouping NtnLocationInfoGrp { description "Represents the NtnLocationInfo datatype."; - + list location { - description "This defines the Location (geographical area) under + description "This defines the Location (geographical area) under consideration to which the satellite coverage info belongs"; key idx; leaf idx { type uint32 ; } - uses types3gpp:GeoAreaGrp; + uses types3gpp:GeoAreaGrp; } - + list availabilityWindows { - description "This attribute defines the list of time windows at which - the satellite coverage will be available for this location. + description "This attribute defines the list of time windows at which + the satellite coverage will be available for this location. Either availabilityWindows or nonAvailabilityWindows shall be present."; key idx; leaf idx { type uint32 ; } uses types3gpp:TimeWindowGrp; } - + list nonAvailabilityWindows { - description "This attribute defines the list of time windows at which - the satellite coverage will not be available for this location. + description "This attribute defines the list of time windows at which + the satellite coverage will not be available for this location. Either availabilityWindows or nonAvailabilityWindows shall be present."; key idx; leaf idx { type uint32 ; } uses types3gpp:TimeWindowGrp; } } - + grouping SatelliteCoverageInfoGrp { description "Represents the datatype SatelliteCoverageInfo"; - + leaf nRSatelliteRATtype { type enumeration { enum NRLEO; @@ -302,23 +302,23 @@ module _3gpp-5gc-nrm-amffunction { enum NRGEO; enum NROTHERSAT; } - description "This attribute defines the RAT Type for NR satellite + description "This attribute defines the RAT Type for NR satellite access."; } - + list locationInfo { - description "This attribute defines the information about location and - corresponding time windows for which the satellite coverage will be + description "This attribute defines the information about location and + corresponding time windows for which the satellite coverage will be available or unavailable."; key idx; leaf idx { type uint32 ; } uses NtnLocationInfoGrp; } } - + grouping SliceExpiryInfoGrp { description "Represents the datatype SliceExpiryInfo"; - + list pLMNInfo { min-elements 1; // ??? config false; @@ -327,76 +327,76 @@ module _3gpp-5gc-nrm-amffunction { leaf idx { type uint32 ; } uses types5g3gpp:PLMNInfo; } - + leaf expiryTime { type yang:date-and-time; config false; - description "This attribute provides information about the time at - which the slice is scheduled to be expired as it is not required + description "This attribute provides information about the time at + which the slice is scheduled to be expired as it is not required anymore. - This attribute will be set based on the sliceAvailability coming as + This attribute will be set based on the sliceAvailability coming as part of ServiceProfile."; } } - + grouping MappedCellIdInfoGrp { description "Represents the datatype MappedCellIdInfo"; - + list ntnGeoArea { - description "This attribute indicates a specific geographical location + description "This attribute indicates a specific geographical location mapped to Mapped Cell ID(s)."; min-elements 1; max-elements 1; key "idx"; leaf idx { type uint32 ; } - uses types3gpp:GeoAreaGrp; + uses types3gpp:GeoAreaGrp; } - + list mappedCellId { - description "This attribute is in format of NCGI to indicate a fixed + description "This attribute is in format of NCGI to indicate a fixed geographical area (See subclause 16.14.5 in TS 38.300"; min-elements 1; max-elements 1; key "idx"; leaf idx { type uint32 ; } - uses types5g3gpp:NcgiGrp; - } + uses types5g3gpp:NcgiGrp; + } } - + grouping AmfInfoGrp { description "Represents the data type AmfInfo."; - + leaf amfRegionId { type int64; mandatory true; - description "It represents the AMF Region ID, which identifies the + description "It represents the AMF Region ID, which identifies the region. AllowedValues: defined in subclause 2.10.1 of 3GPP TS 23.003 "; } - + leaf amfSetId { type int64; mandatory true; - description "It represents the AMF Set ID, which is uniquely identifies + description "It represents the AMF Set ID, which is uniquely identifies the AMF Set within the AMF Region. allowedValues: defined in subclause 2.10.1 of 3GPP TS 23.003"; } - + list taiList { min-elements 1; description "The list of TAIs."; key "idx"; leaf idx { type uint32 ; } - uses types3gpp:TaiGrp; + uses types3gpp:TaiGrp; } - + list taiRangeList { min-elements 1; description "The range of TAIs."; key "idx"; leaf idx { type uint32 ; } - uses types5g3gpp:TaiRangeGrp; + uses types5g3gpp:TaiRangeGrp; } - + list gUAMIdList { description "List of supported Globally Unique AMF Ids (GUAMIs)."; config false; @@ -405,60 +405,60 @@ module _3gpp-5gc-nrm-amffunction { leaf idx { type uint32 ; } uses GUAMInfoGrp; } - + list backupInfoAmfFailure { - description "List of GUAMIs for which the AMF acts as a backup for AMF + description "List of GUAMIs for which the AMF acts as a backup for AMF failure."; min-elements 1; key "idx"; leaf idx { type uint32 ; } uses GUAMInfoGrp; } - + list backupInfoAmfRemoval { - description "List of GUAMIs for which the AMF acts as a backup for + description "List of GUAMIs for which the AMF acts as a backup for planned AMF removal."; min-elements 1; key "idx"; leaf idx { type uint32 ; } uses GUAMInfoGrp; } - + list n2InterfaceAmfInfo { - description "This attribute represents the N2 interface information of + description "This attribute represents the N2 interface information of the AMF. "; max-elements 1; key "idx"; leaf idx { type uint32 ; } uses N2InterfaceAmfInfoGrp; } - + leaf amfOnboardingCapability { type boolean; default false; - description "This attribute indicates the AMF supports SNPN Onboarding - capability. This is used for the case of Onboarding of UEs for SNPNs + description "This attribute indicates the AMF supports SNPN Onboarding + capability. This is used for the case of Onboarding of UEs for SNPNs (see TS 23.501, clause 5.30.2.10). - FALSE: AMF does not support SNPN Onboarding; - TRUE: AMF supports SNPN Onboarding."; } - + leaf highLatencyCom { type boolean; - description "This attribute indicates whether the AMF supports High - Latency communication (e.g. for NR RedCap UE). This is used for CP NF - to discover AMF supporting High Latency communication (see TS 23.501, + description "This attribute indicates whether the AMF supports High + Latency communication (e.g. for NR RedCap UE). This is used for CP NF + to discover AMF supporting High Latency communication (see TS 23.501, clause 6.3.5). - - FALSE: AMF does not support High Latency communication e.g. for + - FALSE: AMF does not support High Latency communication e.g. for NR RedCap UE; - TRUE: AMF supports High Latency communication e.g. for NR RedCap UE;"; } } - + grouping AMFFunctionGrp { description "Represents the AMFFunction IOC. - This IOC contains instances of NTNTimeBasedConfig to support - time-based configuration of the following NTN related entities: + This IOC contains instances of NTNTimeBasedConfig to support + time-based configuration of the following NTN related entities: AMFFunction and EP_N2."; uses mf3gpp:ManagedFunctionGrp; @@ -472,26 +472,26 @@ module _3gpp-5gc-nrm-amffunction { container aMFIdentifier { description "An AMF identifier, comprising an AMF Region ID, an - AMF Set ID and an AMF Pointer."; + AMF Set ID and an AMF Pointer."; uses types3gpp:AmfIdentifier; } leaf sBIFQDN { - description "The FQDN of the registered NF instance in the + description "The FQDN of the registered NF instance in the service-based interface."; type inet:domain-name; } leaf-list cNSIIdList { type string; - description "It is a set of NSI ID. NSI ID is an identifier for - identifying the Core Network part of a Network Slice instance when - multiple Network Slice instances of the same Network Slice are deployed, - and there is a need to differentiate between them in the 5GC. - See NSI ID definition in clause 3.1 of TS 23.501 and + description "It is a set of NSI ID. NSI ID is an identifier for + identifying the Core Network part of a Network Slice instance when + multiple Network Slice instances of the same Network Slice are deployed, + and there is a need to differentiate between them in the 5GC. + See NSI ID definition in clause 3.1 of TS 23.501 and subclause 6.1.6.2.7 of TS 29.531"; } - + list managedNFProfile { key idx; min-elements 1; @@ -503,7 +503,7 @@ module _3gpp-5gc-nrm-amffunction { list commModelList { min-elements 1; key "groupId"; - description "Specifies a list of commModel. It can be used by NF and + description "Specifies a list of commModel. It can be used by NF and NF services to interact with each other in 5G Core network "; reference "3GPP TS 23.501"; uses types5g3gpp:CommModel; @@ -511,37 +511,37 @@ module _3gpp-5gc-nrm-amffunction { list amfInfo { max-elements 1; - description "This attribute represents information of an AMF + description "This attribute represents information of an AMF NF Instance."; key "idx"; leaf idx { type uint32 ; } uses AmfInfoGrp; } - + list nTNPLMNRestrictionsList { - description "This attribute defines the location restrictions per PLMN + description "This attribute defines the location restrictions per PLMN that relates to non-terrestrial network access."; key "idx"; leaf idx { type uint32 ; } uses NTNPLMNRestrictionsInfoGrp; } - + list satelliteCoverageInfoList { - description "This attribute defines the information related to NR + description "This attribute defines the information related to NR Satellite RAT type and corresponding information of satellite coverage"; key "idx"; leaf idx { type uint32 ; } uses SatelliteCoverageInfoGrp; } - + list sliceExpiryInfo { - description "This provides information related to a network slice + description "This provides information related to a network slice validity."; key "idx"; leaf idx { type uint32 ; } uses SliceExpiryInfoGrp; } - + list satelliteBackhaulInfoList{ description "Specifies a list of satellite backhaul information. It can be used by NF and NF services."; @@ -569,18 +569,18 @@ module _3gpp-5gc-nrm-amffunction { } description "represents a list of MDT measurement names that are subject to user consent at MDT activation. - Any MDT measurement, whose name is not specified in this list, is not + Any MDT measurement, whose name is not specified in this list, is not subject to user consent at MDT activation."; } - + list mappedCellIdInfoList { - description "It provides the list of mapping between GEO area and + description "It provides the list of mapping between GEO area and Mapped Cell ID."; key "idx"; leaf idx { type uint32 ; } uses MappedCellIdInfoGrp; } - + leaf aMFSetRef { type types3gpp:DistinguishedName; description "This is the DN of AMFSet"; @@ -595,15 +595,15 @@ module _3gpp-5gc-nrm-amffunction { } } } - + augment "/me3gpp:ManagedElement" { list AMFFunction { - description "This IOC represents the AMF functionality in 5GC. - For more information about the AMF, see 3GPP TS 23.501. + description "This IOC represents the AMF functionality in 5GC. + For more information about the AMF, see 3GPP TS 23.501. - The attribute sliceExpiryInfo is used when the validity information of - a network slice need to be configured. The attribute - sliceExpiryInfo.pLMNInfo indicates the network slice to which the + The attribute sliceExpiryInfo is used when the validity information of + a network slice need to be configured. The attribute + sliceExpiryInfo.pLMNInfo indicates the network slice to which the validity information applies."; key id; uses top3gpp:Top_Grp; diff --git a/yang-models/_3gpp-5gc-nrm-amfregion.yang b/yang-models/_3gpp-5gc-nrm-amfregion.yang index f44940dac..2c55c01e2 100755 --- a/yang-models/_3gpp-5gc-nrm-amfregion.yang +++ b/yang-models/_3gpp-5gc-nrm-amfregion.yang @@ -2,7 +2,7 @@ module _3gpp-5gc-nrm-amfregion { yang-version 1.1; namespace urn:3gpp:sa5:_3gpp-5gc-nrm-amfregion; prefix amfr3gpp; - + import _3gpp-common-yang-types { prefix types3gpp; } import _3gpp-common-subnetwork { prefix subnet3gpp; } import _3gpp-common-top { prefix top3gpp; } @@ -13,25 +13,25 @@ module _3gpp-5gc-nrm-amfregion { contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464"; description "This IOC represents the AMF Region which consists one or multiple AMF Sets. - Copyright 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + Copyright 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved."; reference "3GPP TS 28.541 5G Network Resource Model (NRM)"; - revision 2024-05-24 { reference CR-1273 ; } - revision 2023-09-18 { reference CR-1043 ; } + revision 2024-05-24 { reference CR-1273 ; } + revision 2023-09-18 { reference CR-1043 ; } revision 2022-01-07 { reference CR-0643; } revision 2020-11-06 { reference CR-0412 ; } revision 2019-10-28 { reference S5-193518 ; } revision 2019-06-11 { reference ""; } - + grouping AMFRegionGrp { description "Represents the AMFRegion IOC"; uses mf3gpp:ManagedFunctionGrp; - + list pLMNIdList { - description "List of at most six entries of PLMN Identifiers, but at + description "List of at most six entries of PLMN Identifiers, but at least one (the primary PLMN Id). - The PLMN Identifier is composed of a Mobile Country Code (MCC) + The PLMN Identifier is composed of a Mobile Country Code (MCC) and a Mobile Network Code (MNC)."; min-elements 1; @@ -39,40 +39,40 @@ module _3gpp-5gc-nrm-amfregion { key "mcc mnc"; uses types3gpp:PLMNId; } - + leaf-list nRTACList { - description "List of Tracking Area Codes (legacy TAC or extended TAC) + description "List of Tracking Area Codes (legacy TAC or extended TAC) where the represented management function is serving."; reference "TS 38.413 clause 9.3.3.10"; min-elements 1; config false; type types5g3gpp:NRTAC; } - + list sNSSAIList { description "List of S-NSSAIs the managed object is capable of supporting. (Single Network Slice Selection Assistance Information) - An S-NSSAI has an SST (Slice/Service type) and an optional SD + An S-NSSAI has an SST (Slice/Service type) and an optional SD (Slice Differentiator) field."; //conditional support only if the network slicing feature is supported. reference "3GPP TS 23.003"; key "sd sst"; uses types5g3gpp:SNssai; } - + leaf aMFRegionId { description "Represents the AMF Region ID, which identifies the region."; mandatory true; type types3gpp:AmfRegionId; } - + leaf-list aMFSet { description "The AMFSet that the AFMRegion is associated with."; min-elements 1; type instance-identifier; } } - + augment "/subnet3gpp:SubNetwork" { list AMFRegion { description "5G Core AMFRegion IOC"; diff --git a/yang-models/_3gpp-5gc-nrm-amfset.yang b/yang-models/_3gpp-5gc-nrm-amfset.yang index 9473afee3..0aee9223a 100755 --- a/yang-models/_3gpp-5gc-nrm-amfset.yang +++ b/yang-models/_3gpp-5gc-nrm-amfset.yang @@ -2,35 +2,35 @@ module _3gpp-5gc-nrm-amfset { yang-version 1.1; namespace urn:3gpp:sa5:_3gpp-5gc-nrm-amfset; prefix amfset3gpp; - + import _3gpp-common-yang-types { prefix types3gpp; } import _3gpp-common-subnetwork { prefix subnet3gpp; } import _3gpp-common-top { prefix top3gpp; } import _3gpp-common-managed-function { prefix mf3gpp; } import _3gpp-5g-common-yang-types { prefix types5g3gpp; } - + organization "3gpp SA5"; contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464"; - description "This IOC represents the AMF Set which consists of some AMFs + description "This IOC represents the AMF Set which consists of some AMFs that serve a given area and Network Slice. - Copyright 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + Copyright 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved."; reference "3GPP TS 28.541 5G Network Resource Model (NRM)"; - revision 2024-05-24 { reference CR-1273 ; } - revision 2023-09-18 { reference CR-1043 ; } + revision 2024-05-24 { reference CR-1273 ; } + revision 2023-09-18 { reference CR-1043 ; } revision 2022-01-07 { reference CR-0643; } revision 2020-11-06 { reference CR-0412 ; } revision 2019-10-28 { reference S5-193518 ; } revision 2019-06-11 { reference "Ericsson refactoring."; } - + grouping AMFSetGrp { description "Represents the AMFSet IOC"; uses mf3gpp:ManagedFunctionGrp; - + list pLMNIdList { - description "List of at most six entries of PLMN Identifiers, but at - least one (the primary PLMN Id). The PLMN Identifier is composed + description "List of at most six entries of PLMN Identifiers, but at + least one (the primary PLMN Id). The PLMN Identifier is composed of a Mobile Country Code (MCC) and a Mobile Network Code (MNC)."; min-elements 1; @@ -38,32 +38,32 @@ module _3gpp-5gc-nrm-amfset { key "mcc mnc"; uses types3gpp:PLMNId; } - + leaf-list nRTACList { - description "List of Tracking Area Codes (legacy TAC or extended TAC) + description "List of Tracking Area Codes (legacy TAC or extended TAC) where the represented management function is serving."; reference "TS 38.413 clause 9.3.3.10"; min-elements 1; config false; type types5g3gpp:NRTAC; } - + list sNSSAIList { description "List of S-NSSAIs the managed object is capable of supporting. (Single Network Slice Selection Assistance Information) - An S-NSSAI has an SST (Slice/Service type) and an optional SD + An S-NSSAI has an SST (Slice/Service type) and an optional SD (Slice Differentiator) field."; //conditional support only if the network slicing feature is supported. reference "3GPP TS 23.003"; key "sd sst"; uses types5g3gpp:SNssai; } - + leaf aMFRegion { description "The AMFRegion that the AFMSet is associated with."; type instance-identifier; } - + leaf-list aMFSetMemberList { description "List of DNs of AMFFunction instances of the AMFSet."; min-elements 1; @@ -71,7 +71,7 @@ module _3gpp-5gc-nrm-amfset { type types3gpp:DistinguishedName; } } - + augment "/subnet3gpp:SubNetwork" { list AMFSet { description "5G Core AMFSet IOC"; diff --git a/yang-models/_3gpp-5gc-nrm-anlffunction.yang b/yang-models/_3gpp-5gc-nrm-anlffunction.yang index 3bb52fcdd..8064d0e54 100644 --- a/yang-models/_3gpp-5gc-nrm-anlffunction.yang +++ b/yang-models/_3gpp-5gc-nrm-anlffunction.yang @@ -1,28 +1,28 @@ module _3gpp-5gc-nrm-anlffunction { yang-version 1.1; - + namespace urn:3gpp:sa5:_3gpp-5gc-nrm-anlffunction; prefix anlf3gpp; - + import _3gpp-common-managed-element { prefix me3gpp; } import _3gpp-common-top { prefix top3gpp; } import _3gpp-5gc-nrm-nwdaffunction { prefix nwdaf3gpp; } 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 AnLF function in 5GC. For more information about the AnLF, see 3GPP TS 23.288. - Copyright 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + Copyright 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved."; reference "3GPP TS 28.541"; - + revision 2024-08-07 { reference CR-1331; } revision 2023-11-03 { reference "initial revision"; } - + grouping AnLFFunctionGrp { description "Represents the AnLFFunction IOC"; - uses top3gpp:Top_Grp; + uses top3gpp:Top_Grp; leaf activationStatus { type enumeration { enum ACTIVATED; @@ -35,16 +35,16 @@ module _3gpp-5gc-nrm-anlffunction { type types3gpp:DistinguishedName; description "This attribute holds a DN list of MLModel ¨ (See TS 28.105)."; - config false; + config false; } leaf-list aIMLInferenceFunctionRefList { type types3gpp:DistinguishedName; description "This attribute holds a DN list of AIMLInferenceFunction (See TS 28.105) ."; - config false; - } + config false; + } } - + augment "/me3gpp:ManagedElement/nwdaf3gpp:NWDAFFunction" { list AnLFFunction { description "5G Core AnLF contained by NWDAF"; diff --git a/yang-models/_3gpp-5gc-nrm-ausffunction.yang b/yang-models/_3gpp-5gc-nrm-ausffunction.yang index a47aa8831..3f02fd5ae 100755 --- a/yang-models/_3gpp-5gc-nrm-ausffunction.yang +++ b/yang-models/_3gpp-5gc-nrm-ausffunction.yang @@ -1,9 +1,9 @@ module _3gpp-5gc-nrm-ausffunction { yang-version 1.1; - + namespace urn:3gpp:sa5:_3gpp-5gc-nrm-ausffunction; prefix ausf3gpp; - + import _3gpp-common-managed-function { prefix mf3gpp; } import _3gpp-common-managed-element { prefix me3gpp; } import ietf-inet-types { prefix inet; } @@ -11,93 +11,93 @@ module _3gpp-5gc-nrm-ausffunction { import _3gpp-common-yang-extensions { prefix yext3gpp; } import _3gpp-common-top { prefix top3gpp; } import _3gpp-5gc-nrm-managed-nfprofile { prefix mnfp3gpp; } - + organization "3gpp SA5"; contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464"; - description "This IOC represents the AUSF function in 5GC. For more + description "This IOC represents the AUSF function in 5GC. For more information about the AUSF, see 3GPP TS 23.501. - Copyright 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + Copyright 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved."; reference "3GPP TS 28.541"; - - revision 2023-09-18 { reference CR-1043 ; } + + revision 2023-09-18 { reference CR-1043 ; } revision 2022-01-07 { reference CR-0643; } revision 2020-11-06 { reference CR-0412 ; } revision 2019-10-25 { reference "S5-194457 S5-193518"; } revision 2019-05-22 {reference "initial revision"; } - + grouping AusfInfoGrp { - description "Represents the information of an AUSF NF Instance + description "Represents the information of an AUSF NF Instance (see TS 29.510)."; grouping SuciInfoGrp { - description "This data type represents SUCI information containing + description "This data type represents SUCI information containing Routing Indicator and Home Network Public Key ID. (See TS 29.510)"; - + leaf-list routingInds { type string; min-elements 1; - description "It indicates served Routing Indicator (see TS 23.003, - clause 2.2B). If not provided, the AUSF/UDM + description "It indicates served Routing Indicator (see TS 23.003, + clause 2.2B). If not provided, the AUSF/UDM can serve any Routing Indicator."; } - + leaf-list hNwPubKeyIds { type int64; min-elements 1; - description "It indicating served Home Network Public Key - (see TS 23.003, clause 2.2B). If not provided, the AUSF/UDM + description "It indicating served Home Network Public Key + (see TS 23.003, clause 2.2B). If not provided, the AUSF/UDM can serve any public key."; } } - + leaf nFSrvGroupId { type string; config false; yext3gpp:inVariant; yext3gpp:notNotifyable; - description "This parameter defines identity of the group that is + description "This parameter defines identity of the group that is served by the NF instance (See TS 29.510)."; } - - list supiRanges { - description "It represents list of ranges of SUPIs that can be served + + list supiRanges { + description "It represents list of ranges of SUPIs that can be served by the PCF instance."; key idx; leaf idx { type uint32 ; } - uses mnfp3gpp:SupiRange; + uses mnfp3gpp:SupiRangeGrp; } - + leaf-list routingIndicators { - description "This attribute represents a list of Routing Indicator - information that allows to route network signalling with SUCI + description "This attribute represents a list of Routing Indicator + information that allows to route network signalling with SUCI (see TS 23.003 [13]) to the AUSF instance. If not provided, the AUSF can serve any Routing Indicator."; type string { pattern "[0-9]{1,4}"; } } - + list suciInfos { - description "This attribute represents a list of SuciInfo. A SUCI - that matches this information can be served by the AUSF. - A SUCI that matches all attributes of at least one entry in this + description "This attribute represents a list of SuciInfo. A SUCI + that matches this information can be served by the AUSF. + A SUCI that matches all attributes of at least one entry in this array shall be considered as a match of this information."; key idx; leaf idx { type uint32 ; } uses SuciInfoGrp; - } + } } - + grouping AUSFFuntionGrp { description "Represents the AUSFFuntion IOC"; uses mf3gpp:ManagedFunctionGrp; - + list pLMNInfoList { - description "List of at most six entries of PLMN Identifiers, but at + description "List of at most six entries of PLMN Identifiers, but at least one (the primary PLMN Id). - The PLMN Identifier is composed of a Mobile Country Code (MCC) and + The PLMN Identifier is composed of a Mobile Country Code (MCC) and a Mobile Network Code (MNC)."; min-elements 1; @@ -105,15 +105,15 @@ module _3gpp-5gc-nrm-ausffunction { leaf idx { type uint32 ; } uses types5g3gpp:PLMNInfo; } - + leaf sBIFQDN { - description "The FQDN of the registered NF instance in the + description "The FQDN of the registered NF instance in the service-based interface."; type inet:domain-name; } - + list managedNFProfile { - description "This data type represents a Profile definition + description "This data type represents a Profile definition of a Managed NF"; key idx; leaf idx { type uint32 ; } @@ -121,18 +121,18 @@ module _3gpp-5gc-nrm-ausffunction { max-elements 1; uses mnfp3gpp:ManagedNFProfileGrp; } - + list commModelList { min-elements 1; key "groupId"; - description "Specifies a list of commModel. It can be used by NF and + description "Specifies a list of commModel. It can be used by NF and NF services to interact with each other in 5G Core network "; reference "3GPP TS 23.501"; uses types5g3gpp:CommModel; } - + list ausfInfo { - description "It represents the information of an AUSF NF Instance + description "It represents the information of an AUSF NF Instance (see TS 29.510)"; key idx; min-elements 1; @@ -141,7 +141,7 @@ module _3gpp-5gc-nrm-ausffunction { uses AusfInfoGrp; } } - + augment "/me3gpp:ManagedElement" { list AUSFFunction { description "5G Core AUSF Function"; diff --git a/yang-models/_3gpp-5gc-nrm-configurable5qiset.yang b/yang-models/_3gpp-5gc-nrm-configurable5qiset.yang index 26f68b810..466ec1c19 100755 --- a/yang-models/_3gpp-5gc-nrm-configurable5qiset.yang +++ b/yang-models/_3gpp-5gc-nrm-configurable5qiset.yang @@ -2,25 +2,25 @@ module _3gpp-5gc-nrm-configurable5qiset { yang-version 1.1; namespace urn:3gpp:sa5:_3gpp-5gc-nrm-configurable5qiset; prefix conf5QIs3gpp; - + 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 configurable 5QIs, including - their QoS characteristics, that need to be pre-configured + description "This IOC represents the configurable 5QIs, including + their QoS characteristics, that need to be pre-configured (and configurable) to the 5G NFs. The 5QI set definition supports multiple deployment scenarios. The sets can be name contained by SubNetwork ManagedElement, GNBDUFunction, GNBCUUPFunction and GNBCUCPFunction. Sets are then referenced by attribute - (configurable5QISetRef) in applicable MOIs. For consistency it is + (configurable5QISetRef) in applicable MOIs. For consistency it is recommended that referenced 5QI sets be defined within the same subtree. - Copyright 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + Copyright 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved."; reference "3GPP TS 28.541"; - revision 2023-09-18 { reference CR-1043 ; } + revision 2023-09-18 { reference CR-1043 ; } revision 2022-11-02 { reference "CR-0753" ; } revision 2022-07-28 { reference "CR-0770"; } revision 2022-04-29 { reference "CR-0729"; } @@ -34,7 +34,7 @@ module _3gpp-5gc-nrm-configurable5qiset { range 0..9 ; } mandatory true; - description "The Packet Error Rate of a 5QI expressed as Scalar x 10-k + description "The Packet Error Rate of a 5QI expressed as Scalar x 10-k where k is the Exponent."; } leaf exponent { @@ -42,7 +42,7 @@ module _3gpp-5gc-nrm-configurable5qiset { range 0..9 ; } mandatory true; - description "The Packet Error Rate of a 5QI expressed as Scalar x 10-k, + description "The Packet Error Rate of a 5QI expressed as Scalar x 10-k, where k is the Exponent."; } } @@ -63,10 +63,10 @@ module _3gpp-5gc-nrm-configurable5qiset { enum NON_GBR; } mandatory true; - description "It indicates the Resource Type of a 5QI, as specified + description "It indicates the Resource Type of a 5QI, as specified in TS 23.501 "; } - + leaf priorityLevel { type uint32 { range 0..127 ; @@ -75,16 +75,16 @@ module _3gpp-5gc-nrm-configurable5qiset { description "It indicates the Priority Level of a 5QI, as specified in TS 23.501."; } - + leaf packetDelayBudget { type uint32 { range 0..1023 ; } mandatory true; - description "Indicates the Packet Delay Budget (in unit of 0.5ms)of a 5QI, + description "Indicates the Packet Delay Budget (in unit of 0.5ms)of a 5QI, as specified in TS 23.501 "; } - + list packetErrorRate { key "scalar exponent"; min-elements 1; @@ -102,7 +102,7 @@ module _3gpp-5gc-nrm-configurable5qiset { units ms; reference "TS 23.501"; } - + leaf maximumDataBurstVolume { type uint32{ range 0..4095 ; @@ -126,13 +126,13 @@ module _3gpp-5gc-nrm-configurable5qiset { container attributes { uses FiveQICharacteristicsGrp; } - } - } + } + } grouping Configurable5QISetSubtree { list Configurable5QISet { - description "Specifies the non-standardized 5QIs, including their QoS - characteristics, that need to be pre-configured (and configurable) to + description "Specifies the non-standardized 5QIs, including their QoS + characteristics, that need to be pre-configured (and configurable) to the 5G NFs, see 3GPP TS 23.501."; key id; uses top3gpp:Top_Grp; diff --git a/yang-models/_3gpp-5gc-nrm-dnfunction.yang b/yang-models/_3gpp-5gc-nrm-dnfunction.yang index fb3a27d25..307fe7b0d 100755 --- a/yang-models/_3gpp-5gc-nrm-dnfunction.yang +++ b/yang-models/_3gpp-5gc-nrm-dnfunction.yang @@ -1,32 +1,32 @@ module _3gpp-5gc-nrm-dnfunction { yang-version 1.1; - + namespace urn:3gpp:sa5_3gpp-5gc-nrm-dnfunction; prefix dn3gpp; - + import _3gpp-common-managed-function { prefix mf3gpp; } import _3gpp-common-managed-element { prefix me3gpp; } import _3gpp-common-top { prefix top3gpp; } - + organization "3gpp SA5"; description "This IOC is defined only to describe the IOCs representing Data Network (DN) interaction interface with 5GC (i.e. EP_N6). It has no attributes defined. - Copyright 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + Copyright 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved."; reference "3GPP TS 28.541"; - - revision 2023-09-18 { reference CR-1043 ; } + + revision 2023-09-18 { reference CR-1043 ; } revision 2019-10-28 { reference S5-193518 ; } revision 2019-05-15 { description "initial revision"; } - + grouping DNFunctionGrp { uses mf3gpp:ManagedFunctionGrp; } - + augment "/me3gpp:ManagedElement" { list DNFunction { description "5G Core DN Function"; diff --git a/yang-models/_3gpp-5gc-nrm-dynamic5qiset.yang b/yang-models/_3gpp-5gc-nrm-dynamic5qiset.yang index 9e3a4a1c0..77c52679c 100755 --- a/yang-models/_3gpp-5gc-nrm-dynamic5qiset.yang +++ b/yang-models/_3gpp-5gc-nrm-dynamic5qiset.yang @@ -2,7 +2,7 @@ module _3gpp-5gc-nrm-dynamic5qiset { yang-version 1.1; namespace urn:3gpp:sa5:_3gpp-5gc-nrm-dynamic5qiset; prefix dyn5QIs3gpp; - + import _3gpp-common-top { prefix top3gpp; } import _3gpp-common-subnetwork { prefix subnet3gpp; } import _3gpp-common-managed-element { prefix me3gpp; } @@ -10,17 +10,17 @@ module _3gpp-5gc-nrm-dynamic5qiset { import _3gpp-nr-nrm-gnbcucpfunction { prefix gnbcucp3gpp; } import _3gpp-nr-nrm-gnbcuupfunction { prefix gnbcuup3gpp; } import _3gpp-5gc-nrm-configurable5qiset { prefix Conf5QIs3gpp; } - + organization "3gpp SA5"; contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464"; - description "This IOC represents the dynamic 5QIs including their QoS + description "This IOC represents the dynamic 5QIs including their QoS characteristics. - Copyright 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + Copyright 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved."; reference "3GPP TS 28.541"; - revision 2025-03-25 { reference CR-1489 ; } - revision 2023-09-18 { reference CR-1043 ; } + revision 2025-03-25 { reference CR-1489 ; } + revision 2023-09-18 { reference CR-1043 ; } revision 2022-07-28 { reference "CR-0770"; } revision 2022-01-07 { reference CR-0643; } revision 2020-10-01 { reference "CR-0393"; } @@ -29,10 +29,10 @@ module _3gpp-5gc-nrm-dynamic5qiset { grouping Dynamic5QISetGrp { description "Represents the Dynamic5QISet IOC."; list dynamic5QIs { - description "This IOC specifies the dynamically assigned 5QIs - including their QoS characteristics, see 3GPP TS 23.501. - The instance of this IOC shall not be created or modified by the - MnS consumer except for the instance associated to + description "This IOC specifies the dynamically assigned 5QIs + including their QoS characteristics, see 3GPP TS 23.501. + The instance of this IOC shall not be created or modified by the + MnS consumer except for the instance associated to PCFFunction MOI or SMFFunction MOI when the PCF is not deployed."; key id; uses top3gpp:Top_Grp; @@ -40,12 +40,12 @@ module _3gpp-5gc-nrm-dynamic5qiset { uses Conf5QIs3gpp:FiveQICharacteristicsGrp; } } - } + } grouping Dynamic5QISetSubtree { description "Helps augmenting Dynamic5QISet into multiple places."; list Dynamic5QISet { - description "Specifies the dynamic 5QIs including their QoS + description "Specifies the dynamic 5QIs including their QoS characteristics, see 3GPP TS 23.501."; key "id"; uses top3gpp:Top_Grp; @@ -53,46 +53,46 @@ module _3gpp-5gc-nrm-dynamic5qiset { uses Dynamic5QISetGrp; } uses Conf5QIs3gpp:FiveQICharacteristicsSubtree; - } + } } - + feature Dynamic5QISetUnderSubNetwork { - description "Dynamic5QISet shall be contained under SubNetwork."; + description "Dynamic5QISet shall be contained under SubNetwork."; } - augment "/subnet3gpp:SubNetwork" { + augment "/subnet3gpp:SubNetwork" { if-feature Dynamic5QISetUnderSubNetwork; uses Dynamic5QISetSubtree; } feature Dynamic5QISetUnderManagedElement { - description "Dynamic5QISet shall be contained under ManagedElement."; + description "Dynamic5QISet shall be contained under ManagedElement."; } augment "/me3gpp:ManagedElement" { if-feature Dynamic5QISetUnderManagedElement; uses Dynamic5QISetSubtree; } - + feature Dynamic5QISetUnderGNBDUFunction { - description "Dynamic5QISet shall be contained under GNBDUFunction."; + description "Dynamic5QISet shall be contained under GNBDUFunction."; } augment "/me3gpp:ManagedElement/gnbdu3gpp:GNBDUFunction" { if-feature Dynamic5QISetUnderGNBDUFunction; uses Dynamic5QISetSubtree; } - + feature Dynamic5QISetUnderGNBCUCPFunction { description "Dynamic5QISet shall be contained under GNBCUCPFunction."; } augment "/me3gpp:ManagedElement/gnbcucp3gpp:GNBCUCPFunction" { - if-feature Dynamic5QISetUnderGNBCUCPFunction; + if-feature Dynamic5QISetUnderGNBCUCPFunction; uses Dynamic5QISetSubtree; } feature Dynamic5QISetUnderGNBCUUPFunction { - description "Dynamic5QISet shall be contained under GNBCUUPFunction."; + description "Dynamic5QISet shall be contained under GNBCUUPFunction."; } augment "/me3gpp:ManagedElement/gnbcuup3gpp:GNBCUUPFunction" { - if-feature Dynamic5QISetUnderGNBCUUPFunction; + if-feature Dynamic5QISetUnderGNBCUUPFunction; uses Dynamic5QISetSubtree; } } \ No newline at end of file diff --git a/yang-models/_3gpp-5gc-nrm-ecmconnectioninfo.yang b/yang-models/_3gpp-5gc-nrm-ecmconnectioninfo.yang index b8b795ab4..284eccc39 100644 --- a/yang-models/_3gpp-5gc-nrm-ecmconnectioninfo.yang +++ b/yang-models/_3gpp-5gc-nrm-ecmconnectioninfo.yang @@ -9,28 +9,28 @@ module _3gpp-5gc-nrm-ecmconnectioninfo { organization "3GPP SA5"; contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464"; - description "Defines the YANG mapping of the EcmConnectionInfo Information + description "Defines the YANG mapping of the EcmConnectionInfo Information Object Class (IOC) that is part of the NR Network Resource Model (NRM). - Copyright 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + Copyright 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved."; reference "3GPP TS 28.541 5G Network Resource Model (NRM)"; - revision 2024-01-29 { reference CR-1166 ; } - revision 2023-11-05 { reference CR-1131 ; } - + revision 2024-01-29 { reference CR-1166 ; } + revision 2023-11-05 { reference CR-1131 ; } + grouping GeoLocGrp { description "This datatype represent the geographical location."; reference "3GPP 28.538 clause 6.3.4"; - + list geographicalCoordinates { - description "This refers to the Topological Service Area, - (see clause 7.3.3.2 in TS 23.558) that is defined as a datatype + description "This refers to the Topological Service Area, + (see clause 7.3.3.2 in TS 23.558) that is defined as a datatype (see clause 6.3.8)."; key latitude; max-elements 1; uses types3gpp:GeographicalCoordinates; } - + leaf civicLocations { type string; } @@ -39,67 +39,67 @@ module _3gpp-5gc-nrm-ecmconnectioninfo { grouping TopologicalServiceAreaGrp { description "This datatype represents the topological service area."; reference "3GPP TS 28.538 clause 6.3.7"; - + leaf-list cellIDList { - description "It represents the list of NR cells. + description "It represents the list of NR cells. - The cell ID, together with the gNB Identifier (using gNBId of the - parent GNBCUCPFunction or GNBDUFunction or ExternalCUCPFunction), - identifies a NR cell within a PLMN. This is the NR Cell Identity(NCI). + The cell ID, together with the gNB Identifier (using gNBId of the + parent GNBCUCPFunction or GNBDUFunction or ExternalCUCPFunction), + identifies a NR cell within a PLMN. This is the NR Cell Identity(NCI). See subclause 8.2 of TS 38.300"; type int32; } - + list trackingAreaIdList { description "It represents the list of tracking areas within a PLMN."; min-elements 1; key idx; - + leaf idx { type uint32; } uses types3gpp:TaiGrp; } - + list servingPLMN { description "It specifies the PLMN to be served."; max-elements 1; key idx; - + leaf idx { type uint32; } uses types3gpp:PLMNId; } } - + grouping ServingLocationGrp { - description "This datatype represents the location which is to be served + description "This datatype represents the location which is to be served by the node."; reference "3GPP TS 28.536 clause 6.3.3"; - + list geographicalLocation { - description "This refers to the Geographical Service Area, - (see clause 7.3.3.3 in TS 23.558 that is defined as a datatype + description "This refers to the Geographical Service Area, + (see clause 7.3.3.3 in TS 23.558 that is defined as a datatype (see clause 6.3.4)."; max-elements 1; key idx; - + leaf idx { type uint32; } uses GeoLocGrp; } - - list topologicalLocation { - description "This refers to the Topological Service Area, - (see clause 7.3.3.2 in TS 23.558) that is defined as a datatype + + list topologicalLocation { + description "This refers to the Topological Service Area, + (see clause 7.3.3.2 in TS 23.558) that is defined as a datatype (see clause 6.3.7). "; max-elements 1; key idx; - + leaf idx { type uint32; } uses TopologicalServiceAreaGrp; } } - + grouping _5GCNfConnEcmInfoGrp { description "This data type specifies the 5GC NF connection information."; - + leaf _5GCNFType { type enumeration { enum PCF; @@ -108,15 +108,15 @@ module _3gpp-5gc-nrm-ecmconnectioninfo { } description "It indicates the type of a NF instance."; } - + leaf _5GCNFIpAddress { type inet:host; mandatory true; - description "This parameter defines address of a NF instance, - It can be IP address (either IPv4 address (See RFC 791) or + description "This parameter defines address of a NF instance, + It can be IP address (either IPv4 address (See RFC 791) or IPv6 address (See RFC 2373) or FQDN (See TS 23.003). "; } - + leaf _5GCNFRef { type types3gpp:DistinguishedName; @@ -126,25 +126,25 @@ module _3gpp-5gc-nrm-ecmconnectioninfo { grouping UPFConnInfoGrp { description "This data type specifies the UPF connection information."; - + leaf uPFIpAddress { type inet:host; - description "This parameter defines address of an UPF instance, - It can be IP address (either IPv4 address (See RFC 791) or + description "This parameter defines address of an UPF instance, + It can be IP address (either IPv4 address (See RFC 791) or IPv6 address (See RFC 2373) or FQDN (See TS 23.003). "; } - + leaf uPFRef { type types3gpp:DistinguishedName; description "This attribute holds the DN of an UPF instance."; } } - + grouping EcmConnectionInfoGrp { description "Represents the EcmConnectionInfo IOC."; - list eASServiceArea { - description "This parameter defines the EAS service area + list eASServiceArea { + description "This parameter defines the EAS service area (see clause 7.3.3.6 in TS 23.558)."; min-elements 1; max-elements 1; @@ -152,9 +152,9 @@ module _3gpp-5gc-nrm-ecmconnectioninfo { leaf idx { type uint32 ; } uses ServingLocationGrp; } - + list eESServiceArea { - description "This parameter defines the EES service area + description "This parameter defines the EES service area (see clause 7.3.3.5 in TS 23.558)."; min-elements 1; max-elements 1; @@ -162,9 +162,9 @@ module _3gpp-5gc-nrm-ecmconnectioninfo { leaf idx { type uint32 ; } uses ServingLocationGrp; } - + list eDNServiceArea { - description "This parameter defines the EDN service area + description "This parameter defines the EDN service area (see clause 7.3.3.4 in TS 23.558)"; min-elements 1; max-elements 1; @@ -172,50 +172,50 @@ module _3gpp-5gc-nrm-ecmconnectioninfo { leaf idx { type uint32 ; } uses ServingLocationGrp; } - + leaf eASIpAddress { type inet:ip-address; mandatory true; - description "This parameter defines address of an EAS instance. - It can be IP address (either IPv4 address (See RFC 791) or IPv6 + description "This parameter defines address of an EAS instance. + It can be IP address (either IPv4 address (See RFC 791) or IPv6 address (See RFC 2373)."; } - + leaf eESIpAddress { type inet:ip-address; mandatory true; - description "This parameter defines address of an EES instance. - It can be IP address (either IPv4 address (See RFC 791) or IPv6 + description "This parameter defines address of an EES instance. + It can be IP address (either IPv4 address (See RFC 791) or IPv6 address (See RFC 2373). "; } - + leaf eCSIpAddress { type inet:ip-address; mandatory true; - description "This parameter defines address of an ECS instance. - It can be IP address (either IPv4 address (See RFC 791) or IPv6 + description "This parameter defines address of an ECS instance. + It can be IP address (either IPv4 address (See RFC 791) or IPv6 address (See RFC 2373)."; } - + leaf ednIdentifier { - type string; + type string; description "The identifier of the edge data network (See TS 23.558)."; } - + leaf ecmConnectionType { type enumeration { enum USERPLANE; enum CONTROLPLANE; enum BOTH; } - description "It indicates the type of ECM connection (i.e., user plane + description "It indicates the type of ECM connection (i.e., user plane connection via UPF, control plane connection via PCF or NEF."; } - + list _5GCNfConnEcmInfoList { - description "The attribute specifies a list of 5GCNfConnInfo which is - defined as a datatype (see clause 5.3.120). It is used to - provide 5GC NFs, such as PCF, NEF, SCEF, that are connected EDN NFs, + description "The attribute specifies a list of 5GCNfConnInfo which is + defined as a datatype (see clause 5.3.120). It is used to + provide 5GC NFs, such as PCF, NEF, SCEF, that are connected EDN NFs, such as EAS, EES, and ECS."; config false; min-elements 1; @@ -223,10 +223,10 @@ module _3gpp-5gc-nrm-ecmconnectioninfo { leaf idx { type uint32 ; } uses _5GCNfConnEcmInfoGrp; } - + list uPFConnectionInfo { - description "The attribute is defined as a datatype UPFConnInfo - (see clause 5.3.121). It is used to provide the UPF IP address and + description "The attribute is defined as a datatype UPFConnInfo + (see clause 5.3.121). It is used to provide the UPF IP address and UPF DN. "; config false; min-elements 1; @@ -234,15 +234,15 @@ module _3gpp-5gc-nrm-ecmconnectioninfo { key idx; leaf idx { type uint32 ; } uses UPFConnInfoGrp; - } + } } grouping EcmConnectionInfoSubtree { description "Subtree containing EcmConnectionInfo."; - + list EcmConnectionInfo { - description "This IOC contains attributes to enable ECSP management - system to connect EDN NFs (i.e., EAS, ECS, and EES) to 5GC NFs + description "This IOC contains attributes to enable ECSP management + system to connect EDN NFs (i.e., EAS, ECS, and EES) to 5GC NFs (i.e. UPF, PCF, NEF, SCEF) (See clause 7.4.3 and 7.4.4 in TS 28.538). "; key id; uses top3gpp:Top_Grp; diff --git a/yang-models/_3gpp-5gc-nrm-ep.yang b/yang-models/_3gpp-5gc-nrm-ep.yang index 175fa05a0..ee948f5c6 100755 --- a/yang-models/_3gpp-5gc-nrm-ep.yang +++ b/yang-models/_3gpp-5gc-nrm-ep.yang @@ -2,7 +2,7 @@ module _3gpp-5gc-nrm-ep { yang-version 1.1; namespace "urn:3gpp:tsg:sa5:nrm:_3gpp-5gc-nrm-ep"; prefix "cep3gpp"; - + import _3gpp-common-ep-rp { prefix eprp3gpp; } import _3gpp-common-managed-element { prefix me3gpp; } import _3gpp-5gc-nrm-affunction { prefix af3gpp; } @@ -23,113 +23,113 @@ module _3gpp-5gc-nrm-ep { import _3gpp-common-yang-types { prefix types3gpp; } import _3gpp-common-top { prefix top3gpp; } import ietf-inet-types { prefix inet; } - + organization "3GPP SA5"; description "Defines the YANG mapping of the 5GC related endpoint - Information Object Classes (IOCs) that are part of the 5G Core + Information Object Classes (IOCs) that are part of the 5G Core Network Resource Model. - Copyright 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + Copyright 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved."; reference "3GPP TS 28.541"; - - revision 2024-08-19 { reference CR-1314 ; } - revision 2023-09-18 { reference CR-1043 ; } + + revision 2024-08-19 { reference CR-1314 ; } + revision 2023-09-18 { reference CR-1043 ; } revision 2019-11-18 { description "Ericsson refactoring."; } - + revision 2018-07-31 { description "Initial revision"; } - + grouping EP_N2Grp { uses eprp3gpp:EP_Common; } - + grouping EP_N3Grp { uses eprp3gpp:EP_Common; } - + grouping EP_N4Grp { uses eprp3gpp:EP_Common; } - + grouping EP_N5Grp { uses eprp3gpp:EP_Common; } - + grouping EP_N6Grp { uses eprp3gpp:EP_Common; } - + grouping EP_N7Grp { uses eprp3gpp:EP_Common; } - + grouping EP_N8Grp { uses eprp3gpp:EP_Common; } - + grouping EP_N9Grp { uses eprp3gpp:EP_Common; } - + grouping EP_N10Grp { uses eprp3gpp:EP_Common; } - + grouping EP_N11Grp { uses eprp3gpp:EP_Common; } - + grouping EP_N12Grp { uses eprp3gpp:EP_Common; } - + grouping EP_N13Grp { uses eprp3gpp:EP_Common; } - + grouping EP_N14Grp { uses eprp3gpp:EP_Common; } - + grouping EP_N15Grp { uses eprp3gpp:EP_Common; } - + grouping EP_N16Grp { uses eprp3gpp:EP_Common; } - + grouping EP_N17Grp { uses eprp3gpp:EP_Common; } - + grouping EP_N20Grp { uses eprp3gpp:EP_Common; } - + grouping EP_N21Grp { uses eprp3gpp:EP_Common; } - + grouping EP_N22Grp { uses eprp3gpp:EP_Common; } - + grouping EP_N26Grp { uses eprp3gpp:EP_Common; } - + grouping EP_N27Grp { uses eprp3gpp:EP_Common; } - + grouping EP_N31Grp { uses eprp3gpp:EP_Common; } - + grouping EP_N32Grp { uses eprp3gpp:EP_Common; container remotePlmnId { @@ -137,7 +137,7 @@ module _3gpp-5gc-nrm-ep { The PLMN Identifier is composed of a Mobile Country Code (MCC) and a Mobile Network Code (MNC)."; uses types3gpp:PLMNId; } - + leaf remoteSeppAddress { description "The host address of the SEPP."; type inet:host; @@ -145,45 +145,45 @@ module _3gpp-5gc-nrm-ep { leaf remoteSeppId { type uint16; - } + } leaf n32cParas { type string; - } + } leaf n32fPolicy { type string; - } + } leaf withIPX { type boolean; - } + } } - + grouping EP_S5CGrp { uses eprp3gpp:EP_Common; } - + grouping EP_S5UGrp { uses eprp3gpp:EP_Common; } - + grouping EP_RxGrp { uses eprp3gpp:EP_Common; } - + grouping EP_MAP_SMSCGrp { uses eprp3gpp:EP_Common; } - + grouping EP_NLSGrp { uses eprp3gpp:EP_Common; } - + grouping EP_NL2Grp { uses eprp3gpp:EP_Common; } - + grouping EP_SBI_IPXGrp { uses eprp3gpp:EP_Common; leaf-list sBIService { @@ -192,7 +192,7 @@ module _3gpp-5gc-nrm-ep { type string; } } - + augment "/me3gpp:ManagedElement/af3gpp:AFFunction" { list EP_N6 { description "Represents the EP_N6 IOC."; @@ -202,7 +202,7 @@ module _3gpp-5gc-nrm-ep { uses EP_N6Grp; } } - + list EP_Rx { description "Represents the EP_Rx IOC."; key id; @@ -212,7 +212,7 @@ module _3gpp-5gc-nrm-ep { } } } - + augment "/me3gpp:ManagedElement/amf3gpp:AMFFunction" { list EP_N2 { description "Represents the EP_N2 IOC."; @@ -222,7 +222,7 @@ module _3gpp-5gc-nrm-ep { uses EP_N2Grp; } } - + list EP_N8 { description "Represents the EP_N8 IOC."; key id; @@ -231,7 +231,7 @@ module _3gpp-5gc-nrm-ep { uses EP_N8Grp; } } - + list EP_N11 { description "Represents the EP_N11 IOC."; key id; @@ -240,7 +240,7 @@ module _3gpp-5gc-nrm-ep { uses EP_N11Grp; } } - + list EP_N12 { description "Represents the EP_N12 IOC."; key id; @@ -249,7 +249,7 @@ module _3gpp-5gc-nrm-ep { uses EP_N12Grp; } } - + list EP_N14 { description "Represents the EP_N14 IOC."; key id; @@ -258,7 +258,7 @@ module _3gpp-5gc-nrm-ep { uses EP_N14Grp; } } - + list EP_N15 { description "Represents the EP_N15 IOC."; key id; @@ -267,7 +267,7 @@ module _3gpp-5gc-nrm-ep { uses EP_N15Grp; } } - + list EP_N17 { description "Represents the EP_N17 IOC."; key id; @@ -276,7 +276,7 @@ module _3gpp-5gc-nrm-ep { uses EP_N17Grp; } } - + list EP_N20 { description "Represents the EP_N20 IOC."; key id; @@ -285,7 +285,7 @@ module _3gpp-5gc-nrm-ep { uses EP_N20Grp; } } - + list EP_N22 { description "Represents the EP_N22 IOC."; key id; @@ -294,7 +294,7 @@ module _3gpp-5gc-nrm-ep { uses EP_N22Grp; } } - + list EP_N26 { description "Represents the EP_N26 IOC."; key id; @@ -303,7 +303,7 @@ module _3gpp-5gc-nrm-ep { uses EP_N26Grp; } } - + list EP_NLS { description "Represents the EP_NLS IOC."; key id; @@ -312,7 +312,7 @@ module _3gpp-5gc-nrm-ep { uses EP_NLSGrp; } } - + list EP_NL2 { description "Represents the EP_NL2 IOC."; key id; @@ -322,7 +322,7 @@ module _3gpp-5gc-nrm-ep { } } } - + augment "/me3gpp:ManagedElement/ausf3gpp:AUSFFunction" { list EP_N12 { description "Represents the EP_N12 IOC."; @@ -332,7 +332,7 @@ module _3gpp-5gc-nrm-ep { uses EP_N12Grp; } } - + list EP_N13 { description "Represents the EP_N13 IOC."; key id; @@ -340,9 +340,9 @@ module _3gpp-5gc-nrm-ep { container attributes { uses EP_N13Grp; } - } + } } - + augment "/me3gpp:ManagedElement/dn3gpp:DNFunction" { list EP_N6 { description "Represents the EP_N6 IOC."; @@ -353,7 +353,7 @@ module _3gpp-5gc-nrm-ep { } } } - + augment "/me3gpp:ManagedElement/lmf3gpp:LMFFunction" { list EP_NLS { description "Represents the EP_NLS IOC."; @@ -364,7 +364,7 @@ module _3gpp-5gc-nrm-ep { } } } - + augment "/me3gpp:ManagedElement/n3iwf3gpp:N3IWFFunction" { list EP_N2 { description "Represents the EP_N2 IOC."; @@ -374,7 +374,7 @@ module _3gpp-5gc-nrm-ep { uses EP_N2Grp; } } - + list EP_N3 { description "Represents the EP_N3 IOC."; key id; @@ -384,7 +384,7 @@ module _3gpp-5gc-nrm-ep { } } } - + augment "/me3gpp:ManagedElement/ngeir3gpp:NGEIRFunction" { list EP_N17 { description "Represents the EP_N17 IOC."; @@ -395,7 +395,7 @@ module _3gpp-5gc-nrm-ep { } } } - + augment "/me3gpp:ManagedElement/nrf3gpp:NRFFunction" { list EP_N27 { description "Represents the EP_N27 IOC."; @@ -404,10 +404,10 @@ module _3gpp-5gc-nrm-ep { container attributes { uses EP_N26Grp; } - } + } } - + augment "/me3gpp:ManagedElement/nssf3gpp:NSSFFunction" { list EP_N22 { description "Represents the EP_N22 IOC."; @@ -417,7 +417,7 @@ module _3gpp-5gc-nrm-ep { uses EP_N22Grp; } } - + list EP_N31 { description "Represents the EP_N31 IOC."; key id; @@ -427,7 +427,7 @@ module _3gpp-5gc-nrm-ep { } } } - + augment "/me3gpp:ManagedElement/pcf3gpp:PCFFunction" { list EP_N5 { description "Represents the EP_N5 IOC."; @@ -437,7 +437,7 @@ module _3gpp-5gc-nrm-ep { uses EP_N5Grp; } } - + list EP_N7 { description "Represents the EP_N7 IOC."; key id; @@ -446,7 +446,7 @@ module _3gpp-5gc-nrm-ep { uses EP_N7Grp; } } - + list EP_N15 { description "Represents the EP_N15 IOC."; key id; @@ -455,7 +455,7 @@ module _3gpp-5gc-nrm-ep { uses EP_N15Grp; } } - + list EP_N16 { description "Represents the EP_N16 IOC."; key id; @@ -464,7 +464,7 @@ module _3gpp-5gc-nrm-ep { uses EP_N16Grp; } } - + list EP_Rx { description "Represents the EP_Rx IOC."; key id; @@ -474,7 +474,7 @@ module _3gpp-5gc-nrm-ep { } } } - + augment "/me3gpp:ManagedElement/sepp3gpp:SEPPFunction" { list EP_N32 { description "Represents the EP_N32 IOC."; @@ -485,7 +485,7 @@ module _3gpp-5gc-nrm-ep { } } - } + } augment "/me3gpp:ManagedElement/smsf3gpp:SMSFFunction" { list EP_N20 { description "Represents the EP_20 IOC."; @@ -495,7 +495,7 @@ module _3gpp-5gc-nrm-ep { uses EP_N20Grp; } } - + list EP_N21 { description "Represents the EP_N21 IOC."; key id; @@ -504,7 +504,7 @@ module _3gpp-5gc-nrm-ep { uses EP_N21Grp; } } - + list EP_MAP_SMSC { description "Represents the EP_MAP_SMSC IOC."; key id; @@ -514,7 +514,7 @@ module _3gpp-5gc-nrm-ep { } } } - + augment "/me3gpp:ManagedElement/smf3gpp:SMFFunction" { list EP_N4 { description "Represents the EP_N4 IOC."; @@ -524,7 +524,7 @@ module _3gpp-5gc-nrm-ep { uses EP_N4Grp; } } - + list EP_N7 { description "Represents the EP_N7 IOC."; key id; @@ -533,7 +533,7 @@ module _3gpp-5gc-nrm-ep { uses EP_N7Grp; } } - + list EP_N10 { description "Represents the EP_N10 IOC."; key id; @@ -542,7 +542,7 @@ module _3gpp-5gc-nrm-ep { uses EP_N10Grp; } } - + list EP_N11 { description "Represents the EP_N11 IOC."; key id; @@ -551,7 +551,7 @@ module _3gpp-5gc-nrm-ep { uses EP_N11Grp; } } - + list EP_N16 { description "Represents the EP_N16 IOC."; key id; @@ -560,7 +560,7 @@ module _3gpp-5gc-nrm-ep { uses EP_N16Grp; } } - + list EP_S5C { description "Represents the EP_S5C IOC."; key id; @@ -570,7 +570,7 @@ module _3gpp-5gc-nrm-ep { } } } - + augment "/me3gpp:ManagedElement/udm3gpp:UDMFunction" { list EP_N8 { description "Represents the EP_N8 IOC."; @@ -580,7 +580,7 @@ module _3gpp-5gc-nrm-ep { uses EP_N8Grp; } } - + list EP_N10 { description "Represents the EP_N10 IOC."; key id; @@ -589,7 +589,7 @@ module _3gpp-5gc-nrm-ep { uses EP_N10Grp; } } - + list EP_N13 { description "Represents the EP_N13 IOC."; key id; @@ -600,7 +600,7 @@ module _3gpp-5gc-nrm-ep { } } - + augment "/me3gpp:ManagedElement/upf3gpp:UPFFunction" { list EP_N4 { description "Represents the EP_N4 IOC."; @@ -610,7 +610,7 @@ module _3gpp-5gc-nrm-ep { uses EP_N4Grp; } } - + list EP_N3 { description "Represents the EP_N3 IOC."; key id; @@ -619,7 +619,7 @@ module _3gpp-5gc-nrm-ep { uses EP_N3Grp; } } - + list EP_N9 { description "Represents the EP_N9 IOC."; key id; @@ -628,7 +628,7 @@ module _3gpp-5gc-nrm-ep { uses EP_N9Grp; } } - + list EP_S5U { description "Represents the EP_S5U IOC."; key id; @@ -637,7 +637,7 @@ module _3gpp-5gc-nrm-ep { uses EP_S5UGrp; } } - + list EP_EP_N6 { description "Represents the EP_N6 IOC."; key id; diff --git a/yang-models/_3gpp-5gc-nrm-externalnrffunction.yang b/yang-models/_3gpp-5gc-nrm-externalnrffunction.yang index 3268b7717..7650161f1 100755 --- a/yang-models/_3gpp-5gc-nrm-externalnrffunction.yang +++ b/yang-models/_3gpp-5gc-nrm-externalnrffunction.yang @@ -2,26 +2,26 @@ module _3gpp-5gc-nrm-externalnrffunction { yang-version 1.1; namespace urn:3gpp:sa5:_3gpp-5gc-nrm-externalnrffunction; prefix extnrf3gpp; - + import _3gpp-common-yang-types { prefix types3gpp; } import _3gpp-common-subnetwork { prefix subnet3gpp; } import _3gpp-common-top { prefix top3gpp; } import _3gpp-common-managed-function { prefix mf3gpp; } - - description "This IOC represents external NRF function controlled + + description "This IOC represents external NRF function controlled by another management domain. - Copyright 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + Copyright 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved."; - revision 2023-09-18 { reference CR-1043 ; } + revision 2023-09-18 { reference CR-1043 ; } revision 2019-10-28 { reference S5-193518 ; } revision 2019-06-11 { description "Ericsson refactoring."; } - + grouping ExternalNRFFunctionGrp { uses mf3gpp:ManagedFunctionGrp; - + list pLMNIdList { description "List of at most six entries of PLMN Identifiers, but at least one (the primary PLMN Id). The PLMN Identifier is composed of a Mobile Country Code (MCC) and a Mobile Network Code (MNC)."; @@ -31,7 +31,7 @@ module _3gpp-5gc-nrm-externalnrffunction { uses types3gpp:PLMNId; } } - + augment "/subnet3gpp:SubNetwork" { list ExternalNRFFunction { description "5G Core External NRF Function"; diff --git a/yang-models/_3gpp-5gc-nrm-externalnssffunction.yang b/yang-models/_3gpp-5gc-nrm-externalnssffunction.yang index 5378bc0a7..5023a5a90 100755 --- a/yang-models/_3gpp-5gc-nrm-externalnssffunction.yang +++ b/yang-models/_3gpp-5gc-nrm-externalnssffunction.yang @@ -2,26 +2,26 @@ module _3gpp-5gc-nrm-externalnssffunction { yang-version 1.1; namespace urn:3gpp:sa5:_3gpp-5gc-nrm-externalnssffunction; prefix extnssf3gpp; - + import _3gpp-common-yang-types { prefix types3gpp; } import _3gpp-common-subnetwork { prefix subnet3gpp; } import _3gpp-common-top { prefix top3gpp; } import _3gpp-common-managed-function { prefix mf3gpp; } - - description "This IOC represents external NSSF function controlled + + description "This IOC represents external NSSF function controlled by another management domain. - Copyright 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + Copyright 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved."; - revision 2023-09-18 { reference CR-1043 ; } + revision 2023-09-18 { reference CR-1043 ; } revision 2019-10-28 { reference S5-193518 ; } revision 2019-06-11 { description "Ericsson refactoring."; } - + grouping ExternalNSSFFunctionGrp { uses mf3gpp:ManagedFunctionGrp; - + list pLMNIdList { description "List of at most six entries of PLMN Identifiers, but at least one (the primary PLMN Id). The PLMN Identifier is composed of a Mobile Country Code (MCC) and a Mobile Network Code (MNC)."; @@ -31,7 +31,7 @@ module _3gpp-5gc-nrm-externalnssffunction { uses types3gpp:PLMNId; } } - + augment "/subnet3gpp:SubNetwork" { list ExternalNSSFFunction { description "5G Core External NSSF Function"; diff --git a/yang-models/_3gpp-5gc-nrm-externalseppfunction.yang b/yang-models/_3gpp-5gc-nrm-externalseppfunction.yang index 828cecc36..e3a4a2b65 100755 --- a/yang-models/_3gpp-5gc-nrm-externalseppfunction.yang +++ b/yang-models/_3gpp-5gc-nrm-externalseppfunction.yang @@ -1,35 +1,35 @@ module _3gpp-5gc-nrm-externalseppfunction { yang-version 1.1; - + namespace urn:3gpp:sa5:_3gpp-5gc-nrm-extternalseppfunction; prefix extsepp3gpp; - + import _3gpp-common-managed-function { prefix mf3gpp; } import _3gpp-common-managed-element { prefix me3gpp; } import _3gpp-common-yang-types { prefix types3gpp; } import _3gpp-common-yang-extensions { prefix yext3gpp; } import _3gpp-common-top { prefix top3gpp; } import ietf-inet-types { prefix inet; } - + organization "3gpp SA5"; contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464"; - description "This IOC represents the external SEPP function which support - message filtering and policing on inter-PLMN control plane interface. + description "This IOC represents the external SEPP function which support + message filtering and policing on inter-PLMN control plane interface. For more information about the SEPP, see 3GPP TS 23.501. - Copyright 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + Copyright 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved."; reference "3GPP TS 28.541"; - - revision 2023-09-18 { reference CR-1043 ; } + + revision 2023-09-18 { reference CR-1043 ; } revision 2023-04-26 { reference CR-0916; } revision 2019-11-17 {reference "initial revision"; } grouping ExternalSEPPFunctionGrp { uses mf3gpp:ManagedFunctionGrp; - + container pLMNId { description "PLMN Identifiers of the sepp. - The PLMN Identifier is composed of a Mobile Country Code (MCC) and a + The PLMN Identifier is composed of a Mobile Country Code (MCC) and a Mobile Network Code (MNC)."; yext3gpp:inVariant; uses types3gpp:PLMNId; @@ -38,14 +38,14 @@ module _3gpp-5gc-nrm-externalseppfunction { leaf sEPPId { type uint16; yext3gpp:inVariant; - } + } leaf fqdn { description "The domain name of the SEPP."; type inet:domain-name; } } - + augment "/me3gpp:ManagedElement" { list ExternalSEPPFunction { description "5G Core SEPP Function"; diff --git a/yang-models/_3gpp-5gc-nrm-gmlcfunction.yang b/yang-models/_3gpp-5gc-nrm-gmlcfunction.yang index f516d33f7..aae36afa0 100644 --- a/yang-models/_3gpp-5gc-nrm-gmlcfunction.yang +++ b/yang-models/_3gpp-5gc-nrm-gmlcfunction.yang @@ -1,114 +1,114 @@ -module _3gpp-5gc-nrm-gmlcfunction { - yang-version 1.1; - namespace "urn:3gpp:sa5:_3gpp-5gc-nrm-gmlcfunction"; - prefix gmlc3gpp; - - import _3gpp-common-managed-function { prefix mf3gpp; } - import _3gpp-common-managed-element { prefix me3gpp; } - import _3gpp-common-yang-types { prefix types3gpp; } - import _3gpp-5g-common-yang-types { prefix types5g3gpp; } - import _3gpp-common-top { prefix top3gpp; } - - organization "3GPP SA5"; - contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464"; - description "This module defines the GMLC Function IOC per 3GPP TS 28.541. - Copyright 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, - TTA, TTC). All rights reserved."; - reference "3GPP TS 28.541"; - - revision 2025-03-25 { reference CR-1489 ; } - revision 2025-03-25 { - description "Initial revision."; - reference "3GPP TS 28.541"; - } - - grouping GmlcInfoGrp { - description "Information of a GMLC NF Instance (see TS 29.510, clause 6.1.6.2.41)."; - - leaf servingClientTypes { - description "Identity of the GMLC group that is served by the GMLC instance."; - type enumeration { - enum EMERGENCY_SERVICES { - description "External client for emergency services"; - } - enum VALUE_ADDED_SERVICES { - description "External client for value added services"; - } - enum PLMN_OPERATOR_SERVICES { - description "External client for PLMN operator services"; - } - enum LAWFUL_INTERCEPT_SERVICES { - description "External client for Lawful Intercept services"; - } - enum EXTERNAL_CLIENT_FOR_LAWFUL_INTERCEPT_SERVICES { - description "External client for PLMN Operator Broadcast services"; - } - enum PLMN_OPERATOR_OM { - description "External client for PLMN Operator O&M"; - } - enum PLMN_OPERATOR_ANONYMOUS_STATISTICS { - description "External client for PLMN Operator anonymous statistics"; - } - enum PLMN_OPERATOR_TARGET_MS_SERVICE_SUPPORT { - description "External client for PLMN Operator target MS service support"; - } - } - - } - leaf gmlcNumbers{ - type string{ - pattern "^[0-9]{5,15}$"; - } - description "This attribute represents each item of the array - shall carry an OctetString indicating the ISDN number of the GMLC in - international number format as described in ITU-T Rec. E.164 [94] and - shall be encoded as a TBCD-string."; - - } - } - - grouping GMLCFunctionGrp { - description "GMLC Function IOC grouping."; - uses mf3gpp:ManagedFunctionGrp; - - list pLMNInfoList { - key "idx"; - leaf idx { type uint32; } - min-elements 1; - uses types3gpp:PLMNId; - uses types5g3gpp:SNssai; - } - leaf sBIFqdn { - type string; - description "FQDN of the registered NF instance in the service-based interface."; - } - list managedNFProfile { - description "This parameter defines profile for managed NF. See TS 23.501"; - key idx; - min-elements 1; - uses types3gpp:ManagedNFProfile; - } - list commModelList { - key "groupId"; - min-elements 1; - uses types5g3gpp:CommModel; - } - list gmlcInfo { - key "idx"; - leaf idx { type uint32; } - max-elements 1; - uses GmlcInfoGrp; - } - } - augment "/me3gpp:ManagedElement" { - list GMLCFunction { - description "5G Core LMF Function defined in TS 23.501"; - key id; - uses top3gpp:Top_Grp; - container attributes { - uses GMLCFunctionGrp; - } - uses mf3gpp:ManagedFunctionContainedClasses; - } - } +module _3gpp-5gc-nrm-gmlcfunction { + yang-version 1.1; + namespace "urn:3gpp:sa5:_3gpp-5gc-nrm-gmlcfunction"; + prefix gmlc3gpp; + + import _3gpp-common-managed-function { prefix mf3gpp; } + import _3gpp-common-managed-element { prefix me3gpp; } + import _3gpp-common-yang-types { prefix types3gpp; } + import _3gpp-5g-common-yang-types { prefix types5g3gpp; } + import _3gpp-common-top { prefix top3gpp; } + + organization "3GPP SA5"; + contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464"; + description "This module defines the GMLC Function IOC per 3GPP TS 28.541. + Copyright 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + TTA, TTC). All rights reserved."; + reference "3GPP TS 28.541"; + + revision 2025-03-25 { reference CR-1489 ; } + revision 2025-03-25 { + description "Initial revision."; + reference "3GPP TS 28.541"; + } + + grouping GmlcInfoGrp { + description "Information of a GMLC NF Instance (see TS 29.510, clause 6.1.6.2.41)."; + + leaf servingClientTypes { + description "Identity of the GMLC group that is served by the GMLC instance."; + type enumeration { + enum EMERGENCY_SERVICES { + description "External client for emergency services"; + } + enum VALUE_ADDED_SERVICES { + description "External client for value added services"; + } + enum PLMN_OPERATOR_SERVICES { + description "External client for PLMN operator services"; + } + enum LAWFUL_INTERCEPT_SERVICES { + description "External client for Lawful Intercept services"; + } + enum EXTERNAL_CLIENT_FOR_LAWFUL_INTERCEPT_SERVICES { + description "External client for PLMN Operator Broadcast services"; + } + enum PLMN_OPERATOR_OM { + description "External client for PLMN Operator O&M"; + } + enum PLMN_OPERATOR_ANONYMOUS_STATISTICS { + description "External client for PLMN Operator anonymous statistics"; + } + enum PLMN_OPERATOR_TARGET_MS_SERVICE_SUPPORT { + description "External client for PLMN Operator target MS service support"; + } + } + + } + leaf gmlcNumbers{ + type string{ + pattern "^[0-9]{5,15}$"; + } + description "This attribute represents each item of the array + shall carry an OctetString indicating the ISDN number of the GMLC in + international number format as described in ITU-T Rec. E.164 [94] and + shall be encoded as a TBCD-string."; + + } + } + + grouping GMLCFunctionGrp { + description "GMLC Function IOC grouping."; + uses mf3gpp:ManagedFunctionGrp; + + list pLMNInfoList { + key "idx"; + leaf idx { type uint32; } + min-elements 1; + uses types3gpp:PLMNId; + uses types5g3gpp:SNssai; + } + leaf sBIFqdn { + type string; + description "FQDN of the registered NF instance in the service-based interface."; + } + list managedNFProfile { + description "This parameter defines profile for managed NF. See TS 23.501"; + key idx; + min-elements 1; + uses types3gpp:ManagedNFProfile; + } + list commModelList { + key "groupId"; + min-elements 1; + uses types5g3gpp:CommModel; + } + list gmlcInfo { + key "idx"; + leaf idx { type uint32; } + max-elements 1; + uses GmlcInfoGrp; + } + } + augment "/me3gpp:ManagedElement" { + list GMLCFunction { + description "5G Core LMF Function defined in TS 23.501"; + key id; + uses top3gpp:Top_Grp; + container attributes { + uses GMLCFunctionGrp; + } + uses mf3gpp:ManagedFunctionContainedClasses; + } + } } \ No newline at end of file diff --git a/yang-models/_3gpp-5gc-nrm-lmffunction.yang b/yang-models/_3gpp-5gc-nrm-lmffunction.yang index 63b80fa99..60d0c5baf 100755 --- a/yang-models/_3gpp-5gc-nrm-lmffunction.yang +++ b/yang-models/_3gpp-5gc-nrm-lmffunction.yang @@ -1,9 +1,9 @@ module _3gpp-5gc-nrm-lmffunction { yang-version 1.1; - + namespace urn:3gpp:sa5:_3gpp-5gc-nrm-lmffunction; prefix lmf3gpp; - + import _3gpp-common-managed-function { prefix mf3gpp; } import _3gpp-common-managed-element { prefix me3gpp; } import _3gpp-common-yang-types { prefix types3gpp; } @@ -14,20 +14,20 @@ module _3gpp-5gc-nrm-lmffunction { organization "3gpp SA5"; contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464"; description "This IOC represents the LMF function defined in 3GPP TS 23.501. - Copyright 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + Copyright 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved."; reference "3GPP TS 28.541"; revision 2025-07-25 { reference CR-1558 ; } revision 2025-03-25 { reference CR-1489 ; } - revision 2024-11-01 { reference CR-1405 ; } - revision 2023-09-18 { reference CR-1043 ; } + revision 2024-11-01 { reference CR-1405 ; } + revision 2023-09-18 { reference CR-1043 ; } revision 2019-10-25 { reference "S5-194457 S5193518"; } revision 2019-05-15 { reference "initial revision"; } - + grouping LmfInfoGrp { description "Represents the LmfInfo datatype."; - + leaf-list servingClientTypes { type enumeration { enum EMERGENCY_SERVICES { @@ -52,22 +52,22 @@ module _3gpp-5gc-nrm-lmffunction { description "External client for PLMN Operator anonymous statistics"; } enum PLMN_OPERATOR_TARGET_MS_SERVICE_SUPPORT { - description "External client for PLMN Operator target MS service + description "External client for PLMN Operator target MS service support"; } } description "This attribute represents a list of external client type(s), - e.g. emergency client. The NRF should only include this LMF instance - to NF discovery with 'client-type' query parameter indicating one of + e.g. emergency client. The NRF should only include this LMF instance + to NF discovery with 'client-type' query parameter indicating one of the external client types in the list. - Absence of this attribute means the LMF is not dedicated to serve + Absence of this attribute means the LMF is not dedicated to serve specific client types."; } leaf lmfId { type string; - description "This attribute represents the LMF identification. + description "This attribute represents the LMF identification. See clause 6.1.6.3.6 TS 29.572"; } @@ -76,10 +76,10 @@ module _3gpp-5gc-nrm-lmffunction { enum 3GPP_ACCESS; enum NON_3GPP_ACCESS; } - min-elements 1; - description "This attribute contains the access type (3GPP_ACCESS and/or + min-elements 1; + description "This attribute contains the access type (3GPP_ACCESS and/or NON_3GPP_ACCESS) supported by the SMF. - If not included, it shall be assumed the both access types are + If not included, it shall be assumed the both access types are supported."; } @@ -90,27 +90,27 @@ module _3gpp-5gc-nrm-lmffunction { enum ENB; } min-elements 1; - description "This attribute contains the AN node type (i.e. gNB or NG-eNB) + description "This attribute contains the AN node type (i.e. gNB or NG-eNB) supported by the LMF. - If not included, it shall be assumed that all AN node types are + If not included, it shall be assumed that all AN node types are supported."; } leaf-list servingRatTypes { type string; min-elements 1; - description "This attribute contains the RAT type (e.g. 5G NR, eLTE or - any of the RAT Types specified for NR satellite access) supported by + description "This attribute contains the RAT type (e.g. 5G NR, eLTE or + any of the RAT Types specified for NR satellite access) supported by the LMF. - If not included, it shall be assumed that all RAT types are supported + If not included, it shall be assumed that all RAT types are supported allowedValues: see clause 5.4.3.2 of TS 29.571"; } list taiList { - description "This attribute contains TAI list that the LMF can serve. + description "This attribute contains TAI list that the LMF can serve. It may contain one or more non-3GPP access TAIs. - The absence of both this attribute and the taiRangeList attribute - indicates that the LMF can be selected for any TAI in the serving + The absence of both this attribute and the taiRangeList attribute + indicates that the LMF can be selected for any TAI in the serving network."; min-elements 1; key idx; @@ -119,9 +119,9 @@ module _3gpp-5gc-nrm-lmffunction { } list taiRangeList { - description "This attribute contains TAI range list that the LMF can - serve. It may contain one or more non-3GPP access TAI ranges. - The absence of both this attribute and the taiList attribute indicates + description "This attribute contains TAI range list that the LMF can + serve. It may contain one or more non-3GPP access TAI ranges. + The absence of both this attribute and the taiList attribute indicates that the LMF can be selected for any TAI in the serving network."; min-elements 1; key idx; @@ -147,7 +147,7 @@ module _3gpp-5gc-nrm-lmffunction { description "indicates Ellipsoid point with altitude"; } enum POINT_ALTITUDE_UNCERTAINTY { - description "indicates Ellipsoid point with altitude and + description "indicates Ellipsoid point with altitude and uncertainty ellipsoid"; } enum ELLIPSOID_ARC { @@ -162,65 +162,65 @@ module _3gpp-5gc-nrm-lmffunction { } min-elements 1; description "This attribute contains the GAD shapes supported by the LMF. - If not included, it doesn't indicate that the LMF doesn't support any + If not included, it doesn't indicate that the LMF doesn't support any GAD shapes. The allowedValues are: see clause 6.1.6.3.4 of TS 29.572 "; } } grouping TrpMappingInfoGrp { - description "This data type represents the mapping relationship between + description "This data type represents the mapping relationship between satellite and TRPs."; - + leaf satelliteId { type string { pattern '[0-9]{5}'; } mandatory true; - description "This attribute indicates satellite Id. It shall be formatted - as a fixed 5-digit string, padding with leading digits '0' to complete + description "This attribute indicates satellite Id. It shall be formatted + as a fixed 5-digit string, padding with leading digits '0' to complete a 5-digit length."; } - + leaf-list trpIds { type uint8 { range 1..max; } - description "This attribute indicates TRPs uniquely within an NG-RAN - node (see TS 38.455 clause 9.2.24). A gNB may serve several TRPs. + description "This attribute indicates TRPs uniquely within an NG-RAN + node (see TS 38.455 clause 9.2.24). A gNB may serve several TRPs. For NTN, a TRP may be located on board the satellite."; } } - + grouping TrpInfoGrp { - description "This data type represents the mapping relationship between + description "This data type represents the mapping relationship between gNB and TRPs."; - + leaf gNBId { type uint32; mandatory true; - description "It identifies a gNB within a PLMN. The gNB ID is part of + description "It identifies a gNB within a PLMN. The gNB ID is part of the NR Cell Identifier (NCI) of the gNB cells. - See 'gNB Identifier (gNB ID)' of subclause 8.2 of TS 38.300. See + See 'gNB Identifier (gNB ID)' of subclause 8.2 of TS 38.300. See 'Global gNB ID' in subclause 9.3.1.6 of TS 38.413"; } - + list trpMappingInfoList { description "This is the list of TRP mapping between satellite and TRPs."; min-elements 1; key idx; leaf idx { type uint32; } uses TrpMappingInfoGrp; - } + } } - + grouping LMFFunctionGrp { uses mf3gpp:ManagedFunctionGrp; list pLMNIdList { - description "List of at most six entries of PLMN Identifiers, but at + description "List of at most six entries of PLMN Identifiers, but at least one (the primary PLMN Id). - The PLMN Identifier is composed of a Mobile Country Code (MCC) and a + The PLMN Identifier is composed of a Mobile Country Code (MCC) and a Mobile Network Code (MNC)."; min-elements 1; @@ -228,7 +228,7 @@ module _3gpp-5gc-nrm-lmffunction { key "mcc mnc"; uses types3gpp:PLMNId; } - + list managedNFProfile { description "This parameter defines profile for managed NF. See TS 23.501"; key idx; @@ -237,8 +237,8 @@ module _3gpp-5gc-nrm-lmffunction { } list commModelList { - description "The attribute specifies a list of commModel. It can be used - by NF and NF services to interact with each other in 5G Core network + description "The attribute specifies a list of commModel. It can be used + by NF and NF services to interact with each other in 5G Core network (see TS 23.501)"; min-elements 1; key "groupId"; @@ -254,7 +254,7 @@ module _3gpp-5gc-nrm-lmffunction { } list mappedCellIdInfoList { - description "It provides the list of mapping between GEO area and + description "It provides the list of mapping between GEO area and Mapped Cell ID."; key idx; leaf idx { type uint32; } @@ -270,33 +270,33 @@ module _3gpp-5gc-nrm-lmffunction { } list trpInfoList { - description "This is the list of TRP (Transmission-Reception Point) + description "This is the list of TRP (Transmission-Reception Point) related information on LMF (see TS 38.305 clause 5.4.4)."; min-elements 1; key idx; leaf idx { type uint32; } uses TrpInfoGrp; } - + leaf-list mLModelRefList { type types3gpp:DistinguishedName; config false; description "This attribute holds a DN list of MLModel. See TS 28.105"; } - + leaf-list aIMLInferenceFunctionRef { type types3gpp:DistinguishedName; config false; - description "This attribute holds a DN list of AIMLInferenceFunction. + description "This attribute holds a DN list of AIMLInferenceFunction. See TS 28.105"; } } - + augment "/me3gpp:ManagedElement" { list LMFFunction { description "5G Core LMF Function defined in TS 23.501. - Attribute mLModelRefList indicates that AI/ML is supported for LMF for - UE positioning. Attribute aIMLInferenceFunctionRefList indicates that + Attribute mLModelRefList indicates that AI/ML is supported for LMF for + UE positioning. Attribute aIMLInferenceFunctionRefList indicates that AI/ML Inference Function is supported for LMF for UE positioning."; key id; uses top3gpp:Top_Grp; diff --git a/yang-models/_3gpp-5gc-nrm-managed-nfprofile.yang b/yang-models/_3gpp-5gc-nrm-managed-nfprofile.yang index e278e345b..677ff8687 100755 --- a/yang-models/_3gpp-5gc-nrm-managed-nfprofile.yang +++ b/yang-models/_3gpp-5gc-nrm-managed-nfprofile.yang @@ -1,170 +1,170 @@ module _3gpp-5gc-nrm-managed-nfprofile { yang-version 1.1; - + namespace urn:3gpp:sa5:_3gpp-5gc-nrm-managed-nfprofile; prefix mnfp3gpp; - + import _3gpp-common-yang-types { prefix types3gpp; } import ietf-inet-types { prefix inet; } import ietf-yang-types { prefix yang; } import _3gpp-5gc-nrm-nfservice { prefix nfs3gpp; } - import _3gpp-5g-common-yang-types { prefix types5g3gpp; } + import _3gpp-5g-common-yang-types { prefix types5g3gpp; } organization "3gpp SA5"; contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464"; description "NF profile class. -Copyright 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, +Copyright 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved."; reference "3GPP TS 29.510"; revision 2025-07-25 { reference "initial revision"; } - + grouping SPNInfoIdGrp { - description "This data type represents the SNPN identification + description "This data type represents the SNPN identification consisting of MCC, MNC, and optionally NID."; leaf mcc { type string; description "Mobile Country Code (MCC) of the SNPN."; } - + leaf mnc { type string; description "Mobile Network Code (MNC) of the SNPN."; } - + leaf nId { type string; description "Network Identifier (NID) of the SNPN."; } } grouping CollocatedNfInstanceGrp { - description "This data type represents the SNPN identification + description "This data type represents the SNPN identification consisting of MCC, MNC, and optionally NID."; leaf nfInstanceId { description "String uniquely identifying a NF instance."; mandatory true; type string; } - + leaf nfType { description "Type of Network Function."; mandatory true; type types3gpp:NfType; } } - grouping SupiRange { + grouping SupiRangeGrp { leaf start { - description "First value identifying the start ofa SUPI range.To be - used when the range of SUPI's can be represented as a numeric range + description "First value identifying the start ofa SUPI range.To be + used when the range of SUPI's can be represented as a numeric range (e.g., IMSI ranges)."; type string { pattern '^[0-9]+$'; } } - + leaf end { - description "Last value identifying the end of a SUPI range.To be + description "Last value identifying the end of a SUPI range.To be used when the range of SUPI's can be represented as a numeric range (e.g. IMSI ranges)."; type string { pattern '^[0-9]+$'; } } - + leaf pattern { - description "Pattern representing the set of SUPI's belonging to - this range.A SUPI value is considered part of the range if and + description "Pattern representing the set of SUPI's belonging to + this range.A SUPI value is considered part of the range if and only if the SUPI string fully matches the regular expression."; type string; } } - + grouping ConditionItemGrp { - description "This data type represents a single condition item that - shall be evaluated to determine whether a discovered NF (Service) + description "This data type represents a single condition item that + shall be evaluated to determine whether a discovered NF (Service) Instance shall be selected."; - + leaf consumerNfTypes { - description "It represents the NF types of the consumers for - which the conditions included in this ConditionItem apply. + description "It represents the NF types of the consumers for + which the conditions included in this ConditionItem apply. If this attribute is absent, the conditions are applicable to all NF consumer types."; type types3gpp:NfType; } leaf serviceFeature { - description "It represents a feature number of that NF Service - Instance,under CANARY_RELEASE status. This attribute only - applies when the selectionConditions, where this + description "It represents a feature number of that NF Service + Instance,under CANARY_RELEASE status. This attribute only + applies when the selectionConditions, where this ConditionItem is included, is included in a NF Service Instance - This condition is evaluated to when the service requests + This condition is evaluated to when the service requests froma consumer of this NF Service Instance require the support of the indicated feature on the NF Service Instance."; - type uint32; // positive integer, 0 excluded by context + type uint32; // positive integer, 0 excluded by context } leaf vsServiceFeature { description "It represents a Vendor-Specific feature - number of thatNF Service Instance, under CANARY_RELEASE - status. This attribute only applies when the + number of thatNF Service Instance, under CANARY_RELEASE + status. This attribute only applies when the selectionConditions, where this ConditionItem is included, - is included in a NF Service Instance.This condition is - evaluated to true when the service requests from a - consumer of this NF Service Instance require the support - of the indicated Vendor-Specific feature on the NF + is included in a NF Service Instance.This condition is + evaluated to true when the service requests from a + consumer of this NF Service Instance require the support + of the indicated Vendor-Specific feature on the NF Service Instance."; - type uint32; + type uint32; } list supiRangeList { - description "It represents a set of SUPIs for which + description "It represents a set of SUPIs for which the NF (Service) instance under CANARY_RELEASE status shall be selected."; - key idx; + key idx; leaf idx { type uint32; } - uses SupiRange; + uses SupiRangeGrp; } list gpsiRangeList { - description "It represents a set of GPSIs for which the NF + description "It represents a set of GPSIs for which the NF (Service) instance under CANARY_RELEASE status shall be selected"; min-elements 1; - key idx; + key idx; leaf idx { type uint32; } uses IdentityRange; } list impuRangeList { - description "It represents a set of IMS Public Identities + description "It represents a set of IMS Public Identities for which the NF (Service) instance under CANARY_RELEASE status shall be selected"; min-elements 1; - key idx; + key idx; leaf idx { type uint32; } uses IdentityRange; } list impiRangeList { description "It represents a set of IMS Private Identities - for which theNF (Service) instance under + for which theNF (Service) instance under CANARY_RELEASE status shall be selected."; min-elements 1; - key idx; + key idx; leaf idx { type uint32; } uses IdentityRange; } leaf peiList { - description "It represents a set of PEIs of the UEs for + description "It represents a set of PEIs of the UEs for which the NF(Service) instance under CANARY_RELEASE status shall be selected"; type string; } list taiRangeList { - description "It represents a set of TAIs where the + description "It represents a set of TAIs where the NF(Service) instance under CANARY_RELEASE status shall be selected for a certain UE"; min-elements 1; - key idx; + key idx; leaf idx { type uint32; } uses types5g3gpp:TaiRangeGrp; } leaf dnnList { - description " It represents a set of TAIs where the NF + description " It represents a set of TAIs where the NF (Service) instance under CANARY_RELEASE status shall be selected for a certain UE"; type string; @@ -179,33 +179,33 @@ TTA, TTC). All rights reserved."; key "mcc mnc"; uses types3gpp:PLMNId; } - list sNssaiList { - description "The specific list of S-NSSAIs supported + list sNssaiList { + description "The specific list of S-NSSAIs supported by the given PLMN."; min-elements 1; max-elements 1; key "sst sd"; uses types5g3gpp:SNssai; } - leaf nid { + leaf nid { description "Network Identity; Shall be present if PlmnIdNid identifies an SNPN "; - reference "see clauses 5.30.2.3, 5.30.2.9, 6.3.4, + reference "see clauses 5.30.2.3, 5.30.2.9, 6.3.4, and 6.3.8 in 3GPP TS 23.501 "; type string; } } grouping ConditionGroupGrp { - description "This <> represents a group of conditions that + description "This <> represents a group of conditions that shall be evaluated to determine whether a discovered NF (Service) Instanceshall be selected. (See clause 6.1.6.2.125 TS 29.510 [23])."; - + choice LogicalOperator{ case and { container and { - description "It represents a list of conditions where the - overall evaluation is true only if all the conditions + description "It represents a list of conditions where the + overall evaluation is true only if all the conditions in the list are evaluated as true."; uses SelectionConditionsGrp; } @@ -219,27 +219,27 @@ TTA, TTC). All rights reserved."; uses SelectionConditionsGrp; } } - } + } } - + grouping SelectionConditionsGrp { - description "This data type represents the list of conditions that + description "This data type represents the list of conditions that shall be selected by an NF Service Consumer."; reference "(See clause 6.1.6.2.123 TS 29.510 [23])"; - + list conditionItem{ key "id"; - description "It represent a single condition item that shall be + description "It represent a single condition item that shall be evaluated Instance shall be selected."; leaf id{ type string; } uses ConditionItemGrp; } - - // circular dependency for grouping "ConditionGroupGrp" introduced in - //stage 2 + + // circular dependency for grouping "ConditionGroupGrp" introduced in + //stage 2 // container conditionGroup{ // description "It represents a group of conditions // that shall be evaluated"; @@ -247,7 +247,7 @@ TTA, TTC). All rights reserved."; // } } - + grouping IdentityRange { leaf start { description "First value identifying the start of an identity range. @@ -260,21 +260,21 @@ TTA, TTC). All rights reserved."; leaf end {type string; } // dummy leaf pattern {type string; } // dummy } - + grouping ManagedNFProfileGrp { - + leaf nfInstanceId { description "String uniquely identifying a NF instance."; mandatory true; type string; } - + leaf nfType { description "Type of Network Function."; mandatory true; type types3gpp:NfType; } - + leaf nfStatus { description "Status of the NF Instance."; mandatory true; @@ -290,8 +290,8 @@ grouping ManagedNFProfileGrp { leaf nfInstanceName { description "It represents human readable name of the NF Instance"; type string; - } - + } + leaf heartBeatTimer { description "Time in seconds expected between 2 consecutive heart-beat messages from an NF Instance to the NRF. @@ -300,7 +300,7 @@ grouping ManagedNFProfileGrp { heartbeat time proposed by the NF service consumer."; type uint16; } - + list plmnList { description "PLMN(s) of the Network Function. This IE shall be present if this information @@ -310,8 +310,8 @@ grouping ManagedNFProfileGrp { key "mcc mnc"; uses types3gpp:PLMNId; } - - list sNssais { + + list sNssais { description "S-NSSAIs of the Network Function. If not provided, the NF can serve any S-NSSAI. When present this IE represents the list of S-NSSAIs supported in @@ -335,20 +335,20 @@ grouping ManagedNFProfileGrp { leaf authzInfo { description "This parameter defines NF Specific Service authorization - information. It shall include the NF type (s) and NF realms/origins + information. It shall include the NF type (s) and NF realms/origins allowed to consume NF Service(s) of NF Service Producer "; reference "TS 23.501"; type string; - } + } list allowedPlmns { description "PLMNs allowed to access the NF instance. - If not provided, any PLMN is allowed to access the NF."; + If not provided, any PLMN is allowed to access the NF."; min-elements 1; key "mcc mnc"; uses types3gpp:PLMNId; } - + list sNPNList { key "mcc mnc nId"; description "SNPN(s) of the Network Function. This attributeIE shall be @@ -361,7 +361,7 @@ grouping ManagedNFProfileGrp { description "It includes the S-NSSAIs supported by the Network Function for each PLMN supported by the Network Function. When present, it shall override sNssais IE.If the perPlmnSnssaiList attribute is provided in - at least one NF Service, the S-NSSAIs supported per PLMN in the + at least one NF Service, the S-NSSAIs supported per PLMN in the NF Profile shall be the set or a superset of the perPlmnSnssaiList of the NFService(s)."; key idx; @@ -371,8 +371,8 @@ grouping ManagedNFProfileGrp { list allowedSNPNs { description "SNPNs allowed to access the NF instance. - The absence of this attribute in the NF profile indicates that no SNPN, - other than the SNPN(s) registered in the snpnList attribute of the + The absence of this attribute in the NF profile indicates that no SNPN, + other than the SNPN(s) registered in the snpnList attribute of the NF Profile, is allowed to access the service instance"; key "mCC mNC"; uses nfs3gpp:SNPNIdGrp; @@ -386,9 +386,9 @@ grouping ManagedNFProfileGrp { } leaf-list allowedNfDomains { - description "Pattern (regular expression according to the ECMA-262 - dialect [75]) representing the NF domain names within the PLMN of - the NRF allowed to access the NF instance If not provided, + description "Pattern (regular expression according to the ECMA-262 + dialect [75]) representing the NF domain names within the PLMN of + the NRF allowed to access the NF instance If not provided, any NF domain is allowed to access the NF."; type string; } @@ -405,7 +405,7 @@ grouping ManagedNFProfileGrp { // If not provided, any slice is allowed to access the NF."; // key "sst sd"; // uses RuleSet;? -// } +// } leaf locality { description "Operator defined information about the location of the NF instance (e.g. geographic location, data center)."; @@ -413,9 +413,9 @@ grouping ManagedNFProfileGrp { } leaf extLocality { description "It indicates the operator defined information about the - location of the NF instance. The key of the map shall be a (unique) - valid JSON string per clause 7 of IETF RFC 8259 [92], with a maximum - of 32 characters, representing a type of locality as defined in + location of the NF instance. The key of the map shall be a (unique) + valid JSON string per clause 7 of IETF RFC 8259 [92], with a maximum + of 32 characters, representing a type of locality as defined in clause 6.1.6.3.18."; type string; } @@ -427,48 +427,48 @@ grouping ManagedNFProfileGrp { parameters, those will have precedence over this value."; type uint16; } - + leaf load { description "Dynamic load information, ranged from 0 to 100, indicates the current load percentage of the NF."; type types3gpp:Load; } leaf loadTimeStamp { - description "It indicates the point in time in which the latest load - information (sent by the NF in the load attribute of the NF Profile) - was generated at the NF Instance.If the NF did not provide a timestamp, - the NRF should set it to the instant when the NRF received the message + description "It indicates the point in time in which the latest load + information (sent by the NF in the load attribute of the NF Profile) + was generated at the NF Instance.If the NF did not provide a timestamp, + the NRF should set it to the instant when the NRF received the message where the NF provided the latest load information."; type yang:date-and-time ; } - + leaf-list recoveryTime { - description "Timestamp when the NF was (re)started. The NRF shall notify + description "Timestamp when the NF was (re)started. The NRF shall notify NFs subscribed to receiving notifications of changes of the NF profile, if the NF recoveryTime is changed"; type yang:date-and-time; } leaf nfServicePersistence { - description "This parameter indicates whether the different service - instances of a same NF Service in the NF instance, supporting a same - API version, are capable to persist their resource state in shared - storage and therefore these resources are available after a new NF - service instance supporting the same API version is selected by a NF + description "This parameter indicates whether the different service + instances of a same NF Service in the NF instance, supporting a same + API version, are capable to persist their resource state in shared + storage and therefore these resources are available after a new NF + service instance supporting the same API version is selected by a NF Service Consumer "; - reference "TS 29.510"; + reference "TS 29.510"; type boolean; } leaf-list nfSetIdList { type string ; min-elements 1; - description "A NF Set Identifier is a globally unique identifier of - a set of equivalent and interchangeable CP NFs from a given network - that provide distribution, redundancy and scalability - (see clause 5.21.3 of 3GPP TS 23.501 [2]).An NF Set Identifier shall + description "A NF Set Identifier is a globally unique identifier of + a set of equivalent and interchangeable CP NFs from a given network + that provide distribution, redundancy and scalability + (see clause 5.21.3 of 3GPP TS 23.501 [2]).An NF Set Identifier shall be constructed from the MCC, MNC, NID (for SNPN), NF type and a Set ID. - A NF Set Identifier shall be formatted as the following string: + A NF Set Identifier shall be formatted as the following string: set.set.5gc.mnc.mcc for a NF Set in a PLMN, or - set.set.5gc.nid.mnc.mcc for a NF Set + set.set.5gc.nid.mnc.mcc for a NF Set in a SNPN.At most one NF Set ID shall be indicated per PLMN-ID or SNPN of the NF."; } @@ -483,26 +483,26 @@ grouping ManagedNFProfileGrp { leaf-list nfProfilePartialUpdateChangesSupportInd { description "It represents NF Profile Partial Update Changes Support Indicator. TRUE: the NF Service Consumer supports receiving NF Profile - Changes in the response to an NF Profile Partial Update operation. - FALSE (default): the NF Service Consumer does not support receiving - NF Profile Changes in the response to an NF Profile Partial Update + Changes in the response to an NF Profile Partial Update operation. + FALSE (default): the NF Service Consumer does not support receiving + NF Profile Changes in the response to an NF Profile Partial Update operation"; max-elements 1; type boolean; } leaf-list nfProfileChangesInd { description "NF Profile Changes Indicator. This IE shall be absent - in the request to the NRF and may be included by the NRF + in the request to the NRF and may be included by the NRF in NFRegister or NFUpdate (NF Profile Complete Replacement) response. true: the NF Profile contains NF Profile changes. false (default): complete NF Profile."; - + type boolean; max-elements 1; } list defaultNotificationSubscriptions { description "Notification endpoints for different notification types. - This attribute may contain multiple default subscriptions for a same + This attribute may contain multiple default subscriptions for a same notification type; in that case, those default subscriptions are used as alternative notification endpoints."; key notificationType; @@ -520,7 +520,7 @@ grouping ManagedNFProfileGrp { reference "clause 6.3 of 3gpp TS 29.500"; max-elements 1; type boolean; - } + } leaf-list olcHSupportInd { description "This parameter indicates whether the NF supports or does not support Overload Control based on OCI Header ."; @@ -529,7 +529,7 @@ grouping ManagedNFProfileGrp { type boolean; } leaf-list nfSetRecoveryTimeList { - description "This parameter contains the recovery time of NF Set(s) + description "This parameter contains the recovery time of NF Set(s) indicated by the NfSetId, where the NF instance belongs."; type yang:date-and-time ; max-elements 1; @@ -548,7 +548,7 @@ grouping ManagedNFProfileGrp { type string; } leaf vendorId { - description "Vendor ID of the NF instance, according to the + description "Vendor ID of the NF instance, according to the IANA-assigned SMI Network Management Private Enterprise Codes [77]. allowedValues: 6 decimal digits; if the SMI code has less than 6 digits, it shall be padded with leading digits 0 to complete @@ -567,8 +567,8 @@ grouping ManagedNFProfileGrp { type inet:domain-name; } list nfServices { - description "List of NF Service Instances. It shall include - the services produced by the NF that can be + description "List of NF Service Instances. It shall include + the services produced by the NF that can be discovered by other NFs."; key serviceInstanceID; min-elements 1; @@ -578,7 +578,7 @@ grouping ManagedNFProfileGrp { // description "It indicates a map of Vendor-Specific features, where the // key of the map is the IANA-assigned SMI Network Management Private // Enterprise Codes and the value of each entry of the map shall be - // a list (array) of VendorSpecificFeature objects as defined + // a list (array) of VendorSpecificFeature objects as defined // in the clause 5.3.247."; // type string; // min-elements 1; @@ -592,22 +592,22 @@ grouping ManagedNFProfileGrp { uses SelectionConditionsGrp; } leaf-list canaryRelease { - description "This attribute indicates whether an NF instance whose + description "This attribute indicates whether an NF instance whose nfStatus is set to REGISTERED is in Canary Release condition, i.e. it should only be selected by NF Service Consumers under the conditions indicated by the selectionConditions attribute. - True: the NF is under Canary Release condition, even if the + True: the NF is under Canary Release condition, even if the nfStatus is set to REGISTERED - False: the NF instance indicates its Canary Release condition + False: the NF instance indicates its Canary Release condition via the nfStatus attribute"; max-elements 1; type boolean; } leaf-list exclusiveCanaryReleaseSelection { - description "This attribute indicates whether an NF Service - Consumer should only select an NF Service Producer in Canary + description "This attribute indicates whether an NF Service + Consumer should only select an NF Service Producer in Canary Release condition. - True: the consumer shall only select producers in Canary Release + True: the consumer shall only select producers in Canary Release condition False: the consumer may select producers not in Canary Release condition"; @@ -615,9 +615,9 @@ grouping ManagedNFProfileGrp { type boolean; } leaf sharedProfileDataId { - description "This attribute indicates a string uniquely identifying + description "This attribute indicates a string uniquely identifying Shared Profile Data. The format of the sharedProfileDataId shall be - a Universally Unique Identifier (UUID) version 4, as described in + a Universally Unique Identifier (UUID) version 4, as described in IETF RFC 4122 [44]. The hexadecimal letters should be formatted as lower-case characters by the sender, and they shall be handled as case-insensitive by the receiver. @@ -625,8 +625,8 @@ grouping ManagedNFProfileGrp { type string; } leaf-list shutdownTime { - description "It indicates the timestamp when the NF Instance is - planned to be shut down. This attribute may be present if the + description "It indicates the timestamp when the NF Instance is + planned to be shut down. This attribute may be present if the nfStatus is set to UNDISCOVERABLE due to scheduled shutdown"; type yang:date-and-time ; max-elements 1; @@ -634,25 +634,25 @@ grouping ManagedNFProfileGrp { leaf supportedRcfs { description "It represents a list of Resource Content Filter IDs"; type string; - } + } leaf canaryPrecedenceOverPreferred { - description "ManagedNFProfile.canaryPrecedenceOverPreferred This - attribute indicates whether the NRF shall prioritize the NF Service - Producer in Canary Release condition over the preferences + description "ManagedNFProfile.canaryPrecedenceOverPreferred This + attribute indicates whether the NRF shall prioritize the NF Service + Producer in Canary Release condition over the preferences (preferred-xxx, ext-preferred-xxx) present in NF discovery requests. - allowedValues: + allowedValues: True NRF shall prioritize NF Service Producers in Canary Release condition at NF discovery requests, i.e. NF Service Producers - determined according to preferred-xxx and/or ext-preferred-xxx - shall be prioritized after the NF Service Producers in Canary + determined according to preferred-xxx and/or ext-preferred-xxx + shall be prioritized after the NF Service Producers in Canary Release condition. The associated NF (service) priorities for Service Producers in Canary Release condition shall not be modified by NRF. - False NRF shall prioritize the NF Service Producers according to + False NRF shall prioritize the NF Service Producers according to preferred-xxx and/or ext-preferred-xxx (i.e. Canary Release condition - in NF Service Producers shall not be prioritized over NF Service + in NF Service Producers shall not be prioritized over NF Service Consumer preferences at NF discovery requests)"; type boolean; - } + } typedef NFStatus { type enumeration { enum REGISTERED; @@ -660,6 +660,6 @@ grouping ManagedNFProfileGrp { } } -} +} } diff --git a/yang-models/_3gpp-5gc-nrm-n3iwffunction.yang b/yang-models/_3gpp-5gc-nrm-n3iwffunction.yang index 25dc78827..44d09552d 100755 --- a/yang-models/_3gpp-5gc-nrm-n3iwffunction.yang +++ b/yang-models/_3gpp-5gc-nrm-n3iwffunction.yang @@ -1,31 +1,31 @@ module _3gpp-5gc-nrm-n3iwffunction { yang-version 1.1; - + namespace urn:3gpp:sa5:_3gpp-5gc-nrm-n3iwffunction; prefix n3iwf3gpp; - + import _3gpp-common-managed-function { prefix mf3gpp; } import _3gpp-common-managed-element { prefix me3gpp; } import _3gpp-common-yang-types { prefix types3gpp; } import _3gpp-5g-common-yang-types { prefix types5g3gpp; } import _3gpp-common-top { prefix top3gpp; } - + organization "3gpp SA5"; description "This IOC represents the N3IWF function which is used to enable non-3GPP access networks connected to the 5GC. For more information about the N3IWF, see 3GPP TS 23.501. - Copyright 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + Copyright 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved."; reference "3GPP TS 28.541"; - - revision 2023-09-18 { reference CR-1043 ; } + + revision 2023-09-18 { reference CR-1043 ; } revision 2019-10-28 { reference S5-193518 ; } revision 2019-05-22 { description "initial revision"; } - + grouping N3IWFFunctionGrp { uses mf3gpp:ManagedFunctionGrp; - + list pLMNIdList { description "List of at most six entries of PLMN Identifiers, but at least one (the primary PLMN Id). The PLMN Identifier is composed of a Mobile Country Code (MCC) and a Mobile Network Code (MNC)."; @@ -42,7 +42,7 @@ module _3gpp-5gc-nrm-n3iwffunction { uses types5g3gpp:CommModel; } } - + augment "/me3gpp:ManagedElement" { list N3IWFFunction { description "5G Core N3IWF Function"; diff --git a/yang-models/_3gpp-5gc-nrm-neffunction.yang b/yang-models/_3gpp-5gc-nrm-neffunction.yang index a1034491b..7ae26ae98 100755 --- a/yang-models/_3gpp-5gc-nrm-neffunction.yang +++ b/yang-models/_3gpp-5gc-nrm-neffunction.yang @@ -1,9 +1,9 @@ module _3gpp-5gc-nrm-neffunction { yang-version 1.1; - + namespace urn:3gpp:sa5:_3gpp-5gc-nrm-neffunction; prefix nef3gpp; - + import _3gpp-common-managed-function { prefix mf3gpp; } import _3gpp-common-managed-element { prefix me3gpp; } import ietf-inet-types { prefix inet; } @@ -12,62 +12,62 @@ module _3gpp-5gc-nrm-neffunction { import _3gpp-common-top { prefix top3gpp; } import _3gpp-5g-common-yang-types { prefix types5g3gpp; } import _3gpp-5gc-nrm-managed-nfprofile { prefix mnfp3gpp; } - + organization "3gpp SA5"; contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464"; - description "This IOC represents the NEF function in 5GC. For more + description "This IOC represents the NEF function in 5GC. For more information about the NEF, see 3GPP TS 23.501. - Copyright 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + Copyright 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved."; reference "3GPP TS 28.541"; revision 2025-07-25 { reference CR-1558 ; } revision 2025-03-25 { reference CR-1489 ; } - revision 2025-01-25 { reference CR-1442 ; } - revision 2024-05-18 { reference CR-1273 ; } - revision 2024-04-12 { reference CR-1218 ; } + revision 2025-01-25 { reference CR-1442 ; } + revision 2024-05-18 { reference CR-1273 ; } + revision 2024-04-12 { reference CR-1218 ; } revision 2023-09-18 { reference CR-1103 ; } - revision 2023-09-18 { reference CR-1043 ; } + revision 2023-09-18 { reference CR-1043 ; } revision 2023-04-26 { reference CR-0916 ; } revision 2022-01-07 { reference CR-0643; } revision 2020-11-06 { reference CR-0412 ; } revision 2019-10-20 { reference "initial revision"; } - + grouping DnnInfoItemGrp { - description "This data type represents set of parameters supported by NF + description "This data type represents set of parameters supported by NF for a given S-NSSAI. (See clause 6.1.6.2.97 of TS 29.510)"; - + leaf dnn { type string; mandatory true; - description "String representing a Data Network as defined in clause 9A - of 3GPP TS 23.003; it shall contain either a DNN Network Identifier, - or a full DNN with both the Network Identifier and Operator Identifier, - as specified in 3GPP TS 23.003 clause 9.1.1 and 9.1.2. It shall be - coded as string in which the labels are separated by dots - (e.g. 'Label1.Label2.Label3'). - - Whether the dnn data type contains just the DNN Network Identifier, or - the Network Identifier plus the Operator Identifier, shall be + description "String representing a Data Network as defined in clause 9A + of 3GPP TS 23.003; it shall contain either a DNN Network Identifier, + or a full DNN with both the Network Identifier and Operator Identifier, + as specified in 3GPP TS 23.003 clause 9.1.1 and 9.1.2. It shall be + coded as string in which the labels are separated by dots + (e.g. 'Label1.Label2.Label3'). + + Whether the dnn data type contains just the DNN Network Identifier, or + the Network Identifier plus the Operator Identifier, shall be documented in each API where this data type is used."; } } - + grouping SnssaiInfoItemGrp { - description "This data type represents set of parameters supported by NF + description "This data type represents set of parameters supported by NF for a given S-NSSAI. (See clause 6.1.6.2.97 of TS 29.510)"; - + list sNssai { - description "It represents the S-NSSAI the NetworkSlice managed object - is supporting. The S-NSSAI is defined in TS 23.003."; + description "It represents the S-NSSAI the NetworkSlice managed object + is supporting. The S-NSSAI is defined in TS 23.003."; min-elements 1; key idx; leaf idx { type uint32 ; } uses types5g3gpp:SNssai; } - + list dnnInfoList{ - description "It represents list of parameters supported by the + description "It represents list of parameters supported by the NF per DNN."; min-elements 1; key idx; @@ -75,61 +75,61 @@ module _3gpp-5gc-nrm-neffunction { uses DnnInfoItemGrp; } } - + grouping AfEventExposureDataGrp { - description "This data type represents the AF Event Exposure data managed + description "This data type represents the AF Event Exposure data managed by a given NEF Instance. (See clause 6.1.6.2.50 TS 29.510"; - + leaf-list afEvents { // stage 2 double defined type string; min-elements 1; - description "It represents AF Event(s) exposed by the NEF after + description "It represents AF Event(s) exposed by the NEF after registration of the AF(s) at the NEF."; } - + leaf-list afIds { type string; min-elements 1; - description "It represents list of application function identifiers of + description "It represents list of application function identifiers of the managed PFDs."; } - + leaf-list appIds { // stage 2 shaky type string; min-elements 1; description "It represents list of internal application identifiers."; } } - + grouping PfdDataGrp { - description "This data type represents the list of Application IDs - and/or AF IDs managed by a given NEF Instance. + description "This data type represents the list of Application IDs + and/or AF IDs managed by a given NEF Instance. (See clause 6.1.6.2.49 TS 29.510)"; - + leaf-list appIds { // stage 2 shaky type string; min-elements 1; description "It represents list of internal application identifiers."; } - + leaf-list afIds { type string; min-elements 1; - description "It represents list of application function identifiers of + description "It represents list of application function identifiers of the managed PFDs."; } } - + grouping UnTrustAfInfoGrp { - description "This data type represents information of an untrusted AF + description "This data type represents information of an untrusted AF Instance. (See clause 6.1.6.2.95 TS 29.510)"; - + leaf afId { type string; mandatory true; description "It represents associated AF id."; } - + list sNssaiInfoList { description "It represents S-NSSAIs and DNNs supported by the AF."; min-elements 1; @@ -137,21 +137,21 @@ module _3gpp-5gc-nrm-neffunction { leaf idx { type uint32 ; } uses SnssaiInfoItemGrp; } - + leaf mappingInd { type boolean; yext3gpp:initial-value false; - description "When present, this attribute indicates whether the - AF supports mapping between UE IP address (IPv4 address or IPv6 prefix) + description "When present, this attribute indicates whether the + AF supports mapping between UE IP address (IPv4 address or IPv6 prefix) and UE ID (i.e. GPSI). True: the AF supports mapping between UE IP address and UE ID; - False: the AF does not support mapping between UE IP address + False: the AF does not support mapping between UE IP address and UE ID."; } } - + grouping NefInfoGrp { - description "This data type represents information of an NEF Instance. + description "This data type represents information of an NEF Instance. (See clause 6.1.6.2.48 TS 29.510)."; list taiList { @@ -173,73 +173,73 @@ module _3gpp-5gc-nrm-neffunction { leaf idx { type uint32 ; } uses types5g3gpp:TaiRangeGrp; } - + leaf nefId { type string; mandatory true; - description "It represents the NEF ID. + description "It represents the NEF ID. (see clause 6.1.6.3.2 of TS 29.510)"; } - + list pfdData { config false; - description "It represents PFD data, containing the list of internal - application identifiers and/or the list of application function + description "It represents PFD data, containing the list of internal + application identifiers and/or the list of application function identifiers for which the PFDs can be provided. - Absence of this attribute indicates that the PFDs for any internal - application identifier and for any application function identifier + Absence of this attribute indicates that the PFDs for any internal + application identifier and for any application function identifier can be provided."; min-elements 1; key idx; leaf idx { type uint32 ; } uses PfdDataGrp; } - + list afEeData { config false; - description "It represents the AF provided event exposure data. The NEF + description "It represents the AF provided event exposure data. The NEF registers such information in the NRF on behalf of the AF."; min-elements 1; key idx; leaf idx { type uint32 ; } uses AfEventExposureDataGrp; } - + list gpsiRanges { - description "It represents list of ranges of GPSIs whose profile data + description "It represents list of ranges of GPSIs whose profile data is available."; min-elements 1; key idx; leaf idx { type uint32 ; } uses mnfp3gpp:IdentityRange; } - - list externalGroupIdentifiersRanges { - description "It represents list of ranges of external groups whose + + list externalGroupIdentifiersRanges { + description "It represents list of ranges of external groups whose profile data is available."; // stage 2 definition is shaky min-elements 1; key idx; leaf idx { type uint32 ; } uses mnfp3gpp:IdentityRange; } - + leaf-list servedFqdnList { type string; min-elements 1; - description "It represents pattern (regular expression according to - the ECMA-262 dialect [75]) representing the Domain names served by + description "It represents pattern (regular expression according to + the ECMA-262 dialect [75]) representing the Domain names served by the NEF."; } - + leaf-list dnaiList { type string; min-elements 1; - description "It represents list of Data network access identifiers - supported by the NEF. The absence of this attribute indicates that + description "It represents list of Data network access identifiers + supported by the NEF. The absence of this attribute indicates that the NEF can be selected for any DNAI."; } - + list unTrustAfInfoList { description "It represents list of information corresponding to the AFs."; min-elements 1; @@ -247,7 +247,7 @@ module _3gpp-5gc-nrm-neffunction { leaf idx { type uint32 ; } uses UnTrustAfInfoGrp; } - + leaf uasNfFunctionalityInd { type boolean; yext3gpp:initial-value false; @@ -256,42 +256,42 @@ module _3gpp-5gc-nrm-neffunction { - True: UAS NF functionality is supported by the NEF. - False (default): UAS NF functionality is not supported by the NEF"; } - + leaf multiMemAfSessQosInd { type boolean; default false; - description "This attribute indicates whether the NEF supports + description "This attribute indicates whether the NEF supports Multi-member AF session with required QoS functionality: - - TRUE: Multi-member AF session with required QoS functionality is + - TRUE: Multi-member AF session with required QoS functionality is supported by the NEF - - FALSE (default): Multi-member AF session with required QoS + - FALSE (default): Multi-member AF session with required QoS functionality is not supported by the NEF."; } - + leaf memberUESelAssistInd { type boolean; default false; - description "This attribute indicates whether the NEF supports member + description "This attribute indicates whether the NEF supports member UE selection assistance functionality: - - TRUE: member UE selection assistance functionality is supported by + - TRUE: member UE selection assistance functionality is supported by the NEF - - FALSE (default): member UE selection assistance functionality is + - FALSE (default): member UE selection assistance functionality is not supported by the NEF."; } } - + grouping NEFFunctionGrp { description "Represents the NEFFunction IOC"; uses mf3gpp:ManagedFunctionGrp; - + leaf sBIFQDN { - description "The FQDN of the registered NF instance in the + description "The FQDN of the registered NF instance in the service-based interface."; type inet:domain-name; } - + list sNSSAIList { description "List of S-NSSAIs the managed object is capable of supporting. (Single Network Slice Selection Assistance Information) @@ -308,18 +308,18 @@ module _3gpp-5gc-nrm-neffunction { key idx; uses types3gpp:ManagedNFProfile; } - + leaf-list capabilityList { description "List of supported capabilities of the NEF."; reference "3GPP TS 23.003"; type string; } - + leaf isCAPIFSup { type boolean; yext3gpp:inVariant; } - + list nefInfo { description "This attribute represents information of an NEF NF Instance."; key idx; @@ -327,7 +327,7 @@ module _3gpp-5gc-nrm-neffunction { uses NefInfoGrp; } } - + augment "/me3gpp:ManagedElement" { list NEFFunction { description "5G Core NEF Function"; diff --git a/yang-models/_3gpp-5gc-nrm-nfprofile.yang b/yang-models/_3gpp-5gc-nrm-nfprofile.yang index 354d8b8ac..bb632e6df 100755 --- a/yang-models/_3gpp-5gc-nrm-nfprofile.yang +++ b/yang-models/_3gpp-5gc-nrm-nfprofile.yang @@ -1,14 +1,14 @@ module _3gpp-5gc-nrm-nfprofile { yang-version 1.1; - + namespace urn:3gpp:sa5:_3gpp-5gc-nrm-nfprofile; prefix nfp3gpp; - + import _3gpp-common-yang-types { prefix types3gpp; } import ietf-inet-types { prefix inet; } import ietf-yang-types { prefix yang; } import _3gpp-5gc-nrm-nfservice { prefix nfs3gpp; } - import _3gpp-5g-common-yang-types { prefix types5g3gpp; } + import _3gpp-5g-common-yang-types { prefix types5g3gpp; } import _3gpp-5gc-nrm-nwdaffunction { prefix nwdaf3gpp; } import _3gpp-5gc-nrm-lmffunction {prefix lmf3gpp; } import _3gpp-5gc-nrm-gmlcfunction {prefix gmlc3gpp; } @@ -16,37 +16,37 @@ module _3gpp-5gc-nrm-nfprofile { organization "3gpp SA5"; contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464"; description "NF profile class. - Copyright 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + Copyright 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved."; reference "3GPP TS 29.510"; - revision 2025-03-25 { reference CR-1489 ; } - revision 2025-01-25 { reference CR-1442 ; } - revision 2024-04-12 { reference CR-1218 ; } + revision 2025-03-25 { reference CR-1489 ; } + revision 2025-01-25 { reference CR-1442 ; } + revision 2024-04-12 { reference CR-1218 ; } revision 2023-11-18 { reference CR-1103 ; } - revision 2023-09-18 { reference CR-1043 ; } + revision 2023-09-18 { reference CR-1043 ; } revision 2023-02-14 { reference CR-0891; } revision 2019-06-17 { reference "initial revision"; } - + grouping NFProfileGrp { leaf nfInstanceId { description "String uniquely identifying a NF instance."; mandatory true; type string; } - + leaf nfType { description "Type of Network Function."; mandatory true; type types3gpp:NfType; } - + leaf nfStatus { description "Status of the NF Instance."; mandatory true; type NFStatus; } - + leaf heartBeatTimer { description "Time in seconds expected between 2 consecutive heart-beat messages from an NF Instance to the NRF. @@ -55,19 +55,19 @@ module _3gpp-5gc-nrm-nfprofile { heartbeat time proposed by the NF service consumer."; type uint16; } - + list plmnList { description "PLMN(s) of the Network Function. This IE shall be present if this information is available for the NF. If not provided, PLMN ID(s) of the PLMN of the NRF are assumed for the NF."; - + min-elements 1; key "mcc mnc"; uses types3gpp:PLMNId; } - - list sNssais { + + list sNssais { description "S-NSSAIs of the Network Function. If not provided, the NF can serve any S-NSSAI. When present this IE represents the list of S-NSSAIs supported in @@ -76,7 +76,7 @@ module _3gpp-5gc-nrm-nfprofile { key "sst sd"; uses Snssai; } - + list perPlmnSnssaiList { description "This IE may be included when the list of S-NSSAIs supported by the NF for each PLMN it is supporting @@ -85,88 +85,88 @@ module _3gpp-5gc-nrm-nfprofile { the Network Function. When present, this IE shall override sNssais IE."; min-elements 1; - key idx; + key idx; leaf idx { type uint32; } uses PlmnSnssai; } - + leaf-list nsiList { description "NSI identities of the Network Function. If not provided, the NF can serve any NSI."; min-elements 1; type string; } - + leaf fqdn { description "FQDN of the Network Function. For AMF, the FQDN registered with the NRF shall be that of the AMF Name."; type inet:domain-name; } - + leaf interPlmnFqdn { description "If the NF needs to be discoverable by other NFs in a different PLMN, then an FQDN that is used for inter-PLMN routing is specified."; type inet:domain-name; } - + leaf-list ipv4Addresses { description "IPv4 address(es) of the Network Function."; min-elements 1; type inet:ipv4-address; } - + leaf-list ipv6Addresses { description "IPv6 address(es) of the Network Function."; min-elements 1; type inet:ipv6-address; } - + list allowedPlmns { description "PLMNs allowed to access the NF instance. If not provided, any PLMN is allowed to access the NF."; - + min-elements 1; key "mcc mnc"; uses types3gpp:PLMNId; } - + leaf-list allowedNfTypes { description "Type of the NFs allowed to access the NF instance. If not provided, any NF type is allowed to access the NF."; min-elements 1; type types3gpp:NfType; } - + leaf-list allowedNfDomains { - description "Pattern representing the NF domain names allowed - to access the NF instance. If not provided, + description "Pattern representing the NF domain names allowed + to access the NF instance. If not provided, any NF domain is allowed to access the NF."; min-elements 1; type string; } - - list allowedNssais { + + list allowedNssais { description "S-NSSAI of the allowed slices to access the NF instance. If not provided, any slice is allowed to access the NF."; min-elements 1; key "sst sd"; uses Snssai; } - + leaf priority { description "Priority (relative to other NFs of the same type) in the range of 0-65535, to be used for NF selection; lower values indicate a higher priority. If priority is also present in the nfServiceList parameters, - those will have precedence over this value. + those will have precedence over this value. The NRF may overwrite the received priority value when exposing an NFProfile with the Nnrf_NFDiscovery service."; type uint16; } - + leaf capacity { description "Static capacity information in the range of 0-65535, expressed as a weight relative to other NF instances of @@ -174,21 +174,21 @@ module _3gpp-5gc-nrm-nfprofile { parameters, those will have precedence over this value."; type uint16; } - + leaf load { description "Dynamic load information, ranged from 0 to 100, indicates the current load percentage of the NF."; type types3gpp:Load; } - + leaf locality { description "Operator defined information about the location of the NF instance (e.g. geographic location, data center)."; type string; } - + grouping udrInfo { - + leaf groupId { description "Identity of the UDR group that is served by the UDR instance. @@ -196,7 +196,7 @@ module _3gpp-5gc-nrm-nfprofile { to any UDR group."; type string; } - + list supiRanges { description "List of ranges of SUPI's whose profile data is available in the UDR instance."; @@ -204,7 +204,7 @@ module _3gpp-5gc-nrm-nfprofile { min-elements 1; uses SupiRange; } - + list gpsiRanges { description "List of ranges of GPSIs whose profile data is available in the UDR instance."; @@ -212,7 +212,7 @@ module _3gpp-5gc-nrm-nfprofile { min-elements 1; uses IdentityRange; } - + list externalGroupIdentifiersRanges { description "List of ranges of external groups whose profile data is available in the UDR instance."; @@ -220,7 +220,7 @@ module _3gpp-5gc-nrm-nfprofile { min-elements 1; uses IdentityRange; } - + leaf-list supportedDataSets { description "List of supported data sets in the UDR instance. If not provided, the UDR supports all data sets."; @@ -228,32 +228,32 @@ module _3gpp-5gc-nrm-nfprofile { type DataSetId; } } - + grouping udmInfo { - + leaf groupId { - description "Identity of the UDM group that is served by the + description "Identity of the UDM group that is served by the UDM instance. If not provided, the UDM instance does not pertain to any UDM group."; type string; } - + list supiRanges { - description "List of ranges of SUPI's whose profile data is + description "List of ranges of SUPI's whose profile data is available in the UDM instance."; key "start end pattern"; min-elements 1; uses SupiRange; } - + list gpsiRanges { - description "List of ranges of GPSIs whose profile data is + description "List of ranges of GPSIs whose profile data is available in the UDM instance."; key "start end pattern"; min-elements 1; uses IdentityRange; } - + list externalGroupIdentifiersRanges { description "List of ranges of external groups whose profile data is available in the UDM instance."; @@ -261,227 +261,227 @@ module _3gpp-5gc-nrm-nfprofile { min-elements 1; uses IdentityRange; } - + leaf-list routingIndicators { description "List of Routing Indicator information that allows to route network signalling with SUCI - to the UDM instance. If not provided, + to the UDM instance. If not provided, the UDM can serve any Routing Indicator. Pattern: '^[0-9]{1,4}$'."; min-elements 1; type string; } } - + grouping ausfInfo { - + leaf groupId { - description "Identity of the AUSF group. If not provided, + description "Identity of the AUSF group. If not provided, the AUSF instance does not pertain to any AUSF group."; type string; } - + list supiRanges { - description "List of ranges of SUPIs that can be served by + description "List of ranges of SUPIs that can be served by the AUSF instance. If not provided, the AUSF can serve any SUPI."; key "start end pattern"; min-elements 1; uses SupiRange; } - + leaf-list routingIndicators { description "List of Routing Indicator information that allows to route network signalling with SUCI - to the AUSF instance. If not provided, + to the AUSF instance. If not provided, the AUSF can serve any Routing Indicator. Pattern: '^[0-9]{1,4}$'."; min-elements 1; type string; } } - + grouping amfInfo { - + leaf amfRegionId { description "AMF region identifier"; type string; } - + leaf amfSetId { description "AMF set identifier"; type string; } - + list guamiList { description "List of supported GUAMIs."; - - key idx; + + key idx; leaf idx { type uint32; } - + min-elements 1; uses Guami; } - + list taiList { - description "The list of TAIs the AMF can serve. + description "The list of TAIs the AMF can serve. It may contain the non-3GPP access TAI. - The absence of this attribute and + The absence of this attribute and the taiRangeList attribute indicate that the AMF can be selected for any TAI in the serving network."; - - key idx; + + key idx; leaf idx { type uint32; } - + min-elements 1; uses types3gpp:TaiGrp; } - + list taiRangeList { - description "The range of TAIs the AMF can serve. + description "The range of TAIs the AMF can serve. The absence of this attribute and the taiList attribute indicate that the AMF can be selected for any TAI in the serving network."; min-elements 1; - key idx; + key idx; leaf idx { type uint32; } uses types5g3gpp:TaiRangeGrp; } - + list backupInfoAmfFailure { description "List of GUAMIs for which the AMF acts as a backup for AMF failure."; - - key idx; + + key idx; leaf idx { type uint32; } - + min-elements 1; uses Guami; } - + list backupInfoAmfRemoval { description "List of GUAMIs for which the AMF acts as a backup for planned AMF removal."; - - key idx; + + key idx; leaf idx { type uint32; } - + min-elements 1; uses Guami; } - + list n2InterfaceAmfInfo { - description "N2 interface information of the AMF. + description "N2 interface information of the AMF. This information needs not be sent in NF Discovery responses. It may be used by the NRF to update the DNS for AMF discovery by the 5G Access Network."; - + max-elements 1; - key idx; + key idx; leaf idx { type uint32; } uses N2InterfaceAmfInfo; } } - + grouping smfInfo { - + list sNssaiSmfInfoList { description "List of parameters supported by the SMF per S-NSSAI."; min-elements 1; - key idx; + key idx; leaf idx { type uint32; } uses sNssaiSmfInfoItem; } - + list taiList { - description "The list of TAIs the SMF can serve. + description "The list of TAIs the SMF can serve. It may contain the non-3GPP access TAI. - The absence of this attribute and the taiRangeList + The absence of this attribute and the taiRangeList attribute indicate that - the SMF can be selected for any TAI + the SMF can be selected for any TAI in the serving network."; - - key idx; + + key idx; leaf idx { type uint32; } - + min-elements 1; uses types3gpp:TaiGrp; } - + list taiRangeList { - description "The range of TAIs the SMF can serve. + description "The range of TAIs the SMF can serve. The absence of this attribute and the taiList - attribute indicate that the SMF can be selected + attribute indicate that the SMF can be selected for any TAI in the serving network."; min-elements 1; - key idx; + key idx; leaf idx { type uint32; } uses types5g3gpp:TaiRangeGrp; } - + leaf pgwFqdn { description "The FQDN of the PGW if the SMF is a combined SMF/PGW-C."; type inet:domain-name; } - + leaf-list accessType { - description "If included, this IE shall contain the access type + description "If included, this IE shall contain the access type (3GPP_ACCESS and/or NON_3GPP_ACCESS) supported by the SMF. If not included, it shall be assumed the both access types are supported."; - + min-elements 1; max-elements 2; type AccessType; } } - + grouping upfInfo { - + list sNssaiUpfInfoList { description "List of parameters supported by the UPF per S-NSSAI."; min-elements 1; - key idx; + key idx; leaf idx { type uint32; } uses SnssaiUpfInfoItem; } - + leaf-list smfServingArea { description "The SMF service area(s) the UPF can serve. If not provided, the UPF can serve any SMF service area."; - + min-elements 1; type string; } - + list interfaceUpfInfo { - description "List of User Plane interfaces configured on the UPF. + description "List of User Plane interfaces configured on the UPF. When this IE is provided in the NF Discovery response, the NF Service Consumer (e.g. SMF) may use this information for UPF selection."; - - key idx; + + key idx; leaf idx { type uint32; } - + min-elements 1; uses InterfaceUpfInfoItem; } - + leaf iwkEpsInd { description "Indicates whether interworking with EPS is supported by the UPF. true: Supported false (default): Not Supported"; - + type boolean; } - + leaf-list pduSessionTypes { - description "List of PDU session type(s) supported by the UPF. + description "List of PDU session type(s) supported by the UPF. The absence of this attribute indicates that the UPF can be selected for any PDU session type."; - + min-elements 1; type PduSessionType; } @@ -497,7 +497,7 @@ module _3gpp-5gc-nrm-nfprofile { } leaf proseL2UetoNetworkRelay { type boolean; - description "Indicates support for ProSe Layer-2 + description "Indicates support for ProSe Layer-2 UE-to-Network Relay.."; } leaf proseL3UetoNetworkRelay { @@ -512,17 +512,17 @@ module _3gpp-5gc-nrm-nfprofile { } leaf proseL3RemoteUe { type boolean; - description "Indicates support for ProSe Layer-3 + description "Indicates support for ProSe Layer-3 Remote UE."; } leaf proseL2UetoUeRelay { type boolean; - description "Indicates support for ProSe Layer-2 + description "Indicates support for ProSe Layer-2 UE-to-UE Relay."; } leaf proseL3UetoUeRelay { type boolean; - description "Indicates support for ProSe Layer-3 + description "Indicates support for ProSe Layer-3 UE-to-UE Relay."; } leaf proseL2EndUe { @@ -535,7 +535,7 @@ module _3gpp-5gc-nrm-nfprofile { } leaf proseL3IntermRelay { type boolean; - description "Indicates support for ProSe Layer-3 + description "Indicates support for ProSe Layer-3 Intermediate Relay."; } leaf proseL3MultihopRemote { @@ -544,7 +544,7 @@ module _3gpp-5gc-nrm-nfprofile { } leaf proseL3NetMultihopRelay { type boolean; - description "Indicates support for ProSe Layer-3 Network Multihop + description "Indicates support for ProSe Layer-3 Network Multihop Relay."; } leaf proseL3UeMultihopRelay { @@ -554,18 +554,18 @@ module _3gpp-5gc-nrm-nfprofile { leaf proseL3EndUeMultihop { type boolean; description "Indicates support for ProSe Layer-3 End UE Multihop."; - } - } + } + } grouping pcfInfo { - + leaf-list dnnList { description "DNNs supported by the PCF. If not provided, the PCF can serve any DNN."; - + min-elements 1; type string; } - + list supiRanges { description "List of ranges of SUPIs that can be served by the PCF instance. If not provided, the PCF can serve any SUPI."; @@ -573,22 +573,22 @@ module _3gpp-5gc-nrm-nfprofile { min-elements 1; uses SupiRange; } - + leaf rxDiamHost { description "This IE shall be present if the PCF supports Rx interface. - When present, this IE shall indicate the Diameter host + When present, this IE shall indicate the Diameter host of the Rx interface for the PCF. Pattern: '^([A-Za-z0-9]+(-[A-Za-z0-9]+).)+[a-z]{2,}$'."; - + type string; } - + leaf rxDiamRealm { description "This IE shall be present if the PCF supports Rx interface. - When present, this IE shall indicate the Diameter realm + When present, this IE shall indicate the Diameter realm of the Rx interface for the PCF. Pattern: '^([A-Za-z0-9]+(-[A-Za-z0-9]+).)+[a-z]{2,}$'."; - + type string; } list proseCapability { @@ -597,32 +597,32 @@ module _3gpp-5gc-nrm-nfprofile { config false; } } - + grouping bsfInfo { - + list ipv4AddressRanges { description "List of ranges of IPv4 addresses handled by BSF. If not provided, the BSF can serve any IPv4 address."; key "start end"; uses types3gpp:Ipv4AddressRange; } - + leaf-list dnnList { description "List of DNNs handled by the BSF If not provided, the BSF can serve any DNN."; - + min-elements 1; type string; } - + leaf-list ipDomainList { - description "List of IPv4 address domains, as described in + description "List of IPv4 address domains, as described in subclause 6.2 of 3GPP TS 29.513, handled by the BSF. If not provided, the BSF can serve any IP domain."; min-elements 1; type string; } - + list ipv6PrefixRanges { description "List of ranges of IPv6 prefixes handled by the BSF. If not provided, the BSF can serve any IPv6 prefix."; @@ -630,9 +630,9 @@ module _3gpp-5gc-nrm-nfprofile { uses types3gpp:Ipv6PrefixRange; } } - + grouping chfInfo { - + list supiRangeList { description "List of ranges of SUPIs that can be served by the CHF instance. If not provided, the CHF can serve any SUPI."; @@ -640,20 +640,20 @@ module _3gpp-5gc-nrm-nfprofile { min-elements 1; uses SupiRange; } - + list gpsiRangeList { - description "List of ranges of GPSI that can be served + description "List of ranges of GPSI that can be served by the CHF instance. If not provided, the CHF can serve any GPSI."; key "start end pattern"; min-elements 1; uses IdentityRange; } - + list plmnRangeList { - description "List of ranges of PLMNs (including the PLMN + description "List of ranges of PLMNs (including the PLMN IDs of the CHF instance) that can be served by the CHF instance. If not provided, the CHF can serve any PLMN."; - + min-elements 1; key "mcc mnc"; uses types3gpp:PLMNId; @@ -662,72 +662,72 @@ module _3gpp-5gc-nrm-nfprofile { grouping pcscfInfo { description "This data type represents the information of a P-CSCF NF Instance. For more information, see clause 6.1.6.2.53 of TS 29.510."; - + leaf-list accessType { description "It provides the condition of access type of the UE when - the session AMBR shall be enforced, see TS 29.512 [60].If this + the session AMBR shall be enforced, see TS 29.512 [60].If this attribute is included in SmfInfo, it shall contain the access type - (3GPP_ACCESS and/or NON_3GPP_ACCESS) supported by the SMF.If not + (3GPP_ACCESS and/or NON_3GPP_ACCESS) supported by the SMF.If not included, it shall be assumed the both access types are supported."; type enumeration { enum 3GPP_ACCESS; enum NON_3GPP_ACCESS; - } + } min-elements 1; max-elements 2; } leaf-list dnnList { - description "It represents the DNNs supported by the PCF. The DNN, + description "It represents the DNNs supported by the PCF. The DNN, as defined in clause 9A of TS 23.003 [13], shall contain the Network - Identifier and it may additionally contain an Operator Identifier, + Identifier and it may additionally contain an Operator Identifier, as specified in TS 23.003 [13] clause 9.1.1 and 9.1.2. If the Operator Identifier is not included, the DNN is supported for all the PLMNs in the plmnList of the NF Profile.If not provided, the PCF can serve any DNN."; min-elements 1; type string; - } + } leaf-list gmFqdn { description "This attribute represents FQDN of the P-CSCF for the Gm - interface.."; + interface.."; max-elements 1; type string; } leaf-list gmIpv4Addresses { description "This attribute represents list of IPv4 addresses of of - the P-CSCF for the Gm interface."; + the P-CSCF for the Gm interface."; type inet:ipv4-address; - } + } leaf-list gmIpv6Addresses { description "This attribute represents list of IPv6 addresses of of the - P-CSCF for the Gm interface."; + P-CSCF for the Gm interface."; type inet:ipv6-address; - } + } leaf mwFqdn { - description "This attribute represents FQDN of the P-CSCF for the Mw - interface."; + description "This attribute represents FQDN of the P-CSCF for the Mw + interface."; type string; - } + } leaf-list mwIpv4Addresses { - description "List of ranges of PLMNs (including the PLMN + description "List of ranges of PLMNs (including the PLMN IDs of the CHF instance) that can be served by the CHF instance. If not provided, the CHF can serve any PLMN."; type inet:ipv4-address; - } + } leaf-list mwIpv6Addresses { description "This attribute represents list of IPv4 addresses of the P-CSCF for the Mw interface."; type inet:ipv6-address; - } + } list servedIpv4AddressRanges { - description "List of ranges of PLMNs (including the PLMN + description "List of ranges of PLMNs (including the PLMN IDs of the CHF instance) that can be served by the CHF instance. If not provided, the CHF can serve any PLMN."; - + min-elements 1; key "mcc mnc"; uses types3gpp:PLMNId; - } + } } grouping HssInfoGrp { description " Information of an HSS NF Instance"; @@ -749,7 +749,7 @@ module _3gpp-5gc-nrm-nfprofile { uses ImsiRange; } list imsPrivateIdentityRanges{ - description "This attribute defines the list of ranges of IMS Private + description "This attribute defines the list of ranges of IMS Private Identities whose profile data is available in the HSS instance."; min-elements 1; key "id"; @@ -767,7 +767,7 @@ module _3gpp-5gc-nrm-nfprofile { leaf id { description "Unique identifier for the IMSI range."; type string; - } + } uses IdentityRange; } list msisdnRanges{ @@ -778,12 +778,12 @@ module _3gpp-5gc-nrm-nfprofile { leaf id { description "Unique identifier for the IMSI range."; type string; - } + } uses IdentityRange; } list externalGroupIdentifiersRanges{ - description "This attribute defines the list of ranges of external - group IDs that can be served by this HSS instance.If not provided, + description "This attribute defines the list of ranges of external + group IDs that can be served by this HSS instance.If not provided, the HSS instance does not serve any external groups. "; min-elements 1; key "id"; @@ -800,9 +800,9 @@ module _3gpp-5gc-nrm-nfprofile { leaf id { description "Unique identifier for the IMSI range."; type string; - } + } uses NetworkNodeDiameterAddress; - } + } list additionalDiamAddresses{ description "This attribute defines the Additional Diameter Addresses of the HSS;may be present if hssDiameterAddress is present "; @@ -811,9 +811,9 @@ module _3gpp-5gc-nrm-nfprofile { leaf id { description "Unique identifier for the IMSI range."; type string; - } + } uses NetworkNodeDiameterAddress; - } + } list dnnUpfInfoList { description "List of parameters supported by the UPF per DNN."; @@ -833,224 +833,224 @@ module _3gpp-5gc-nrm-nfprofile { key "mcc mnc"; uses types3gpp:PLMNId; } - } + } grouping nrfInfoGrp { - + list servedUdrInfo { - description "This attribute contains all the udrInfo - attributes - locally configured in the NRF or the NRF received + description "This attribute contains all the udrInfo + attributes + locally configured in the NRF or the NRF received during NF registration."; - + key nfInstanceId; leaf nfInstanceId { description "String uniquely identifying a NF instance."; type string; } - + min-elements 1; uses udrInfo; } - + list servedUdmInfo { description "This attribute contains all the udmInfo attributes - locally configured in the NRF or the NRF + locally configured in the NRF or the NRF received during NF registration."; - + key nfInstanceId; leaf nfInstanceId { description "String uniquely identifying a NF instance."; type string; } - + min-elements 1; uses udmInfo; } - + list servedAusfInfo { description "This attribute contains all the ausfInfo attributes locally configured in the NRF or the NRF received during NF registration."; - + key nfInstanceId; leaf nfInstanceId { description "String uniquely identifying a NF instance."; type string; } - + min-elements 1; uses ausfInfo; } - + list servedAmfInfo { description "This attribute contains all the amfInfo attributes locally configured in the NRF or the NRF received during NF registration."; - + key nfInstanceId; leaf nfInstanceId { description "String uniquely identifying a NF instance."; type string; } - + min-elements 1; uses amfInfo; } - + list servedSmfInfo { description "This attribute contains all the smfInfo attributes locally configured in the NRF or the NRF received during NF registration."; - + key nfInstanceId; leaf nfInstanceId { description "String uniquely identifying a NF instance."; type string; } - + min-elements 1; uses smfInfo; } - + list servedUpfInfo { description "This attribute contains all the upfInfo attributes locally configured in the NRF or the NRF received during NF registration."; - + key nfInstanceId; leaf nfInstanceId { description "String uniquely identifying a NF instance."; type string; } - + min-elements 1; uses upfInfo; } - + list servedPcfInfo { description "This attribute contains all the pcfInfo attributes locally configured in the NRF or the NRF received during NF registration."; - + key nfInstanceId; leaf nfInstanceId { description "String uniquely identifying a NF instance."; type string; } - + min-elements 1; uses pcfInfo; } - + list servedBsfInfo { description "This attribute contains all the bsfInfo attributes locally configured in the NRF or the NRF received during NF registration."; - + key nfInstanceId; leaf nfInstanceId{ description "String uniquely identifying a NF instance."; type string; } - + min-elements 1; uses bsfInfo; } - + list servedChfInfo { description "This attribute contains all the bsfInfo attributes locally configured in the NRF or the NRF received during NF registration."; - + key nfInstanceId; leaf nfInstanceId { description "String uniquely identifying a NF instance."; type string; } - + min-elements 1; uses chfInfo; } list servedNwdafInfo { description "This attribute contains all the nwdafInfo attributes - locally configured in the NRF or the NRF received during NF - registration. The key of the map is the nfInstanceId of which + locally configured in the NRF or the NRF received during NF + registration. The key of the map is the nfInstanceId of which the nwdafInfo belongs to."; - + key nfInstanceId; leaf nfInstanceId { description "String uniquely identifying a NF instance."; type string; } - + min-elements 1; uses nwdaf3gpp:NwdafInfoGrp; - } + } list servedPcscfInfoList { description "This attribute contains all the pcscfInfo attributes locally configured in the NRF or the NRF received during NF registration. The key of the map is the nfInstanceId to which the map entry belongs to."; - + key nfInstanceId; leaf nfInstanceId { description "String uniquely identifying a NF instance."; type string; } - + min-elements 1; uses pcscfInfo; } list servedGmlcInfo { - description "This attribute contains all the gmlcInfo attributes - locally configured in the NRF or the NRF received during NF - registration. The key of the map is the nfInstanceId of which - the nefInfo belongs to."; + description "This attribute contains all the gmlcInfo attributes + locally configured in the NRF or the NRF received during NF + registration. The key of the map is the nfInstanceId of which + the nefInfo belongs to."; key nfInstanceId; leaf nfInstanceId { description "String uniquely identifying a NF instance."; type string; } - + min-elements 1; uses gmlc3gpp:GmlcInfoGrp; } list servedLmfInfo { - description "This attribute contains all the lmfInfo attributes - locally configured in the NRF or the NRF received during NF - registration. The key of the map is the nfInstanceId of which - the lmfInfo belongs to."; + description "This attribute contains all the lmfInfo attributes + locally configured in the NRF or the NRF received during NF + registration. The key of the map is the nfInstanceId of which + the lmfInfo belongs to."; key nfInstanceId; leaf nfInstanceId { description "String uniquely identifying a NF instance."; type string; } - + min-elements 1; uses lmf3gpp:LmfInfoGrp; } list servedNfInfo { - description "This attribute contains information of other NFs - without corresponding NF type specific Info extensions locally - configured in the NRF or the NRF received during NF registration. - The key of the map is the nfInstanceId of the NF. The map entry - is the NfInfo as defined in clause 5.3.229 representing the - information of a generic NF instance."; + description "This attribute contains information of other NFs + without corresponding NF type specific Info extensions locally + configured in the NRF or the NRF received during NF registration. + The key of the map is the nfInstanceId of the NF. The map entry + is the NfInfo as defined in clause 5.3.229 representing the + information of a generic NF instance."; key nfInstanceId; leaf nfInstanceId { description "String uniquely identifying a NF instance."; type string; } - + min-elements 1; uses nfInfoGrp; } @@ -1058,7 +1058,7 @@ module _3gpp-5gc-nrm-nfprofile { description "This attribute contains list of HssInfo attribute locally configured in the NRF or that the NRF received during NF registration. The key of the map is the nfInstanceId to which the - map entry belongs to."; + map entry belongs to."; key nfInstanceId; leaf nfInstanceId { description "String uniquely identifying a NF instance."; @@ -1066,12 +1066,12 @@ module _3gpp-5gc-nrm-nfprofile { } min-elements 1; uses HssInfoGrp; - } + } list served5gDdnmfInfo { description "This attribute contains all the 5gDdnmfInfo - attribute locally configured in the NRF or that the NRF - received during NF registration. The key of the map is - the nfInstanceId to which the map entry belongs to."; + attribute locally configured in the NRF or that the NRF + received during NF registration. The key of the map is + the nfInstanceId to which the map entry belongs to."; key nfInstanceId; leaf nfInstanceId { description "String uniquely identifying a NF instance."; @@ -1079,95 +1079,95 @@ module _3gpp-5gc-nrm-nfprofile { } min-elements 1; uses FiveGDdnmfInfo ; - } + } } list nrfInfo { description "nrfinfo"; - key idx; + key idx; leaf idx { type uint32; } max-elements 1; uses nrfInfoGrp; } list nfInfo { description "nrfinfo"; - key idx; + key idx; leaf idx { type uint32; } max-elements 1; uses nfInfoGrp; } grouping nfInfoGrp { - description "This data type represents the information of a - generic NF Instance. (See clause 6.1.6.2.56 TS 29.510 [23])."; + description "This data type represents the information of a + generic NF Instance. (See clause 6.1.6.2.56 TS 29.510 [23])."; leaf nfType { description "This parameter defines type of Network Function"; - type uint16; + type uint16; } - } - + } + leaf customInfo { description "Specific data for custom Network Functions."; type string; } - + leaf recoveryTime { description "Timestamp when the NF was (re)started."; type yang:date-and-time; } - + leaf nfServicePersistence { description "If present, and set to true, it indicates that the different service instances of a same NF Service in this NF instance, - + supporting a same API version, are capable to persist their resource state in shared storage and therefore these resources are available after a new NF service instance supporting - the same API version is selected by a NF + the same API version is selected by a NF Service Consumer (see 3GPP TS 23.527). Otherwise, it indicates that the NF Service - Instances of + Instances of a same NF Service are not capable to share resource state inside the NF Instance."; - + type boolean; } - + list nfServices { - description "List of NF Service Instances. It shall include - the services produced by the NF that can be + description "List of NF Service Instances. It shall include + the services produced by the NF that can be discovered by other NFs."; key serviceInstanceID; min-elements 1; uses nfs3gpp:NFServiceGrp; } - + leaf nfProfileChangesSupportInd { description "NF Profile Changes Support Indicator. - This IE may be present + This IE may be present in the NFRegister or NFUpdate (NF Profile Complete - Replacement) request + Replacement) request and shall be absent in the response. true: the NF Service Consumer supports receiving NF Profile Changes in the response. - false (default): the NF Service Consumer does not support + false (default): the NF Service Consumer does not support receiving NF Profile Changes in the response."; - + type boolean; } - + leaf nfProfileChangesInd { description "NF Profile Changes Indicator. This IE shall be absent - in the request to the NRF and may be included by the NRF + in the request to the NRF and may be included by the NRF in NFRegister or NFUpdate (NF Profile Complete Replacement) response. true: the NF Profile contains NF Profile changes. false (default): complete NF Profile."; - + type boolean; } - + list defaultNotificationSubscriptions { description "Notification endpoints for different notification types."; key notificationType; @@ -1175,14 +1175,14 @@ module _3gpp-5gc-nrm-nfprofile { uses types3gpp:DefaultNotificationSubscription; } } - + typedef NFStatus { type enumeration { enum REGISTERED; enum SUSPENDED; } } - + typedef DataSetId { type enumeration { enum SUBSCRIPTION; @@ -1191,41 +1191,41 @@ module _3gpp-5gc-nrm-nfprofile { enum APPLICATION; } } - + grouping SupiRange { leaf start { description "First value identifying the start of a SUPI range. - To be used when the range of SUPI's can be - represented + To be used when the range of SUPI's can be + represented as a numeric range (e.g., IMSI ranges)."; type string { pattern '^[0-9]+$'; } } - + leaf end { - description "Last value identifying the end of + description "Last value identifying the end of a SUPI range. - To be used when the range of SUPI's can be + To be used when the range of SUPI's can be represented as a numeric range (e.g. IMSI ranges)."; type string { pattern '^[0-9]+$'; } } - + leaf pattern { - description "Pattern representing the set of SUPI's belonging + description "Pattern representing the set of SUPI's belonging to this range. - A SUPI value is considered part + A SUPI value is considered part of the range - if and only if the SUPI string + if and only if the SUPI string fully matches the regular expression."; type string; } } - + grouping IdentityRange { leaf start { description "First value identifying the start of an identity range. @@ -1235,7 +1235,7 @@ module _3gpp-5gc-nrm-nfprofile { pattern '^[0-9]+$'; } } - + leaf end { description "Last value identifying the end of an identity range. To be used when the range of identities can be represented @@ -1244,19 +1244,19 @@ module _3gpp-5gc-nrm-nfprofile { pattern '^[0-9]+$'; } } - + leaf pattern { - description "Pattern representing the set of identities + description "Pattern representing the set of identities belonging to this range. - An identity value is considered part of the range + An identity value is considered part of the range if and only if the identity string fully matches the regular expression."; type string; } } - + grouping SnssaiUpfInfoItem { - list sNssai { + list sNssai { description "Supported S-NSSAI."; min-elements 1; max-elements 1; @@ -1264,25 +1264,25 @@ module _3gpp-5gc-nrm-nfprofile { uses Snssai; } } - + grouping DnnUpfInfoItem { leaf dnn { description "String representing a Data Network."; mandatory true; type string; } - + leaf-list dnaiList { description "List of Data network access identifiers supported by the UPF for this DNN. - The absence of this attribute indicates that the UPF + The absence of this attribute indicates that the UPF can be selected for this DNN for any DNAI."; min-elements 1; - type string; //dnai is the type but its only a string with - //desc: DNAI (Data network access identifier), + type string; //dnai is the type but its only a string with + //desc: DNAI (Data network access identifier), //is this needed as its own typedef or string is ok } - + leaf-list pduSessionTypes { description "List of PDU session type(s) supported by the UPF for a specific DNN."; @@ -1290,7 +1290,7 @@ module _3gpp-5gc-nrm-nfprofile { type PduSessionType; } } - + grouping Snssai { leaf sst { description "Unsigned integer, within the range 0 to 255, @@ -1300,7 +1300,7 @@ module _3gpp-5gc-nrm-nfprofile { mandatory true; type uint32; } - + leaf sd { description "3-octet string, representing the Slice Differentiator, in hexadecimal representation."; @@ -1308,10 +1308,10 @@ module _3gpp-5gc-nrm-nfprofile { pattern '^[A-Fa-f0-9]{6}$'; } } - + reference "3GPP TS 29.571"; } - + typedef PduSessionType { type enumeration { enum IPV4; @@ -1321,7 +1321,7 @@ module _3gpp-5gc-nrm-nfprofile { enum ETHERNET; } } - + grouping Guami { list plmnId { description "PLMN Identity."; @@ -1330,7 +1330,7 @@ module _3gpp-5gc-nrm-nfprofile { key "mcc mnc"; uses types3gpp:PLMNId; } - + list amfId { description "AMF Identity."; min-elements 1; @@ -1339,14 +1339,14 @@ module _3gpp-5gc-nrm-nfprofile { uses types3gpp:AmfIdentifier; } } - + grouping InterfaceUpfInfoItem { leaf interfaceType { description "User Plane interface type."; mandatory true; type UPInterfaceType; } - + choice address { case ipv4EndpointAddresses { leaf-list ipv4EndpointAddresses { @@ -1356,7 +1356,7 @@ module _3gpp-5gc-nrm-nfprofile { type inet:ipv4-address; } } - + case ipv6EndpointAddresses { leaf-list ipv6EndpointAddresses { description "Available endpoint IPv6 address(es) of @@ -1365,23 +1365,23 @@ module _3gpp-5gc-nrm-nfprofile { type inet:ipv6-address; } } - + case endpointFqdn { leaf endpointFqdn { - description "FQDN of available endpoint of the + description "FQDN of available endpoint of the User Plane interface."; type inet:domain-name; } } } - + leaf networkInstance { - description "Network Instance associated to the + description "Network Instance associated to the User Plane interface."; type string; } } - + typedef UPInterfaceType { type enumeration { enum N3; @@ -1389,14 +1389,14 @@ module _3gpp-5gc-nrm-nfprofile { enum N9; } } - + typedef AccessType { type enumeration { enum 3GPP_ACCESS; enum NON_3GPP_ACCESS; } } - + grouping N2InterfaceAmfInfo { choice address { case ipv4EndpointAddress { @@ -1406,7 +1406,7 @@ module _3gpp-5gc-nrm-nfprofile { type inet:ipv4-address; } } - + case ipv6EndpointAddress { leaf-list ipv6EndpointAddress { description "Available AMF endpoint IPv6 address(es) for N2."; @@ -1415,23 +1415,23 @@ module _3gpp-5gc-nrm-nfprofile { } } } - + leaf amfName { description "AMF name."; type string; } } - + grouping sNssaiSmfInfoItem { - list sNssai { + list sNssai { description "Supported S-NSSAI."; min-elements 1; max-elements 1; key "sst sd"; uses Snssai; } - - list dnnSmfInfoList { + + list dnnSmfInfoList { description "List of parameters supported by the SMF per DNN. The absence indicates the DNN can be selected for any DNAI."; min-elements 1; @@ -1439,7 +1439,7 @@ module _3gpp-5gc-nrm-nfprofile { uses DnnSmfInfoItem; } } - + grouping DnnSmfInfoItem { leaf dnn { description "Supported DNN."; @@ -1448,14 +1448,14 @@ module _3gpp-5gc-nrm-nfprofile { } leaf-list dnaiList { - description "List of Data network access identifiers supported by + description "List of Data network access identifiers supported by the SMF for this DNN. The absence of this attribute indicates that the SMF can be selected for this DNN for any DNAI."; min-elements 1; type string; } } - + grouping PlmnSnssai { list plmnId { description "PLMN ID for which list of supported S-NSSAI(s) @@ -1465,9 +1465,9 @@ module _3gpp-5gc-nrm-nfprofile { key "mcc mnc"; uses types3gpp:PLMNId; } - - list sNssaiList { - description "The specific list of S-NSSAIs supported + + list sNssaiList { + description "The specific list of S-NSSAIs supported by the given PLMN."; min-elements 1; key "sst sd"; @@ -1490,18 +1490,18 @@ module _3gpp-5gc-nrm-nfprofile { } } leaf pattern{ - description "This attribute indicates pattern (regular expression - according to the ECMA-262 dialect [75]) representing the set of - IMSIs belonging to this range. An IMSI value is considered part - of the range if and only if the IMSI string fully matches the - regular expression.Either the start and end attributes, or the + description "This attribute indicates pattern (regular expression + according to the ECMA-262 dialect [75]) representing the set of + IMSIs belonging to this range. An IMSI value is considered part + of the range if and only if the IMSI string fully matches the + regular expression.Either the start and end attributes, or the pattern attribute, shall be present."; type string; } } grouping NetworkNodeDiameterAddress { leaf-list name{ - description "This attribute indicates the Diameter + description "This attribute indicates the Diameter name of the network node diameter address."; reference " See TS 29.571 [61]. String contains a Diameter Identity (FQDN)."; diff --git a/yang-models/_3gpp-5gc-nrm-nfservice.yang b/yang-models/_3gpp-5gc-nrm-nfservice.yang index 2577809c6..04802fe0b 100755 --- a/yang-models/_3gpp-5gc-nrm-nfservice.yang +++ b/yang-models/_3gpp-5gc-nrm-nfservice.yang @@ -1,81 +1,81 @@ module _3gpp-5gc-nrm-nfservice { yang-version 1.1; - + namespace urn:3gpp:sa5:_3gpp-5gc-nrm-nfservice; prefix nfs3gpp; - + import _3gpp-common-yang-types { prefix types3gpp; } import ietf-yang-types { prefix yang; } import ietf-inet-types { prefix inet; } import _3gpp-5g-common-yang-types { prefix types5g3gpp; } - + organization "3gpp SA5"; contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464"; description "NF service class. - Copyright 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + Copyright 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved."; reference "3GPP TS 29.510"; - - revision 2025-01-25 { reference CR-1442; } - revision 2023-09-18 { reference CR-1043 ; } + + revision 2025-01-25 { reference CR-1442; } + revision 2023-09-18 { reference CR-1043 ; } revision 2021-01-25 { reference CR-0454 ; } revision 2020-11-05 { reference CR-0412 ; } revision 2019-06-17 { reference "initial revision"; } - + grouping NFServiceGrp { description "Represents the NFService IOC"; leaf serviceInstanceID { - description + description "Unique ID of the service instance within a given NF Instance."; mandatory true; type string; } - + leaf serviceName { description "Name of the service instance (e.g. 'nudm-sdm')."; mandatory true; type ServiceName; } - + list versions { //check in review if key is ok (unique) - description "API versions supported by the NF Service and if available, + description "API versions supported by the NF Service and if available, the corresponding retirement date of the NF Service."; min-elements 1; key "apiVersionInUri apiFullVersion"; uses NFServiceVersion; } - + leaf scheme { description "URI scheme (e.g. 'http', 'https')."; mandatory true; type UriScheme; } - + leaf nfServiceStatus { description "Status of the NF Service Instance."; mandatory true; type NFServiceStatus; } - + leaf fqdn { description "FQDN of the NF Service Instance."; //optional support type inet:domain-name; } - + leaf interPlmnFqdn { - description "If the NF service needs to be discoverable by other NFs in a + description "If the NF service needs to be discoverable by other NFs in a different PLMN, then an FQDN that is used for inter PLMN routing."; //optional support type inet:domain-name; } - + list ipEndPoints { - description "IP address(es) and port information of the Network Function - (including IPv4 and/or IPv6 address)where the service is listening + description "IP address(es) and port information of the Network Function + (including IPv4 and/or IPv6 address)where the service is listening for incoming service requests."; //optional support - + key idx; leaf idx { type string; @@ -83,14 +83,14 @@ module _3gpp-5gc-nrm-nfservice { min-elements 1; uses ipEndPoint; } - + leaf apiPrefix { - description "Optional path segment(s) used to construct the {apiRoot} + description "Optional path segment(s) used to construct the {apiRoot} variable of the different API URIs."; //optional support type string; } - + list defaultNotificationSubscriptions { description "Notification endpoints for different notification types."; key notificationType; @@ -98,12 +98,12 @@ module _3gpp-5gc-nrm-nfservice { min-elements 1; uses types3gpp:DefaultNotificationSubscription; } - + list allowedPLMNs { description "PLMNs allowed to access the service instance. - The absence of this attribute indicates that any PLMN is allowed to + The absence of this attribute indicates that any PLMN is allowed to access the service instance."; - + min-elements 1; //optional support key "mcc mnc"; @@ -111,21 +111,21 @@ module _3gpp-5gc-nrm-nfservice { } list allowedSnpns { description "PLMNs allowed to access the service instance. - The absence of this attribute indicates that any PLMN is allowed to + The absence of this attribute indicates that any PLMN is allowed to access the service instance."; - + min-elements 1; //optional support key "mcc mnc"; uses types3gpp:PLMNId; - } + } leaf-list allowedNfTypes { - description "SNPNs allowed to access the NF instance"; + description "SNPNs allowed to access the NF instance"; min-elements 1; //optional support type types3gpp:NfType; } - + leaf-list allowedNfDomains { description "Pattern representing the NF domain names allowed to access the service instance."; @@ -133,7 +133,7 @@ module _3gpp-5gc-nrm-nfservice { min-elements 1; type string; } - + list allowedNSSAI { description "S-NSSAI of the allowed slices to access the service instance. The absence of this attribute indicates that any slice @@ -150,7 +150,7 @@ module _3gpp-5gc-nrm-nfservice { //optional support type string; min-elements 1; - } + } leaf-list allowedOperationsPerNfInstance { description "It indicates the allowed operations on resources for a given NF Instance; the key of the map is the NF Instance Id, and @@ -163,45 +163,45 @@ module _3gpp-5gc-nrm-nfservice { type boolean; default false; description "When it is present and set to true, indicates that - the scopes defined in attribute allowedOperationsPerNfInstance + the scopes defined in attribute allowedOperationsPerNfInstance for a given NF Instance ID take precedence over the scopes defined - in attribute allowedOperationsPerNfType for the corresponding + in attribute allowedOperationsPerNfType for the corresponding NF type of the NF Instance associated to such NF Instance ID.."; - } + } leaf-list oauth2Required { type boolean; max-elements 1; - description "It indicates whether the NF Service Instance requires + description "It indicates whether the NF Service Instance requires Oauth2-based authorization"; - } + } leaf-list sharedServiceDataId { type string; max-elements 1; description "String uniquely identifying SharedServiceData. The format - of the sharedServiceDataId shall be a Universally Unique Identifier + of the sharedServiceDataId shall be a Universally Unique Identifier (UUID) version 4, as described in IETF RFC 4122 [44]. The hexadecimal letters should be formatted as lower-case characters by the sender, and they shall be handled as case-insensitive by the receiver."; - } + } leaf priority { - description "Priority (relative to other services of the same type) - in the range of 0-65535, to be used for NF Service selection; lower + description "Priority (relative to other services of the same type) + in the range of 0-65535, to be used for NF Service selection; lower values indicate a higher priority."; //optional support type uint16 { range "0..65535"; } } - + leaf capacity { - description "Static capacity information in the range of 0-65535, + description "Static capacity information in the range of 0-65535, expressed as a weight relative to other services of the same type."; //optional support type uint16; } - - + + leaf recoveryTime { description "Timestamp when the NF was (re)started."; //optional support @@ -214,23 +214,23 @@ module _3gpp-5gc-nrm-nfservice { type string; } } - + typedef SupportedFeatures { type string { pattern '[A-Fa-f0-9]*'; } } - + grouping ipEndPoint { choice address { leaf ipv4Address { type inet:ipv4-address; } - + leaf ipv6Address { type inet:ipv6-address; } - + leaf ipv6Prefix { type inet:ipv6-prefix; } @@ -244,7 +244,7 @@ module _3gpp-5gc-nrm-nfservice { type uint16; } } - + typedef TransportProtocol { type enumeration { enum TCP; @@ -252,24 +252,24 @@ module _3gpp-5gc-nrm-nfservice { enum UDP; } } - + grouping NFServiceVersion { leaf apiVersionInUri { mandatory true; type string; } - + leaf apiFullVersion { mandatory true; type string; } - + leaf expiry { //optional to support type yang:date-and-time; } } - + typedef ServiceName { type enumeration { enum NNRF_NFM; @@ -307,14 +307,14 @@ module _3gpp-5gc-nrm-nfservice { enum NNWDAF_ANALYTICSINFO; } } - + typedef UriScheme { type enumeration { enum HTTP; enum HTTPS; } } - + typedef NFServiceStatus { type enumeration { enum REGISTERED; @@ -322,17 +322,17 @@ module _3gpp-5gc-nrm-nfservice { enum UNDISCOVERABLE; } } - + grouping ChfServiceInfo { leaf primaryChfServiceInstance { - description "Shall be present if the CHF service instance serves as a + description "Shall be present if the CHF service instance serves as a secondary CHF instance of another primary CHF service instance."; //conditional to support type string; } - + leaf secondaryChfServiceInstance { - description "Shall be present if the CHF service instance serves as a + description "Shall be present if the CHF service instance serves as a primary CHF instance of another secondary CHF service instance."; //conditional to support type string; @@ -342,19 +342,19 @@ module _3gpp-5gc-nrm-nfservice { description "This <> represents the information of a SNPN identification"; leaf mCC { - description "This is the Mobile Country Code (MCC) of the PLMN + description "This is the Mobile Country Code (MCC) of the PLMN identifier. See TS 23.003 [13] subclause 2.2 and 12.1"; type string; } leaf mNC { - description "This is the Mobile Network Code (MNC) of the PLMN + description "This is the Mobile Network Code (MNC) of the PLMN identifier. See TS 23.003 [13] subclause 2.2 and 12.1."; type string; } leaf nId { - description "Network Identity; Shall be present if PlmnIdNid + description "Network Identity; Shall be present if PlmnIdNid identifies an SNPN"; type string; - } + } } } \ No newline at end of file diff --git a/yang-models/_3gpp-5gc-nrm-ngeirfunction.yang b/yang-models/_3gpp-5gc-nrm-ngeirfunction.yang index 2c8c1a4fb..0f86f481a 100755 --- a/yang-models/_3gpp-5gc-nrm-ngeirfunction.yang +++ b/yang-models/_3gpp-5gc-nrm-ngeirfunction.yang @@ -1,38 +1,38 @@ module _3gpp-5gc-nrm-ngeirfunction { yang-version 1.1; - + namespace urn:3gpp:sa5:_3gpp-5gc-nrm-ngeirfunction; prefix ngeir3gpp; - + import _3gpp-common-managed-function { prefix mf3gpp; } import _3gpp-common-managed-element { prefix me3gpp; } import _3gpp-common-yang-types { prefix types3gpp; } import _3gpp-5g-common-yang-types { prefix types5g3gpp; } 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 5G-EIR function in 5GC. For more + description "This IOC represents the 5G-EIR function in 5GC. For more information about the 5G-EIR, see 3GPP TS 23.501. - Copyright 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + Copyright 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved."; reference "3GPP TS 28.541"; - - revision 2023-09-18 { reference CR-1043 ; } + + revision 2023-09-18 { reference CR-1043 ; } revision 2022-01-07 { reference CR-0643; } revision 2020-11-06 { reference CR-0412 ; } - revision 2019-10-25 { reference "S5-194457 S5-195427 S5-193518"; } + revision 2019-10-25 { reference "S5-194457 S5-195427 S5-193518"; } revision 2019-05-15 {reference "initial revision"; } - + grouping NGEIRFunctionGrp { description "Represents the NGEIRFunction IOC"; uses mf3gpp:ManagedFunctionGrp; - + list pLMNIdList { - description "List of at most six entries of PLMN Identifiers, but at + description "List of at most six entries of PLMN Identifiers, but at least one (the primary PLMN Id). - The PLMN Identifier is composed of a Mobile Country Code (MCC) and + The PLMN Identifier is composed of a Mobile Country Code (MCC) and a Mobile Network Code (MNC)."; min-elements 1; @@ -40,7 +40,7 @@ module _3gpp-5gc-nrm-ngeirfunction { key "mcc mnc"; uses types3gpp:PLMNId; } - + list sNSSAIList { description "List of S-NSSAIs the managed object is capable of supporting. (Single Network Slice Selection Assistance Information) @@ -51,7 +51,7 @@ module _3gpp-5gc-nrm-ngeirfunction { key "sd sst"; uses types5g3gpp:SNssai; } - + list managedNFProfile { key idx; min-elements 1; @@ -62,13 +62,13 @@ module _3gpp-5gc-nrm-ngeirfunction { list commModelList { min-elements 1; key "groupId"; - description "Specifies a list of commModel. It can be used by NF and + description "Specifies a list of commModel. It can be used by NF and NF services to interact with each other in 5G Core network "; reference "3GPP TS 23.501"; uses types5g3gpp:CommModel; } } - + augment "/me3gpp:ManagedElement" { list NGEIRFunction { description "5G Core NGEIR Function"; diff --git a/yang-models/_3gpp-5gc-nrm-nrffunction.yang b/yang-models/_3gpp-5gc-nrm-nrffunction.yang index a82e3a5f1..fed4e6159 100755 --- a/yang-models/_3gpp-5gc-nrm-nrffunction.yang +++ b/yang-models/_3gpp-5gc-nrm-nrffunction.yang @@ -1,9 +1,9 @@ module _3gpp-5gc-nrm-nrffunction { yang-version 1.1; - + namespace urn:3gpp:sa5:_3gpp-5gc-nrm-nrffunction; prefix nrf3gpp; - + import _3gpp-common-managed-function { prefix mf3gpp; } import _3gpp-common-managed-element { prefix me3gpp; } import ietf-inet-types { prefix inet; } @@ -18,241 +18,485 @@ module _3gpp-5gc-nrm-nrffunction { import _3gpp-5gc-nrm-smffunction { prefix smf3gpp;} import _3gpp-5gc-nrm-upffunction { prefix upf3gpp;} import _3gpp-5gc-nrm-pcffunction { prefix pcf3gpp;} + import _3gpp-5gc-nrm-nwdaffunction { prefix nwdaf3gpp;} + import _3gpp-5gc-nrm-gmlcfunction { prefix gmlc3gpp;} + import _3gpp-5gc-nrm-lmffunction { prefix lmf3gpp;} organization "3gpp SA5"; contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464"; description "This IOC represents the NRF function in 5GC. For more information about the NRF, see 3GPP TS 23.501 [2]. - Copyright 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + Copyright 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved."; reference "3GPP TS 28.541"; - - revision 2025-01-25 { reference CR-1442 ; } - revision 2023-09-18 { reference CR-1043 ; } + + revision 2025-07-25 { reference CR-1558 ; } + revision 2025-01-25 { reference CR-1442 ; } + revision 2023-09-18 { reference CR-1043 ; } revision 2023-04-26 { reference CR-0916; } revision 2020-11-08 { reference CR-0412 ; } revision 2020-08-03 { reference "CR-0321"; } revision 2019-10-28 { reference S5-193518 ; } revision 2019-05-15 { reference "initial revision"; } - + + + grouping bsfInfo { + + list ipv4AddressRanges { + description "List of ranges of IPv4 addresses handled by BSF. + If not provided, the BSF can serve any IPv4 address."; + key "start end"; + uses types3gpp:Ipv4AddressRange; + } + + leaf-list dnnList { + description "List of DNNs handled by the BSF + If not provided, the BSF can serve any DNN."; + + min-elements 1; + type string; + } + + leaf-list ipDomainList { + description "List of IPv4 address domains, as described in + subclause 6.2 of 3GPP TS 29.513, handled by the BSF. + If not provided, the BSF can serve any IP domain."; + min-elements 1; + type string; + } + + list ipv6PrefixRanges { + description "List of ranges of IPv6 prefixes handled by the BSF. + If not provided, the BSF can serve any IPv6 prefix."; + key "start end"; + uses types3gpp:Ipv6PrefixRange; + } + } + grouping chfInfo { + + list supiRangeList { + description "List of ranges of SUPIs that can be served by + the CHF instance. If not provided, the CHF can serve any SUPI."; + key "start end pattern"; + min-elements 1; + uses mnfp3gpp:SupiRangeGrp; + } + + list gpsiRangeList { + description "List of ranges of GPSI that can be served + by the CHF instance. If not provided, the CHF can serve any GPSI."; + key idx; + leaf idx { type uint32; } + min-elements 1; + uses mnfp3gpp:IdentityRange; + } + + list plmnRangeList { + description "List of ranges of PLMNs (including the PLMN + IDs of the CHF instance) that can be served by the CHF instance. + If not provided, the CHF can serve any PLMN."; + + min-elements 1; + key "mcc mnc"; + uses types3gpp:PLMNId; + } + leaf primaryChfInstance { + //optional + description "This attribute represents the NF Instance Id of the + primary CHF instance. This attribute shall be absent if the + secondaryChfInstance is present."; + type string; + + } + leaf secondaryChfInstance { + //optional + description "This attribute represents the NF Instance Id of the + secondary CHF instance.This attribute shall be absent if the + primaryChfInstance is present."; + type string; + } + } + grouping pcscfInfo { + description "This data type represents the information of a P-CSCF NF Instance. + For more information, see clause 6.1.6.2.53 of TS 29.510."; + + leaf-list accessType { + description "It provides the condition of access type of the UE when + the session AMBR shall be enforced, see TS 29.512 [60].If this + attribute is included in SmfInfo, it shall contain the access type + (3GPP_ACCESS and/or NON_3GPP_ACCESS) supported by the SMF.If not + included, it shall be assumed the both access types are supported."; + type enumeration { + enum 3GPP_ACCESS; + enum NON_3GPP_ACCESS; + } + min-elements 1; + max-elements 2; + } + leaf-list dnnList { + description "It represents the DNNs supported by the PCF. The DNN, + as defined in clause 9A of TS 23.003 [13], shall contain the Network + Identifier and it may additionally contain an Operator Identifier, + as specified in TS 23.003 [13] clause 9.1.1 and 9.1.2. If the Operator + Identifier is not included, the DNN is supported for all the PLMNs in + the plmnList of the NF Profile.If not provided, the PCF can serve any + DNN."; + min-elements 1; + type string; + } + leaf-list gmFqdn { + description "This attribute represents FQDN of the P-CSCF for the Gm + interface.."; + max-elements 1; + type string; + //optional + } + leaf-list gmIpv4Addresses { + description "This attribute represents list of IPv4 addresses of of + the P-CSCF for the Gm interface."; + type inet:ipv4-address; + //optional + } + leaf-list gmIpv6Addresses { + description "This attribute represents list of IPv6 addresses of of the + P-CSCF for the Gm interface."; + type inet:ipv6-address; + //optional + } + leaf mwFqdn { + description "This attribute represents FQDN of the P-CSCF for the Mw + interface."; + type string; + //optional + } + leaf-list mwIpv4Addresses { + description "List of ranges of PLMNs (including the PLMN + IDs of the CHF instance) that can be served by the CHF instance. + If not provided, the CHF can serve any PLMN."; + type inet:ipv4-address; + //optional + } + leaf-list mwIpv6Addresses { + description "This attribute represents list of IPv4 addresses of + the P-CSCF for the Mw interface."; + type inet:ipv6-address; + //optional + } + list servedIpv4AddressRanges { + description "List of ranges of PLMNs (including the PLMN + IDs of the CHF instance) that can be served by the CHF instance. + If not provided, the CHF can serve any PLMN."; + + min-elements 1; + key "mcc mnc"; + uses types3gpp:PLMNId; + //optional + } + } + grouping HssInfoGrp { + description " Information of an HSS NF Instance"; + leaf groupID{ + description "This attribute defines the identity of the HSS group + that is served by the HSS instance.If not provided, the HSS instance + does not pertain to any HSS group."; + type string; + } + list imsiRanges { + description "This attribute defines the list of ranges of IMSIs whose + profile data is available in the HSS instance."; + min-elements 1; + key "id"; + leaf id { + description "Unique identifier for the IMSI range."; + type string; + } + uses ImsiRange; + } + list imsPrivateIdentityRanges{ + description "This attribute defines the list of ranges of IMS Private + Identities whose profile data is available in the HSS instance."; + min-elements 1; + key "id"; + leaf id { + description "Unique identifier for the IMSI range."; + type string; + } + uses mnfp3gpp:IdentityRange; + } + list imsPublicIdentityRanges{ + description "This attribute defines the list of ranges of MSISDNs whose + profile data is available in the HSS instance. "; + min-elements 1; + key "id"; + leaf id { + description "Unique identifier for the IMSI range."; + type string; + } + uses mnfp3gpp:IdentityRange; + } + list msisdnRanges{ + description "This attribute defines the list of ranges of IMS Public + Identities whose profile data is available in the HSS instance "; + min-elements 1; + key "id"; + leaf id { + description "Unique identifier for the IMSI range."; + type string; + } + uses mnfp3gpp:IdentityRange; + } + list externalGroupIdentifiersRanges{ + description "This attribute defines the list of ranges of external + group IDs that can be served by this HSS instance.If not provided, + the HSS instance does not serve any external groups. "; + min-elements 1; + key "id"; + leaf id { + description "Unique identifier for the IMSI range."; + type string; + } + uses mnfp3gpp:IdentityRange; + } + list hssDiameterAddress{ + description "This attribute defines the Diameter Address of the HSS "; + max-elements 1; + key "id"; + leaf id { + description "Unique identifier for the IMSI range."; + type string; + } + uses NetworkNodeDiameterAddress; + } + list additionalDiamAddresses{ + description "This attribute defines the Additional Diameter Addresses + of the HSS;may be present if hssDiameterAddress is present "; + min-elements 1; + key "id"; + leaf id { + description "Unique identifier for the IMSI range."; + type string; + } + uses NetworkNodeDiameterAddress; + } + } grouping NrfInfoGrp { - + list servedUdrInfo { - description "This attribute contains all the udrInfo - attributes - locally configured in the NRF or the NRF received + description "This attribute contains all the udrInfo + attributes + locally configured in the NRF or the NRF received during NF registration."; - + key nfInstanceId; leaf nfInstanceId { description "String uniquely identifying a NF instance."; type string; } - + min-elements 1; uses udr3gpp:UdrInfoGrp; } - + list servedUdmInfo { description "This attribute contains all the udmInfo attributes - locally configured in the NRF or the NRF + locally configured in the NRF or the NRF received during NF registration."; - + key nfInstanceId; leaf nfInstanceId { description "String uniquely identifying a NF instance."; type string; } - + min-elements 1; uses udm3gpp:UdmInfoGrp; } - + list servedAusfInfo { description "This attribute contains all the ausfInfo attributes locally configured in the NRF or the NRF received during NF registration."; - + key nfInstanceId; leaf nfInstanceId { description "String uniquely identifying a NF instance."; type string; } - + min-elements 1; uses ausf3gpp:AusfInfoGrp; } - + list servedAmfInfo { description "This attribute contains all the amfInfo attributes locally configured in the NRF or the NRF received during NF registration."; - + key nfInstanceId; leaf nfInstanceId { description "String uniquely identifying a NF instance."; type string; } - + min-elements 1; uses amf3gpp:AmfInfoGrp; } - + list servedSmfInfo { description "This attribute contains all the smfInfo attributes locally configured in the NRF or the NRF received during NF registration."; - + key nfInstanceId; leaf nfInstanceId { description "String uniquely identifying a NF instance."; type string; } - + min-elements 1; uses smf3gpp:SmfInfoGrp; } - + list servedUpfInfo { description "This attribute contains all the upfInfo attributes locally configured in the NRF or the NRF received during NF registration."; - + key nfInstanceId; leaf nfInstanceId { description "String uniquely identifying a NF instance."; type string; } - + min-elements 1; uses upf3gpp:UpfInfoGrp; } - + list servedPcfInfo { description "This attribute contains all the pcfInfo attributes locally configured in the NRF or the NRF received during NF registration."; - + key nfInstanceId; leaf nfInstanceId { description "String uniquely identifying a NF instance."; type string; } - + min-elements 1; uses pcf3gpp:pcfInfoGrp; } - + list servedBsfInfo { description "This attribute contains all the bsfInfo attributes locally configured in the NRF or the NRF received during NF registration."; - + key nfInstanceId; leaf nfInstanceId{ description "String uniquely identifying a NF instance."; type string; } - + min-elements 1; uses bsfInfo; } - + list servedChfInfo { description "This attribute contains all the bsfInfo attributes locally configured in the NRF or the NRF received during NF registration."; - + key nfInstanceId; leaf nfInstanceId { description "String uniquely identifying a NF instance."; type string; } - + min-elements 1; uses chfInfo; } list servedNwdafInfo { description "This attribute contains all the nwdafInfo attributes - locally configured in the NRF or the NRF received during NF - registration. The key of the map is the nfInstanceId of which + locally configured in the NRF or the NRF received during NF + registration. The key of the map is the nfInstanceId of which the nwdafInfo belongs to."; - + key nfInstanceId; leaf nfInstanceId { description "String uniquely identifying a NF instance."; type string; } - + min-elements 1; uses nwdaf3gpp:NwdafInfoGrp; - } + } list servedPcscfInfoList { description "This attribute contains all the pcscfInfo attributes locally configured in the NRF or the NRF received during NF registration. The key of the map is the nfInstanceId to which the map entry belongs to."; - + key nfInstanceId; leaf nfInstanceId { description "String uniquely identifying a NF instance."; type string; } - + min-elements 1; uses pcscfInfo; } list servedGmlcInfo { - description "This attribute contains all the gmlcInfo attributes - locally configured in the NRF or the NRF received during NF - registration. The key of the map is the nfInstanceId of which - the nefInfo belongs to."; + description "This attribute contains all the gmlcInfo attributes + locally configured in the NRF or the NRF received during NF + registration. The key of the map is the nfInstanceId of which + the nefInfo belongs to."; key nfInstanceId; leaf nfInstanceId { description "String uniquely identifying a NF instance."; type string; } - + min-elements 1; uses gmlc3gpp:GmlcInfoGrp; } list servedLmfInfo { - description "This attribute contains all the lmfInfo attributes - locally configured in the NRF or the NRF received during NF - registration. The key of the map is the nfInstanceId of which - the lmfInfo belongs to."; + description "This attribute contains all the lmfInfo attributes + locally configured in the NRF or the NRF received during NF + registration. The key of the map is the nfInstanceId of which + the lmfInfo belongs to."; key nfInstanceId; leaf nfInstanceId { description "String uniquely identifying a NF instance."; type string; } - + min-elements 1; uses lmf3gpp:LmfInfoGrp; } list servedNfInfo { - description "This attribute contains information of other NFs - without corresponding NF type specific Info extensions locally - configured in the NRF or the NRF received during NF registration. - The key of the map is the nfInstanceId of the NF. The map entry - is the NfInfo as defined in clause 5.3.229 representing the - information of a generic NF instance."; + description "This attribute contains information of other NFs + without corresponding NF type specific Info extensions locally + configured in the NRF or the NRF received during NF registration. + The key of the map is the nfInstanceId of the NF. The map entry + is the NfInfo as defined in clause 5.3.229 representing the + information of a generic NF instance."; key nfInstanceId; leaf nfInstanceId { description "String uniquely identifying a NF instance."; type string; } - + min-elements 1; uses nfInfoGrp; } @@ -260,7 +504,7 @@ module _3gpp-5gc-nrm-nrffunction { description "This attribute contains list of HssInfo attribute locally configured in the NRF or that the NRF received during NF registration. The key of the map is the nfInstanceId to which the - map entry belongs to."; + map entry belongs to."; key nfInstanceId; leaf nfInstanceId { description "String uniquely identifying a NF instance."; @@ -268,12 +512,12 @@ module _3gpp-5gc-nrm-nrffunction { } min-elements 1; uses HssInfoGrp; - } + } list served5gDdnmfInfo { description "This attribute contains all the 5gDdnmfInfo - attribute locally configured in the NRF or that the NRF - received during NF registration. The key of the map is - the nfInstanceId to which the map entry belongs to."; + attribute locally configured in the NRF or that the NRF + received during NF registration. The key of the map is + the nfInstanceId to which the map entry belongs to."; key nfInstanceId; leaf nfInstanceId { description "String uniquely identifying a NF instance."; @@ -281,17 +525,114 @@ module _3gpp-5gc-nrm-nrffunction { } min-elements 1; uses FiveGDdnmfInfo ; - } + } + } + grouping ImsiRange{ + leaf start{ + description "This attribute indicates the first value identifying + the start of a IMSI range. "; + type string{ + pattern "^[0-9]+$"; + } + } + leaf end{ + description "This attribute indicates the last value identifying + the end of a IMSI range."; + type string{ + pattern "^[0-9]+$"; + } + } + leaf pattern{ + description "This attribute indicates pattern (regular expression + according to the ECMA-262 dialect [75]) representing the set of + IMSIs belonging to this range. An IMSI value is considered part + of the range if and only if the IMSI string fully matches the + regular expression.Either the start and end attributes, or the + pattern attribute, shall be present."; + type string; + } + } + grouping NetworkNodeDiameterAddress { + leaf-list name{ + description "This attribute indicates the Diameter + name of the network node diameter address."; + reference " See TS 29.571 [61]. String contains a Diameter Identity + (FQDN)."; + type string; + min-elements 1; + max-elements 1; + } + leaf-list realm{ + description "This attribute indicates the Diameter realm of the + network node diameter addres. See TS 29.571 [61]. String contains + a Diameter Identity (FQDN)."; + type string; + min-elements 1; + max-elements 1; + } + } + typedef PduSessionType { + type enumeration { + enum IPV4; + enum IPV6; + enum IPV4V6; + enum UNSTRUCTURED; + enum ETHERNET; + } + } + grouping DnnUpfInfoItem { + leaf dnn { + description "String representing a Data Network."; + mandatory true; + type string; } + leaf-list dnaiList { + description "List of Data network access identifiers supported + by the UPF for this DNN. + The absence of this attribute indicates that the UPF + can be selected for this DNN for any DNAI."; + min-elements 1; + type string; //dnai is the type but its only a string with + //desc: DNAI (Data network access identifier), + //is this needed as its own typedef or string is ok + } + + leaf-list pduSessionTypes { + description "List of PDU session type(s) supported by + the UPF for a specific DNN."; + min-elements 1; + type PduSessionType; + } + } + grouping nfInfoGrp { + description "This data type represents the information of a + generic NF Instance. (See clause 6.1.6.2.56 TS 29.510 [23])."; + leaf nfType { + description "This parameter defines type of Network Function"; + type uint16; + } + } + grouping FiveGDdnmfInfo { + description "This data type represents the specific data for the 5G DDMF NF. + See clause 6.1.6.2.74 of TS 29.510."; + list plmnId { + description "PLMN ID for which list of supported S-NSSAI(s) + is provided."; + min-elements 1; + max-elements 1; + key "mcc mnc"; + uses types3gpp:PLMNId; + } + } grouping NRFFunctionGrp { description "Represents the NRFFunction IOC"; uses mf3gpp:ManagedFunctionGrp; - + list pLMNIdList { - description "List of at most six entries of PLMN Identifiers, but at + description "List of at most six entries of PLMN Identifiers, but at least one (the primary PLMN Id). - The PLMN Identifier is composed of a Mobile Country Code (MCC) and a + The PLMN Identifier is composed of a Mobile Country Code (MCC) and a Mobile Network Code (MNC)."; min-elements 1; @@ -299,22 +640,23 @@ module _3gpp-5gc-nrm-nrffunction { key "mcc mnc"; uses types3gpp:PLMNId; } - + + leaf sBIFQDN { - description "The FQDN of the registered NF instance in the service-based + description "The FQDN of the registered NF instance in the service-based interface."; type inet:domain-name; } leaf-list cNSIIdList { - description "NSI ID. NSI ID is an identifier for identifying the Core - Network part of a Network Slice instance when multiple Network Slice - instances of the same Network Slice are deployed, and there is a need - to differentiate between them in the 5GC, see clause 3.1 of TS 23.501 + description "NSI ID. NSI ID is an identifier for identifying the Core + Network part of a Network Slice instance when multiple Network Slice + instances of the same Network Slice are deployed, and there is a need + to differentiate between them in the 5GC, see clause 3.1 of TS 23.501 and subclause 6.1.6.2.7 of 3GPP TS 29.531"; type string; } - + list sNSSAIList { description "List of S-NSSAIs the managed object is capable of supporting. (Single Network Slice Selection Assistance Information) @@ -325,6 +667,7 @@ module _3gpp-5gc-nrm-nrffunction { key "sd sst"; uses types5g3gpp:SNssai; } + list nrfInfo { description ""; key idx; @@ -332,16 +675,14 @@ module _3gpp-5gc-nrm-nrffunction { uses NrfInfoGrp; } list nFProfileList { - description "It is a set of NFProfile(s) to be registered in the NRF + description "It is a set of NFProfile(s) to be registered in the NRF instance. NFProfile is defined in 3GPP TS 29.510 "; key idx; leaf idx { type uint32; } min-elements 1; max-elements 1; uses mnfp3gpp:ManagedNFProfileGrp; - description "This parameter defines profile for managed NF"; - reference "3gpp TS 23.501"; - } + } list managedNFProfile { key idx; leaf idx { type uint32; } @@ -352,7 +693,7 @@ module _3gpp-5gc-nrm-nrffunction { reference "3gpp TS 23.501"; } } - + augment "/me3gpp:ManagedElement" { list NRFFunction { description "5G Core NRF Function"; diff --git a/yang-models/_3gpp-5gc-nrm-nssffunction.yang b/yang-models/_3gpp-5gc-nrm-nssffunction.yang index 315ae9ebc..655609065 100755 --- a/yang-models/_3gpp-5gc-nrm-nssffunction.yang +++ b/yang-models/_3gpp-5gc-nrm-nssffunction.yang @@ -1,39 +1,39 @@ module _3gpp-5gc-nrm-nssffunction { yang-version 1.1; - + namespace urn:3gpp:sa5:_3gpp-5gc-nrm-nssffunction; prefix nssf3gpp; - + import _3gpp-common-managed-function { prefix mf3gpp; } import _3gpp-common-managed-element { prefix me3gpp; } 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"; - description "This IOC represents the NSSF function in 5GC. For more + description "This IOC represents the NSSF function in 5GC. For more information about the NSSF, see 3GPP TS 23.501. - Copyright 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + Copyright 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved."; reference "3GPP TS 28.541"; - - revision 2023-09-18 { reference CR-1043 ; } + + revision 2023-09-18 { reference CR-1043 ; } revision 2023-04-26 { reference CR-0916; } revision 2020-11-08 { reference CR-0412 ; } revision 2020-08-03 { reference "CR-0321"; } revision 2019-10-25 { reference "S5-194457 S5-195427 S5-193518"; } revision 2019-05-15 { reference "initial revision"; } - + grouping NSSFFunctionGrp { description "Represents the NSSFFunction IOC"; uses mf3gpp:ManagedFunctionGrp; - + list pLMNIdList { - description "List of at most six entries of PLMN Identifiers, but at least + description "List of at most six entries of PLMN Identifiers, but at least one (the primary PLMN Id). - The PLMN Identifier is composed of a Mobile Country Code (MCC) and a + The PLMN Identifier is composed of a Mobile Country Code (MCC) and a Mobile Network Code (MNC)."; min-elements 1; @@ -41,33 +41,33 @@ module _3gpp-5gc-nrm-nssffunction { key "mcc mnc"; uses types3gpp:PLMNId; } - + leaf sBIFQDN { - description "The FQDN of the registered NF instance in the service-based + description "The FQDN of the registered NF instance in the service-based interface."; type inet:domain-name; } - + list sNSSAIList { description "List of S-NSSAIs the managed object is capable of supporting. (Single Network Slice Selection Assistance Information) An S-NSSAI has an SST (Slice/Service type) and an optional SD (Slice Differentiator) field."; - + reference "3GPP TS 23.003"; key "sd sst"; uses types5g3gpp:SNssai; } - + leaf-list cNSIIdList { - description "NSI ID. NSI ID is an identifier for identifying the Core - Network part of a Network Slice instance when multiple Network Slice - instances of the same Network Slice are deployed, and there is a need - to differentiate between them in the 5GC, see clause 3.1 of TS 23.501 + description "NSI ID. NSI ID is an identifier for identifying the Core + Network part of a Network Slice instance when multiple Network Slice + instances of the same Network Slice are deployed, and there is a need + to differentiate between them in the 5GC, see clause 3.1 of TS 23.501 and subclause 6.1.6.2.7 of 3GPP TS 29.531"; type string; } - + list managedNFProfile { key idx; min-elements 1; @@ -76,7 +76,7 @@ module _3gpp-5gc-nrm-nssffunction { uses types3gpp:ManagedNFProfile; } } - + augment "/me3gpp:ManagedElement" { list NSSFFunction { description "5G Core NSSF Function"; diff --git a/yang-models/_3gpp-5gc-nrm-nwdaffunction.yang b/yang-models/_3gpp-5gc-nrm-nwdaffunction.yang index 3ed04046e..291131c95 100755 --- a/yang-models/_3gpp-5gc-nrm-nwdaffunction.yang +++ b/yang-models/_3gpp-5gc-nrm-nwdaffunction.yang @@ -1,9 +1,9 @@ module _3gpp-5gc-nrm-nwdaffunction { yang-version 1.1; - + namespace urn:3gpp:sa5:_3gpp-5gc-nrm-nwdaffunction; prefix nwdaf3gpp; - + import _3gpp-common-managed-function { prefix mf3gpp; } import _3gpp-common-managed-element { prefix me3gpp; } import ietf-inet-types { prefix inet; } @@ -11,27 +11,27 @@ module _3gpp-5gc-nrm-nwdaffunction { import _3gpp-common-yang-extensions { prefix yext3gpp; } import _3gpp-5g-common-yang-types { prefix types5g3gpp; } 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 NWDAF function in 5GC. For more + description "This IOC represents the NWDAF function in 5GC. For more information about the NWDAF, see 3GPP TS 23.501. - Copyright 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + Copyright 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved."; reference "3GPP TS 28.541"; - + revision 2025-03-25 { reference CR-1489 ; } revision 2024-08-07 { reference CR-1329; } - revision 2024-04-12 { reference CR-1218; } - revision 2023-09-18 { reference CR-1043; } + revision 2024-04-12 { reference CR-1218; } + revision 2023-09-18 { reference CR-1043; } revision 2023-04-26 { reference CR-0916; } revision 2020-11-08 { reference CR-0412; } revision 2019-10-25 { reference "S5-194457 S5-195427 S5-193518"; } - + revision 2019-05-15 {reference "initial revision"; } - + typedef NwdafEvent { - description "The detailed ENUM value for NwdafEvent see the + description "The detailed ENUM value for NwdafEvent see the Table 5.1.6.3.4-1 in TS 29.520"; type union { type enumeration { @@ -49,94 +49,94 @@ module _3gpp-5gc-nrm-nwdaffunction { enum DISPERSION; enum RED_TRANS_EXP; enum WLAN_PERFORMANCE; - enum SM_CONGESTION; + enum SM_CONGESTION; } type string; } } - + grouping NwdafCapabilityGrp { - description "This data type represents the capability supported by the + description "This data type represents the capability supported by the NWDAF."; reference "TS 29.510"; - + leaf analyticsAggregation { type boolean ; default false; - description "It indicates whether the NWDAF supports analytics + description "It indicates whether the NWDAF supports analytics aggregation"; } - + leaf analyticsMetadataProvisioning { type boolean ; default false; - description "It indicate whether the NWDAF supports analytics metadata + description "It indicate whether the NWDAF supports analytics metadata provisioning:"; - } + } leaf roamingExchange { type boolean ; default false; description "It indicates whether the NWDAF supports roaming exchange capability"; - } + } } grouping MlAnalyticsInfoGrp { - description "This data type represents ML Analytics Filter information + description "This data type represents ML Analytics Filter information supported by the Nnwdaf_MLModelProvision service."; reference "TS 29.510"; - + leaf-list mlAnalyticsIds { type NwdafEvent; ordered-by user; - description "This attribute represents the Analytic functionalities - (identified by nwdafEvent defined in TS 29.520 [85]) of the NWDAF - instance. MnS consumer can configure this attribute to specify - which Analytic functionalities (identified by nwdafEvent) can be - performed the NWDAF instance. If the value of this attribute is not + description "This attribute represents the Analytic functionalities + (identified by nwdafEvent defined in TS 29.520 [85]) of the NWDAF + instance. MnS consumer can configure this attribute to specify + which Analytic functionalities (identified by nwdafEvent) can be + performed the NWDAF instance. If the value of this attribute is not present, the NWDAF instance can perform any NWDAFEvents - Analytics Id(s) supported by the Nnwdaf_MLModelProvision service, + Analytics Id(s) supported by the Nnwdaf_MLModelProvision service, if none are provided the NWDAF can serve any mlAnalyticsId."; } - + list sNSSAIList { min-elements 1; - description "List of S-NSSAIs the managed object is capable of + description "List of S-NSSAIs the managed object is capable of supporting."; reference "3GPP TS 23.003"; key "sd sst"; uses types5g3gpp:SNssai; } - + list trackingAreaList { - description "This attribute represents area of Interest of the ML model, - if none are provided the ML model for the analytics can apply to any + description "This attribute represents area of Interest of the ML model, + if none are provided the ML model for the analytics can apply to any TAIs. - If present, it represents the list of TAIs, it may contain one or + If present, it represents the list of TAIs, it may contain one or more non-3GPP access TAIs."; key idx ; leaf idx { type uint32; } uses types3gpp:TaiGrp; } - + leaf-list mlModelInterInfo { type string { pattern "[0-9]{6}"; } - description "This attribute defines the list of NWDAF vendors that are - allowed to retrieve ML models from the NWDAF containing MTLF. The - absence of this attribute indicates that none of the NWDAF vendors - can retrieve the ML models. + description "This attribute defines the list of NWDAF vendors that are + allowed to retrieve ML models from the NWDAF containing MTLF. The + absence of this attribute indicates that none of the NWDAF vendors + can retrieve the ML models. - allowedValues: 6 decimal digits; if the SMI code has less than - 6 digits, it shall be padded with leading digits '0' to complete a + allowedValues: 6 decimal digits; if the SMI code has less than + 6 digits, it shall be padded with leading digits '0' to complete a 6-digit string value."; } - + leaf flCapabilityType { type enumeration { enum FL_SERVER { @@ -146,25 +146,25 @@ module _3gpp-5gc-nrm-nwdaffunction { description "NWDAF containing MTLF as Federated Learning Client"; } enum FL_SERVER_AND_CLIENT { - description "NWDAF containing MTLF as Federated Learning Server and + description "NWDAF containing MTLF as Federated Learning Server and Client."; } } - description "This attribute defines the federated learning capability + description "This attribute defines the federated learning capability type supported by NWDAF containing MTLF."; } - + list flTimeInterval { key idx ; leaf idx { type uint32; } - description "This attribute defines the time window at which the - indicated flCapabilityType supported by NWDAF MTLF is available. - This attribute shall be present only if flCapabilityType attribute + description "This attribute defines the time window at which the + indicated flCapabilityType supported by NWDAF MTLF is available. + This attribute shall be present only if flCapabilityType attribute is present."; uses types3gpp:TimeWindowGrp; } } - + grouping NwdafInfoGrp { description "This data type represents specific data for the NWDAF."; reference "TS 29.510"; @@ -172,24 +172,24 @@ module _3gpp-5gc-nrm-nwdaffunction { leaf-list nwdafEvents { type NwdafEvent; ordered-by user; - description "This attribute represents the Analytic functionalities - (identified by nwdafEvent defined in TS 29.520) of the NWDAF instance. - MnS consumer can configure this attribute to specify which Analytic - functionalities (identified by nwdafEvent) can be performed the NWDAF - instance. If the value of this attribute is not present, the NWDAF + description "This attribute represents the Analytic functionalities + (identified by nwdafEvent defined in TS 29.520) of the NWDAF instance. + MnS consumer can configure this attribute to specify which Analytic + functionalities (identified by nwdafEvent) can be performed the NWDAF + instance. If the value of this attribute is not present, the NWDAF instance can perform any NWDAFEvents. - The detailed ENUM value for NwdafEvent see the Table 5.1.6.3.4-1 + The detailed ENUM value for NwdafEvent see the Table 5.1.6.3.4-1 in TS 29.520"; } - + leaf-list eventIds { type string ; min-elements 1; - description "It represents the EventId(s) supported by the - Nnwdaf_AnalyticsInfo service, if none are provided the NWDAF can serve + description "It represents the EventId(s) supported by the + Nnwdaf_AnalyticsInfo service, if none are provided the NWDAF can serve any eventId. (see clause TS 29.520)"; } - + list taiList { description "The list of TAIs. "; min-elements 1; @@ -197,7 +197,7 @@ module _3gpp-5gc-nrm-nwdaffunction { leaf idx { type uint32; } uses types3gpp:TaiGrp; } - + list taiRangeList { min-elements 1; key idx ; @@ -205,7 +205,7 @@ module _3gpp-5gc-nrm-nwdaffunction { description "The range of TAIs."; uses types5g3gpp:TaiRangeGrp; } - + list nwdafCapability { max-elements 1; key idx ; @@ -214,100 +214,100 @@ module _3gpp-5gc-nrm-nwdaffunction { If not present, the NWDAF shall be regarded with no capability."; uses NwdafCapabilityGrp; } - + leaf analyticsDelay { type int32 ; units seconds; - description "It represents the supported Analytics Delay related to the - eventIds and nwdafEvents. - It is an unsigned integer identifying a period of time in units of + description "It represents the supported Analytics Delay related to the + eventIds and nwdafEvents. + It is an unsigned integer identifying a period of time in units of seconds.(see clause 5.2.2 TS 29.571)."; } - + leaf-list servingNfTypeList { type types3gpp:NfType; min-elements 1; - description "It contains the list of NF type(s) from which the NWDAF NF - can collect data. The absence of this attribute indicates that the + description "It contains the list of NF type(s) from which the NWDAF NF + can collect data. The absence of this attribute indicates that the NWDAF can collect data from any NF type."; } - + leaf-list servingNfSetIdList { type string ; min-elements 1; - description "It contains the list of NF type(s) from which the NWDAF NF - can collect data. The absence of this attribute indicates that the - NWDAF can collect data from any NF type. (see clause 5.4.2 NfSetId + description "It contains the list of NF type(s) from which the NWDAF NF + can collect data. The absence of this attribute indicates that the + NWDAF can collect data from any NF type. (see clause 5.4.2 NfSetId in TS 29.571)"; } - + list mlAnalyticsList { min-elements 1; key idx ; leaf idx { type uint32; } - description "It represents ML Analytics Filter information supported by + description "It represents ML Analytics Filter information supported by the Nnwdaf_MLModelProvision service."; uses MlAnalyticsInfoGrp; } } - + grouping NetworkSliceInfoGrp { - description "Represents information of network slice when the NWDAF is + description "Represents information of network slice when the NWDAF is authorized to collect the management data of the network slice. "; - + list sNSSAI { - description "It represents the S-NSSAI the NetworkSlice managed object + description "It represents the S-NSSAI the NetworkSlice managed object is supporting. The S-NSSAI is defined in TS 23.003 "; key idx; min-elements 1; max-elements 1; - + leaf idx { type string; } uses types5g3gpp:SNssai; } - + leaf-list cNSIId { type string; - description "It represents NSI ID which is an identifier for identifying - the Core Network part of a Network Slice instance when multiple - Network Slice instances of the same Network Slice are deployed, - and there is a need to differentiate between them in the 5GC. - See NSI ID definition in clause 3.1 of TS 23.501 and + description "It represents NSI ID which is an identifier for identifying + the Core Network part of a Network Slice instance when multiple + Network Slice instances of the same Network Slice are deployed, + and there is a need to differentiate between them in the 5GC. + See NSI ID definition in clause 3.1 of TS 23.501 and subclause 6.1.6.2.7 of TS 29.531."; } - + leaf networkSliceRef { type types3gpp:DistinguishedName; mandatory true; - description "This holds a DN of the NetworkSlice managed object relating - to the NetworkSlice instance differentiated by sNSSAI and optional + description "This holds a DN of the NetworkSlice managed object relating + to the NetworkSlice instance differentiated by sNSSAI and optional cNSIId."; } } - + grouping NWDAFFunctionGrp { - description "The NWDAFFunction IOC includes attributes inherited from + description "The NWDAFFunction IOC includes attributes inherited from ManagedFunction IOC(defined in TS 28.622)and the following attributes:"; uses mf3gpp:ManagedFunctionGrp; - + list pLMNInfoList { description "It defines the PLMN(s) of a Network Function."; - min-elements 1; + min-elements 1; key "idx"; leaf idx { type uint32; } uses types3gpp:PLMNId; uses types5g3gpp:SNssai; } - + leaf sBIFQDN { - description "The FQDN of the registered NF instance in the service-based + description "The FQDN of the registered NF instance in the service-based interface."; type inet:domain-name; } - + list managedNFProfile { key idx; min-elements 1; @@ -319,23 +319,23 @@ module _3gpp-5gc-nrm-nwdaffunction { list commModelList { min-elements 1; key "groupId"; - description "Specifies a list of commModel. It can be used by NF and + description "Specifies a list of commModel. It can be used by NF and NF services to interact with each other in 5G Core network "; reference "3GPP TS 23.501"; uses types5g3gpp:CommModel; } - + list networkSliceInfoList { key idx; min-elements 1; - description "The attribute specifies a list of NetworkSliceInfo which - is defined as a datatype (see clause 5.3.95). It is used by an - authorized consumer, e.g. NWDAF, to facilitate the data collection + description "The attribute specifies a list of NetworkSliceInfo which + is defined as a datatype (see clause 5.3.95). It is used by an + authorized consumer, e.g. NWDAF, to facilitate the data collection from OAM."; leaf idx { type string; } - uses NetworkSliceInfoGrp; + uses NetworkSliceInfoGrp; yext3gpp:inVariant; } @@ -347,67 +347,67 @@ module _3gpp-5gc-nrm-nwdaffunction { description "It represents specific data for the NWDAF."; uses NwdafInfoGrp; } - + leaf administrativeState { type types3gpp:BasicAdministrativeState ; mandatory true; - description "This attribute determines whether the NWDAF is enabled or - disabled. MnS consumer can configure this attribute to activate or - de-activate the analytic functionalities (identified by nwdafEvent + description "This attribute determines whether the NWDAF is enabled or + disabled. MnS consumer can configure this attribute to activate or + de-activate the analytic functionalities (identified by nwdafEvent defined in TS 29.520) of the NWDAF instance."; } - + leaf nwdafLogicalFuncSupported { type enumeration { enum NWDAF_WITH_ANLF { - description "Indicates the NWDAF containing Analytics logical + description "Indicates the NWDAF containing Analytics logical function (AnLF)"; } enum NWDAF_WITH_MTLF { - description "Indicates the NWDAF containing Model Training logical + description "Indicates the NWDAF containing Model Training logical function (MTLF)."; } enum NWDAF_WITH_ANLF_MTLF { - description "Indicates the NWDAF containing both Analytics logical + description "Indicates the NWDAF containing both Analytics logical function (AnLF) and Model Training logical function (MTLF)."; } } config false; - description "It represents the logical functions supported by the NWDAF. - If not present, the NWDAF shall be regarded with no logical - decomposition, in that case the NWDAF only supports the analytics + description "It represents the logical functions supported by the NWDAF. + If not present, the NWDAF shall be regarded with no logical + decomposition, in that case the NWDAF only supports the analytics services."; } leaf roamingAnalytics { type boolean ; config false; - description "It indicates whether the NWDAF supports + description "It indicates whether the NWDAF supports Nnwdaf_RoamingAnalytics service"; } leaf roamingData { type boolean ; config false; - description "It indicates whether the NWDAF supports + description "It indicates whether the NWDAF supports Nnwdaf_RoamingData service"; - } + } } - + augment "/me3gpp:ManagedElement" { list NWDAFFunction { description "5G Core NWDAF Function. - For more information about the NWDAF, see TS 23.501. Several - attributes (including 'nwdafInfo', 'administrativeState' and - 'ManagedNFProfile.servingScope') are used to control the functionalities + For more information about the NWDAF, see TS 23.501. Several + attributes (including 'nwdafInfo', 'administrativeState' and + 'ManagedNFProfile.servingScope') are used to control the functionalities (identified by nwdafEvent defined in TS 29.520) of the NWDAF instance. - The attribute 'ManagedNFProfile.servingScope' is used to represent - specified certain geographical area(s) can be served by the NWDAF - instance. - - The attribute 'NwdafInfo.taiList' and 'NwdafInfo.taiRangeList' is used - to represent specified certain tracking area(s) can be served by the + The attribute 'ManagedNFProfile.servingScope' is used to represent + specified certain geographical area(s) can be served by the NWDAF + instance. + + The attribute 'NwdafInfo.taiList' and 'NwdafInfo.taiRangeList' is used + to represent specified certain tracking area(s) can be served by the NWDAF instance."; reference "3GPP TS 28.541 3GPP TS 23.501"; key id; diff --git a/yang-models/_3gpp-5gc-nrm-pcffunction.yang b/yang-models/_3gpp-5gc-nrm-pcffunction.yang index 725bdbc2e..a9ab6b435 100755 --- a/yang-models/_3gpp-5gc-nrm-pcffunction.yang +++ b/yang-models/_3gpp-5gc-nrm-pcffunction.yang @@ -1,9 +1,9 @@ module _3gpp-5gc-nrm-pcffunction { yang-version 1.1; - + namespace urn:3gpp:sa5:_3gpp-5gc-nrm-pcffunction; prefix pcf3gpp; - + import _3gpp-common-managed-function { prefix mf3gpp; } import _3gpp-common-managed-element { prefix me3gpp; } import ietf-inet-types { prefix inet; } @@ -11,25 +11,25 @@ module _3gpp-5gc-nrm-pcffunction { import _3gpp-5g-common-yang-types { prefix types5g3gpp; } import _3gpp-common-top { prefix top3gpp; } import _3gpp-5gc-nrm-managed-nfprofile { prefix mnfp3gpp; } - + organization "3gpp SA5"; contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464"; - description "This IOC represents the PCF function in 5GC. For more + description "This IOC represents the PCF function in 5GC. For more information about the PCF, see 3GPP TS 23.501. - Copyright 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + Copyright 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved."; reference "3GPP TS 28.541"; - - revision 2025-07-25 { reference CR-1558 ; } - revision 2024-05-24 { reference CR-1273 ; } - revision 2023-09-18 { reference CR-1043 ; } + + revision 2025-07-25 { reference CR-1558 ; } + revision 2024-05-24 { reference CR-1273 ; } + revision 2023-09-18 { reference CR-1043 ; } revision 2023-04-26 { reference CR-0916; } revision 2020-11-08 { reference CR-0412 ; } revision 2020-08-06 { reference "CR-0333"; } revision 2020-08-06 { reference "CR-0331"; } revision 2019-10-25 { reference "S5-194457 S5-193518"; } revision 2019-05-22 { reference "initial revision"; } - + grouping ProSeCapabilityGrp { leaf proseDirectDiscovery { type boolean; @@ -41,7 +41,7 @@ module _3gpp-5gc-nrm-pcffunction { } leaf proseL2UetoNetworkRelay { type boolean; - description "Indicates support for ProSe Layer-2 + description "Indicates support for ProSe Layer-2 UE-to-Network Relay.."; } leaf proseL3UetoNetworkRelay { @@ -56,17 +56,17 @@ module _3gpp-5gc-nrm-pcffunction { } leaf proseL3RemoteUe { type boolean; - description "Indicates support for ProSe Layer-3 + description "Indicates support for ProSe Layer-3 Remote UE."; } leaf proseL2UetoUeRelay { type boolean; - description "Indicates support for ProSe Layer-2 + description "Indicates support for ProSe Layer-2 UE-to-UE Relay."; } leaf proseL3UetoUeRelay { type boolean; - description "Indicates support for ProSe Layer-3 + description "Indicates support for ProSe Layer-3 UE-to-UE Relay."; } leaf proseL2EndUe { @@ -79,7 +79,7 @@ module _3gpp-5gc-nrm-pcffunction { } leaf proseL3IntermRelay { type boolean; - description "Indicates support for ProSe Layer-3 + description "Indicates support for ProSe Layer-3 Intermediate Relay."; } leaf proseL3MultihopRemote { @@ -88,7 +88,7 @@ module _3gpp-5gc-nrm-pcffunction { } leaf proseL3NetMultihopRelay { type boolean; - description "Indicates support for ProSe Layer-3 Network Multihop + description "Indicates support for ProSe Layer-3 Network Multihop Relay."; } leaf proseL3UeMultihopRelay { @@ -98,41 +98,42 @@ module _3gpp-5gc-nrm-pcffunction { leaf proseL3EndUeMultihop { type boolean; description "Indicates support for ProSe Layer-3 End UE Multihop."; - } - } + } + } grouping pcfInfoGrp { - + leaf-list dnnList { description "DNNs supported by the PCF. If not provided, the PCF can serve any DNN."; - + min-elements 1; type string; } - + list supiRanges { description "List of ranges of SUPIs that can be served by the PCF instance. If not provided, the PCF can serve any SUPI."; - key "start end pattern"; + key idx; + leaf idx { type uint32; } min-elements 1; - uses mnfp3gpp:SupiRange; + uses mnfp3gpp:SupiRangeGrp; } - + leaf rxDiamHost { description "This IE shall be present if the PCF supports Rx interface. - When present, this IE shall indicate the Diameter host + When present, this IE shall indicate the Diameter host of the Rx interface for the PCF. Pattern: '^([A-Za-z0-9]+(-[A-Za-z0-9]+).)+[a-z]{2,}$'."; - + type string; } - + leaf rxDiamRealm { description "This IE shall be present if the PCF supports Rx interface. - When present, this IE shall indicate the Diameter realm + When present, this IE shall indicate the Diameter realm of the Rx interface for the PCF. Pattern: '^([A-Za-z0-9]+(-[A-Za-z0-9]+).)+[a-z]{2,}$'."; - + type string; } list proseCapability { @@ -144,11 +145,11 @@ module _3gpp-5gc-nrm-pcffunction { grouping PCFFunctionGrp { description "Represents the PCFFunction IOC"; uses mf3gpp:ManagedFunctionGrp; - + list pLMNIdList { - description "List of at most six entries of PLMN Identifiers, but at + description "List of at most six entries of PLMN Identifiers, but at least one (the primary PLMN Id). - The PLMN Identifier is composed of a Mobile Country Code (MCC) and a + The PLMN Identifier is composed of a Mobile Country Code (MCC) and a Mobile Network Code (MNC)."; min-elements 1; @@ -156,13 +157,13 @@ module _3gpp-5gc-nrm-pcffunction { key "mcc mnc"; uses types3gpp:PLMNId; } - + leaf sBIFQDN { - description "The FQDN of the registered NF instance in the service-based + description "The FQDN of the registered NF instance in the service-based interface."; type inet:domain-name; } - + list sNSSAIList { description "List of S-NSSAIs the managed object is capable of supporting. (Single Network Slice Selection Assistance Information) @@ -173,7 +174,7 @@ module _3gpp-5gc-nrm-pcffunction { key "sd sst"; uses types5g3gpp:SNssai; } - + list managedNFProfile { key idx; leaf idx { type uint32; } @@ -185,19 +186,19 @@ module _3gpp-5gc-nrm-pcffunction { list commModelList { min-elements 1; key "groupId"; - description "Specifies a list of commModel. It can be used by NF and + description "Specifies a list of commModel. It can be used by NF and NF services to interact with each other in 5G Core network "; reference "3GPP TS 23.501"; uses types5g3gpp:CommModel; } leaf supportedBMOList { - description "It is used to indicate the list of supported BMOs + description "It is used to indicate the list of supported BMOs (Bridge Managed Objects) required for integration with TSN system."; type string; } list pcfInfo { - description "This attribute represents information of a PCF NF Instance. - Multiple pcfInfo may be allowed to define different DNN list for each + description "This attribute represents information of a PCF NF Instance. + Multiple pcfInfo may be allowed to define different DNN list for each supiranges."; key idx; leaf idx { type uint32; } @@ -205,16 +206,16 @@ module _3gpp-5gc-nrm-pcffunction { } leaf dynamic5QISetRef { type types3gpp:DistinguishedName; - description "DN of the Dynamic5QISet that the PCFFunction supports + description "DN of the Dynamic5QISet that the PCFFunction supports (is associated to)."; } leaf configurable5QISetRef { type types3gpp:DistinguishedName; - description "DN of the Configurable5QISet that the PCFFunction supports + description "DN of the Configurable5QISet that the PCFFunction supports (is associated to)."; } } - + augment "/me3gpp:ManagedElement" { list PCFFunction { description "5G Core PCF Function"; diff --git a/yang-models/_3gpp-5gc-nrm-predefinedpccruleset.yang b/yang-models/_3gpp-5gc-nrm-predefinedpccruleset.yang index 5489a5413..c54cbddb7 100755 --- a/yang-models/_3gpp-5gc-nrm-predefinedpccruleset.yang +++ b/yang-models/_3gpp-5gc-nrm-predefinedpccruleset.yang @@ -1,44 +1,44 @@ module _3gpp-5gc-nrm-predefinedpccruleset { yang-version 1.1; - + namespace urn:3gpp:sa5:_3gpp-5gc-nrm-predefinedpccruleset; prefix PredPccRules3gpp; - + import _3gpp-common-managed-element { prefix me3gpp; } import _3gpp-common-top { prefix top3gpp; } import _3gpp-5gc-nrm-smffunction { prefix smf3gpp; } import _3gpp-5gc-nrm-pcffunction { prefix pcf3gpp; } import ietf-yang-types { prefix yang; } - + organization "3gpp SA5"; contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464"; - description "This IOC represents the predefined PCC rules, which are + description "This IOC represents the predefined PCC rules, which are configured to SMF and referenced by PCF. - Copyright 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + Copyright 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved."; reference "3GPP TS 28.541"; revision 2025-05-01 { reference CR-xxxx ; } revision 2025-04-25 { reference CR-1520 ; } revision 2025-03-25 { reference CR-1489 ; } - revision 2023-09-18 { reference CR-1043 ; } + revision 2023-09-18 { reference CR-1043 ; } revision 2023-04-26 { reference CR-0916; } revision 2020-10-04 { reference "CR-0393"; } revision 2020-08-21 { reference "CR-0330"; } grouping TscaiInputContainer { - description "It specifies the transports TSCAI input parameters for TSC + description "It specifies the transports TSCAI input parameters for TSC traffic at the ingress interface of the DS-TT/UE for a PCC rule."; reference " 3GPP TS 29.512"; leaf periodicity { type uint32; - description "It identifies the time period between the start of two bursts + description "It identifies the time period between the start of two bursts in reference to the TSN GM."; reference "3GPP TS 29.571."; } leaf burstArrivalTime { type yang:date-and-time; - description "It Indicates the arrival time (in date-time format) of the + description "It Indicates the arrival time (in date-time format) of the data burst in reference to the TSN GM."; reference "3GPP,TS 29.571."; } @@ -53,13 +53,13 @@ module _3gpp-5gc-nrm-predefinedpccruleset { } leaf activationTime { type yang:date-and-time; - description " It indicates the time (in date-time format) when the decision + description " It indicates the time (in date-time format) when the decision data shall be activated."; reference "3GPP29.512 and TS 29.571."; } leaf deactivationTime { type yang:date-and-time; - description "It indicates the time (in date-time format) when the decision + description "It indicates the time (in date-time format) when the decision data shall be deactivated."; reference "3GPPTS 29.512 and TS 29.571."; } @@ -68,7 +68,7 @@ module _3gpp-5gc-nrm-predefinedpccruleset { enum 3GPP_ACCESS; enum NON_3GPP_ACCESS; } - description "It provides the condition of access type of the UE when the + description "It provides the condition of access type of the UE when the session AMBR shall be enforced."; reference "3GPPTS 29.512."; } @@ -90,7 +90,7 @@ module _3gpp-5gc-nrm-predefinedpccruleset { enum UTRA; enum GERA; } - description "It provides the condition of RAT type of the UE when the + description "It provides the condition of RAT type of the UE when the session AMBR shall be enforced."; reference "3GPPTS 29.512 and TS 29.571."; } @@ -126,7 +126,7 @@ module _3gpp-5gc-nrm-predefinedpccruleset { type uint8 { range 0..100; } - description "It indicates the traffic load to steer to the 3GPP Access + description "It indicates the traffic load to steer to the 3GPP Access expressed in one percent."; } leaf prioAcc { @@ -140,19 +140,19 @@ module _3gpp-5gc-nrm-predefinedpccruleset { } grouping UpPathChgEvent { - description "It specifies the information about the AF subscriptions of the + description "It specifies the information about the AF subscriptions of the UP path change."; reference "3GPPTS 29.512"; leaf notificationUri { type string; mandatory true; - description "It provides notification address (Uri) of AF receiving the + description "It provides notification address (Uri) of AF receiving the event notification."; } leaf notifCorreId { type string; mandatory true; - description "It is used to set the value of Notification Correlation ID in + description "It is used to set the value of Notification Correlation ID in the notification sent by the SMF, see TS 29.512"; } leaf dnaiChgType { @@ -167,7 +167,7 @@ module _3gpp-5gc-nrm-predefinedpccruleset { leaf afAckInd { type boolean; default false; - description "It identifies whether the AF acknowledgement of UP path + description "It identifies whether the AF acknowledgement of UP path event notification is expected."; } } @@ -176,24 +176,24 @@ module _3gpp-5gc-nrm-predefinedpccruleset { description "It specifies the traffic routing information."; leaf ipv4Addr { type string; - description "It defines the Ipv4 address of the tunnel end point in the + description "It defines the Ipv4 address of the tunnel end point in the data network, formatted in the dotted decimal notation."; } leaf ipv6Addr { type string; - description "It defines the Ipv6 address of the tunnel end point in the + description "It defines the Ipv6 address of the tunnel end point in the data network."; } leaf portNumber { type uint32; mandatory true; - description " It defines the UDP port number of the tunnel end point in + description " It defines the UDP port number of the tunnel end point in the data network, see TS 29.571"; } } grouping RouteToLocation { - description "It specifies a list of location which the traffic shall be + description "It specifies a list of location which the traffic shall be routed to for the AF request."; leaf dnai { type string; @@ -212,7 +212,7 @@ module _3gpp-5gc-nrm-predefinedpccruleset { } grouping RedirectInformaton { - description "It specifies the redirect information for traffic control in + description "It specifies the redirect information for traffic control in the PCC rule."; leaf redirectEnabled { type boolean; @@ -238,12 +238,12 @@ module _3gpp-5gc-nrm-predefinedpccruleset { } grouping TrafficControlDataInformation { - description "It specifies the traffic control data for a service + description "It specifies the traffic control data for a service flow of a PCC rule."; leaf tcId { type string; mandatory true; - description "It univocally identifies the traffic control policy data + description "It univocally identifies the traffic control policy data within a PDU session."; } leaf flowStatus { @@ -255,22 +255,22 @@ module _3gpp-5gc-nrm-predefinedpccruleset { enum REMOVED; } mandatory true; - description "It represents whether the service data flow(s) are enabled + description "It represents whether the service data flow(s) are enabled or disabled."; } container redirectInfo { - description "It contains the redirect information indicating whether the + description "It contains the redirect information indicating whether the detected application traffic should be redirected to another controlled address."; uses RedirectInformaton; } container addRedirectInfo { - description "It contains the additional redirect information indicating - whether the detected application traffic should be redirected to another + description "It contains the additional redirect information indicating + whether the detected application traffic should be redirected to another controlled address."; list redirectInfo { - description "The list of redirect information indicating whether the - detected application traffic should be redirected to another + description "The list of redirect information indicating whether the + detected application traffic should be redirected to another controlled address."; key "redirectServerAddress"; uses RedirectInformaton; @@ -279,7 +279,7 @@ module _3gpp-5gc-nrm-predefinedpccruleset { leaf muteNotif { type boolean; default false; - description "It indicates whether applicat'on's start or stop notification + description "It indicates whether applicat'on's start or stop notification is to be muted."; } leaf trafficSteeringPolIdDl { @@ -288,14 +288,14 @@ module _3gpp-5gc-nrm-predefinedpccruleset { } leaf trafficSteeringPolIdUl { type string; - description "It references to a pre-configured traffic steering policy for + description "It references to a pre-configured traffic steering policy for uplink traffic at the SMF, see TS 29.512"; } container routeToLocs { - description "It provides a list of location which the traffic shall be + description "It provides a list of location which the traffic shall be routed to for the AF request."; list routeToLoc { - description "The list of location which the traffic shall be routed to + description "The list of location which the traffic shall be routed to for the AF request."; key "dnai"; uses RouteToLocation; @@ -311,7 +311,7 @@ module _3gpp-5gc-nrm-predefinedpccruleset { reference "3GPPTS 29.512"; } container steerModeDl { - description "It provides the traffic distribution rule across 3GPP and + description "It provides the traffic distribution rule across 3GPP and Non-3GPP accesses to apply for downlink traffic."; uses SteeringMode; } @@ -429,7 +429,7 @@ module _3gpp-5gc-nrm-predefinedpccruleset { leaf destMacAddr { type string; mandatory true; - description "It specifies the destination MAC address formatted in the + description "It specifies the destination MAC address formatted in the hexadecimal ."; reference "clause 1.1 and clause 2.1 of IETF RFC"; } @@ -454,16 +454,16 @@ module _3gpp-5gc-nrm-predefinedpccruleset { leaf sourceMacAddr { type string; mandatory true; - description "It specifies the source MAC address formatted in the + description "It specifies the source MAC address formatted in the hexadecimal notation."; reference "clause 1.1 and clause 2.1 of IETF RFC 7042"; } leaf-list vlanTags { type string; - description "It specifies the Customer-VLAN and/or Service-VLAN tags - containing the VID, PCP/DEI fields as defined in IEEE 802.1Q and - IETF RFC 7042. The first/lower instance in the array stands for the - Customer-VLAN tag and the second/higher instance in the array stands + description "It specifies the Customer-VLAN and/or Service-VLAN tags + containing the VID, PCP/DEI fields as defined in IEEE 802.1Q and + IETF RFC 7042. The first/lower instance in the array stands for the + Customer-VLAN tag and the second/higher instance in the array stands for the Service-VLAN tag."; } leaf srcMacAddrEnd { @@ -539,7 +539,7 @@ module _3gpp-5gc-nrm-predefinedpccruleset { leaf applicationId { type string; default false; - description "A reference to the application detection filter configured + description "A reference to the application detection filter configured at the UPF."; } leaf appDescriptor { @@ -554,7 +554,7 @@ module _3gpp-5gc-nrm-predefinedpccruleset { type uint8 { range 0..255; } - description "It indicates the order in which this PCC rule is applied + description "It indicates the order in which this PCC rule is applied relative to other PCC rules within the same PDU session."; } leaf afSigProtocol { @@ -562,13 +562,13 @@ module _3gpp-5gc-nrm-predefinedpccruleset { enum NO_INFORMATION; enum SIP; } - description "Indicates the protocol used for signalling between the UE + description "Indicates the protocol used for signalling between the UE and the AF, the default value is NO_INFORMATION."; } leaf isAppRelocatable { type boolean; default false; - description "It indicates the application relocation possibility, the + description "It indicates the application relocation possibility, the default value is NO_INFORMATION."; } leaf isUeAddrPreserved { @@ -585,7 +585,7 @@ module _3gpp-5gc-nrm-predefinedpccruleset { } } container altQosParams { - description "It contains the QoS control policy data for the Alternative + description "It contains the QoS control policy data for the Alternative QoS parameter sets of the service data flow."; list qosDataInfo { description "The list of QoS control policy data."; @@ -601,15 +601,15 @@ module _3gpp-5gc-nrm-predefinedpccruleset { uses TrafficControlDataInformation; } } - uses ConditionData; + uses ConditionData; container tscaiInputUl { description "It contains transports TSCAI input parameters for TSC traffic at the ingress interface of the DS-TT/UE (uplink flow direction)."; - uses TscaiInputContainer; + uses TscaiInputContainer; } container tscaiInputDl { description "It contains transports TSCAI input parameters for TSC traffic at the ingress of the NW-TT (downlink flow direction)."; - uses TscaiInputContainer; + uses TscaiInputContainer; } leaf easRedisIndRequired { type boolean; @@ -629,7 +629,7 @@ module _3gpp-5gc-nrm-predefinedpccruleset { type boolean; default false; description "Indicates whether QoS flow parameter signalling to the UE is enabled (TRUE), when the SMF is notified by the NG-RAN of changes in the fulfilled QoS situation,"; - } + } leaf packFiltAllPrec { type uint32; description "Determines the order of TFT packet filter allocation for PCC rules."; @@ -637,7 +637,7 @@ module _3gpp-5gc-nrm-predefinedpccruleset { leaf nscSupportedFeats { type uint32; description "Indicates the Network Function Service Consumer features supported per service."; - } + } } grouping PredefinedPccRuleSetGrp { @@ -647,7 +647,7 @@ module _3gpp-5gc-nrm-predefinedpccruleset { key "pccRuleId"; uses PccRule; } - } + } grouping PredefinedPccRuleSetSubtree { description "It specifies the PredefinedPccRuleSet IOC with inherited attributes."; @@ -659,7 +659,7 @@ module _3gpp-5gc-nrm-predefinedpccruleset { description "It contains the attributes defined specifically in the PredefinedPccRuleSet IOC."; uses PredefinedPccRuleSetGrp; } - } + } } augment "/me3gpp:ManagedElement/smf3gpp:SMFFunction" { diff --git a/yang-models/_3gpp-5gc-nrm-scpfunction.yang b/yang-models/_3gpp-5gc-nrm-scpfunction.yang index f52d2f078..ce1914b9b 100755 --- a/yang-models/_3gpp-5gc-nrm-scpfunction.yang +++ b/yang-models/_3gpp-5gc-nrm-scpfunction.yang @@ -1,30 +1,30 @@ module _3gpp-5gc-nrm-scpfunction { yang-version 1.1; - + namespace urn:3gpp:sa5:_3gpp-5gc-nrm-scpfunction; prefix scp3gpp; - + import _3gpp-common-managed-function { prefix mf3gpp; } import _3gpp-common-managed-element { prefix me3gpp; } import ietf-inet-types { prefix inet; } import _3gpp-5g-common-yang-types { prefix types5g3gpp; } 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 SCP function in 5GC. For more + description "This IOC represents the SCP function in 5GC. For more information about the SCP, see 3GPP TS 23.501. - Copyright 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + Copyright 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved."; reference "3GPP TS 28.541"; - - revision 2023-09-18 { reference CR-1043 ; } + + revision 2023-09-18 { reference CR-1043 ; } revision 2023-04-26 { reference CR-0916; } revision 2019-10-24 { reference "initial revision"; } - + grouping SCPFunctionGrp { uses mf3gpp:ManagedFunctionGrp; - + leaf address { description "The host address of the SCP."; type inet:host; @@ -33,13 +33,13 @@ module _3gpp-5gc-nrm-scpfunction { list supportedFuncList { min-elements 1; key "function"; - description "This parameter lists functionalities supported by a SCP. + description "This parameter lists functionalities supported by a SCP. Refer to TS 23.501 "; uses types5g3gpp:SupportedFunc; } - + } - + augment "/me3gpp:ManagedElement" { list SCPFunction { description "5G Core SCP Function"; diff --git a/yang-models/_3gpp-5gc-nrm-seppfunction.yang b/yang-models/_3gpp-5gc-nrm-seppfunction.yang index 3be7623d4..19eeb3860 100755 --- a/yang-models/_3gpp-5gc-nrm-seppfunction.yang +++ b/yang-models/_3gpp-5gc-nrm-seppfunction.yang @@ -1,9 +1,9 @@ module _3gpp-5gc-nrm-seppfunction { yang-version 1.1; - + namespace urn:3gpp:sa5:_3gpp-5gc-nrm-seppfunction; prefix sepp3gpp; - + import _3gpp-common-managed-function { prefix mf3gpp; } import _3gpp-common-managed-element { prefix me3gpp; } import _3gpp-5g-common-yang-types { prefix types5g3gpp; } @@ -11,18 +11,18 @@ module _3gpp-5gc-nrm-seppfunction { import _3gpp-common-yang-extensions { prefix yext3gpp; } import _3gpp-common-top { prefix top3gpp; } import ietf-inet-types { prefix inet; } - + organization "3gpp SA5"; description "This IOC represents the SEPP function which support message filtering and policing on inter-PLMN control plane interface. For more information about the SEPP, see 3GPP TS 23.501. - Copyright 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + Copyright 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved."; reference "3GPP TS 28.541"; - - revision 2023-09-18 { reference CR-1043 ; } + + revision 2023-09-18 { reference CR-1043 ; } revision 2020-08-03 { reference "CR-0321"; } revision 2019-10-28 { reference S5-193518 ; } - + typedef SEPPType { reference "3GPP TS 23501"; type enumeration { @@ -37,41 +37,41 @@ module _3gpp-5gc-nrm-seppfunction { } } } - + grouping SeppInfoGrp { leaf seppPrefix { type string ; - description "This attributes represents optional deployment specific - string used to construct the apiRoot of the next hop SEPP, as described + description "This attributes represents optional deployment specific + string used to construct the apiRoot of the next hop SEPP, as described in clause 6.10 of TS 29.500"; } - + leaf-list seppPorts { type uint16 ; - description "This attributes represents SEPP port number(s) for HTTP + description "This attributes represents SEPP port number(s) for HTTP and/or HTTPS. - This attribute shall be present if the SEPP uses non-default HTTP - and/or HTTPS ports. When present, it shall contain the HTTP and/or + This attribute shall be present if the SEPP uses non-default HTTP + and/or HTTPS ports. When present, it shall contain the HTTP and/or HTTPS ports. The key of the map shall be 'http' or 'https'. - The value shall indicate the port number for HTTP or + The value shall indicate the port number for HTTP or HTTPS respectively."; } - + list remotePlmnList { - description "It represents a list of remote PLMNs reachable through the + description "It represents a list of remote PLMNs reachable through the SEPP. - The absence of this attribute indicates that any PLMN is reachable + The absence of this attribute indicates that any PLMN is reachable through the SEPP."; key idx; leaf idx { type uint32 ; } uses types3gpp:PLMNId; } - + list remoteSnpnList { - description "This attributes represents list of remote SNPNs reachable + description "This attributes represents list of remote SNPNs reachable through the SEPP. - The absence of this attribute indicates that no SNPN is reachable + The absence of this attribute indicates that no SNPN is reachable through the SEPP."; key idx; leaf idx { type uint32 ; } @@ -81,39 +81,39 @@ module _3gpp-5gc-nrm-seppfunction { grouping SEPPFunctionGrp { uses mf3gpp:ManagedFunctionGrp; - + container pLMNId { description "PLMN Identifiers of the sepp. The PLMN Identifier is composed of a Mobile Country Code (MCC) and a Mobile Network Code (MNC)."; yext3gpp:inVariant; uses types3gpp:PLMNId; } - + leaf sEPPType { type sepp3gpp:SEPPType; yext3gpp:inVariant; } - + leaf sEPPId { type uint16; yext3gpp:inVariant; - } - + } + leaf fqdn { description "The domain name of the SEPP."; type inet:domain-name; } - + list seppInfo { max-elements 1; key idx; - description "This attributes represents information of a SEPP Instance, + description "This attributes represents information of a SEPP Instance, as described in clause 6.1.6.2.72 of TS 29.510 "; leaf idx { type uint32 ; } uses SeppInfoGrp; } } - + augment "/me3gpp:ManagedElement" { list SEPPFunction { description "5G Core SEPP Function"; diff --git a/yang-models/_3gpp-5gc-nrm-smffunction.yang b/yang-models/_3gpp-5gc-nrm-smffunction.yang index 4a943bdf8..d62b1cfac 100755 --- a/yang-models/_3gpp-5gc-nrm-smffunction.yang +++ b/yang-models/_3gpp-5gc-nrm-smffunction.yang @@ -14,12 +14,12 @@ module _3gpp-5gc-nrm-smffunction { organization "3gpp SA5"; contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464"; description "SMFFunction derived from basic ManagedFunction. - Copyright 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + Copyright 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved."; reference "3GPP TS 28.541"; - revision 2024-05-24 { reference CR-1273 ; } - revision 2023-09-18 { reference CR-1043 ; } + revision 2024-05-24 { reference CR-1273 ; } + revision 2023-09-18 { reference CR-1043 ; } revision 2023-04-26 { reference CR-0916; } revision 2020-11-08 { reference CR-0412 ; } revision 2020-08-06 { reference "CR-0333"; } @@ -30,62 +30,62 @@ module _3gpp-5gc-nrm-smffunction { grouping SmfInfoGrp { - + list sNssaiSmfInfoList { description "List of parameters supported by the SMF per S-NSSAI."; min-elements 1; - key idx; + key idx; leaf idx { type uint32; } uses types5g3gpp:sNssaiSmfInfoItem; } - + list taiList { - description "The list of TAIs the SMF can serve. + description "The list of TAIs the SMF can serve. It may contain the non-3GPP access TAI. - The absence of this attribute and the taiRangeList + The absence of this attribute and the taiRangeList attribute indicate that - the SMF can be selected for any TAI + the SMF can be selected for any TAI in the serving network."; - - key idx; + + key idx; leaf idx { type uint32; } - + min-elements 1; uses types3gpp:TaiGrp; } - + list taiRangeList { - description "The range of TAIs the SMF can serve. + description "The range of TAIs the SMF can serve. The absence of this attribute and the taiList - attribute indicate that the SMF can be selected + attribute indicate that the SMF can be selected for any TAI in the serving network."; min-elements 1; - key idx; + key idx; leaf idx { type uint32; } uses types5g3gpp:TaiRangeGrp; } - + leaf pgwFqdn { description "The FQDN of the PGW if the SMF is a combined SMF/PGW-C."; type inet:domain-name; } leaf-list accessType { - description "If included, this IE shall contain the access type + description "If included, this IE shall contain the access type (3GPP_ACCESS and/or NON_3GPP_ACCESS) supported by the SMF. If not included, it shall be assumed the both access types are supported."; - + min-elements 1; max-elements 2; type AccessType; } leaf priority { description "This parameter defines Priority (relative to other - NFs of the same type) in the range of 0-65535, to be used for + NFs of the same type) in the range of 0-65535, to be used for NF selection; lower values indicate a higher priority. If - priority is also present in the nfServiceList parameters, + priority is also present in the nfServiceList parameters, those will have precedence over this value "; - type uint16; + type uint16; } leaf-list vsmfSupportInd { description "Used by an SMF to explicitly indicate the support of @@ -99,28 +99,28 @@ module _3gpp-5gc-nrm-smffunction { } leaf pgwFqdnList { - description "When present, this attribute provides additional FQDNs - to the FQDN indicated in the pgwFqdn attribute. - The pgwFqdnList attribute may be present if the pgwFqdn attribute + description "When present, this attribute provides additional FQDNs + to the FQDN indicated in the pgwFqdn attribute. + The pgwFqdnList attribute may be present if the pgwFqdn attribute is present."; type string; } leaf-list ismfSupportInd { - description "This attribute may be used by an SMF to explicitly - indicate the support of I-SMF capability and its preference to be - selected as I-SMF. When present, this attribute shall indicate + description "This attribute may be used by an SMF to explicitly + indicate the support of I-SMF capability and its preference to be + selected as I-SMF. When present, this attribute shall indicate whether the I-SMF capability are supported by the SMF: - TRUE: I-SMF capability supported by the SMF - FALSE: I-SMF capability not supported by the SMF. Absence of this - attribute indicates the I-SMF capability support of the SMF is not + attribute indicates the I-SMF capability support of the SMF is not specified."; max-elements 1; type boolean; } leaf-list smfOnboardingCapability { - description "This attribute indicates the SMF supports SNPN - Onboarding capability and User Plane Remote Provisioning. This - is used for the case of Onboarding of UEs for SNPNs + description "This attribute indicates the SMF supports SNPN + Onboarding capability and User Plane Remote Provisioning. This + is used for the case of Onboarding of UEs for SNPNs (see TS 23.501 [2], clauses 5.30.2.10 and 6.2.6.2). - FALSE: SMF does not support SNPN Onboarding; - TRUE: SMF supports SNPN Onboarding."; @@ -129,8 +129,8 @@ module _3gpp-5gc-nrm-smffunction { } leaf-list smfUPRPCapability { description "This attribute IE indicates the SMF supports User - Plane Remote Provisioning (UPRP) capability. This is used for - the case of Onboarding of UEs for SNPNs , + Plane Remote Provisioning (UPRP) capability. This is used for + the case of Onboarding of UEs for SNPNs , clauses 5.30.2.10 and 6.2.6.2). - FALSE: SMF does not support UPRP; - TRUE: SMF supports UPRP."; @@ -138,14 +138,14 @@ module _3gpp-5gc-nrm-smffunction { type boolean; } } - + grouping SMFFunctionGrp { description "Represents the SMFFuntion IOC"; uses mf3gpp:ManagedFunctionGrp; list pLMNIdList { min-elements 1; - description "A list of PLMN identifiers (Mobile Country Code and Mobile + description "A list of PLMN identifiers (Mobile Country Code and Mobile Network Code)."; key "mcc mnc"; uses types3gpp:PLMNId; @@ -160,11 +160,11 @@ module _3gpp-5gc-nrm-smffunction { } leaf sBIFQDN { - description "The FQDN of the registered NF instance in the service-based + description "The FQDN of the registered NF instance in the service-based interface."; type inet:domain-name; } - + list managedNFProfile { key idx; leaf idx { type uint32; } @@ -177,7 +177,7 @@ module _3gpp-5gc-nrm-smffunction { list commModelList { min-elements 1; key "groupId"; - description "Specifies a list of commModel. It can be used by NF and + description "Specifies a list of commModel. It can be used by NF and NF services to interact with each other in 5G Core network "; reference "3GPP TS 23.501"; uses types5g3gpp:CommModel; @@ -185,13 +185,13 @@ module _3gpp-5gc-nrm-smffunction { leaf configurable5QISetRef { type types3gpp:DistinguishedName; - description "DN of the Configurable5QISet that the SMFFunction supports + description "DN of the Configurable5QISet that the SMFFunction supports (is associated to)."; } - + leaf dynamic5QISetRef { type types3gpp:DistinguishedName; - description "DN of the Dynamic5QISet that the SMFFunction supports + description "DN of the Dynamic5QISet that the SMFFunction supports (is associated to)."; } @@ -208,9 +208,9 @@ module _3gpp-5gc-nrm-smffunction { leaf-list dnaiList { description "List of Data network access identifiers."; min-elements 1; - type string; + type string; } - + leaf satelliteid { description "Unique identifier of a GEO satellite."; type string; diff --git a/yang-models/_3gpp-5gc-nrm-smsffunction.yang b/yang-models/_3gpp-5gc-nrm-smsffunction.yang index 61c7d1242..481789e7f 100755 --- a/yang-models/_3gpp-5gc-nrm-smsffunction.yang +++ b/yang-models/_3gpp-5gc-nrm-smsffunction.yang @@ -1,42 +1,42 @@ module _3gpp-5gc-nrm-smsffunction { yang-version 1.1; - + namespace urn:3gpp:sa5:_3gpp-5gc-nrm-smsffunction; prefix smsf3gpp; - + import _3gpp-common-managed-function { prefix mf3gpp; } import _3gpp-common-managed-element { prefix me3gpp; } import _3gpp-common-yang-types { prefix types3gpp; } import _3gpp-5g-common-yang-types { prefix types5g3gpp; } import _3gpp-common-top { prefix top3gpp; } - + organization "3gpp SA5"; description "This IOC represents the SMSF function defined in 3GPP TS 23.501. - Copyright 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + Copyright 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved."; reference "3GPP TS 28.541"; - - revision 2023-09-18 { reference CR-1043 ; } + + revision 2023-09-18 { reference CR-1043 ; } revision 2019-10-25 { reference "S5-194457 S5-195427 S5-193518"; } - + revision 2019-05-15 { description "initial revision"; - + } - + grouping SMSFFunctionGrp { uses mf3gpp:ManagedFunctionGrp; - + list pLMNIdList { description "List of at most six entries of PLMN Identifiers, but at least one (the primary PLMN Id). The PLMN Identifier is composed of a Mobile Country Code (MCC) and a Mobile Network Code (MNC)."; - + min-elements 1; max-elements 6; key "mcc mnc"; uses types3gpp:PLMNId; - } - + } + list managedNFProfile { key idx; min-elements 1; @@ -49,7 +49,7 @@ module _3gpp-5gc-nrm-smsffunction { uses types5g3gpp:CommModel; } } - + augment "/me3gpp:ManagedElement" { list SMSFFunction { description "5G Core SMSF Function"; diff --git a/yang-models/_3gpp-5gc-nrm-udmfunction.yang b/yang-models/_3gpp-5gc-nrm-udmfunction.yang index c91967e05..32fc1d769 100755 --- a/yang-models/_3gpp-5gc-nrm-udmfunction.yang +++ b/yang-models/_3gpp-5gc-nrm-udmfunction.yang @@ -1,9 +1,9 @@ module _3gpp-5gc-nrm-udmfunction { yang-version 1.1; - + namespace urn:3gpp:sa5:_3gpp-5gc-nrm-udmfunction; prefix udm3gpp; - + import _3gpp-common-managed-function { prefix mf3gpp; } import _3gpp-common-managed-element { prefix me3gpp; } import ietf-inet-types { prefix inet; } @@ -11,26 +11,26 @@ module _3gpp-5gc-nrm-udmfunction { import _3gpp-5g-common-yang-types { prefix types5g3gpp; } import _3gpp-common-top { prefix top3gpp; } import _3gpp-5gc-nrm-managed-nfprofile { prefix mnfp3gpp; } - + organization "3gpp SA5"; contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464"; - description "This IOC represents the UDM function in 5GC. For more + description "This IOC represents the UDM function in 5GC. For more information about the UDM, see 3GPP TS 23.501. - Copyright 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + Copyright 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved."; reference "3GPP TS 28.541"; - + revision 2024-04-04 { reference CR-1139; } - revision 2023-09-18 { reference CR-1043 ; } + revision 2023-09-18 { reference CR-1043 ; } revision 2023-04-26 { reference CR-0916; } revision 2020-11-08 { reference CR-0412 ; } revision 2019-10-25 { reference "S5-194457 S5-195427 S5-193518"; } revision 2019-05-22 { reference "initial revision";} - + grouping InternalGroupIdRangeGrp { leaf start { - description "It indicates first value identifying the start of an + description "It indicates first value identifying the start of an identity range, to be used when the range of identities can be represented as a consecutive numeric range."; type string; @@ -38,64 +38,64 @@ module _3gpp-5gc-nrm-udmfunction { leaf end{ description "It indicates last value identifying the end of an - identity range, to be used when the range of identities can be + identity range, to be used when the range of identities can be represented as a consecutive numeric range."; - type string; + type string; } leaf pattern { - description "It indicates pattern (regular expression according - to the ECMA-262 dialect [75]) representing the set of identities - belonging to this range. An identity value is considered part of - the range if and only if the identity string fully matches the + description "It indicates pattern (regular expression according + to the ECMA-262 dialect [75]) representing the set of identities + belonging to this range. An identity value is considered part of + the range if and only if the identity string fully matches the regular expression."; - type string; + type string; } } grouping SuciInfoGrp { - description "This data type represents SUCI information containing + description "This data type represents SUCI information containing Routing Indicator and Home Network Public Key ID. (See TS 29.510)"; - + leaf-list routingInds { type string; min-elements 1; - description "It indicates served Routing Indicator (see TS 23.003, - clause 2.2B). If not provided, the AUSF/UDM + description "It indicates served Routing Indicator (see TS 23.003, + clause 2.2B). If not provided, the AUSF/UDM can serve any Routing Indicator."; } - + leaf-list hNwPubKeyIds { type int64; min-elements 1; - description "It indicating served Home Network Public Key - (see TS 23.003, clause 2.2B). If not provided, the AUSF/UDM + description "It indicating served Home Network Public Key + (see TS 23.003, clause 2.2B). If not provided, the AUSF/UDM can serve any public key."; } } grouping UdmInfoGrp { - + leaf groupId { - description "Identity of the UDM group that is served by the + description "Identity of the UDM group that is served by the UDM instance. If not provided, the UDM instance does not pertain to any UDM group."; type string; } - + list supiRanges { - description "List of ranges of SUPI's whose profile data is + description "List of ranges of SUPI's whose profile data is available in the UDM instance."; key "start end pattern"; min-elements 1; - uses mnfp3gpp:SupiRange; + uses mnfp3gpp:SupiRangeGrp; } - + list gpsiRanges { - description "List of ranges of GPSIs whose profile data is + description "List of ranges of GPSIs whose profile data is available in the UDM instance."; key "start end pattern"; min-elements 1; uses mnfp3gpp:IdentityRange; } - + list externalGroupIdentifiersRanges { description "List of ranges of external groups whose profile data is available in the UDM instance."; @@ -103,11 +103,11 @@ module _3gpp-5gc-nrm-udmfunction { min-elements 1; uses mnfp3gpp:IdentityRange; } - + leaf-list routingIndicators { description "List of Routing Indicator information that allows to route network signalling with SUCI - to the UDM instance. If not provided, + to the UDM instance. If not provided, the UDM can serve any Routing Indicator. Pattern: '^[0-9]{1,4}$'."; min-elements 1; @@ -115,9 +115,9 @@ module _3gpp-5gc-nrm-udmfunction { } list internalGroupIdentifiersRanges{ - description "It represents list of ranges of Internal Group + description "It represents list of ranges of Internal Group Identifiers whose profile data is available in the UDM instance. - If not provided, it does not imply that the UDM supports all + If not provided, it does not imply that the UDM supports all internal groups."; key idx; leaf idx { type uint32; } @@ -126,10 +126,10 @@ module _3gpp-5gc-nrm-udmfunction { list suciInfos { description "It represents list of SuciInfo. A SUCI that matches this information can be served by the UDM .A SUCI that matches - all attributes of at least one entry in this array shall be + all attributes of at least one entry in this array shall be considered as a match of this information"; key idx; - leaf idx { type uint32; } + leaf idx { type uint32; } uses SuciInfoGrp; } } @@ -137,11 +137,11 @@ module _3gpp-5gc-nrm-udmfunction { grouping UDMFuntionGrp { description "Represents the UDMFuntion IOC"; uses mf3gpp:ManagedFunctionGrp; - + list pLMNIdList { - description "List of at most six entries of PLMN Identifiers, but at + description "List of at most six entries of PLMN Identifiers, but at least one (the primary PLMN Id). - The PLMN Identifier is composed of a Mobile Country Code (MCC) and a + The PLMN Identifier is composed of a Mobile Country Code (MCC) and a Mobile Network Code (MNC)."; min-elements 1; @@ -149,13 +149,13 @@ module _3gpp-5gc-nrm-udmfunction { key "mcc mnc"; uses types3gpp:PLMNId; } - + leaf sBIFQDN { - description "The FQDN of the registered NF instance in the service-based + description "The FQDN of the registered NF instance in the service-based interface."; type inet:domain-name; } - + list sNSSAIList { description "List of S-NSSAIs the managed object is capable of supporting. (Single Network Slice Selection Assistance Information) @@ -166,7 +166,7 @@ module _3gpp-5gc-nrm-udmfunction { key "sd sst"; uses types5g3gpp:SNssai; } - + list managedNFProfile { key idx; leaf idx { type uint32; } @@ -179,7 +179,7 @@ module _3gpp-5gc-nrm-udmfunction { list commModelList { min-elements 1; key "groupId"; - description "Specifies a list of commModel. It can be used by NF and + description "Specifies a list of commModel. It can be used by NF and NF services to interact with each other in 5G Core network "; reference "3GPP TS 23.501"; uses types5g3gpp:CommModel; @@ -207,11 +207,11 @@ module _3gpp-5gc-nrm-udmfunction { } description "represents a list of MDT measurement names that are subject to user consent at MDT activation. - Any MDT measurement, whose name is not specified in this list, is not + Any MDT measurement, whose name is not specified in this list, is not subject to user consent at MDT activation."; } } - + augment "/me3gpp:ManagedElement" { list UDMFunction { description "5G Core UDM Function"; diff --git a/yang-models/_3gpp-5gc-nrm-udrfunction.yang b/yang-models/_3gpp-5gc-nrm-udrfunction.yang index 071eb6df8..5f9ff1028 100755 --- a/yang-models/_3gpp-5gc-nrm-udrfunction.yang +++ b/yang-models/_3gpp-5gc-nrm-udrfunction.yang @@ -1,9 +1,9 @@ module _3gpp-5gc-nrm-udrfunction { yang-version 1.1; - + namespace urn:3gpp:sa5:_3gpp-5gc-nrm-udrfunction; prefix udr3gpp; - + import _3gpp-common-managed-function { prefix mf3gpp; } import _3gpp-common-managed-element { prefix me3gpp; } import ietf-inet-types { prefix inet; } @@ -14,22 +14,22 @@ module _3gpp-5gc-nrm-udrfunction { organization "3gpp SA5"; contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464"; - description "This IOC represents the UDR function in 5GC. For more information + description "This IOC represents the UDR function in 5GC. For more information about the UDR, see 3GPP TS 23.501. - Copyright 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + Copyright 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved."; reference "3GPP TS 28.541"; - - revision 2025-07-25 { reference CR-1558 ; } - revision 2023-09-18 { reference CR-1043 ; } + + revision 2025-07-25 { reference CR-1558 ; } + revision 2023-09-18 { reference CR-1043 ; } revision 2023-04-26 { reference CR-0916; } revision 2020-11-08 { reference CR-0412 ; } revision 2019-10-25 { reference "S5-194457 S5-195427 S5-193518"; } - + revision 2019-05-22 {reference "initial revision"; } grouping UdrInfoGrp { - + leaf groupId { description "Identity of the UDR group that is served by the UDR instance. @@ -37,15 +37,15 @@ module _3gpp-5gc-nrm-udrfunction { to any UDR group."; type string; } - + list supiRanges { description "List of ranges of SUPI's whose profile data is available in the UDR instance."; key "start end pattern"; min-elements 1; - uses mnfp3gpp:SupiRange; + uses mnfp3gpp:SupiRangeGrp; } - + list gpsiRanges { description "List of ranges of GPSIs whose profile data is available in the UDR instance."; @@ -53,7 +53,7 @@ module _3gpp-5gc-nrm-udrfunction { min-elements 1; uses mnfp3gpp:IdentityRange; } - + list externalGroupIdentifiersRanges { description "List of ranges of external groups whose profile data is available in the UDR instance."; @@ -61,22 +61,22 @@ module _3gpp-5gc-nrm-udrfunction { min-elements 1; uses mnfp3gpp:IdentityRange; } - + leaf-list supportedDataSets { description "List of supported data sets in the UDR instance. If not provided, the UDR supports all data sets."; min-elements 1; type DataSetId; } - } + } grouping UDRFuntionGrp { description "Representse the UDRFuntion IOC"; uses mf3gpp:ManagedFunctionGrp; - + list pLMNIdList { - description "List of at most six entries of PLMN Identifiers, but at + description "List of at most six entries of PLMN Identifiers, but at least one (the primary PLMN Id). - The PLMN Identifier is composed of a Mobile Country Code (MCC) and a + The PLMN Identifier is composed of a Mobile Country Code (MCC) and a Mobile Network Code (MNC)."; min-elements 1; @@ -84,13 +84,13 @@ module _3gpp-5gc-nrm-udrfunction { key "mcc mnc"; uses types3gpp:PLMNId; } - + leaf sBIFQDN { - description "The FQDN of the registered NF instance in the service-based + description "The FQDN of the registered NF instance in the service-based interface."; type inet:domain-name; } - + list sNSSAIList { description "List of S-NSSAIs the managed object is capable of supporting. (Single Network Slice Selection Assistance Information) @@ -101,7 +101,7 @@ module _3gpp-5gc-nrm-udrfunction { key "sd sst"; uses types5g3gpp:SNssai; } - + list managedNFProfile { key idx; leaf idx { type uint32; } @@ -111,7 +111,7 @@ module _3gpp-5gc-nrm-udrfunction { uses mnfp3gpp:ManagedNFProfileGrp; } } - + typedef DataSetId { type enumeration { enum SUBSCRIPTION; @@ -120,7 +120,7 @@ module _3gpp-5gc-nrm-udrfunction { enum APPLICATION; } } - + augment "/me3gpp:ManagedElement" { list UDRFunction { description "5G Core UDR Function"; diff --git a/yang-models/_3gpp-5gc-nrm-udsffunction.yang b/yang-models/_3gpp-5gc-nrm-udsffunction.yang index 553ca7d5a..ee9c30b9b 100755 --- a/yang-models/_3gpp-5gc-nrm-udsffunction.yang +++ b/yang-models/_3gpp-5gc-nrm-udsffunction.yang @@ -1,39 +1,39 @@ module _3gpp-5gc-nrm-udsffunction { yang-version 1.1; - + namespace urn:3gpp:sa5:_3gpp-5gc-nrm-udsffunction; prefix udsf3gpp; - + import _3gpp-common-managed-function { prefix mf3gpp; } import _3gpp-common-managed-element { prefix me3gpp; } 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"; - description "This IOC represents the UDSF function which can be interacted + description "This IOC represents the UDSF function which can be interacted with any other 5GC NF defined in 3GPP TS 23.501. - Copyright 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + Copyright 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved."; reference "3GPP TS 28.541"; - - revision 2023-09-18 { reference CR-1043 ; } + + revision 2023-09-18 { reference CR-1043 ; } revision 2023-04-26 { reference CR-0916; } revision 2020-11-08 { reference CR-0412 ; } - revision 2019-10-25 { reference "S5-194457 S5-195427 S5-193518"; } - + revision 2019-10-25 { reference "S5-194457 S5-195427 S5-193518"; } + revision 2019-05-22 { reference "initial revision"; } - + grouping UDSFFuntionGrp { description "Represents the UDSFFuntion IOC"; uses mf3gpp:ManagedFunctionGrp; - + list pLMNIdList { - description "List of at most six entries of PLMN Identifiers, but at + description "List of at most six entries of PLMN Identifiers, but at least one (the primary PLMN Id). - The PLMN Identifier is composed of a Mobile Country Code (MCC) and a + The PLMN Identifier is composed of a Mobile Country Code (MCC) and a Mobile Network Code (MNC)."; min-elements 1; @@ -41,13 +41,13 @@ module _3gpp-5gc-nrm-udsffunction { key "mcc mnc"; uses types3gpp:PLMNId; } - + leaf sBIFQDN { - description "The FQDN of the registered NF instance in the + description "The FQDN of the registered NF instance in the service-based interface."; type inet:domain-name; } - + list sNSSAIList { description "List of S-NSSAIs the managed object is capable of supporting. (Single Network Slice Selection Assistance Information) @@ -58,7 +58,7 @@ module _3gpp-5gc-nrm-udsffunction { key "sd sst"; uses types5g3gpp:SNssai; } - + list managedNFProfile { key idx; min-elements 1; @@ -68,7 +68,7 @@ module _3gpp-5gc-nrm-udsffunction { uses types3gpp:ManagedNFProfile; } } - + augment "/me3gpp:ManagedElement" { list UDSFFunction { description "5G Core UDSF Function"; diff --git a/yang-models/_3gpp-5gc-nrm-upffunction.yang b/yang-models/_3gpp-5gc-nrm-upffunction.yang index afef56593..3e709c478 100755 --- a/yang-models/_3gpp-5gc-nrm-upffunction.yang +++ b/yang-models/_3gpp-5gc-nrm-upffunction.yang @@ -14,13 +14,13 @@ module _3gpp-5gc-nrm-upffunction { organization "3GPP SA5"; contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464"; description "UPFFunction derived from basic ManagedFunction. - Copyright 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + Copyright 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved."; reference "3GPP TS 28.541 5G Network Resource Model (NRM)"; revision 2025-07-25 { reference CR-1558 ; } - revision 2024-05-24 { reference CR-1273 ; } - revision 2023-09-18 { reference CR-1043 ; } + revision 2024-05-24 { reference CR-1273 ; } + revision 2023-09-18 { reference CR-1043 ; } revision 2023-04-26 { reference CR-0916; } revision 2020-11-08 { reference CR-0412 ; } revision 2019-10-25 { reference "S5-194457 S5-193518"; } @@ -36,106 +36,106 @@ module _3gpp-5gc-nrm-upffunction { enum ETHERNET; } } - - grouping DnnUpfInfoItemGrp { + + grouping DnnUpfInfoItemGrp { leaf dnn { description "String representing a Data Network."; mandatory true; type string; } - + leaf-list dnaiList { description "List of Data network access identifiers supported by the UPF for this DNN. - The absence of this attribute indicates that the UPF + The absence of this attribute indicates that the UPF can be selected for this DNN for any DNAI."; min-elements 1; - type string; //dnai is the type but its only a string with - //desc: DNAI (Data network access identifier), + type string; //dnai is the type but its only a string with + //desc: DNAI (Data network access identifier), //is this needed as its own typedef or string is ok } - + leaf-list pduSessionTypes { description "List of PDU session type(s) supported by the UPF for a specific DNN."; min-elements 1; type PduSessionType; } - + list ipv4AddressRanges { - description "This attribute represents a list of ranges of IPv4 addresses + description "This attribute represents a list of ranges of IPv4 addresses handled by UPF. "; key idx; leaf idx { type uint32; } uses types3gpp:Ipv4AddressRange; } - + list ipv6PrefixRanges { - description "This attribute represents a list of ranges of IPv6 prefixes + description "This attribute represents a list of ranges of IPv6 prefixes handled by the UPF. "; key idx; leaf idx { type uint32; } uses types3gpp:Ipv6PrefixRange; } - + list natedIpv4AddressRanges { - description "This attribute represents a list of ranges of NATed IPv4 + description "This attribute represents a list of ranges of NATed IPv4 addresses."; key idx; leaf idx { type uint32; } uses types3gpp:Ipv4AddressRange; } - + list natedIpv6PrefixRanges { - description "This attribute represents a list of ranges of NATed IPv6 + description "This attribute represents a list of ranges of NATed IPv6 prefixes."; key idx; leaf idx { type uint32; } uses types3gpp:Ipv6PrefixRange; } - + leaf-list ipv4IndexList { type union { type int32; type string; } - description "This attribute represents a list of Ipv4 Index supported by + description "This attribute represents a list of Ipv4 Index supported by the UPF. - This <> represents the IP Index to be sent from UDM to the SMF. + This <> represents the IP Index to be sent from UDM to the SMF. (See clause 6.1.6.2.77 TS 29.503) It is a list of non-exclusive alternatives (Integer or String)."; } - + leaf-list ipv6IndexList { type union { type int32; type string; } - description "This attribute represents a list of Ipv6 Index supported + description "This attribute represents a list of Ipv6 Index supported by the UPF. - This <> represents the IP Index to be sent from UDM to the SMF. + This <> represents the IP Index to be sent from UDM to the SMF. (See clause 6.1.6.2.77 TS 29.503) It is a list of non-exclusive alternatives (Integer or String)."; } - + leaf networkInstance { type string; - description "This attribute represents the N6 Network Instance + description "This attribute represents the N6 Network Instance (See TS 29.244) associated with the S-NSSAI and DNN."; } - + leaf-list dnaiNwInstanceList { type string; - description "This attribute represents a map of a network instance per - DNAI for the DNN, where the key of the map is the DNAI (Data network + description "This attribute represents a map of a network instance per + DNAI for the DNN, where the key of the map is the DNAI (Data network access identifier), see TS 23.501. - When present, the value of each entry of the map shall contain a N6 + When present, the value of each entry of the map shall contain a N6 network instance that is configured for the DNAI indicated by the key."; } - } - - grouping SnssaiUpfInfoItemGrp { - list sNssai { + } + + grouping SnssaiUpfInfoItemGrp { + list sNssai { description "Supported S-NSSAI."; min-elements 1; max-elements 1; @@ -143,20 +143,20 @@ module _3gpp-5gc-nrm-upffunction { leaf idx { type uint32; } uses types5g3gpp:ExtSnssaiGrp; } - + list dnnUpfInfoList { - description "It represents list of parameters supported by the UPF + description "It represents list of parameters supported by the UPF per DNN."; min-elements 1; key dnn; - uses DnnUpfInfoItemGrp; + uses DnnUpfInfoItemGrp; } - + leaf redundantTransport { type boolean; default false; - description "This attribute indicates whether the UPF supports redundant - transport path on the transport layer in the corresponding network + description "This attribute indicates whether the UPF supports redundant + transport path on the transport layer in the corresponding network slice. true: supported false: not supported"; @@ -189,8 +189,8 @@ module _3gpp-5gc-nrm-upffunction { enum SXBU; enum N4U; } - } - + } + grouping InterfaceUpfInfoItemGrp { leaf interfaceType { description "User Plane interface type. @@ -199,7 +199,7 @@ module _3gpp-5gc-nrm-upffunction { type UPInterfaceType; must '../ipv4EndpointAddresses or ../ipv6EndpointAddresses or ../fqdn'; } - + leaf-list ipv4EndpointAddresses { description "Available endpoint IPv4 address(es) of the User Plane interface."; @@ -213,42 +213,42 @@ module _3gpp-5gc-nrm-upffunction { } leaf fqdn { - description "This parameter defines FQDN of the Network Function + description "This parameter defines FQDN of the Network Function (See TS 23.003)."; type inet:domain-name; } - + leaf networkInstance { - description "Network Instance (See TS 29.244) associated to the User + description "Network Instance (See TS 29.244) associated to the User Plane interface"; type string; mandatory true; } } - + grouping AtsssCapabilityGrp { leaf atsssLL { - description "Indicates the ATSSS-LL capability to support procedures - related to Access Traffic Steering, Switching, Splitting + description "Indicates the ATSSS-LL capability to support procedures + related to Access Traffic Steering, Switching, Splitting (see clauses 4.2.10, 5.32 of TS 23.501). true: Supported false: Not Supported"; type boolean; default false; } - + leaf mptcp { - description "Indicates the MPTCP capability to support procedures related - to Access Traffic Steering, Switching, Splitting + description "Indicates the MPTCP capability to support procedures related + to Access Traffic Steering, Switching, Splitting (see clauses 4.2.10, 5.32 of TS 23.501). true: Supported false: Not Supported"; type boolean; default false; } - + leaf rttWithoutPmf { - description "Indicates whether the UPF supports RTT measurement without + description "Indicates whether the UPF supports RTT measurement without PMF (see clauses 5.32.2, 6.3.3.3 of TS 23.501). true: Supported false: Not Supported"; @@ -256,47 +256,47 @@ module _3gpp-5gc-nrm-upffunction { default false; } } - + grouping UpfInfoGrp { - description "Represents datatype UpfInfo. This data type represents + description "Represents datatype UpfInfo. This data type represents information of an UPF Instance"; list sNssaiUpfInfoList { - description "This attribute represents a list of parameters supported by + description "This attribute represents a list of parameters supported by the UPF per S-NSSAI."; min-elements 1; - key idx; + key idx; leaf idx { type uint32; } uses SnssaiUpfInfoItemGrp; } - + leaf-list smfServingArea { type string; min-elements 1; description "The SMF service area(s) the UPF can serve. See TS 29.510. If not provided, the UPF can serve any SMF service area."; } - + list interfaceUpfInfoList { - description "List of User Plane interfaces configured on the UPF. When - this parameter is provided in the NF Discovery response, the NF Service + description "List of User Plane interfaces configured on the UPF. When + this parameter is provided in the NF Discovery response, the NF Service Consumer (e.g., SMF) may use this information for UPF selection."; min-elements 1; key idx; leaf idx { type uint32; } uses InterfaceUpfInfoItemGrp; } - + leaf iwkEpsInd { type boolean; mandatory true; config false; - description "Indicates whether interworking with EPS is supported by + description "Indicates whether interworking with EPS is supported by the UPF. True: Supported False: Not Supported"; } - + leaf-list pduSessionTypes { type enumeration { enum IPV4; @@ -309,7 +309,7 @@ module _3gpp-5gc-nrm-upffunction { min-elements 1; description "Indicates the type(s) of a PDU session."; } - + list atsssCapability { config false; description "Indicate the ATSSS capability of the UPF"; @@ -319,17 +319,17 @@ module _3gpp-5gc-nrm-upffunction { leaf idx { type uint32; } uses AtsssCapabilityGrp; } - + leaf ueIpAddrInd { type boolean; config false; default false; - description "Indicates whether the UPF supports allocating UE IP + description "Indicates whether the UPF supports allocating UE IP addresses/prefixes. true: supported false: not supported"; } - + list taiList { description "The list of TAIs."; min-elements 1; @@ -337,7 +337,7 @@ module _3gpp-5gc-nrm-upffunction { leaf idx { type uint32; } uses types3gpp:TaiGrp; } - + list taiRangeList { description "The range of TAIs."; min-elements 1; @@ -345,10 +345,10 @@ module _3gpp-5gc-nrm-upffunction { leaf idx { type uint32; } uses types5g3gpp:TaiRangeGrp; } - + list wAgfInfo { - description "Indicate that the UPF is collocated with W-AGF. If not - present, the UPF is not collocated with Wireline Access Gateway + description "Indicate that the UPF is collocated with W-AGF. If not + present, the UPF is not collocated with Wireline Access Gateway Function (W-AGF)."; min-elements 1; max-elements 1; @@ -356,10 +356,10 @@ module _3gpp-5gc-nrm-upffunction { leaf idx { type uint32; } uses types5g3gpp:IpInterfaceGrp; } - + list tngfInfo { - description "Indicate that the UPF is collocated with TNGF. If not - present, the UPF is not collocated with Trusted Non-3GPP Gateway + description "Indicate that the UPF is collocated with TNGF. If not + present, the UPF is not collocated with Trusted Non-3GPP Gateway Function (TNGF)."; min-elements 1; max-elements 1; @@ -367,10 +367,10 @@ module _3gpp-5gc-nrm-upffunction { leaf idx { type uint32; } uses types5g3gpp:IpInterfaceGrp; } - + list twifInfo { - description "Indicate that the UPF is collocated with TWIF. If not - present, the UPF is not collocated with Trusted WLAN Interworking + description "Indicate that the UPF is collocated with TWIF. If not + present, the UPF is not collocated with Trusted WLAN Interworking Function (TWIF)."; min-elements 1; max-elements 1; @@ -378,17 +378,17 @@ module _3gpp-5gc-nrm-upffunction { leaf idx { type uint32; } uses types5g3gpp:IpInterfaceGrp; } - + leaf priority { type uint16; mandatory true; - description "This parameter defines Priority (relative to other NFs of - the same type) in the range of 0-65535, to be used for NF selection; - lower values indicate a higher priority. If priority is also present - in the nfServiceList parameters, those will have precedence over + description "This parameter defines Priority (relative to other NFs of + the same type) in the range of 0-65535, to be used for NF selection; + lower values indicate a higher priority. If priority is also present + in the nfServiceList parameters, those will have precedence over this value (See TS 29.510)."; } - + leaf redundantGtpu { type boolean; default false; @@ -397,74 +397,74 @@ module _3gpp-5gc-nrm-upffunction { true: supported false: not supported"; } - + leaf ipups { type boolean; default false; - description "Indicates whether the UPF is configured for Inter-PLMN User - Plane Security (IPUPS). Any UPF can support the IPUPS functionality. - In network deployments where specific UPFs are used to provide IPUPS, + description "Indicates whether the UPF is configured for Inter-PLMN User + Plane Security (IPUPS). Any UPF can support the IPUPS functionality. + In network deployments where specific UPFs are used to provide IPUPS, UPFs configured for providing IPUPS services shall be selected. true: The UPF is configured for IPUPS. false: The UPF is not configured for IPUPS"; } - + leaf dataForwarding { type boolean; default false; - description "Indicates whether the UPF is configured for data forwarding. - Based on operator policies, if dedicated UPFs are preferred to be used - for indirect data forwarding during handover scenarios, when setting - up the indirect data forwarding tunnel, the SMF should preferably - select a UPF configured for data forwarding and use the network - instance indicated in the Network Instance ID associated to the + description "Indicates whether the UPF is configured for data forwarding. + Based on operator policies, if dedicated UPFs are preferred to be used + for indirect data forwarding during handover scenarios, when setting + up the indirect data forwarding tunnel, the SMF should preferably + select a UPF configured for data forwarding and use the network + instance indicated in the Network Instance ID associated to the DATA_FORWARDING interface type in the interfaceUpfInfoList attribute. true: the UPF is configured for data forwarding false: the UPF is not configured for data forwarding - If the UPF is configured for data forwarding, it shall support UP + If the UPF is configured for data forwarding, it shall support UP network interface with type 'DATA_FORWARDING'."; } - + leaf supportedPfcpFeatures { type string; config false; description "Supported Packet Forwarding Control Protocol (PFCP) Features. - A string used to indicate the PFCP features supported by the UPF, - which encodes the 'UP Function Features' as specified in - Table 8.2.25-1 of TS 29.244 (starting from Octet 5), in hexadecimal + A string used to indicate the PFCP features supported by the UPF, + which encodes the 'UP Function Features' as specified in + Table 8.2.25-1 of TS 29.244 (starting from Octet 5), in hexadecimal representation. - Each character in the string shall take a value of '0' to '9', 'a' - to 'f' or 'A' to 'F' and each two characters shall represent one octet - of 'UP Function Features' (starting from Octet 5, to higher octets). - For each two characters representing one octet, the first character - representing the 4 most significant bits of the octet and the second + Each character in the string shall take a value of '0' to '9', 'a' + to 'f' or 'A' to 'F' and each two characters shall represent one octet + of 'UP Function Features' (starting from Octet 5, to higher octets). + For each two characters representing one octet, the first character + representing the 4 most significant bits of the octet and the second character the 4 least significant bits of the octet. - The supported PFCP features shall be provisioned in addition and be - consistent with the existing UPF features (atsssCapability, ueIpAddrInd, - redundantGtpu and ipups), e.g., if the ueIpAddrInd is set to 'true', - then the UEIP flag shall also be set to '1' in the supported PFCP + The supported PFCP features shall be provisioned in addition and be + consistent with the existing UPF features (atsssCapability, ueIpAddrInd, + redundantGtpu and ipups), e.g., if the ueIpAddrInd is set to 'true', + then the UEIP flag shall also be set to '1' in the supported PFCP features."; } - + leaf sxaInd { type boolean; config false; - description "This attribute indicates whether the UPF is configured to + description "This attribute indicates whether the UPF is configured to support Sxa interface. true: Supported false: Not Supported"; } } - + grouping UPFFunctionGrp { description "Represents the UPFFunction IOC"; uses mf3gpp:ManagedFunctionGrp; list pLMNIdList { - description "A list of PLMN identifiers (Mobile Country Code and Mobile + description "A list of PLMN identifiers (Mobile Country Code and Mobile Network Code)."; min-elements 1; key "mcc mnc"; @@ -472,7 +472,7 @@ module _3gpp-5gc-nrm-upffunction { } leaf-list nRTACList { - description "List of Tracking Area Codes (legacy TAC or extended TAC) + description "List of Tracking Area Codes (legacy TAC or extended TAC) where the represented management function is serving."; reference "TS 38.413 clause 9.3.3.10"; min-elements 1; @@ -482,11 +482,11 @@ module _3gpp-5gc-nrm-upffunction { leaf-list cNSIIdList { type string; - description "It is a set of NSI ID. NSI ID is an identifier for - identifying the Core Network part of a Network Slice instance when - multiple Network Slice instances of the same Network Slice are deployed, - and there is a need to differentiate between them in the 5GC. - See NSI ID definition in clause 3.1 of TS 23.501 and + description "It is a set of NSI ID. NSI ID is an identifier for + identifying the Core Network part of a Network Slice instance when + multiple Network Slice instances of the same Network Slice are deployed, + and there is a need to differentiate between them in the 5GC. + See NSI ID definition in clause 3.1 of TS 23.501 and subclause 6.1.6.2.7 of TS 29.531. "; } leaf energySavingControl { @@ -495,10 +495,10 @@ module _3gpp-5gc-nrm-upffunction { enum TO_BE_NOT_ENERGYSAVING; } mandatory true; - description "This attribute allows management system to initiate energy + description "This attribute allows management system to initiate energy saving activation or deactivation for the edge UPF."; } - + leaf energySavingState { type enumeration { enum IS_NOT_ENERGYSAVING; @@ -506,28 +506,28 @@ module _3gpp-5gc-nrm-upffunction { } mandatory true; config false; - description "This attribute specifies the status regarding the energy + description "This attribute specifies the status regarding the energy saving in the edge UPF. - If the value of energySavingControl is TO_BE_ENERGYSAVING, then it - shall be tried to achieve the value IS_ENERGYSAVING for the + If the value of energySavingControl is TO_BE_ENERGYSAVING, then it + shall be tried to achieve the value IS_ENERGYSAVING for the energySavingState. - If the value of energySavingControl is TO_BE_NOT_ENERGYSAVING, then - it shall be tried to achieve the value IS_NOT_ENERGYSAVING for the + If the value of energySavingControl is TO_BE_NOT_ENERGYSAVING, then + it shall be tried to achieve the value IS_NOT_ENERGYSAVING for the energySavingState. "; } /*list sNSSAIList { ??? not visible in stage 2 description "List of S-NSSAIs the managed object is capable of supporting. (Single Network Slice Selection Assistance Information) - An S-NSSAI has an SST (Slice/Service type) and an optional SD + An S-NSSAI has an SST (Slice/Service type) and an optional SD (Slice Differentiator) field."; reference "3GPP TS 23.003"; key "sd sst"; uses types5g3gpp:SNssai; }*/ - + list managedNFProfile { key idx; min-elements 1; @@ -535,31 +535,31 @@ module _3gpp-5gc-nrm-upffunction { description "Profile definition of a Managed NF (See TS 23.501)"; uses types3gpp:ManagedNFProfile; } - + leaf-list supportedBMOList { type string; - description "List of supported BMOs (Bridge Managed Objects) required + description "List of supported BMOs (Bridge Managed Objects) required for integration with TSN system."; } - + list upfInfo { - description "This attribute represents information of an UPF NF Instance. - Multiple upfInfo may be allowed to define different TAI list for each + description "This attribute represents information of an UPF NF Instance. + Multiple upfInfo may be allowed to define different TAI list for each supported S-NSSAI"; key idx; leaf idx { type uint32; } uses UpfInfoGrp; } - + leaf isOnboardSatellite { type boolean; default false; config false; yext3gpp:inVariant; - description "This attribute indicates whether the function is + description "This attribute indicates whether the function is on board the satellite."; } - + leaf onboardSatelliteId { type string { pattern "[0-9]{5}" ; @@ -567,15 +567,15 @@ module _3gpp-5gc-nrm-upffunction { config false; yext3gpp:inVariant; description "This attribute indicates the onboard satellite Id. - It shall be formatted as a fixed 5-digit string, padding with + It shall be formatted as a fixed 5-digit string, padding with leading digits '0' to complete a 5-digit length."; } - + leaf uPFCapabilities { type string; yext3gpp:inVariant; - description "It indicates the operator configurable capability supported - by the UPF. (see clause 5.8.2.21 in TS 23.501, clause 5.4.2 + description "It indicates the operator configurable capability supported + by the UPF. (see clause 5.8.2.21 in TS 23.501, clause 5.4.2 in TS 29.571)"; } } diff --git a/yang-models/_3gpp-common-antennafunction.yang b/yang-models/_3gpp-common-antennafunction.yang index 330c5c748..ee80939ee 100644 --- a/yang-models/_3gpp-common-antennafunction.yang +++ b/yang-models/_3gpp-common-antennafunction.yang @@ -1,196 +1,196 @@ -module _3gpp-common-antennafunction { - yang-version 1.1; - namespace "urn:3gpp:sa5:_3gpp-common-antennafunction"; - prefix "antfunc3gpp"; - - import _3gpp-common-yang-types { prefix types3gpp; } - import _3gpp-common-managed-function { prefix mf3gpp; } - import _3gpp-common-managed-element { prefix me3gpp; } - import _3gpp-common-top { prefix top3gpp; } - - organization "3GPP SA5"; - contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464"; - description "Defines the YANG mapping of the Antenna Function Information - Object Class (IOC) that is part of the Generic Network Resource Model (NRM). - Copyright 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, - TTA, TTC). All rights reserved."; - reference "3GPP TS 28.662 Generic Network Resource Model (NRM)"; - - revision 2025-05-01 { description "Initial revision"; - } - grouping AntennaFunctionGrp { - description "Represents the AntennaFunction."; - uses mf3gpp:ManagedFunctionGrp; - - leaf beamTilt { - description "The beam tilt of the wanted antenna beam - in the vertical plane. A positive value on the - beamtilt indicates an antenna beam direction below the - vertical plane."; - units degree; - type types3gpp:TenthOfDegrees; - } - - leaf bearing { - description "The bearing in degrees that the antenna is pointing in. - AllowedValues: See \"Antenna bearing\" in 3GPP TS 25.463."; - reference "3GPP TS 25.463, UTRAN Iuant interface: - Remote Electrical Tilting (RET) - antennas Application Part (RETAP) signalling"; - type types3gpp:TenthOfDegrees; - } - - leaf elevation { - description "The elevation the antenna function should have, - based on World Geodetic System (1984 version) global - reference frame (WGS 84). Positive values correspond to - meters above sea level, negative values correspond to meters - below sea level. If empty, value is not defined."; - type types3gpp:Altitude; - } - - leaf horizBeamWidth { - description "The 3 dB power beamwidth of the antenna pattern - in the horizontal plane. - A value of 360 indicates an omnidirectional antenna. - Note: The value of this attribute has no operational impact - on the network, e.g. the NE behaviour is not affected by the - value setting of this attribute. - Note as well that this attribute is not supported over the - Iuant interface according to 3GPP TS37.466. - A single integral value corresponding to an angle in degrees - between 0 and 360."; - reference "3GPP TS 37.466, Iuant interface: Application part"; - type types3gpp:TenthOfDegrees; - } - - leaf latitude { - description "Latitude of transmitter antenna position. - Positive value means north, negative value means south. - - Specification: WGS 84 - Allowed Values: { -90.000000..90.000000 }"; - units degree; - type types3gpp:Latitude; - } - - leaf longititude { - description "Longitude of transmitter antenna position. - Positive value means east, negative value means west. - Specification: WGS 84 - Allowed Values: { -180.000000..180.000000 }"; - units degree; - type types3gpp:Longitude; - } - - leaf maxAzimuthValue { - description "The maximum amount of change of azimuth the RET - system can support. This is the change in degrees clockwise - from bearing. - Note: The value of this attribute has no operational impact - on the network, e.g. the NE behaviour is not affected by the - value setting of this attribute. - Note as well that this attribute is not supported over the - Iuant interface according to Ref. 3GPP TS 37.466. - A single decimal value corresponding to an angle in degrees - between 0 and 360 with a resolution of 0.1 degrees."; - reference "3GPP TS 37.466, Iuant interface: Application part"; - units degree; - type decimal64 { - range "0..360"; - fraction-digits 1; - } - } - leaf minAzimuthValue { - description "The minimum amount of change of azimuth the RET - system can support. This is the change in degrees clockwise - from bearing. - Note: The value of this attribute has no operational impact - on the network, e.g. the NE behaviour is not affected by the - value setting of this attribute. - Note as well that this attribute is not supported over the - Iuant interface according to Ref. 3GPP TS 37.466. - A single decimal value corresponding to an angle in degrees - between 0 and 360 with a resolution of 0.1 degrees."; - reference "3GPP TS 37.466, Iuant interface: Application part"; - units degree; - type decimal64 { - range "0..360"; - fraction-digits 1; - } - } - - leaf-list referencedBy { - description "This attribute contains the DNs of one or more objects - that refer to this object. - - In the case of AntennaFunction, these referring objects may - include DNs of SectorEquipmentFunction instances if associations - between them and the AntennaFunction exist. - - Note: referencedBy is a DN datatype and so can reference an MOI - under a different ME"; - config false; - type types3gpp:DistinguishedName; - } - - - leaf retGroupName { - description "The group name is a textual, alpha-numeric string to - define a logical grouping of antennas which may be in different cells. - - This attribute permits the definition of a logical grouping - of the antennas. This may be defined either at - installation time, or by management activity"; - type string; - } - - leaf retTiltValue { - description "The electrical tilt setting of the antenna, \"Tilt value\" in - 3GPP TS 37.466."; - reference "3GPP TS 37.466, Iuant interface: Application part"; - type types3gpp:TenthOfDegrees; - } - - leaf vertBeamWidth { - description "The 3 dB power beamwidth of the antenna pattern in - the vertical plane. - The value of this attribute has no operational impact on - the network, e.g. the NE behaviour is not affected by the - value setting of this attribute. - This attribute is not supported over the Iuant interface - according to Ref. 3GPP TS 37.466."; - reference "3GPP TS 37.466, Iuant interface: Application part"; - units degree; - type uint32 { - range "0..180"; - } - } - - leaf-list theCellList { - description "This attribute contains the DNs of EUtranGenericCell - or UtranGenericCell if associations between them exist. - This attribute contains the DNs of GSMCellPart if association - between them exist. "; - config false; - status deprecated; - type types3gpp:DistinguishedName; - } - - } - - augment "/me3gpp:ManagedElement" { - - list AntennaFunction { - key id; - uses top3gpp:Top_Grp; - description "This MOI represents an array of radiating elements that - may be tilted to adjust the RF coverage of a cell(s)."; - - container attributes { - uses AntennaFunctionGrp; - } - uses mf3gpp:ManagedFunctionContainedClasses; - } - } -} +module _3gpp-common-antennafunction { + yang-version 1.1; + namespace "urn:3gpp:sa5:_3gpp-common-antennafunction"; + prefix "antfunc3gpp"; + + import _3gpp-common-yang-types { prefix types3gpp; } + import _3gpp-common-managed-function { prefix mf3gpp; } + import _3gpp-common-managed-element { prefix me3gpp; } + import _3gpp-common-top { prefix top3gpp; } + + organization "3GPP SA5"; + contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464"; + description "Defines the YANG mapping of the Antenna Function Information + Object Class (IOC) that is part of the Generic Network Resource Model (NRM). + Copyright 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + TTA, TTC). All rights reserved."; + reference "3GPP TS 28.662 Generic Network Resource Model (NRM)"; + + revision 2025-05-01 { description "Initial revision"; + } + grouping AntennaFunctionGrp { + description "Represents the AntennaFunction."; + uses mf3gpp:ManagedFunctionGrp; + + leaf beamTilt { + description "The beam tilt of the wanted antenna beam + in the vertical plane. A positive value on the + beamtilt indicates an antenna beam direction below the + vertical plane."; + units degree; + type types3gpp:TenthOfDegrees; + } + + leaf bearing { + description "The bearing in degrees that the antenna is pointing in. + AllowedValues: See \"Antenna bearing\" in 3GPP TS 25.463."; + reference "3GPP TS 25.463, UTRAN Iuant interface: + Remote Electrical Tilting (RET) + antennas Application Part (RETAP) signalling"; + type types3gpp:TenthOfDegrees; + } + + leaf elevation { + description "The elevation the antenna function should have, + based on World Geodetic System (1984 version) global + reference frame (WGS 84). Positive values correspond to + meters above sea level, negative values correspond to meters + below sea level. If empty, value is not defined."; + type types3gpp:Altitude; + } + + leaf horizBeamWidth { + description "The 3 dB power beamwidth of the antenna pattern + in the horizontal plane. + A value of 360 indicates an omnidirectional antenna. + Note: The value of this attribute has no operational impact + on the network, e.g. the NE behaviour is not affected by the + value setting of this attribute. + Note as well that this attribute is not supported over the + Iuant interface according to 3GPP TS37.466. + A single integral value corresponding to an angle in degrees + between 0 and 360."; + reference "3GPP TS 37.466, Iuant interface: Application part"; + type types3gpp:TenthOfDegrees; + } + + leaf latitude { + description "Latitude of transmitter antenna position. + Positive value means north, negative value means south. + + Specification: WGS 84 + Allowed Values: { -90.000000..90.000000 }"; + units degree; + type types3gpp:Latitude; + } + + leaf longititude { + description "Longitude of transmitter antenna position. + Positive value means east, negative value means west. + Specification: WGS 84 + Allowed Values: { -180.000000..180.000000 }"; + units degree; + type types3gpp:Longitude; + } + + leaf maxAzimuthValue { + description "The maximum amount of change of azimuth the RET + system can support. This is the change in degrees clockwise + from bearing. + Note: The value of this attribute has no operational impact + on the network, e.g. the NE behaviour is not affected by the + value setting of this attribute. + Note as well that this attribute is not supported over the + Iuant interface according to Ref. 3GPP TS 37.466. + A single decimal value corresponding to an angle in degrees + between 0 and 360 with a resolution of 0.1 degrees."; + reference "3GPP TS 37.466, Iuant interface: Application part"; + units degree; + type decimal64 { + range "0..360"; + fraction-digits 1; + } + } + leaf minAzimuthValue { + description "The minimum amount of change of azimuth the RET + system can support. This is the change in degrees clockwise + from bearing. + Note: The value of this attribute has no operational impact + on the network, e.g. the NE behaviour is not affected by the + value setting of this attribute. + Note as well that this attribute is not supported over the + Iuant interface according to Ref. 3GPP TS 37.466. + A single decimal value corresponding to an angle in degrees + between 0 and 360 with a resolution of 0.1 degrees."; + reference "3GPP TS 37.466, Iuant interface: Application part"; + units degree; + type decimal64 { + range "0..360"; + fraction-digits 1; + } + } + + leaf-list referencedBy { + description "This attribute contains the DNs of one or more objects + that refer to this object. + + In the case of AntennaFunction, these referring objects may + include DNs of SectorEquipmentFunction instances if associations + between them and the AntennaFunction exist. + + Note: referencedBy is a DN datatype and so can reference an MOI + under a different ME"; + config false; + type types3gpp:DistinguishedName; + } + + + leaf retGroupName { + description "The group name is a textual, alpha-numeric string to + define a logical grouping of antennas which may be in different cells. + + This attribute permits the definition of a logical grouping + of the antennas. This may be defined either at + installation time, or by management activity"; + type string; + } + + leaf retTiltValue { + description "The electrical tilt setting of the antenna, \"Tilt value\" in + 3GPP TS 37.466."; + reference "3GPP TS 37.466, Iuant interface: Application part"; + type types3gpp:TenthOfDegrees; + } + + leaf vertBeamWidth { + description "The 3 dB power beamwidth of the antenna pattern in + the vertical plane. + The value of this attribute has no operational impact on + the network, e.g. the NE behaviour is not affected by the + value setting of this attribute. + This attribute is not supported over the Iuant interface + according to Ref. 3GPP TS 37.466."; + reference "3GPP TS 37.466, Iuant interface: Application part"; + units degree; + type uint32 { + range "0..180"; + } + } + + leaf-list theCellList { + description "This attribute contains the DNs of EUtranGenericCell + or UtranGenericCell if associations between them exist. + This attribute contains the DNs of GSMCellPart if association + between them exist. "; + config false; + status deprecated; + type types3gpp:DistinguishedName; + } + + } + + augment "/me3gpp:ManagedElement" { + + list AntennaFunction { + key id; + uses top3gpp:Top_Grp; + description "This MOI represents an array of radiating elements that + may be tilted to adjust the RF coverage of a cell(s)."; + + container attributes { + uses AntennaFunctionGrp; + } + uses mf3gpp:ManagedFunctionContainedClasses; + } + } +} diff --git a/yang-models/_3gpp-common-ep-rp.yang b/yang-models/_3gpp-common-ep-rp.yang index 1b12d4c19..3b4d22dd9 100755 --- a/yang-models/_3gpp-common-ep-rp.yang +++ b/yang-models/_3gpp-common-ep-rp.yang @@ -1,5 +1,5 @@ module _3gpp-common-ep-rp { - yang-version 1.1; + yang-version 1.1; namespace "urn:3gpp:sa5:_3gpp-common-ep-rp"; prefix "eprp3gpp"; @@ -8,43 +8,43 @@ module _3gpp-common-ep-rp { import _3gpp-common-measurements { prefix meas3gpp; } organization "3GPP SA5"; - contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464"; - description "Common/basic class/grouping to be inherited/reused. - This IOC represents an end point of a link used across a reference + contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464"; + description "Common/basic class/grouping to be inherited/reused. + This IOC represents an end point of a link used across a reference point between two network entities. - Copyright 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + Copyright 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved."; - reference - "3GPP TS 28.622 + reference + "3GPP TS 28.622 Generic Network Resource Model (NRM) Integration Reference Point (IRP); Information Service (IS) - - 3GPP TS 28.620 + + 3GPP TS 28.620 Umbrella Information Model (UIM)"; - revision 2023-09-18 { reference CR-0271 ; } - revision 2020-06-08 { reference "CR-0092"; } + revision 2023-09-18 { reference CR-0271 ; } + revision 2020-06-08 { reference "CR-0092"; } revision 2019-06-17 { description "Initial revision"; } - + grouping EP_RPGrp { - description "Abstract class, represents an end point of a link used - across a reference point between two network entities. - - For naming the subclasses of EP_RP, the following rules shall apply: - - The name of the subclassed IOC shall have the form 'EP_', - where is a string that represents the name of the reference point. - Thus, two valid examples of EP_RP subclassed IOC names would be: + description "Abstract class, represents an end point of a link used + across a reference point between two network entities. + + For naming the subclasses of EP_RP, the following rules shall apply: + - The name of the subclassed IOC shall have the form 'EP_', + where is a string that represents the name of the reference point. + Thus, two valid examples of EP_RP subclassed IOC names would be: EP_S1 and EP_X2."; - + leaf userLabel { type string; description "A user-friendly (and user assignable) name of this object."; } - + leaf farEndEntity { config false; type types3gpp:DistinguishedName; diff --git a/yang-models/_3gpp-common-externaldata.yang b/yang-models/_3gpp-common-externaldata.yang index 63700caf8..0854e9f88 100644 --- a/yang-models/_3gpp-common-externaldata.yang +++ b/yang-models/_3gpp-common-externaldata.yang @@ -11,12 +11,12 @@ module _3gpp-common-externaldata { organization "3GPP SA5"; contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464"; description "Defines the YANG mapping of the external data. - Copyright 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + Copyright 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved."; reference "3GPP TS 28.623 Generic Network Resource Model (NRM)"; revision 2025-07-19 { reference CR-0551; } - + grouping ExternalDataScopeGrp { list geoAreas { description "It describes the concrete geographical area(s)"; @@ -24,107 +24,107 @@ module _3gpp-common-externaldata { leaf idx { type uint32; } uses types3gpp:GeoAreaGrp; } - + leaf-list objectInstancesIncluded { type types3gpp:DistinguishedName; - description "List of managed object instances to which the described + description "List of managed object instances to which the described data are related. Each object instance is identified by its DN."; } - + leaf-list objectInstancesExcluded { type types3gpp:DistinguishedName; - description "List of managed object instances which are not considered - in relation to the described data. Each object instance is identified + description "List of managed object instances which are not considered + in relation to the described data. Each object instance is identified by its DN."; } } grouping ExternalDataTypeGrp { description "Represents the IOC ExternalDataType"; - + leaf externalDataType { type string; mandatory true; - description "Type of external management data as defined by the + description "Type of external management data as defined by the implementation. - Examples: 'Electronic Map', 'Camara Data', 'UE path', 'Camera Photo', + Examples: 'Electronic Map', 'Camara Data', 'UE path', 'Camera Photo', 'Event Schedule”"; - } - + } + leaf-list mediaLocation { type inet:uri; - description "URI of the media which includes the transfer protocol. + description "URI of the media which includes the transfer protocol. Examples: sftp://companyA.com/datastore/fileName.xml https://companyA.com/ManagedElement=1/Files=1/File=1"; - } - + } + leaf externalDataTypeSchema { type inet:uri; mandatory true; description "URI of the schema to parse a type of external management data. The detailed schema definition for the different types of external management data is out of scope of this specification."; - } - + } + list externalDataScope { - description "It describes the concrete scope which the external management + description "It describes the concrete scope which the external management data is applicable."; key idx; leaf idx { type uint32; } uses ExternalDataScopeGrp; - } + } } - + augment /subnet3gpp:SubNetwork { list ExternalDataType { - description "This IOC specifies a type of external management data and + description "This IOC specifies a type of external management data and the associated meta data. - External management data is data which enrich 3GPP specified management - data and management data specified based on 3GPP defined management data - definition templates and frameworks. External management data can be - produced by data sources of different nature (e.g. sensors) with different + External management data is data which enrich 3GPP specified management + data and management data specified based on 3GPP defined management data + definition templates and frameworks. External management data can be + produced by data sources of different nature (e.g. sensors) with different formats. Details see clause 6.4.1 in TS 28.537. - MnS producer may use this IOC to describe external management data. + MnS producer may use this IOC to describe external management data. - For example, MnS producer publishes all external management data which + For example, MnS producer publishes all external management data which are available. - MnS consumer may use this IOC to configure, discover or request external - management data. For example, MnS consumer discovers and requests certain + MnS consumer may use this IOC to configure, discover or request external + management data. For example, MnS consumer discovers and requests certain types of external management data. The ExternalDataType IOC can be name-contained by SubNetwork. - Attribute externalDataType defines the type of external management data. + Attribute externalDataType defines the type of external management data. - Attribute mediaLocation indicates the address from which the described - external management data can be retrieved. + Attribute mediaLocation indicates the address from which the described + external management data can be retrieved. - The value of mediaLocation, if present, can provide one or several - directories or the address where the described external management data - can be retrieved. The different directories can be used to group the - external management data, e.g., one directory per geographical area or - per time period. For example, the value of the mediaLocation attribute + The value of mediaLocation, if present, can provide one or several + directories or the address where the described external management data + can be retrieved. The different directories can be used to group the + external management data, e.g., one directory per geographical area or + per time period. For example, the value of the mediaLocation attribute can be given by - + sftp://companyA.com/datastore/weatherforecasts/ - In this case a potential file with name 'weatherforecastMunicht0.xml' - needs to be retrieved using 'sftp' from - + In this case a potential file with name 'weatherforecastMunicht0.xml' + needs to be retrieved using 'sftp' from + sftp://companyA.com/datastore/weatherforecasts/weatherforecastMunicht0.xml. - Attribute externalDataTypeSchema indicates the URI where the MnS consumer + Attribute externalDataTypeSchema indicates the URI where the MnS consumer can get the schema to parse the external management data. Attribute externalDataScope is used to describe the concrete scope (e.g., geographical areas) which the external management data is applicable."; - + key id; uses top3gpp:Top_Grp; container attributes { diff --git a/yang-models/_3gpp-common-filemanagement.yang b/yang-models/_3gpp-common-filemanagement.yang index 4ead4f89a..531b73cba 100644 --- a/yang-models/_3gpp-common-filemanagement.yang +++ b/yang-models/_3gpp-common-filemanagement.yang @@ -9,17 +9,17 @@ module _3gpp-common-filemanagement { import _3gpp-common-yang-extensions { prefix yext3gpp; } import _3gpp-common-managed-element { prefix me3gpp; } import ietf-inet-types { prefix inet; } - + organization "3GPP SA5"; contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464"; description "Defines the YANG mapping of the FileDownloadJob Information Object Class (IOC) that is part of the Generic Network Resource Model (NRM). - Copyright 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + Copyright 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved."; reference "3GPP TS 28.623 Generic Network Resource Model (NRM)"; revision 2024-11-07 { reference CR-0474 ; } - revision 2023-09-18 { reference CR-0271 ; } + revision 2023-09-18 { reference CR-0271 ; } revision 2023-02-14 { reference CR-0234; } revision 2022-10-24 { reference CR-0196; } revision 2022-02-10 { reference "Initial revision, S5-221757"; } @@ -47,31 +47,31 @@ module _3gpp-common-filemanagement { } } } - + grouping FileDownloadJobGrp { description "Represents the FileDownloadJob IOC."; reference "3GPP TS 28.622"; uses top3gpp:Top_Grp; - + leaf fileLocation { type inet:uri; yext3gpp:notNotifyable; yext3gpp:inVariant; - description "Location of the file incl. the file transfer protocol, - and the file name for the case the file content cannot be retrieved + description "Location of the file incl. the file transfer protocol, + and the file name for the case the file content cannot be retrieved by reading the 'fileContent' attribute. - + The allowed file transfer protocols are: - sftp - ftpes - https - + Examples: 'sftp://companyA.com/datastore/fileName.xml', 'https://companyA.com/ManagedElement=1/Files=1/File=1' "; } - + leaf notificationRecipientAddress { description "Address of the notification recipient."; type string; @@ -81,8 +81,8 @@ module _3gpp-common-filemanagement { leaf cancelJob { description "Setting this attribute to TRUE cancels the file download job. - As specified in the definition of ProcessMonitor, cancellation is - possible in the NOT_STARTED and RUNNING state. Setting the attribute + As specified in the definition of ProcessMonitor, cancellation is + possible in the NOT_STARTED and RUNNING state. Setting the attribute to FALSE has no observable result."; type boolean; mandatory true; @@ -104,9 +104,9 @@ module _3gpp-common-filemanagement { container attributes { uses FileDownloadJobGrp; } - } + } } - + augment "/subnet3gpp:SubNetwork" { uses FileDownloadJobSubtree; } diff --git a/yang-models/_3gpp-common-files.yang b/yang-models/_3gpp-common-files.yang index cc0ba8f55..105246d30 100644 --- a/yang-models/_3gpp-common-files.yang +++ b/yang-models/_3gpp-common-files.yang @@ -11,9 +11,9 @@ module _3gpp-common-files { organization "3GPP SA5"; contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464"; - description "Defines the YANG mapping of File retrieval NRM fragment + description "Defines the YANG mapping of File retrieval NRM fragment including the IOCs File and Files. - Copyright 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + Copyright 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved."; reference "3GPP TS 28.623 Generic Network Resource Model (NRM) @@ -24,11 +24,11 @@ module _3gpp-common-files { Generic Network Resource Model (NRM) Integration Reference Point (IRP); Information Service (IS)"; - - revision 2024-05-25 { reference CR-0362 ; } - revision 2023-09-18 { reference CR-0271 ; } + + revision 2024-05-25 { reference CR-0362 ; } + revision 2023-09-18 { reference CR-0271 ; } revision 2022-09-28 { reference CR-0191; } - + grouping FileGrp { description "Represents the File IOC."; @@ -37,29 +37,29 @@ module _3gpp-common-files { mandatory true; yext3gpp:notNotifyable ; yext3gpp:inVariant ; - description "Location of the file incl. the file transfer protocol, - and the file name for the case the file content cannot be retrieved + description "Location of the file incl. the file transfer protocol, + and the file name for the case the file content cannot be retrieved by reading the 'fileContent' attribute. - + The allowed file transfer protocols are: - sftp - ftpes - https - + Examples: 'sftp://companyA.com/datastore/fileName.xml', 'https://companyA.com/ManagedElement=1/Files=1/File=1' "; } - + leaf fileCompression { type string ; mandatory true; yext3gpp:notNotifyable ; yext3gpp:inVariant ; - description "Name of the algorithm used for compressing the file. - An empty or absent 'fileCompression' parameter indicates the file is - not compressed. The MnS producer selects the compression algorithm. + description "Name of the algorithm used for compressing the file. + An empty or absent 'fileCompression' parameter indicates the file is + not compressed. The MnS producer selects the compression algorithm. It is encouraged to use popular algorithms such as GZIP."; } @@ -71,7 +71,7 @@ module _3gpp-common-files { yext3gpp:inVariant ; description "Size of the file"; } - + leaf fileDataType { type enumeration { enum PERFORMANCE { @@ -86,26 +86,26 @@ module _3gpp-common-files { yext3gpp:inVariant ; description "Type of the management data stored in the file."; } - + leaf fileFormat { type string ; mandatory true; yext3gpp:notNotifyable ; yext3gpp:inVariant ; - description "Identifier of the XML or ASN.1 schema (incl. its version) + description "Identifier of the XML or ASN.1 schema (incl. its version) used to produce the file content."; } - + leaf fileReadyTime { type yang:date-and-time ; mandatory true; yext3gpp:notNotifyable ; yext3gpp:inVariant ; - description "Date and time, when the file was closed (the last time) - and made available on the MnS producer. + description "Date and time, when the file was closed (the last time) + and made available on the MnS producer. The file content will not be changed anymore."; } - + leaf fileExpirationTime { type yang:date-and-time ; mandatory true; @@ -113,23 +113,23 @@ module _3gpp-common-files { yext3gpp:inVariant ; description "Date and time after which the file may be deleted."; } - + leaf fileContent { type string ; // String is very restrictive mandatory true; yext3gpp:notNotifyable ; yext3gpp:inVariant ; - description "File content"; + description "File content"; } leaf-list jobRef { type types3gpp:DistinguishedName ; yext3gpp:notNotifyable ; yext3gpp:inVariant ; - description "Object instance of the 'PerfMetricJob' or 'TraceJob' + description "Object instance of the 'PerfMetricJob' or 'TraceJob' that produced the file."; } - + leaf jobId { type string ; yext3gpp:notNotifyable ; @@ -137,23 +137,23 @@ module _3gpp-common-files { description "Identifier of a PerfMetricJob job or a TraceJob."; } } - + grouping FilesGrp { description "Represents the Files IOC."; leaf numberOfFiles { type uint64 ; yext3gpp:notNotifyable ; - description "Number of files in a file collection."; + description "Number of files in a file collection."; } leaf-list jobRef { type types3gpp:DistinguishedName ; yext3gpp:notNotifyable ; yext3gpp:inVariant ; - description "Object instance of the 'PerfMetricJob' or 'TraceJob' + description "Object instance of the 'PerfMetricJob' or 'TraceJob' that produced the file."; } - + leaf jobId { type string ; yext3gpp:notNotifyable ; @@ -161,7 +161,7 @@ module _3gpp-common-files { description "Identifier of a PerfMetricJob job or a TraceJob."; } } - + grouping FilesSubtree { description "Contains classes of the File retrieval NRM fragment. Should be used in classes (or classes inheriting from) @@ -172,153 +172,153 @@ module _3gpp-common-files { If a YANG module wants to augment these classes/list/groupings they must augment all user classes!"; - - list Files { - description "This IOC represents a collection of files. It can be - name-contained by 'SubNetwork', 'ManagedElement', 'PerfMetricJob' or - 'TraceJob'. The 'Files' object name-contains 'File' objects, that - represent the files of the collection. File collections allow to + + list Files { + description "This IOC represents a collection of files. It can be + name-contained by 'SubNetwork', 'ManagedElement', 'PerfMetricJob' or + 'TraceJob'. The 'Files' object name-contains 'File' objects, that + represent the files of the collection. File collections allow to structure related files under a common root. - Instances of 'Files' are created by MnS producers. They shall be - created at latest when the first file of the collection becomes + Instances of 'Files' are created by MnS producers. They shall be + created at latest when the first file of the collection becomes available for retrieval by MnS consumers. - The attributes of 'Files' represent properties of the file collection + The attributes of 'Files' represent properties of the file collection and not properties of individual files. - When the file retrieval NRM fragment is used together with a data - collection job ('PerfMetricJob' or 'TraceJob') the following + When the file retrieval NRM fragment is used together with a data + collection job ('PerfMetricJob' or 'TraceJob') the following provisions shall apply: - - The 'Files' object shall be created at the same time as the object + - The 'Files' object shall be created at the same time as the object representing the data collection job. - - The attributes 'jobRef' and 'jobId' shall be supported and present - in a 'Files' instance. They shall identify the job that the files in + - The attributes 'jobRef' and 'jobId' shall be supported and present + in a 'Files' instance. They shall identify the job that the files in the file collection relate to. - - A 'Files' instance shall contain files related to one and only one + - A 'Files' instance shall contain files related to one and only one job. - - The files produced by one job shall be contained in one and only + - The files produced by one job shall be contained in one and only one 'Files' instance. - - The job object shall support an attribute with a link to the + - The job object shall support an attribute with a link to the created 'Files' instance ('_linkToFiles'). - - The attribute '_linkToFiles' shall be returned in the job creation - response, if the stage 3 protocol supports returning attributes in an + - The attribute '_linkToFiles' shall be returned in the job creation + response, if the stage 3 protocol supports returning attributes in an object creation response. - - The MnS producer decides where to name-contain the 'Files' instance + - The MnS producer decides where to name-contain the 'Files' instance related to a job. - The attribute '_linkToFiles' allows a MnS consumer to create simple - and targeted subscriptions for 'notifyFileReady'and - 'notifyFilePreparationError', or - 'notifyMOICreation', 'notifyMOIChanges' and 'notifyFilePreparationError' - related to 'File' instances created or deleted - under the 'Files' instance of a specific job. The subscription needs + The attribute '_linkToFiles' allows a MnS consumer to create simple + and targeted subscriptions for 'notifyFileReady'and + 'notifyFilePreparationError', or + 'notifyMOICreation', 'notifyMOIChanges' and 'notifyFilePreparationError' + related to 'File' instances created or deleted + under the 'Files' instance of a specific job. The subscription needs to scope simply objects one level below the 'Files' object. - In addition, the attribute '_linkToFiles' allows for simple - deployments not relying on notifications for reporting the - availability of new files, where the MnS consumer polls regularly + In addition, the attribute '_linkToFiles' allows for simple + deployments not relying on notifications for reporting the + availability of new files, where the MnS consumer polls regularly for new files under 'Files'."; - + key id; config false; uses top3gpp:Top_Grp ; container attributes { uses FilesGrp ; } - + list File { description "Represents a file. It is name-contained by 'Files'. - When a file becomes available on a MnS producer for retrieval by a - MnS consumer, the MnS producer shall create a 'File' instance + When a file becomes available on a MnS producer for retrieval by a + MnS consumer, the MnS producer shall create a 'File' instance representing that file. - The time of creation shall be captured by the MnS producer in the - 'fileReadyTime' attribute. The MnS producer shall keep the file at - least until the time specified by 'fileExpirationTime'. After that - time the MnS producer may delete the 'File' instance. - The 'fileExpirationTime' is determined by the MnS producer based on - considerations such as available storage space or file retention + The time of creation shall be captured by the MnS producer in the + 'fileReadyTime' attribute. The MnS producer shall keep the file at + least until the time specified by 'fileExpirationTime'. After that + time the MnS producer may delete the 'File' instance. + The 'fileExpirationTime' is determined by the MnS producer based on + considerations such as available storage space or file retention policies. - The attributes 'fileSize', 'fileCompression', 'fileDataType' and + The attributes 'fileSize', 'fileCompression', 'fileDataType' and 'fileFormat' describe the file properties. - The 'fileLocation' attribute indicates the address where the file can - be retrieved. The address includes the file transfer protocol (schema). + The 'fileLocation' attribute indicates the address where the file can + be retrieved. The address includes the file transfer protocol (schema). Allowed file transfer protocols are 'sftp', 'ftpes' and 'https'. - The value of 'fileLocation' can be identical to or different from the - address of the 'File' instance. The attribute 'fileContent' is - provided for retrieving the actual file content. When identifying in - the Read request a 'File' instance and specifying only the - 'fileContent' attribute be returned, then only the file content shall - be returned in the response. Note, as usual, multiple attributes can - be specified to be returned, so that the file content together with - some or all file meta data attributes can be returned in response to + The value of 'fileLocation' can be identical to or different from the + address of the 'File' instance. The attribute 'fileContent' is + provided for retrieving the actual file content. When identifying in + the Read request a 'File' instance and specifying only the + 'fileContent' attribute be returned, then only the file content shall + be returned in the response. Note, as usual, multiple attributes can + be specified to be returned, so that the file content together with + some or all file meta data attributes can be returned in response to a single request. - In case the 'fileLocation' specifies a location different than the - 'File' object location, then the attribute 'fileContent' cannot be - used for retrieving the file content. For example, the 'File' object + In case the 'fileLocation' specifies a location different than the + 'File' object location, then the attribute 'fileContent' cannot be + used for retrieving the file content. For example, the 'File' object location may be given by 'https://companyA.com/ManagedElement=1/Files=1/File=1' and the value of the 'fileLocation' attribute by 'sftp://companyA.com/datastore/fileName.xml' - In this case the file needs to be retrieved using 'sftp' from - 'sftp://companyA.com/datastore/fileName.xml'. Attempts to read the + In this case the file needs to be retrieved using 'sftp' from + 'sftp://companyA.com/datastore/fileName.xml'. Attempts to read the 'fileContent' attribute shall return an error. - When the file retrieval NRM fragment is used together with a data - collection job ('PerfMetricJob' or 'TraceJob') the following + When the file retrieval NRM fragment is used together with a data + collection job ('PerfMetricJob' or 'TraceJob') the following provisions shall apply: - - The attributes 'jobRef' and 'jobId' shall be supported and + - The attributes 'jobRef' and 'jobId' shall be supported and present. They shall identify the job that the file is related to. - The attributes 'jobRef' and 'jobId' allow to set notification filters - in the subscription in such a way that only 'notifyMOICreation', - notifyMOIChanges and - 'notifyMOIDeletion' notifications are sent to subscribed MnS consumers - if the created or deleted 'File' instance represents data related to + The attributes 'jobRef' and 'jobId' allow to set notification filters + in the subscription in such a way that only 'notifyMOICreation', + notifyMOIChanges and + 'notifyMOIDeletion' notifications are sent to subscribed MnS consumers + if the created or deleted 'File' instance represents data related to jobs the subscribed MnS consumer created or is interested in. - Upon creation of a 'File' instance, a notification of type - 'notifyMOICreation' or 'notifyMOIChanges' shall be emitted to - subscribed MnS consumers as - usual. For the case that the file contains performance metric data - ('fileDataType' is 'PERFORMANCE') the MnS producer shall emit either - a notification of type 'notifyMOICreation', 'notifyMOICreation' or - of type - 'notifyFileReady'. The MnS consumer selects the notification type he + Upon creation of a 'File' instance, a notification of type + 'notifyMOICreation' or 'notifyMOIChanges' shall be emitted to + subscribed MnS consumers as + usual. For the case that the file contains performance metric data + ('fileDataType' is 'PERFORMANCE') the MnS producer shall emit either + a notification of type 'notifyMOICreation', 'notifyMOICreation' or + of type + 'notifyFileReady'. The MnS consumer selects the notification type he wishes to receive with the subscription created on the MnS producer. - The 'objectClass' and 'objectInstance' parameters in the notification - header of 'notifyFileReady' shall identify the new 'File' instance, - instead of the related 'PerfMetricJob', 'TraceJob', 'ManagedElement' - or 'ManagementNode'as described in 3GPP TS 28.532, - clause 11.6.1.1.1 for the case that 'notifyFileReady' is used as + The 'objectClass' and 'objectInstance' parameters in the notification + header of 'notifyFileReady' shall identify the new 'File' instance, + instead of the related 'PerfMetricJob', 'TraceJob', 'ManagedElement' + or 'ManagementNode'as described in 3GPP TS 28.532, + clause 11.6.1.1.1 for the case that 'notifyFileReady' is used as part of the file data reporting MnS. - The notification 'notifyFilePreparationError' shall be supported as - well by the 'File' object. It shall be sent when an error occurs - during the preparation of the file. No 'notifyFileReady' or - 'notifMOICreation shall be sent in that case. The 'objectClass' - and 'objectInstance' parameters of the notification header shall - identify the new 'File' instance representing the corrupted file, - instead of the related 'PerfMetricJob', 'TraceJob', 'ManagedElement' - or 'ManagementNode'as described in 3GPP TS 28.532, clause 11.6.1.1.1 - for the case that 'notifyFilePreparationError' is used as part of - the file data reporting MnS. When the file is not created at all or - deleted, the 'objectClass' and 'objectInstance' parameters of the - notification header are populated as described in 3GPP TS 28.532, - clause 11.6.1.1.1. The parameter 'fileCreationErrorInfoList' - shall provide details about files and job which failed to create them. - The error information about such files shall only be emitted once, - at the time the MnS producer fails to create them, to inform the MnS - consumer about files which the node could not create. Note that to - receive 'notifyFilePreparationError' in that case the notification + The notification 'notifyFilePreparationError' shall be supported as + well by the 'File' object. It shall be sent when an error occurs + during the preparation of the file. No 'notifyFileReady' or + 'notifMOICreation shall be sent in that case. The 'objectClass' + and 'objectInstance' parameters of the notification header shall + identify the new 'File' instance representing the corrupted file, + instead of the related 'PerfMetricJob', 'TraceJob', 'ManagedElement' + or 'ManagementNode'as described in 3GPP TS 28.532, clause 11.6.1.1.1 + for the case that 'notifyFilePreparationError' is used as part of + the file data reporting MnS. When the file is not created at all or + deleted, the 'objectClass' and 'objectInstance' parameters of the + notification header are populated as described in 3GPP TS 28.532, + clause 11.6.1.1.1. The parameter 'fileCreationErrorInfoList' + shall provide details about files and job which failed to create them. + The error information about such files shall only be emitted once, + at the time the MnS producer fails to create them, to inform the MnS + consumer about files which the node could not create. Note that to + receive 'notifyFilePreparationError' in that case the notification subscription needs to include these objects in its scope."; key id; uses top3gpp:Top_Grp ; @@ -327,5 +327,5 @@ module _3gpp-common-files { } } } - } + } } diff --git a/yang-models/_3gpp-common-fm.yang b/yang-models/_3gpp-common-fm.yang index b067ace3f..2a2710c0a 100755 --- a/yang-models/_3gpp-common-fm.yang +++ b/yang-models/_3gpp-common-fm.yang @@ -12,23 +12,23 @@ module _3gpp-common-fm { contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464"; description "Defines a Fault Management model - Copyright 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + Copyright 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved."; reference "3GPP TS 28.111"; revision 2025-05-01 { reference "CR-0042 CR-0043"; } // common for R18, R19 - revision 2025-03-25 { reference "CR-0025 CR-0026"; } - revision 2024-05-12 { + revision 2025-03-25 { reference "CR-0025 CR-0026"; } + revision 2024-05-12 { description "The definition of the module was from TS 28.623 to TS 28.111"; - reference CR-0008 ; - } - revision 2024-03-06 { reference CR-0333 ; } - revision 2024-02-24 { reference CR-0346; } + reference CR-0008 ; + } + revision 2024-03-06 { reference CR-0333 ; } + revision 2024-02-24 { reference CR-0346; } revision 2024-01-18 { description "The specification of the file is moved from 28.623 to 28.532"; - reference "28.623 CR-0315"; + reference "28.623 CR-0315"; } - revision 2023-09-18 { reference CR-0271; } + revision 2023-09-18 { reference CR-0271; } revision 2023-05-10 { reference CR-0250; } revision 2022-10-24 { reference CR-0196; } revision 2021-08-08 { reference "CR-0132"; } @@ -37,10 +37,10 @@ module _3gpp-common-fm { revision 2020-02-24 { reference "S5-201365"; } feature AcknowledgeByConsumer { - description "Indicates whether alarm acknowledgement by the consumer is + description "Indicates whether alarm acknowledgement by the consumer is supported."; } - + typedef eventType { type enumeration { enum OTHER { @@ -139,15 +139,15 @@ module _3gpp-common-fm { } grouping ThresholdHysteresisGrp { - description "The ThresholdHysteresis defines the threshold boundaries to + description "The ThresholdHysteresis defines the threshold boundaries to control the hysteresis mechanism. - The high attribute of ThresholdHysteresis identifies the higher value of - a threshold with hysteris, the integer type is used for counter - thresholds and the float type for gauge thresholds. The low attribute - of ThresholdHysteresis identifies the lower value of a threshold with + The high attribute of ThresholdHysteresis identifies the higher value of + a threshold with hysteris, the integer type is used for counter + thresholds and the float type for gauge thresholds. The low attribute + of ThresholdHysteresis identifies the lower value of a threshold with hysteresis, applicable only to gauge thresholds."; - + leaf high { type union { type int64; @@ -156,37 +156,37 @@ module _3gpp-common-fm { } } mandatory true; - description "Higher value of a threshold with hysteris, the integer type - is used for counter thresholds and the float type for gauge + description "Higher value of a threshold with hysteris, the integer type + is used for counter thresholds and the float type for gauge thresholds."; } - + leaf low { type decimal64 { fraction-digits 7; } - description "Lower value of a threshold with hysteresis, applicable + description "Lower value of a threshold with hysteresis, applicable only to gauge thresholds."; } } - + grouping ThresholdLevelIndGrp { - description "The up attribute indicates for counter and gauge thresholds - that the threshold crossing occurred when going up. The down attribute - only indicates for gauge thresholds that the threshold crossing occurred + description "The up attribute indicates for counter and gauge thresholds + that the threshold crossing occurred when going up. The down attribute + only indicates for gauge thresholds that the threshold crossing occurred when going down, applicable only to gauge thresholds."; - + list up { - description "Indicates for counter and gauge thresholds that the + description "Indicates for counter and gauge thresholds that the threshold crossing occurred when going up."; max-elements 1; key idx; leaf idx { type int32; } uses ThresholdHysteresisGrp; } - + list down { - description "Indicates for gauge thresholds that the threshold crossing + description "Indicates for gauge thresholds that the threshold crossing occurred when going down, applicable only to gauge thresholds."; max-elements 1; key idx; @@ -194,41 +194,41 @@ module _3gpp-common-fm { uses ThresholdHysteresisGrp; } } - + grouping ThresholdCrossingGrp { - description "The datatype indicates the crossed threshold - information regardless of the gauge threshold, which represents an - instantaneous value that changes over time, or the counter threshold, + description "The datatype indicates the crossed threshold + information regardless of the gauge threshold, which represents an + instantaneous value that changes over time, or the counter threshold, which represents monotonically increasing cumulative quantity. - - The observedMeasurement attribute of TheresholdInfo specifies the name - of the monitored measurement that crossed the threshold and that - caused the notification (Rec. ITU-T X. 733[8]). The observedValue - attribute indicates the value of the gauge or counter which crossed + + The observedMeasurement attribute of TheresholdInfo specifies the name + of the monitored measurement that crossed the threshold and that + caused the notification (Rec. ITU-T X. 733[8]). The observedValue + attribute indicates the value of the gauge or counter which crossed the threshold. This may be different from the threshold value if, for - example, the gauge may only take on discrete values. Integer values - are used for counters and float values for gauges (Rec. ITU-T X. 733). - Note that a 'number' type property can contain both integers and + example, the gauge may only take on discrete values. Integer values + are used for counters and float values for gauges (Rec. ITU-T X. 733). + Note that a 'number' type property can contain both integers and floating point numbers. - - For the thresholdLevel attribute, in the case of a gauge, it specifies - a pair of threshold values, the first being the value of the crossed - threshold and the second, its corresponding hysteresis; in the case of - a counter, it specifies only the threshold value (Rec. ITU-T X. 733). - - For the armTime attribute, for a gauge threshold, it specifies the - time at which the threshold was last re-armed, namely the time after - the previous threshold crossing at which the hysteresis value of the - threshold was exceeded thus again permitting generation of - notifications when the threshold is crossed; for a counter threshold, - the later of the time at which the threshold offset was last applied, - or the time at which the counter was last initialized (for resettable + + For the thresholdLevel attribute, in the case of a gauge, it specifies + a pair of threshold values, the first being the value of the crossed + threshold and the second, its corresponding hysteresis; in the case of + a counter, it specifies only the threshold value (Rec. ITU-T X. 733). + + For the armTime attribute, for a gauge threshold, it specifies the + time at which the threshold was last re-armed, namely the time after + the previous threshold crossing at which the hysteresis value of the + threshold was exceeded thus again permitting generation of + notifications when the threshold is crossed; for a counter threshold, + the later of the time at which the threshold offset was last applied, + or the time at which the counter was last initialized (for resettable counters) (Rec. ITU-T X. 733)."; - + leaf observedMeasurement { type string; mandatory true; - description "The name of the monitored measurement that crossed the + description "The name of the monitored measurement that crossed the threshold and that caused the notification (Rec. ITU-T X. 733 "; } @@ -240,19 +240,19 @@ module _3gpp-common-fm { } } mandatory true; - description "The value of the gauge or counter which crossed the - threshold. This may be different from the threshold value if, for - example, the gauge may only take on discrete values. - Integer values are used for counters and float values for gauges - (Rec. ITU-T X. 733). Note that a 'number' type property can contain + description "The value of the gauge or counter which crossed the + threshold. This may be different from the threshold value if, for + example, the gauge may only take on discrete values. + Integer values are used for counters and float values for gauges + (Rec. ITU-T X. 733). Note that a 'number' type property can contain both integers and floating point numbers."; } list thresholdLevel { - description "In the case of a gauge the threshold level specifies - a pair of threshold values, the first being the value of the crossed - threshold and the second, its corresponding hysteresis; in the case - of a counter the threshold level specifies only the threshold value + description "In the case of a gauge the threshold level specifies + a pair of threshold values, the first being the value of the crossed + threshold and the second, its corresponding hysteresis; in the case + of a counter the threshold level specifies only the threshold value (Rec. ITU-T X. 733)."; max-elements 1; key idx; @@ -262,17 +262,17 @@ module _3gpp-common-fm { leaf armTime { type yang:date-and-time; - description "For a gauge threshold, the time at which the threshold - was last re-armed, namely the time after the previous threshold - crossing at which the hysteresis value of the threshold was - exceeded thus again permitting generation of notifications when the - threshold is crossed. For a counter threshold, the later of the time - at which the threshold offset was last applied, or the time at - which the counter was last initialized (for resettable counters) + description "For a gauge threshold, the time at which the threshold + was last re-armed, namely the time after the previous threshold + crossing at which the hysteresis value of the threshold was + exceeded thus again permitting generation of notifications when the + threshold is crossed. For a counter threshold, the later of the time + at which the threshold offset was last applied, or the time at + which the counter was last initialized (for resettable counters) (Rec. ITU-T X. 733)"; } - } - + } + grouping AlarmRecordGrp { description "Contains alarm information of an alarmed object instance. A new record is created in the alarm list when an alarmed object @@ -382,7 +382,7 @@ module _3gpp-common-fm { leaf backUpObject { type types3gpp:DistinguishedName; config false ; - description "Backup object of the alarmed object as defined in + description "Backup object of the alarmed object as defined in ITU-T Rec. X. 733"; yext3gpp:notNotifyable; } @@ -412,25 +412,25 @@ module _3gpp-common-fm { list stateChangeDefinition { key attributeName; config false ; - description "Indicates MO attribute value changes associated with the - alarm for state attributes of the monitored entity (state transitions). - The change is reported with the name of the state attribute, the new - value and an optional old value. + description "Indicates MO attribute value changes associated with the + alarm for state attributes of the monitored entity (state transitions). + The change is reported with the name of the state attribute, the new + value and an optional old value. See definition in ITU-T Recommendation X.733 [4] clause 8.1.2.10."; yext3gpp:notNotifyable; - + leaf attributeName { type string; } - + anydata newValue { mandatory true; - description "The new value of the attribute. The content of this data + description "The new value of the attribute. The content of this data node shall be in accordance with the data model for the attribute."; } - + anydata oldValue{ - description "The old value of the attribute. The content of this data + description "The old value of the attribute. The content of this data node shall be in accordance with the data model for the attribute."; } } @@ -439,18 +439,18 @@ module _3gpp-common-fm { key attributeName; config false ; yext3gpp:notNotifyable; - description "Attributes of the monitored entity and their - values at the time the alarm occurred that are of interest for the + description "Attributes of the monitored entity and their + values at the time the alarm occurred that are of interest for the alarm report."; reference "ITU-T Recommendation X.733 clause 8.1.2.11."; leaf attributeName { type string; } - + anydata value { mandatory true; - description "The value of the attribute. The content of this data + description "The value of the attribute. The content of this data node shall be in accordance with the data model for the attribute."; } } @@ -572,15 +572,15 @@ module _3gpp-common-fm { config false ; yext3gpp:notNotifyable; } - + list correlatedNotifications { key sourceObjectInstance; description "List of correlated notifications"; - + leaf sourceObjectInstance { type types3gpp:DistinguishedName; } - + leaf-list notificationIds { type int32; min-elements 1; @@ -634,14 +634,14 @@ module _3gpp-common-fm { type types3gpp:DistinguishedName; config false; yext3gpp:notNotifyable; - description "Identifies, the part of the alarm scope that may not be + description "Identifies, the part of the alarm scope that may not be reliable. - If this parameter is equal to the instance carried in systemDN, + If this parameter is equal to the instance carried in systemDN, then all AlarmRecord instances in the AlarmList may not be reliable. - If this parameter is equal to some instance represented by - MonitoredEntity, then only AlarmRecord related to this instance and + If this parameter is equal to some instance represented by + MonitoredEntity, then only AlarmRecord related to this instance and its descendants may not be reliable."; } } diff --git a/yang-models/_3gpp-common-managed-element.yang b/yang-models/_3gpp-common-managed-element.yang index 70e53be99..aca6caf86 100755 --- a/yang-models/_3gpp-common-managed-element.yang +++ b/yang-models/_3gpp-common-managed-element.yang @@ -1,8 +1,8 @@ module _3gpp-common-managed-element { - yang-version 1.1; + yang-version 1.1; namespace urn:3gpp:sa5:_3gpp-common-managed-element; prefix "me3gpp"; - + import _3gpp-common-yang-types { prefix types3gpp ; } import _3gpp-common-yang-extensions { prefix yext3gpp ; } import _3gpp-common-top { prefix top3gpp; } @@ -20,42 +20,42 @@ module _3gpp-common-managed-element { organization "3GPP SA5"; contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464"; - description "Defines ManagedElement which will be augmented + description "Defines ManagedElement which will be augmented by other IOCs - Copyright 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + Copyright 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved."; reference "3GPP TS 28.623 Generic Network Resource Model (NRM) Integration Reference Point (IRP); Solution Set (SS) definitions - + 3GPP TS 28.622 Generic Network Resource Model (NRM) Integration Reference Point (IRP); Information Service (IS) - - 3GPP TS 28.620 + + 3GPP TS 28.620 Umbrella Information Model (UIM)"; - - revision 2025-04-25 { reference "CR-0532 CR0541" ; } - revision 2025-03-25 { reference "CR-0516"; } - revision 2024-10-01 { reference "CR-0437,CR-0438" ; } - revision 2024-01-30 { reference CR-0328 ; } + + revision 2025-04-25 { reference "CR-0532 CR0541" ; } + revision 2025-03-25 { reference "CR-0516"; } + revision 2024-10-01 { reference "CR-0437,CR-0438" ; } + revision 2024-01-30 { reference CR-0328 ; } revision 2023-11-14 { reference CR-0305 ; } - revision 2023-09-18 { reference CR-0271 ; } + revision 2023-09-18 { reference CR-0271 ; } revision 2023-08-10 { reference CR-0257; } revision 2023-04-26 { reference CR-0250; } revision 2023-02-14 { reference "CR-0234"; } revision 2022-09-30 { reference "CR-0191"; } - revision 2021-01-16 { reference "CR-0120"; } - revision 2020-08-06 { reference "CR-0102"; } - revision 2020-08-03 { reference "CR-0095"; } - revision 2020-06-08 { reference "CR-0092"; } + revision 2021-01-16 { reference "CR-0120"; } + revision 2020-08-06 { reference "CR-0102"; } + revision 2020-08-03 { reference "CR-0095"; } + revision 2020-06-08 { reference "CR-0092"; } revision 2020-05-12 { reference "CR0084"; } revision 2020-02-24 { reference "S5-201365"; } revision 2019-06-17 { reference " S5-203316"; } revision 2019-05-08 { reference "Initial revision"; } - + feature ECMappingRuleUnderManagedElement { description "ECMappingRule shall be contained under ManagedElement."; } @@ -63,7 +63,7 @@ module _3gpp-common-managed-element { feature EcmConnectionInfoUnderManagedElement { description "The EcmConnectionInfo shall be contained under ManagedElement"; - } + } feature Configurable5QISetUnderManagedElement { description "The Configurable5QISet shall be contained under ManagedElement"; @@ -77,7 +77,7 @@ module _3gpp-common-managed-element { description "The MeasurementSubtree shall be contained under ManagedElement"; } - + feature SubscriptionControlUnderManagedElement { description "The SubscriptionControlSubtree shall be contained under ManagedElement"; @@ -91,7 +91,7 @@ module _3gpp-common-managed-element { feature FmUnderManagedElement { description "The FmSubtree shall be contained under ManagedElement"; } - + feature TraceUnderManagedElement { description "The TraceSubtree shall be contained under ManageElement"; } @@ -129,121 +129,121 @@ module _3gpp-common-managed-element { description "Class representing Cross Domain-Centralized SON Energy Saving feature. The CESManagementFunction shall be contained under ManagedElement."; - } + } feature StmCtrlUnderManagedElement { description "The StmCtrlSubtree shall be contained under ManagedElement"; - } - + } + feature MWABUnderManagedElement { description "The MWAB shall be contained under ManagedElement"; } - + grouping ManagedElement_Grp { description "Abstract class representing telecommunications resources. - An ME communicates with a manager (directly or indirectly) for the - purpose of being monitored and/or controlled. MEs may perform element - management functionality. - An ME (and its contained Function_(s)) may or may not be geographically - distributed. An ME (and its contained Function_(s)) is often referred + An ME communicates with a manager (directly or indirectly) for the + purpose of being monitored and/or controlled. MEs may perform element + management functionality. + An ME (and its contained Function_(s)) may or may not be geographically + distributed. An ME (and its contained Function_(s)) is often referred to as a Network Element"; - + leaf dnPrefix { - description "Provides naming context that allows the Managed - Elements to be partitioned into logical domains. + description "Provides naming context that allows the Managed + Elements to be partitioned into logical domains. A Distingushed Name(DN) is defined by 3GPP TS 32.300, which splits the DN into a DN Prefix and Local DN"; type types3gpp:DistinguishedName; yext3gpp:inVariant; } - + leaf userLabel { description "A user-friendly (and user assignable) name of this object."; type string; } - + leaf locationName { - description "The physical location (e.g. an address) of an entity - represented by a (derivative of) ManagedElement_. It may contain no - information to support the case where the derivative of + description "The physical location (e.g. an address) of an entity + represented by a (derivative of) ManagedElement_. It may contain no + information to support the case where the derivative of ManagedElement_ needs to represent a distributed multi-location NE."; config false; type string; } - + leaf-list managedBy { - description "Relates to the role played by ManagementSystem_ in the - between ManagedSystem_ and ManagedElement_. This attribute contains - a list of the DN(s) of the related subclasses of + description "Relates to the role played by ManagementSystem_ in the + between ManagedSystem_ and ManagedElement_. This attribute contains + a list of the DN(s) of the related subclasses of ManagementSystem_ instance(s)."; config false; type types3gpp:DistinguishedName; } - + leaf-list managedElementTypeList { description "The type of functionality provided by the ManagedElement. - It may represent one ME functionality or a combination of - more than one functionality. - 1) The allowed values of this attribute are the names of the IOC(s) - that are (a) derived/subclassed from ManagedFunction and (b) directly - name-contained by ManagedElement IOC (on the first level below - ManagedElement), but with the string 'Function' excluded. - 2) If a ManagedElement contains multiple instances of a ManagedFunction + It may represent one ME functionality or a combination of + more than one functionality. + 1) The allowed values of this attribute are the names of the IOC(s) + that are (a) derived/subclassed from ManagedFunction and (b) directly + name-contained by ManagedElement IOC (on the first level below + ManagedElement), but with the string 'Function' excluded. + 2) If a ManagedElement contains multiple instances of a ManagedFunction this attribute will not contain repeated values. - 3) The capitalisation (usage of upper/lower case) of characters in this - attribute is insignificant. Thus, the NodeB should be case insensitive + 3) The capitalisation (usage of upper/lower case) of characters in this + attribute is insignificant. Thus, the NodeB should be case insensitive when reading these values. - 4) Two examples of allowed values are: + 4) Two examples of allowed values are: - NodeB; - HLR, VLR."; config false; min-elements 1; type string; - } + } } - + grouping ManagedElementGrp { - description "Represents telecommunications equipment or - TMN entities within the telecommunications network providing support + description "Represents telecommunications equipment or + TMN entities within the telecommunications network providing support and/or service to the subscriber."; - + uses ManagedElement_Grp; - + leaf vendorName { config false; type string; } - + leaf userDefinedState { type string; description "An operator defined state for operator specific usage"; } - + leaf swVersion { config false; type string; } - + leaf priorityLabel { type uint32; mandatory true; - } - + } + uses meas3gpp:SupportedPerfMetricGroupGrp; leaf-list supportedTraceMetrics { type string; config false; - description "List of trace metrics. When this attribute is contained in - a managed object it defines the trace metrics supported for this + description "List of trace metrics. When this attribute is contained in + a managed object it defines the trace metrics supported for this object and all descendant objects. - Trace metrics include trace messages, MDT measurements - (Immediate MDT, Logged MDT, Logged MBSFN MDT), RLF and RCEF reports, - see TS 32.422. Trace metrics are identified with their metric - identifier. The metric identifier is constructed as defined + Trace metrics include trace messages, MDT measurements + (Immediate MDT, Logged MDT, Logged MBSFN MDT), RLF and RCEF reports, + see TS 32.422. Trace metrics are identified with their metric + identifier. The metric identifier is constructed as defined in clause 10 of TS 32.422."; } } @@ -283,28 +283,28 @@ module _3gpp-common-managed-element { multiple ManagedFunction IOC instances. In this case, the ManagedElement IOC may be used to represent a NE with combined ManagedFunction funcationality (as indicated by the managedElementType attribute and the - contained instances of different ManagedFunction IOCs).For example, a + contained instances of different ManagedFunction IOCs).For example, a ManagedElement is used to represent the combined functionality of 3GPP defined gNBCUCPFuntion, gNBCUUPFunction and gNBDUFunction"; - key id; + key id; uses top3gpp:Top_Grp; container attributes { uses ManagedElementGrp; } - + uses meas3gpp:MeasurementSubtree { if-feature MeasurementsUnderManagedElement; } - + uses subscr3gpp:SubscriptionControlSubtree { if-feature SubscriptionControlUnderManagedElement; } - + uses subscr3gpp:SupportedNotificationsSubtree { if-feature SupportedNotificationsUnderManagedElement; - } - + } + uses fm3gpp:FmSubtree { if-feature FmUnderManagedElement; } @@ -315,7 +315,7 @@ module _3gpp-common-managed-element { uses files3gpp:FilesSubtree { if-feature FilesUnderManagedElement; - } + } uses fiveqi3gpp:Configurable5QISetSubtree { if-feature Configurable5QISetUnderManagedElement; @@ -328,13 +328,13 @@ module _3gpp-common-managed-element { uses ecmap3gpp:NRECMappingRuleSubtree { if-feature ECMappingRuleUnderManagedElement; } - + uses stm3gpp:StmCtrlSubTree { if-feature StmCtrlUnderManagedElement ; } - + uses mwab3gpp:MWABSubTree { if-feature MWABUnderManagedElement ; } - } + } } diff --git a/yang-models/_3gpp-common-managed-function.yang b/yang-models/_3gpp-common-managed-function.yang index f7a5a379f..edaf3449f 100755 --- a/yang-models/_3gpp-common-managed-function.yang +++ b/yang-models/_3gpp-common-managed-function.yang @@ -9,38 +9,38 @@ module _3gpp-common-managed-function { import _3gpp-common-measurements { prefix meas3gpp; } import _3gpp-common-trace { prefix trace3gpp; } import _3gpp-stm-nrm-stmfunction { prefix stm3gpp; } - + organization "3GPP SA5"; contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464"; - description "The module defines a base class/grouping for major 3GPP + description "The module defines a base class/grouping for major 3GPP functions. - Copyright 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + Copyright 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved."; - reference - "3GPP TS 28.622 + reference + "3GPP TS 28.622 Generic Network Resource Model (NRM) Integration Reference Point (IRP); Information Service (IS) - - 3GPP TS 28.620 + + 3GPP TS 28.620 Umbrella Information Model (UIM)"; - revision 2025-07-25 { reference "CR-"; } - revision 2025-04-19 { reference "CR-0541"; } - revision 2024-11-19 { reference "Add STM"; } - revision 2024-02-24 { reference CR-0346; } - revision 2023-09-18 { reference CR-0271; } + revision 2025-07-25 { reference "CR-"; } + revision 2025-04-19 { reference "CR-0541"; } + revision 2024-11-19 { reference "Add STM"; } + revision 2024-02-24 { reference CR-0346; } + revision 2023-09-18 { reference CR-0271; } revision 2023-04-26 { reference CR-0250; } revision 2023-02-14 { reference "CR-0234"; } revision 2022-11-02 { reference "CR-0753"; } revision 2022-10-24 { reference CR-0196; } revision 2022-01-07 { reference "CR-0146"; } - revision 2021-01-25 { reference "CR-0122"; } - revision 2020-09-30 { reference "CR-bbbb"; } - revision 2020-08-06 { reference "CR-0102"; } - revision 2020-08-03 { reference "CR-0095"; } + revision 2021-01-25 { reference "CR-0122"; } + revision 2020-09-30 { reference "CR-bbbb"; } + revision 2020-08-06 { reference "CR-0102"; } + revision 2020-08-03 { reference "CR-0095"; } revision 2020-06-23 { reference "CR-085"; } - revision 2020-06-08 { reference "CR-0092"; } + revision 2020-06-08 { reference "CR-0092"; } revision 2019-11-21 { reference "S5-197275, S5-197735"; } revision 2019-10-28 { reference S5-193518 ; } revision 2019-06-18 { reference "Initial revision"; } @@ -55,21 +55,21 @@ module _3gpp-common-managed-function { feature StmCtrlUnderManagedFunction { description "The StmCtrlSubtree shall be contained under ManagedFunction"; - } - + } + grouping OperationGrp { description "This data type represents an operation."; reference "3gpp TS 28.622"; - + leaf name { type string; mandatory true; yext3gpp:notNotifyable; yext3gpp:inVariant; } - + leaf-list allowedNFTypes { - type string; + type string; min-elements 1; description "The type of the managed NF service instance The specifc values allowed are described in TS 23.501"; @@ -88,39 +88,39 @@ module _3gpp-common-managed-function { reference "3GPP TS 23.502"; } } - - grouping ManagedNFServiceGrp { + + grouping ManagedNFServiceGrp { description "A ManagedNFService represents a Network Function (NF) service."; reference "Clause 7 of 3GPP TS 23.501."; leaf userLabel { type string; description "A user-friendly (and user assignable) name of this object."; - } - + } + leaf nFServiceType { config false; mandatory true; - type string; + type string; description "The type of the managed NF service instance The specifc values allowed are described in clause 7.2 of TS 23.501"; yext3gpp:notNotifyable; yext3gpp:inVariant; } - + list sAP { - key "host port"; + key "host port"; min-elements 1; max-elements 1; description "The service access point of the managed NF service instance"; - uses types3gpp:SAPGrp; + uses types3gpp:SAPGrp; } - + list operations { key name; min-elements 1; uses OperationGrp ; - description "Set of operations supported by the managed NF + description "Set of operations supported by the managed NF service instance"; } @@ -136,16 +136,16 @@ module _3gpp-common-managed-function { mandatory true; description "Describes whether the resource is installed and working"; } - + leaf usageState { type types3gpp:usageState ; config false; mandatory true; - description "Describes whether the resource is actively in use at a - specific instant, and if so, whether or not it has spare + description "Describes whether the resource is actively in use at a + specific instant, and if so, whether or not it has spare capacity for additional users."; } - + leaf registrationState { type enumeration { enum REGISTERED; @@ -154,94 +154,94 @@ module _3gpp-common-managed-function { config false; } } - - grouping Function_Grp { + + grouping Function_Grp { description "A base grouping for 3GPP functions."; leaf userLabel { type string; description "A user-friendly (and user assignable) name of this object."; - } + } } grouping VnfParametersGrp { - description "This <> represents the parameter set of the VNF - instance(s) corresponding to an NE."; - + description "This <> represents the parameter set of the VNF + instance(s) corresponding to an NE."; + leaf vnfInstanceId { type string ; description "VNF instance identifier"; - reference "ETSI GS NFV-IFA 008 v2.1.1: - Network Functions Virtualisation (NFV); Management and Orchestration; + reference "ETSI GS NFV-IFA 008 v2.1.1: + Network Functions Virtualisation (NFV); Management and Orchestration; Ve-Vnfm reference point - Interface and Information Model Specification - section 9.4.2 - - ETSI GS NFV-IFA 015 v2.1.2: Network Functions Virtualisation (NFV); + section 9.4.2 + + ETSI GS NFV-IFA 015 v2.1.2: Network Functions Virtualisation (NFV); Management and Orchestration; Report on NFV Information Model section B2.4.2.1.2.3"; } - + leaf vnfdId { type string ; description "Identifier of the VNFD on which the VNF instance is based. - The absence of the leaf or a string length of zero for vnfInstanceId - means the VNF instance(s) does not exist (e.g. has not been + The absence of the leaf or a string length of zero for vnfInstanceId + means the VNF instance(s) does not exist (e.g. has not been instantiated yet, has already been terminated)."; - reference "ETSI GS NFV-IFA 008 v2.1.1: - Network Functions Virtualisation (NFV); Management and Orchestration; + reference "ETSI GS NFV-IFA 008 v2.1.1: + Network Functions Virtualisation (NFV); Management and Orchestration; Ve-Vnfm reference point - Interface and Information Model Specification - section 9.4.2"; + section 9.4.2"; } - + leaf flavourId { type string ; - description "Identifier of the VNF Deployment Flavour applied to this + description "Identifier of the VNF Deployment Flavour applied to this VNF instance."; - reference "ETSI GS NFV-IFA 008 v2.1.1: + reference "ETSI GS NFV-IFA 008 v2.1.1: Network Functions Virtualisation (NFV) Management and Orchestration"; } leaf autoScalable { type boolean ; - description "Indicator of whether the auto-scaling of this + description "Indicator of whether the auto-scaling of this VNF instance is enabled or disabled."; - } + } } - + grouping PeeParametersGrp { - description "This <> represents the parameter list for the + description "This <> represents the parameter list for the control and monitoring of power, energy and environmental parameters of ManagedFunction instance(s)."; - leaf idx { type uint32; } + leaf idx { type uint32; } leaf siteIdentification { type string; mandatory true; - description "The identification of the site where the + description "The identification of the site where the ManagedFunction resides."; } - + leaf siteLatitude { type decimal64 { fraction-digits 4; - range "-90.0000..+90.0000"; + range "-90.0000..+90.0000"; } - description "The latitude of the site where the ManagedFunction - instance resides, based on World Geodetic System (1984 version) - global reference frame (WGS 84). Positive values correspond to - the northern hemisphere. This attribute is optional - for BTSFunction, RNCFunction, GNBDUFunction and + description "The latitude of the site where the ManagedFunction + instance resides, based on World Geodetic System (1984 version) + global reference frame (WGS 84). Positive values correspond to + the northern hemisphere. This attribute is optional + for BTSFunction, RNCFunction, GNBDUFunction and NRSectorCarrier instance(s)."; } - + leaf siteLongitude { type decimal64 { fraction-digits 4; - range "-180.0000..+180.0000"; + range "-180.0000..+180.0000"; } - description "The longitude of the site where the ManagedFunction - instance resides, based on World Geodetic System (1984 version) - global reference frame (WGS 84). Positive values correspond to - degrees east of 0 degrees longitude. This attribute is optional - for BTSFunction, RNCFunction, GNBDUFunction and + description "The longitude of the site where the ManagedFunction + instance resides, based on World Geodetic System (1984 version) + global reference frame (WGS 84). Positive values correspond to + degrees east of 0 degrees longitude. This attribute is optional + for BTSFunction, RNCFunction, GNBDUFunction and NRSectorCarrier instance(s)."; } @@ -251,97 +251,97 @@ module _3gpp-common-managed-function { fraction-digits 4; } description "The altitude of the site where the ManagedFunction - instance resides, in the unit of meter. This attribute is - optional for BTSFunction, RNCFunction, GNBDUFunction and + instance resides, in the unit of meter. This attribute is + optional for BTSFunction, RNCFunction, GNBDUFunction and NRSectorCarrier instance(s)."; } - + leaf siteDescription { type string; mandatory true; - description "An operator defined description of the site where + description "An operator defined description of the site where the ManagedFunction instance resides."; } - + leaf equipmentType { type string; mandatory true; - description "The type of equipment where the managedFunction + description "The type of equipment where the managedFunction instance resides."; reference "clause 4.4.1 of ETSI ES 202 336-12"; } - + leaf environmentType { type string; mandatory true; - description "The type of environment where the managedFunction + description "The type of environment where the managedFunction instance resides."; reference "clause 4.4.1 of ETSI ES 202 336-12"; } - + leaf powerInterface { type string; mandatory true; description "The type of power."; reference "clause 4.4.1 of ETSI ES 202 336-12"; - } + } } grouping ManagedFunctionGrp { - description "Abstract root class to be inherited/reused by classes + description "Abstract root class to be inherited/reused by classes representing 3GPP functions. - + Anywhere this grouping is used by classes inheriting from ManagedFunction - the list representing the inheriting class needs to include all - contained classes of ManagedFunction too. Contained classes are - either - - augmented into the Function class or - - shall be included in the list representing the inheriting class + the list representing the inheriting class needs to include all + contained classes of ManagedFunction too. Contained classes are + either + - augmented into the Function class or + - shall be included in the list representing the inheriting class using the grouping ManagedFunctionContainedClasses: 1) EP_RP solved using augment - 2) uses mf3gpp:ManagedFunctionContainedClasses; + 2) uses mf3gpp:ManagedFunctionContainedClasses; "; uses Function_Grp; list vnfParametersList { - key "vnfInstanceId"; + key "vnfInstanceId"; uses VnfParametersGrp; - description "This attribute contains the parameter set of the VNF - instance(s) corresponding to an NE. The presence of this attribute - indicates that the ManagedFunction represented by the MOI is a + description "This attribute contains the parameter set of the VNF + instance(s) corresponding to an NE. The presence of this attribute + indicates that the ManagedFunction represented by the MOI is a virtualized function "; } list peeParameterslist{ key "idx"; uses PeeParametersGrp; description "This attribute contains the parameter list for the control - and monitoring of power, energy and environmental parameters of + and monitoring of power, energy and environmental parameters of ManagedFunction instance(s). "; } - + leaf priorityLabel { type uint32; } uses meas3gpp:SupportedPerfMetricGroupGrp; - + leaf-list supportedTraceMetrics { type string; config false; - description "List of trace metrics. When this attribute is contained in - a managed object it defines the trace metrics supported for this + description "List of trace metrics. When this attribute is contained in + a managed object it defines the trace metrics supported for this object and all descendant objects. - Trace metrics include trace messages, MDT measurements - (Immediate MDT, Logged MDT, Logged MBSFN MDT), RLF and RCEF reports, - see TS 32.422. Trace metrics are identified with their metric - identifier. The metric identifier is constructed as defined + Trace metrics include trace messages, MDT measurements + (Immediate MDT, Logged MDT, Logged MBSFN MDT), RLF and RCEF reports, + see TS 32.422. Trace metrics are identified with their metric + identifier. The metric identifier is constructed as defined in clause 10 of TS 32.422."; - } + } } grouping ManagedFunctionContainedClasses { - description "A grouping used to containe classes (lists) contained by + description "A grouping used to containe classes (lists) contained by the abstract IOC ManagedFunction"; list ManagedNFService { description "Represents a Network Function (NF)"; @@ -352,15 +352,15 @@ module _3gpp-common-managed-function { uses ManagedNFServiceGrp; } } - + uses meas3gpp:MeasurementSubtree { if-feature MeasurementsUnderManagedFunction ; - } - + } + uses trace3gpp:TraceSubtree { if-feature TraceUnderManagedFunction ; } - + uses stm3gpp:StmCtrlSubTree { if-feature StmCtrlUnderManagedFunction ; } diff --git a/yang-models/_3gpp-common-management-node.yang b/yang-models/_3gpp-common-management-node.yang index 44a92e78d..d569b23be 100644 --- a/yang-models/_3gpp-common-management-node.yang +++ b/yang-models/_3gpp-common-management-node.yang @@ -1,9 +1,9 @@ module _3gpp-common-management-node { - yang-version 1.1; + yang-version 1.1; namespace urn:3gpp:sa5:_3gpp-common-management-node; prefix "mmgmtnode3gpp"; - - import _3gpp-common-top { prefix top3gpp; } + + import _3gpp-common-top { prefix top3gpp; } import _3gpp-common-yang-types { prefix types3gpp ; } import _3gpp-common-subnetwork { prefix subnet3gpp ; } @@ -11,22 +11,22 @@ module _3gpp-common-management-node { contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464"; description "Defines ManagementNode IOCs - Copyright 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + Copyright 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved."; reference "3GPP TS 28.623 Generic Network Resource Model (NRM) Integration Reference Point (IRP); Solution Set (SS) definitions - + 3GPP TS 28.622 Generic Network Resource Model (NRM) Integration Reference Point (IRP); Information Service (IS) - - 3GPP TS 28.620 + + 3GPP TS 28.620 Umbrella Information Model (UIM)"; - revision 2023-09-18 { reference CR-0271 ; } + revision 2023-09-18 { reference CR-0271 ; } revision 2023-02-14 { reference "CR-0234"; } grouping ManagementSystem_Grp { @@ -36,58 +36,58 @@ module _3gpp-common-management-node { type string; description "A user-friendly (and user assignable) name of this object."; } - + leaf-list managedElements { type types3gpp:DistinguishedName; config false; - description "Contains a list of the DN(s) of the related subclasses of + description "Contains a list of the DN(s) of the related subclasses of ManagedElement_ instance(s)."; } } - + grouping ManagementNodeGrp { uses ManagementSystem_Grp; - + leaf vendorName { type string; config false; } - + leaf userDefinedState { type string; description "An operator defined state for operator specific usage"; } - + leaf locationName { type string; config false; description "The physical location of this entity (e.g. an address)."; } - + leaf swVersion { type string; config false; } } - augment /subnet3gpp:SubNetwork { + augment /subnet3gpp:SubNetwork { list ManagementNode { - description "Represents a telecommunications management system (EM) within - the TMN that contains functionality for managing a number of - ManagedElements (MEs). The management system communicates with the MEs - directly or indirectly over one or more interfaces for the purpose + description "Represents a telecommunications management system (EM) within + the TMN that contains functionality for managing a number of + ManagedElements (MEs). The management system communicates with the MEs + directly or indirectly over one or more interfaces for the purpose of monitoring and/or controlling these MEs. - - This class has similar characteristics as the ManagedElement. The - main difference between these two classes is that the ManagementNode - has a special association to the managed elements that it is + + This class has similar characteristics as the ManagedElement. The + main difference between these two classes is that the ManagementNode + has a special association to the managed elements that it is responsible for managing."; - - key id; + + key id; uses top3gpp:Top_Grp; container attributes { uses ManagementNodeGrp; - } + } } } } \ No newline at end of file diff --git a/yang-models/_3gpp-common-managementdatacollection.yang b/yang-models/_3gpp-common-managementdatacollection.yang index bd15c8a0e..5aa4a80ed 100644 --- a/yang-models/_3gpp-common-managementdatacollection.yang +++ b/yang-models/_3gpp-common-managementdatacollection.yang @@ -10,9 +10,9 @@ module _3gpp-common-managementdatacollection { organization "3GPP SA5"; contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464"; - + description "Handling management data collection - Copyright 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + Copyright 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved."; reference "3GPP TS 28.623 Generic Network Resource Model (NRM) @@ -25,27 +25,27 @@ module _3gpp-common-managementdatacollection { Information Service (IS)"; revision 2025-07-19 { reference CR-0551; } - revision 2025-02-07 { reference "CR-0461 CR-0505"; } - revision 2024-04-12 { reference CR-0346; } + revision 2025-02-07 { reference "CR-0461 CR-0505"; } + revision 2024-04-12 { reference CR-0346; } revision 2023-11-18 { reference CR-0299 ; } revision 2023-11-06 { reference "CR-0305"; } - revision 2023-09-18 { reference CR-0271 ; } + revision 2023-09-18 { reference CR-0271 ; } revision 2023-02-14 { reference "CR-0234"; } revision 2022-11-04 { reference "CR-0194"; } - + grouping ManagementDataGrp { - description "This <> defines the management data which is - requested. It is a choice between - - a list of data categories (attribute mgtDataCategory) This may include - 'COVERAGE', 'CAPACITY', 'MOBILITY', 'ENERGY_EFFICIENCY', 'ACCESSIBILITY' - etc. The mapping of exact measurement with the requested category will be - done at the producer and is implementation specific. - - a list of management data identified with their name (attribute + description "This <> defines the management data which is + requested. It is a choice between + - a list of data categories (attribute mgtDataCategory) This may include + 'COVERAGE', 'CAPACITY', 'MOBILITY', 'ENERGY_EFFICIENCY', 'ACCESSIBILITY' + etc. The mapping of exact measurement with the requested category will be + done at the producer and is implementation specific. + - a list of management data identified with their name (attribute 'mgtDataName'). The management data name presents a specific single - measurement (e.g. by selecting 'RRU.PrbTotDl', see TS 28.552 or - 'immediateMdt.nr.m1', see TS 32.422) or a set of measurements (e.g. - measurement families such as RRU (radio resource utilization) or - MM (mobility management) in case of PM, see TS 28.552 [20], or group of + measurement (e.g. by selecting 'RRU.PrbTotDl', see TS 28.552 or + 'immediateMdt.nr.m1', see TS 32.422) or a set of measurements (e.g. + measurement families such as RRU (radio resource utilization) or + MM (mobility management) in case of PM, see TS 28.552 [20], or group of measurements such as 'immediateMdt.nr' in case of MDT, see TS 32.422)."; choice managementData { case mgtDataCategory { @@ -100,23 +100,23 @@ module _3gpp-common-managementdatacollection { (Immediate MDT, Logged MDT, Logged MBSFN MDT), RRC, RLF and RCEF reports) defined in TS 32.422, the name (metric identifier) is defined in clause 10 of TS 32.422. - - For non-3GPP specified managment data the name is defined + + For non-3GPP specified managment data the name is defined elsewhere."; } } mandatory true; } } - + grouping GeoAreaToCellMappingGrp { - description "Represents the GeoAreaToCellMapping data type. - - The mapping of the geographical area to cells is performed at + description "Represents the GeoAreaToCellMapping data type. + + The mapping of the geographical area to cells is performed at instantiation of the IOC."; - + list geoArea { - description "It specifies the geographical area using the cordinates of + description "It specifies the geographical area using the cordinates of the corners of a convex polygon."; key idx; max-elements 1; @@ -125,48 +125,48 @@ module _3gpp-common-managementdatacollection { } uses types3gpp:GeoAreaGrp; } - + leaf associationThreshold { type uint8 { range 1..100; } yext3gpp:inVariant; - description "It specifies the threshold of coverage area in + description "It specifies the threshold of coverage area in percentage whether a cell belongs to the geographical area or not. - If this attribute is absent, the location of the base station - antenna determines whether a cell belongs to the geographical + If this attribute is absent, the location of the base station + antenna determines whether a cell belongs to the geographical area or not."; } } grouping AreaOfInterestGrp { - description "It specifies a location(s) from where the management data - shall be collected."; - + description "It specifies a location(s) from where the management data + shall be collected."; + list geoAreaToCellMapping { - description "Contains a geographical area and an association threshold. - The geo-area is defined as a convex polygon using the attribute + description "Contains a geographical area and an association threshold. + The geo-area is defined as a convex polygon using the attribute 'geoArea'. - The MnS producer shall map the geographical area to cells. There are - two evaluation criteria whether a cell belongs to a geographical area - or not. If attribute 'associationThreshold' is absent, the location - of the base station antenna determines the belonging. If attribute - 'associationThreshold' is configured, the coverage area is considered. - The attribute 'associationThreshold' determines the lower boundary of - the coverage ratio. For example, if the 'associationThreshold' is - configured to 60%, a cell shall be considered as included in the - geographical area if at least 60% of the coverage area of that - cell overlaps with the specified geographical area. - - The mapping of the geographical area to cells is performed at + The MnS producer shall map the geographical area to cells. There are + two evaluation criteria whether a cell belongs to a geographical area + or not. If attribute 'associationThreshold' is absent, the location + of the base station antenna determines the belonging. If attribute + 'associationThreshold' is configured, the coverage area is considered. + The attribute 'associationThreshold' determines the lower boundary of + the coverage ratio. For example, if the 'associationThreshold' is + configured to 60%, a cell shall be considered as included in the + geographical area if at least 60% of the coverage area of that + cell overlaps with the specified geographical area. + + The mapping of the geographical area to cells is performed at instantiation of the IOC."; key idx; leaf idx { type string; } uses GeoAreaToCellMappingGrp; } - + list taiList { description "Tracking Area Identity list"; key idx; @@ -175,17 +175,17 @@ module _3gpp-common-managementdatacollection { leaf idx { type string; } uses types3gpp:TaiGrp; } - + leaf-list nrCellIdList { type string; description "List of NR cells identified by NG-RAN CGI"; } - + leaf-list eutraCellIdList { type string; description "List of E-UTRAN cells identified by E-UTRAN-CGI"; } - + leaf-list utraCellIdList { type string; description "List of UTRAN cells identified by UTRAN CGI"; @@ -199,7 +199,7 @@ module _3gpp-common-managementdatacollection { leaf idx { type string; } - uses AreaOfInterestGrp; + uses AreaOfInterestGrp; description "It specifies a location(s) from where the management data shall be collected. It is defined in terms of TAI(s)."; } @@ -232,11 +232,11 @@ module _3gpp-common-managementdatacollection { subnet should be targeted. Please refer to 3GPP TS 23.501: 'System Architecture for the 5G System'"; } - + leaf-list objectInstances { type types3gpp:DistinguishedName; yext3gpp:inVariant; - description "List of managed object instances. Each object instance is + description "List of managed object instances. Each object instance is identified by its DN."; } } @@ -255,7 +255,7 @@ module _3gpp-common-managementdatacollection { grouping ManagementDataCollectionGrp { uses ManagementDataGrp { - description "This attribute defines the list of management data that are + description "This attribute defines the list of management data that are requested."; } @@ -299,43 +299,43 @@ module _3gpp-common-managementdatacollection { description "It specifies whether the required data is reported per S-NSSAI or per 5QI."; } - + leaf condition { type string; mandatory true; yext3gpp:inVariant; - description "Logical expression of one or several condition(s). + description "Logical expression of one or several condition(s). - The actual syntax and capabilities of condition is SS specific. However, - each SS should support condition consisting of one or several assertions - that may be grouped using the logical operators AND, OR and NOT. Only if - the whole expression of condition evaluates TRUE, the attribute + The actual syntax and capabilities of condition is SS specific. However, + each SS should support condition consisting of one or several assertions + that may be grouped using the logical operators AND, OR and NOT. Only if + the whole expression of condition evaluates TRUE, the attribute conditionStatus will be TRUE. - Each assertion is a pointer to a Boolean parameter or a logical - expression of attribute existence or attribute value comparison + Each assertion is a pointer to a Boolean parameter or a logical + expression of attribute existence or attribute value comparison ('equal to X, less than Y' etc.). An empty string is not allowed."; } - + list processMonitor { config false; min-elements 1; max-elements 1; key idx; - leaf idx { type string; } + leaf idx { type string; } description "Indicates the process of the ManagementDataCollection MOI."; } - + leaf consolidateOutput { type boolean; mandatory true; yext3gpp:inVariant; - description "Indicates whether the management data collection output will + description "Indicates whether the management data collection output will be consolidated into a single file per reporting period."; } - + leaf jobId { type string; yext3gpp:inVariant; @@ -354,15 +354,15 @@ module _3gpp-common-managementdatacollection { description "This IOC represents a management data collection request job. The requested data is of kind Trace, MDT (Minimization of Drive Test), RLF (Radio Link Failure) report, RCEF (RRC Connection - Establishment Failure) report, RRC report, + Establishment Failure) report, RRC report, PM (performance measurements), KPI (end-to-end key performance indicators) or a combination of these. The attribute managementData defines the management data which shall be reported. This may either include a list of data categories or a list of management data identified with their name. For further details - see TS 28.622 clause 4.3.50. - + see TS 28.622 clause 4.3.50. + The targetNodeFilter attribute can be used to target object instance(s) producing the required management data. It is assumed that the consumer may not have detailed knowledge @@ -376,71 +376,71 @@ module _3gpp-common-managementdatacollection { To activate the production of the requested data, a MnS consumer has to create a ManagementDataCollection object instance on the MnS producer. - The attribute jobId is used to identify a management data collection + The attribute jobId is used to identify a management data collection request. - - The production and reporting of the management data can be constrained - by conditions such that only when the conditions are satisfied shall - management data collection be enabled. For example, a MnS consumer can - request to create two ManagementDataCollection instances. One can be - configured with high data producing and reporting period on a set of - conditions (e.g, to reduce transmission cost when network performance - metric is in normal range). Another can be configured with low data - producing and reporting period on another set of conditions (e.g. to - enable network optimization when network performance metric is in + + The production and reporting of the management data can be constrained + by conditions such that only when the conditions are satisfied shall + management data collection be enabled. For example, a MnS consumer can + request to create two ManagementDataCollection instances. One can be + configured with high data producing and reporting period on a set of + conditions (e.g, to reduce transmission cost when network performance + metric is in normal range). Another can be configured with low data + producing and reporting period on another set of conditions (e.g. to + enable network optimization when network performance metric is in abnormal range). - The MnS producer may derive multiple jobs (PerfMetricJob, TraceJob) - from a single ManagementDataCollection job for collecting the required - management data. The jobId of the request is used to identify the - output. The value is also used to correlate the derived jobs which + The MnS producer may derive multiple jobs (PerfMetricJob, TraceJob) + from a single ManagementDataCollection job for collecting the required + management data. The jobId of the request is used to identify the + output. The value is also used to correlate the derived jobs which will have the same jobId value as the ManagementDataCollection. - If the MnS producer receives the collected data from multiple sources, - it will consolidate the data into a set of management data for + If the MnS producer receives the collected data from multiple sources, + it will consolidate the data into a set of management data for reporting based on the value of the attribute consolidateOutput. - For consolidation of file-based management data the attribute + For consolidation of file-based management data the attribute consolidateOutput controls: - - True: the MnS Producer will combine the file output from jobs used - to collect the required management data into a single output file as + - True: the MnS Producer will combine the file output from jobs used + to collect the required management data into a single output file as follows: - File is in compressed format, i.e. zip. - File shall contain individual output files from each configured job - Each file retains its original filename - Each file retains it original content - - Consolidated filename uses naming convention defined in, + - Consolidated filename uses naming convention defined in, TS 28.532 clause 11.3.2.1.4 with the following: - - is a combination of the management data types included in + - is a combination of the management data types included in the consolidated output - - is omitted + - is omitted - False: the MnS Producer will not combine the output from jobs used to collect the required management data. The MnS Consumer will receive separate output from the derived jobs. - Subject to the reporting method, the MnS Consumer may receive file - related notifications. When consolidated output is selected the - MnS Producer will create file notifications for the consolidated files. - When consolidated output is not selected, the MnS Producer will create - the notification subscriptions on behalf of the MnS Consumer and the + Subject to the reporting method, the MnS Consumer may receive file + related notifications. When consolidated output is selected the + MnS Producer will create file notifications for the consolidated files. + When consolidated output is not selected, the MnS Producer will create + the notification subscriptions on behalf of the MnS Consumer and the MnS Consumer will receive notifications directly from the derived jobs. - The attribute collectionTimeWindow specifies the time window for which - the management data should be reported. The attributes startTime and + The attribute collectionTimeWindow specifies the time window for which + the management data should be reported. The attributes startTime and the endTime can be in the past, present or in the future. - The attribute reportingCtrl specifies the method and associated control - parameters for reporting the produced management data to MnS consumers. - Three methods are available: file-based reporting with selection of the - file location by the MnS producer, file-based reporting with selection + The attribute reportingCtrl specifies the method and associated control + parameters for reporting the produced management data to MnS consumers. + Three methods are available: file-based reporting with selection of the + file location by the MnS producer, file-based reporting with selection of the file location by the MnS consumer and stream-based reporting. - The attribute dataScope configures, whether the management data should + The attribute dataScope configures, whether the management data should be reported per S-NSSAI or per 5QI or per PLMN, if applicable. - The attribute processMonitor allows the MnS consumer to monitor the - status of the management data collection represented by the object + The attribute processMonitor allows the MnS consumer to monitor the + status of the management data collection represented by the object ManagementDataCollection. - The MnS producer indicates in the attribute progressStateInfo the + The MnS producer indicates in the attribute progressStateInfo the state of the management data collection: - NOT_STARTED - RUNNING diff --git a/yang-models/_3gpp-common-measurements.yang b/yang-models/_3gpp-common-measurements.yang index 2c23d8b18..400c30014 100755 --- a/yang-models/_3gpp-common-measurements.yang +++ b/yang-models/_3gpp-common-measurements.yang @@ -7,7 +7,7 @@ module _3gpp-common-measurements { import _3gpp-common-yang-types { prefix types3gpp; } import _3gpp-common-yang-extensions { prefix yext3gpp; } import _3gpp-common-files { prefix files3gpp; } - + organization "3GPP SA5"; contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464"; @@ -43,8 +43,8 @@ module _3gpp-common-measurements { Measurements can be contained under ManagedElement, SubNetwork, or any list representing a class inheriting from Subnetwork or - ManagedFunction. - Copyright 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + ManagedFunction. + Copyright 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved."; reference "3GPP TS 28.623 Generic Network Resource Model (NRM) @@ -59,12 +59,12 @@ module _3gpp-common-measurements { revision 2025-08-01 { reference CR-0551; } revision 2025-05-19 { reference CR-0532; } revision 2025-02-07 { reference CR-0461; } - revision 2025-01-29 { reference CR-0512; } - revision 2024-11-01 { reference CR-0488; } + revision 2025-01-29 { reference CR-0512; } + revision 2024-11-01 { reference CR-0488; } revision 2024-05-06 { reference CR-0359; } - revision 2024-02-24 { reference CR-0346; } + revision 2024-02-24 { reference CR-0346; } revision 2023-11-18 { reference "CR-0299 CR-0305"; } - revision 2023-09-18 { reference CR-0271; } + revision 2023-09-18 { reference CR-0271; } revision 2023-04-26 { reference CR-0250; } revision 2023-02-18 { reference "CR-0240"; } revision 2023-02-14 { reference "CR-0234"; } @@ -92,15 +92,15 @@ module _3gpp-common-measurements { type string; min-elements 1; description "List of performance metrics. - Performance metrics include measurements defined in TS 28.552 and KPIs - defined in TS 28.554 [28]. Performance metrics can also be specified - by other SDOs, or be vendor specific. Performance metrics are + Performance metrics include measurements defined in TS 28.552 and KPIs + defined in TS 28.554 [28]. Performance metrics can also be specified + by other SDOs, or be vendor specific. Performance metrics are identified with their names. For measurements defined in TS 28.552 the name is constructed as the bullet e) of the measurement definition. - A name can also identify a vendor specific performance metric or a + A name can also identify a vendor specific performance metric or a group of vendor specific performance metrics."; } @@ -157,7 +157,7 @@ module _3gpp-common-measurements { range "0..max"; } } - must '. >= 0'; + must '. >= 0'; description "Hysteresis of a threshold. If this attribute is present the monitored performance metric is not compared against the threshold value as specified by the thresholdValue attribute but @@ -214,7 +214,7 @@ module _3gpp-common-measurements { range 1..max ; } units seconds; - description "Granularity periods supported for the associated + description "Granularity periods supported for the associated measurement types. The period is defined in seconds."; } @@ -232,7 +232,7 @@ module _3gpp-common-measurements { range 1..max ; } units seconds; - description "Reporting periods supported for the associated + description "Reporting periods supported for the associated measurement types. The period is defined in seconds."; } } @@ -304,12 +304,12 @@ module _3gpp-common-measurements { } } } - + leaf _linkToFiles { type string ; config false; mandatory true; - yext3gpp:notNotifyable ; + yext3gpp:notNotifyable ; description "Link to a 'Files' object."; yext3gpp:inVariant; } @@ -490,7 +490,7 @@ module _3gpp-common-measurements { A threshold monitor checks for threshold crossings of performance metric values and generates a notification when that happens. - The ThresholdMonitor shall be used only when NRM based threshold + The ThresholdMonitor shall be used only when NRM based threshold monitoring is supported. To activate threshold monitoring, a MnS consumer needs to create a @@ -524,7 +524,7 @@ module _3gpp-common-measurements { Multiple thresholds can be defined for multiple performance metric sets in a single monitor using thresholdInfoList. The attribute monitorGranularityPeriod defines the granularity period to be applied. - The value is a supported GP for the measurements being monitored. + The value is a supported GP for the measurements being monitored. Threshold crossing behaviour is as defined in [54], Annex F. Each threshold is identified with a number (key) called thresholdLevel. diff --git a/yang-models/_3gpp-common-mecontext.yang b/yang-models/_3gpp-common-mecontext.yang index 9f5dceae0..00bbeb7da 100644 --- a/yang-models/_3gpp-common-mecontext.yang +++ b/yang-models/_3gpp-common-mecontext.yang @@ -25,7 +25,7 @@ module _3gpp-common-mecontext { Integration Reference Point (IRP); Information Service (IS)"; - revision 2025-03-25 { reference "CR-00525"; } + revision 2025-03-25 { reference "CR-00525"; } revision 2025-03-24 { reference "CR-0517 CR-0516"; } revision 2024-07-17 { reference "CR-0381 CR-0382 CR-0383"; } @@ -34,7 +34,7 @@ module _3gpp-common-mecontext { leaf dnPrefix { type types3gpp:DistinguishedName; - yext3gpp:inVariant; + yext3gpp:inVariant; description "It carries the DN Prefix information or no information. The instance of MeContext is the local root instance of the MIB. Otherwise the attribute shall be absent or carry no information."; diff --git a/yang-models/_3gpp-common-mnsagent.yang b/yang-models/_3gpp-common-mnsagent.yang index 4cbddecca..3fc127ac2 100644 --- a/yang-models/_3gpp-common-mnsagent.yang +++ b/yang-models/_3gpp-common-mnsagent.yang @@ -1,9 +1,9 @@ module _3gpp-common-mnsagent { - yang-version 1.1; + yang-version 1.1; namespace urn:3gpp:sa5:_3gpp-common-mnsagent; prefix "magent3gpp"; - - import _3gpp-common-top { prefix top3gpp; } + + import _3gpp-common-top { prefix top3gpp; } import _3gpp-common-yang-types { prefix types3gpp ; } import _3gpp-common-managed-element { prefix me3gpp ; } import _3gpp-common-subnetwork { prefix subnet3gpp ; } @@ -13,67 +13,67 @@ module _3gpp-common-mnsagent { contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464"; description "Defines MnsAgent IOCs - Copyright 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + Copyright 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved."; reference "3GPP TS 28.623 Generic Network Resource Model (NRM) Integration Reference Point (IRP); Solution Set (SS) definitions - + 3GPP TS 28.622 Generic Network Resource Model (NRM) Integration Reference Point (IRP); Information Service (IS) - - 3GPP TS 28.620 + + 3GPP TS 28.620 Umbrella Information Model (UIM)"; - revision 2023-09-18 { reference CR-0271 ; } + revision 2023-09-18 { reference CR-0271 ; } revision 2023-02-14 { reference "CR-0234"; } - + feature MnsAgentUnderManagedElement { description "MnsAgent shall be contained under ManagedElement."; - } + } feature MnsAgentUnderSubNetwork { description "MnsAgent shall be contained under SubNetwork."; - } + } feature MnsAgentUnderManagementNode { description "MnsAgent shall be contained under ManagementNode."; - } + } grouping MnsAgentGrp { description "Represents the MnsAgentGrp IOC."; - + leaf systemDN { type types3gpp:DistinguishedName; config false; description "Distinguished Name (DN) of a IRPAgent or a MnSAgent."; } } - + grouping MnsAgentSubtree { list MnsAgent { - description "The MnsAgent represents the MnS producers, incl. the - supporting hardware and software, available for a certain management + description "The MnsAgent represents the MnS producers, incl. the + supporting hardware and software, available for a certain management scope that is related to the object name-containing the MnS Agent. The MnSAgent can be name-contained under an IOC as follows: 1) ManagementNode; 2) SubNetwork, if the SubNetwork does not contain a ManagementNode; 3) ManagedElement, if it is the root element. - In case the MnsAgent is name-contained under a ManagementNode, the - management scope is the complete management scope of the + In case the MnsAgent is name-contained under a ManagementNode, the + management scope is the complete management scope of the ManagementNode or a subset thereof. - In case the MnsAgent is name-contained under a SubNetwork, the + In case the MnsAgent is name-contained under a SubNetwork, the management scope is the complete SubNetwork or a subset thereof. - In case the MnsAgent is name-contained under a ManagedElement, the + In case the MnsAgent is name-contained under a ManagedElement, the management scope is the complete ManagedElement or a subset thereof."; - key id; + key id; uses top3gpp:Top_Grp; container attributes { uses MnsAgentGrp; - } + } } } diff --git a/yang-models/_3gpp-common-mnsregistry.yang b/yang-models/_3gpp-common-mnsregistry.yang index a3464b212..29bd57ebb 100755 --- a/yang-models/_3gpp-common-mnsregistry.yang +++ b/yang-models/_3gpp-common-mnsregistry.yang @@ -11,15 +11,15 @@ module _3gpp-common-mnsregistry { organization "3GPP SA5"; contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464"; - description "Defines the YANG mapping of the MNSRegistry IOC and its + description "Defines the YANG mapping of the MNSRegistry IOC and its contained classes that ares part of the Generic Network Resource Model (NRM). - Copyright 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + Copyright 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved."; reference "3GPP TS 28.623 Generic Network Resource Model (NRM)"; revision 2025-07-19 { reference CR-0551; } revision 2023-09-30 { reference CR-0278; } - revision 2023-09-18 { reference CR-0271 ; } + revision 2023-09-18 { reference CR-0271 ; } revision 2023-05-10 { reference CR-0243; } revision 2023-02-14 { reference CR-0234; } revision 2021-11-23 { reference "S5-216090"; } @@ -28,27 +28,27 @@ module _3gpp-common-mnsregistry { grouping MgmtDataInfoGrp { description "Represents the MgmtDataInfo IOC."; - + uses mgtdatcol3gpp:ManagementDataGrp { description "Defines the list of management data that can be supported. The management data is a choice between: - a list of data categories (attribute mgtDataCategory) - - a list of management data identified with their name + - a list of management data identified with their name (attribute 'mgtDataName')."; } - + leaf-list supportedGranularityPeriods { type int32; units seconds; - description "Granularity periods supported for the production of + description "Granularity periods supported for the production of associated management data. The period is defined in seconds."; } leaf-list supportedReportingPeriods { type uint32; units seconds; - description "Reporting periods supported for the associated management + description "Reporting periods supported for the associated management data. The period is defined in seconds."; } @@ -57,7 +57,7 @@ module _3gpp-common-mnsregistry { units seconds; description "This attribute describes the maximum period of the requested historical data. The period is defined in seconds. - When the value of this attribute is NULL, which means the capability of + When the value of this attribute is NULL, which means the capability of querying historical data is not supported."; } @@ -67,86 +67,86 @@ module _3gpp-common-mnsregistry { enum STREAM; } min-elements 1; - description "List of supported reporting methods for the associated + description "List of supported reporting methods for the associated management data."; } leaf-list supportedDataScope { type enumeration { enum SNSSAI; - enum 5QI; + enum 5QI; enum PLMN; } min-elements 1; - description "List of supported sub counter capabilities for the associated + description "List of supported sub counter capabilities for the associated management data"; } leaf-list supportedDataRequestMnSRef { type types3gpp:DistinguishedName; min-elements 1; - description "List of DN of MnSInfo for the MnS instance(s) which can be + description "List of DN of MnSInfo for the MnS instance(s) which can be used to request the associated management data"; } leaf-list supportedDataReportingMnSRef { type types3gpp:DistinguishedName; min-elements 1; - description "List of DN of MnSInfo for the MnS instance(s) which can be + description "List of DN of MnSInfo for the MnS instance(s) which can be used to report the associated management data"; } - } - + } + grouping MnsScopeGrp { - description "This <> specifies the list of managed object instances - that can be accessed using the Management Service. These managed object + description "This <> specifies the list of managed object instances + that can be accessed using the Management Service. These managed object instances can be represented with one of the following options: - - A list of DNs, i.e. representing managed object instances identified - by the DN. + - A list of DNs, i.e. representing managed object instances identified + by the DN. - - A list of GeoAreas, i.e. representing managed object instances covered - by the specified geographical areas. In the present document, the - geoAreasList is only used for MnS consumer to retrieve MnS + - A list of GeoAreas, i.e. representing managed object instances covered + by the specified geographical areas. In the present document, the + geoAreasList is only used for MnS consumer to retrieve MnS scope of the specified MnS instance. - - A list of TAIs, i.e. representing managed object instances covered + - A list of TAIs, i.e. representing managed object instances covered by the specified TAIs."; - + choice MnsScope { mandatory true; leaf-list objectInstanceList { type types3gpp:DistinguishedName; yext3gpp:inVariant; yext3gpp:notNotifyable; - description "This attribute describes list of DNs for the managed - object instances that can be accessed using the Management Service. - If a complete SubNetwork can be accessed using the Management Service, - this attribute may contain the DN of the SubNetwork instead of the + description "This attribute describes list of DNs for the managed + object instances that can be accessed using the Management Service. + If a complete SubNetwork can be accessed using the Management Service, + this attribute may contain the DN of the SubNetwork instead of the DNs of the individual managed entities within the SubNetwork. - If a complete ManagedElement can be accessed using the Management - Service, this attribute may contain the DN of the ManagedElement - instead of the DNs of the individual managed entities within the + If a complete ManagedElement can be accessed using the Management + Service, this attribute may contain the DN of the ManagedElement + instead of the DNs of the individual managed entities within the ManagedElement."; } - + list geoAreasList { yext3gpp:inVariant; yext3gpp:notNotifyable; - description "This attribute describes geographical areas for the - managed object instances that can be accessed using the Management + description "This attribute describes geographical areas for the + managed object instances that can be accessed using the Management Service."; key idx; leaf idx { type uint32; } uses types3gpp:GeoAreaGrp; } - + list taiList { yext3gpp:inVariant; yext3gpp:notNotifyable; - description "This attribute describes the list of Tracking Area - Identities (TAI) for the managed object instances that can be accessed + description "This attribute describes the list of Tracking Area + Identities (TAI) for the managed object instances that can be accessed using the Management Service."; key idx; leaf idx { type uint32; } @@ -154,7 +154,7 @@ module _3gpp-common-mnsregistry { } } } - + grouping MnsInfoGrp { description "Represents the MnsInfo IOC."; leaf mnsLabel { @@ -162,7 +162,7 @@ module _3gpp-common-mnsregistry { mandatory true; type string; } - + leaf mnsType { description "Type of management service."; type enumeration { @@ -172,17 +172,17 @@ module _3gpp-common-mnsregistry { enum FileDataReportingMnS; } } - + leaf mnsVersion { description "Version of management service."; type string; - } - + } + leaf mnsAddress { description "Addressing information for Management Service operations."; mandatory true; type string; - } + } leaf-list mnsCapability { type union { @@ -218,42 +218,42 @@ module _3gpp-common-mnsregistry { } type string; } - description "It describes the types of management capabilities of the - MnS instance provided by the MnS producer. The detailed description for + description "It describes the types of management capabilities of the + MnS instance provided by the MnS producer. The detailed description for above enum values see Annex F in TS 28.533. - Note: vendor extension values are allowed for the attribute + Note: vendor extension values are allowed for the attribute 'mnsCapability'"; } - + list mnsScope { - description "This attribute defines the information about the - management scope of the Management Service. The management scope is - used to represent the set of managed object instances that can be + description "This attribute defines the information about the + management scope of the Management Service. The management scope is + used to represent the set of managed object instances that can be accessed using the Management Service."; min-elements 1; key idx; leaf idx { type uint32; } uses MnsScopeGrp; } - + leaf-list mgmtDataInfoRef { type types3gpp:DistinguishedName; yext3gpp:notNotifyable; min-elements 1; - description "List of DN of MgmtDataInfo instance(s) which are associated + description "List of DN of MgmtDataInfo instance(s) which are associated the MnSInfo which represent a management service instance"; - + } } - + grouping MnsRegistryGrp { description "Currently no own attributes defined."; - } - + } + augment "/subnet3gpp:SubNetwork" { list MnsRegistry { - description "This IOC is a container for MnsInfo IOC-s. It can be - contained only by SubNetwork IOC. A SubNetwork IOC can contain + description "This IOC is a container for MnsInfo IOC-s. It can be + contained only by SubNetwork IOC. A SubNetwork IOC can contain only one instance of MnsRegistry. The IOC is instantiated by the system."; key id; @@ -262,7 +262,7 @@ module _3gpp-common-mnsregistry { container attributes { uses MnsRegistryGrp; } - + list MnsInfo { description "This IOC represents an available Management Service (MnS) and provides the data required to support its discovery. @@ -278,9 +278,9 @@ module _3gpp-common-mnsregistry { Attribute mnsAddress is used to provide addressing information for the Management Service operations. - Attribute mnsScope is used to provide information about the - management scope of the Management Service. The management scope - is used to represent the set of managed object instances that can + Attribute mnsScope is used to provide information about the + management scope of the Management Service. The management scope + is used to represent the set of managed object instances that can be accessed using the Management Service."; key id; @@ -289,13 +289,13 @@ module _3gpp-common-mnsregistry { uses MnsInfoGrp; } } - + list MgmtDataInfo { - description "Describes the management capabilities for a set of - management data, which can be used for management data discovery. + description "Describes the management capabilities for a set of + management data, which can be used for management data discovery. MgmtDataInfo is contained by MnSRegistry and associated to MnSInfo. - Multiple MgmtDataInfo instances maybe created for different sets of + Multiple MgmtDataInfo instances maybe created for different sets of management data, it is MnS producer’s decision."; key id; @@ -304,7 +304,7 @@ module _3gpp-common-mnsregistry { uses MgmtDataInfoGrp; } } - + } } } \ No newline at end of file diff --git a/yang-models/_3gpp-common-qmcjob.yang b/yang-models/_3gpp-common-qmcjob.yang index 9d58855f5..f25bf8712 100644 --- a/yang-models/_3gpp-common-qmcjob.yang +++ b/yang-models/_3gpp-common-qmcjob.yang @@ -15,7 +15,7 @@ module _3gpp-common-qmcjob { organization "3GPP SA5"; contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464"; description "Quality of Experience Measurement Collection Job handling - Copyright 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + Copyright 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved."; reference "3GPP TS 28.623 Generic Network Resource Model (NRM) @@ -29,15 +29,15 @@ module _3gpp-common-qmcjob { revision 2025-02-06 { reference CR-0508; } revision 2024-11-05 { reference CR-0480; } - revision 2024-04-04 { reference CR-0334; } - revision 2023-09-18 { reference CR-0271 ; } + revision 2024-04-04 { reference CR-0334; } + revision 2023-09-18 { reference CR-0271 ; } revision 2023-02-14 { reference "CR-0234"; } revision 2022-11-04 { reference "CR-0215"; } revision 2022-08-17 { reference "CR-0185"; } revision 2022-04-29 { reference "CR-0171"; } revision 2022-03-22 { reference "draftCR"; } revision 2022-01-06 { reference "CR-0142"; } - + grouping QMCJobGrp { leaf serviceType { description "Specifies an end user service type for QoE measurements."; @@ -53,8 +53,8 @@ module _3gpp-common-qmcjob { key "idx"; leaf idx { type uint32 ; } description "It defines the area scope of QoE, which is specified - in clause 5.4 of TS 28.405."; - uses trace3gpp:AreaScopeGrp; + in clause 5.4 of TS 28.405."; + uses trace3gpp:AreaScopeGrp; } leaf qoECollectionEntityAddress { @@ -66,12 +66,12 @@ module _3gpp-common-qmcjob { list pLMNTarget { max-elements 1; - description "Defines the PLMN for which sessions shall be selected in - the network request session in case of area based QMC when several - PLMNs are supported in the RAN (this means that shared cells and not - shared cells are allowed for the specified PLMN. Furthermore, several - PLMNs can be used for not shared RAN cases as well as for shared RAN - cases.). Only the sessions may be selected where the PLMN that the + description "Defines the PLMN for which sessions shall be selected in + the network request session in case of area based QMC when several + PLMNs are supported in the RAN (this means that shared cells and not + shared cells are allowed for the specified PLMN. Furthermore, several + PLMNs can be used for not shared RAN cases as well as for shared RAN + cases.). Only the sessions may be selected where the PLMN that the UE reports as selected PLMN is the same as the PLMN Target."; uses types3gpp:PLMNId; key "mcc mnc"; @@ -79,8 +79,8 @@ module _3gpp-common-qmcjob { leaf qoETarget { type string; - description "Specifies the target object of the QMC in case of - signalling based QMC. The qoETarget attribute shall be able + description "Specifies the target object of the QMC in case of + signalling based QMC. The qoETarget attribute shall be able to carry IMSI or SUPI."; mandatory true; } @@ -88,26 +88,26 @@ module _3gpp-common-qmcjob { leaf qoEReference { type string; mandatory true; - description "Identifies the QoE measurement collection job in the + description "Identifies the QoE measurement collection job in the Managed Elements and in the measurement collection entity. The QoE reference shall be globally unique therefore it is composed as follows: - MCC+MNC+QMC ID, where the MCC and MNC are coming with the QMC - activation request from the management system to identify one PLMN - containing the management system, and QMC ID is a 3 byte Octet String. + MCC+MNC+QMC ID, where the MCC and MNC are coming with the QMC + activation request from the management system to identify one PLMN + containing the management system, and QMC ID is a 3 byte Octet String. The QMC ID is generated by the management system or the operator."; } leaf jobId { type string; yext3gpp:inVariant; - description "The jobId attribute presents the job identifier of a - QMCJob instance. The jobId can be used to associate multiple QMCJob - instances. For example, it is possible to configure the same jobId - for multiple QMCJob instances required to produce the data - (e.g. Streaming services and MTSI reports) for a specific network + description "The jobId attribute presents the job identifier of a + QMCJob instance. The jobId can be used to associate multiple QMCJob + instances. For example, it is possible to configure the same jobId + for multiple QMCJob instances required to produce the data + (e.g. Streaming services and MTSI reports) for a specific network analysis."; } - + list sliceScope { description "Contains a list of S-NSSAIs (Single Network Slice Selection Assistance Information). A Network Slice end to end is identified by @@ -118,7 +118,7 @@ module _3gpp-common-qmcjob { leaf qMCConfigFile { type string; - description "Provides a reference to a file including the parameters for + description "Provides a reference to a file including the parameters for configuration of application layer measurements, known as Container for Application Layer Measurement Configuration."; mandatory true; @@ -136,7 +136,7 @@ module _3gpp-common-qmcjob { uses trace3gpp:TraceReferenceGrp ; } - + leaf-list availableRANqoEMetrics { type enumeration { enum APP_LAYER_BUFFER_LEVEL_LIST; @@ -152,52 +152,52 @@ module _3gpp-common-qmcjob { enum BROADCAST; enum MULTICAST; } - description "This attribute indicates which type of MBS communication + description "This attribute indicates which type of MBS communication service the QoE measurement configuration pertains to."; } } - + grouping QMCJobSubTree { description "Helps with augmenting QMCJob into multple places."; list QMCJob { - description "The QoE Measurement Collection provides capability for + description "The QoE Measurement Collection provides capability for collecting QoE information from: - - UEs which are in the specified area in case of Management Based - Activation or + - UEs which are in the specified area in case of Management Based + Activation or - an individual UE in case of Signalling Based Activation. - The QoE Measurement Collection enables collection of application layer - measurements from the UE for specified end user service type. + The QoE Measurement Collection enables collection of application layer + measurements from the UE for specified end user service type. The supported service types are: - - Streaming services, see TS 26.247 - - MTSI services, see TS 26.114 - - VR services, see TS 26.118 - A QMCJob instance represents the job for collecting QoE measurements - according to the job parameters. For details of the QoE measurement - collection configuration parameters see clause 5 of TS 28.405. - QMCJob instance can be name-contained by SubNetwork or ManagedElement. - A QMC Job is activated by creating a QMCJob object instance in the - producer. For details of Management Based Activation of QoE Measurement - Collection see clause 4.5 and for details of Signalling Based - Activation of QoE Measurement Collection see clause 4.6 of TS 28.405. - The attribute pLMNTarget is only relevant when - Management Based Activation is used and the attribute qoETarget is - only relevant when Signalling Based Activation is used. All other - attributes are common for both Management Based Activation and + - Streaming services, see TS 26.247 + - MTSI services, see TS 26.114 + - VR services, see TS 26.118 + A QMCJob instance represents the job for collecting QoE measurements + according to the job parameters. For details of the QoE measurement + collection configuration parameters see clause 5 of TS 28.405. + QMCJob instance can be name-contained by SubNetwork or ManagedElement. + A QMC Job is activated by creating a QMCJob object instance in the + producer. For details of Management Based Activation of QoE Measurement + Collection see clause 4.5 and for details of Signalling Based + Activation of QoE Measurement Collection see clause 4.6 of TS 28.405. + The attribute pLMNTarget is only relevant when + Management Based Activation is used and the attribute qoETarget is + only relevant when Signalling Based Activation is used. All other + attributes are common for both Management Based Activation and Signalling Based Activation. - The areaScope attribute defines the area scope of QoE, which is + The areaScope attribute defines the area scope of QoE, which is specified in clause 5.4 of TS 28.405. - When a MnS consumer wishes to deactivate a QMC Job, the MnS consumer - shall delete the corresponding QMCJob instance. - NOTE: If the reporting is ongoing, when a request to delete a QMCJob - is received, the reporting does not end. The QMCJob instance is deleted, + When a MnS consumer wishes to deactivate a QMC Job, the MnS consumer + shall delete the corresponding QMCJob instance. + NOTE: If the reporting is ongoing, when a request to delete a QMCJob + is received, the reporting does not end. The QMCJob instance is deleted, when the last reporting for the QMC Job expires. - The jobId attribute presents the job identifier of a QMCJob instance. - jobId can be used to associate multiple QMCJob instances. For example, - it is possible to configure the same jobId value for multiple QMCJob - instances required to produce the data (e.g. Streaming services and + The jobId attribute presents the job identifier of a QMCJob instance. + jobId can be used to associate multiple QMCJob instances. For example, + it is possible to configure the same jobId value for multiple QMCJob + instances required to produce the data (e.g. Streaming services and MTSI reports) for a specific network analysis."; key id; uses top3gpp:Top_Grp; @@ -206,7 +206,7 @@ module _3gpp-common-qmcjob { } } } - + augment "/subnet3gpp:SubNetwork" { uses QMCJobSubTree; } diff --git a/yang-models/_3gpp-common-sectorequipmentfunction.yang b/yang-models/_3gpp-common-sectorequipmentfunction.yang index 985e77639..bb18f41c7 100644 --- a/yang-models/_3gpp-common-sectorequipmentfunction.yang +++ b/yang-models/_3gpp-common-sectorequipmentfunction.yang @@ -1,88 +1,88 @@ -module _3gpp-common-sectorequipmentfunction { - yang-version 1.1; - namespace "urn:3gpp:sa5:_3gpp-common-sectorequipmentfunction"; - prefix "scteqpfun3gpp"; - - import _3gpp-common-yang-types { prefix types3gpp; } - import _3gpp-common-managed-function { prefix mf3gpp; } - import _3gpp-common-managed-element { prefix me3gpp; } - import _3gpp-common-top { prefix top3gpp; } - - organization "3GPP SA5"; - contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464"; - description "Defines the YANG mapping of the Sector Equipment Function - Information Object Class (IOC) that is part of the Generic Network Resource - Model (NRM). - Copyright 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, - TTA, TTC). All rights reserved."; - reference "3GPP TS 28.662 Generic Network Resource Model (NRM)"; - - revision 2025-05-01 { description "Initial revision"; } - - grouping SectorEquipmentFunctionGrp { - description "Represents the SectorEquipmentFunction."; - uses mf3gpp:ManagedFunctionGrp; - - leaf confOutputPower { - description "It defines the allowed total power to use for all - cells together in this sector. - It may be set by the operator and/or limited by HW limitation - or licensed power, e.g.: 20, 40, 60, 80,120 watts"; - type uint32; - } - - leaf-list fqBandList { - description "The list of frequency bands/ranges supported by the - hardware associated with the SectorEquipmentFunction. The - earfcnDl and earfcnUl or earfcn of cells associated with the - SectorEquipmentFunction must be assigned one of the specified - frequency range values within the supported range. - - Valid frequency bands/ranges may be found in 3GPP TS 25.104 (UTRA), - 36.104 (E-UTRA) and 38.104 (NR). - - AllowedValues: - Operating band id or supported frequency tuple - expressed as a string. - - Examples for NR: - Bands: {'n1', 'n12'} - Frequencies: {'1920–1980, 2110–2170, FDD', '699–716, 729–746, FDD'}"; - config false; - type string; - } - - leaf-list referencedBy { - description "This attribute contains the DNs of one or more objects - that refer to this object. - - In the case of SectorEquipmentFunction , these referring objects - may include Cells, NRSectorCarriers if associations between them - and the SectorEquipmentFunction exist. - - Note: referencedBy is a DN datatype and so can reference an MOI - under a different ME"; - config false; - type types3gpp:DistinguishedName; - } - } - - augment "/me3gpp:ManagedElement" { - list SectorEquipmentFunction { - key id; - uses top3gpp:Top_Grp; - description "This IOC represents a set of cells within a geographical - area that has common functions relating to AntennaFunction, TMAFunction - and supporting equipment, such as power amplifier."; - - must 'id != ""' { - error-message "Empty id value is not allowed."; - } - - container attributes { - uses SectorEquipmentFunctionGrp; - } - uses mf3gpp:ManagedFunctionContainedClasses; - } -} +module _3gpp-common-sectorequipmentfunction { + yang-version 1.1; + namespace "urn:3gpp:sa5:_3gpp-common-sectorequipmentfunction"; + prefix "scteqpfun3gpp"; + + import _3gpp-common-yang-types { prefix types3gpp; } + import _3gpp-common-managed-function { prefix mf3gpp; } + import _3gpp-common-managed-element { prefix me3gpp; } + import _3gpp-common-top { prefix top3gpp; } + + organization "3GPP SA5"; + contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464"; + description "Defines the YANG mapping of the Sector Equipment Function + Information Object Class (IOC) that is part of the Generic Network Resource + Model (NRM). + Copyright 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + TTA, TTC). All rights reserved."; + reference "3GPP TS 28.662 Generic Network Resource Model (NRM)"; + + revision 2025-05-01 { description "Initial revision"; } + + grouping SectorEquipmentFunctionGrp { + description "Represents the SectorEquipmentFunction."; + uses mf3gpp:ManagedFunctionGrp; + + leaf confOutputPower { + description "It defines the allowed total power to use for all + cells together in this sector. + It may be set by the operator and/or limited by HW limitation + or licensed power, e.g.: 20, 40, 60, 80,120 watts"; + type uint32; + } + + leaf-list fqBandList { + description "The list of frequency bands/ranges supported by the + hardware associated with the SectorEquipmentFunction. The + earfcnDl and earfcnUl or earfcn of cells associated with the + SectorEquipmentFunction must be assigned one of the specified + frequency range values within the supported range. + + Valid frequency bands/ranges may be found in 3GPP TS 25.104 (UTRA), + 36.104 (E-UTRA) and 38.104 (NR). + + AllowedValues: + Operating band id or supported frequency tuple + expressed as a string. + + Examples for NR: + Bands: {'n1', 'n12'} + Frequencies: {'1920–1980, 2110–2170, FDD', '699–716, 729–746, FDD'}"; + config false; + type string; + } + + leaf-list referencedBy { + description "This attribute contains the DNs of one or more objects + that refer to this object. + + In the case of SectorEquipmentFunction , these referring objects + may include Cells, NRSectorCarriers if associations between them + and the SectorEquipmentFunction exist. + + Note: referencedBy is a DN datatype and so can reference an MOI + under a different ME"; + config false; + type types3gpp:DistinguishedName; + } + } + + augment "/me3gpp:ManagedElement" { + list SectorEquipmentFunction { + key id; + uses top3gpp:Top_Grp; + description "This IOC represents a set of cells within a geographical + area that has common functions relating to AntennaFunction, TMAFunction + and supporting equipment, such as power amplifier."; + + must 'id != ""' { + error-message "Empty id value is not allowed."; + } + + container attributes { + uses SectorEquipmentFunctionGrp; + } + uses mf3gpp:ManagedFunctionContainedClasses; + } +} } \ No newline at end of file diff --git a/yang-models/_3gpp-common-subnetwork.yang b/yang-models/_3gpp-common-subnetwork.yang index c94f40638..5a8759900 100755 --- a/yang-models/_3gpp-common-subnetwork.yang +++ b/yang-models/_3gpp-common-subnetwork.yang @@ -2,7 +2,7 @@ module _3gpp-common-subnetwork { yang-version 1.1; namespace "urn:3gpp:sa5:_3gpp-common-subnetwork"; prefix "subnet3gpp"; - + import _3gpp-common-yang-types { prefix types3gpp; } import _3gpp-common-yang-extensions { prefix yext3gpp ; } import _3gpp-common-top { prefix top3gpp; } @@ -20,43 +20,43 @@ module _3gpp-common-subnetwork { organization "3GPP SA5"; contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464"; - + description "Defines basic SubNetwork which will be augmented by other IOCs - Copyright 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + Copyright 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved."; reference "3GPP TS 28.623 Generic Network Resource Model (NRM) Integration Reference Point (IRP); Solution Set (SS) definitions - + 3GPP TS 28.622 Generic Network Resource Model (NRM) Integration Reference Point (IRP); Information Service (IS) - - 3GPP TS 28.620 + + 3GPP TS 28.620 Umbrella Information Model (UIM)"; - - revision 2025-04-25 { reference "CR-0532 CR0541" ; } - revision 2025-03-25 { reference "CR-0516 CR-0527"; } - revision 2024-11-19 { reference "Add STM"; } - revision 2024-01-30 { reference CR-1337 ; } - revision 2024-01-30 { reference CR-0328 ; } - revision 2023-11-14 { reference CR-0305 ; } - revision 2023-09-18 { reference CR-0271 ; } + + revision 2025-04-25 { reference "CR-0532 CR0541" ; } + revision 2025-03-25 { reference "CR-0516 CR-0527"; } + revision 2024-11-19 { reference "Add STM"; } + revision 2024-01-30 { reference CR-1337 ; } + revision 2024-01-30 { reference CR-0328 ; } + revision 2023-11-14 { reference CR-0305 ; } + revision 2023-09-18 { reference CR-0271 ; } revision 2023-08-10 { reference CR-0257; } revision 2023-04-26 { reference CR-0250; } revision 2023-02-14 { reference CR-0234; } revision 2022-09-30 { reference CR-0191 ; } - revision 2021-01-16 { reference "CR-0120"; } - revision 2020-08-06 { reference "CR-0102"; } - revision 2020-06-08 { reference "CR-0092"; } + revision 2021-01-16 { reference "CR-0120"; } + revision 2020-08-06 { reference "CR-0102"; } + revision 2020-06-08 { reference "CR-0092"; } revision 2020-05-08 { reference "S5-203316"; } - - revision 2020-03-11 { + + revision 2020-03-11 { description "Added KPIs and corrections"; reference "S5-201365, S5-201581, SP-200229"; } @@ -88,15 +88,15 @@ module _3gpp-common-subnetwork { } feature ExternalsUnderSubNetwork { - description "Classes representing external entities like EUtranFrequency, - ExternalGNBCUCPFunction, ExternalENBFunction + description "Classes representing external entities like EUtranFrequency, + ExternalGNBCUCPFunction, ExternalENBFunction are contained under a Subnetwork list/class."; } - + feature MeasurementsUnderSubNetwork { description "The MeasurementSubtree shall be contained under SubNetwork"; } - + feature SubscriptionControlUnderSubNetwork { description "The SubscriptionControlSubtree shall be contained under SubNetwork"; @@ -110,39 +110,39 @@ module _3gpp-common-subnetwork { feature FmUnderSubNetwork { description "The FmSubtree shall be contained under SubNetwork"; } - + feature TraceUnderSubNetwork { description "The TraceSubtree shall be contained under SubNetwork"; } - + feature DESManagementFunction { description "Class representing Distributed SON or Domain-Centralized SON Energy Saving feature. The DESManagementFunction shall be contained under SubNetwork."; } - + feature DMROFunction { description "Class representing D-SON function of MRO feature. The DMROFunction shall be contained under SubNetwork."; } - + feature DRACHOptimizationFunction { description "Class representing D-SON function of RACH optimization feature. The DRACHOptimizationFunction shall be contained under SubNetwork."; } - + feature DPCIConfigurationFunction { description "Class representing Distributed SON or Domain-Centralized SON function of PCI configuration feature. The DPCIConfigurationFunction shall be contained under SubNetwork."; } - + feature CPCIConfigurationFunction { description "Class representing Cross Domain-Centralized SON function of PCI configuration feature. The CPCIConfigurationFunction shall be contained under SubNetwork."; } - + feature CESManagementFunction { description "Class representing Cross Domain-Centralized SON Energy Saving feature. The CESManagementFunction shall be contained under SubNetwork."; @@ -150,52 +150,52 @@ module _3gpp-common-subnetwork { feature StmCtrlUnderManagedSubNetwork { description "The StmCtrlSubtree shall be contained under SubNetwork"; - } - + } + feature MWABUnderSubNetwork { description "The MWAB shall be contained under SubNetwork"; } - + grouping Domain_Grp { - description "A domain is a partition of instances of managed entities - such that : - - the group represents a topological structure which describes the + description "A domain is a partition of instances of managed entities + such that : + - the group represents a topological structure which describes the potential for connectivity - Subject to common administration - With common characteristics"; - + leaf dnPrefix { type types3gpp:DistinguishedName; - yext3gpp:inVariant; + yext3gpp:inVariant; reference "Annex C of 32.300 "; } - + leaf userLabel { type string; description "A user-friendly (and user assignable) name of this object."; } - + leaf userDefinedNetworkType { type string; description "Textual information indicating network type, e.g. 'UTRAN'."; - } + } } grouping SubNetworkGrp { uses Domain_Grp; - + leaf-list setOfMcc { - description "Set of Mobile Country Code (MCC). - The MCC uniquely identifies the country of domicile + description "Set of Mobile Country Code (MCC). + The MCC uniquely identifies the country of domicile of the mobile subscriber. MCC is part of the IMSI (3GPP TS 23.003) - This list contains all the MCC values in subordinate object + This list contains all the MCC values in subordinate object instances to this SubNetwork instance. See clause 2.3 of 3GPP TS 23.003 for MCC allocation principles. - It shall be supported if there is more than one value in setOfMcc - of the SubNetwork. Otherwise the support is optional."; + It shall be supported if there is more than one value in setOfMcc + of the SubNetwork. Otherwise the support is optional."; type types3gpp:Mcc; } @@ -203,35 +203,35 @@ module _3gpp-common-subnetwork { mandatory true; type uint32; } - + uses meas3gpp:SupportedPerfMetricGroupGrp; leaf-list supportedTraceMetrics { type string; config false; - description "List of trace metrics. When this attribute is contained in - a managed object it defines the trace metrics supported for this + description "List of trace metrics. When this attribute is contained in + a managed object it defines the trace metrics supported for this object and all descendant objects. - Trace metrics include trace messages, MDT measurements - (Immediate MDT, Logged MDT, Logged MBSFN MDT), RLF and RCEF reports, - see TS 32.422. Trace metrics are identified with their metric - identifier. The metric identifier is constructed as defined + Trace metrics include trace messages, MDT measurements + (Immediate MDT, Logged MDT, Logged MBSFN MDT), RLF and RCEF reports, + see TS 32.422. Trace metrics are identified with their metric + identifier. The metric identifier is constructed as defined in clause 10 of TS 32.422."; } - } + } list SubNetwork { key id; description "Represents a set of managed entities - Contained ManagedElements and SubNetworks shall be connected via + Contained ManagedElements and SubNetworks shall be connected via YANG Schema-mount."; uses top3gpp:Top_Grp; - container attributes { + container attributes { uses SubNetworkGrp; } - + uses meas3gpp:MeasurementSubtree { if-feature MeasurementsUnderSubNetwork; } @@ -247,14 +247,14 @@ module _3gpp-common-subnetwork { uses fm3gpp:FmSubtree { if-feature FmUnderSubNetwork; } - + uses trace3gpp:TraceSubtree { if-feature TraceUnderSubNetwork; } uses files3gpp:FilesSubtree { if-feature FilesUnderSubNetwork; - } + } uses fiveqi3gpp:Configurable5QISetSubtree { if-feature Configurable5QISetUnderSubNetwork; @@ -270,9 +270,9 @@ module _3gpp-common-subnetwork { uses stm3gpp:StmCtrlSubTree { if-feature StmCtrlUnderManagedSubNetwork ; - } + } + - uses mwab3gpp:MWABSubTree { if-feature MWABUnderSubNetwork ; } diff --git a/yang-models/_3gpp-common-subscription-control.yang b/yang-models/_3gpp-common-subscription-control.yang index 471d19c54..689082218 100755 --- a/yang-models/_3gpp-common-subscription-control.yang +++ b/yang-models/_3gpp-common-subscription-control.yang @@ -2,58 +2,58 @@ module _3gpp-common-subscription-control { yang-version 1.1; namespace "urn:3gpp:sa5:_3gpp-common-subscription-control"; prefix "subscr3gpp"; - + import _3gpp-common-top { prefix top3gpp; } import _3gpp-common-yang-extensions { prefix yext3gpp; } import _3gpp-common-yang-types { prefix types3gpp; } import ietf-yang-types { prefix yang; } - + organization "3GPP SA5"; contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464"; - + description "Defines IOCs for subscription and heartbeat control. - Copyright 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + Copyright 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved."; reference "3GPP TS 28.623 Generic Network Resource Model (NRM) Integration Reference Point (IRP); Solution Set (SS) definitions 3GPP TS 28.623"; - + revision 2025-07-19 { reference CR-0551; } - revision 2025-05-13 { reference "CR-0548"; } - revision 2025-03-24 { reference "CR-0516 0518"; } - revision 2024-05-18 { reference CR-0359; } - revision 2024-01-18 { reference "CR-0309 CR-0329"; } - revision 2023-09-18 { reference CR-0271; } + revision 2025-05-13 { reference "CR-0548"; } + revision 2025-03-24 { reference "CR-0516 0518"; } + revision 2024-05-18 { reference CR-0359; } + revision 2024-01-18 { reference "CR-0309 CR-0329"; } + revision 2023-09-18 { reference CR-0271; } revision 2023-08-10 { reference "CR0257 CR0260"; } revision 2022-10-20 { reference CR-0196; } - revision 2021-01-16 { reference "CR-0120"; } + revision 2021-01-16 { reference "CR-0120"; } revision 2020-08-26 { reference "CR-0106"; } revision 2019-11-29 { reference "S5-197648 S5-197647 S5-197829 S5-197828"; } grouping ScopeGrp { - description "This <> allows to select data nodes in an object - tree whose root is identified by the so called base managed object - instance. The identification of the base object instance is not part of - this <> and needs to be specified by other means. The base - managed object instance is typically a managed object instance in an + description "This <> allows to select data nodes in an object + tree whose root is identified by the so called base managed object + instance. The identification of the base object instance is not part of + this <> and needs to be specified by other means. The base + managed object instance is typically a managed object instance in an object tree. - - The 'scopeType' and the 'scopeLevel' attributes allow to select managed - object instances. Attributes, attribute fields and attribute elements + + The 'scopeType' and the 'scopeLevel' attributes allow to select managed + object instances. Attributes, attribute fields and attribute elements cannot be selected. - The 'dataNodeSelector' attribute allows to select managed object - instances, attributes, attribute fields, attribute elements, or - attribute field elements. Its value contains a solution set specific + The 'dataNodeSelector' attribute allows to select managed object + instances, attributes, attribute fields, attribute elements, or + attribute field elements. Its value contains a solution set specific expression for specifying the data nodes to be selected."; choice scope { - description "Describes which object instances are selected with + description "Describes which object instances are selected with respect to a base object instance."; - + case type-level { - leaf scopeType { + leaf scopeType { type enumeration { enum BASE_ONLY; enum BASE_ALL; @@ -61,42 +61,42 @@ module _3gpp-common-subscription-control { enum BASE_SUBTREE; } mandatory true; - description "If the optional scopeLevel parameter is not supported + description "If the optional scopeLevel parameter is not supported or absent, allowed values of scopeType are BASE_ONLY and BASE_ALL. The value BASE_ONLY indicates only the base object is selected. - The value BASE_ALL indicates the base object and all of its + The value BASE_ALL indicates the base object and all of its subordinate objects (incl. the leaf objects) are selected. - If the scopeLevel parameter is supported and present, allowed - values of scopeType are BASE_ALL, BASE_ONLY, BASE_NTH_LEVEL + If the scopeLevel parameter is supported and present, allowed + values of scopeType are BASE_ALL, BASE_ONLY, BASE_NTH_LEVEL and BASE_SUBTREE. - The value BASE_NTH_LEVEL indicates all objects on the level, - which is specified by the scopeLevel parameter, below the base + The value BASE_NTH_LEVEL indicates all objects on the level, + which is specified by the scopeLevel parameter, below the base object are selected. The base object is at scopeLevel zero. - The value BASE_SUBTREE indicates the base object and all of its - subordinate objects down to and including the objects on the level, - which is specified by the scopeLevel parameter, are selected. + The value BASE_SUBTREE indicates the base object and all of its + subordinate objects down to and including the objects on the level, + which is specified by the scopeLevel parameter, are selected. The base object is at scopeLevel zero."; } - + leaf scopeLevel { when '../scopeType = "BASE_NTH_LEVEL" or ../scopeType = "BASE_SUBTREE"'; - type uint16; + type uint16; mandatory true; description "See description of scopeType."; } } case dataNodeSelector { container dataNodeSelector { - description "The value shall follow the rules of RFC 8641 + description "The value shall follow the rules of RFC 8641 filter-spec"; reference "RFC 8641 section 5. and ietf-yang-push.yang"; choice dataNodeSelector { anydata datastore-subtree-filter { description "Subtree filter"; - reference + reference "RFC 6241: Network Configuration Protocol (NETCONF), Section 6"; } leaf datastore-xpath-filter { @@ -108,12 +108,12 @@ module _3gpp-common-subscription-control { RFC 7950: The YANG 1.1 Data Modeling Language, Section 10"; } - } + } } } - } + } } - + typedef NotificationTypes { description "An extensible enumeration of notification types"; type union { @@ -140,21 +140,21 @@ module _3gpp-common-subscription-control { type string; } } - + grouping NtfSubscriptionControlGrp { description "Attributes of a specific notification subscription"; - + leaf notificationRecipientAddress { type string; mandatory true; } - + leaf-list notificationTypes { type NotificationTypes; - description "Defines the types of notifications that are candidates + description "Defines the types of notifications that are candidates for being forwarded to the notification recipient. - If the notificationTypes attribute is not supported or not present - all candidate notifications types are forwarded to the notification; + If the notificationTypes attribute is not supported or not present + all candidate notifications types are forwarded to the notification; discriminated by notificationFilter attribute."; } @@ -168,197 +168,197 @@ module _3gpp-common-subscription-control { leaf notificationFilter { type string; - description "Defines a filter to be applied to candidate notifications - identified by the notificationTypes attribute. - If notificationFilter is present, only notifications that pass the - filter criteria are forwarded to the notification recipient; all other + description "Defines a filter to be applied to candidate notifications + identified by the notificationTypes attribute. + If notificationFilter is present, only notifications that pass the + filter criteria are forwarded to the notification recipient; all other notifications are discarded. The filter can be applied to any field of a notification. - - The format of the string shall confrm to a + + The format of the string shall confrm to a JSON expressions (Jex) 'JexConditionsExpr'"; reference "3GPP TS 32.161"; } - + leaf lastSequenceNo { type uint64; config false; mandatory true; - description "The sequence number of the last notification that was sent + description "The sequence number of the last notification that was sent by a 'NtfSubscriptionControl' instance."; } - + leaf operationalState { type types3gpp:OperationalState; config false; mandatory true; - description "Operational state of manged object instance. - The operational state describes if an object instance is operable + description "Operational state of manged object instance. + The operational state describes if an object instance is operable ('ENABLED') or inoperable ('DISABLED'). - This state is set by the object instance or the MnS producer and + This state is set by the object instance or the MnS producer and is hence READ-ONLY."; } - + leaf-list availabilityStatus { type types3gpp:AvailabilityStatus; config false; - description "The availability status provides additional information + description "The availability status provides additional information about the operational state"; } } - + grouping HeartbeatControlGrp { description "Attributes of HeartbeatControl."; - + leaf heartbeatNtfPeriod { type uint32; mandatory true; units seconds; - description "Specifies the periodicity of heartbeat notification emission. - The value of zero has the special meaning of stopping the heartbeat + description "Specifies the periodicity of heartbeat notification emission. + The value of zero has the special meaning of stopping the heartbeat notification emission."; } - + leaf triggerHeartbeatNtf { type boolean; default false; - description "Setting this attribute to 'true' triggers an immediate - additional heartbeat notification emission. Setting the value to + description "Setting this attribute to 'true' triggers an immediate + additional heartbeat notification emission. Setting the value to 'false' has no observable result. The periodicity of notifyHeartbeat emission is not changed. - - After triggering the heartbeat the system SHALL set the value + + After triggering the heartbeat the system SHALL set the value back to false."; yext3gpp:notNotifyable; } } - + grouping SubscriptionControlSubtree { - description "Contains notification subscription related classes. - Should be used in all classes (or classes inheriting from) + description "Contains notification subscription related classes. + Should be used in all classes (or classes inheriting from) - SubNetwork - ManagedElement - - If some YAM wants to augment these classes/list/groupings they must + + If some YAM wants to augment these classes/list/groupings they must augment all user classes!"; list NtfSubscriptionControl { - description "NtfSubscriptionControl represents a notification - subscription of a notification recipient. - - The scope attribute is used to select managed object instances included - in the subscription. The base object instance of the scope is the - object instance name-containing the NtfSubscriptionControl instance. - When the scope attribute is absent, all objects below and including - the base object are scoped. The notifications related to the selected - managed object instances are candidates to be sent to the address + description "NtfSubscriptionControl represents a notification + subscription of a notification recipient. + + The scope attribute is used to select managed object instances included + in the subscription. The base object instance of the scope is the + object instance name-containing the NtfSubscriptionControl instance. + When the scope attribute is absent, all objects below and including + the base object are scoped. The notifications related to the selected + managed object instances are candidates to be sent to the address specified by the notificationRecipientAddress attribute. - - The notificationTypes attribute and notificationFilter attribute - allow MnS consumers to control which candidate notifications are + + The notificationTypes attribute and notificationFilter attribute + allow MnS consumers to control which candidate notifications are sent to the notificationRecipientAddress. - - If the notificationTypes attribute is present, its value identifies - the notification types that are candidates to be sent to the - notificationRecipientAddress. If the notificationTypes attribute is - absent, notifications of all types are candidates to be sent to - notificationRecipientAddress. Notification types supported in the - NtfSubscriptionControl.notificationTypes attribute are the ones + + If the notificationTypes attribute is present, its value identifies + the notification types that are candidates to be sent to the + notificationRecipientAddress. If the notificationTypes attribute is + absent, notifications of all types are candidates to be sent to + notificationRecipientAddress. Notification types supported in the + NtfSubscriptionControl.notificationTypes attribute are the ones listed in the attribute SupportedNotifications.notificationTypes. - - If supported, the notificationFilter attribute defines a filter that - is applied to the set of candidate notifications. The filter is - applicable to all parameters of a notification. Only candidate - notifications that pass the filter criteria are sent to the - notificationRecipientAddress. If the notificationFilter attribute is - absent, all candidate notificatios are sent to the + + If supported, the notificationFilter attribute defines a filter that + is applied to the set of candidate notifications. The filter is + applicable to all parameters of a notification. Only candidate + notifications that pass the filter criteria are sent to the + notificationRecipientAddress. If the notificationFilter attribute is + absent, all candidate notificatios are sent to the notificationRecipientAddress. - - To receive notifications, a MnS consumer has to create a - NtfSubscriptionControl instance on the MnS producer. A MnS consumer - can create a subscription for another MnS consumer since it is not + + To receive notifications, a MnS consumer has to create a + NtfSubscriptionControl instance on the MnS producer. A MnS consumer + can create a subscription for another MnS consumer since it is not required the notificationRecipientAddress be his own address. - - When a MnS consumer does not wish to receive notifications any more - the MnS consumer shall delete the corresponding NtfSubscriptionControl + + When a MnS consumer does not wish to receive notifications any more + the MnS consumer shall delete the corresponding NtfSubscriptionControl instance. - - When a subscription is created and the notification scope inludes - the created subscription object and the subscribed notification types - include notifications reporting object creation (notifyMOICreation - or notifyMOIChanges), the first notification sent related to the - new subscription shall report the creation of the - NtfSubscriptionControl instance. Likewise, when a subscription is - deleted and the notification scope includes the deleted subscription - object and the subscribed notification types include notifications - reporting object deletion (notifyMOIDeletion or notifyMOIChanges), - the last notification sent related to the subscription shall report + + When a subscription is created and the notification scope inludes + the created subscription object and the subscribed notification types + include notifications reporting object creation (notifyMOICreation + or notifyMOIChanges), the first notification sent related to the + new subscription shall report the creation of the + NtfSubscriptionControl instance. Likewise, when a subscription is + deleted and the notification scope includes the deleted subscription + object and the subscribed notification types include notifications + reporting object deletion (notifyMOIDeletion or notifyMOIChanges), + the last notification sent related to the subscription shall report the deletion of the NtfSubscriptionControl instance. - If multiple NtfSubscriptionControl instances are configured to send - the same notification to the same notificationRecipientAddress, then - a separate notification message shall be sent for each such + If multiple NtfSubscriptionControl instances are configured to send + the same notification to the same notificationRecipientAddress, then + a separate notification message shall be sent for each such NtfSubscriptionControl instance. - A 'NtfSubscriptionControl' class optionally supports adding a sequence - number parameter to the notification header. For each notification - sent from a 'NtfSubscriptionControl' instance to the configured - notification recipient, the sequence number is increased by one. - This allows the notification recipient to detect notifications lost or - reordered in transit. The sequence number sent last is reflected in - the 'lastSequenceNo' attribute. This allows the MnS consumer to check - if he missed notifications in situations where he did not receive + A 'NtfSubscriptionControl' class optionally supports adding a sequence + number parameter to the notification header. For each notification + sent from a 'NtfSubscriptionControl' instance to the configured + notification recipient, the sequence number is increased by one. + This allows the notification recipient to detect notifications lost or + reordered in transit. The sequence number sent last is reflected in + the 'lastSequenceNo' attribute. This allows the MnS consumer to check + if he missed notifications in situations where he did not receive any notification for some time. - The 'operationalState' attribute represents the operability of the - subscription. The 'availabilityStatus' further qualifies the + The 'operationalState' attribute represents the operability of the + subscription. The 'availabilityStatus' further qualifies the opertational state. Both attributes are set by the MnS producer. - If the 'operationalState' is set to 'ENABLED' and 'availabilityStatus' - has no value the subscription process is fully operational and + If the 'operationalState' is set to 'ENABLED' and 'availabilityStatus' + has no value the subscription process is fully operational and notifications are forwarded to the subscribed consumer. - If the 'operationalState' is set to 'ENABLED' and 'availabilityStatus' - is set to 'DEGRADED' the subscription process is degraded. There is - no guarantee that all notifications, that should be forwarded to the + If the 'operationalState' is set to 'ENABLED' and 'availabilityStatus' + is set to 'DEGRADED' the subscription process is degraded. There is + no guarantee that all notifications, that should be forwarded to the notification recipient, are forwarded. - If the 'operationalState' is set to 'DISABLED' and 'availabilityStatus' - is set to 'FAILED' the subscription process is not operational, and + If the 'operationalState' is set to 'DISABLED' and 'availabilityStatus' + is set to 'FAILED' the subscription process is not operational, and no notifications are sent to the notification recipient. - If the 'operationalState' is set to 'DISABLED' and 'availabilityStatus' - is set to 'DEPENDENCY' the subscription process itself has no problems - but some other process on which it depends such as downstream - processes in the event channel that feeds events into the subscription - process. As a result, events are not delivered to the subscription + If the 'operationalState' is set to 'DISABLED' and 'availabilityStatus' + is set to 'DEPENDENCY' the subscription process itself has no problems + but some other process on which it depends such as downstream + processes in the event channel that feeds events into the subscription + process. As a result, events are not delivered to the subscription process and no notifications are sent to the notification recipient. - When the subscription process is disabled or degraded and becomes - fully operational again, the MnS producer sends- the related data node - tree change notifications to subscribed MnS consumers. The MnS consumer - may use the reception of these notifications as a trigger to synchronize - his data node tree with the data node tree on the MnS producer. - However, the state change notifications contain no information about - which part of the data node tree should be synchronized. For this - purpose the 'notifyDataNodeTreeSyncRecommended' (TS 28.532 [27]) and + When the subscription process is disabled or degraded and becomes + fully operational again, the MnS producer sends- the related data node + tree change notifications to subscribed MnS consumers. The MnS consumer + may use the reception of these notifications as a trigger to synchronize + his data node tree with the data node tree on the MnS producer. + However, the state change notifications contain no information about + which part of the data node tree should be synchronized. For this + purpose the 'notifyDataNodeTreeSyncRecommended' (TS 28.532 [27]) and 'alarmListRebuilt' (TS 28.111 [58]) notifications are provided. - Creation and deletion of NtfSubscriptionControl instances by MnS - consumers is optional; when not supported, the NtfSubscriptionControl - instances may be created and deleted by the system or be + Creation and deletion of NtfSubscriptionControl instances by MnS + consumers is optional; when not supported, the NtfSubscriptionControl + instances may be created and deleted by the system or be pre-installed."; - + key id; uses top3gpp:Top_Grp; container attributes { uses NtfSubscriptionControlGrp; } - + list HeartbeatControl { description "MnS consumers (i.e. notification recipients) use heartbeat - notifications to monitor the communication channels between themselves + notifications to monitor the communication channels between themselves and MnS producers configured to emit notifications. A HeartbeatControl instance allows controlling the emission of @@ -399,23 +399,23 @@ module _3gpp-common-subscription-control { max-elements 1; key id; uses top3gpp:Top_Grp; - + container attributes { uses HeartbeatControlGrp; } } } - } - + } + grouping SupportedNotificationsGrp { description "Attributes of SupportedNotifications."; - + leaf-list notificationTypes { type NotificationTypes; config false; description "List of notification types supported by the MnS producer"; } - + leaf-list notificationProtocols { type enumeration { enum HTTP; @@ -427,26 +427,26 @@ module _3gpp-common-subscription-control { reference "3GPP TS 28.532"; } } - + grouping SupportedNotificationsSubtree { description "Contains SupportedNotifications."; list SupportedNotifications { - description "SupportedNotifications represents the notification related - capabilities of a MnS producer. + description "SupportedNotifications represents the notification related + capabilities of a MnS producer. - The notificationTypes attribute lists notificationTypes supported - by the MnSProducer. Specific IOCs can be the source of a specific - but not necessary every supported notificationType. + The notificationTypes attribute lists notificationTypes supported + by the MnSProducer. Specific IOCs can be the source of a specific + but not necessary every supported notificationType. - The notificationProtocols attribute identifies the notification + The notificationProtocols attribute identifies the notification transport protocols supported by a MnS producer."; - + key id; uses top3gpp:Top_Grp; container attributes { uses SupportedNotificationsGrp; } } - } + } } diff --git a/yang-models/_3gpp-common-top.yang b/yang-models/_3gpp-common-top.yang index 69c76b843..93f9138b3 100755 --- a/yang-models/_3gpp-common-top.yang +++ b/yang-models/_3gpp-common-top.yang @@ -1,29 +1,29 @@ module _3gpp-common-top { yang-version 1.1; - + namespace urn:3gpp:sa5:_3gpp-common-top; prefix top3gpp; - + organization "3gpp SA5"; - description "The model defines a YANG mapping of the top level - information classes used for management of 5G networks and + description "The model defines a YANG mapping of the top level + information classes used for management of 5G networks and network slicing. - Copyright 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + Copyright 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved."; - reference - "3GPP TS 28.622 + reference + "3GPP TS 28.622 Generic Network Resource Model (NRM) Integration Reference Point (IRP); Information Service (IS) - - 3GPP TS 28.620 + + 3GPP TS 28.620 Umbrella Information Model (UIM)"; - revision 2023-09-18 { reference CR-0271 ; } + revision 2023-09-18 { reference CR-0271 ; } revision 2019-06-17 { description "Initial revision"; } - + grouping Top_Grp { description "Abstract class supplying a naming attribute"; reference "3GPP TS 28.620"; @@ -31,9 +31,9 @@ module _3gpp-common-top { leaf id { type string; description "Key leaf (namingAttribute) for a class/list. - Should be used as a key leaf for lists representing + Should be used as a key leaf for lists representing stage 2 classes."; - reference "3GPP TS 32.300 Name convention for managed objects"; - } - } + reference "3GPP TS 32.300 Name convention for managed objects"; + } + } } \ No newline at end of file diff --git a/yang-models/_3gpp-common-trace.yang b/yang-models/_3gpp-common-trace.yang index e39fc0f8e..803987731 100755 --- a/yang-models/_3gpp-common-trace.yang +++ b/yang-models/_3gpp-common-trace.yang @@ -14,7 +14,7 @@ module _3gpp-common-trace { contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464"; description "Trace handling - Copyright 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + Copyright 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved."; reference "3GPP TS 28.623 Generic Network Resource Model (NRM) @@ -29,18 +29,18 @@ module _3gpp-common-trace { revision 2025-05-07 { reference "CR-0532 CR-0536 CR-0540" ; } revision 2025-02-07 { reference "CR-0504" ; } revision 2025-02-05 { reference "CR-0461" ; } - revision 2024-11-25 { reference "CR-0492" ; } + revision 2024-11-25 { reference "CR-0492" ; } revision 2024-11-07 { reference "CR-0480"; } revision 2024-10-01 { reference "CR-0457"; } - revision 2024-08-13 { reference "CR-0387 CR-0377"; } + revision 2024-08-13 { reference "CR-0387 CR-0377"; } revision 2024-08-07 { reference "CR-0405 CR-0421 CR-0379"; } revision 2024-05-12 { reference "CR-0401"; } revision 2024-05-06 { reference CR-0359; } revision 2024-04-06 { reference "CR-0342"; } revision 2024-01-29 { reference "CR-0316"; } revision 2023-11-06 { reference "CR-0290 CR-0294"; } - revision 2023-11-03 { reference CR-0302 ; } - revision 2023-09-18 { reference CR-0271 ; } + revision 2023-11-03 { reference CR-0302 ; } + revision 2023-09-18 { reference CR-0271 ; } revision 2023-08-10 { reference CR-0261; } revision 2023-04-26 { reference CR-0250; } revision 2023-02-18 { reference "CR-0234"; } @@ -58,60 +58,60 @@ module _3gpp-common-trace { } grouping FreqInfoGrp { - description "Represents the FreqInfo dataType. - This <> defines the RF reference frequency and the frequency - operating bands used in a cell for a given direction (UL or DL) in FDD + description "Represents the FreqInfo dataType. + This <> defines the RF reference frequency and the frequency + operating bands used in a cell for a given direction (UL or DL) in FDD or for both UL and DL directions in TDD"; - + leaf arfcn { type uint32 { range 0..3279165; } mandatory true; - description "RF Reference Frequency as defined in TS 38.104, - clause 5.4.2.1. The frequency provided identifies the absolute - frequency position of the reference resource block (Common RB 0) + description "RF Reference Frequency as defined in TS 38.104, + clause 5.4.2.1. The frequency provided identifies the absolute + frequency position of the reference resource block (Common RB 0) of the carrier. Its lowest subcarrier is also known as Point A."; } - + leaf-list freqBands { type uint32 { range 1..1024; - } + } min-elements 1; - description "List of NR frequency operating bands. Primary NR + description "List of NR frequency operating bands. Primary NR Operating Band as defined in TS 38.104, clause 5.4.2.3. - The value 1 corresponds to n1, value 2 corresponds to NR operating + The value 1 corresponds to n1, value 2 corresponds to NR operating band n2, etc."; } } - + grouping AreaConfigGrp { description "Represents the AreaConfig dataType. - This <> defines the area for which measurement logging should - be performed. It is described by a list of cells and a list of + This <> defines the area for which measurement logging should + be performed. It is described by a list of cells and a list of frequencies."; - + list freqInfo { key arfcn; min-elements 1; max-elements 32; - description "It specifies the carrier frequency and bands used in + description "It specifies the carrier frequency and bands used in a cell."; uses FreqInfoGrp ; } - + leaf-list pciList { type uint32 { range 0..1007; - } + } min-elements 1; max-elements 32; description "List of neighbour cells subject for MDT scope."; } } - + grouping AreaScopeGrp { description "This <> defines an area scope."; @@ -122,21 +122,21 @@ module _3gpp-common-trace { max-elements 32; description "List of E-UTRAN cells identified by E-UTRAN-CGI"; } - + leaf-list nrCellIdList { type string; min-elements 1; max-elements 32; description "List of NR cells identified by NG-RAN CGI"; } - + leaf-list tacList { type types3gpp:Tac; min-elements 1; max-elements 8; description "Tracking Area Code list"; } - + list sliceIdList { description "Network Slice Id list"; key idx; @@ -157,8 +157,8 @@ module _3gpp-common-trace { } list nPNIdentityList { - description "list of NPN IDs of in NR. It is either a list of PNI-NPNs - identified by CAG ID with associated plmn-Identity or a list of SNPN + description "list of NPN IDs of in NR. It is either a list of PNI-NPNs + identified by CAG ID with associated plmn-Identity or a list of SNPN identified by Network ID with associated plmn-Identity"; key idx; min-elements 1; @@ -166,21 +166,21 @@ module _3gpp-common-trace { leaf idx { type string; } } } - + grouping ExcessPacketDelayThresholdsGrp { description "Represents the ExcessPacketDelayThresholds dataType. - This <> defines a excess packet delay threshold information - to enable the calculation of the PDCP Excess Packet Delay in the - uplink in case of M6 uplink measurements are requested. The excess - packet delay threshold information is specified with the 5QI value + This <> defines a excess packet delay threshold information + to enable the calculation of the PDCP Excess Packet Delay in the + uplink in case of M6 uplink measurements are requested. The excess + packet delay threshold information is specified with the 5QI value and excess packet delay threshold value."; - + leaf fiveQIValue { type uint8; mandatory true; description "It indicates 5QI value."; } - + leaf excessPacketDelayThresholdValue { type decimal64 { fraction-digits 2; @@ -188,36 +188,36 @@ module _3gpp-common-trace { } mandatory true; units milliseconds; - description "Value of excess packet delay threshold + description "Value of excess packet delay threshold for M6 UL measurement in milliseconds."; } } - + grouping TraceReferenceGrp { description "Represents the TraceReference dataType. - This <> defines a globally unique identifier, which uniquely - identifies the Trace Session that is created by the TraceJob. It is - composed of the MCC, MNC (resulting in PLMN identifier) and the + This <> defines a globally unique identifier, which uniquely + identifies the Trace Session that is created by the TraceJob. It is + composed of the MCC, MNC (resulting in PLMN identifier) and the trace identifier."; - + uses types3gpp:PLMNId; // mcc+mnc - + leaf traceId { type string { pattern "[0-9a-fA-F]{6}"; } mandatory true; - description "An identifier, which identifies the Trace + description "An identifier, which identifies the Trace (together with MCC and MNC). This is a 3 byte Octet String, expressed in hexadecimal form e.g., '1a7b3d')."; } } - + grouping MbsfnAreaGrp { - description "Represents the MbsfnArea dataType. - This <> defines a MBSFN area. It is composed of the MBSFN Area + description "Represents the MbsfnArea dataType. + This <> defines a MBSFN area. It is composed of the MBSFN Area identifier and the carrier frequency (EARFCN)."; - + leaf mbsfnAreaId { type uint32 { range 1..max; @@ -225,7 +225,7 @@ module _3gpp-common-trace { mandatory true; description "MBSFN Area Identifier"; } - + leaf earfcn{ type uint32 { range 1..max; @@ -234,18 +234,18 @@ module _3gpp-common-trace { description "Carrier Frequency"; } } - + grouping TraceConfigGrp { - description "Defines the configuration parameters of TraceJob + description "Defines the configuration parameters of TraceJob which are specific for Trace or combined Trace and Immediate MDT. - The attribute listOfNeTypes specifies the network elements to be + The attribute listOfNeTypes specifies the network elements to be traced. The optional attribute listOfInterfaces allows to specify the individual interfaces of the network elements to be recorded. - The attribute traceDepth allows to configure the level of detail + The attribute traceDepth allows to configure the level of detail of the information which shall be recorded. For trace the reporting - is event based, where the triggering event is configured with - attribute triggeringEvents. For each triggering event the first and + is event based, where the triggering event is configured with + attribute triggeringEvents. For each triggering event the first and last message (start/stop triggering event) to record are specified."; list listOfInterfaces { @@ -586,16 +586,16 @@ module _3gpp-common-trace { enum VENDORMAXIMUM; } default MAXIMUM; - description "It specifies the trace depth. The attribute is applicable + description "It specifies the trace depth. The attribute is applicable only for Trace."; reference "Clause 5.3 of 3GPP TS 32.422."; - } - + } + list triggeringEvents { key idx; - description "It specifies the triggering event parameter of the trace + description "It specifies the triggering event parameter of the trace session. The attribute is applicable only for Trace."; - reference "Clause 5.1 of 3GPP TS 32.422"; + reference "Clause 5.1 of 3GPP TS 32.422"; leaf idx { type uint32; } max-elements 1; @@ -604,7 +604,7 @@ module _3gpp-common-trace { enum MO_MT_CALLS; enum MO_MT_SMS; enum LU_IMSIattach_IMSIdetach; - enum SS; + enum SS; } } @@ -617,7 +617,7 @@ module _3gpp-common-trace { } } - + leaf-list MGW { type enumeration { enum CONTEXT; @@ -654,7 +654,7 @@ module _3gpp-common-trace { } } - + leaf-list SGW { type enumeration { enum PDNconnectionCreation; @@ -761,12 +761,12 @@ module _3gpp-common-trace { } grouping ImmediateMdtConfigGrp { - description "Represents the ImmediateMdtConfig dataType. - This <> defines the configuration parameters of - IOC TraceJob which are specific for Immediate MDT or combine - Trace and Immediate MDT. - - The optional attribute positioningMethod allows to specify + description "Represents the ImmediateMdtConfig dataType. + This <> defines the configuration parameters of + IOC TraceJob which are specific for Immediate MDT or combine + Trace and Immediate MDT. + + The optional attribute positioningMethod allows to specify the positioning methods to use. The following attributes are conditional available based on the @@ -799,64 +799,64 @@ module _3gpp-common-trace { -beamLevelMeasurement (conditional for M1 in NR), -excessPacketDelayThresholds (conditional for M6 UL measurement in NR). - For immediate MDT, the measurement reporting is dependent on the + For immediate MDT, the measurement reporting is dependent on the configured measurements: - - - For measurement M1 in LTE or NR, it is possible to select between - periodical, event triggered, event triggered periodic reporting or - reporting according to all configured RRM event triggers. For M1 and M2 - measurement in UMTS, it is possible to select between periodical, event - triggered reporting or reporting according to all configured RRM event - triggers. Parameter reportingTrigger determines which of the reporting - methods is selected and in case of event triggered or event-triggered - periodic, which is the decisive event type. For periodical reporting, + + - For measurement M1 in LTE or NR, it is possible to select between + periodical, event triggered, event triggered periodic reporting or + reporting according to all configured RRM event triggers. For M1 and M2 + measurement in UMTS, it is possible to select between periodical, event + triggered reporting or reporting according to all configured RRM event + triggers. Parameter reportingTrigger determines which of the reporting + methods is selected and in case of event triggered or event-triggered + periodic, which is the decisive event type. For periodical reporting, parameters reportInterval and reportAmount determine the interval between - two successive reports and the number of reports. This means the + two successive reports and the number of reports. This means the periodical reporting terminates after reportAmount reports have been - sent as long as reportAmount is configured with a value different from - infinity. For event-triggered periodic reporting, these two parameters - apply in addition to parameter eventThreshold which determines the - threshold of the event. In this case up to reportAmount reports are - sent with a periodicity of reportInterval after the entering condition - is fulfilled. The reporting is stopped, if the leaving condition is - fulfulled and is restarted if the configured event reoccurs. For event - based reporting, there is only one report sent after the event occurs. - The parameters to configure are reportingTrigger and eventThreshold. - In case of UMTS and 1f event reporting, additionally parameter - measurementQuantity is necessary in order to determine for which - measurement(s) the event threshold is applicable. Parameter + sent as long as reportAmount is configured with a value different from + infinity. For event-triggered periodic reporting, these two parameters + apply in addition to parameter eventThreshold which determines the + threshold of the event. In this case up to reportAmount reports are + sent with a periodicity of reportInterval after the entering condition + is fulfilled. The reporting is stopped, if the leaving condition is + fulfulled and is restarted if the configured event reoccurs. For event + based reporting, there is only one report sent after the event occurs. + The parameters to configure are reportingTrigger and eventThreshold. + In case of UMTS and 1f event reporting, additionally parameter + measurementQuantity is necessary in order to determine for which + measurement(s) the event threshold is applicable. Parameter beamLevelMeasurement determines whether beam level measurements shall be included in case of NR. - + - For measurement M2 in LTE or NR, reporting is according to RRM - configuration, see TS 38.321, TS 36.321 and TS 38.331, TS 36.331. - - - For measurement M4 in UMTS, reporting is either according to RRM + configuration, see TS 38.321, TS 36.321 and TS 38.331, TS 36.331. + + - For measurement M4 in UMTS, reporting is either according to RRM configuration, see TS 25.321 and TS 25.331 or periodic or event - triggered periodic using parameter collectionPeriodRRMUMTS and + triggered periodic using parameter collectionPeriodRRMUMTS and eventThresholdUphUMTS. - + - For measurement M3 in UMTS, the reporting is done upon availability, see TS 37.320. - - - For measurements M4, M5, M6 and M7 in NR, for measurements - M3, M4, M5, M6 and M7 in LTE and for measurements M5, M6 and M7 + + - For measurements M4, M5, M6 and M7 in NR, for measurements + M3, M4, M5, M6 and M7 in LTE and for measurements M5, M6 and M7 in UMTS periodical reporting is applied. The configurable parameter - is the interval between two measurements (collectionPeriodRRMNR, + is the interval between two measurements (collectionPeriodRRMNR, collectionPeriodM6NR, collectionPeriodM7NR, collectionPeriodRRMLTE, measurementPeriodLte, collectionPeriodM6LTE, collectionPeriodM7LTE, - collectionPeriodRRMUMTS, measurementPeriodUMTS) and the number of - reports (reportAmountM4NR, reportAmountM5NR, reportAmountM6NR, - reportAmountM7NR, reportAmountM4LTE, reportAmountM5LTE, + collectionPeriodRRMUMTS, measurementPeriodUMTS) and the number of + reports (reportAmountM4NR, reportAmountM5NR, reportAmountM6NR, + reportAmountM7NR, reportAmountM4LTE, reportAmountM5LTE, reportAmountM6LTE,reportAmountM7LTE). If no collection period is configured for M5 in UMTS, all available measurements are logged according to RRM configuration. - - Measurements M8 and M9 in NR or LTE are reported according to - configured M1 and/or M6 related UE measurement reporting. - + - Measurements M8 and M9 in NR or LTE are reported according to + configured M1 and/or M6 related UE measurement reporting. + "; - + leaf listOfMeasurements { when '../../../jobType = "IMMEDIATE_MDT_ONLY"'; type enumeration { @@ -875,8 +875,8 @@ module _3gpp-common-trace { enum M8; enum M9; } - description "It specifies the UE measurements that shall be - collected in an Immediate MDT job. The attribute is + description "It specifies the UE measurements that shall be + collected in an Immediate MDT job. The attribute is applicable only for Immediate MDT."; reference "Clause 5.10.3 of 3GPP TS 32.422."; } @@ -916,7 +916,7 @@ module _3gpp-common-trace { reportingTrigger is configured for periodical measurements."; reference "5.10.5 of 3GPP TS 32.422."; } - + leaf reportAmount { when '../../../jobType = "IMMEDIATE_MDT_ONLY"' + ' and ../reportingTrigger = "PERIODICAL"'; @@ -934,7 +934,7 @@ module _3gpp-common-trace { reportingTrigger is configured for periodical measurements."; reference "Clause 5.10.6 of 3GPP TS 32.422"; } - + leaf eventThreshold { when '../../../jobType = "IMMEDIATE_MDT_ONLY"'; type int64; @@ -944,7 +944,7 @@ module _3gpp-common-trace { configured for A2 event in LTE or 1F event or 1l event in UMTS."; reference "Clauses 5.10.7 and 5.10.7a of 3GPP TS 32.422"; } - + leaf collectionPeriodRRMNR { when '../../../jobType = "IMMEDIATE_MDT_ONLY"' + ' or ../../../jobType = "IMMEDIATE_MDT_AND_TRACE"'; @@ -952,8 +952,8 @@ module _3gpp-common-trace { range "1024|2048|5120|10240|60000"; } units milliseconds; - description "Specifies the collection period for collecting RRM - configured measurement samples for M4, M5 in NR. The attribute is + description "Specifies the collection period for collecting RRM + configured measurement samples for M4, M5 in NR. The attribute is applicable only for Immediate MDT."; reference "Clause 5.10.30 of 3GPP TS 32.422"; } @@ -977,26 +977,26 @@ module _3gpp-common-trace { enum 12min; enum 30min; } - description "It specifies the collection period for the Packet Delay - measurement (M6) for NR MDT taken by the gNB. The attribute is + description "It specifies the collection period for the Packet Delay + measurement (M6) for NR MDT taken by the gNB. The attribute is applicable only for Immediate MDT. "; reference "clause 5.10.34 of TS 32.422"; } - + leaf collectionPeriodM7NR { when '../../../jobType = "IMMEDIATE_MDT_ONLY"' + ' or ../../../jobType = "IMMEDIATE_MDT_AND_TRACE"'; type uint32 { range "1..60"; } - description "It specifies the collection period for the Packet Loss Rate - measurement (M7) for NR MDT taken by the gNB. The attribute is - applicable only for Immediate MDT."; + description "It specifies the collection period for the Packet Loss Rate + measurement (M7) for NR MDT taken by the gNB. The attribute is + applicable only for Immediate MDT."; reference "clause 5.10.35 of TS 32.422"; } leaf collectionPeriodRRMLTE { - when '../../../jobType = "IMMEDIATE_MDT_ONLY"' + when '../../../jobType = "IMMEDIATE_MDT_ONLY"' + ' or ../../../jobType = "IMMEDIATE_MDT_AND_TRACE"'; type enumeration { enum 100ms; @@ -1027,47 +1027,47 @@ module _3gpp-common-trace { enum 1min; } mandatory true; - description "It specifies the measurement period for the - Data Volume (M4) and Scheduled IP throughput + description "It specifies the measurement period for the + Data Volume (M4) and Scheduled IP throughput measurements (M5) for LTE MDT taken by the eNB. The attribute is applicable only for Immediate MDT."; reference "Clause 5.10.23 of 3GPP TS 32.422."; } - + leaf collectionPeriodM6LTE { - when '../../../jobType = "IMMEDIATE_MDT_ONLY"' + when '../../../jobType = "IMMEDIATE_MDT_ONLY"' + ' or ../../../jobType = "IMMEDIATE_MDT_AND_TRACE"'; type uint32 { range "1024|2048|5120|10240"; } units milliseconds; - description "Specifies the collection period for the Packet Delay - measurement (M6) for MDT taken by the eNB. The attribute is applicable - only for Immediate MDT. In case this attribute is not used, + description "Specifies the collection period for the Packet Delay + measurement (M6) for MDT taken by the eNB. The attribute is applicable + only for Immediate MDT. In case this attribute is not used, it carries a null semantic."; reference "Clause 5.10.32 of TS 32.422. "; } - + leaf collectionPeriodM7LTE { - when '../../../jobType = "IMMEDIATE_MDT_ONLY"' + when '../../../jobType = "IMMEDIATE_MDT_ONLY"' + ' or ../../../jobType = "IMMEDIATE_MDT_AND_TRACE"'; type uint16 { range 1..60 ; } - description "It specifies the collection period for the Packet Loss Rate - measurement (M7) for LTE MDT taken by the eNB. The attribute is + description "It specifies the collection period for the Packet Loss Rate + measurement (M7) for LTE MDT taken by the eNB. The attribute is applicable only for Immediate MDT."; reference "Clause 5.10.33 of TS 32.422."; } leaf eventThresholdUphUMTS { - when '../../../jobType = "IMMEDIATE_MDT_ONLY"' + when '../../../jobType = "IMMEDIATE_MDT_ONLY"' + ' or ../../../jobType = "IMMEDIATE_MDT_AND_TRACE"'; type uint16 { range 0..31 ; - } - description "It specifies the threshold which should trigger - the reporting in case of event-triggered periodic reporting for M4 + } + description "It specifies the threshold which should trigger + the reporting in case of event-triggered periodic reporting for M4 (UE power headroom measurement) in UMTS."; reference "Clause 5.10.39 of TS 32.422."; } @@ -1113,13 +1113,13 @@ module _3gpp-common-trace { job for a UMTS MDT configured for event triggered reporting."; reference "Clause 5.10.15 of 3GPP TS 32.422."; } - + leaf beamLevelMeasurement { when '../../../jobType = "IMMEDIATE_MDT_ONLY"' + ' or ../../../jobType = "IMMEDIATE_MDT_AND_TRACE"'; type boolean; default false; - description "Indicates whether the NR M1 beam level measurements shall + description "Indicates whether the NR M1 beam level measurements shall be included or not."; reference "Clause 5.10.40 of 3GPP TS 32.422."; } @@ -1135,7 +1135,7 @@ module _3gpp-common-trace { MDT job."; reference "Clause 5.10.19 of 3GPP TS 32.422."; } - + list excessPacketDelayThresholds { description "Excess packet delay thresholds info for M6 UL measurement."; min-elements 1; @@ -1143,7 +1143,7 @@ module _3gpp-common-trace { leaf idx { type string; } uses ExcessPacketDelayThresholdsGrp; } - + leaf reportAmountM1LTE { type enumeration { enum 1; @@ -1155,14 +1155,14 @@ module _3gpp-common-trace { enum 64; enum INFINITY; } - description "It specifies the number of measurement reports that shall be - taken for periodic reporting while the UE is in connected mode. - The attribute is applicable only for Immediate MDT and combined Trace - and Immediate MDT and when reportingTrigger is configured for periodical + description "It specifies the number of measurement reports that shall be + taken for periodic reporting while the UE is in connected mode. + The attribute is applicable only for Immediate MDT and combined Trace + and Immediate MDT and when reportingTrigger is configured for periodical measurements and applicable only for LTE."; reference "Clause 5.10.19 of 3GPP TS 32.422."; } - + leaf reportAmountM4LTE { type enumeration { enum 1; @@ -1174,10 +1174,10 @@ module _3gpp-common-trace { enum 64; enum INFINITY; } - description "It specifies the number of measurement reports that shall be - taken for periodic reporting while the UE is in connected mode. - The attribute is applicable only for Immediate MDT and combined Trace - and Immediate MDT and when reportingTrigger is configured for periodical + description "It specifies the number of measurement reports that shall be + taken for periodic reporting while the UE is in connected mode. + The attribute is applicable only for Immediate MDT and combined Trace + and Immediate MDT and when reportingTrigger is configured for periodical measurements and applicable only for LTE."; reference "Clause 5.10.6 of TS 32.422."; } @@ -1193,10 +1193,10 @@ module _3gpp-common-trace { enum 64; enum INFINITY; } - description "It specifies the number of measurement reports that shall be - taken for periodic reporting while the UE is in connected mode. - The attribute is applicable only for Immediate MDT and combined Trace - and Immediate MDT and when reportingTrigger is configured for periodical + description "It specifies the number of measurement reports that shall be + taken for periodic reporting while the UE is in connected mode. + The attribute is applicable only for Immediate MDT and combined Trace + and Immediate MDT and when reportingTrigger is configured for periodical measurements and applicable only for LTE."; reference "Clause 5.10.6 of TS 32.422."; } @@ -1212,10 +1212,10 @@ module _3gpp-common-trace { enum 64; enum INFINITY; } - description "It specifies the number of measurement reports that shall be - taken for periodic reporting while the UE is in connected mode. - The attribute is applicable only for Immediate MDT and combined Trace - and Immediate MDT and when reportingTrigger is configured for periodical + description "It specifies the number of measurement reports that shall be + taken for periodic reporting while the UE is in connected mode. + The attribute is applicable only for Immediate MDT and combined Trace + and Immediate MDT and when reportingTrigger is configured for periodical measurements and applicable only for LTE."; reference "Clause 5.10.6 of TS 32.422."; } @@ -1231,10 +1231,10 @@ module _3gpp-common-trace { enum 64; enum INFINITY; } - description "It specifies the number of measurement reports that shall be - taken for periodic reporting while the UE is in connected mode. - The attribute is applicable only for Immediate MDT and combined Trace - and Immediate MDT and when reportingTrigger is configured for periodical + description "It specifies the number of measurement reports that shall be + taken for periodic reporting while the UE is in connected mode. + The attribute is applicable only for Immediate MDT and combined Trace + and Immediate MDT and when reportingTrigger is configured for periodical measurements and applicable only for LTE."; reference "Clause 5.10.6 of TS 32.422."; } @@ -1250,10 +1250,10 @@ module _3gpp-common-trace { enum 64; enum INFINITY; } - description "It specifies the number of measurement reports that shall be - taken for periodic reporting while the UE is in connected mode. - The attribute is applicable only for Immediate MDT and combined Trace - and Immediate MDT and when reportingTrigger is configured for periodical + description "It specifies the number of measurement reports that shall be + taken for periodic reporting while the UE is in connected mode. + The attribute is applicable only for Immediate MDT and combined Trace + and Immediate MDT and when reportingTrigger is configured for periodical measurements and applicable only for NR."; reference "Clause 5.10.6 of TS 32.422."; } @@ -1269,12 +1269,12 @@ module _3gpp-common-trace { enum 64; enum INFINITY; } - description "It specifies the number of measurement reports that shall be - taken for periodic reporting while the UE is in connected mode. - The attribute is applicable only for Immediate MDT and combined Trace - and Immediate MDT and when reportingTrigger is configured for periodical + description "It specifies the number of measurement reports that shall be + taken for periodic reporting while the UE is in connected mode. + The attribute is applicable only for Immediate MDT and combined Trace + and Immediate MDT and when reportingTrigger is configured for periodical measurements and applicable only for NR."; - reference "Clause 5.10.6 of TS 32.422."; + reference "Clause 5.10.6 of TS 32.422."; } leaf reportAmountM5NR { @@ -1288,10 +1288,10 @@ module _3gpp-common-trace { enum 64; enum INFINITY; } - description "It specifies the number of measurement reports that shall be - taken for periodic reporting while the UE is in connected mode. - The attribute is applicable only for Immediate MDT and combined Trace - and Immediate MDT and when reportingTrigger is configured for periodical + description "It specifies the number of measurement reports that shall be + taken for periodic reporting while the UE is in connected mode. + The attribute is applicable only for Immediate MDT and combined Trace + and Immediate MDT and when reportingTrigger is configured for periodical measurements and applicable only for NR."; reference "Clause 5.10.6 of TS 32.422."; } @@ -1307,10 +1307,10 @@ module _3gpp-common-trace { enum 64; enum INFINITY; } - description "It specifies the number of measurement reports that shall be - taken for periodic reporting while the UE is in connected mode. - The attribute is applicable only for Immediate MDT and combined Trace - and Immediate MDT and when reportingTrigger is configured for periodical + description "It specifies the number of measurement reports that shall be + taken for periodic reporting while the UE is in connected mode. + The attribute is applicable only for Immediate MDT and combined Trace + and Immediate MDT and when reportingTrigger is configured for periodical measurements and applicable only for NR."; reference "Clause 5.10.6 of TS 32.422."; } @@ -1326,63 +1326,63 @@ module _3gpp-common-trace { enum 64; enum INFINITY; } - description "It specifies the number of measurement reports that shall be - taken for periodic reporting while the UE is in connected mode. - The attribute is applicable only for Immediate MDT and combined Trace - and Immediate MDT and when reportingTrigger is configured for periodical + description "It specifies the number of measurement reports that shall be + taken for periodic reporting while the UE is in connected mode. + The attribute is applicable only for Immediate MDT and combined Trace + and Immediate MDT and when reportingTrigger is configured for periodical measurements and applicable only for NR."; - reference "Clause 5.10.6 of TS 32.422."; + reference "Clause 5.10.6 of TS 32.422."; } } grouping LoggedMdtConfigGrp { - description "This <> defines the configuration parameters of + description "This <> defines the configuration parameters of IOC TraceJob which are specific for Logged MDT or Logged MBSFN MDT. - Based on the value configured for attribute jobType in IOC TraceJob, - different attributes are available. In case of LOGGED_MDT_ONLY, the - attributes reportType, eventListForEventTriggeredMeasurement, - eventThresholdL1, hysteresisL1, timeToTriggerL1, + Based on the value configured for attribute jobType in IOC TraceJob, + different attributes are available. In case of LOGGED_MDT_ONLY, the + attributes reportType, eventListForEventTriggeredMeasurement, + eventThresholdL1, hysteresisL1, timeToTriggerL1, areaConfigurationForNeighCells and npnIdentityList are applicable. - In case of LOGGED_MBSFN_MDT, + In case of LOGGED_MBSFN_MDT, the attribute mbsfnAreaList is applicable. The optional attribute - plmnList allows to specify the PLMNs where - measurement collection, status indication and log reporting is - allowed, the optional attribute areaConfigurationForNeighCell + plmnList allows to specify the PLMNs where + measurement collection, status indication and log reporting is + allowed, the optional attribute areaConfigurationForNeighCell allows to specify the area for which UE is requested to perform - measurements logging for neighbour cells which have list of - frequencies. - - For logged MDT in UMTS and LTE, the reporting is periodical. Parameter - loggingInterval determines the interval between the reports and parameter + measurements logging for neighbour cells which have list of + frequencies. + + For logged MDT in UMTS and LTE, the reporting is periodical. Parameter + loggingInterval determines the interval between the reports and parameter loggingDuration determines how long the configuration is valid meaning - after this duration has passed no further reports are sent. In NR, the - reporting can be periodical or event based, determined by parameter - reportType. For periodical reporting the same parameters as in LTE and - UMTS apply. For event based reporting, - parameter eventListForEventTriggeredMeasurement configures the event type, - namely 'out of coverage' or 'L1 event'. In case 'L1 event' is selected as + after this duration has passed no further reports are sent. In NR, the + reporting can be periodical or event based, determined by parameter + reportType. For periodical reporting the same parameters as in LTE and + UMTS apply. For event based reporting, + parameter eventListForEventTriggeredMeasurement configures the event type, + namely 'out of coverage' or 'L1 event'. In case 'L1 event' is selected as event type, the logging is performed according to parameter loggingInterval at regular intervals only when the conditions indicated by - eventThresholdL1, hysteresisL1, timeToTriggerL1 (defining the thresholds, + eventThresholdL1, hysteresisL1, timeToTriggerL1 (defining the thresholds, hysteresis and time to trigger) are met and if UE is 'camped normally' - state (TS 38.331, + state (TS 38.331, TS 38.304). In case 'out of coverage' is selected as event type, the - logging is performed according to parameter loggingInterval at regular - intervals only when the UE is in 'any cell selection' state. + logging is performed according to parameter loggingInterval at regular + intervals only when the UE is in 'any cell selection' state. Furthermore, logging is performed immediately upon transition from the - 'any cell selection' state to the 'camped normally' state (TS 38.331, + 'any cell selection' state to the 'camped normally' state (TS 38.331, TS 38.304)."; - + leaf traceCollectionEntityId { type int64; - description "It specifies the TCE Id which is sent to the UE in + description "It specifies the TCE Id which is sent to the UE in Logged MDT."; reference "Clause 5.10.11 of 3GPP TS 32.422."; } - + leaf loggingDuration { - when '../../../jobType = "LOGGED_MDT_ONLY" or' + when '../../../jobType = "LOGGED_MDT_ONLY" or' + ' ../../../jobType = "LOGGED_MBSFN_MDT"'; type uint32 { range "600|1200|2400|3600|5400|7200"; @@ -1395,7 +1395,7 @@ module _3gpp-common-trace { } leaf loggingInterval { - when '../../../jobType = "LOGGED_MDT_ONLY" or' + when '../../../jobType = "LOGGED_MDT_ONLY" or' + ' ../../../jobType = "LOGGED_MBSFN_MDT"'; type enumeration { enum 320ms; @@ -1414,7 +1414,7 @@ module _3gpp-common-trace { applicable only for Logged MDT and Logged MBSFN MDT."; reference "Clause 5.10.8 of 3GPP TS 32.422"; } - + leaf reportType { when '../../../jobType = "IMMEDIATE_MDT_ONLY"'; type enumeration { @@ -1424,7 +1424,7 @@ module _3gpp-common-trace { description "It specifies report type for logged NR MDT"; reference "Clause 5.10.27 of 3GPP TS 32.422."; } - + leaf eventListForEventTriggeredMeasurement { when '../../../jobType = "LOGGED_MDT_ONLY"'; type enumeration { @@ -1441,29 +1441,29 @@ module _3gpp-common-trace { } leaf eventThresholdL1 { - when '../../../jobType = "LOGGED_MDT_ONLY" or' + when '../../../jobType = "LOGGED_MDT_ONLY" or' + ' ../../../jobType = "LOGGED_MBSFN_MDT"'; type uint32 { range "0..127"; } - description "It specifies the threshold which should trigger - the reporting in case of event based reporting of logged NR MDT. - The attribute is applicable only for Logged MDT and when reportType - is configured for event triggered reporting and when + description "It specifies the threshold which should trigger + the reporting in case of event based reporting of logged NR MDT. + The attribute is applicable only for Logged MDT and when reportType + is configured for event triggered reporting and when eventListForEventTriggeredMeasurement is configured for L1 event."; reference "clause 5.10.36 of TS 32.422"; } - + leaf hysteresisL1 { when '../../../jobType = "LOGGED_MDT_ONLY" or ' + '../../../jobType = "LOGGED_MBSFN_MDT"'; type uint32 { range "0..30"; } - description "It specifies the hysteresis used within the entry and leave - condition of the L1 event based reporting of logged NR MDT. - The attribute is applicable only for Logged MDT, when reportType - is configured for event triggered reporting and when + description "It specifies the hysteresis used within the entry and leave + condition of the L1 event based reporting of logged NR MDT. + The attribute is applicable only for Logged MDT, when reportType + is configured for event triggered reporting and when eventListForEventTriggeredMeasurement is configured for L1 event."; reference "clause 5.10.37 of TS 32.422"; } @@ -1475,14 +1475,14 @@ module _3gpp-common-trace { range 0|40|64|80|100|128|160|256|320|480|512|640|1024|1280|2560|5120; } units milliseconds; - description "It specifies the threshold which should trigger - the reporting in case of event based reporting of logged NR MDT. - The attribute is applicable only for Logged MDT, when reportType - is configured for event triggered reporting and when + description "It specifies the threshold which should trigger + the reporting in case of event based reporting of logged NR MDT. + The attribute is applicable only for Logged MDT, when reportType + is configured for event triggered reporting and when eventListForEventTriggeredMeasurement is configured for L1 event."; reference "clause 5.10.38 of TS 32.422"; } - + list areaConfigurationForNeighCell { when '../../../jobType = "LOGGED_MDT_ONLY"'; key "idx"; @@ -1506,34 +1506,34 @@ module _3gpp-common-trace { Frequency (EARFCN). The target MBSFN area List can have up to 8 entries. This parameter is applicable only if the job type is Logged MBSFN MDT."; reference "Clause 5.10.25 of 3GPP TS 32.422."; - + uses MbsfnAreaGrp; } - + list nPNIdentityList { - description "It defines which NPNs that can be served by the NR cell, - and which CAG IDs or NIDs can be supported by the NR cell for + description "It defines which NPNs that can be served by the NR cell, + and which CAG IDs or NIDs can be supported by the NR cell for corresponding PNI-NPN or SNPN in case of the cell is NPN-only cell. (NPN-Identity referring to TS 38.331)"; key idx; - max-elements 1; + max-elements 1; uses types3gpp:NpnIdGrp; leaf idx { type string;} } } grouping MdtConfigGrp { - description "Defines the configuration parameters of IOC - TraceJob which are specific for MDT. The attribute - anonymizationOfMdtData specifies the level of anonymization + description "Defines the configuration parameters of IOC + TraceJob which are specific for MDT. The attribute + anonymizationOfMdtData specifies the level of anonymization of MDT data. The attribute areaScope defines the area scope of MDT, which is specified in clause 5.10.2 of TS 32.422. - The optional attribute sensorInformation allows to specify - the sensor information to include. Based on the value - configured for attribute jobType in IOC TraceJob, the attributes - immediateMdtConfig or loggedMdtConfig are available: In case of - IMMEDIATE_MDT_ONLY or IMMEDIATE_MDT_AND_TRACE the attribute - immediateMdtConfig is applicable. In case of LOGGED_MDT_ONLY or + The optional attribute sensorInformation allows to specify + the sensor information to include. Based on the value + configured for attribute jobType in IOC TraceJob, the attributes + immediateMdtConfig or loggedMdtConfig are available: In case of + IMMEDIATE_MDT_ONLY or IMMEDIATE_MDT_AND_TRACE the attribute + immediateMdtConfig is applicable. In case of LOGGED_MDT_ONLY or LOGGED_MBSFN_MDT the attribute loggedMdtConfig is applicable."; leaf anonymizationOfMdtData { @@ -1552,8 +1552,8 @@ module _3gpp-common-trace { key "idx"; leaf idx { type uint32 ; } description "It specifies the area where data shall be collected. "; - max-elements 1; - uses AreaScopeGrp; + max-elements 1; + uses AreaScopeGrp; } leaf-list sensorInformation { @@ -1568,32 +1568,32 @@ module _3gpp-common-trace { } list immediateMdtConfig { - description "The set of parameters specific for Immediate MDT + description "The set of parameters specific for Immediate MDT configuration."; key idx; max-elements 1; leaf idx { type string; } uses ImmediateMdtConfigGrp; } - + list loggedMdtConfig { - description "The set of parameters specific for Logged MDT and Logged + description "The set of parameters specific for Logged MDT and Logged MBSFN MDT configuration."; key idx; max-elements 1; leaf idx { type string; } uses LoggedMdtConfigGrp; - } - + } + leaf mNOnly { type boolean; default false; - description "Specifies whether the MDT configuration is for MN - only or not. The value FALSE means the MDT configuration is for - both MN and SN. The value TRUE means the MDT configuration is + description "Specifies whether the MDT configuration is for MN + only or not. The value FALSE means the MDT configuration is for + both MN and SN. The value TRUE means the MDT configuration is for MN only."; - } - + } + list plmnList { key "mcc mnc"; uses types3gpp:PLMNId; @@ -1601,23 +1601,23 @@ module _3gpp-common-trace { description "It indicates the PLMNs where measurement collection, status indication and log reporting is allowed."; reference "Clause 5.10.24 of 3GPP TS 32.422."; - } + } } grouping UECoreMeasConfigGrp { description "Represents the UECoreMeasConfig dataType. This <> defines the aconfiguration parameters of IOC TraceJob which are specific for UE level measurements collection."; - + leaf-list ueCoreMeasurements { type string; min-elements 1; description "List of 5GC UE level measurements identified by name. - The list may include 5GC UE level measurements defined in TS 28.558, + The list may include 5GC UE level measurements defined in TS 28.558, or vendor specific measurements. - - For non-3GPP specified 5GC UE level measurements the name is defined + + For non-3GPP specified 5GC UE level measurements the name is defined elsewhere."; } @@ -1625,21 +1625,21 @@ module _3gpp-common-trace { type uint32; mandatory true; units milliseconds; - description "Granularity period used to produce 5GC UE + description "Granularity period used to produce 5GC UE level measurements. The period is defined in milliseconds (ms)."; } leaf nfTypeToMeasure { type string; mandatory true; - description "It indicates the type of NE to produce the 5GC UE level + description "It indicates the type of NE to produce the 5GC UE level measurements. - - allowedValues: The NF types represented by the measured object - classes as defined by f) of the 5GC UE level measurements specified + + allowedValues: The NF types represented by the measured object + classes as defined by f) of the 5GC UE level measurements specified in TS 28.558."; - } - + } + leaf-list objectInstances { type string; description "List of object instances. @@ -1669,13 +1669,13 @@ module _3gpp-common-trace { enum 5GC_UE_LEVEL_MEASUREMENTS_ONLY; enum TRACE_AND_5GC_UE_LEVEL_MEASUREMENTS; enum IMMEDIATE_MDT_AND_5GC_UE_LEVEL_MEASUREMENTS; - enum TRACE_AND_IMMEDIATE_MDT_AND_5GC_UE_LEVEL_MEASUREMENTS; + enum TRACE_AND_IMMEDIATE_MDT_AND_5GC_UE_LEVEL_MEASUREMENTS; enum RRC_REPORT; } default TRACE_ONLY; description "It specifies whether the - TraceJob represents only MDT, Trace, RLF, RCEF, RRC or 5GC UE - level measurements job, or a combined job. It also defines the + TraceJob represents only MDT, Trace, RLF, RCEF, RRC or 5GC UE + level measurements job, or a combined job. It also defines the MDT mode."; reference "Clause 5.9a of 3GPP TS 32.422."; } @@ -1697,7 +1697,7 @@ module _3gpp-common-trace { description "It specifies which PLMN that the subscriber of the session to be recorded uses as selected PLMN."; reference "Clause 5.9b of 3GPP TS 32.422"; - + uses types3gpp:PLMNId; } @@ -1706,10 +1706,10 @@ module _3gpp-common-trace { + ' or ../jobType = "IMMEDIATE_MDT_AND_TRACE"'; type string; description "List of trace metrics identified by name. - Includes trace messages, MDT measurements (Immediate MDT, - Logged MDT, Logged MBSFN MDT), RLF, RCEF and RRC reports, + Includes trace messages, MDT measurements (Immediate MDT, + Logged MDT, Logged MBSFN MDT), RLF, RCEF and RRC reports, see TS 32.422 Trace messages are identified with their message - identifier. Trace metric identifier is constructed as defined + identifier. Trace metric identifier is constructed as defined in clause 10 of TS 32.422. For non-3GPP specified trace metrics the name is defined elsewhere. "; @@ -1718,13 +1718,13 @@ module _3gpp-common-trace { leaf traceCollectionEntityIPAddress { type inet:ip-address; - description "It specifies the address of the Trace Collection Entity - when the attribute traceReportingFormat is configured for the - file-based reporting. The attribute is applicable for both Trace and + description "It specifies the address of the Trace Collection Entity + when the attribute traceReportingFormat is configured for the + file-based reporting. The attribute is applicable for both Trace and MDT."; reference "Clause 5.9 of 3GPP TS 32.422."; } - + leaf traceReportingConsumerUri { when '../traceReportingFormat = "STREAMING"'; @@ -1733,7 +1733,7 @@ module _3gpp-common-trace { (a.k.a. streaming target)."; reference "Clause 5.9 of 3GPP TS 32.422."; } - + list traceReference { key "idx"; min-elements 1; @@ -1746,7 +1746,7 @@ module _3gpp-common-trace { reference "Clause 5.6 of 3GPP TS 32.422."; leaf idx { type uint32 ; } - uses trace3gpp:TraceReferenceGrp ; + uses trace3gpp:TraceReferenceGrp ; } leaf jobId { @@ -1765,15 +1765,15 @@ module _3gpp-common-trace { reporting or file-based trace reporting"; reference "3GPP TS 32.422 clause 5.11"; } - + list traceTarget { key "traceTargetType"; max-elements 1; - description "It specifies the target object of the Trace, MDT and + description "It specifies the target object of the Trace, MDT and 5GC UE level measurements collection. The attribute is applicable for Trace, MDT, and 5GC UE level measurements collection. - In case of management based Immediate MDT, RLF reporting, RCEF - reporting or RRC reposring, the traceTarget attribute shall be null + In case of management based Immediate MDT, RLF reporting, RCEF + reporting or RRC reposring, the traceTarget attribute shall be null value."; leaf traceTargetType { @@ -1791,15 +1791,15 @@ module _3gpp-common-trace { enum SUPI; enum N4_SESSION_ID; } - description "It specifies the target object of the Trace, MDT and + description "It specifies the target object of the Trace, MDT and 5GC UE level measurements collection. The attribute is applicable for Trace, MDT, and 5GC UE level measurements collection. The targetIdType shall be PUBLIC_ID in case of a Management Based Activation is done to an SCSCFFunction (Serving Call Session Control - Function) or PCSCFFunction (Proxy Call Session Control Function) + Function) or PCSCFFunction (Proxy Call Session Control Function) - The targetIdType shall be UTRAN_CELL only in case of + The targetIdType shall be UTRAN_CELL only in case of UTRAN cell traffic trace function. The targetIdType shall be E-UTRAN_CELL only in case of E-UTRAN cell @@ -1834,27 +1834,27 @@ module _3gpp-common-trace { - UPFFunction - UDMFunction - In case of signalling based MDT, the targetIdType shall be + In case of signalling based MDT, the targetIdType shall be able to carry PUBLIC_ID, IMSI, IMEI, IMEISV or SUPI. - In case of management based Logged MDT, the targetIdType - shall carry an eNB or a gNB or an RNC. + In case of management based Logged MDT, the targetIdType + shall carry an eNB or a gNB or an RNC. The Logged MDT should be initiated on the specified eNB/gNB/RNC in targetIdValueList. - - In case of signalling based 5GC UE level measurements collection, - the targetIdTypee shall be able to carry IMEISV or SUPI. - - In case of management based 5GC UE level measurements collection, - the targetIdType shall be able to carry the corresponding - Measured UE Identifier as defined by the bullet g) of the 5GC UE - level measurements (see TS 28.558) when the TraceJob is created at + + In case of signalling based 5GC UE level measurements collection, + the targetIdTypee shall be able to carry IMEISV or SUPI. + + In case of management based 5GC UE level measurements collection, + the targetIdType shall be able to carry the corresponding + Measured UE Identifier as defined by the bullet g) of the 5GC UE + level measurements (see TS 28.558) when the TraceJob is created at the subject ManagedEntity."; } leaf-list traceTargetValueList { type string; - description "It specifies the ID value(s) of the target object defined + description "It specifies the ID value(s) of the target object defined by traceTargetType"; } @@ -1865,50 +1865,50 @@ module _3gpp-common-trace { when '../jobType = "TRACE_ONLY"' + ' or ../jobType = "IMMEDIATE_MDT_AND_TRACE"' + ' or ../jobType = "TRACE_AND_5GC_UE_LEVEL_MEASUREMENTS"' - + ' or ../jobType = - "TRACE_AND_IMMEDIATE_MDT_AND_5GC_UE_LEVEL_MEASUREMENTS"'; + + ' or ../jobType = + "TRACE_AND_IMMEDIATE_MDT_AND_5GC_UE_LEVEL_MEASUREMENTS"'; key idx; description "Trace config"; max-elements 1; - uses TraceConfigGrp; + uses TraceConfigGrp; leaf idx { type string; } } - - list mdtConfig { + + list mdtConfig { when '../jobType = "IMMEDIATE_MDT_ONLY"' + ' or ../jobType = "IMMEDIATE_MDT_AND_TRACE"' + ' or ../jobType = "RLF_REPORT_ONLY"' + ' or ../jobType = "RCEF_REPORT_ONLY"' + ' or ../jobType = "LOGGED_MBSFN_MDT"' + ' or ../jobType = "IMMEDIATE_MDT_AND_5GC_UE_LEVEL_MEASUREMENTS"' - + ' or ../jobType = + + ' or ../jobType = "TRACE_AND_IMMEDIATE_MDT_AND_5GC_UE_LEVEL_MEASUREMENTS"'; key idx; description "MDT config"; - max-elements 1; + max-elements 1; uses MdtConfigGrp; - leaf idx { type string; } + leaf idx { type string; } } - list ueCoreMeasConfig { + list ueCoreMeasConfig { when '../jobType = "5GC_UE_LEVEL_MEASUREMENTS_ONLY"' + ' or ../jobType = "TRACE_AND_5GC_UE_LEVEL_MEASUREMENTS"' + ' or ../jobType = "IMMEDIATE_MDT_AND_5GC_UE_LEVEL_MEASUREMENTS"' - + ' or ../jobType = + + ' or ../jobType = "TRACE_AND_IMMEDIATE_MDT_AND_5GC_UE_LEVEL_MEASUREMENTS"'; key idx; description "5GC UE level measurements config"; - max-elements 1; + max-elements 1; uses UECoreMeasConfigGrp; - leaf idx { type string; } + leaf idx { type string; } } - + list nPNTarget { - description "applicable only for NR and shall be present in case of NPN - either a PNI-NPN or a SNPN) and for management-based activation when + description "applicable only for NR and shall be present in case of NPN + either a PNI-NPN or a SNPN) and for management-based activation when several NPNs are supported in the RAN."; key idx; - max-elements 1; + max-elements 1; uses types3gpp:NpnIdGrp; leaf idx { type string;} } @@ -1925,75 +1925,75 @@ module _3gpp-common-trace { augment all user classes!"; list TraceJob { - description "A TraceJob instance represents the Trace Control and - Configuration parameters of a particular Trace Job (see TS 32.421 and - TS 32.422 for details). It can be name-contained by SubNetwork, + description "A TraceJob instance represents the Trace Control and + Configuration parameters of a particular Trace Job (see TS 32.421 and + TS 32.422 for details). It can be name-contained by SubNetwork, ManagedElement, ManagedFunction. - To activate Trace Jobs, a MnS consumer has to create TraceJob object - instances on the MnS producer. A MnS consumer can activate a Trace Job - for another MnS consumer since it is not required the value of - traceCollectionEntityIPAddress or traceReportingConsumerUri to be + To activate Trace Jobs, a MnS consumer has to create TraceJob object + instances on the MnS producer. A MnS consumer can activate a Trace Job + for another MnS consumer since it is not required the value of + traceCollectionEntityIPAddress or traceReportingConsumerUri to be his own. - For the details of Trace Job activation see clauses 4.1.1.1.2 and + For the details of Trace Job activation see clauses 4.1.1.1.2 and 4.1.2.1.2 of TS 32.422. - When a MnS consumer wishes to deactivate a Trace Job, the MnS consumer - shall delete the corresponding TraceJob instance. - + When a MnS consumer wishes to deactivate a Trace Job, the MnS consumer + shall delete the corresponding TraceJob instance. + For details of management Trace Job activation/deactivation see clause 4.1.1.1.2 of TS 32.422. - The attribute traceReference specifies a globally unique ID and - identifies a Trace session. One Trace Session may be activated to + The attribute traceReference specifies a globally unique ID and + identifies a Trace session. One Trace Session may be activated to multiple Network Elements. The traceReference is populated by the consumer that makes the request for a Trace Session. - The jobId attribute presents the job identifier of a TraceJob instance. - The jobId can be used to associate multiple TraceJob instances. - For example, it is possible to configure the same jobId value for - multiple TraceJob instances required to produce the data (e.g. RSRP + The jobId attribute presents the job identifier of a TraceJob instance. + The jobId can be used to associate multiple TraceJob instances. + For example, it is possible to configure the same jobId value for + multiple TraceJob instances required to produce the data (e.g. RSRP values of M1 and RLF reports) for a specific network analysis. - The attribute traceReportingFormat defines the method for reporting - the produced measurements. The selectable options are file-based or - stream-based reporting. In case of file-based reporting the attribute - traceCollectionEntityIPAddress is used to specify the IP address to - which the trace records shall be transferred, while in case of - stream-based reporting the attribute traceReportingConsumerUri + The attribute traceReportingFormat defines the method for reporting + the produced measurements. The selectable options are file-based or + stream-based reporting. In case of file-based reporting the attribute + traceCollectionEntityIPAddress is used to specify the IP address to + which the trace records shall be transferred, while in case of + stream-based reporting the attribute traceReportingConsumerUri specifies the streaming target. - The mandatory attribute traceTarget determines the target object of - the TraceJob. Dependent on the network element to which the Trace - Session is activated different types of the target object are possible. - The attribute pLMNTarget defines the PLMN for which sessions shall be - selected in the Trace Session in case of management based activation + The mandatory attribute traceTarget determines the target object of + the TraceJob. Dependent on the network element to which the Trace + Session is activated different types of the target object are possible. + The attribute pLMNTarget defines the PLMN for which sessions shall be + selected in the Trace Session in case of management based activation when several PLMNs are supported in the RAN.The MDT configuration may - include area scope defined by network slice, in which case + include area scope defined by network slice, in which case the attribute pLMNTarget is not applicable. The attribute listOfTraceMetrics allows configuraton of which metrics shall be recorded. - The attribute jobType specifies the kind of data to collect. In case of - TRACE_ONLY, the configuration parameters of attribute traceConfig - shall be applied. In case of IMMEDIATE_MDT_ONLY, LOGGED_MDT_ONLY, - RLF_REPORT_ONLY, RCEF_REPORT_ONLY and LOGGED_MBSFN_MDT the - configuration parameters of - attribute mdtConfig or a subset of these shall be applied. In case of + The attribute jobType specifies the kind of data to collect. In case of + TRACE_ONLY, the configuration parameters of attribute traceConfig + shall be applied. In case of IMMEDIATE_MDT_ONLY, LOGGED_MDT_ONLY, + RLF_REPORT_ONLY, RCEF_REPORT_ONLY and LOGGED_MBSFN_MDT the + configuration parameters of + attribute mdtConfig or a subset of these shall be applied. In case of 5GC_UE_LEVEL_MEASUREMENTS_ONLY, the configuration parameters - of attribute ueCoreMeasConfig shall be applied. In case of any - combination of Trace, Immediate MDT, and 5GC UE level measurements, + of attribute ueCoreMeasConfig shall be applied. In case of any + combination of Trace, Immediate MDT, and 5GC UE level measurements, the configuration parameters - of the corresponding attributes, traceConfig, mdtConfig and + of the corresponding attributes, traceConfig, mdtConfig and ueCoreMeasConfig are applicable. - If jobType has the value RRC Report, the attribute rrcReportType shall + If jobType has the value RRC Report, the attribute rrcReportType shall bepresent. The rrcReportType allows the tracing of RRC reports. - Creation and deletion of TraceJob instances by MnS consumers is - optional; when not supported, the TraceJob instances may be created + Creation and deletion of TraceJob instances by MnS consumers is + optional; when not supported, the TraceJob instances may be created and deleted by the system or be pre-installed."; key id; diff --git a/yang-models/_3gpp-common-util.yang b/yang-models/_3gpp-common-util.yang index 040b1f501..0f0c11a39 100644 --- a/yang-models/_3gpp-common-util.yang +++ b/yang-models/_3gpp-common-util.yang @@ -1,10 +1,10 @@ module _3gpp-common-util { - yang-version 1.1; + yang-version 1.1; namespace urn:3gpp:sa5:_3gpp-common-util; prefix "util3gpp"; - + import ietf-yang-types { prefix yang ; } - import _3gpp-common-top { prefix top3gpp; } + import _3gpp-common-top { prefix top3gpp; } import _3gpp-common-yang-types { prefix types3gpp ; } import _3gpp-common-managed-element { prefix me3gpp ; } import _3gpp-common-subnetwork { prefix subnet3gpp ; } @@ -13,60 +13,60 @@ module _3gpp-common-util { contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464"; description "Defines Utility IOCs: ConditionMonitor, Scheduler - Copyright 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + Copyright 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved."; reference "3GPP TS 28.623"; revision 2024-08-13 { reference CR-0387; } - revision 2024-07-30 { reference "CR-0392 CR-0393"; } + revision 2024-07-30 { reference "CR-0392 CR-0393"; } revision 2024-05-06 { reference CR-0359; } feature SchedulerUnderManagedElement { description "Scheduler shall be contained under ManagedElement."; - } + } feature SchedulerUnderSubNetwork { description "Scheduler shall be contained under SubNetwork."; - } - + } + grouping TimeIntervalGrp { - description "This data type defines a time interval within one day. - If the whole day shall be selected, intervalStart shall be set to + description "This data type defines a time interval within one day. + If the whole day shall be selected, intervalStart shall be set to 00:00:00 and intervalEnd shall be set to 23:59:59."; - + leaf intervalStart { type types3gpp:FullTime; mandatory true; - description "It indicates the time (in 'full-time' format) when the + description "It indicates the time (in 'full-time' format) when the service shall be started. - Data type 'FullTime' defines the time as specified by 'full-time' + Data type 'FullTime' defines the time as specified by 'full-time' in RFC3339."; } - + leaf intervalEnd { type types3gpp:FullTime; mandatory true; - description "It indicates the time (in 'full-time' format) when the + description "It indicates the time (in 'full-time' format) when the service shall be stopped. 'FullTime' defines the time as specified by 'full-time' in RFC3339. - intervalEnd should use the same timezone as intervalStart and shall + intervalEnd should use the same timezone as intervalStart and shall be later then intervalStart"; } } - + grouping SchedulingTimeGrp { - description "This <> defines the scheduling time and allows to - configure one of four possible scheduling methods: + description "This <> defines the scheduling time and allows to + configure one of four possible scheduling methods: - - One time interval: The attribute timeWindow presents the active + - One time interval: The attribute timeWindow presents the active scheduling time. A duration more than one day may be configured. - - Daily periodicity: Several active intervals per day can be configured + - Daily periodicity: Several active intervals per day can be configured in attribute timeIntervals. The active scheduling times recur each day. - - Weekly periodicity: Several active intervals for one day can be - configured in attribute timeIntervals. The active scheduling times recur - on the days of the weeks configured by attribute daysOfWeek - - Monthly periodicity: Several active intervals for one day can be - configured in attribute timeIntervals. The active scheduling times + - Weekly periodicity: Several active intervals for one day can be + configured in attribute timeIntervals. The active scheduling times recur + on the days of the weeks configured by attribute daysOfWeek + - Monthly periodicity: Several active intervals for one day can be + configured in attribute timeIntervals. The active scheduling times recur on the days of the months configured by attribute daysOfMonth."; choice SchedulingTime { mandatory true; @@ -75,7 +75,7 @@ module _3gpp-common-util { } case periodic { list timeIntervals { - description "List of intervals within one day for which the service + description "List of intervals within one day for which the service shall be active."; key "intervalStart intervalEnd"; min-elements 1; @@ -83,23 +83,23 @@ module _3gpp-common-util { } leaf daysOfWeek { must 'not(../daysOfMonth)'; - description "Shall be present in case of Weekly periodicity, + description "Shall be present in case of Weekly periodicity, otherwise not"; type types3gpp:DayOfWeek; } leaf daysOfMonth { must 'not(../daysOfWeek)'; - description "Shall be present in case of Monthly periodicity, + description "Shall be present in case of Monthly periodicity, otherwise not"; type types3gpp:DateMonthDay; } } } } - + grouping SchedulerGrp { description "Represents the Scheduler IOC."; - + list schedulingTimes { description "It defines the active scheduling times."; min-elements 1; @@ -107,36 +107,36 @@ module _3gpp-common-util { leaf idx { type uint32; } uses SchedulingTimeGrp; } - + leaf schedulerStatus { type boolean; mandatory true; config false; - description "Switches between TRUE and FALSE depending upon whether the + description "Switches between TRUE and FALSE depending upon whether the configured time constraints are fulfilled or not."; } } - + grouping SchedulerSubtree { list Scheduler { - description "This IOC defines a time scheduler. + description "This IOC defines a time scheduler. It can be name-contained by SubNetwork or ManagedElement. - - The attribute schedulingTimes allows to configure one or several - active time intervals. The active intervals can be configured to occur + + The attribute schedulingTimes allows to configure one or several + active time intervals. The active intervals can be configured to occur once or recurring periodically. - - The boolean attribute schedulerStatus switches between TRUE and FALSE - depending upon whether the configured time constraints are fulfilled + + The boolean attribute schedulerStatus switches between TRUE and FALSE + depending upon whether the configured time constraints are fulfilled or not. This attribute makes the internal Scheduler status observable."; - key id; + key id; uses top3gpp:Top_Grp; container attributes { uses SchedulerGrp; - } + } } } - + augment /me3gpp:ManagedElement { if-feature SchedulerUnderManagedElement; uses SchedulerSubtree; @@ -145,73 +145,73 @@ module _3gpp-common-util { if-feature SchedulerUnderSubNetwork; uses SchedulerSubtree; } - + /////////////////////////////////////////////////////////////////////////////// feature ConditionMonitorUnderManagedElement { description "ConditionMonitor shall be contained under ManagedElement."; - } + } feature ConditionMonitorUnderSubNetwork { description "ConditionMonitor shall be contained under SubNetwork."; - } + } grouping ConditionMonitorGrp { description "Represents the Scheduler IOC."; - + leaf condition { type yang:xpath1.0 { length 1..max; } mandatory true; - description "A logical condition containing an XPath expression. - The leaf contains an XPath 1.0 string with the following restrictions - - The accessible tree is the full Network Resource Model - - The root node is the list representing the top level MOI + description "A logical condition containing an XPath expression. + The leaf contains an XPath 1.0 string with the following restrictions + - The accessible tree is the full Network Resource Model + - The root node is the list representing the top level MOI (E.g. ManagedElement) - In the accessible tree, all leafs and leaf-lists with default values in use exist - - The data tree has no concept of document order except when 'ordered-by + - The data tree has no concept of document order except when 'ordered-by user' is declared. - The set of variable bindings is empty. - The function library is the core function library defined in XPATH - - Namespaces should be ignored when evaluating the expression + - Namespaces should be ignored when evaluating the expression An empty string is not allowed."; } - + leaf conditionStatus { type boolean; mandatory true; config false; description "The boolean result of the condition. - Switches between TRUE and FALSE depending upon whether the + Switches between TRUE and FALSE depending upon whether the configured constraints are fulfilled or not."; } } - + grouping ConditionMonitorSubtree { list ConditionMonitor { - description "This IOC defines one or several conditions and monitors - whether these conditions are satisfied. It can be name-contained by + description "This IOC defines one or several conditions and monitors + whether these conditions are satisfied. It can be name-contained by SubNetwork or ManagedElement. - - The attribute condition allows to configure one or several conditions. - Possible conditions include but are not limited to scheduling - requirements or parameter settings e.g. evaluation if a configuration - parameter is above a certain threshold or has a certain values. - - The boolean attribute conditionStatus switches between TRUE and FALSE - depending upon whether the configured conditions are fulfilled or not. + + The attribute condition allows to configure one or several conditions. + Possible conditions include but are not limited to scheduling + requirements or parameter settings e.g. evaluation if a configuration + parameter is above a certain threshold or has a certain values. + + The boolean attribute conditionStatus switches between TRUE and FALSE + depending upon whether the configured conditions are fulfilled or not. This attribute makes the internal ConditionMonitor status observable."; - key id; + key id; uses top3gpp:Top_Grp; container attributes { uses ConditionMonitorGrp; - } + } } } - + augment /me3gpp:ManagedElement { if-feature ConditionMonitorUnderManagedElement; uses ConditionMonitorSubtree; @@ -219,5 +219,5 @@ module _3gpp-common-util { augment /subnet3gpp:SubNetwork { if-feature ConditionMonitorUnderSubNetwork; uses ConditionMonitorSubtree; - } + } } \ No newline at end of file diff --git a/yang-models/_3gpp-common-yang-extensions.yang b/yang-models/_3gpp-common-yang-extensions.yang index 0b1c1ee27..6f32cfcb9 100755 --- a/yang-models/_3gpp-common-yang-extensions.yang +++ b/yang-models/_3gpp-common-yang-extensions.yang @@ -6,7 +6,7 @@ module _3gpp-common-yang-extensions { organization "3GPP SA5"; contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464"; - description "The module defines YANG extensions needed + description "The module defines YANG extensions needed 3GPP YANG modeling. Extensions MUST be defined with the following structure in the @@ -18,7 +18,7 @@ module _3gpp-common-yang-extensions { - This statement can have the following substatements with cardinality x..y. - Newline - - Is changing this statement an editorial, BC(backwards compatible) + - Is changing this statement an editorial, BC(backwards compatible) or NBC(non-BC) change? - Newline. - The argument its meaning and type. Preferably use YANG types and @@ -38,7 +38,7 @@ module _3gpp-common-yang-extensions { If support for an extension is missing the extension statement needs individual handling or it SHOULD be removed from the module using the extension e.g. with a deviation. - Copyright 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + Copyright 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved."; reference "3GPP TS 28.623 Generic Network Resource Model (NRM) @@ -46,77 +46,77 @@ module _3gpp-common-yang-extensions { Solution Set (SS) definitions 3GPP TS 28.623"; - revision 2025-01-12 { reference "CR-0507, 0492" ; } - revision 2024-04-05 { reference "CR-0332, 0333" ; } - revision 2023-09-17 { reference "CR-0270, 0271" ; } + revision 2025-01-12 { reference "CR-0507, 0492" ; } + revision 2024-04-05 { reference "CR-0332, 0333" ; } + revision 2023-09-17 { reference "CR-0270, 0271" ; } revision 2022-10-31 { reference "CR-0195, 0196"; } revision 2019-06-23 { reference "Initial version"; } extension only-system-created { description - "Indicates that the MOI can only be created and deleted by the - MnS producer. + "Indicates that the MOI can only be created and deleted by the + MnS producer. System created MOIs can have both read-only and read-write data - node children. Implementers shall add the extension to standard + node children. Implementers shall add the extension to standard models if they restrict creation/deletion of an IOC. - + The statement MUST only be a sub-statement of the list statement, with the parent list statement representing an IOC. Zero or one only-system-created statement per parent statement is allowed. No sub-statements are allowed. - - Adding this statement is an NBC change, - removing it is BC, however if the system behavior is also changed in + + Adding this statement is an NBC change, + removing it is BC, however if the system behavior is also changed in parallel (the system stops creating the MOIs), this behavior is NBC."; } extension notNotifyable { description - "Indicates that data change notifications shall not be sent - for this attribute. If the extension is not present and other + "Indicates that data change notifications shall not be sent + for this attribute. If the extension is not present and other conditions are fulfilled data change notification should be sent. - - If a list or container already has the notNotifyable + + If a list or container already has the notNotifyable extension, that is also valid for all contained data nodes. The statement MUST only be a substatement of a leaf, leaf-list, list, - container statement that is contained within the 'attributes' - container of an IOC and that represents an attribute or sub-parts of - an attribute. If the attribute is represented by a container or list, - the statement shall be put on these, not on data nodes inside the + container statement that is contained within the 'attributes' + container of an IOC and that represents an attribute or sub-parts of + an attribute. If the attribute is represented by a container or list, + the statement shall be put on these, not on data nodes inside the list/container. Zero or one notNotifyable statement is allowed per parent statement. NO substatements are allowed. - + Adding this statement is an NBC change, removing it is BC."; } extension inVariant { description - "Indicates that the value for the data node can only be set when the list + "Indicates that the value for the data node can only be set when the list data node representing the containing object(MOI) is created. - The above statement in YANG terms means, that the value for the data - node can only be set when the list entry that is the parent of the - restricted node's ancestor container named 'attributes' is being created. - To change the value after that, the mentioned + The above statement in YANG terms means, that the value for the data + node can only be set when the list entry that is the parent of the + restricted node's ancestor container named 'attributes' is being created. + To change the value after that, the mentioned list data node must be deleted and recreated with the restricted data node having the new value. - If a list or container already has the inVariant + If a list or container already has the inVariant extension, that is also valid for all contained data nodes. It is unnecessary to use and MUST NOT be used for key leafs. The statement MUST only be a substatement of a leaf, leaf-list, list, - container statement that is contained within the 'attributes' - container of an IOC and that represents an attribute or sub-parts of - an attribute and is config=true. If the attribute is represented by a - container or list, the statement shall be put on these, not on data + container statement that is contained within the 'attributes' + container of an IOC and that represents an attribute or sub-parts of + an attribute and is config=true. If the attribute is represented by a + container or list, the statement shall be put on these, not on data nodes inside the list/container. Zero or one inVariant statement is allowed per parent statement. NO substatements are allowed. - + Adding this statement is an NBC change, removing it is BC."; } @@ -130,10 +130,10 @@ module _3gpp-common-yang-extensions { the label 'Initial-value: ' followed by the text from the argument. The statement MUST only be a substatement of a leaf or leaf-list. - The statement MUST NOT be present if the leaf or the leaf-list - has a default statement or the type used for the data node + The statement MUST NOT be present if the leaf or the leaf-list + has a default statement or the type used for the data node has a default value. - The statement MUST NOT be used for config=false data or in an + The statement MUST NOT be used for config=false data or in an action, rpc or notification. Zero or one initial-value statements are allowed for a leaf parent statement. Zero or more initial-value statements are allowed for a diff --git a/yang-models/_3gpp-common-yang-types.yang b/yang-models/_3gpp-common-yang-types.yang index e060a1203..769690e65 100755 --- a/yang-models/_3gpp-common-yang-types.yang +++ b/yang-models/_3gpp-common-yang-types.yang @@ -2,31 +2,31 @@ module _3gpp-common-yang-types { yang-version 1.1; namespace "urn:3gpp:sa5:_3gpp-common-yang-types"; prefix "types3gpp"; - + import ietf-inet-types { prefix inet; } import ietf-yang-types { prefix yang; } import _3gpp-common-yang-extensions { prefix yext3gpp; } organization "3GPP SA5"; contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464"; - description "The model defines a YANG mapping of the top level - information classes used for management of 5G networks and + description "The model defines a YANG mapping of the top level + information classes used for management of 5G networks and network slicing. - Copyright 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + Copyright 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved."; reference "3GPP TS 28.623"; - revision 2025-02-19 { reference CR-0512; } + revision 2025-02-19 { reference CR-0512; } revision 2025-02-07 { reference CR-0492; } - revision 2024-11-25 { reference CR-1442; } - revision 2024-11-25 { reference CR-1412; } - revision 2024-11-01 { reference CR-0463; } - revision 2024-08-13 { reference CR-0387; } - revision 2024-05-18 { reference CR-0359; } - revision 2024-04-12 { reference CR-0346; } + revision 2024-11-25 { reference CR-1442; } + revision 2024-11-25 { reference CR-1412; } + revision 2024-11-01 { reference CR-0463; } + revision 2024-08-13 { reference CR-0387; } + revision 2024-05-18 { reference CR-0359; } + revision 2024-04-12 { reference CR-0346; } revision 2023-11-06 { reference CR-0305; } - revision 2023-09-18 { reference CR-0271 ; } + revision 2023-09-18 { reference CR-0271 ; } revision 2023-08-09 { reference CR-0266; } revision 2023-05-10 { reference CR-0250; } revision 2023-02-14 { reference CR-0234; } @@ -35,7 +35,7 @@ module _3gpp-common-yang-types { revision 2022-07-26 { reference "CR-0180" ; } revision 2022-02-09 { reference "CR-0144"; } revision 2021-11-01 { reference "CR-0141"; } - + revision 2021-09-30 { description "Added Longitude, Latitude, TenthOfDegrees, OnOff."; reference "CR-0138"; @@ -50,7 +50,7 @@ module _3gpp-common-yang-types { description "Removed faulty when statements."; reference "SP-200229"; } - + revision 2019-10-25 { description "Added ManagedNFProfile."; reference "S5-194457"; @@ -71,7 +71,7 @@ module _3gpp-common-yang-types { enum ENABLED ; } } - + grouping nameValuePair { leaf name { type string; } leaf value { type string; } @@ -88,7 +88,7 @@ module _3gpp-common-yang-types { enum Sunday; } } - + typedef DayOfWeek { type enumeration { enum MONDAY; @@ -100,26 +100,26 @@ module _3gpp-common-yang-types { enum SUNDAY; } } - + typedef DateMonth { type uint8 { range 0..12; } } - + typedef DateMonthDay { type uint8 { range 0..31; } } - + typedef FullTime { type yang:time-with-zone-offset; } - + grouping DayInYearGrp { description "This <> represents a day in a year."; - + leaf month { description "It indicates the month in a year."; type DateMonth; @@ -142,85 +142,85 @@ module _3gpp-common-yang-types { type yang:date-and-time; yext3gpp:inVariant; } - } - + } + grouping ProcessMonitorGrp { - description "Provides attributes to monitor the progress of processes - with specific purpose and limited lifetime running on MnS producers. - It may be used as data type for dedicated progress monitor attributes - when specifying the management representation of these processes. - The attributes in this clause are defined in a generic way. - For some attributes specialisations may be provided when specifying a + description "Provides attributes to monitor the progress of processes + with specific purpose and limited lifetime running on MnS producers. + It may be used as data type for dedicated progress monitor attributes + when specifying the management representation of these processes. + The attributes in this clause are defined in a generic way. + For some attributes specialisations may be provided when specifying a concrete process representation. - If a management operation on some IOCs triggers an associated - asynchronous process (whose progress shall be monitored), this should - also result in creating an attribute named 'processMonitor' (of type - 'ProcessMonitor') in these IOC(s). The processMonitor attribute may be + If a management operation on some IOCs triggers an associated + asynchronous process (whose progress shall be monitored), this should + also result in creating an attribute named 'processMonitor' (of type + 'ProcessMonitor') in these IOC(s). The processMonitor attribute may be accompanied by use-case specific additional data items. - The progress of the process is described by the 'status' and - 'progressPercentage' attributes. Additional textual qualifications for - the 'status' attribute may be provided by the 'progressStateInfo' and + The progress of the process is described by the 'status' and + 'progressPercentage' attributes. Additional textual qualifications for + the 'status' attribute may be provided by the 'progressStateInfo' and 'resultStateInfo' attributes. - When the process is instantiated, the 'status' is set to 'NOT_RUNNING' - and the 'progressPercentage' to '0'. The MnS producer decides when to - start executing the process and to transition into the 'RUNNING' state. - This time is captured in the 'startTime' attribute. Alternatively, the - process may start to execute directly upon its instantiation. One + When the process is instantiated, the 'status' is set to 'NOT_RUNNING' + and the 'progressPercentage' to '0'. The MnS producer decides when to + start executing the process and to transition into the 'RUNNING' state. + This time is captured in the 'startTime' attribute. Alternatively, the + process may start to execute directly upon its instantiation. One alternative must be selected when using this data type. - During the 'RUNNING' state the 'progressPercentage' attribute may be - repeatedly updated. The exact semantic of this attribute is subject to - further specialisation. The 'progressInfo' attribute may be used to - provide additional textual information in the 'NOT_RUNNING', 'CANCELLING' - and 'RUNNING' states. Further specialisation of - 'progressStateInfo' may be provided where this data type is + During the 'RUNNING' state the 'progressPercentage' attribute may be + repeatedly updated. The exact semantic of this attribute is subject to + further specialisation. The 'progressInfo' attribute may be used to + provide additional textual information in the 'NOT_RUNNING', 'CANCELLING' + and 'RUNNING' states. Further specialisation of + 'progressStateInfo' may be provided where this data type is used. - Upon successful completion of the process, the 'status' attribute is set - to 'FINISHED', the 'progressPercentage' to 100%. The time is captured in - the 'endTime' attribute. Additional textual information may be provided - in the 'resultStateInfo' attribute. The type of - 'resultStateInfo' in this data type definition is 'String'. - Further specialisation of 'resultStateInfo' may be provided + Upon successful completion of the process, the 'status' attribute is set + to 'FINISHED', the 'progressPercentage' to 100%. The time is captured in + the 'endTime' attribute. Additional textual information may be provided + in the 'resultStateInfo' attribute. The type of + 'resultStateInfo' in this data type definition is 'String'. + Further specialisation of 'resultStateInfo' may be provided where this data type is used. - In case the process fails to complete successfully, the 'status' - attribute is set to 'FAILED' or 'PARTIALLY_FAILED', the current value of - 'progressPercentage' is frozen, and the time captured in 'endTime'. The - 'resultStateInfo' specifies the reason for the failure. - Specific failure reasons may be specified where the data type defined in - this clause is used. The exact semantic of failure may be subject for + In case the process fails to complete successfully, the 'status' + attribute is set to 'FAILED' or 'PARTIALLY_FAILED', the current value of + 'progressPercentage' is frozen, and the time captured in 'endTime'. The + 'resultStateInfo' specifies the reason for the failure. + Specific failure reasons may be specified where the data type defined in + this clause is used. The exact semantic of failure may be subject for further specialisation as well. - In case the process is cancelled, the 'status' attribute is first set to - 'CANCELLING' and when the process is really cancelled then to 'CANCELLED'. - The transition to 'CANCELLED' is captured in the 'endTime' attribute. - The value of 'progressPercentage' is frozen. Additional textual + In case the process is cancelled, the 'status' attribute is first set to + 'CANCELLING' and when the process is really cancelled then to 'CANCELLED'. + The transition to 'CANCELLED' is captured in the 'endTime' attribute. + The value of 'progressPercentage' is frozen. Additional textual information may be provided in the 'resultStateInfo' attribute. - The 'resultStateInfo' attribute is provided only for additional textual - qualification of the states 'FINISHED', 'FAILED', 'PARTIALLY_FAILED' or - 'CANCELLED'. It shall not be used for making the outcome, that the + The 'resultStateInfo' attribute is provided only for additional textual + qualification of the states 'FINISHED', 'FAILED', 'PARTIALLY_FAILED' or + 'CANCELLED'. It shall not be used for making the outcome, that the process may produce in case of success, available. - The process may have to be completed within a certain time after its - creation, for example because required data may not be available any - more after a certain time, or the process outcome is needed until a - certain time and when not provided by this time is not needed any more. - The time until the MnS producer automatically cancels the process is + The process may have to be completed within a certain time after its + creation, for example because required data may not be available any + more after a certain time, or the process outcome is needed until a + certain time and when not provided by this time is not needed any more. + The time until the MnS producer automatically cancels the process is indicated by the 'timer' attribute."; - + leaf id { type string; mandatory true; - description "Id of the process. It is unique within a single + description "Id of the process. It is unique within a single multivalue attribute of type ProcessMonitor."; } - - leaf status { + + leaf status { type enumeration { enum NOT_STARTED ; enum RUNNING ; @@ -232,9 +232,9 @@ module _3gpp-common-yang-types { } config false; default RUNNING; - description "Represents the status of the associated process, - whether it fails, succeeds etc. - It does not represent the returned values of a successfully finished + description "Represents the status of the associated process, + whether it fails, succeeds etc. + It does not represent the returned values of a successfully finished process. "; } @@ -249,44 +249,44 @@ module _3gpp-common-yang-types { leaf-list progressStateInfo { type string; config false; - description "Additional textual qualification of the states + description "Additional textual qualification of the states 'NOT_STARTED', 'CANCELLING' and 'RUNNING'. - For specific processes, specific well-defined strings (e.g. string + For specific processes, specific well-defined strings (e.g. string patterns or enums) may be defined as a specialisation."; } leaf resultStateInfo { type string; config false; - description "Additional textual qualification of the states - 'FINISHED', 'FAILED', 'PARTIALLY_FAILED and 'CANCELLED'. - For example, in the 'FAILED' or 'PARTIALLY_FAILED' state this + description "Additional textual qualification of the states + 'FINISHED', 'FAILED', 'PARTIALLY_FAILED and 'CANCELLED'. + For example, in the 'FAILED' or 'PARTIALLY_FAILED' state this attribute may be used to provide error reasons. - This attribute shall not be used to make the outcome of the process - available for retrieval, if any. For this purpose, dedicated - attributes shall be specified when specifying the representation of + This attribute shall not be used to make the outcome of the process + available for retrieval, if any. For this purpose, dedicated + attributes shall be specified when specifying the representation of a specific process. - For specific processes, specific well-defined strings (e.g. string + For specific processes, specific well-defined strings (e.g. string patterns or enums) may be defined as a specialisation."; } leaf startTime { type yang:date-and-time; config false; - description "Start time of the associated process, i.e. the time when the + description "Start time of the associated process, i.e. the time when the status changed from 'NOT_STARTED' to 'RUNNING'."; } leaf endTime { type yang:date-and-time; config false; - description "Date and time when status changed to 'SUCCESS', 'CANCELLED', - 'FAILED' or 'PARTIALLY_FAILED'. + description "Date and time when status changed to 'SUCCESS', 'CANCELLED', + 'FAILED' or 'PARTIALLY_FAILED'. - If the time is in the future, it is the estimated time + If the time is in the future, it is the estimated time the process will end."; } @@ -294,40 +294,40 @@ module _3gpp-common-yang-types { type uint32; units minutes; description "Time until the associated process is automatically cancelled. - If set, the system decreases the timer with time. When it reaches zero - the cancellation of the associated process is initiated by the - MnS_Producer. + If set, the system decreases the timer with time. When it reaches zero + the cancellation of the associated process is initiated by the + MnS_Producer. If not set, there is no time limit for the process. - - Once the timer is set, the consumer can not change it anymore. + + Once the timer is set, the consumer can not change it anymore. If the consumer has not set the timer the MnS Producer may set it."; yext3gpp:notNotifyable; } } - + grouping NpnIdGrp { - description "Represents the NPN supported by the <> using this - <> as one of its attributes in case of the cell is a + description "Represents the NPN supported by the <> using this + <> as one of its attributes in case of the cell is a NPN-only cell."; - + list plmnId { key "mcc mnc"; min-elements 1; description "It specifies the PLMN Id of the NPN network."; uses types3gpp:PLMNId; } - + choice npnidChoice { leaf-list cAGIdList { type string; max-elements 256; - description "It identifies a CAG list containing up to 12 - CAG-identifiers per Ue or up to 12 CAG-identifiers per cell, + description "It identifies a CAG list containing up to 12 + CAG-identifiers per Ue or up to 12 CAG-identifiers per cell, see TS 38.331. CAG ID is used to combine with PLMN ID to identify a PNI-NPN.CAG ID is a hexadecimal range with size 32 bit"; } - + leaf-list nIDList { type string; max-elements 16; @@ -337,20 +337,20 @@ module _3gpp-common-yang-types { } } } - - typedef TenthOfDegrees { - type uint16 { - range 0..3600; + + typedef TenthOfDegrees { + type uint16 { + range 0..3600; } units "0.1 degrees"; - description "A single integral value corresponding to an angle in degrees + description "A single integral value corresponding to an angle in degrees between 0 and 360 with a resolution of 0.1 degrees."; } typedef Latitude { type decimal64 { fraction-digits 4; - range "-90.0000..+90.0000"; + range "-90.0000..+90.0000"; } description "Latitude values"; } @@ -358,7 +358,7 @@ module _3gpp-common-yang-types { typedef Longitude { type decimal64 { fraction-digits 4; - range "-180.0000..+180.0000"; + range "-180.0000..+180.0000"; } description "Longitude values"; } @@ -369,22 +369,22 @@ module _3gpp-common-yang-types { } units "meters"; description - "Height from a reference 0 value."; + "Height from a reference 0 value."; } grouping GeographicalCoordinates { description "This datatype represents the geographical coordinates"; reference "3GPP TS 28.538 clause 6.3.8"; - + leaf latitude { type Latitude; - mandatory true; + mandatory true; } - + leaf longitude { type Longitude; - mandatory true; - } + mandatory true; + } } typedef OnOff { @@ -393,74 +393,74 @@ module _3gpp-common-yang-types { enum OFF; } } - - // grouping ManagedNFProfile will be removed as it is + + // grouping ManagedNFProfile will be removed as it is // being moved to _3gpp-5gc-nrm-nfprofile grouping ManagedNFProfile { description "Defines profile for managed NF"; reference "3GPP TS 23.501"; - + leaf idx { type uint32 ; } - + leaf nfInstanceId { config false; mandatory true; type yang:uuid ; - description "This parameter defines profile for managed NF. - The format of the NF Instance ID shall be a - Universally Unique Identifier (UUID) version 4, + description "This parameter defines profile for managed NF. + The format of the NF Instance ID shall be a + Universally Unique Identifier (UUID) version 4, as described in IETF RFC 4122 " ; yext3gpp:inVariant; } - + leaf-list nfType { config false; min-elements 1; type NfType; description "Type of the Network Function" ; } - + leaf hostAddr { mandatory true; type inet:host ; description "Host address of a NF"; } - + leaf authzInfo { type string ; - description "This parameter defines NF Specific Service authorization - information. It shall include the NF type (s) and NF realms/origins + description "This parameter defines NF Specific Service authorization + information. It shall include the NF type (s) and NF realms/origins allowed to consume NF Service(s) of NF Service Producer."; reference "See TS 23.501" ; } - + leaf location { type string ; - description "Information about the location of the NF instance + description "Information about the location of the NF instance (e.g. geographic location, data center) defined by operator"; reference "TS 29.510" ; } - + leaf capacity { mandatory true; type uint16 ; - description "This parameter defines static capacity information - in the range of 0-65535, expressed as a weight relative to other - NF instances of the same type; if capacity is also present in the + description "This parameter defines static capacity information + in the range of 0-65535, expressed as a weight relative to other + NF instances of the same type; if capacity is also present in the nfServiceList parameters, those will have precedence over this value."; reference "TS 29.510" ; } - + leaf nFSrvGroupId { type string ; - description "This parameter defines identity of the group that is + description "This parameter defines identity of the group that is served by the NF instance. - May be config false or true depending on the ManagedFunction. - Config=true for Udrinfo. Config=false for UdmInfo and AusfInfo. + May be config false or true depending on the ManagedFunction. + Config=true for Udrinfo. Config=false for UdmInfo and AusfInfo. Shall be present if ../nfType = UDM or AUSF or UDR. "; reference "TS 29.510" ; } - + leaf-list supportedDataSetIds { type enumeration { enum SUBSCRIPTION; @@ -468,41 +468,41 @@ module _3gpp-common-yang-types { enum EXPOSURE; enum APPLICATION; } - description "List of supported data sets in the UDR instance. + description "List of supported data sets in the UDR instance. May be present if ../nfType = UDR"; reference "TS 29.510" ; } - + leaf-list smfServingAreas { type string ; - description "Defines the SMF service area(s) the UPF can serve. + description "Defines the SMF service area(s) the UPF can serve. Shall be present if ../nfType = UPF"; reference "TS 29.510" ; } - + leaf priority { type uint16; - description "This parameter defines Priority (relative to other NFs - of the same type) in the range of 0-65535, to be used for NF selection; - lower values indicate a higher priority. If priority is also present - in the nfServiceList parameters, those will have precedence over + description "This parameter defines Priority (relative to other NFs + of the same type) in the range of 0-65535, to be used for NF selection; + lower values indicate a higher priority. If priority is also present + in the nfServiceList parameters, those will have precedence over this value. Shall be present if ../nfType = AMF "; reference "TS 29.510" ; } } - + typedef usageState { type enumeration { enum IDLE; enum ACTIVE; enum BUSY; } - description "It describes whether or not the resource is actively in - use at a specific instant, and if so, whether or not it has spare + description "It describes whether or not the resource is actively in + use at a specific instant, and if so, whether or not it has spare capacity for additional users at that instant. The value is READ-ONLY."; reference "ITU T Recommendation X.731"; } - + grouping SAPGrp { leaf host { type inet:host; @@ -515,10 +515,10 @@ module _3gpp-common-yang-types { description "Service access point."; reference "TS 28.622"; } - + typedef Mcc { - description "The mobile country code consists of three decimal digits, - The first digit of the mobile country code identifies the geographic + description "The mobile country code consists of three decimal digits, + The first digit of the mobile country code identifies the geographic region (the digits 1 and 8 are not used):"; type string { pattern '[02-79][0-9][0-9]'; @@ -527,7 +527,7 @@ module _3gpp-common-yang-types { } typedef Mnc { - description "The mobile network code consists of two or three + description "The mobile network code consists of two or three decimal digits (for example: MNC of 001 is not the same as MNC of 01)"; type string { pattern '[0-9][0-9][0-9]|[0-9][0-9]'; @@ -546,10 +546,10 @@ module _3gpp-common-yang-types { } reference "TS 38.413 clause 9.3.3.5"; } - + typedef Nci { - description "NR Cell Identity. The NCI shall be of fixed length of 36 bits - and shall be coded using full hexadecimal representation. + description "NR Cell Identity. The NCI shall be of fixed length of 36 bits + and shall be coded using full hexadecimal representation. The exact coding of the NCI is the responsibility of each PLMN operator"; reference "TS 23.003"; type union { @@ -563,7 +563,7 @@ module _3gpp-common-yang-types { } } } - + typedef OperationalState { reference "3GPP TS 28.625 and ITU-T X.731"; type enumeration { @@ -579,7 +579,7 @@ module _3gpp-common-yang-types { } } - + typedef BasicAdministrativeState { reference "3GPP TS 28.625 and ITU-T X.731"; type enumeration { @@ -597,7 +597,7 @@ module _3gpp-common-yang-types { } } } - + typedef AdministrativeState { reference "3GPP TS 28.625 and ITU-T X.731"; type enumeration { @@ -618,32 +618,32 @@ module _3gpp-common-yang-types { value 2; description "Use of the resource is administratively permitted to existing instances of use only. While the system remains in - the shutting down state the manager or the managed element - may at any time cause the resource to transition to the + the shutting down state the manager or the managed element + may at any time cause the resource to transition to the locked state."; } } } - + typedef AvailabilityStatus { type enumeration { enum IN_TEST; - enum FAILED; - enum POWER_OFF; - enum OFF_LINE; - enum OFF_DUTY; - enum DEPENDENCY; - enum DEGRADED; - enum NOT_INSTALLED; - enum LOG_FULL; + enum FAILED; + enum POWER_OFF; + enum OFF_LINE; + enum OFF_DUTY; + enum DEPENDENCY; + enum DEGRADED; + enum NOT_INSTALLED; + enum LOG_FULL; } } - + typedef CellState { type enumeration { enum IDLE; - enum INACTIVE; - enum ACTIVE; + enum INACTIVE; + enum ACTIVE; } } @@ -658,13 +658,13 @@ module _3gpp-common-yang-types { pattern "([A-Fa-f0-9]{4})|([A-Fa-f0-9]{6})" ; } description "Tracking Area Code - 2 or 3-octet string identifying a tracking area code as specified in - clause 9.3.3.10 of 3GPP TS 38.413 [34], in hexadecimal representation. - Each character in the string shall take a value of - '0' to '9', 'a' to 'f' or 'A' to 'F' and shall represent 4 bits. - The most significant character representing the 4 most significant - bits of the TAC shall appear first in the string, and the character - representing the 4 least significant bit of the TAC shall appear last + 2 or 3-octet string identifying a tracking area code as specified in + clause 9.3.3.10 of 3GPP TS 38.413 [34], in hexadecimal representation. + Each character in the string shall take a value of + '0' to '9', 'a' to 'f' or 'A' to 'F' and shall represent 4 bits. + The most significant character representing the 4 most significant + bits of the TAC shall appear first in the string, and the character + representing the 4 least significant bit of the TAC shall appear last in the string. pattern: '(^[A-Fa-f0-9]{4}$)|(^[A-Fa-f0-9]{6}$)' @@ -676,10 +676,10 @@ module _3gpp-common-yang-types { } grouping TaiGrp { - description "This <> defines a Tracking Area Identity (TAI) - as specified in clause 28.6 of TS 23.003, clause 8.2 of TS 38.300 - and clause 9.3.3.11 of TS 38.413. It is composed of the PLMN - identifier (PLMN-Id, which is composed of the MCC and MNC) and + description "This <> defines a Tracking Area Identity (TAI) + as specified in clause 28.6 of TS 23.003, clause 8.2 of TS 38.300 + and clause 9.3.3.11 of TS 38.413. It is composed of the PLMN + identifier (PLMN-Id, which is composed of the MCC and MNC) and the Tracking Area Code (TAC)."; list plmnId { description "PLMN Identity."; @@ -688,61 +688,61 @@ module _3gpp-common-yang-types { key "mcc mnc"; uses types3gpp:PLMNId; } - - leaf tac { + + leaf tac { type Tac; mandatory true; description "Tracking Area Code"; } } - + grouping GeoCoordinateGrp { - description "Geographical location on earth"; + description "Geographical location on earth"; leaf latitude { type decimal64 { fraction-digits 4; range -90..90 ; } mandatory true; - description "Latitude based on World Geodetic System (1984 version) - global reference frame (WGS 84). Positive values correspond to the + description "Latitude based on World Geodetic System (1984 version) + global reference frame (WGS 84). Positive values correspond to the northern hemisphere."; } - + leaf longitude { type decimal64 { fraction-digits 4; range -180..180 ; } mandatory true; - description "Longitude based on World Geodetic System (1984 version) - global reference frame (WGS 84). Positive values correspond to + description "Longitude based on World Geodetic System (1984 version) + global reference frame (WGS 84). Positive values correspond to degrees east of 0 degrees longitude."; } - + leaf altitude { type Altitude; } } - + grouping GeoAreaGrp { - description "This data type defines a geographical area. - The geo-area is defined using a convex polygon in the attribute + description "This data type defines a geographical area. + The geo-area is defined using a convex polygon in the attribute 'geoPolygon'."; - + list geoPolygon { - description "Specifies the geographical area with a convex polygon. + description "Specifies the geographical area with a convex polygon. The convex polygon is specified by its corners."; key "latitude longitude"; min-elements 3; ordered-by user; - + uses GeoCoordinateGrp; } } - + typedef AmfRegionId { - type union { + type union { type uint8 ; type string { length 8; @@ -753,7 +753,7 @@ module _3gpp-common-yang-types { } typedef AmfSetId { - type union { + type union { type uint16 { range '0..1023'; } @@ -766,7 +766,7 @@ module _3gpp-common-yang-types { } typedef AmfPointer { - type union { + type union { type uint8 { range '0..63'; } @@ -777,8 +777,8 @@ module _3gpp-common-yang-types { } reference "clause 2.10.1 of 3GPP TS 23.003"; } - - grouping AmfIdentifier { + + grouping AmfIdentifier { leaf amfRegionId { type AmfRegionId; } @@ -787,13 +787,13 @@ module _3gpp-common-yang-types { } leaf amfPointer { type AmfPointer; - } - description "The AMFI is constructed from an AMF Region ID, - an AMF Set ID and an AMF Pointer. - The AMF Region ID identifies the region, - the AMF Set ID uniquely identifies the AMF Set within the AMF Region, and - the AMF Pointer uniquely identifies the AMF within the AMF Set. "; - } + } + description "The AMFI is constructed from an AMF Region ID, + an AMF Set ID and an AMF Pointer. + The AMF Region ID identifies the region, + the AMF Set ID uniquely identifies the AMF Set within the AMF Region, and + the AMF Pointer uniquely identifies the AMF within the AMF Set. "; + } // type definitions especially for core NFs @@ -819,17 +819,17 @@ module _3gpp-common-yang-types { enum UDSF; enum BSF; enum CHF; - } + } } - + typedef NotificationType { type enumeration { enum N1_MESSAGES; enum N2_INFORMATION; enum LOCATION_NOTIFICATION; - } + } } - + typedef Load { description "Latest known load information of the NF, percentage "; type uint8 { @@ -842,10 +842,10 @@ module _3gpp-common-yang-types { enum 5GMM; enum SM; enum LPP; - enum SMS; - } + enum SMS; + } } - + typedef N2InformationClass { type enumeration { enum SM; @@ -853,35 +853,35 @@ module _3gpp-common-yang-types { enum PWS; enum PWS_BCAL; enum PWS_RF; - } + } } - + grouping DefaultNotificationSubscription { - + leaf notificationType { type NotificationType; } - + leaf callbackUri { type inet:uri; } - + leaf interPlmnCallbackUri { - description "It indicates the callback URI to be used by NF Service - Producers located in PLMNs that are different from the PLMN of + description "It indicates the callback URI to be used by NF Service + Producers located in PLMNs that are different from the PLMN of the NF consumer."; type inet:uri; - } + } leaf n1MessageClass { type N1MessageClass; } - + leaf n2InformationClass { type N2InformationClass; - } + } leaf versions { - description "This attribute identifies the API versions + description "This attribute identifies the API versions (e.g. v1) supported for the default notification type"; //optional type N2InformationClass; @@ -889,15 +889,15 @@ module _3gpp-common-yang-types { leaf binding { description "This attribute shall contain the value of the Binding Indication for the default subscription notification "; - reference " i.e. the value part of 3gpp-Sbi-Binding header, as - specified in + reference " i.e. the value part of 3gpp-Sbi-Binding header, as + specified in clause 6.12.4 of 3GPP TS 29.500 76. "; //optional type string; config false; } leaf acceptedEncoding { - description "It indicates the content encodings that are accepted by a + description "It indicates the content encodings that are accepted by a NF Service Consumer when receiving a notification related to a default notification subscription"; reference "IETF RFC 9110 clause 12.5.3 "; @@ -910,54 +910,54 @@ module _3gpp-common-yang-types { corresponding to the subscribed default notification, which are supported by the NF (Service) instance acting as NF service consumer. The string shall contain a bitmask indicating supported features in hexadecimal - representation:Each character in the string shall take a value + representation:Each character in the string shall take a value of 0 to 9, a to f or A to F "; - reference "shall represent the support of 4 features as described in + reference "shall represent the support of 4 features as described in table 5.2.2-3 of TS 29.571 [61]."; //optional type string; config false; - } + } leaf serviceInfoList { - description "It indicates a list of service specific information. It may + description "It indicates a list of service specific information. It may be present when the notification request of the notification type may be - generated by multiple services, i.e. notifications from different + generated by multiple services, i.e. notifications from different services may be received by the subscription."; //optional type string; config false; - } + } leaf callbackUriPrefix { description "It indicates the optional path segment(s) used to construct the prefix of the Callback URIs during the reselection of an NF service consumer, as described in 3GPP TS 29.501"; //optional type inet:uri; - } - } - + } + } + grouping Ipv4AddressRange { leaf start { type inet:ipv4-address; } leaf end { type inet:ipv4-address; - } + } } - + grouping Ipv6PrefixRange { leaf start { type inet:ipv6-prefix; } leaf end { type inet:ipv6-prefix; - } + } } - + typedef NsiId { type string; } - + typedef UeMobilityLevel { type enumeration { enum STATIONARY; @@ -966,14 +966,14 @@ module _3gpp-common-yang-types { enum FULLY_MOBILITY; } } - + typedef ResourceSharingLevel { type enumeration { enum SHARED; enum NOT_SHARED; } } - + typedef TxDirection { type enumeration { enum DL; @@ -981,105 +981,105 @@ module _3gpp-common-yang-types { enum DL_AND_UL; } } - + grouping AddressWithVlan { leaf ipAddress { - type inet:ip-address; + type inet:ip-address; } leaf vlanId { type uint16; - } + } } - /* DistinguishedName pattern is built up based on the + /* DistinguishedName pattern is built up based on the EBNF in 32.300 clause 7.3 EBNF of DN String Representation - + leaf DN { type string { // Same pattern as LocalDN - pattern '[A-Z][^,=+<>#;\\"\r\n*.]*=([^,=+<>#;\\"\r\n* ]|(\\[a-fA-F0-9]{2}))(([^,=+<>#;\\"\r\n*]|(\\[a-fA-F0-9]{2}))*([^,=+<>#;\\"\r\n* ]|(\\[a-fA-F0-9]{2})))?(,[A-Z][^,=+<>#;\\"\r\n*.]*=([^,=+<>#;\\"\r\n* ]|(\\[a-fA-F0-9]{2}))(([^,=+<>#;\\"\r\n*]|(\\[a-fA-F0-9]{2}))*([^,=+<>#;\\"\r\n* ]|(\\[a-fA-F0-9]{2})))?)*'; + pattern '[A-Z][^,=+<>#;\\"\r\n*.]*=([^,=+<>#;\\"\r\n* ]|(\\[a-fA-F0-9]{2}))(([^,=+<>#;\\"\r\n*]|(\\[a-fA-F0-9]{2}))*([^,=+<>#;\\"\r\n* ]|(\\[a-fA-F0-9]{2})))?(,[A-Z][^,=+<>#;\\"\r\n*.]*=([^,=+<>#;\\"\r\n* ]|(\\[a-fA-F0-9]{2}))(([^,=+<>#;\\"\r\n*]|(\\[a-fA-F0-9]{2}))*([^,=+<>#;\\"\r\n* ]|(\\[a-fA-F0-9]{2})))?)*'; } } - + leaf fullLocalDN { type string { // LocalRDN , { RDNSeparator , LocalRDN } RDNSeparator is a single , no space or \R allowed Me.mykey=1 allowed // (fullLocalRDN)(,(fullLocalRDN))* - pattern '(([A-Z][^,=+<>#;\\"\r\n*.]*|([A-Z][^,=+<>#;\\"\r\n*.]*\.[a-z][^,=+<>#;\\"\r\n*.]*))=(([^,=+<>#;\\"\r\n* ]|(\\[a-fA-F0-9]{2}))(([^,=+<>#;\\"\r\n*]|(\\[a-fA-F0-9]{2}))*([^,=+<>#;\\"\r\n* ]|(\\[a-fA-F0-9]{2})))?))(,(([A-Z][^,=+<>#;\\"\r\n*.]*|([A-Z][^,=+<>#;\\"\r\n*.]*\.[a-z][^,=+<>#;\\"\r\n*.]*))=(([^,=+<>#;\\"\r\n* ]|(\\[a-fA-F0-9]{2}))(([^,=+<>#;\\"\r\n*]|(\\[a-fA-F0-9]{2}))*([^,=+<>#;\\"\r\n* ]|(\\[a-fA-F0-9]{2})))?)))*'; + pattern '(([A-Z][^,=+<>#;\\"\r\n*.]*|([A-Z][^,=+<>#;\\"\r\n*.]*\.[a-z][^,=+<>#;\\"\r\n*.]*))=(([^,=+<>#;\\"\r\n* ]|(\\[a-fA-F0-9]{2}))(([^,=+<>#;\\"\r\n*]|(\\[a-fA-F0-9]{2}))*([^,=+<>#;\\"\r\n* ]|(\\[a-fA-F0-9]{2})))?))(,(([A-Z][^,=+<>#;\\"\r\n*.]*|([A-Z][^,=+<>#;\\"\r\n*.]*\.[a-z][^,=+<>#;\\"\r\n*.]*))=(([^,=+<>#;\\"\r\n* ]|(\\[a-fA-F0-9]{2}))(([^,=+<>#;\\"\r\n*]|(\\[a-fA-F0-9]{2}))*([^,=+<>#;\\"\r\n* ]|(\\[a-fA-F0-9]{2})))?)))*'; } } - + leaf LocalDN { type string { // LocalRDN , { RDNSeparator , LocalRDN } RDNSeparator is a single , no space or \R allowed // LocalRDN(,LocalRDN)* - pattern '[A-Z][^,=+<>#;\\"\r\n*.]*=([^,=+<>#;\\"\r\n* ]|(\\[a-fA-F0-9]{2}))(([^,=+<>#;\\"\r\n*]|(\\[a-fA-F0-9]{2}))*([^,=+<>#;\\"\r\n* ]|(\\[a-fA-F0-9]{2})))?(,[A-Z][^,=+<>#;\\"\r\n*.]*=([^,=+<>#;\\"\r\n* ]|(\\[a-fA-F0-9]{2}))(([^,=+<>#;\\"\r\n*]|(\\[a-fA-F0-9]{2}))*([^,=+<>#;\\"\r\n* ]|(\\[a-fA-F0-9]{2})))?)*'; + pattern '[A-Z][^,=+<>#;\\"\r\n*.]*=([^,=+<>#;\\"\r\n* ]|(\\[a-fA-F0-9]{2}))(([^,=+<>#;\\"\r\n*]|(\\[a-fA-F0-9]{2}))*([^,=+<>#;\\"\r\n* ]|(\\[a-fA-F0-9]{2})))?(,[A-Z][^,=+<>#;\\"\r\n*.]*=([^,=+<>#;\\"\r\n* ]|(\\[a-fA-F0-9]{2}))(([^,=+<>#;\\"\r\n*]|(\\[a-fA-F0-9]{2}))*([^,=+<>#;\\"\r\n* ]|(\\[a-fA-F0-9]{2})))?)*'; } } - + leaf fullLocalRDN { type string { // same as fullLocalDNAttributeTypeAndValue - pattern '([A-Z][^,=+<>#;\\"\r\n*.]*|([A-Z][^,=+<>#;\\"\r\n*.]*\.[a-z][^,=+<>#;\\"\r\n*.]*))=(([^,=+<>#;\\"\r\n* ]|(\\[a-fA-F0-9]{2}))(([^,=+<>#;\\"\r\n*]|(\\[a-fA-F0-9]{2}))*([^,=+<>#;\\"\r\n* ]|(\\[a-fA-F0-9]{2})))?)'; + pattern '([A-Z][^,=+<>#;\\"\r\n*.]*|([A-Z][^,=+<>#;\\"\r\n*.]*\.[a-z][^,=+<>#;\\"\r\n*.]*))=(([^,=+<>#;\\"\r\n* ]|(\\[a-fA-F0-9]{2}))(([^,=+<>#;\\"\r\n*]|(\\[a-fA-F0-9]{2}))*([^,=+<>#;\\"\r\n* ]|(\\[a-fA-F0-9]{2})))?)'; } } - + leaf LocalRDN { type string { // same as LocalDNAttributeTypeAndValue - pattern '[A-Z][^,=+<>#;\\"\r\n*.]*=([^,=+<>#;\\"\r\n* ]|(\\[a-fA-F0-9]{2}))(([^,=+<>#;\\"\r\n*]|(\\[a-fA-F0-9]{2}))*([^,=+<>#;\\"\r\n* ]|(\\[a-fA-F0-9]{2})))?'; + pattern '[A-Z][^,=+<>#;\\"\r\n*.]*=([^,=+<>#;\\"\r\n* ]|(\\[a-fA-F0-9]{2}))(([^,=+<>#;\\"\r\n*]|(\\[a-fA-F0-9]{2}))*([^,=+<>#;\\"\r\n* ]|(\\[a-fA-F0-9]{2})))?'; } } - - leaf fullLocalDNAttributeTypeAndValue { type string { // LocalDNAttributeType , AttributeTypeAndValueSeparator , RegularAttributeValue + + leaf fullLocalDNAttributeTypeAndValue { type string { // LocalDNAttributeType , AttributeTypeAndValueSeparator , RegularAttributeValue // pattern LocalDNAttributeType=RegularAttributeValue - pattern '([A-Z][^,=+<>#;\\"\r\n*.]*|([A-Z][^,=+<>#;\\"\r\n*.]*\.[a-z][^,=+<>#;\\"\r\n*.]*))=(([^,=+<>#;\\"\r\n* ]|(\\[a-fA-F0-9]{2}))(([^,=+<>#;\\"\r\n*]|(\\[a-fA-F0-9]{2}))*([^,=+<>#;\\"\r\n* ]|(\\[a-fA-F0-9]{2})))?)'; + pattern '([A-Z][^,=+<>#;\\"\r\n*.]*|([A-Z][^,=+<>#;\\"\r\n*.]*\.[a-z][^,=+<>#;\\"\r\n*.]*))=(([^,=+<>#;\\"\r\n* ]|(\\[a-fA-F0-9]{2}))(([^,=+<>#;\\"\r\n*]|(\\[a-fA-F0-9]{2}))*([^,=+<>#;\\"\r\n* ]|(\\[a-fA-F0-9]{2})))?)'; } } - + // limitation: NamesOfClassAndNamingAttributenot supported Me.mykey=1 - leaf LocalDNAttributeTypeAndValue { type string { + leaf LocalDNAttributeTypeAndValue { type string { // ebnf1 LocalDNAttributeType , AttributeTypeAndValueSeparator , RegularAttributeValue // ebnf2-limited NameOfClassWithIdAttribute , AttributeTypeAndValueSeparator , RegularAttributeValue // pattern NameOfClassWithIdAttribute=RegularAttributeValue - pattern '[A-Z][^,=+<>#;\\"\r\n*.]*=([^,=+<>#;\\"\r\n* ]|(\\[a-fA-F0-9]{2}))(([^,=+<>#;\\"\r\n*]|(\\[a-fA-F0-9]{2}))*([^,=+<>#;\\"\r\n* ]|(\\[a-fA-F0-9]{2})))?'; + pattern '[A-Z][^,=+<>#;\\"\r\n*.]*=([^,=+<>#;\\"\r\n* ]|(\\[a-fA-F0-9]{2}))(([^,=+<>#;\\"\r\n*]|(\\[a-fA-F0-9]{2}))*([^,=+<>#;\\"\r\n* ]|(\\[a-fA-F0-9]{2})))?'; } } leaf LocalDNAttributeType { type string { // NameOfClassWithIdAttribute | NamesOfClassAndNamingAttribute RDNSeparator is a single , no space or \R allowed // NameOfClassWithIdAttribute|NamesOfClassAndNamingAttribute - pattern '[A-Z][^,=+<>#;\\"\r\n*.]*|([A-Z][^,=+<>#;\\"\r\n*.]*\.[a-z][^,=+<>#;\\"\r\n*.]*)'; + pattern '[A-Z][^,=+<>#;\\"\r\n*.]*|([A-Z][^,=+<>#;\\"\r\n*.]*\.[a-z][^,=+<>#;\\"\r\n*.]*)'; } } leaf RegularAttributeValue { type string { // ( AttributeValueChar - SpaceChar ) , [ { AttributeValueChar } , ( AttributeValueChar - SpaceChar ) ] - pattern '([^,=+<>#;\\"\r\n* ]|(\\[a-fA-F0-9]{2}))(([^,=+<>#;\\"\r\n*]|(\\[a-fA-F0-9]{2}))*([^,=+<>#;\\"\r\n* ]|(\\[a-fA-F0-9]{2})))?' ; + pattern '([^,=+<>#;\\"\r\n* ]|(\\[a-fA-F0-9]{2}))(([^,=+<>#;\\"\r\n*]|(\\[a-fA-F0-9]{2}))*([^,=+<>#;\\"\r\n* ]|(\\[a-fA-F0-9]{2})))?' ; } } - + leaf NamesOfClassAndNamingAttribute { type string { // ClassName , ClassNamingAttributeSeparator , NamingAttributeName // pattern: ClassName\.NamingAttributeName - pattern '[A-Z][^,=+<>#;\\"\r\n*.]*\.[a-z][^,=+<>#;\\"\r\n*.]*' ; + pattern '[A-Z][^,=+<>#;\\"\r\n*.]*\.[a-z][^,=+<>#;\\"\r\n*.]*' ; } } - - leaf restrictiveClassName { type string { // - pattern '[a-zA-Z][a-zA-Z0-9-_]*' ; + + leaf restrictiveClassName { type string { // + pattern '[a-zA-Z][a-zA-Z0-9-_]*' ; } } - + leaf ClassName { type string { // CapitalLetterChar , { LocalDNAttributeTypeChar } - pattern '[A-Z][^,=+<>#;\\"\r\n*.]*' ; + pattern '[A-Z][^,=+<>#;\\"\r\n*.]*' ; } } - + leaf NamingAttributeName { type string { // SmallLetterChar , { LocalDNAttributeTypeChar } - pattern '[a-z][^,=+<>#;\\"\r\n*.]*' ; - } } - + pattern '[a-z][^,=+<>#;\\"\r\n*.]*' ; + } } + */ - typedef DistinguishedName { + typedef DistinguishedName { type string { pattern '[A-Z][^,=+<>#;\\"\r\n*.]*=([^,=+<>#;\\"\r\n* ]|' + '(\\[a-fA-F0-9]{2}))(([^,=+<>#;\\"\r\n*]|(\\[a-fA-F0-9]{2}))*' + '([^,=+<>#;\\"\r\n* ]|(\\[a-fA-F0-9]{2})))?' + '(,[A-Z][^,=+<>#;\\"\r\n*.]*=([^,=+<>#;\\"\r\n* ]|(\\[a-fA-F0-9]{2}))' + '(([^,=+<>#;\\"\r\n*]|(\\[a-fA-F0-9]{2}))*' - + '([^,=+<>#;\\"\r\n* ]|(\\[a-fA-F0-9]{2})))?)*'; + + '([^,=+<>#;\\"\r\n* ]|(\\[a-fA-F0-9]{2})))?)*'; } - description "Represents the 3GPP standard for DistinguishedName. - - Limitations: + description "Represents the 3GPP standard for DistinguishedName. + + Limitations: - RDNSeparator: don't allow SpaceChar or CarriageReturnChar - NullDN: Disallow nullDN that is the same as not providing a DN - - NamesOfClassAndNamingAttribute format not allowed + - NamesOfClassAndNamingAttribute format not allowed (eg. ManagedElement.mykey=345436)"; reference "3GPP TS 32.300"; - } - + } + typedef QOffsetRange { - type int8 { + type int8 { range "-24 | -22 | -20 | -18 | -16 | -14 | -12 | -10 | -8 | -6 | " + " -5 | -4 | -3 | -2 | -1 | 0 | 1 | 2 | 3 | 4 | 5 | 6 | 8 | 10 | " + - " 12 | 14 | 16 | 18 | 20 | 22 | 24"; + " 12 | 14 | 16 | 18 | 20 | 22 | 24"; } units dB; } @@ -1108,8 +1108,8 @@ module _3gpp-common-yang-types { In addition, the MnS producer shall create on behalf of the MnS consumer a subscription, using 'NtfSubscriptionControl', for the notification types 'notifyMOICreation' and 'notifyMOIDeletion' related - to the 'File' instances that will be produced later. In case an - existing subscription does already include the 'File' instances to be + to the 'File' instances that will be produced later. In case an + existing subscription does already include the 'File' instances to be produced, no new subscription shall be created. The 'notificationRecipientAddress' attribute in the created 'NtfSubscriptionControl' instance shall be set to the value of the @@ -1121,12 +1121,12 @@ module _3gpp-common-yang-types { request for implicit subscription shall be deleted as well. - When only the 'fileReportingPeriod' and 'fileLocation' attributes are present (CHOICE_3), the MnS producer shall store the files at the - location specified by 'fileLocation'. The file location may identify - any entity such as a file server or a MnS consumer. The identified - MnS consumer may or may not be identical to the MnS consumer creating - the 'PerfMetricJob'. As for CHOICE_1 the MnS producer may emit + location specified by 'fileLocation'. The file location may identify + any entity such as a file server or a MnS consumer. The identified + MnS consumer may or may not be identical to the MnS consumer creating + the 'PerfMetricJob'. As for CHOICE_1 the MnS producer may emit 'notifyFileReady' and 'notifyFilePreparationError' notifications to - inform subscribers that a file has been made available at the location + inform subscribers that a file has been made available at the location specified by 'fileLocation'. - When only the streamTarget attribute is present, the MnS producer @@ -1156,7 +1156,7 @@ module _3gpp-common-yang-types { leaf fileLocation { type string ; description "Applicable and must be present when the file-based - reporting method is supported, and the files are stored on the + reporting method is supported, and the files are stored on the MnS consumer."; } } diff --git a/yang-models/_3gpp-engy-nrm-energyinformation.yang b/yang-models/_3gpp-engy-nrm-energyinformation.yang index 38b72c25e..2c3f9a63c 100644 --- a/yang-models/_3gpp-engy-nrm-energyinformation.yang +++ b/yang-models/_3gpp-engy-nrm-energyinformation.yang @@ -1,52 +1,52 @@ module _3gpp-engy-nrm-energyinformation { yang-version 1.1; - + namespace urn:3gpp:sa5:_3gpp-engy-nrm-energyinformation; prefix engyinfo3gpp; - + import _3gpp-common-managed-element { prefix me3gpp; } import _3gpp-common-subnetwork { prefix subnet3gpp; } 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 Energy Information NRM. - Copyright 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, + Copyright 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved."; reference "3GPP TS 28.310"; - + revision 2025-05-07 { reference CR-0082 ; } - + feature energyinformationUnderSubNetwork { description "The energyinformation shall be contained under SubNetwork"; } feature energyinformationUnderManagedElement { - description "The energyrelatedinformation shall be contained under + description "The energyrelatedinformation shall be contained under ManagedElement"; } - + grouping EnergySourceInfoGrp { description "This data type defines the information related to a type - of energy source. This information is configured by the operator with - the information obtained from sources external to 3GPP. The attribute - energySourceType is used to indicate the type of energy source used by + of energy source. This information is configured by the operator with + the information obtained from sources external to 3GPP. The attribute + energySourceType is used to indicate the type of energy source used by an energy supply mode to produce the energy. The attribute energySourceCef - is used to indicate the carbon emission factor of the energy source. + is used to indicate the carbon emission factor of the energy source. The attribute renewableEnergy is used to indicate if the energy source is renewable or non-renewable. The attribute energyCompositionPercentage - is used to indicate the percentage of energy source used to produce the + is used to indicate the percentage of energy source used to produce the energy."; - + leaf energySourceType { type string; mandatory true; description "The attribute is used to indicate the type of energy source used by an energy supply mode to produce the energy."; } - + leaf energySourceCef { type decimal64 { fraction-digits 2; @@ -56,7 +56,7 @@ module _3gpp-engy-nrm-energyinformation { description "The attribute is used to indicate the Carbon Emission Factor of a type of energy source. Its unit is kg CO2eq / kWh."; } - + leaf renewableEnergy { description "This attribute represents if the energy source is renewable or non-renewable. This information is configured by the operator with the @@ -64,7 +64,7 @@ module _3gpp-engy-nrm-energyinformation { type boolean; mandatory true; } - + leaf energyCompositionPercentage { type uint8 { range 0..100; @@ -73,38 +73,38 @@ module _3gpp-engy-nrm-energyinformation { description "The attribute is used to indicate the percentage of energy source type used by the energy supply mode."; } - + } - + grouping EnergyInfoGroupGrp { leaf energySupplyModeRefList { description "The list of energy supply modes for the Network Elements - of the group. This information is configured by the operator with the + of the group. This information is configured by the operator with the information obtained from external sources."; type types3gpp:DistinguishedName; } - + leaf memberDNList { description "This attribute contains the DNs of managed entities that are members of the energy info group."; type types3gpp:DistinguishedName; } - + } - + grouping EnergySupplyInfoGrp { - + leaf energySupplyMode { description "The mode by which energy is supplied to a Network Element. - This information is configured by the operator with the information + This information is configured by the operator with the information obtained from external sources.The mode can be one of the following: - GRID_ELECTRICITY: Energy from local grid electricity + GRID_ELECTRICITY: Energy from local grid electricity (See Grid electricity in clause 6 of ITU-T Recommendation L.1333 [D]) - BACKUP_ENERGY: Energy from backup diesel or other types (from battery + BACKUP_ENERGY: Energy from backup diesel or other types (from battery banks/UPS), or from generators such as solar panels. (See Backup energy in clause 6 of ITU-T Recommendation L.1333[D]) LOCALLY_GENERATED_ENERGY: - Energy provided by local generators not used for backup functionality, + Energy provided by local generators not used for backup functionality, e.g., solar panels, wind generator etc. (See Locally generated energy in clause 6 of ITU-T Recommendation L.1333[D])"; mandatory true; @@ -112,35 +112,35 @@ module _3gpp-engy-nrm-energyinformation { enum GRID_ELECTRICITY; enum BACKUP_ENERGY; enum LOCALLY_GENERATED_ENERGY; - } + } } - + list energySourceList { description "This attribute represents the list of sources used to produce the energy by the supplier. This includes energy related - information i.e., carbon emission and renewable energy related + information i.e., carbon emission and renewable energy related information, and the percentage of the energy produced using the source."; min-elements 1; key idx; leaf idx { type uint32; } uses EnergySourceInfoGrp; - } + } } - + augment "/subnet3gpp:SubNetwork" { if-feature energyinformationUnderSubNetwork; list EnergyInfoGroup { description "This IOC represents a group of Network Elements, represented by ManagedElement IOC and information related to the energy supply modes - that are used to power them. This information is configured by the - operator. Attribute memberDNList can be configured with the DNs of - ManagedElement or DNs of SubNetwork. This attribute provides the list - of Network Elements in the group, represented using ManagedElement MOIs - or represented using SubNetwork MOIs. In the case, memberDNList is + that are used to power them. This information is configured by the + operator. Attribute memberDNList can be configured with the DNs of + ManagedElement or DNs of SubNetwork. This attribute provides the list + of Network Elements in the group, represented using ManagedElement MOIs + or represented using SubNetwork MOIs. In the case, memberDNList is configured by DN of SubNetwork, then all the ManagedElement MOIs that are name-contained by the SubNetwork MOI are part of the group. Attribute - energySupplyModeRefList is used to indicate the mode of energy supply + energySupplyModeRefList is used to indicate the mode of energy supply for powering the Network Elements of the group."; key id; uses top3gpp:Top_Grp; @@ -151,7 +151,7 @@ module _3gpp-engy-nrm-energyinformation { list EnergySupplyInfo { description "This IOC defines the information related to energy supply and the sources used to produce the energy. This information is configured - by the operator with the information obtained from sources external to + by the operator with the information obtained from sources external to 3GPP e.g an energy supplier. "; key id; uses top3gpp:Top_Grp; @@ -160,20 +160,20 @@ module _3gpp-engy-nrm-energyinformation { } } } - + augment "/me3gpp:ManagedElement" { if-feature energyinformationUnderManagedElement; list EnergyInfoGroup { description "This IOC represents a group of Network Elements, represented by ManagedElement IOC and information related to the energy supply modes - that are used to power them. This information is configured by the - operator. Attribute memberDNList can be configured with the DNs of - ManagedElement or DNs of SubNetwork. This attribute provides the list - of Network Elements in the group, represented using ManagedElement MOIs - or represented using SubNetwork MOIs. In the case, memberDNList is + that are used to power them. This information is configured by the + operator. Attribute memberDNList can be configured with the DNs of + ManagedElement or DNs of SubNetwork. This attribute provides the list + of Network Elements in the group, represented using ManagedElement MOIs + or represented using SubNetwork MOIs. In the case, memberDNList is configured by DN of SubNetwork, then all the ManagedElement MOIs that are name-contained by the SubNetwork MOI are part of the group. Attribute - energySupplyModeRefList is used to indicate the mode of energy supply + energySupplyModeRefList is used to indicate the mode of energy supply for powering the Network Elements of the group."; key id; uses top3gpp:Top_Grp; @@ -184,7 +184,7 @@ module _3gpp-engy-nrm-energyinformation { list EnergySupplyInfo { description "This IOC defines the information related to energy supply and the sources used to produce the energy. This information is configured - by the operator with the information obtained from sources external to + by the operator with the information obtained from sources external to 3GPP e.g an energy supplier. "; key id; uses top3gpp:Top_Grp; diff --git a/yang-models/_3gpp-nr-nrm-beam.yang b/yang-models/_3gpp-nr-nrm-beam.yang index ce8735414..f657af5a8 100755 --- a/yang-models/_3gpp-nr-nrm-beam.yang +++ b/yang-models/_3gpp-nr-nrm-beam.yang @@ -13,11 +13,11 @@ module _3gpp-nr-nrm-beam { contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464"; description "Defines the YANG mapping of the Beam Information Object Class (IOC) that is part of the NR Network Resource Model (NRM). - Copyright 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + Copyright 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved."; reference "3GPP TS 28.541 5G Network Resource Model (NRM)"; - revision 2023-09-18 { reference CR-1043 ; } + revision 2023-09-18 { reference CR-1043 ; } revision 2023-04-26 { reference CR-0916 ; } revision 2019-11-26 { reference "S5-197643"; } diff --git a/yang-models/_3gpp-nr-nrm-bwp.yang b/yang-models/_3gpp-nr-nrm-bwp.yang index b75642abc..bf4369a34 100755 --- a/yang-models/_3gpp-nr-nrm-bwp.yang +++ b/yang-models/_3gpp-nr-nrm-bwp.yang @@ -12,11 +12,11 @@ module _3gpp-nr-nrm-bwp { contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464"; description "Defines the YANG mapping of the BWP Information Object Class (IOC) that is part of the NR Network Resource Model (NRM). - Copyright 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + Copyright 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved."; reference "3GPP TS 28.541 5G Network Resource Model (NRM)"; - revision 2023-09-18 { reference CR-1043 ; } + revision 2023-09-18 { reference CR-1043 ; } revision 2020-11-17 { reference CR-0410 ; } revision 2019-10-28 { reference S5-193518 ; } revision 2019-06-17 { reference "Initial revision"; } @@ -70,7 +70,7 @@ module _3gpp-nr-nrm-bwp { } leaf cyclicPrefix { - description "Cyclic prefix, which may be normal or extended."; + description "Cyclic prefix, which may be normal or extended."; reference "3GPP TS 38.211"; mandatory true; type CyclicPrefix; @@ -98,7 +98,7 @@ module _3gpp-nr-nrm-bwp { description "Represents a bandwidth part (BWP)."; key id; uses top3gpp:Top_Grp; - container attributes { + container attributes { uses BWPGrp; } uses mf3gpp:ManagedFunctionContainedClasses; diff --git a/yang-models/_3gpp-nr-nrm-bwpset.yang b/yang-models/_3gpp-nr-nrm-bwpset.yang index 42f700352..846f67c39 100644 --- a/yang-models/_3gpp-nr-nrm-bwpset.yang +++ b/yang-models/_3gpp-nr-nrm-bwpset.yang @@ -12,13 +12,13 @@ module _3gpp-nr-nrm-bwpset { contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464"; description "Defines the YANG mapping of the BWPSet Information Object Class (IOC) that is part of the NR Network Resource Model (NRM). - Copyright 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + Copyright 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved."; reference "3GPP TS 28.541 5G Network Resource Model (NRM)"; - revision 2024-11-01 { reference CR-1405 ; } - revision 2024-08-19 { reference CR-1314 ; } - revision 2023-09-18 { reference CR-1043 ; } + revision 2024-11-01 { reference CR-1405 ; } + revision 2024-08-19 { reference CR-1314 ; } + revision 2023-09-18 { reference CR-1043 ; } revision 2022-06-29 { reference CR-0756 ; } grouping BWPSetGrp { @@ -32,7 +32,7 @@ module _3gpp-nr-nrm-bwpset { description "Represents a bandwidth part (BWP) set."; key id; uses top3gpp:Top_Grp; - container attributes { + container attributes { uses BWPSetGrp; } uses mf3gpp:ManagedFunctionContainedClasses; diff --git a/yang-models/_3gpp-nr-nrm-cco.yang b/yang-models/_3gpp-nr-nrm-cco.yang index 97a154dfe..0cf4b56cd 100644 --- a/yang-models/_3gpp-nr-nrm-cco.yang +++ b/yang-models/_3gpp-nr-nrm-cco.yang @@ -1,25 +1,25 @@ module _3gpp-nr-nrm-cco { yang-version 1.1; - + namespace urn:3gpp:sa5:_3gpp-nr-nrm-cco; prefix cco3gpp; - + import _3gpp-common-top { prefix top3gpp; } import _3gpp-common-subnetwork { prefix subnet3gpp; } - + organization "3gpp SA5"; contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464"; - description "Implements support the C-SON function of Capacity and + description "Implements support the C-SON function of Capacity and Coverage optimization . - Copyright 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + Copyright 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved."; reference "3GPP TS 28.541"; - - revision 2024-05-24 { reference CR-1273 ; } - + + revision 2024-05-24 { reference CR-1273 ; } + grouping ParameterRangeGrp { description "This data type represents the adjustment range for parameters."; - + leaf maxValue { type int64; mandatory true; @@ -32,12 +32,12 @@ module _3gpp-nr-nrm-cco { description "It indicates the minimum value of the parameter."; } } - + grouping CCOParametersGrp { description "Represents the CCOParameters IOC"; - - list downlinkTransmitPowerRange { - description "It indicates adjustment range (including maximum value, + + list downlinkTransmitPowerRange { + description "It indicates adjustment range (including maximum value, minimum value) of downlinkTransmitPower to optimize radio coverage."; key minValue; min-elements 1; @@ -51,9 +51,9 @@ module _3gpp-nr-nrm-cco { } } } - + list antennaTiltRange { - description "It indicates adjustment range (including maximum value, + description "It indicates adjustment range (including maximum value, minimum value) of antennaTilt to optimize radio coverage. units 0.1 degree"; key minValue; @@ -68,7 +68,7 @@ module _3gpp-nr-nrm-cco { } } } - + list antennaAzimuthRange { description "It indicates adjustment range (including maximum value, minimum value) of antennaAzimuth to optimize radio coverage. @@ -85,9 +85,9 @@ module _3gpp-nr-nrm-cco { } } } - + list digitalTiltRange { - description "It indicates adjustment range (including maximum value, + description "It indicates adjustment range (including maximum value, minimum value) of digitalTilt to optimize radio coverage. units 0.1 degree"; key minValue; @@ -102,9 +102,9 @@ module _3gpp-nr-nrm-cco { } } } - + list digitalAzimuthRange { - description "It indicates adjustment range (including maximum value, + description "It indicates adjustment range (including maximum value, minimum value) of digitalAzimuth to optimize radio coverage. units 0.1 degree"; key minValue; @@ -118,49 +118,49 @@ module _3gpp-nr-nrm-cco { must '. >= -1800 and . <= 1800'; } } } - + leaf-list coverageShapeList { type uint16; ordered-by user; - description "It indicates the coverage shape of specific sites which + description "It indicates the coverage shape of specific sites which can be selected to optimize radio coverage."; } } - + grouping CCOWeakCoverageParametersGrp { description "Represents the CCOWeakCoverageParameters IOC"; uses CCOParametersGrp; } - + grouping CCOPilotPollutionParametersGrp { description "Represents the CCOPilotPollutionParameters IOC"; - uses CCOParametersGrp; + uses CCOParametersGrp; } - + grouping CCOOvershootCoverageParametersGrp { description "Represents the CCOOvershootCoverageParameters IOC"; uses CCOParametersGrp; } - + grouping CCOFunctionGrp { description "Represents the CCOFunction IOC"; - + leaf cCOControl { - description "This attribute determines whether the centralized + description "This attribute determines whether the centralized SON CCO Function is enabled or disabled."; mandatory true; type boolean; - } + } } - + augment "/subnet3gpp:SubNetwork" { list CCOFunction { - description "This IOC contains attributes to support the C-SON - function of Capacity and Coverage optimization - (See clause 7.2.3 in TS 28.313). - NOTE: in the case where multiple CCOFunction MOIs exist at different - levels of the containment tree, the CCOFunction MOI at the lower - level overrides the CCOFunction MOIs at higher level(s) of the same + description "This IOC contains attributes to support the C-SON + function of Capacity and Coverage optimization + (See clause 7.2.3 in TS 28.313). + NOTE: in the case where multiple CCOFunction MOIs exist at different + levels of the containment tree, the CCOFunction MOI at the lower + level overrides the CCOFunction MOIs at higher level(s) of the same containment tree."; key id; @@ -169,10 +169,10 @@ module _3gpp-nr-nrm-cco { container attributes { uses CCOFunctionGrp; } - + list CCOWeakCoverageParameters { - description "This IOC represents the properties of - CCOWeakCoverageParameters. CCOWeakCoverageParameters is one + description "This IOC represents the properties of + CCOWeakCoverageParameters. CCOWeakCoverageParameters is one realization of abstract CCOParameters IOC."; key id; max-elements 1; @@ -181,10 +181,10 @@ module _3gpp-nr-nrm-cco { uses CCOWeakCoverageParametersGrp; } } - + list CCOPilotPollutionParameters { - description "This IOC represents the properties of - CCOPilotPollutionParameters. CCOPilotPollutionParameters is one + description "This IOC represents the properties of + CCOPilotPollutionParameters. CCOPilotPollutionParameters is one realization of abstract CCOParameters IOC."; key id; max-elements 1; @@ -193,10 +193,10 @@ module _3gpp-nr-nrm-cco { uses CCOPilotPollutionParametersGrp; } } - + list CCOOvershootCoverageParameters { - description "This IOC represents the properties of - CCOOvershootCoverageParameters. CCOOvershootCoverageParameters is + description "This IOC represents the properties of + CCOOvershootCoverageParameters. CCOOvershootCoverageParameters is one realization of abstract CCOParameters IOC."; key id; max-elements 1; diff --git a/yang-models/_3gpp-nr-nrm-cesmanagementfunction.yang b/yang-models/_3gpp-nr-nrm-cesmanagementfunction.yang index a7d179a38..f8473b037 100755 --- a/yang-models/_3gpp-nr-nrm-cesmanagementfunction.yang +++ b/yang-models/_3gpp-nr-nrm-cesmanagementfunction.yang @@ -12,19 +12,19 @@ module _3gpp-nr-nrm-cesmanagementfunction { organization "3GPP SA5"; contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464"; - description "Defines the YANG mapping of the CESManagementFunction + description "Defines the YANG mapping of the CESManagementFunction Information Object Class (IOC) that is part of the NR Network Resource Model (NRM). - Copyright 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + Copyright 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved."; reference "3GPP TS 28.541 5G Network Resource Model (NRM)"; - revision 2023-09-18 { reference CR-1043 ; } + revision 2023-09-18 { reference CR-1043 ; } revision 2021-08-05 { reference S5-214053/CR-0518; } revision 2020-05-08 { reference S5-203316; } grouping loadTimeThresholdGrp { - description "Represents the the traffic load threshold and the time + description "Represents the the traffic load threshold and the time duration."; leaf loadThreshold { @@ -33,9 +33,9 @@ module _3gpp-nr-nrm-cesmanagementfunction { type type5g3gpp:EnergySavingLoadThresholdT; } leaf timeDuration { - description "The time duration indicates how long the traffic load - (either for UL or DL) in the cell needs to have been above the - threshold to wake up one or more original cells which have been + description "The time duration indicates how long the traffic load + (either for UL or DL) in the cell needs to have been above the + threshold to wake up one or more original cells which have been provided backup coverage by the candidate cell."; type type5g3gpp:EnergySavingLoadThresholdT; } @@ -51,9 +51,9 @@ module _3gpp-nr-nrm-cesmanagementfunction { } list intraRatEsActivationOriginalCellLoadParameters { description "This attributes is relevant, if the cell acts as an original - cell.This attribute indicates the traffic load threshold and the time - duration, which are used by distributed ES algorithms to allow a cell - to enter the energySaving state. The time duration indicates how long + cell.This attribute indicates the traffic load threshold and the time + duration, which are used by distributed ES algorithms to allow a cell + to enter the energySaving state. The time duration indicates how long the load needs to have been below the threshold."; key loadThreshold; min-elements 1; @@ -63,16 +63,16 @@ module _3gpp-nr-nrm-cesmanagementfunction { list intraRatEsActivationCandidateCellsLoadParameters { description "This attributes is relevant, if the cell acts as a candidate - cell. This attribute indicates the traffic load threshold and the time - duration, which are used by distributed ES algorithms level to allow an + cell. This attribute indicates the traffic load threshold and the time + duration, which are used by distributed ES algorithms level to allow an 'original' cell to enter the energySaving state. Threshold and duration - are applied to the candidate cell(s) which will provides coverage - backup of an original cell when it is in the energySaving state. The - threshold applies in the same way for a candidate cell, no matter for + are applied to the candidate cell(s) which will provides coverage + backup of an original cell when it is in the energySaving state. The + threshold applies in the same way for a candidate cell, no matter for which original cell it will provide backup coverage. - The time duration indicates how long the traffic in the candidate cell - needs to have been below the threshold before any original cells which - will be provided backup coverage by the candidate cell enters energy + The time duration indicates how long the traffic in the candidate cell + needs to have been below the threshold before any original cells which + will be provided backup coverage by the candidate cell enters energy saving state."; key loadThreshold; min-elements 1; @@ -82,15 +82,15 @@ module _3gpp-nr-nrm-cesmanagementfunction { list intraRatEsDeactivationCandidateCellsLoadParameters { description "This attributes is relevant, if the cell acts as a candidate - cell. This attribute indicates the traffic load threshold and the time - duration which is used by distributed ES algorithms to allow a cell to - leave the energySaving state. Threshold and time duration are applied - to the candidate cell when it which provides coverage backup for the + cell. This attribute indicates the traffic load threshold and the time + duration which is used by distributed ES algorithms to allow a cell to + leave the energySaving state. Threshold and time duration are applied + to the candidate cell when it which provides coverage backup for the cell in energySaving state. The threshold applies in the same way for a - candidate cell, no matter for which original cell it provides backup + candidate cell, no matter for which original cell it provides backup coverage. - The time duration indicates how long the traffic in the candidate cell - needs to have been above the threshold to wake up one or more original + The time duration indicates how long the traffic in the candidate cell + needs to have been above the threshold to wake up one or more original cells which have been provided backup coverage by the candidate cell."; key loadThreshold; min-elements 1; @@ -99,7 +99,7 @@ module _3gpp-nr-nrm-cesmanagementfunction { } list esNotAllowedTimePeriod { - description "This is a list of time periods during which + description "This is a list of time periods during which inter-RAT energy saving is not allowed"; key idx; @@ -110,27 +110,27 @@ module _3gpp-nr-nrm-cesmanagementfunction { } list interRatEsActivationOriginalCellParameters { - description "This attribute is relevant, if the cell acts as an original - cell. This attribute indicates the traffic load threshold and the time - duration, which are used by distributed inter-RAT ES algorithms to - allow an original cell to enter the energySaving state. The time + description "This attribute is relevant, if the cell acts as an original + cell. This attribute indicates the traffic load threshold and the time + duration, which are used by distributed inter-RAT ES algorithms to + allow an original cell to enter the energySaving state. The time duration indicates how long the traffic load (both for UL and DL) needs to have been below the threshold. - In case the original cell is an EUTRAN cell, the load information - refers to Composite Available Capacity Group IE (see 3GPP TS 36.413 + In case the original cell is an EUTRAN cell, the load information + refers to Composite Available Capacity Group IE (see 3GPP TS 36.413 [12] Annex B.1.5) and the following applies: - Load = (100 - 'Capacity Value' ) * 'Cell Capacity Class Value', - where 'Capacity Value' and 'Cell Capacity Class Value' are defined in + Load = (100 - 'Capacity Value' ) * 'Cell Capacity Class Value', + where 'Capacity Value' and 'Cell Capacity Class Value' are defined in 3GPP TS 36.423 [7]. - In case the original cell is a UTRAN cell, the load information refers + In case the original cell is a UTRAN cell, the load information refers to Cell Load Information Group IE (see 3GPP TS 36.413 [12] Annex B.1.5) and the following applies: - Load= 'Load Value' * 'Cell Capacity Class Value', where 'Load Value' + Load= 'Load Value' * 'Cell Capacity Class Value', where 'Load Value' and 'Cell Capacity Class Value' are defined in 3GPP TS 25.413 [19]. - If the 'Cell Capacity Class Value' is not known, then 'Cell Capacity + If the 'Cell Capacity Class Value' is not known, then 'Cell Capacity Class Value' should be set to 1 when calculating the load, and the load threshold should be set in range of 0..100."; key loadThreshold; @@ -140,26 +140,26 @@ module _3gpp-nr-nrm-cesmanagementfunction { } list interRatEsActivationCandidateCellParameters { - description "This attribute is relevant, if the cell acts as a candidate - cell. This attribute indicates the traffic load threshold and the time - duration, which are used by distributed inter-RAT ES algorithms to - allow an original cell to enter the energySaving state. Threshold and - time duration are applied to the candidate cell(s) which will provides - coverage backup of an original cell when it is in the energySaving - state. The time duration indicates how long the traffic load (both for + description "This attribute is relevant, if the cell acts as a candidate + cell. This attribute indicates the traffic load threshold and the time + duration, which are used by distributed inter-RAT ES algorithms to + allow an original cell to enter the energySaving state. Threshold and + time duration are applied to the candidate cell(s) which will provides + coverage backup of an original cell when it is in the energySaving + state. The time duration indicates how long the traffic load (both for UL and DL) in the candidate cell needs to have been below the threshold before any original cells which will be provided backup coverage by the candidate cell enters energySaving state. - In case the candidate cell is a UTRAN or GERAN cell, the load - information refers to Cell Load Information Group IE (see 3GPP TS + In case the candidate cell is a UTRAN or GERAN cell, the load + information refers to Cell Load Information Group IE (see 3GPP TS 36.413 [12] Annex B.1.5) and the following applies: - Load= 'Load Value' * 'Cell Capacity Class Value', where 'Load Value' - and 'Cell Capacity Class Value' are defined in 3GPP TS 25.413 [19] + Load= 'Load Value' * 'Cell Capacity Class Value', where 'Load Value' + and 'Cell Capacity Class Value' are defined in 3GPP TS 25.413 [19] (for UTRAN) / TS 48.008 [20] (for GERAN). - If the 'Cell Capacity Class Value' is not known, then 'Cell Capacity - Class Value' should be set to 1 when calculating the load, and the load + If the 'Cell Capacity Class Value' is not known, then 'Cell Capacity + Class Value' should be set to 1 when calculating the load, and the load threshold should be set in range of 0..100."; min-elements 1; max-elements 1; @@ -168,22 +168,22 @@ module _3gpp-nr-nrm-cesmanagementfunction { } list interRatEsDeactivationCandidateCellParameters { - description "This attribute is relevant, if the cell acts as a candidate - cell. This attribute indicates the traffic load threshold and the time - duration which is used by distributed inter-RAT ES algorithms to allow - an original cell to leave the energySaving state. Threshold and time - duration are applied to the candidate cell which provides coverage - backup for the cell in energySaving state. + description "This attribute is relevant, if the cell acts as a candidate + cell. This attribute indicates the traffic load threshold and the time + duration which is used by distributed inter-RAT ES algorithms to allow + an original cell to leave the energySaving state. Threshold and time + duration are applied to the candidate cell which provides coverage + backup for the cell in energySaving state. The time duration indicates how long the traffic load (either for UL or - DL) in the candidate cell needs to have been above the threshold to - wake up one or more original cells which have been provided backup + DL) in the candidate cell needs to have been above the threshold to + wake up one or more original cells which have been provided backup coverage by the candidate cell. - For the load see the definition of + For the load see the definition of interRatEsActivationCandidateCellParameters. - This attribute indicates the traffic load threshold and the time - duration which is used by distributed inter-RAT ES algorithms to allow + This attribute indicates the traffic load threshold and the time + duration which is used by distributed inter-RAT ES algorithms to allow an original cell to leave the energySaving state."; key loadThreshold; min-elements 1; @@ -192,11 +192,11 @@ module _3gpp-nr-nrm-cesmanagementfunction { } leaf energySavingState { - description "Specifies the status regarding the energy saving in the + description "Specifies the status regarding the energy saving in the cell. If the value of energySavingControl is toBeEnergySaving, then it - shall be tried to achieve the value isEnergySaving for the - energySavingState. If the value of energySavingControl is - toBeNotEnergySaving, then it shall be tried to achieve the value + shall be tried to achieve the value isEnergySaving for the + energySavingState. If the value of energySavingControl is + toBeNotEnergySaving, then it shall be tried to achieve the value isNotEnergySaving for the energySavingState. "; type enumeration{ enum isNotEnergySaving; @@ -205,8 +205,8 @@ module _3gpp-nr-nrm-cesmanagementfunction { } leaf energySavingControl { - description "This attribute allows the Cross Domain-Centralized SON - energy saving function to initiate energy saving activation or + description "This attribute allows the Cross Domain-Centralized SON + energy saving function to initiate energy saving activation or deactivation."; type enumeration{ enum toBeEnergySaving; @@ -218,20 +218,20 @@ module _3gpp-nr-nrm-cesmanagementfunction { grouping EsNotAllowedTimePeriodGrp { leaf startTime { description "Start of not allowed time period in UTC time zone. - If set, the endTime must also be set. If not set, this is + If set, the endTime must also be set. If not set, this is interpreted as around the clock."; must ../endTime; type type5g3gpp:UTC24TimeOfDayT; } leaf endTime { - description "If endTime has a lower value than startTime, it will + description "If endTime has a lower value than startTime, it will be interpreted as referring to the following day."; must ../startTime; type type5g3gpp:UTC24TimeOfDayT; } leaf-list daysOfWeek { - description "Specifies that the not allowed periods are only - applicable to the specified days in UTC timezone. Every day if + description "Specifies that the not allowed periods are only + applicable to the specified days in UTC timezone. Every day if not set."; type type5g3gpp:DayOfWeekT; } @@ -239,20 +239,20 @@ module _3gpp-nr-nrm-cesmanagementfunction { grouping CESManagementFunctionSubtree { list CESManagementFunction { - description "This IOC represents the management capabilities of - Centralized SON Energy Saving (ES) functions. This is provided for + description "This IOC represents the management capabilities of + Centralized SON Energy Saving (ES) functions. This is provided for Energy Saving purposes. - - In the case where multiple CESManagement MOIs exist at different - levels of the containment tree, the CESManagement MOI at the lower - level overrides the CESManagement MOIs at higher level(s) of the + + In the case where multiple CESManagement MOIs exist at different + levels of the containment tree, the CESManagement MOI at the lower + level overrides the CESManagement MOIs at higher level(s) of the same containment tree."; reference "clause 6.2.2 in TS 28.310"; - key id; + key id; uses top3gpp:Top_Grp; container attributes { uses CESManagementFunctionGrp; - } + } } } diff --git a/yang-models/_3gpp-nr-nrm-commonbeamformingfunction.yang b/yang-models/_3gpp-nr-nrm-commonbeamformingfunction.yang index 550b4972d..04a5cbe69 100755 --- a/yang-models/_3gpp-nr-nrm-commonbeamformingfunction.yang +++ b/yang-models/_3gpp-nr-nrm-commonbeamformingfunction.yang @@ -11,13 +11,13 @@ module _3gpp-nr-nrm-commonbeamformingfunction { organization "3GPP SA5"; contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464"; - description "Defines the YANG mapping of the CommonBeamformingFuntion IOC + description "Defines the YANG mapping of the CommonBeamformingFuntion IOC that is part of the NR Network Resource Model (NRM). - Copyright 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + Copyright 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved."; reference "3GPP TS 28.541 5G Network Resource Model (NRM)"; - revision 2023-09-18 { reference CR-1043 ; } + revision 2023-09-18 { reference CR-1043 ; } revision 2023-04-26 { reference CR-0916 ; } revision 2019-11-22 { reference "S5-197643"; } @@ -26,19 +26,19 @@ module _3gpp-nr-nrm-commonbeamformingfunction { reference "3GPP TS 28.541"; leaf coverageShape { - description "Identifies the sector carrier coverage shape described by - the envelope of the contained SSB beams. The coverage shape is + description "Identifies the sector carrier coverage shape described by + the envelope of the contained SSB beams. The coverage shape is implementation dependent."; mandatory true; type int32 { range "0..65535"; } } leaf digitalAzimuth { - description "Digitally-controlled azimuth through beamforming. - It represents the horizontal pointing direction of the antenna - relative to the antenna bore sight, representing the total - non-mechanical horizontal pan of the selected coverageShape. - Positive value gives azimuth to the right and negative value gives + description "Digitally-controlled azimuth through beamforming. + It represents the horizontal pointing direction of the antenna + relative to the antenna bore sight, representing the total + non-mechanical horizontal pan of the selected coverageShape. + Positive value gives azimuth to the right and negative value gives an azimuth to the left."; reference "3GPP TS 38.104, TS 38.901, TS 28.662"; @@ -47,10 +47,10 @@ module _3gpp-nr-nrm-commonbeamformingfunction { } leaf digitalTilt { - description "Digitally-controlled tilt through beamforming. - It represents the vertical pointing direction of the antenna relative - to the antenna bore sight, representing the total non-mechanical - vertical tilt of the selected coverageShape. Positive value gives + description "Digitally-controlled tilt through beamforming. + It represents the vertical pointing direction of the antenna relative + to the antenna bore sight, representing the total non-mechanical + vertical tilt of the selected coverageShape. Positive value gives downwards tilt and negative value gives upwards tilt."; reference "3GPP TS 38.104, TS 38.901, TS 28.662"; type int32 { range "-900..900"; } @@ -62,7 +62,7 @@ module _3gpp-nr-nrm-commonbeamformingfunction { + "nrsectcarr3gpp:NRSectorCarrier" { list CommonBeamformingFunction { - description "Represents common beamforming functionality (eg: SSB beams) + description "Represents common beamforming functionality (eg: SSB beams) for the NRSectorCarrier."; key id; uses top3gpp:Top_Grp; diff --git a/yang-models/_3gpp-nr-nrm-cpciconfigurationfunction.yang b/yang-models/_3gpp-nr-nrm-cpciconfigurationfunction.yang index 4c9de6b8f..8a1f869d5 100755 --- a/yang-models/_3gpp-nr-nrm-cpciconfigurationfunction.yang +++ b/yang-models/_3gpp-nr-nrm-cpciconfigurationfunction.yang @@ -11,13 +11,13 @@ module _3gpp-nr-nrm-cpciconfigurationfunction { organization "3GPP SA5"; contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464"; - description "Represents the CPCIConfigurationFunction Information Object + description "Represents the CPCIConfigurationFunction Information Object Class(IOC) that is part of the NR Network Resource Model. - Copyright 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + Copyright 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved."; reference "3GPP TS 28.541 5G Network Resource Model (NRM)"; - revision 2023-09-18 { reference CR-1043 ; } + revision 2023-09-18 { reference CR-1043 ; } revision 2021-08-05 { reference S5-214053/CR-0518; } revision 2020-05-08 { reference S5-203316; } @@ -25,7 +25,7 @@ module _3gpp-nr-nrm-cpciconfigurationfunction { description "Represents the CPCIConfigurationFunction IOC."; leaf cPciConfigurationControl { - description "This attribute determines whether the Centralized SON + description "This attribute determines whether the Centralized SON PCI configuration function is enabled or disabled."; type boolean; mandatory true; @@ -34,11 +34,11 @@ module _3gpp-nr-nrm-cpciconfigurationfunction { leaf-list cSonPciList { type int32 { range "0..1007"; } min-elements 1; - description "Holds a list of physical cell identities that can be - assigned to the pci attribute by gNB. The assignment algorithm is not - specified. + description "Holds a list of physical cell identities that can be + assigned to the pci attribute by gNB. The assignment algorithm is not + specified. See TS 38.211 clause 7.4.2.1 for legal values of pci. - This attribute shall be supported if and only if the C-SON PCI + This attribute shall be supported if and only if the C-SON PCI configuration is supported."; reference "See TS 38.211 clause 7.4.2.1"; } @@ -46,19 +46,19 @@ module _3gpp-nr-nrm-cpciconfigurationfunction { grouping CPCIConfigurationFunctionSubtree { list CPCIConfigurationFunction { - description "This IOC contains attributes to support the Cross + description "This IOC contains attributes to support the Cross Domain-Centralized SON function of PCI configuration - - In the case where multiple CPCIConfiguration MOIs exist at different - levels of the containment tree, the CPCIConfiguration MOI at the lower - level overrides the CPCIConfiguration MOIs at higher level(s) of the + + In the case where multiple CPCIConfiguration MOIs exist at different + levels of the containment tree, the CPCIConfiguration MOI at the lower + level overrides the CPCIConfiguration MOIs at higher level(s) of the same containment tree."; reference "clause 7.2.1 in TS 28.313"; - key id; - uses top3gpp:Top_Grp ; + key id; + uses top3gpp:Top_Grp ; container attributes { uses CPCIConfigurationFunctionGrp ; - } + } } } diff --git a/yang-models/_3gpp-nr-nrm-danrmanagementfunction.yang b/yang-models/_3gpp-nr-nrm-danrmanagementfunction.yang index 5dbbc4e4f..defdff6fb 100755 --- a/yang-models/_3gpp-nr-nrm-danrmanagementfunction.yang +++ b/yang-models/_3gpp-nr-nrm-danrmanagementfunction.yang @@ -11,26 +11,26 @@ module _3gpp-nr-nrm-danrmanagementfunction { contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464"; description "Defines the YANG mapping of the DANRManagementFunction IOC that is part of the NR Network Resource Model (NRM). - Copyright 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + Copyright 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved."; reference "3GPP TS 28.541 5G Network Resource Model (NRM)"; revision 2025-05-06 { reference "CR-1526 CR-1527" ; } // common for R18, R19 - revision 2024-08-19 { reference CR-1314 ; } - revision 2023-09-18 { reference CR-1043 ; } + revision 2024-08-19 { reference CR-1314 ; } + revision 2023-09-18 { reference CR-1043 ; } revision 2020-05-08 { reference S5-203316; } grouping DANRManagementFunctionGrp { description "Represents the DANRManagementFunction IOC."; leaf intrasystemANRManagementSwitch { - description "This attribute determines whether the intra-system ANR + description "This attribute determines whether the intra-system ANR function is activated or deactivated."; type boolean; } leaf intersystemANRManagementSwitch { - description "This attribute determines whether the inter-system ANR + description "This attribute determines whether the inter-system ANR function is activated or deactivated."; type boolean; } @@ -38,9 +38,9 @@ module _3gpp-nr-nrm-danrmanagementfunction { augment "/me3gpp:ManagedElement/gnbcucp3gpp:GNBCUCPFunction" { list DANRManagementFunction { - description "This IOC contains attributes to support the D-SON function + description "This IOC contains attributes to support the D-SON function of ANR Management (See clause 6.4.1.3 in TS 28.313 ."; - key id; + key id; max-elements 1; uses top3gpp:Top_Grp; container attributes { diff --git a/yang-models/_3gpp-nr-nrm-desmanagementfunction.yang b/yang-models/_3gpp-nr-nrm-desmanagementfunction.yang index 2e1e5bbaa..82edd8c9c 100755 --- a/yang-models/_3gpp-nr-nrm-desmanagementfunction.yang +++ b/yang-models/_3gpp-nr-nrm-desmanagementfunction.yang @@ -13,20 +13,20 @@ module _3gpp-nr-nrm-desmanagementfunction { organization "3GPP SA5"; contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464"; - description "Defines the YANG mapping of the DESManagementFunction - Information Object Class (IOC) that is part of the NR Network Resource + description "Defines the YANG mapping of the DESManagementFunction + Information Object Class (IOC) that is part of the NR Network Resource Model (NRM). - Copyright 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + Copyright 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved."; reference "3GPP TS 28.541 5G Network Resource Model (NRM)"; revision 2024-08-07 { reference CR-1331; } - revision 2023-09-18 { reference CR-1043 ; } + revision 2023-09-18 { reference CR-1043 ; } revision 2021-08-05 { reference S5-214053/CR-0518; } revision 2020-05-08 { reference S5-203316; } grouping loadTimeThresholdGrp { - description "Represents the the traffic load threshold and the time + description "Represents the the traffic load threshold and the time duration."; leaf loadThreshold { @@ -35,9 +35,9 @@ module _3gpp-nr-nrm-desmanagementfunction { type type5g3gpp:EnergySavingLoadThresholdT; } leaf timeDuration { - description "The time duration indicates how long the traffic load - (either for UL or DL) in the cell needs to have been above the - threshold to wake up one or more original cells which have been + description "The time duration indicates how long the traffic load + (either for UL or DL) in the cell needs to have been above the + threshold to wake up one or more original cells which have been provided backup coverage by the candidate cell."; type type5g3gpp:EnergySavingTimeDurationT; } @@ -47,15 +47,15 @@ module _3gpp-nr-nrm-desmanagementfunction { description "Represents the DESManagementFunction IOC."; leaf desSwitch { - description "This attribute determines whether the Distributed SON + description "This attribute determines whether the Distributed SON energy saving function is enabled or disabled."; type boolean; } list intraRatEsActivationOriginalCellLoadParameters { description "This attributes is relevant, if the cell acts as an original - cell. This attribute indicates the traffic load threshold and the time - duration, which are used by distributed ES algorithms to allow a cell + cell. This attribute indicates the traffic load threshold and the time + duration, which are used by distributed ES algorithms to allow a cell to enter the energySaving state."; key loadThreshold; min-elements 1; @@ -65,7 +65,7 @@ module _3gpp-nr-nrm-desmanagementfunction { list intraRatEsActivationCandidateCellsLoadParameters { description "This attribute indicates the traffic load threshold and the - time duration, which are used by distributed ES algorithms level to + time duration, which are used by distributed ES algorithms level to allow an 'original' cell to enter the energySaving state."; key loadThreshold; min-elements 1; @@ -75,8 +75,8 @@ module _3gpp-nr-nrm-desmanagementfunction { list intraRatEsDeactivationCandidateCellsLoadParameters { description "This attributes is relevant, if the cell acts as a candidate - cell.This attribute indicates the traffic load threshold and the time - duration which is used by distributed ES algorithms to allow a cell to + cell.This attribute indicates the traffic load threshold and the time + duration which is used by distributed ES algorithms to allow a cell to leave the energySaving state."; key loadThreshold; min-elements 1; @@ -85,7 +85,7 @@ module _3gpp-nr-nrm-desmanagementfunction { } list esNotAllowedTimePeriod { - description "This is a list of time periods during which + description "This is a list of time periods during which inter-RAT energy saving is not allowed"; key idx; @@ -96,7 +96,7 @@ module _3gpp-nr-nrm-desmanagementfunction { } list interRatEsActivationOriginalCellParameters { - description "This attribute indicates the traffic load threshold and the + description "This attribute indicates the traffic load threshold and the time duration, which are used by distributed inter-RAT ES algorithms to allow an original cell to enter the energySaving state."; key loadThreshold; @@ -106,7 +106,7 @@ module _3gpp-nr-nrm-desmanagementfunction { } list interRatEsActivationCandidateCellParameters { - description "This attribute indicates the traffic load threshold and the + description "This attribute indicates the traffic load threshold and the time duration, which are used by distributed inter-RAT ES algorithms to allow an original cell to enter the energySaving state."; key loadThreshold; @@ -116,8 +116,8 @@ module _3gpp-nr-nrm-desmanagementfunction { } list interRatEsDeactivationCandidateCellParameters { - description "This attribute indicates the traffic load threshold and the - time duration which is used by distributed inter-RAT ES algorithms to + description "This attribute indicates the traffic load threshold and the + time duration which is used by distributed inter-RAT ES algorithms to allow an original cell to leave the energySaving state."; key loadThreshold; min-elements 1; @@ -126,7 +126,7 @@ module _3gpp-nr-nrm-desmanagementfunction { } leaf energySavingState { - description "Specifies the status regarding the energy saving in the + description "Specifies the status regarding the energy saving in the cell."; type enumeration { enum isNotEnergySaving; @@ -135,44 +135,44 @@ module _3gpp-nr-nrm-desmanagementfunction { } leaf isProbingCapable { - description "This attribute indicates whether this cell is capable of + description "This attribute indicates whether this cell is capable of performing the ES probing procedure."; type enumeration{ enum yes; enum no; - } + } } leaf-list mLModelRefList { type types3gpp:DistinguishedName; description "This attribute holds a DN list of MLModel ¨ (See TS 28.105])."; - config false; + config false; } leaf-list aIMLInferenceFunctionRefList { type types3gpp:DistinguishedName; description "This attribute holds a DN list of AIMLInferenceFunction (See TS 28.105) ."; - config false; + config false; } } grouping EsNotAllowedTimePeriodGrp { leaf startTime { description "Start of not allowed time period in UTC time zone. - If set, the endTime must also be set. If not set, this is + If set, the endTime must also be set. If not set, this is interpreted as around the clock."; must ../endTime; type type5g3gpp:UTC24TimeOfDayT; } leaf endTime { - description "If endTime has a lower value than startTime, it will + description "If endTime has a lower value than startTime, it will be interpreted as referring to the following day."; type type5g3gpp:UTC24TimeOfDayT; must ../startTime; } leaf-list daysOfWeek { - description "Specifies that the not allowed periods are only - applicable to the specified days in UTC timezone. Every day if + description "Specifies that the not allowed periods are only + applicable to the specified days in UTC timezone. Every day if not set."; type type5g3gpp:DayOfWeekT; } @@ -180,20 +180,20 @@ module _3gpp-nr-nrm-desmanagementfunction { grouping DESManagementFunctionSubtree { list DESManagementFunction { - description "This IOC represents the management capabilities of - Distributed SON Energy Saving (ES) functions. This is provided for + description "This IOC represents the management capabilities of + Distributed SON Energy Saving (ES) functions. This is provided for Energy Saving purposes. - In the case where multiple DESManagement MOIs exist at different - levels of the containment tree, the DESManagement MOI at the lower - level overrides the DESManagement MOIs at higher level(s) of the same + In the case where multiple DESManagement MOIs exist at different + levels of the containment tree, the DESManagement MOI at the lower + level overrides the DESManagement MOIs at higher level(s) of the same containment tree."; reference "clause 6.2.3.0 in TS 28.310"; - key id; + key id; uses top3gpp:Top_Grp; container attributes { uses DESManagementFunctionGrp; - } + } } } diff --git a/yang-models/_3gpp-nr-nrm-dlbofunction.yang b/yang-models/_3gpp-nr-nrm-dlbofunction.yang index 9a3781a45..1ed4e20b4 100644 --- a/yang-models/_3gpp-nr-nrm-dlbofunction.yang +++ b/yang-models/_3gpp-nr-nrm-dlbofunction.yang @@ -12,17 +12,17 @@ module _3gpp-nr-nrm-dlbofunction { organization "3GPP SA5"; contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464"; - description "Defines the YANG mapping of the DLBOFunction - Information Object Class (IOC) that is part of the NR Network Resource + description "Defines the YANG mapping of the DLBOFunction + Information Object Class (IOC) that is part of the NR Network Resource Model (NRM). - Copyright 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + Copyright 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved."; reference "3GPP TS 28.541 5G Network Resource Model (NRM)"; revision 2024-08-07 { reference CR-1331; } - revision 2023-09-18 { reference CR-1043 ; } + revision 2023-09-18 { reference CR-1043 ; } revision 2022-03-25 { reference "CR-0683"; } - revision 2021-10-22 { reference "CR-0577"; } + revision 2021-10-22 { reference "CR-0577"; } feature DLBOUnderGNBCUCPFunction { description "The DLBOFunction shall be available under @@ -42,30 +42,30 @@ module _3gpp-nr-nrm-dlbofunction { description "Represents the DLBOFunction IOC."; leaf dlboControl { - description "This attribute determines whether the LBO function is + description "This attribute determines whether the LBO function is enabled or disabled."; type boolean; } leaf maximumDeviationHoTriggerLow { - description "This parameter defines the maximum allowed lower - deviation of the Handover Trigger, from the default point of + description "This parameter defines the maximum allowed lower + deviation of the Handover Trigger, from the default point of operation."; type int32 { range "-20..20"; } units "0.5 dB"; } leaf maximumDeviationHoTriggerHigh { - description "This parameter defines the maximum allowed upper - deviation of the Handover Trigger, from the default point of + description "This parameter defines the maximum allowed upper + deviation of the Handover Trigger, from the default point of operation."; type int32 { range "-20..20"; } units "0.5 dB"; } leaf minimumTimeBetweenHoTriggerChange { - description "This parameter defines the minimum allowed time interval - between two Handover Trigger change performed by MRO. This is used + description "This parameter defines the minimum allowed time interval + between two Handover Trigger change performed by MRO. This is used to control the stability and convergence of the algorithm."; type int32 { range "0..604800"; } units "1"; @@ -74,30 +74,30 @@ module _3gpp-nr-nrm-dlbofunction { type types3gpp:DistinguishedName; description "This attribute holds a DN list of MLModel ¨ (See TS 28.105)."; - config false; + config false; } leaf-list aIMLInferenceFunctionRefList { type types3gpp:DistinguishedName; description "This attribute holds a DN list of AIMLInferenceFunction (See TS 28.105) ."; - config false; + config false; } } grouping DLBOFunctionSubtree { list DLBOFunction { - description "This IOC contains attributes to support the D-SON function + description "This IOC contains attributes to support the D-SON function of LBO. - In the case where multiple DLBO MOIs exist at different levels of the + In the case where multiple DLBO MOIs exist at different levels of the containment tree, the DLBO MOI at the lower level overrides the DLBO MOIs at higher level(s) of the same containment tree."; reference "clause 7.1.2 in TS 28.313"; - key id; + key id; uses top3gpp:Top_Grp; container attributes { uses DLBOFunctionGrp; - } + } } } diff --git a/yang-models/_3gpp-nr-nrm-dmrofunction.yang b/yang-models/_3gpp-nr-nrm-dmrofunction.yang index 9c1937e1d..e03f24c59 100755 --- a/yang-models/_3gpp-nr-nrm-dmrofunction.yang +++ b/yang-models/_3gpp-nr-nrm-dmrofunction.yang @@ -12,15 +12,15 @@ module _3gpp-nr-nrm-dmrofunction { organization "3GPP SA5"; contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464"; - description "Defines the YANG mapping of the DMROFunction - Information Object Class (IOC) that is part of the NR Network Resource + description "Defines the YANG mapping of the DMROFunction + Information Object Class (IOC) that is part of the NR Network Resource Model (NRM). - Copyright 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + Copyright 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved."; reference "3GPP TS 28.541 5G Network Resource Model (NRM)"; - revision 2024-08-07 { reference CR-1331; } - revision 2023-09-18 { reference CR-1043 ; } + revision 2024-08-07 { reference CR-1331; } + revision 2023-09-18 { reference CR-1043 ; } revision 2022-01-07 { reference CR-0633; } revision 2021-08-05 { reference S5-214053/CR-0518; } revision 2020-05-08 { reference S5-203316; } @@ -30,16 +30,16 @@ module _3gpp-nr-nrm-dmrofunction { leaf maximumDeviationHoTriggerLow { - description "This parameter defines the maximum allowed lower - deviation of the Handover Trigger, from the default point of + description "This parameter defines the maximum allowed lower + deviation of the Handover Trigger, from the default point of operation."; type int32 {range "-20..20";} units "0.5 dB"; } - + leaf maximumDeviationHoTriggerHigh { - description "This parameter defines the maximum allowed upper - deviation of the Handover Trigger, from the default point of + description "This parameter defines the maximum allowed upper + deviation of the Handover Trigger, from the default point of operation."; type int32 {range "-20..20";} units "0.5 dB"; @@ -47,23 +47,23 @@ module _3gpp-nr-nrm-dmrofunction { leaf minimumTimeBetweenHoTriggerChange { description "This parameter defines the minimum allowed time interval - between two Handover Trigger change performed by MRO. This is used to + between two Handover Trigger change performed by MRO. This is used to control the stability and convergence of the algorithm."; - type uint32 { + type uint32 { range 0..604800; // <= 1 week } units seconds; } leaf tstoreUEcntxt { - description "The timer used for detection of too early HO, too late HO + description "The timer used for detection of too early HO, too late HO and HO to wrong cell."; - type uint32 { + type uint32 { range 0..1023; } units "100 milliseconds"; } leaf dmroControl { - description "This attribute determines whether the MRO function is + description "This attribute determines whether the MRO function is enabled or disabled."; type boolean; } @@ -83,18 +83,18 @@ module _3gpp-nr-nrm-dmrofunction { grouping DMROFunctionSubtree { list DMROFunction { - description "This IOC contains attributes to support the D-SON function + description "This IOC contains attributes to support the D-SON function of MRO. - In the case where multiple DMRO MOIs exist at different levels of the - containment tree, the DMRO MOI at the lower level overrides the DMRO + In the case where multiple DMRO MOIs exist at different levels of the + containment tree, the DMRO MOI at the lower level overrides the DMRO MOIs at higher level(s) of the same containment tree."; reference "clause 7.1.2 in TS 28.313"; - key id; + key id; uses top3gpp:Top_Grp; container attributes { uses DMROFunctionGrp; - } + } } } diff --git a/yang-models/_3gpp-nr-nrm-dpciconfigurationfunction.yang b/yang-models/_3gpp-nr-nrm-dpciconfigurationfunction.yang index 1a11e046a..233d8ad40 100755 --- a/yang-models/_3gpp-nr-nrm-dpciconfigurationfunction.yang +++ b/yang-models/_3gpp-nr-nrm-dpciconfigurationfunction.yang @@ -12,14 +12,14 @@ module _3gpp-nr-nrm-dpciconfigurationfunction { organization "3GPP SA5"; contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464"; - description "Defines the YANG mapping of the DPCIConfigurationFunction + description "Defines the YANG mapping of the DPCIConfigurationFunction Information Object Class (IOC) that is part of the NR Network Resource Model (NRM). - Copyright 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + Copyright 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved."; reference "3GPP TS 28.541 5G Network Resource Model (NRM)"; - revision 2023-09-18 { reference CR-1043 ; } + revision 2023-09-18 { reference CR-1043 ; } revision 2021-08-05 { reference S5-214053/CR-0518; } revision 2021-01-25 { reference CR-0454 ; } revision 2020-11-25 { reference CR-0386 ; } @@ -30,11 +30,11 @@ module _3gpp-nr-nrm-dpciconfigurationfunction { list nRPciList { description "This holds a list of physical cell identities that can be - assigned to the NR cells. This attribute shall be supported if D-SON + assigned to the NR cells. This attribute shall be supported if D-SON PCI configuration function is supported."; key NRPci; - leaf NRPci { - type type5g3gpp:PhysCellID; + leaf NRPci { + type type5g3gpp:PhysCellID; } } @@ -47,19 +47,19 @@ module _3gpp-nr-nrm-dpciconfigurationfunction { grouping DPCIConfigurationFunctionSubtree { list DPCIConfigurationFunction { - description "This IOC contains attributes to support the Distributed SON - function of PCI configuration. + description "This IOC contains attributes to support the Distributed SON + function of PCI configuration. - In the case where multiple DPCIConfiguration MOIs exist at different - levels of the containment tree, the DPCIConfiguration MOI at the lower - level overrides the DPCIConfiguration MOIs at higher level(s) of the + In the case where multiple DPCIConfiguration MOIs exist at different + levels of the containment tree, the DPCIConfiguration MOI at the lower + level overrides the DPCIConfiguration MOIs at higher level(s) of the same containment tree."; reference "clause 7.1.3 in TS 28.313"; - key id; + key id; uses top3gpp:Top_Grp; container attributes { uses DPCIConfigurationFunctionGrp; - } + } } } diff --git a/yang-models/_3gpp-nr-nrm-drachoptimizationfunction.yang b/yang-models/_3gpp-nr-nrm-drachoptimizationfunction.yang index 6b4ac81bb..94b277e68 100755 --- a/yang-models/_3gpp-nr-nrm-drachoptimizationfunction.yang +++ b/yang-models/_3gpp-nr-nrm-drachoptimizationfunction.yang @@ -11,21 +11,21 @@ module _3gpp-nr-nrm-drachoptimizationfunction { organization "3GPP SA5"; contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464"; - description "Defines the YANG mapping of the DRACHOptimizationFunction - Information Object Class (IOC) that is part of the NR Network Resource + description "Defines the YANG mapping of the DRACHOptimizationFunction + Information Object Class (IOC) that is part of the NR Network Resource Model (NRM). - Copyright 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + Copyright 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved."; reference "3GPP TS 28.541 5G Network Resource Model (NRM)"; revision 2025-03-25 { reference CR-1504 ; } - revision 2023-09-18 { reference CR-1043 ; } + revision 2023-09-18 { reference CR-1043 ; } revision 2021-08-05 { reference S5-214053/CR-0518; } revision 2021-01-25 { reference CR-0454 ; } revision 2020-10-02 { reference "CR-0384, CR-0382" ; } revision 2020-05-08 { reference S5-203316; } - typedef TargetProbabilityT { + typedef TargetProbabilityT { type enumeration { enum 25; enum 50; @@ -33,14 +33,14 @@ module _3gpp-nr-nrm-drachoptimizationfunction { enum 90; } } - typedef NumberofpreamblessentT { - type uint32 { - range "1..200"; + typedef NumberofpreamblessentT { + type uint32 { + range "1..200"; } } - typedef AccessdelayT { - type uint32 { - range "10..560"; + typedef AccessdelayT { + type uint32 { + range "10..560"; } } grouping NumPreableAccessDelayGrp { @@ -53,12 +53,12 @@ module _3gpp-nr-nrm-drachoptimizationfunction { type TargetProbabilityT; } leaf numberofpreamblessent { - description "This attribute indicates the number of preambles sent - used to configure a wanted distribution of RACH preambles in a + description "This attribute indicates the number of preambles sent + used to configure a wanted distribution of RACH preambles in a vendor implemented DRACH optimisation function. Note: The DRACH optimization function may configure preambleTransMax as defined in TS 38.331 [54]. The allowed values for preambleTransMax - are 3, 4, 5, 6, 7, 8, 10, 20, 50, 100, 200 (see 38.331 [54], + are 3, 4, 5, 6, 7, 8, 10, 20, 50, 100, 200 (see 38.331 [54], subclause 6.3.2)."; mandatory true; type NumberofpreamblessentT; @@ -75,13 +75,13 @@ module _3gpp-nr-nrm-drachoptimizationfunction { uses NumPreableAccessDelayGrp; } list ueAccDelayProbilityDist { - description "This is a list of target Access Delay probability (ADP) + description "This is a list of target Access Delay probability (ADP) for the RACH optimization function."; key "targetProbability numberofpreamblessent"; uses NumPreableAccessDelayGrp; } leaf drachOptimizationControl { - description "This attribute determines whether the RACH Optimization + description "This attribute determines whether the RACH Optimization function is enabled or disabled."; type boolean; } @@ -89,20 +89,20 @@ module _3gpp-nr-nrm-drachoptimizationfunction { grouping DRACHOptimizationFunctionSubtree { list DRACHOptimizationFunction { - description "This IOC represents the management capabilities of - Centralized SON Energy Saving (ES) functions. This is provided for + description "This IOC represents the management capabilities of + Centralized SON Energy Saving (ES) functions. This is provided for Energy Saving purposes. - - In the case where multiple CESManagement MOIs exist at different - levels of the containment tree, the CESManagement MOI at the lower - level overrides the CESManagement MOIs at higher level(s) of the + + In the case where multiple CESManagement MOIs exist at different + levels of the containment tree, the CESManagement MOI at the lower + level overrides the CESManagement MOIs at higher level(s) of the same containment tree."; reference "clause 6.2.2 in TS 28.310"; - key id; + key id; uses top3gpp:Top_Grp; container attributes { uses DRACHOptimizationFunctionGrp; - } + } } } diff --git a/yang-models/_3gpp-nr-nrm-ecmappingrule.yang b/yang-models/_3gpp-nr-nrm-ecmappingrule.yang index f971ade81..629b5dee5 100644 --- a/yang-models/_3gpp-nr-nrm-ecmappingrule.yang +++ b/yang-models/_3gpp-nr-nrm-ecmappingrule.yang @@ -2,40 +2,40 @@ module _3gpp-nr-nrm-ecmappingrule { yang-version 1.1; namespace urn:3gpp:sa5:_3gpp-nr-nrm-ecmappingrule; prefix ecmap3gpp; - + 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 unified mapping rule input to support Energy Cost Index Mapping when Energy Cost Reporting. - Copyright 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + Copyright 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved."; reference "3GPP TS 28.541"; revision 2025-05-06 { reference "CR-1526 CR-1527" ; } // common for R18, R19 - revision 2024-08-12 { reference "CR-1336 CR-1337"; } - + revision 2024-08-12 { reference "CR-1336 CR-1337"; } + grouping NRECMappingRuleGrp { - description "Represents the unified mapping rule to support Energy Cost Mapping - when Energy Cost Reporting is supported. Can be name-contained by SubNetwork + description "Represents the unified mapping rule to support Energy Cost Mapping + when Energy Cost Reporting is supported. Can be name-contained by SubNetwork or ManagedElement. It applies to all ManagedEntity contained by the parent."; leaf eCMRInputMinValue { type uint8; - description "The minimum value of to be applied + description "The minimum value of to be applied for mapping from this attribute to the energy cost."; } - + leaf eCMRInputMaxValue { type uint8; - description "The maximum value of to be applied - for mapping from this attribute to the energy cost."; + description "The maximum value of to be applied + for mapping from this attribute to the energy cost."; } leaf eCTimeInterval { type uint8; - description "Time interval (in seconds) that - should be applied for collecting values of mapping + description "Time interval (in seconds) that + should be applied for collecting values of mapping rule attribute to be used for computing the energy cost."; units seconds; } @@ -44,18 +44,18 @@ module _3gpp-nr-nrm-ecmappingrule { grouping NRECMappingRuleSubtree { description "Helps augmenting NRECMappingRule into multiple places."; list NRECMappingRule { - description "Represents the unified mapping rule, applicable for the - group of gNBs (within a certain area), for the calculation of the - energy cost (see TS 34.423). - - NRECMappingRule can be name-contained by SubNetwork or ManagedElement. + description "Represents the unified mapping rule, applicable for the + group of gNBs (within a certain area), for the calculation of the + energy cost (see TS 34.423). + + NRECMappingRule can be name-contained by SubNetwork or ManagedElement. It applies to all ManagedEntity contained by the parent."; key id; uses top3gpp:Top_Grp; min-elements 1; max-elements 1; container attributes { - uses NRECMappingRuleGrp; + uses NRECMappingRuleGrp; } } } diff --git a/yang-models/_3gpp-nr-nrm-ep.yang b/yang-models/_3gpp-nr-nrm-ep.yang index 60bc8091f..30f2a4d84 100755 --- a/yang-models/_3gpp-nr-nrm-ep.yang +++ b/yang-models/_3gpp-nr-nrm-ep.yang @@ -15,12 +15,12 @@ module _3gpp-nr-nrm-ep { description "Defines the YANG mapping of the NR related endpoint Information Object Classes (IOCs) that are part of the NR Network Resource Model (NRM). - Copyright 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + Copyright 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved."; reference "3GPP TS 28.541 5G Network Resource Model (NRM)"; revision 2025-05-06 { reference "CR-1526 CR-1527" ; } // common for R18, R19 - revision 2023-09-18 { reference CR-1043 ; } + revision 2023-09-18 { reference CR-1043 ; } revision 2022-01-07 { reference CR-0643; } revision 2021-05-01 { reference CR-0490; } revision 2021-03-03 { reference CR-0435 ; } @@ -40,7 +40,7 @@ module _3gpp-nr-nrm-ep { feature EPClassesUnderGNBDUFunction { description "Endpoint classes shall be contained under GNBDUFunction"; } - + grouping EP_E1Grp { description "Represents the EP_E1 IOC."; reference "3GPP TS 28.541, 3GPP TS 38.401"; @@ -54,7 +54,7 @@ module _3gpp-nr-nrm-ep { reference "3GPP TS 28.541, 3GPP TS 38.470"; key id; uses top3gpp:Top_Grp; - container attributes { + container attributes { uses eprp3gpp:EP_Common; } } @@ -67,7 +67,7 @@ module _3gpp-nr-nrm-ep { reference "3GPP TS 28.541, 3GPP TS 38.470"; key id; uses top3gpp:Top_Grp; - container attributes { + container attributes { uses eprp3gpp:EP_Common; } } @@ -78,37 +78,37 @@ module _3gpp-nr-nrm-ep { reference "3GPP TS 28.541, 3GPP TS 38.420"; uses eprp3gpp:EP_Common; } - + grouping EP_XnUGrp { description "Represents the EP_XnU IOC."; reference "3GPP TS 28.541, 3GPP TS 38.420"; uses eprp3gpp:EP_Common; } - + grouping EP_NgCGrp { description "Represents the EP_NgC IOC."; reference "3GPP TS 28.541, 3GPP TS 38.470"; uses eprp3gpp:EP_Common; } - + grouping EP_NgUGrp { description "Represents the EP_NgU IOC."; reference "3GPP TS 28.541, 3GPP TS 38.470"; uses eprp3gpp:EP_Common; } - + grouping EP_X2CGrp { description "Represents the EP_X2C IOC."; reference "3GPP TS 28.541, 3GPP TS 36.423"; uses eprp3gpp:EP_Common; } - + grouping EP_X2UGrp { description "Represents the EP_X2U IOC."; reference "3GPP TS 28.541, 3GPP TS 36.425"; uses eprp3gpp:EP_Common; } - + grouping EP_S1UGrp { description "Represents the EP_S1U IOC."; reference "3GPP TS 28.541, 3GPP TS 36.410"; @@ -124,7 +124,7 @@ module _3gpp-nr-nrm-ep { reference "3GPP TS 28.541, 3GPP TS 38.401"; key id; uses top3gpp:Top_Grp; - container attributes { + container attributes { uses EP_E1Grp; } } @@ -137,20 +137,20 @@ module _3gpp-nr-nrm-ep { reference "3GPP TS 28.541, 3GPP TS 38.470"; key id; uses top3gpp:Top_Grp; - container attributes { + container attributes { uses EP_NgCGrp; } } list EP_XnC { description "Represents the local gNB node end point of the logical - link, supporting Xn application protocols, to a neighbour NG-RAN node - (including gNB and ng-eNB). The Xn Application PDUs are carried over + link, supporting Xn application protocols, to a neighbour NG-RAN node + (including gNB and ng-eNB). The Xn Application PDUs are carried over SCTP/IP/Data link layer/Physical layer stack."; reference "3GPP TS 28.541, 3GPP TS 38.420 subclause 7"; key id; uses top3gpp:Top_Grp; - container attributes { + container attributes { uses EP_XnCGrp; } } @@ -162,7 +162,7 @@ module _3gpp-nr-nrm-ep { reference "3GPP TS 28.541, 3GPP TS 36.423"; key id; uses top3gpp:Top_Grp; - container attributes { + container attributes { uses EP_X2CGrp; } } @@ -177,7 +177,7 @@ module _3gpp-nr-nrm-ep { reference "3GPP TS 28.541, 3GPP TS 38.401"; key id; uses top3gpp:Top_Grp; - container attributes { + container attributes { uses EP_E1Grp; } } @@ -190,7 +190,7 @@ module _3gpp-nr-nrm-ep { reference "3GPP TS 28.541, 3GPP TS 38.470"; key id; uses top3gpp:Top_Grp; - container attributes { + container attributes { uses EP_NgUGrp; } } @@ -202,7 +202,7 @@ module _3gpp-nr-nrm-ep { reference "3GPP TS 28.541, 3GPP TS 38.420"; key id; uses top3gpp:Top_Grp; - container attributes { + container attributes { uses EP_XnUGrp; } } @@ -213,7 +213,7 @@ module _3gpp-nr-nrm-ep { reference "3GPP TS 28.541, 3GPP TS 36.425"; key id; uses top3gpp:Top_Grp; - container attributes { + container attributes { uses EP_X2UGrp; } } @@ -224,7 +224,7 @@ module _3gpp-nr-nrm-ep { reference "3GPP TS 28.541, 3GPP TS 36.410"; key id; uses top3gpp:Top_Grp; - container attributes { + container attributes { uses EP_S1UGrp; } } @@ -238,7 +238,7 @@ module _3gpp-nr-nrm-ep { max-elements 1; } } - + uses EP_F1USubtree; } } \ No newline at end of file diff --git a/yang-models/_3gpp-nr-nrm-eutrancellrelation.yang b/yang-models/_3gpp-nr-nrm-eutrancellrelation.yang index 015b86206..9d36d0f17 100755 --- a/yang-models/_3gpp-nr-nrm-eutrancellrelation.yang +++ b/yang-models/_3gpp-nr-nrm-eutrancellrelation.yang @@ -2,7 +2,7 @@ module _3gpp-nr-nrm-eutrancellrelation { yang-version 1.1; namespace "urn:3gpp:sa5:_3gpp-nr-nrm-eutrancellrelation"; prefix "eutrancellrel3gpp"; - + import _3gpp-common-yang-types { prefix types3gpp; } import _3gpp-common-managed-function { prefix mf3gpp; } import _3gpp-common-managed-element { prefix me3gpp; } @@ -13,11 +13,11 @@ module _3gpp-nr-nrm-eutrancellrelation { organization "3GPP SA5"; description "Defines the YANG mapping of the EUtranCellRelation Information Object Class (IOC) that is part of the NR Network Resource Model (NRM). - Copyright 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + Copyright 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved."; reference "3GPP TS 28.541 5G Network Resource Model (NRM)"; - revision 2023-09-18 { reference CR-1043 ; } + revision 2023-09-18 { reference CR-1043 ; } revision 2019-10-28 { reference S5-193518 ; } revision 2019-06-17 { description "Initial revision"; @@ -26,15 +26,15 @@ module _3gpp-nr-nrm-eutrancellrelation { typedef ActionAllowed { type enumeration { enum YES; - enum NO; + enum NO; } } - + typedef EnergySavingCoverage { type enumeration { enum YES; - enum NO; - enum PARTIAL; + enum NO; + enum PARTIAL; } } @@ -88,7 +88,7 @@ module _3gpp-nr-nrm-eutrancellrelation { Target cell is the adjacent cell referenced by this EUtranCellRelation instance. If NO, ICIC load information message sending shall not be allowed."; - reference "3GPP TS 36.423"; + reference "3GPP TS 36.423"; mandatory true; type ActionAllowed; } @@ -132,7 +132,7 @@ module _3gpp-nr-nrm-eutrancellrelation { leaf cellIndividualOffset { description "Offset applicable to a neighbouring cell. It is used for evaluating the neighbouring cell for handover in connected mode. Used - by the HandOver parameter Optimization (HOO) function or Load + by the HandOver parameter Optimization (HOO) function or Load Balancing Optimization (LBO) function."; reference "3GPP TS 36.331"; config false; @@ -151,10 +151,10 @@ module _3gpp-nr-nrm-eutrancellrelation { list EUtranCellRelation { description "Represents a relation between an NR cell and an E-UTRAN cell."; - reference "3GPP TS 28.541"; + reference "3GPP TS 28.541"; key id; uses top3gpp:Top_Grp; - container attributes { + container attributes { uses EUtranCellRelationGrp; } uses mf3gpp:ManagedFunctionContainedClasses; diff --git a/yang-models/_3gpp-nr-nrm-eutranetwork.yang b/yang-models/_3gpp-nr-nrm-eutranetwork.yang index ab7dc74f8..03b222a0c 100755 --- a/yang-models/_3gpp-nr-nrm-eutranetwork.yang +++ b/yang-models/_3gpp-nr-nrm-eutranetwork.yang @@ -11,12 +11,12 @@ module _3gpp-nr-nrm-eutranetwork { contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464"; description "Defines the YANG mapping of the EUtraNetwork Information Object Class (IOC) that is part of the NR Network Resource Model (NRM). - Copyright 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + Copyright 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved."; reference "3GPP TS 28.541 5G Network Resource Model (NRM)"; revision 2025-04-25 { reference "CR-1526 CR-1527" ; } // common for r18, r19 - revision 2023-09-18 { reference CR-1043 ; } + revision 2023-09-18 { reference CR-1043 ; } revision 2019-06-17 {reference "Initial revision"; } grouping EUtraNetworkGrp { @@ -24,14 +24,14 @@ module _3gpp-nr-nrm-eutranetwork { Contains no additiona attributes."; } - augment /me3gpp:ManagedElement/gnbcucp3gpp:GNBCUCPFunction { + augment /me3gpp:ManagedElement/gnbcucp3gpp:GNBCUCPFunction { list EUtraNetwork { description "A subnetwork containing gNB external E-UTRAN entities."; key id; uses top3gpp:Top_Grp; container attributes { uses EUtraNetworkGrp; - } + } } } } \ No newline at end of file diff --git a/yang-models/_3gpp-nr-nrm-eutranfreqrelation.yang b/yang-models/_3gpp-nr-nrm-eutranfreqrelation.yang index 32e67873d..5bb780abb 100755 --- a/yang-models/_3gpp-nr-nrm-eutranfreqrelation.yang +++ b/yang-models/_3gpp-nr-nrm-eutranfreqrelation.yang @@ -2,7 +2,7 @@ module _3gpp-nr-nrm-eutranfreqrelation { yang-version 1.1; namespace "urn:3gpp:sa5:_3gpp-nr-nrm-eutranfreqrelation"; prefix "eutranfreqrel3gpp"; - + import _3gpp-common-yang-types { prefix types3gpp; } import _3gpp-common-managed-function { prefix mf3gpp; } import _3gpp-common-managed-element { prefix me3gpp; } @@ -14,13 +14,13 @@ module _3gpp-nr-nrm-eutranfreqrelation { contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464"; description "Defines the YANG mapping of the EUtranFreqRelation Information Object Class (IOC) that is part of the NR Network Resource Model (NRM). - Copyright 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + Copyright 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved."; reference "3GPP TS 28.541 5G Network Resource Model (NRM)"; - revision 2025-01-25 { reference CR-1442; } - revision 2024-02-24 { reference CR-1218; } - revision 2023-09-18 { reference CR-1043; } + revision 2025-01-25 { reference CR-1442; } + revision 2024-02-24 { reference CR-1218; } + revision 2023-09-18 { reference CR-1043; } revision 2019-10-28 { reference S5-193518 ; } revision 2019-06-17 { reference "Initial version"; @@ -79,7 +79,7 @@ module _3gpp-nr-nrm-eutranfreqrelation { } leaf pMax { - description "Used for calculation of the parameter Pcompensation + description "Used for calculation of the parameter Pcompensation (defined in 3GPP TS 38.304), at cell reselection to a cell."; reference "PEMAX in 3GPP TS 38.101-1"; mandatory true; @@ -196,7 +196,7 @@ module _3gpp-nr-nrm-eutranfreqrelation { type types3gpp:DistinguishedName; } } - + augment "/me3gpp:ManagedElement" + "/gnbcucp3gpp:GNBCUCPFunction/nrcellcu3gpp:NRCellCU" { @@ -206,7 +206,7 @@ module _3gpp-nr-nrm-eutranfreqrelation { reference "3GPP TS 28.541"; key id; uses top3gpp:Top_Grp; - container attributes { + container attributes { uses EUtranFreqRelationGrp; } uses mf3gpp:ManagedFunctionContainedClasses; diff --git a/yang-models/_3gpp-nr-nrm-eutranfrequency.yang b/yang-models/_3gpp-nr-nrm-eutranfrequency.yang index 70508b134..d813c2ff7 100755 --- a/yang-models/_3gpp-nr-nrm-eutranfrequency.yang +++ b/yang-models/_3gpp-nr-nrm-eutranfrequency.yang @@ -13,13 +13,13 @@ module _3gpp-nr-nrm-eutranfrequency { contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464"; description "Defines the YANG mapping of the EUtranFrequency Information Object Class (IOC), that is part of the NR Network Resource Model (NRM). - Copyright 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + Copyright 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved."; reference "3GPP TS 28.541 5G Network Resource Model (NRM), 3GPP TS 28.658 (E-UTRAN) Network Resource Model (NRM)"; revision 2025-04-25 { reference "CR-1526 CR-1527" ; } // common for r18, r19 - revision 2023-09-18 { reference CR-1043 ; } + revision 2023-09-18 { reference CR-1043 ; } revision 2019-10-28 { reference S5-193518 ; } revision 2019-06-17 { reference "Initial revision"; } @@ -52,12 +52,12 @@ module _3gpp-nr-nrm-eutranfrequency { uses EUtranFrequencyGrp; } } - } - + } + feature EUtranFrequencyUnderSubNetwork { description "The EUtranFrequency shall be contained under SubNetwork"; } - + augment "/subnet3gpp:SubNetwork" { if-feature EUtranFrequencyUnderSubNetwork ; uses EUtranFrequencyWrapper; @@ -66,7 +66,7 @@ module _3gpp-nr-nrm-eutranfrequency { feature EUtranFrequencyUnderEUtraNetwork { description "The EUtranFrequency shall be contained under EUtraNetwork"; } - + augment "/me3gpp:ManagedElement/gnbcucp3gpp:GNBCUCPFunction/" + "eutranet3gpp:EUtraNetwork" { if-feature EUtranFrequencyUnderEUtraNetwork; diff --git a/yang-models/_3gpp-nr-nrm-externalamffunction.yang b/yang-models/_3gpp-nr-nrm-externalamffunction.yang index f74c5d3a0..7dee0c635 100755 --- a/yang-models/_3gpp-nr-nrm-externalamffunction.yang +++ b/yang-models/_3gpp-nr-nrm-externalamffunction.yang @@ -2,7 +2,7 @@ module _3gpp-nr-nrm-externalamffunction { yang-version 1.1; namespace "urn:3gpp:sa5:_3gpp-nr-nrm-externalamffunction"; prefix "extamf3gpp"; - + import _3gpp-common-managed-function { prefix mf3gpp; } import _3gpp-common-subnetwork { prefix subnet3gpp; } import _3gpp-common-top { prefix top3gpp; } @@ -12,12 +12,12 @@ module _3gpp-nr-nrm-externalamffunction { contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464"; description "Defines the YANG mapping of the ExternalAMFFunction Information Object Class (IOC) that is part of the NR Network Resource Model (NRM). - Copyright 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + Copyright 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved."; reference "3GPP TS 28.541 5G Network Resource Model (NRM)"; revision 2025-04-25 { reference "CR-1526 CR-1527" ; } // common for r18, r19 - revision 2023-09-18 { reference CR-1043 ; } + revision 2023-09-18 { reference CR-1043 ; } revision 2019-10-28 { reference S5-193518 ; } revision 2019-06-17 { reference "Initial revision"; } @@ -26,16 +26,16 @@ module _3gpp-nr-nrm-externalamffunction { uses mf3gpp:ManagedFunctionGrp; list pLMNIdList { - description "List of at most six entries of PLMN Identifiers, but at least + description "List of at most six entries of PLMN Identifiers, but at least one (the primary PLMN Id). - The PLMN Identifier is composed of a Mobile Country Code (MCC) and a + The PLMN Identifier is composed of a Mobile Country Code (MCC) and a Mobile Network Code (MNC)."; min-elements 1; max-elements 6; key "mcc mnc"; uses types3gpp:PLMNId; } - + container aMFIdentifier { presence true; description "An AMF identifier, comprising an AMF Region ID, an AMF Set ID and an AMF Pointer."; @@ -56,8 +56,8 @@ module _3gpp-nr-nrm-externalamffunction { } uses mf3gpp:ManagedFunctionContainedClasses; } - } - + } + augment "/subnet3gpp:SubNetwork" { uses ExternalAMFFunctionWrapper; } diff --git a/yang-models/_3gpp-nr-nrm-externalenbfunction.yang b/yang-models/_3gpp-nr-nrm-externalenbfunction.yang index ed8cb6683..441096e32 100755 --- a/yang-models/_3gpp-nr-nrm-externalenbfunction.yang +++ b/yang-models/_3gpp-nr-nrm-externalenbfunction.yang @@ -16,13 +16,13 @@ module _3gpp-nr-nrm-externalenbfunction { description "Defines the YANG mapping of the ExternalENBFunction Information Object Class (IOC) that is part of the NR Network Resource Model (NRM). - Copyright 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + Copyright 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved."; reference "3GPP TS 28.541 5G Network Resource Model (NRM), 3GPP TS 28.658 (E-UTRAN) Network Resource Model (NRM)"; revision 2025-04-25 { reference "CR-1526 CR-1527" ; } // common for r18, r19 - revision 2023-09-18 { reference CR-1043 ; } + revision 2023-09-18 { reference CR-1043 ; } revision 2019-10-28 { reference S5-193518 ; } revision 2019-06-17 { reference "Initial revision"; } @@ -54,13 +54,13 @@ module _3gpp-nr-nrm-externalenbfunction { uses exteutrancell3gpp:ExternalEUtranCellFDDSubtree; uses exteutrancell3gpp:ExternalEUtranCellTDDSubtree; } - } - + } + feature ExternalENBFunctionUnderSubNetwork { description "The ExternalENBFunction shall be contained under SubNetwork"; } - + augment "/subnet3gpp:SubNetwork" { if-feature ExternalENBFunctionUnderSubNetwork ; uses ExternalENBFunctionWrapper; @@ -70,7 +70,7 @@ module _3gpp-nr-nrm-externalenbfunction { description "The ExternalENBFunction shall be contained under EUtraNetwork"; } - + augment "/me3gpp:ManagedElement/gnbcucp3gpp:GNBCUCPFunction/" + "eutranet3gpp:EUtraNetwork" { if-feature ExternalENBFunctionUnderEUtraNetwork; diff --git a/yang-models/_3gpp-nr-nrm-externaleutrancell.yang b/yang-models/_3gpp-nr-nrm-externaleutrancell.yang index e6f97092e..bdd969fc1 100755 --- a/yang-models/_3gpp-nr-nrm-externaleutrancell.yang +++ b/yang-models/_3gpp-nr-nrm-externaleutrancell.yang @@ -12,18 +12,18 @@ module _3gpp-nr-nrm-externaleutrancell { description "Defines the YANG mapping of the ExternalEUtranCellFDD and ExternalEUtranCellTDD Information Object Classes (IOCs) that are part of the NR Network Resource Model (NRM). - Copyright 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + Copyright 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved."; reference "3GPP TS 28.541 5G Network Resource Model (NRM), 3GPP TS 28.658 (E-UTRAN) Network Resource Model (NRM)"; revision 2025-04-25 { reference "CR-1526 CR-1527" ; } // common for r18, r19 - revision 2023-09-18 { reference CR-1043 ; } + revision 2023-09-18 { reference CR-1043 ; } revision 2019-10-28 { reference S5-193518 ; } revision 2019-06-17 { reference "Initial revision"; } grouping ExternalEUtranGenericCellGrp { - description "Represents the ExternalEUtranGenericCell IOC."; + description "Represents the ExternalEUtranGenericCell IOC."; reference "3GPP TS 28.658"; uses mf3gpp:ManagedFunctionGrp; @@ -53,10 +53,10 @@ module _3gpp-nr-nrm-externaleutrancell { uses types3gpp:PLMNId; } - leaf cellLocalId { + leaf cellLocalId { description "Unambiguously identifies a cell within an eNodeB."; reference "NCI defined in 3GPP TS 38.300"; - type int32 {range "0..255"; } + type int32 {range "0..255"; } } leaf eNBId { @@ -68,9 +68,9 @@ module _3gpp-nr-nrm-externaleutrancell { // allowed. } } - + grouping ExternalEUtranCellFDDGrp { - description "Represents the ExternalEUtranCellFDD IOC."; + description "Represents the ExternalEUtranCellFDD IOC."; reference "3GPP TS 28.658"; uses ExternalEUtranGenericCellGrp; @@ -91,7 +91,7 @@ module _3gpp-nr-nrm-externaleutrancell { } grouping ExternalEUtranCellTDDGrp { - description "Represents the ExternalEUtranCellTDD IOC."; + description "Represents the ExternalEUtranCellTDD IOC."; reference "3GPP TS 28.658"; uses ExternalEUtranGenericCellGrp; diff --git a/yang-models/_3gpp-nr-nrm-externalgnbcucpfunction.yang b/yang-models/_3gpp-nr-nrm-externalgnbcucpfunction.yang index ff466a30b..0c7b28228 100755 --- a/yang-models/_3gpp-nr-nrm-externalgnbcucpfunction.yang +++ b/yang-models/_3gpp-nr-nrm-externalgnbcucpfunction.yang @@ -17,12 +17,12 @@ module _3gpp-nr-nrm-externalgnbcucpfunction { description "Defines the YANG mapping of the ExternalGNBCUCPFunction Information Object Class (IOC), that is part of the NR Network Resource Model (NRM). - Copyright 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + Copyright 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved."; reference "3GPP TS 28.541 5G Network Resource Model (NRM)"; revision 2025-04-25 { reference "CR-1526 CR-1527" ; } // common for r18, r19 - revision 2023-09-18 { reference CR-1043 ; } + revision 2023-09-18 { reference CR-1043 ; } revision 2019-10-28 { reference S5-193518 ; } revision 2019-06-17 { reference "Initial revision"; } @@ -31,10 +31,10 @@ module _3gpp-nr-nrm-externalgnbcucpfunction { uses mf3gpp:ManagedFunctionGrp; leaf gNBId { - description "Identifies a gNB within a PLMN. + description "Identifies a gNB within a PLMN. The gNB ID is part of the NR Cell Identifier (NCI) of the gNB cells. - See 'gNB Identifier (gNB ID)' of subclause 8.2 of TS 38.300. + See 'gNB Identifier (gNB ID)' of subclause 8.2 of TS 38.300. See 'Global gNB ID' in subclause 9.3.1.6 of TS 38.413"; mandatory true; type uint32 { range "0..4294967295"; } @@ -67,17 +67,17 @@ module _3gpp-nr-nrm-externalgnbcucpfunction { uses ExternalGNBCUCPFunctionGrp; } uses mf3gpp:ManagedFunctionContainedClasses; - + uses extnrcellcu3gpp:ExternalNRCellCUSubtree; } - } - + } + feature ExternalGNBCUCPFunctionUnderNRNetwork { description "The ExternalGNBCUCPFunction shall be contained under NRNetwork"; } - - augment "/me3gpp:ManagedElement/gnbcucp3gpp:GNBCUCPFunction/" + + augment "/me3gpp:ManagedElement/gnbcucp3gpp:GNBCUCPFunction/" + "nrnet3gpp:NRNetwork" { if-feature ExternalGNBCUCPFunctionUnderNRNetwork; uses ExternalGNBCUCPFunctionWrapper; @@ -87,7 +87,7 @@ module _3gpp-nr-nrm-externalgnbcucpfunction { description "The ExternalGNBCUCPFunction shall be contained under SubNetwork"; } - + augment "/subnet3gpp:SubNetwork" { if-feature ExternalGNBCUCPFunctionUnderSubNetwork ; uses ExternalGNBCUCPFunctionWrapper; diff --git a/yang-models/_3gpp-nr-nrm-externalgnbcuupfunction.yang b/yang-models/_3gpp-nr-nrm-externalgnbcuupfunction.yang index 41ac84351..5dcc6844e 100755 --- a/yang-models/_3gpp-nr-nrm-externalgnbcuupfunction.yang +++ b/yang-models/_3gpp-nr-nrm-externalgnbcuupfunction.yang @@ -15,25 +15,25 @@ module _3gpp-nr-nrm-externalgnbcuupfunction { description "Defines the YANG mapping of the ExternalGNBCUUPFunction Information Object Class (IOC), that is part of the NR Network Resource Model (NRM). - Copyright 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + Copyright 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved."; reference "3GPP TS 28.541 5G Network Resource Model (NRM)"; revision 2025-04-25 { reference "CR-1526 CR-1527" ; } // common for r18, r19 - revision 2023-09-18 { reference CR-1043 ; } + revision 2023-09-18 { reference CR-1043 ; } revision 2019-10-28 { reference S5-193518 ; } revision 2019-06-17 { reference "Initial revision"; } grouping ExternalGNBCUUPFunctionGrp { description "Represets the ExternalGNBCUUPFunction IOC."; - reference "3GPP TS 28.541"; - uses mf3gpp:ManagedFunctionGrp; - + reference "3GPP TS 28.541"; + uses mf3gpp:ManagedFunctionGrp; + leaf gNBId { - description "Identifies a gNB within a PLMN. + description "Identifies a gNB within a PLMN. The gNB ID is part of the NR Cell Identifier (NCI) of the gNB cells. - See 'gNB Identifier (gNB ID)' of subclause 8.2 of TS 38.300. + See 'gNB Identifier (gNB ID)' of subclause 8.2 of TS 38.300. See 'Global gNB ID' in subclause 9.3.1.6 of TS 38.413"; mandatory true; type uint32 { range "0..4294967295"; } @@ -58,14 +58,14 @@ module _3gpp-nr-nrm-externalgnbcuupfunction { } uses mf3gpp:ManagedFunctionContainedClasses; } - } - + } + feature ExternalGNBCUUPFunctionUnderNRNetwork { description "The ExternalGNBCUUPFunction shall be contained under NRNetwork"; } - - augment "/me3gpp:ManagedElement/gnbcucp3gpp:GNBCUCPFunction/" + + augment "/me3gpp:ManagedElement/gnbcucp3gpp:GNBCUCPFunction/" + "nrnet3gpp:NRNetwork" { if-feature ExternalGNBCUUPFunctionUnderNRNetwork; uses ExternalGNBCUUPFunctionSubtree; @@ -75,7 +75,7 @@ module _3gpp-nr-nrm-externalgnbcuupfunction { description "The ExternalGNBCUUPFunction shall be contained under SubNetwork"; } - + augment "/subnet3gpp:SubNetwork" { if-feature ExternalGNBCUUPFunctionUnderSubNetwork ; uses ExternalGNBCUUPFunctionSubtree; diff --git a/yang-models/_3gpp-nr-nrm-externalgnbdufunction.yang b/yang-models/_3gpp-nr-nrm-externalgnbdufunction.yang index 115fdf6c8..500644531 100755 --- a/yang-models/_3gpp-nr-nrm-externalgnbdufunction.yang +++ b/yang-models/_3gpp-nr-nrm-externalgnbdufunction.yang @@ -16,25 +16,25 @@ module _3gpp-nr-nrm-externalgnbdufunction { description "Defines the YANG mapping of the ExternalGNBDUFunction Information Object Class (IOC) that is part of the NR Network Resource Model (NRM). - Copyright 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + Copyright 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved."; reference "3GPP TS 28.541 5G Network Resource Model (NRM)"; revision 2025-04-25 { reference "CR-1526 CR-1527" ; } // common for r18, r19 - revision 2023-09-18 { reference CR-1043 ; } + revision 2023-09-18 { reference CR-1043 ; } revision 2019-10-28 { reference S5-193518 ; } revision 2019-06-17 { reference "Initial revision"; } grouping ExternalGNBDUFunctionGrp { description "Represets the ExternalGNBDUFunction IOC."; - reference "3GPP TS 28.541"; - uses mf3gpp:ManagedFunctionGrp; - + reference "3GPP TS 28.541"; + uses mf3gpp:ManagedFunctionGrp; + leaf gNBId { - description "Identifies a gNB within a PLMN. + description "Identifies a gNB within a PLMN. The gNB ID is part of the NR Cell Identifier (NCI) of the gNB cells. - See 'gNB Identifier (gNB ID)' of subclause 8.2 of TS 38.300. + See 'gNB Identifier (gNB ID)' of subclause 8.2 of TS 38.300. See 'Global gNB ID' in subclause 9.3.1.6 of TS 38.413"; mandatory true; type uint32 { range "0..4294967295"; } @@ -60,14 +60,14 @@ module _3gpp-nr-nrm-externalgnbdufunction { } uses mf3gpp:ManagedFunctionContainedClasses; } - } - + } + feature ExternalGNBDUFunctionUnderNRNetwork { description "The ExternalGNBDUFunction shall be contained under NRNetwork"; } - - augment "/me3gpp:ManagedElement/gnbcucp3gpp:GNBCUCPFunction/" + + augment "/me3gpp:ManagedElement/gnbcucp3gpp:GNBCUCPFunction/" + "nrnet3gpp:NRNetwork" { if-feature ExternalGNBDUFunctionUnderNRNetwork; uses ExternalGNBDUFunctionSubtree; @@ -77,7 +77,7 @@ module _3gpp-nr-nrm-externalgnbdufunction { description "The ExternalGNBDUFunction shall be contained under SubNetwork"; } - + augment "/subnet3gpp:SubNetwork" { if-feature ExternalGNBDUFunctionUnderSubNetwork ; uses ExternalGNBDUFunctionSubtree; diff --git a/yang-models/_3gpp-nr-nrm-externalnrcellcu.yang b/yang-models/_3gpp-nr-nrm-externalnrcellcu.yang index 1586cad43..b925509bc 100755 --- a/yang-models/_3gpp-nr-nrm-externalnrcellcu.yang +++ b/yang-models/_3gpp-nr-nrm-externalnrcellcu.yang @@ -11,48 +11,48 @@ module _3gpp-nr-nrm-externalnrcellcu { contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464"; description "Defines the YANG mapping of the ExternalNRCellCU Information Object Class (IOC), that is part of the NR Network Resource Model (NRM). - Copyright 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + Copyright 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved."; reference "3GPP TS 28.541 5G Network Resource Model (NRM)"; revision 2025-04-25 { reference "CR-1526 CR-1527" ; } // common for r18, r19 - revision 2023-09-18 { reference CR-1043 ; } + revision 2023-09-18 { reference CR-1043 ; } revision 2019-10-28 { reference S5-193518 ; } revision 2019-06-17 { reference "Initial revision"; } grouping ExternalNRCellCUGrp { - description "Represents the ExternalNRCellCU IOC."; + description "Represents the ExternalNRCellCU IOC."; uses mf3gpp:ManagedFunctionGrp; - - leaf cellLocalId { - description "It identifies a NR cell of a gNB. - It, together with the gNB Identifier (using gNBId of the parent - GNBCUCPFunction or GNBDUFunction or OperatorDU (for MOCN network - sharing scenario) or ExternalCUCPFunction), identifies a NR cell within - a PLMN. This is the NR Cell Identity(NCI). See subclause 8.2 of TS38.300. + leaf cellLocalId { + description "It identifies a NR cell of a gNB. - The NCI can be constructed by encoding the gNB Identifier using gNBId - (of the parent GNBCUCPFunction or GNBDUFunction or OperatorDU - (for MOCN network sharing scenario) or ExternalCUCPFunction) and + It, together with the gNB Identifier (using gNBId of the parent + GNBCUCPFunction or GNBDUFunction or OperatorDU (for MOCN network + sharing scenario) or ExternalCUCPFunction), identifies a NR cell within + a PLMN. This is the NR Cell Identity(NCI). See subclause 8.2 of TS38.300. + + The NCI can be constructed by encoding the gNB Identifier using gNBId + (of the parent GNBCUCPFunction or GNBDUFunction or OperatorDU + (for MOCN network sharing scenario) or ExternalCUCPFunction) and cellLocalId where the gNB Identifier field is of length specified by - gNBIdLength (of the parent GNBCUCPFunction or GNBDUFunction or - ExternalCUCPFunction). See 'Global gNB ID' in subclause 9.3.1.6 of + gNBIdLength (of the parent GNBCUCPFunction or GNBDUFunction or + ExternalCUCPFunction). See 'Global gNB ID' in subclause 9.3.1.6 of TS 38.413. - The NR Cell Global identifier (NCGI) is constructed from the - PLMN identity the cell belongs to and the NR Cell Identifier (NCI) of + The NR Cell Global identifier (NCGI) is constructed from the + PLMN identity the cell belongs to and the NR Cell Identifier (NCI) of the cell. See relation between NCI and NCGI subclause 8.2 of TS 38.300 "; mandatory true; - type int32; + type int32; } leaf nRPCI { description "This holds the Physical Cell Identity (PCI) of the NR cell. - allowedValues: + allowedValues: See 3GPP TS 36.211 subclause 6.11 for legal values of pci."; mandatory true; type int64; @@ -78,8 +78,8 @@ module _3gpp-nr-nrm-externalnrcellcu { grouping ExternalNRCellCUSubtree { list ExternalNRCellCU { - description "This IOC contains necessary attributes for inter-system - and intra-system handover. It also contains a subset of the attributes + description "This IOC contains necessary attributes for inter-system + and intra-system handover. It also contains a subset of the attributes of related IOCs controlled by Management Service Provider."; key id; uses top3gpp:Top_Grp; @@ -88,5 +88,5 @@ module _3gpp-nr-nrm-externalnrcellcu { } uses mf3gpp:ManagedFunctionContainedClasses; } - } + } } \ No newline at end of file diff --git a/yang-models/_3gpp-nr-nrm-externalservinggwfunction.yang b/yang-models/_3gpp-nr-nrm-externalservinggwfunction.yang index dcaba95b4..128b2f0ea 100755 --- a/yang-models/_3gpp-nr-nrm-externalservinggwfunction.yang +++ b/yang-models/_3gpp-nr-nrm-externalservinggwfunction.yang @@ -2,7 +2,7 @@ module _3gpp-nr-nrm-externalservinggwfunction { yang-version 1.1; namespace "urn:3gpp:sa5:_3gpp-nr-nrm-externalservinggwfunction"; prefix "extservgw3gpp"; - + import _3gpp-common-managed-function { prefix mf3gpp; } //import _3gpp-common-subnetwork { prefix subnet3gpp; } import _3gpp-common-top { prefix top3gpp; } @@ -11,12 +11,12 @@ module _3gpp-nr-nrm-externalservinggwfunction { description "Defines the YANG mapping of the ExternalServingGWFunction Information Object Class (IOC) that is part of the NR Network Resource Model (NRM). - Copyright 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + Copyright 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved."; reference "3GPP TS 28.541 5G Network Resource Model (NRM)"; revision 2025-04-25 { reference "CR-1526 CR-1527" ; } // common for r18, r19 - revision 2023-09-18 { reference CR-1043 ; } + revision 2023-09-18 { reference CR-1043 ; } revision 2019-10-28 { reference S5-193518 ; } revision 2019-06-17 { description "Initial revision"; @@ -41,8 +41,8 @@ module _3gpp-nr-nrm-externalservinggwfunction { } uses mf3gpp:ManagedFunctionContainedClasses; } - } - + } + /*augment "/subnet3gpp:SubNetwork" { if-feature subnet3gpp:ExternalsUnderSubNetwork ; uses ExternalServingGWFunctionWrapper; diff --git a/yang-models/_3gpp-nr-nrm-externalupffunction.yang b/yang-models/_3gpp-nr-nrm-externalupffunction.yang index abe82b6c8..4f817ef85 100755 --- a/yang-models/_3gpp-nr-nrm-externalupffunction.yang +++ b/yang-models/_3gpp-nr-nrm-externalupffunction.yang @@ -2,7 +2,7 @@ module _3gpp-nr-nrm-externalupffunction { yang-version 1.1; namespace "urn:3gpp:sa5:_3gpp-nr-nrm-externalupffunction"; prefix "extupf3gpp"; - + import _3gpp-common-managed-function { prefix mf3gpp; } /*import _3gpp-common-subnetwork { prefix subnet3gpp; } import _3gpp-nr-nrm-nrnetwork { prefix nrnet3gpp; }*/ @@ -12,12 +12,12 @@ module _3gpp-nr-nrm-externalupffunction { contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464"; description "Defines the YANG mapping of the ExternalUPFFunction Information Object Class (IOC) that is part of the NR Network Resource Model (NRM). - Copyright 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + Copyright 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved."; reference "3GPP TS 28.541 5G Network Resource Model (NRM)"; revision 2025-04-25 { reference "CR-1526 CR-1527" ; } // common for r18, r19 - revision 2023-09-18 { reference CR-1043 ; } + revision 2023-09-18 { reference CR-1043 ; } revision 2019-10-28 { reference S5-193518 ; } revision 2019-06-17 { description "Initial revision"; @@ -42,8 +42,8 @@ module _3gpp-nr-nrm-externalupffunction { } uses mf3gpp:ManagedFunctionContainedClasses; } - } - + } + /*augment "/subnet3gpp:SubNetwork" { if-feature subnet3gpp:ExternalsUnderSubNetwork ; uses ExternalUPFFunctionWrapper; diff --git a/yang-models/_3gpp-nr-nrm-gnbcucpfunction.yang b/yang-models/_3gpp-nr-nrm-gnbcucpfunction.yang index 335eb3c16..e2940624d 100755 --- a/yang-models/_3gpp-nr-nrm-gnbcucpfunction.yang +++ b/yang-models/_3gpp-nr-nrm-gnbcucpfunction.yang @@ -2,7 +2,7 @@ module _3gpp-nr-nrm-gnbcucpfunction { yang-version 1.1; namespace "urn:3gpp:sa5:_3gpp-nr-nrm-gnbcucpfunction"; prefix "gnbcucp3gpp"; - + import _3gpp-common-yang-types { prefix types3gpp; } import _3gpp-5g-common-yang-types { prefix types5g3gpp; } import _3gpp-common-yang-extensions { prefix yext3gpp; } @@ -14,9 +14,9 @@ module _3gpp-nr-nrm-gnbcucpfunction { organization "3GPP SA5"; contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464"; - description "Defines the YANG mapping of the GNBCUCPFunction Information + description "Defines the YANG mapping of the GNBCUCPFunction Information Object Class (IOC) that is part of the NR Network Resource Model (NRM). - Copyright 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + Copyright 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved."; reference "3GPP TS 28.541 5G Network Resource Model (NRM)"; @@ -24,14 +24,14 @@ module _3gpp-nr-nrm-gnbcucpfunction { revision 2025-05-07 { reference "CR-1548"; } revision 2025-03-25 { reference "CR-1509"; } revision 2025-01-25 { reference "CR-1442"; } - revision 2024-11-07 { reference "CR-1443"; } - revision 2024-08-19 { reference "CR-1405"; } - revision 2024-08-19 { reference "CR-1337 CR-1352"; } - revision 2024-05-24 { reference CR-1273 ; } + revision 2024-11-07 { reference "CR-1443"; } + revision 2024-08-19 { reference "CR-1405"; } + revision 2024-08-19 { reference "CR-1337 CR-1352"; } + revision 2024-05-24 { reference CR-1273 ; } revision 2024-04-04 { reference CR-1139; } - revision 2024-02-24 { reference CR-1218; } + revision 2024-02-24 { reference CR-1218; } revision 2024-01-12 { reference CR-1138; } - revision 2023-09-18 { reference CR-1043; } + revision 2023-09-18 { reference CR-1043; } revision 2023-04-26 { reference CR-0916; } revision 2022-07-28 { reference "CR-0770"; } revision 2021-11-06 { reference "CR-0611" ; } @@ -65,18 +65,18 @@ module _3gpp-nr-nrm-gnbcucpfunction { } grouping BackhaulAddressGrp { - description "This data type represents the properties describing the + description "This data type represents the properties describing the backhaul address of gNB. "; - + leaf gNBId { type uint32 ; mandatory true; - description "It identifies a gNB within a PLMN. The gNB ID is part of + description "It identifies a gNB within a PLMN. The gNB ID is part of the NR Cell Identifier (NCI) of the gNB cells."; - reference "gNB Identifier (gNB ID) of subclause 8.2 of TS 38.300. + reference "gNB Identifier (gNB ID) of subclause 8.2 of TS 38.300. Global gNB ID in subclause 9.3.1.6 of TS 38.413"; } - + list tAI { key tac; min-elements 1; @@ -86,25 +86,25 @@ module _3gpp-nr-nrm-gnbcucpfunction { uses types3gpp:TaiGrp; } } - + grouping MappingSetIDBackhaulAddressGrp { - description "This data type represents the properties describing the + description "This data type represents the properties describing the mapping relationship between set ID and backhaul address of gNB."; - + leaf setId { type uint32 { range 0..4194304; // 22 bits } mandatory true; - description "This specifies the set ID of a victim Set (RIM-RS1 Set) or - aggressor Set (RIM-RS2 set). (See subclause 7.4.1.6 in TS 38.211). + description "This specifies the set ID of a victim Set (RIM-RS1 Set) or + aggressor Set (RIM-RS2 set). (See subclause 7.4.1.6 in TS 38.211). allowedValues: The bit length of the set ID is maximum 22bit."; } - + list backhaulAddress { - description "The attribute specifies backhaulAddress which is defined as + description "The attribute specifies backhaulAddress which is defined as a datatype."; min-elements 1; max-elements 1; @@ -114,34 +114,34 @@ module _3gpp-nr-nrm-gnbcucpfunction { } grouping TceIDMappingInfoGrp { - description "This data type represents the properties describing the - mapping relationship between TCE ID, PLMN where TCE resides and + description "This data type represents the properties describing the + mapping relationship between TCE ID, PLMN where TCE resides and IP address of TCE."; - + leaf tceIPAddress { type inet:ip-address; mandatory true; - description "This attribute indicates IP address of TCE. + description "This attribute indicates IP address of TCE. (See subclause 4.1.1.9.2 in TS 32.422)"; } - + leaf tceID { type int64; mandatory true; - description "This attribute indicates TCE Id. + description "This attribute indicates TCE Id. (See subclause 4.1.1.9.2 in TS 32.422)"; } - + list pLMNTarget { - description "Indicates the PLMN where TCE resides. + description "Indicates the PLMN where TCE resides. (See subclauses 4.1.1.9.2 and 4.9.2 in TS 32.422)"; min-elements 1; max-elements 1; - key mnc; + key mnc; uses types3gpp:PLMNId; } } - + grouping GNBCUCPFunctionGrp { description "Represents the GNBCUCPFunction IOC."; reference "3GPP TS 28.541"; @@ -177,7 +177,7 @@ module _3gpp-nr-nrm-gnbcucpfunction { max-elements 1; yext3gpp:inVariant; uses types3gpp:PLMNId; - } + } list x2BlockList { description "List of nodes to which X2 connections are prohibited."; @@ -222,27 +222,27 @@ module _3gpp-nr-nrm-gnbcucpfunction { } list mappingSetIDBackhaulAddressList { - description "The attribute specifies a list of mappingSetIDBackhaulAddress - which is defined as a datatype. Which is used to + description "The attribute specifies a list of mappingSetIDBackhaulAddress + which is defined as a datatype. Which is used to retrieve the backhaul address of the victim set."; min-elements 1; key idx; leaf idx {type uint32; } uses MappingSetIDBackhaulAddressGrp; } - + list tceIDMappingInfoList { - description "This attribute includes a list of TCE ID, PLMN where TCE - resides and the corresponding TCE IP address. It is used in Logged MDT - case to provide the information to the gNodeB or GNBCUCPFunction to - get the corresponding TCE IP address when there is an MDT log + description "This attribute includes a list of TCE ID, PLMN where TCE + resides and the corresponding TCE IP address. It is used in Logged MDT + case to provide the information to the gNodeB or GNBCUCPFunction to + get the corresponding TCE IP address when there is an MDT log received from the UE."; min-elements 1; key idx; leaf idx { type uint32; } uses TceIDMappingInfoGrp; } - + leaf dDAPSHOControl { type boolean; description "This attribute determines whether the DAPS handover function @@ -251,7 +251,7 @@ module _3gpp-nr-nrm-gnbcucpfunction { leaf dCHOControl { type boolean; - description "This attribute determines whether the CHO function is + description "This attribute determines whether the CHO function is enabled or disabled."; } @@ -280,12 +280,12 @@ module _3gpp-nr-nrm-gnbcucpfunction { } description "represents a list of MDT measurement names that are subject to user consent at MDT activation. - Any MDT measurement, whose name is not specified in this list, is not + Any MDT measurement, whose name is not specified in this list, is not subject to user consent at MDT activation."; } - + list mappedCellIdInfoList { - description "This attribute provides the list of mapping between + description "This attribute provides the list of mapping between geographical location and Mapped Cell ID."; key idx; leaf idx { type uint32; } @@ -294,7 +294,7 @@ module _3gpp-nr-nrm-gnbcucpfunction { leaf configurable5QISetRef { type types3gpp:DistinguishedName; - description "DN of the Configurable5QISet that the GNBCUCPFunction + description "DN of the Configurable5QISet that the GNBCUCPFunction supports (is associated to)."; } @@ -304,18 +304,18 @@ module _3gpp-nr-nrm-gnbcucpfunction { description "This attribute indicates whether the function is on board the satellite."; } - + leaf onboardSatelliteId { type string; config false; - description "This attribute indicates the onboard satellite Id. + description "This attribute indicates the onboard satellite Id. It shall be formatted as a fixed 5-digit string, padding with leading digits '0' to complete a 5-digit length."; } - + leaf dynamic5QISetRef { type types3gpp:DistinguishedName; - description "DN of the Dynamic5QISet that the GNBCUCPFunction supports + description "DN of the Dynamic5QISet that the GNBCUCPFunction supports (is associated to)."; } @@ -326,7 +326,7 @@ module _3gpp-nr-nrm-gnbcucpfunction { leaf nRECMappingRuleRef { type types3gpp:DistinguishedName; - description "DN of a NRECMappingRule. An empty value indicates the + description "DN of a NRECMappingRule. An empty value indicates the NRECMappingRule contained by parent, e.g. ManagedElement or SubNetwork, applies."; } @@ -334,7 +334,7 @@ module _3gpp-nr-nrm-gnbcucpfunction { leaf mWABRef { type types3gpp:DistinguishedName; description "This attribute represents the MWAB functionality - (See sub clause 5.49 [11]). This attribute contains the DN of the + (See sub clause 5.49 [11]). This attribute contains the DN of the referenced MWAB."; } } @@ -348,10 +348,10 @@ module _3gpp-nr-nrm-gnbcucpfunction { leaf qoECollectionEntityIdentity { type string; - description "Specifies the unique identity to which the QMC reports + description "Specifies the unique identity to which the QMC reports shall be transferred."; } - + list pLMNTarget { description "The PLMN identifier where QoE collection entity resides. "; @@ -364,14 +364,14 @@ module _3gpp-nr-nrm-gnbcucpfunction { } grouping GgNBIdGrp { - description "Represents the properties of a global gNB ID (GgNBId)."; + description "Represents the properties of a global gNB ID (GgNBId)."; uses types3gpp:PLMNId; leaf gnbIdLength { type int32 {range "22..32";} mandatory true; - description "This indicates the number of bits for encoding the gNB ID. + description "This indicates the number of bits for encoding the gNB ID. See 'Global gNB ID' in subclause 9.3.1.6 of TS 38.413"; } @@ -383,13 +383,13 @@ module _3gpp-nr-nrm-gnbcucpfunction { type int64 { range "0..4294967295"; } } } - + grouping GeNBIdGrp { - description "Represents the properties of a global eNB ID (GeNBId)."; + description "Represents the properties of a global eNB ID (GeNBId)."; uses types3gpp:PLMNId; - + leaf enbId { - description "It identifies an eNB within a PLMN. The eNB ID is part of + description "It identifies an eNB within a PLMN. The eNB ID is part of the E-UTRAN Cell Global Identifier (ECGI) of the eNB cells."; reference "eNB ID in 3GPP TS 36.300. Global eNB ID in 3GPP TS 36.413."; mandatory true; @@ -404,7 +404,7 @@ module _3gpp-nr-nrm-gnbcucpfunction { reference "3GPP TS 28.541"; key id; uses top3gpp:Top_Grp; - container attributes { + container attributes { uses GNBCUCPFunctionGrp; } uses mf3gpp:ManagedFunctionContainedClasses; diff --git a/yang-models/_3gpp-nr-nrm-gnbcuupfunction.yang b/yang-models/_3gpp-nr-nrm-gnbcuupfunction.yang index 4238ccf3b..41058cdd1 100755 --- a/yang-models/_3gpp-nr-nrm-gnbcuupfunction.yang +++ b/yang-models/_3gpp-nr-nrm-gnbcuupfunction.yang @@ -2,7 +2,7 @@ module _3gpp-nr-nrm-gnbcuupfunction { yang-version 1.1; namespace "urn:3gpp:sa5:_3gpp-nr-nrm-gnbcuupfunction"; prefix "gnbcuup3gpp"; - + import _3gpp-common-yang-types { prefix types3gpp; } import _3gpp-common-yang-extensions { prefix yext3gpp; } import _3gpp-common-managed-function { prefix mf3gpp; } @@ -15,20 +15,20 @@ module _3gpp-nr-nrm-gnbcuupfunction { contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464"; description "Defines the YANG mapping of the GNBCUUPFunction Information Object Class (IOC) that is part of the NR Network Resource Model (NRM). - Copyright 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + Copyright 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved."; reference "3GPP TS 28.541 5G Network Resource Model (NRM)"; - revision 2024-11-01 { reference CR-1405 ; } - revision 2024-05-24 { reference CR-1273 ; } - revision 2023-09-18 { reference CR-1043 ; } + revision 2024-11-01 { reference CR-1405 ; } + revision 2024-05-24 { reference CR-1273 ; } + revision 2023-09-18 { reference CR-1043 ; } revision 2023-04-26 { reference CR-0916; } revision 2022-07-28 { reference "CR-0770"; } revision 2020-11-05 { reference CR-0412 ; } revision 2020-08-06 { reference "CR-0333"; } revision 2020-08-03 { reference "CR-0321"; } revision 2020-06-03 { reference "CR-0286"; } - revision 2020-05-28 { reference "CR-0318"; } + revision 2020-05-28 { reference "CR-0318"; } revision 2020-03-12 { reference "SP-200233 S5-201547"; } revision 2020-02-14 { reference S5-20XXXX ; } revision 2019-10-28 { reference S5-193518 ; } @@ -42,7 +42,7 @@ module _3gpp-nr-nrm-gnbcuupfunction { grouping GNBCUUPFunctionGrp { description "Represents the GNBCUUPFunction IOC."; reference "3GPP TS 28.541"; - uses mf3gpp:ManagedFunctionGrp; + uses mf3gpp:ManagedFunctionGrp; leaf gNBCUUPId { type uint64 { @@ -58,36 +58,36 @@ module _3gpp-nr-nrm-gnbcuupfunction { leaf gNBId { type uint32; mandatory true; - description "Identifies a gNB within a PLMN. The gNB ID is part of the + description "Identifies a gNB within a PLMN. The gNB ID is part of the NR Cell Identifier (NCI) of the gNB cells. "; reference "gNB Identifier (gNB ID) of subclause 8.2 of TS 38.300. Global gNB ID in subclause 9.3.1.6 of TS 38.413"; } - + leaf gNBIdLength { mandatory true; type int32 { range "22..32"; } description "Indicates the number of bits for encoding the gNB Id."; reference "gNB Id in 3GPP TS 38.300, Global gNB ID in 3GPP TS 38.413"; } - + list pLMNInfoList { - description "The PLMNInfoList is a list of PLMNInfo data type. It - defines which PLMNs that can be served by the GNBCUUPFunction and - which S-NSSAIs can be supported by the GNBCUUPFunction for + description "The PLMNInfoList is a list of PLMNInfo data type. It + defines which PLMNs that can be served by the GNBCUUPFunction and + which S-NSSAIs can be supported by the GNBCUUPFunction for corresponding PLMN in case of network slicing feature is supported"; key "mcc mnc sd sst"; uses types5g3gpp:PLMNInfo; } - + leaf configurable5QISetRef { type types3gpp:DistinguishedName; - description "DN of the Configurable5QISet that the GNBCUUPFunction + description "DN of the Configurable5QISet that the GNBCUUPFunction supports (is associated to)."; } leaf dynamic5QISetRef { type types3gpp:DistinguishedName; - description "DN of the Dynamic5QISet that the GNBCUUPFunction + description "DN of the Dynamic5QISet that the GNBCUUPFunction supports (is associated to)."; } } @@ -99,7 +99,7 @@ module _3gpp-nr-nrm-gnbcuupfunction { description "Represents the logical function CU-UP of gNB or en-gNB."; reference "3GPP TS 28.541"; uses top3gpp:Top_Grp; - container attributes { + container attributes { uses GNBCUUPFunctionGrp; } uses mf3gpp:ManagedFunctionContainedClasses; diff --git a/yang-models/_3gpp-nr-nrm-gnbdufunction.yang b/yang-models/_3gpp-nr-nrm-gnbdufunction.yang index 19b3c3138..efbac6a5e 100755 --- a/yang-models/_3gpp-nr-nrm-gnbdufunction.yang +++ b/yang-models/_3gpp-nr-nrm-gnbdufunction.yang @@ -14,7 +14,7 @@ module _3gpp-nr-nrm-gnbdufunction { contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464"; description "Defines the YANG mapping of the GNBDUFunction Information Object Class (IOC) that is part of the NR Network Resource Model (NRM). - Copyright 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + Copyright 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved."; reference "3GPP TS 28.541 5G Network Resource Model (NRM)"; @@ -191,30 +191,30 @@ module _3gpp-nr-nrm-gnbdufunction { type boolean; default false; config false; - description "This attribute indicates whether the function is + description "This attribute indicates whether the function is on board the satellite."; } leaf onboardSatelliteId { type string; - description "This attribute indicates the onboard satellite Id. + description "This attribute indicates the onboard satellite Id. It shall be formatted as a fixed 5-digit string, padding with leading digits '0' to complete a 5-digit length."; } leaf configurable5QISetRef { type types3gpp:DistinguishedName; - description "DN of the Configurable5QISet that the GNBDUFunction supports + description "DN of the Configurable5QISet that the GNBDUFunction supports (is associated to)."; } leaf dynamic5QISetRef { type types3gpp:DistinguishedName; - description "DN of the Dynamic5QISet that the GNBDUFunction supports + description "DN of the Dynamic5QISet that the GNBDUFunction supports (is associated to)."; } leaf nRECMappingRuleRef { type types3gpp:DistinguishedName; - description "DN of a NRECMappingRule. An empty value indicates the + description "DN of a NRECMappingRule. An empty value indicates the NRECMappingRule contained by parent, e.g. ManagedElement or SubNetwork, applies."; } diff --git a/yang-models/_3gpp-nr-nrm-mwab.yang b/yang-models/_3gpp-nr-nrm-mwab.yang index ab4791037..9f8af2af9 100644 --- a/yang-models/_3gpp-nr-nrm-mwab.yang +++ b/yang-models/_3gpp-nr-nrm-mwab.yang @@ -11,19 +11,19 @@ module _3gpp-nr-nrm-mwab { description "Defines the YANG mapping of the ExternalGNBCUCPFunction Information Object Class (IOC), that is part of the NR Network Resource Model (NRM). - Copyright 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + Copyright 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved."; reference "3GPP TS 28.541 5G Network Resource Model (NRM)"; - revision 2025-04-25 { reference CR-1527 ; } - + revision 2025-04-25 { reference CR-1527 ; } + grouping MWABGrp { description "Represets the ExternalENBFunction IOC."; - + leaf operationalState { - description "It indicates the operational state of the MWAB instance. - It describes whether the resource is installed and partially or fully - operable (Enabled) or the resource is not installed or not + description "It indicates the operational state of the MWAB instance. + It describes whether the resource is installed and partially or fully + operable (Enabled) or the resource is not installed or not operable (Disabled)."; mandatory true; config false; @@ -31,17 +31,17 @@ module _3gpp-nr-nrm-mwab { } leaf administrativeState { - description "It indicates the administrative state of the MWAB instance. - It describes the permission to use or prohibition against using the + description "It indicates the administrative state of the MWAB instance. + It describes the permission to use or prohibition against using the MWAB functionalities, imposed through the OAM services."; default LOCKED; type types3gpp:AdministrativeState; } list allowedArea { - description "This specifies the area where the MWAB can act as MWAB-gNB. - If the OAM indicates that the MWAB can act as MWAB-gNB is allowed areas, - it acts as MWAB-gNB only on the allowed area only. + description "This specifies the area where the MWAB can act as MWAB-gNB. + If the OAM indicates that the MWAB can act as MWAB-gNB is allowed areas, + it acts as MWAB-gNB only on the allowed area only. (See sub clause 5.49 TS 28.662)."; key idx; leaf idx { type uint32; } @@ -50,9 +50,9 @@ module _3gpp-nr-nrm-mwab { list allowedTime { description "This specifies the time window for which the MWAB can act - as MWAB-gNB. If the allowed time window/ validity indicates 20th June, + as MWAB-gNB. If the allowed time window/ validity indicates 20th June, 10 am to 5 pm of the day, the MWAB acts as an MWAB g-NB only during 20th - June, 10 am to 5 pm of the day, and does not act as MWAB-gNB for any + June, 10 am to 5 pm of the day, and does not act as MWAB-gNB for any other time. (See sub clause 5.49 [11])."; key idx; leaf idx { type uint32 ; } @@ -62,10 +62,10 @@ module _3gpp-nr-nrm-mwab { grouping MWABSubTree { list MWAB { - description "MWAB provides an NR access link to UEs in proximity and - connects to the 5GC serving the UE through an IP connectivity provided - by a Backhaul PDU session(s). The MWAB consists of a gNB component - (MWAB-gNB) and a UE component (MWAB-UE). This IOC defines the + description "MWAB provides an NR access link to UEs in proximity and + connects to the 5GC serving the UE through an IP connectivity provided + by a Backhaul PDU session(s). The MWAB consists of a gNB component + (MWAB-gNB) and a UE component (MWAB-UE). This IOC defines the configuration information for the MWAB-gNB."; key id; uses top3gpp:Top_Grp; @@ -73,5 +73,5 @@ module _3gpp-nr-nrm-mwab { uses MWABGrp; } } - } -} + } +} diff --git a/yang-models/_3gpp-nr-nrm-nrcellcu.yang b/yang-models/_3gpp-nr-nrm-nrcellcu.yang index c394748a2..a2ddbc5c5 100755 --- a/yang-models/_3gpp-nr-nrm-nrcellcu.yang +++ b/yang-models/_3gpp-nr-nrm-nrcellcu.yang @@ -14,11 +14,11 @@ module _3gpp-nr-nrm-nrcellcu { contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464"; description "Defines the YANG mapping of the NRCellCU Information Object Class (IOC) that is part of the NR Network Resource Model (NRM). - Copyright 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + Copyright 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved."; reference "3GPP TS 28.541 5G Network Resource Model (NRM)"; - revision 2023-09-18 { reference CR-1043 ; } + revision 2023-09-18 { reference CR-1043 ; } revision 2021-01-25 { reference CR-0454 ; } revision 2020-11-25 { reference CR-0386 ; } revision 2020-11-05 { reference CR-0412 ; } @@ -29,12 +29,12 @@ module _3gpp-nr-nrm-nrcellcu { revision 2019-06-17 { reference "Initial revision"; } feature DPCIConfigurationFunction { - description "Class representing Distributed SON + description "Class representing Distributed SON function of PCI configuration feature"; } feature DESManagementFunction { - description "Class representing Distributed SON + description "Class representing Distributed SON Energy Saving feature"; } @@ -43,7 +43,7 @@ module _3gpp-nr-nrm-nrcellcu { } feature CESManagementFunction { - description "Class representing Centralized SON Energy Saving + description "Class representing Centralized SON Energy Saving feature"; } @@ -60,11 +60,11 @@ module _3gpp-nr-nrm-nrcellcu { } list pLMNInfoList { - description "The PLMNInfoList is a list of PLMNInfo data type. It defines - which PLMNs that can be served by the NR cell, and which S-NSSAIs that - can be supported by the NR cell for corresponding PLMN in case of + description "The PLMNInfoList is a list of PLMNInfo data type. It defines + which PLMNs that can be served by the NR cell, and which S-NSSAIs that + can be supported by the NR cell for corresponding PLMN in case of network slicing feature is supported."; - // Note: Whether the attribute pLMNId in the pLMNInfo can be writable + // Note: Whether the attribute pLMNId in the pLMNInfo can be writable // depends on the implementation. key "mcc mnc sd sst"; min-elements 1; diff --git a/yang-models/_3gpp-nr-nrm-nrcelldu.yang b/yang-models/_3gpp-nr-nrm-nrcelldu.yang index e7cbfb51e..40245e23e 100755 --- a/yang-models/_3gpp-nr-nrm-nrcelldu.yang +++ b/yang-models/_3gpp-nr-nrm-nrcelldu.yang @@ -15,15 +15,15 @@ module _3gpp-nr-nrm-nrcelldu { contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464"; description "Defines the YANG mapping of the NRCellDU Information Object Class (IOC) that is part of the NR Network Resource Model (NRM). - Copyright 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + Copyright 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved."; reference "3GPP TS 28.541 5G Network Resource Model (NRM)"; revision 2025-07-25 { reference CR-1558 ; } revision 2025-02-07 { reference CR-1442; } revision 2024-05-25 { reference CR-1412 ; } - revision 2024-05-24 { reference CR-1273 ; } - revision 2023-09-18 { reference CR-1043 ; } + revision 2024-05-24 { reference CR-1273 ; } + revision 2023-09-18 { reference CR-1043 ; } revision 2022-07-28 { reference "CR-0770"; } revision 2022-06-29 { reference CR-0756 ; } revision 2021-10-28 { reference CR-0607 ; } @@ -37,23 +37,23 @@ module _3gpp-nr-nrm-nrcelldu { revision 2019-09-03 { reference "Initial revision"; } feature DRACHOptimizationFunction { - description "Class representing D-SON function of RACH optimization + description "Class representing D-SON function of RACH optimization feature"; } - + feature CPCIConfigurationFunction { - description "Class representing Centralized SON function of + description "Class representing Centralized SON function of PCI configuration feature"; } - + grouping NRCellDUGrp { description "Represents the NRCellDU IOC."; reference "3GPP TS 28.541"; uses mf3gpp:ManagedFunctionGrp; - + leaf cellLocalId { description "Identifies an NR cell of a gNB. Together with the - corresponding gNB identifier in forms the NR Cell Identity (NCI)."; + corresponding gNB identifier in forms the NR Cell Identity (NCI)."; reference "NCI in 3GPP TS 38.300"; mandatory true; type int32 { range "0..16383"; } @@ -86,11 +86,11 @@ module _3gpp-nr-nrm-nrcelldu { } list pLMNInfoList { - description "The PLMNInfoList is a list of PLMNInfo data type. It - defines which PLMNs that can be served by the NR cell, and which - S-NSSAIs that can be supported by the NR cell for corresponding PLMN - in case of network slicing feature is supported. The plMNId of the - first entry of the list is the PLMNId used to construct the nCGI for + description "The PLMNInfoList is a list of PLMNInfo data type. It + defines which PLMNs that can be served by the NR cell, and which + S-NSSAIs that can be supported by the NR cell for corresponding PLMN + in case of network slicing feature is supported. The plMNId of the + first entry of the list is the PLMNId used to construct the nCGI for the NR cell."; key "mcc mnc sd sst"; min-elements 1; @@ -102,14 +102,14 @@ module _3gpp-nr-nrm-nrcelldu { key idx ; min-elements 1; ordered-by user; - description "It defines which NPNs that can be served by the NR cell, - and which CAG IDs or NIDs can be supported by the NR cell for + description "It defines which NPNs that can be served by the NR cell, + and which CAG IDs or NIDs can be supported by the NR cell for corresponding PNI-NPN or SNPN in case of the cell is NPN-only cell."; reference "3GPP TS 38.331"; leaf idx { type uint32 ; } uses types3gpp:NpnIdGrp; } - + leaf nRPCI { description "The Physical Cell Identity (PCI) of the NR cell."; reference "3GPP TS 36.211"; @@ -118,7 +118,7 @@ module _3gpp-nr-nrm-nrcelldu { } leaf nRTAC { - description "The common 5GS Tracking Area Code for the PLMNs."; + description "The common 5GS Tracking Area Code for the PLMNs."; reference "3GPP TS 23.003, 3GPP TS 38.473"; type types5g3gpp:NRTAC; } @@ -127,11 +127,11 @@ module _3gpp-nr-nrm-nrcelldu { type string; min-elements 1; max-elements 12; - description "It is the list of Tracking Area Codes which is only present - in an NTN cell. If this field is present, network does not configure + description "It is the list of Tracking Area Codes which is only present + in an NTN cell. If this field is present, network does not configure trackingAreaCode, see TS 38.331)."; } - + leaf arfcnDL { description "NR Absolute Radio Frequency Channel Number (NR-ARFCN) for downlink."; @@ -139,7 +139,7 @@ module _3gpp-nr-nrm-nrcelldu { mandatory true; type int32; } - + leaf arfcnUL { description "NR Absolute Radio Frequency Channel Number (NR-ARFCN) for uplink."; @@ -164,117 +164,117 @@ module _3gpp-nr-nrm-nrcelldu { leaf rimRSMonitoringStartTime { type yang:date-and-time ; mandatory true; - description "Configures the UTC time when the gNB attempts to start + description "Configures the UTC time when the gNB attempts to start RIM-RS monitoring."; } - + leaf rimRSMonitoringStopTime { type yang:date-and-time ; mandatory true; - description "Configures the UTC time when the gNB stops RIM-RS + description "Configures the UTC time when the gNB stops RIM-RS monitoring."; } - + leaf rimRSMonitoringWindowDuration { type uint32 { range 1..16384 ; } mandatory true; - description "Configures a duration of the monitoring window in which - gNB monitors the RIM-RS, in unit of P_t, where P_t is the RIM-RS + description "Configures a duration of the monitoring window in which + gNB monitors the RIM-RS, in unit of P_t, where P_t is the RIM-RS transmission periodicity in units of uplink-downlink switching period ( see 38.211 subclause 7.4.1.6). - This field is configured together with rimRSMonitoringInterval, - rimRSMonitoringWindowStartingOffset, rimRSMonitoringOccasionInterval + This field is configured together with rimRSMonitoringInterval, + rimRSMonitoringWindowStartingOffset, rimRSMonitoringOccasionInterval and rimRSMonitoringOccasionStartingOffset. - The duration of the monitoring window is expected to be larger than - or equal to M*P_t, where M is the interval between adjacent monitoring - occasions within the monitoring window + The duration of the monitoring window is expected to be larger than + or equal to M*P_t, where M is the interval between adjacent monitoring + occasions within the monitoring window (configured by rimRSMonitoringInterval). - The absolute duration of the monitoring window is not expected to be - larger than the periodicity of the monitoring window (configured by + The absolute duration of the monitoring window is not expected to be + larger than the periodicity of the monitoring window (configured by rimRSMonitoringWindowPeriodicity). - + See 3GPP TS 28.541 attribute descrition rimRSMonitoringWindowDuration for the exact math formulas. - - Only the earliest N_T consecutive detection durations in each RIM-RS - transmission periodicity (P_t) in the monitoring window are taken as - valid time for monitoring potential interference, and they are - consecutively monitored in the monitoring window, while the residual - part of each RIM-RS transmission periodicity is not used for - discovering potential interference, where, a consecutive detection + + Only the earliest N_T consecutive detection durations in each RIM-RS + transmission periodicity (P_t) in the monitoring window are taken as + valid time for monitoring potential interference, and they are + consecutively monitored in the monitoring window, while the residual + part of each RIM-RS transmission periodicity is not used for + discovering potential interference, where, a consecutive detection duration spans P1*R1 (if only P1 is configured) or ((P1+P2))/2*R1 ( if both P1 and P2 are configured), where, - R1 is the number of consecutive uplink-downlinkswitching periods + R1 is the number of consecutive uplink-downlinkswitching periods for RS-1 (configured by nrofConsecutiveRIMRS1), - P1 is the first uplink-downlinkswitching period (configured by - dlULSwitchingPeriod1), - P2 is the second uplink-downlink switching period (configured by + P1 is the first uplink-downlinkswitching period (configured by + dlULSwitchingPeriod1), + P2 is the second uplink-downlink switching period (configured by dlULSwitchingPeriod2), and N_T= - ((N_setID # RIM,1)/(N_f # RI N_s # RIM,1) + ((N_setID # RIM,1)/(N_f # RI N_s # RIM,1) if enableEnoughNotEnoughIndication is 'disable' - + (2N_setID # RIM,1)/(N_f # RIM N_s # RIM,1) if enableEnoughNotEnoughIndication is 'enable' - + N_setID # 'RIM,1' is the total number of set IDs for RIM RS-1 (configured by totalnrofSetIdofRS1), - N_f # RIM is the number of candidate frequency resources in the whole - network (configured by nrofGlobalRIMRSFrequencyCandidates), and - N_s # 'RIM,1' is the number of candidate sequences assigned for + N_f # RIM is the number of candidate frequency resources in the whole + network (configured by nrofGlobalRIMRSFrequencyCandidates), and + N_s # 'RIM,1' is the number of candidate sequences assigned for RIM RS-1 (configured by nrofRIMRSSequenceCandidatesofRS1)."; } - + leaf rimRSMonitoringWindowStartingOffset { type uint8 { range 0..23 ; } mandatory true; units hours; - description "Configures the start offset of the first monitoring window + description "Configures the start offset of the first monitoring window within one day, in unit of hours."; } - + leaf rimRSMonitoringWindowPeriodicity { type uint8 { range 1|2|3|4|6|8|12|24 ; } units hours; mandatory true; - description "Configures the periodicity of the monitoring window, in + description "Configures the periodicity of the monitoring window, in unit of hours"; } - + leaf rimRSMonitoringOccasionInterval { type uint32 { range 1..max ; } mandatory true; - description "Configures the interval between adjacent monitoring - occasions (M) within the monitoring window, in unit of consecutive + description "Configures the interval between adjacent monitoring + occasions (M) within the monitoring window, in unit of consecutive detection duration. - M is expected to be prime to N_T, where N_T is given in above + M is expected to be prime to N_T, where N_T is given in above attribute rimRSMonitoringWindowDuration. allowedValues: 1,2..N_T-1"; } - + leaf rimRSMonitoringOccasionStartingOffset { type uint32 ; mandatory true; - description "Configures the start offset of the first monitoring occasions - within the monitoring window (S_M), in unit of consecutive detection + description "Configures the start offset of the first monitoring occasions + within the monitoring window (S_M), in unit of consecutive detection duration. - gNB starts monitoring potential interference from the S_M-th consecutive - detection duration in the first complete RIM-RS transmission + gNB starts monitoring potential interference from the S_M-th consecutive + detection duration in the first complete RIM-RS transmission periodicity (P_t) within the monitoring window. allowedValues: 0,1,2..M-1 - where M is the the interval between adjacent monitoring occasions - within the monitoring window + where M is the the interval between adjacent monitoring occasions + within the monitoring window (configured by rimRSMonitoringOccasionInterval)"; } @@ -287,7 +287,7 @@ module _3gpp-nr-nrm-nrcelldu { 3GPP TS 38.101-1, and within bSChannelBwDL."; mandatory true; type int32 { range "0..3279165"; } - } + } leaf ssbPeriodicity { description "Indicates cell defined SSB periodicity. The SSB periodicity @@ -359,11 +359,11 @@ module _3gpp-nr-nrm-nrcelldu { description "Reference to corresponding NRFrequency instance."; type types3gpp:DistinguishedName; } - + leaf victimSetRef { type types3gpp:DistinguishedName; mandatory true; - description "DN of a victim Set (RimRSSet) + description "DN of a victim Set (RimRSSet) Implemented if RIM feature is supported"; } @@ -372,56 +372,56 @@ module _3gpp-nr-nrm-nrcelldu { mandatory true; description "DN of an aggressor Set (RimRSSet)"; } - + leaf redCapAccessCriteriaRef { type types3gpp:DistinguishedName; mandatory true; - description "This attribute contains the DN of the redCapAccessCriteria + description "This attribute contains the DN of the redCapAccessCriteria MOI "; - } + } } augment "/me3gpp:ManagedElement/gnbdu3gpp:GNBDUFunction" { list NRCellDU { - description "This IOC represents the part of NR cell information that - describes the specific resources instances. - - An NR cell transmits SS/PBCH block and always requires downlink - transmission at a certain carrier frequency with a certain channel - bandwidth. Transmission may be performed from multiple sector-carriers - using different transmission points, and these may be configured with - different carrier frequencies and channel bandwidths, as long as they - are aligned to the cell's downlink resource grids as defined in - subclause 4.4 in TS 38.211. The values of arfcnDL and bSChannelBwDL - attributes define the resource grids which each sector-carrier needs to - be aligned to. See subclauses 5.3 and 5.4.2 of TS 38.104 for definitions + description "This IOC represents the part of NR cell information that + describes the specific resources instances. + + An NR cell transmits SS/PBCH block and always requires downlink + transmission at a certain carrier frequency with a certain channel + bandwidth. Transmission may be performed from multiple sector-carriers + using different transmission points, and these may be configured with + different carrier frequencies and channel bandwidths, as long as they + are aligned to the cell's downlink resource grids as defined in + subclause 4.4 in TS 38.211. The values of arfcnDL and bSChannelBwDL + attributes define the resource grids which each sector-carrier needs to + be aligned to. See subclauses 5.3 and 5.4.2 of TS 38.104 for definitions of BS channel bandwidth and NR-ARFCN, respectively. - - An NR cell requires an uplink in order to provide initial access. In - case of TDD, the values of arfcnUL and bSChannelBwUL have to always be - set to the same values as for the corresponding DL attributes. For both - FDD and TDD, the arfcnUL and bSChannelBwUL define uplink resource grids + + An NR cell requires an uplink in order to provide initial access. In + case of TDD, the values of arfcnUL and bSChannelBwUL have to always be + set to the same values as for the corresponding DL attributes. For both + FDD and TDD, the arfcnUL and bSChannelBwUL define uplink resource grids to which each sector-carrier needs to align to. - - An NR cell can in addition be configured with a supplementary uplink, - which has its own arfcnSUL and bSChannelBwSUL, which define resource + + An NR cell can in addition be configured with a supplementary uplink, + which has its own arfcnSUL and bSChannelBwSUL, which define resource grids for supplementary uplink sector-carriers. - - Each of downlink, uplink and supplementary uplink (if configured) need - an initial bandwidth part (BWP), which defines resources to be used by - UEs during and immediately after initial access. Additional BWPs can be - either configured or calculated by gNB internally and be applied to UEs - dynamically by gNB based on e.g. UE capability and bandwidth need of + + Each of downlink, uplink and supplementary uplink (if configured) need + an initial bandwidth part (BWP), which defines resources to be used by + UEs during and immediately after initial access. Additional BWPs can be + either configured or calculated by gNB internally and be applied to UEs + dynamically by gNB based on e.g. UE capability and bandwidth need of each UE. - + BWPs are configured individually (bWPRef) or via sets (bWPSetRef). - An NTN NR cell can be configured with list of Tracking Areas to support - broadcast multiple Tracking Area Codes per PLMN ID. Given that the - related TAIs broadcast may change with a foot print moving on earth, - which is predictable, time windows per TAList can be derived and - configured for NTN cell. These time windows define the specific periods + An NTN NR cell can be configured with list of Tracking Areas to support + broadcast multiple Tracking Area Codes per PLMN ID. Given that the + related TAIs broadcast may change with a foot print moving on earth, + which is predictable, time windows per TAList can be derived and + configured for NTN cell. These time windows define the specific periods during which the satellite coverage will be available for the location."; key id; uses top3gpp:Top_Grp; diff --git a/yang-models/_3gpp-nr-nrm-nrcellrelation.yang b/yang-models/_3gpp-nr-nrm-nrcellrelation.yang index b6bc8290b..01d017b53 100755 --- a/yang-models/_3gpp-nr-nrm-nrcellrelation.yang +++ b/yang-models/_3gpp-nr-nrm-nrcellrelation.yang @@ -12,11 +12,11 @@ module _3gpp-nr-nrm-nrcellrelation { organization "3GPP SA5"; description "Defines the YANG mapping of the NRCellRelation Information Object Class (IOC) that is part of the NR Network Resource Model (NRM). - Copyright 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + Copyright 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved."; reference "3GPP TS 28.541 5G Network Resource Model (NRM)"; - revision 2023-09-18 { reference CR-1043 ; } + revision 2023-09-18 { reference CR-1043 ; } revision 2023-04-26 { reference CR-0916; } revision 2021-01-25 { reference CR-0454 ; } revision 2020-06-03 { reference S5-202333 ; } @@ -30,8 +30,8 @@ module _3gpp-nr-nrm-nrcellrelation { typedef EnergySavingCoverage { type enumeration { enum FULL; - enum NO; - enum PARTIAL; + enum NO; + enum PARTIAL; } } @@ -39,78 +39,78 @@ module _3gpp-nr-nrm-nrcellrelation { description "Represents the NRCellRelation IOC."; reference "3GPP TS 28.541"; - leaf nRTCI { + leaf nRTCI { description "Target NR Cell Identifier. It consists of NR Cell Identifier (NCI) and Physical Cell Identifier of the target NR cell (nRPCI)."; - type uint64; + type uint64; } container cellIndividualOffset { description "A set of offset values for the neighbour cell. Used when - UE is in connected mode. Defined for rsrpOffsetSSB, rsrqOffsetSSB, + UE is in connected mode. Defined for rsrpOffsetSSB, rsrqOffsetSSB, sinrOffsetSSB, rsrpOffsetCSI-RS, rsrqOffsetCSI-RS and sinrOffsetCSI-RS."; reference "cellIndividualOffset in MeasObjectNR in 3GPP TS 38.331"; - leaf rsrpOffsetSsb { + leaf rsrpOffsetSsb { description "Offset value of rsrpOffsetSSB."; default 0; - type types3gpp:QOffsetRange; + type types3gpp:QOffsetRange; } - leaf rsrqOffsetSsb{ + leaf rsrqOffsetSsb{ description "Offset value of rsrqOffsetSSB."; default 0; - type types3gpp:QOffsetRange; + type types3gpp:QOffsetRange; } - leaf sinrOffsetSsb { + leaf sinrOffsetSsb { description "Offset value of sinrOffsetSSB."; default 0; - type types3gpp:QOffsetRange; + type types3gpp:QOffsetRange; } - leaf rsrpOffsetCsiRs{ + leaf rsrpOffsetCsiRs{ description "Offset value of rsrpOffsetCSI-RS."; default 0; - type types3gpp:QOffsetRange; + type types3gpp:QOffsetRange; } - leaf rsrqOffsetCsiRs { + leaf rsrqOffsetCsiRs { description "Offset value of rsrqOffsetCSI-RS."; default 0; - type types3gpp:QOffsetRange; + type types3gpp:QOffsetRange; } - leaf sinrOffsetCsiRs { + leaf sinrOffsetCsiRs { description "Offset value of sinrOffsetCSI-RS."; default 0; - type types3gpp:QOffsetRange; + type types3gpp:QOffsetRange; } } - leaf nRFreqRelationRef { + leaf nRFreqRelationRef { description "Reference to a corresponding NRFreqRelation instance."; mandatory true; type types3gpp:DistinguishedName; } - leaf adjacentNRCellRef { + leaf adjacentNRCellRef { description "Reference to an adjacent NR cell (NRCellCU or ExternalNRCellCU)."; mandatory true; type types3gpp:DistinguishedName; } - leaf isRemoveAllowed { - type boolean; + leaf isRemoveAllowed { + type boolean; default true; description "True if the ANR function in the node is allowed to remove this relation."; } - leaf isHOAllowed { - type boolean; + leaf isHOAllowed { + type boolean; default true; description "True if handovers are allowed over this relation."; } diff --git a/yang-models/_3gpp-nr-nrm-nrfreqrelation.yang b/yang-models/_3gpp-nr-nrm-nrfreqrelation.yang index 4472165a6..8dc0fd1f9 100755 --- a/yang-models/_3gpp-nr-nrm-nrfreqrelation.yang +++ b/yang-models/_3gpp-nr-nrm-nrfreqrelation.yang @@ -13,17 +13,17 @@ module _3gpp-nr-nrm-nrfreqrelation { contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464"; description "Defines the YANG mapping of the NRFreqRelation Information Object Class (IOC) that is part of the NR Network Resource Model (NRM). - Copyright 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + Copyright 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved."; reference "3GPP TS 28.541 5G Network Resource Model (NRM)"; revision 2025-01-25 { reference CR-1442; } - revision 2024-02-24 { reference CR-1218; } - revision 2023-09-18 { reference CR-1043; } + revision 2024-02-24 { reference CR-1218; } + revision 2023-09-18 { reference CR-1043; } revision 2023-04-26 { reference CR-0916; } revision 2020-04-23 { reference CR-0281; } revision 2019-10-28 { reference S5-193518; } - revision 2019-06-17 { + revision 2019-06-17 { reference "Initial version"; description "Initial revision"; } @@ -42,40 +42,40 @@ module _3gpp-nr-nrm-nrfreqrelation { rsrpOffsetCSI-RS, rsrqOffsetCSI-RS and sinrOffsetCSI-RS."; reference "offsetMO in MeasObjectNR in 3GPP TS 38.331"; - leaf rsrpOffsetSsb { + leaf rsrpOffsetSsb { description "Offset value of rsrpOffsetSSB."; default 0; - type types3gpp:QOffsetRange; + type types3gpp:QOffsetRange; } - leaf rsrqOffsetSsb { + leaf rsrqOffsetSsb { description "Offset value of rsrqOffsetSSB."; default 0; - type types3gpp:QOffsetRange; + type types3gpp:QOffsetRange; } - leaf sinrOffsetSsb { + leaf sinrOffsetSsb { description "Offset value of sinrOffsetSSB."; default 0; - type types3gpp:QOffsetRange; + type types3gpp:QOffsetRange; } - leaf rsrpOffsetCsiRs { + leaf rsrpOffsetCsiRs { description "Offset value of rsrpOffsetCSI-RS."; default 0; - type types3gpp:QOffsetRange; + type types3gpp:QOffsetRange; } - leaf rsrqOffsetCsiRs { + leaf rsrqOffsetCsiRs { description "Offset value of rsrqOffsetCSI-RS."; default 0; - type types3gpp:QOffsetRange; + type types3gpp:QOffsetRange; } - leaf sinrOffsetCsiRs { + leaf sinrOffsetCsiRs { description "Offset value of sinrOffsetCSI-RS."; default 0; - type types3gpp:QOffsetRange; + type types3gpp:QOffsetRange; } } @@ -114,7 +114,7 @@ module _3gpp-nr-nrm-nrfreqrelation { } leaf pMax { - description "Used for calculation of the parameter Pcompensation + description "Used for calculation of the parameter Pcompensation (defined in 3GPP TS 38.304), at cell reselection to a cell."; reference "PEMAX in 3GPP TS 38.101-1"; type int32 { range "-30..33"; } @@ -194,7 +194,7 @@ module _3gpp-nr-nrm-nrfreqrelation { units dB; } - leaf tReselectionNR { + leaf tReselectionNR { description "Cell reselection timer for NR."; reference "TreselectionRAT for NR in 3GPP TS 38.331"; mandatory true; @@ -213,7 +213,7 @@ module _3gpp-nr-nrm-nrfreqrelation { units %; } - leaf tReselectionNRSfMedium { + leaf tReselectionNRSfMedium { description "The attribute tReselectionNr (parameter TreselectionNR in 3GPP TS 38.304) multiplied with this scaling factor if the UE is in medium mobility state."; @@ -231,7 +231,7 @@ module _3gpp-nr-nrm-nrfreqrelation { } } - augment "/me3gpp:ManagedElement" + + augment "/me3gpp:ManagedElement" + "/gnbcucp3gpp:GNBCUCPFunction/nrcellcu3gpp:NRCellCU" { list NRFreqRelation { diff --git a/yang-models/_3gpp-nr-nrm-nrfrequency.yang b/yang-models/_3gpp-nr-nrm-nrfrequency.yang index 91b01d3d4..39f3795a7 100755 --- a/yang-models/_3gpp-nr-nrm-nrfrequency.yang +++ b/yang-models/_3gpp-nr-nrm-nrfrequency.yang @@ -13,12 +13,12 @@ module _3gpp-nr-nrm-nrfrequency { contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464"; description "Defines the YANG mapping of the NRFrequency Information Object Class (IOC) that is part of the NR Network Resource Model (NRM). - Copyright 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + Copyright 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved."; reference "3GPP TS 28.541 5G Network Resource Model (NRM)"; revision 2025-04-25 { reference "CR-1526 CR-1527"; } // common for r18, r19 - revision 2023-09-18 { reference CR-1043 ; } + revision 2023-09-18 { reference CR-1043 ; } revision 2019-10-28 { reference S5-193518 ; } revision 2019-06-17 { reference "Initial version"; } @@ -34,7 +34,7 @@ module _3gpp-nr-nrm-nrfrequency { leaf ssBSubCarrierSpacing { description "Sub-carrier spacing of the SSB. - Note that the allowed values of SSB used for representing data, + Note that the allowed values of SSB used for representing data, by e.g. a BWP, are: 15, 30, 60 and 120 in units of kHz."; mandatory true; type uint8 { range "15 | 30 | 60 | 120 | 240"; } @@ -59,13 +59,13 @@ module _3gpp-nr-nrm-nrfrequency { uses NRFrequencyGrp; } } - } - + } + feature NRFrequencyUnderNRNetwork { description "NRFrequency shall be contained under NRNetwork"; } - - augment "/me3gpp:ManagedElement/gnbcucp3gpp:GNBCUCPFunction/" + + augment "/me3gpp:ManagedElement/gnbcucp3gpp:GNBCUCPFunction/" + "nrnet3gpp:NRNetwork" { if-feature NRFrequencyUnderNRNetwork; uses NRFrequencyWrapper; @@ -74,7 +74,7 @@ module _3gpp-nr-nrm-nrfrequency { feature NRFrequencyUnderSubNetwork { description "NRFrequency shall be contained under SubNetwork"; } - + augment "/subnet3gpp:SubNetwork" { if-feature NRFrequencyUnderSubNetwork; uses NRFrequencyWrapper; diff --git a/yang-models/_3gpp-nr-nrm-nrnetwork.yang b/yang-models/_3gpp-nr-nrm-nrnetwork.yang index 044c2d0db..548365aed 100755 --- a/yang-models/_3gpp-nr-nrm-nrnetwork.yang +++ b/yang-models/_3gpp-nr-nrm-nrnetwork.yang @@ -11,12 +11,12 @@ module _3gpp-nr-nrm-nrnetwork { contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464"; description "Defines the YANG mapping of the NRNetwork Information Object Class (IOC) that is part of the NR Network Resource Model (NRM). - Copyright 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + Copyright 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved."; reference "3GPP TS 28.541 5G Network Resource Model (NRM)"; - revision 2025-04-25 { reference "CR-1526 CR-1527" ; } // common r17, r18 - revision 2023-09-18 { reference CR-1043 ; } + revision 2025-04-25 { reference "CR-1526 CR-1527" ; } // common r17, r18 + revision 2023-09-18 { reference CR-1043 ; } revision 2019-06-17 { reference "Initial revision"; } grouping NRNetworkGrp { @@ -26,7 +26,7 @@ module _3gpp-nr-nrm-nrnetwork { augment /me3gpp:ManagedElement/gnbcucp3gpp:GNBCUCPFunction { list NRNetwork { - description "Represents a set of NR frequencies and external NR entities + description "Represents a set of NR frequencies and external NR entities (e.g. ExternalGNBCUCPFunction). This is used to differentiate these entities and frequencies from those in EUTRAN."; key id; diff --git a/yang-models/_3gpp-nr-nrm-nroperatorcelldu.yang b/yang-models/_3gpp-nr-nrm-nroperatorcelldu.yang index b4d490fbb..8ca3ec4ff 100755 --- a/yang-models/_3gpp-nr-nrm-nroperatorcelldu.yang +++ b/yang-models/_3gpp-nr-nrm-nroperatorcelldu.yang @@ -9,28 +9,28 @@ module _3gpp-nr-nrm-nroperatorcelldu { import _3gpp-5g-common-yang-types { prefix types5g3gpp; } import _3gpp-common-yang-types { prefix types3gpp; } import _3gpp-nr-nrm-gnbdufunction { prefix gnbdu3gpp; } - + organization "3GPP SA5"; contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464"; description "Defines the YANG mapping of the OperatorDU Information Object Class (IOC) that is part of the NR Network Resource Model (NRM). - Copyright 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + Copyright 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved."; reference "3GPP TS 28.541 5G Network Resource Model (NRM)"; revision 2025-05-06 { reference "CR-1526 CR-1527" ; } // common for R18, R19 - revision 2024-05-24 { reference CR-1273 ; } - revision 2023-09-18 { reference CR-1043 ; } + revision 2024-05-24 { reference CR-1273 ; } + revision 2023-09-18 { reference CR-1043 ; } revision 2021-10-01 { reference "Initial revision"; } grouping NROperatorCellDUGrp { description "Represents the NROperatorCellDU IOC."; reference "3GPP TS 28.541"; uses operdu3gpp:OperatorDUGrp; - + leaf cellLocalId { description "Identifies an NR cell of a gNB. Together with the - corresponding gNB identifier in forms the NR Cell Identity (NCI)."; + corresponding gNB identifier in forms the NR Cell Identity (NCI)."; reference "NCI in 3GPP TS 38.300"; type int32 { range "0..16383"; } } @@ -44,24 +44,24 @@ module _3gpp-nr-nrm-nroperatorcelldu { } list pLMNInfoList { - description "The PLMNInfoList is a list of PLMNInfo data type. It - defines which PLMNs that can be served by the NR cell, and which - S-NSSAIs that can be supported by the NR cell for corresponding PLMN - in case of network slicing feature is supported. The plMNId of the - first entry of the list is the PLMNId used to construct the nCGI for + description "The PLMNInfoList is a list of PLMNInfo data type. It + defines which PLMNs that can be served by the NR cell, and which + S-NSSAIs that can be supported by the NR cell for corresponding PLMN + in case of network slicing feature is supported. The plMNId of the + first entry of the list is the PLMNId used to construct the nCGI for the NR cell."; key "mcc mnc sd sst"; min-elements 1; ordered-by user; uses types5g3gpp:PLMNInfo; } - + leaf nRTAC { - description "The common 5GS Tracking Area Code for the PLMNs."; + description "The common 5GS Tracking Area Code for the PLMNs."; reference "3GPP TS 23.003, 3GPP TS 38.473"; type types5g3gpp:NRTAC; } - + leaf-list nRCellDURef { description "Reference to corresponding NRCellDU instance."; type types3gpp:DistinguishedName; @@ -69,7 +69,7 @@ module _3gpp-nr-nrm-nroperatorcelldu { } - augment "/me3gpp:ManagedElement/gnbdu3gpp:GNBDUFunction/operdu3gpp:OperatorDU" + augment "/me3gpp:ManagedElement/gnbdu3gpp:GNBDUFunction/operdu3gpp:OperatorDU" { list NROperatorCellDU { diff --git a/yang-models/_3gpp-nr-nrm-nrsectorcarrier.yang b/yang-models/_3gpp-nr-nrm-nrsectorcarrier.yang index 7c48e5965..046957939 100755 --- a/yang-models/_3gpp-nr-nrm-nrsectorcarrier.yang +++ b/yang-models/_3gpp-nr-nrm-nrsectorcarrier.yang @@ -13,11 +13,11 @@ module _3gpp-nr-nrm-nrsectorcarrier { contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464"; description "Defines the YANG mapping of the NRSectorCarrier Information Object Class (IOC) that is part of the NR Network Resource Model (NRM). - Copyright 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + Copyright 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved."; reference "3GPP TS 28.541 5G Network Resource Model (NRM)"; - revision 2023-09-18 { reference CR-1043 ; } + revision 2023-09-18 { reference CR-1043 ; } revision 2020-05-28 { reference CR-0316 ; } revision 2019-10-28 { reference S5-193518 ; } revision 2019-06-17 { @@ -37,9 +37,9 @@ module _3gpp-nr-nrm-nrsectorcarrier { } leaf configuredMaxTxPower { - description "Maximum transmisssion power at the antenna port for all + description "Maximum transmisssion power at the antenna port for all downlink channels, used simultaneously in a cell, added together. - Condition: The sector-carrier has a downlink and the + Condition: The sector-carrier has a downlink and the configuration of Tx power at antenna port reference point is supported."; mandatory true; type int32; @@ -50,16 +50,16 @@ module _3gpp-nr-nrm-nrsectorcarrier { type int64; units dBm; mandatory true; - description "The maximum emitted isotroptic radiated power (EIRP) in dBm + description "The maximum emitted isotroptic radiated power (EIRP) in dBm for all downlink channels, used simultaneously in a cell, added together. - Condition: the sector-carrier has a downlink and the + Condition: the sector-carrier has a downlink and the configuration of emitted isotropic radiated power is supported"; } leaf arfcnDL { description "NR Absolute Radio Frequency Channel Number (NR-ARFCN) - for downlink. - Condition: The sector-carrier has a downlink AND the value + for downlink. + Condition: The sector-carrier has a downlink AND the value differs from the referring cell's value of arfcnDL."; reference "3GPP TS 38.104"; mandatory true; @@ -68,8 +68,8 @@ module _3gpp-nr-nrm-nrsectorcarrier { leaf arfcnUL { description "NR Absolute Radio Frequency Channel Number (NR-ARFCN) - for uplink. - Condition: The sector-carrier has an uplink AND the value + for uplink. + Condition: The sector-carrier has an uplink AND the value differs from the referring cell's value of arfcnUL."; reference "3GPP TS 38.104"; mandatory true; @@ -77,8 +77,8 @@ module _3gpp-nr-nrm-nrsectorcarrier { } leaf bSChannelBwDL { - description "Base station channel bandwitdth for downlink. - Condition: The sector-carrier has a downlink AND the value + description "Base station channel bandwitdth for downlink. + Condition: The sector-carrier has a downlink AND the value differs from the referring cell's value of bSChannelBwDL."; reference "3GPP TS 38.104"; mandatory true; @@ -101,9 +101,9 @@ module _3gpp-nr-nrm-nrsectorcarrier { instance."; reference "3GPP TS 23.622"; mandatory true; - type types3gpp:DistinguishedName; - } - } + type types3gpp:DistinguishedName; + } + } augment "/me3gpp:ManagedElement/gnbdu3gpp:GNBDUFunction" { diff --git a/yang-models/_3gpp-nr-nrm-ntnfunction.yang b/yang-models/_3gpp-nr-nrm-ntnfunction.yang index 43e2a86eb..f75961b88 100644 --- a/yang-models/_3gpp-nr-nrm-ntnfunction.yang +++ b/yang-models/_3gpp-nr-nrm-ntnfunction.yang @@ -1,41 +1,41 @@ module _3gpp-nr-nrm-ntnfunction { yang-version 1.1; - + namespace urn:3gpp:sa5:_3gpp-nr-nrm-ntnfunction; prefix ntn3gpp; - + import _3gpp-common-top { prefix top3gpp; } import _3gpp-5g-common-yang-types { prefix types5g3gpp; } import ietf-yang-types { prefix yang; } import _3gpp-common-managed-element { prefix me3gpp; } import _3gpp-common-subnetwork { prefix subnet3gpp; } import _3gpp-common-yang-types { prefix types3gpp; } - + organization "3gpp SA5"; contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464"; - description "Implements support the C-SON function of Capacity and + description "Implements support the C-SON function of Capacity and Coverage optimization . - Copyright 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + Copyright 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved."; reference "3GPP TS 28.541"; - + revision 2025-03-27 { reference CR-1512; } revision 2025-02-17 { reference CR-1479 ; } - revision 2024-05-24 { reference CR-1273 ; } + revision 2024-05-24 { reference CR-1273 ; } + - feature NTNFunctionUnderSubNetwork { - description "The NTNFunction shall be contained under SubNetwork"; + description "The NTNFunction shall be contained under SubNetwork"; } - + feature NTNFunctionUnderManagedElement { - description "The NTNFunction shall be contained under ManagedElement"; + description "The NTNFunction shall be contained under ManagedElement"; } - + grouping PositionVelocityGrp { - description "This data type defines configuration parameters to support + description "This data type defines configuration parameters to support satellite position and velocity state"; - + leaf positionX { type uint32 { range 0..604800; @@ -43,11 +43,11 @@ module _3gpp-nr-nrm-ntnfunction { config false; default 0; units meter; - description "X, Y, Z coordinate of satellite position state vector - in ECEF. Unit is meter. + description "X, Y, Z coordinate of satellite position state vector + in ECEF. Unit is meter. Step of 1.3 m. Actual value = field value * 1.3."; } - + leaf positionY { type uint32 { range 0..604800; @@ -55,11 +55,11 @@ module _3gpp-nr-nrm-ntnfunction { config false; default 0; units meter; - description "X, Y, Z coordinate of satellite position state vector - in ECEF. Unit is meter. + description "X, Y, Z coordinate of satellite position state vector + in ECEF. Unit is meter. Step of 1.3 m. Actual value = field value * 1.3."; } - + leaf positionZ { type uint32 { range 0..604800; @@ -67,11 +67,11 @@ module _3gpp-nr-nrm-ntnfunction { config false; default 0; units meter; - description "X, Y, Z coordinate of satellite position state vector - in ECEF. Unit is meter. + description "X, Y, Z coordinate of satellite position state vector + in ECEF. Unit is meter. Step of 1.3 m. Actual value = field value * 1.3."; } - + leaf velocityVX { type int32 { range -131072..131071; @@ -79,11 +79,11 @@ module _3gpp-nr-nrm-ntnfunction { config false; default 0; units meter/second; - description "X, Y, Z coordinate of satellite velocity state vector - in ECEF. + description "X, Y, Z coordinate of satellite velocity state vector + in ECEF. Step of 0.06 m/s. Actual value = field value * 0.06."; } - + leaf velocityVY { type int32 { range -131072..131071; @@ -91,11 +91,11 @@ module _3gpp-nr-nrm-ntnfunction { config false; default 0; units meter/second; - description "X, Y, Z coordinate of satellite velocity state vector - in ECEF. + description "X, Y, Z coordinate of satellite velocity state vector + in ECEF. Step of 0.06 m/s. Actual value = field value * 0.06."; } - + leaf velocityVZ { type int32 { range -131072..131071; @@ -103,16 +103,16 @@ module _3gpp-nr-nrm-ntnfunction { config false; default 0; units meter/second; - description "X, Y, Z coordinate of satellite velocity state vector - in ECEF. + description "X, Y, Z coordinate of satellite velocity state vector + in ECEF. Step of 0.06 m/s. Actual value = field value * 0.06."; } } - + grouping OrbitalGrp { - description "This data type defines configuration parameters of orbital + description "This data type defines configuration parameters of orbital trajectory information to support satellite access."; - + leaf semiMajorAxis { type uint64 { range 0..8589934591; @@ -120,24 +120,24 @@ module _3gpp-nr-nrm-ntnfunction { config false; default 0; units meter; - description "Satellite orbital parameter: semi major axis alpha, - see NIMA TR 8350.2. - Step of 4.249 * 10**-3 m. + description "Satellite orbital parameter: semi major axis alpha, + see NIMA TR 8350.2. + Step of 4.249 * 10**-3 m. Actual value = 6500000 + field value * (4.249 * 10**-3)."; } - + leaf eccentricity { type int32 { range -524288..524287; } config false; default 0; - description "Satellite orbital parameter: eccentricity e, + description "Satellite orbital parameter: eccentricity e, see NIMA TR 8350.2. - Step 1.431 * 10**-8. + Step 1.431 * 10**-8. Actual value = field value * (1.431 * 10**-8)."; } - + leaf periapsis { type uint32 { range 0..16777215; @@ -145,25 +145,25 @@ module _3gpp-nr-nrm-ntnfunction { config false; default 0; units radian; - description "Satellite orbital parameter: argument of periapsis omega, - see NIMA TR 8350.2. - Step of 2.341* 10**-8 rad. + description "Satellite orbital parameter: argument of periapsis omega, + see NIMA TR 8350.2. + Step of 2.341* 10**-8 rad. Actual value = field value * (2.341* 10**-8)."; } - + leaf longitude { type uint32 { range 0..2097151; } config false; - default 0; + default 0; units radian; - description "Satellite orbital parameter: longitude of ascending node - OMEGA, see NIMA TR 8350.2. + description "Satellite orbital parameter: longitude of ascending node + OMEGA, see NIMA TR 8350.2. Step of 2.341* 10**-8 rad. Actual value = field value * (2.341* 10**-8)."; } - + leaf inclination { type int32 { range -524288..524287; @@ -171,12 +171,12 @@ module _3gpp-nr-nrm-ntnfunction { config false; default 0; units radian; - description "Satellite orbital parameter: inclination i, - see NIMA TR 8350.2. - Step of 2.341* 10**-8 rad. + description "Satellite orbital parameter: inclination i, + see NIMA TR 8350.2. + Step of 2.341* 10**-8 rad. Actual value = field value * (2.341* 10**-8)."; } - + leaf meanAnomaly { type uint32 { range 0..16777215; @@ -184,47 +184,47 @@ module _3gpp-nr-nrm-ntnfunction { config false; default 0; units radian; - description "Satellite orbital parameter: Mean anomaly M at epoch time, - see NIMA TR 8350.2. - Step of 2.341* 10**-8 rad. + description "Satellite orbital parameter: Mean anomaly M at epoch time, + see NIMA TR 8350.2. + Step of 2.341* 10**-8 rad. Actual value = field value * (2.341* 10**-8)."; } } - + grouping EphemerisGrp { - description "This data type represents the satellite ephemeris related - information. The ephemeris data format may be expressed either in - format of position and velocity state vector or in format of orbital + description "This data type represents the satellite ephemeris related + information. The ephemeris data format may be expressed either in + format of position and velocity state vector or in format of orbital parameters."; - + leaf satelliteId { type string { pattern "00([01][0-9][0-9])|(2[0-4][0-9]|(25[0-5]))"; } config false; - description "This attribute indicates satellite Id.number. - It shall be formatted as a fixed 5-digit string, padding with + description "This attribute indicates satellite Id.number. + It shall be formatted as a fixed 5-digit string, padding with leading digits '0' to complete a 5-digit length. allowedValues: 00000..00255"; } - + leaf epochTime { type yang:date-and-time; config false; description "It defines the ephemeris reference time."; } - + choice positionVelocity-or-orbital { list positionVelocity { - description "It indicates ephemeris is in format of NTN payload + description "It indicates ephemeris is in format of NTN payload position and velocity state vectors."; max-elements 1; config false; uses PositionVelocityGrp; } - + list orbital { - description "It indicates ephemeris is in orbital parameter ephemeris + description "It indicates ephemeris is in orbital parameter ephemeris format, as specified in NIMA TR 8350.2"; max-elements 1; config false; @@ -232,10 +232,10 @@ module _3gpp-nr-nrm-ntnfunction { } } } - + grouping EphemerisInfoSetGrp { description "Represents the EphemerisInfoSet IOC"; - + list EphemerisInfos { description "This is the list of Ephemeris related information."; min-elements 1; @@ -244,10 +244,10 @@ module _3gpp-nr-nrm-ntnfunction { uses EphemerisGrp; } } - + grouping NTNEntityConfigGrp { description "The attribute nTNConfEntity specifies an NTN related MOI. - The attribute nTNConfList optionally specifies configuration + The attribute nTNConfList optionally specifies configuration updates to be applied to the nTNConfEntity. If no updates are provided the value of nTNConfEntity is used without modification."; @@ -265,13 +265,13 @@ module _3gpp-nr-nrm-ntnfunction { description "Specifies the list of configuration parameters and values. The content of the attribute is a list of attributeName- attributeValue pairs. AttributeValues may be complex types."; - } + } } grouping NTNTimeBasedConfigGrp { description "Define configuration to be applied during a specified time window. - The attribute timeWindow specifies the time window during which the + The attribute timeWindow specifies the time window during which the specified configuration is applied. The attribute nTNEntityConfigList specifies configuration updates applied during the specified timeWindow."; @@ -294,15 +294,15 @@ module _3gpp-nr-nrm-ntnfunction { updates to be applied to specified NTN entities."; } } - + grouping NTNFunctionGrp { description "Represents the NTNFunction IOC"; - + list nTNpLMNInfoList { - description "It defines which PLMNs that can be served by the NR NTN cell, - and which S-NSSAIs can be supported by the NR NTN cell for - corresponding PLMN in case of network slicing feature is supported. - The pLMNId of the first entry of the list is the PLMNId used to + description "It defines which PLMNs that can be served by the NR NTN cell, + and which S-NSSAIs can be supported by the NR NTN cell for + corresponding PLMN in case of network slicing feature is supported. + The pLMNId of the first entry of the list is the PLMNId used to construct the nCGI for the NR cell."; min-elements 1; ordered-by user; @@ -310,25 +310,25 @@ module _3gpp-nr-nrm-ntnfunction { leaf idx { type uint32; } uses types5g3gpp:PLMNInfo; } - + leaf-list nTNTAClist { type types5g3gpp:NRTAC; min-elements 1; - description "It is the list of Tracking Area Codes (either legacy TAC or - extended TAC) for NR NTN. - Legacy TAC and Extended TAC are defined in clause 9.3.3.10 of + description "It is the list of Tracking Area Codes (either legacy TAC or + extended TAC) for NR NTN. + Legacy TAC and Extended TAC are defined in clause 9.3.3.10 of TS 38.413."; } } - + grouping NTNFunctionSubtreeGrp { list NTNFunction { - description "This IOC contains attributes to support the non-terrestrial + description "This IOC contains attributes to support the non-terrestrial NR access. This IOC contains instances of NTNTimeBasedConfig to support - time-based configuration of the following NTN related entities: - EP_NgC, NRCellCU, NRCellDU, NRSectorCarrier, SectorEquipmentFunction, - and NRCellRelation. The IP Configuration of the feeder links may be - configured via IP Autoconfiguration services [x] and/or configured via + time-based configuration of the following NTN related entities: + EP_NgC, NRCellCU, NRCellDU, NRSectorCarrier, SectorEquipmentFunction, + and NRCellRelation. The IP Configuration of the feeder links may be + configured via IP Autoconfiguration services [x] and/or configured via instances of NTNTimeBasedConfig in anticipation of feeder link switchovers."; key id; max-elements 1; @@ -338,8 +338,8 @@ module _3gpp-nr-nrm-ntnfunction { } list EphemerisInfoSet { - description "This IOC represents the satellite ephemeris information - describing the orbital trajectory information or coordinates for the + description "This IOC represents the satellite ephemeris information + describing the orbital trajectory information or coordinates for the NTN vehicles."; key id; uses top3gpp:Top_Grp; @@ -359,12 +359,12 @@ module _3gpp-nr-nrm-ntnfunction { } } } - + augment "/subnet3gpp:SubNetwork" { if-feature NTNFunctionUnderSubNetwork; uses NTNFunctionSubtreeGrp; } - + augment "/me3gpp:ManagedElement" { if-feature NTNFunctionUnderManagedElement; uses NTNFunctionSubtreeGrp; diff --git a/yang-models/_3gpp-nr-nrm-operatordu.yang b/yang-models/_3gpp-nr-nrm-operatordu.yang index f50f7873a..66ff8c6b0 100755 --- a/yang-models/_3gpp-nr-nrm-operatordu.yang +++ b/yang-models/_3gpp-nr-nrm-operatordu.yang @@ -8,26 +8,26 @@ module _3gpp-nr-nrm-operatordu { import _3gpp-nr-nrm-gnbdufunction {prefix gnbdu3gpp; } import _3gpp-common-yang-types { prefix types3gpp; } import _3gpp-nr-nrm-ep { prefix ep3gpp; } - + organization "3GPP SA5"; contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464"; description "Defines the YANG mapping of the OperatorDU Information Object Class (IOC) that is part of the NR Network Resource Model (NRM). - Copyright 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + Copyright 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved."; reference "3GPP TS 28.541 5G Network Resource Model (NRM)"; revision 2025-05-06 { reference "CR-1526 CR-1527" ; } // common for R18, R19 - revision 2024-02-24 { reference CR-1218; } + revision 2024-02-24 { reference CR-1218; } revision 2023-11-14 { reference "CR1136"; } revision 2023-09-30 { reference "CR1048"; } - revision 2023-09-18 { reference CR-1043 ; } + revision 2023-09-18 { reference CR-1043 ; } revision 2021-10-01 { reference "Initial revision"; } grouping OperatorDUGrp { description "Represents the OperatorDU IOC."; reference "3GPP TS 28.541"; - + leaf gNBId { type int64 { range "0..4294967295"; } mandatory true; @@ -42,7 +42,7 @@ module _3gpp-nr-nrm-operatordu { description "Indicates the number of bits for encoding the gNB ID."; reference "gNB ID in 3GPP TS 38.300, Global gNB ID in 3GPP TS 38.413"; } - + leaf configurable5QISetRef { type types3gpp:DistinguishedName; description "DN of the Configurable5QISet that the OperatorDU @@ -51,26 +51,26 @@ module _3gpp-nr-nrm-operatordu { leaf dynamic5QISetRef { type types3gpp:DistinguishedName; - description "DN of the Dynamic5QISet that the OperatorDU + description "DN of the Dynamic5QISet that the OperatorDU supports (is associated to)."; - } + } } augment "/me3gpp:ManagedElement/gnbdu3gpp:GNBDUFunction" { list OperatorDU { - description "This IOC contains attributes to support operator specific - gNB-DU level information to support the NG-RAN Multi-Operator Core - Network (NG-RAN MOCN) network sharing with multiple Cell Identity - broadcast feature. An instance of OperatorDU <> should be created - and configured for each POP. When configured the attributes override + description "This IOC contains attributes to support operator specific + gNB-DU level information to support the NG-RAN Multi-Operator Core + Network (NG-RAN MOCN) network sharing with multiple Cell Identity + broadcast feature. An instance of OperatorDU <> should be created + and configured for each POP. When configured the attributes override those in parent GNBDUFunction instance. - - The OperatorDU <> is only used to support NG-RAN MOCN with - multiple cell identity broadcast feature. If NG-RAN MOCN with multiple - cell identity broadcast feature is not supported, is not used. - For scenarios with an F1 interface supporting multiple PLMN broadcast, - the values of the EP_F1C and EP_F1U attributes contained by different + + The OperatorDU <> is only used to support NG-RAN MOCN with + multiple cell identity broadcast feature. If NG-RAN MOCN with multiple + cell identity broadcast feature is not supported, is not used. + For scenarios with an F1 interface supporting multiple PLMN broadcast, + the values of the EP_F1C and EP_F1U attributes contained by different OperatorDU of the same GNBDUFunction should be same."; reference "3GPP TS 28.541"; key id; @@ -78,13 +78,13 @@ module _3gpp-nr-nrm-operatordu { container attributes { uses OperatorDUGrp; } - + uses ep3gpp:EP_F1CSubtree { refine EP_F1C { max-elements 1; } } - + uses ep3gpp:EP_F1USubtree; } } diff --git a/yang-models/_3gpp-nr-nrm-redcapaccess.yang b/yang-models/_3gpp-nr-nrm-redcapaccess.yang index 77914ad37..51e91f203 100755 --- a/yang-models/_3gpp-nr-nrm-redcapaccess.yang +++ b/yang-models/_3gpp-nr-nrm-redcapaccess.yang @@ -12,42 +12,42 @@ module _3gpp-nr-nrm-redcapaccess { Class (IOC) that is part of the NR Network Resource Model (NRM). Copyright 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved."; - + reference "3GPP TS 28.541 5G Network Resource Model (NRM)"; revision 2025-07-07 { reference CR-; } feature redcapaccesscriteriasubnertwork { - description "The RedCap acsess criterea shall be contained under + description "The RedCap acsess criterea shall be contained under SubNetwork"; } - + grouping RedCapAccessCriteriaGrp { description "Represents the RedCapAccessCriteria <> "; - + leaf nRCellDURef { type types3gpp:DistinguishedName; - mandatory true; + mandatory true; description "This attribute contains the DN of a NR Cell (NRCellDU) "; - } - + } + leaf criteriaConditionRef { type types3gpp:DistinguishedName; mandatory true; - description "This specifies the DN of the ConditionMonitor MOI.The - attribute condition will contain information on the condition to be - satisfied to restrict Redcap UE access. This means that the value of - attribute uECellBarredAccess of NRCellDU IOC will be set to - REDCAP_1RX and REDCAP_2RX if this condition is met.The condition + description "This specifies the DN of the ConditionMonitor MOI.The + attribute condition will contain information on the condition to be + satisfied to restrict Redcap UE access. This means that the value of + attribute uECellBarredAccess of NRCellDU IOC will be set to + REDCAP_1RX and REDCAP_2RX if this condition is met.The condition will be created providing following information: The performance metrics (KPIs and performance measurements) that are to be considered in the criteria for deciding whether the cell in a RAN node is barred or allowed for RedCap/eRedCap UEs - The direction (up and down) that is to be considered for crossing - the threshold value of the given performance metrics for taking a - decision whether the RAN node is barred or allowed for - RedCap/eRedCap UEs. + The direction (up and down) that is to be considered for crossing + the threshold value of the given performance metrics for taking a + decision whether the RAN node is barred or allowed for + RedCap/eRedCap UEs. The threshold level of performance metrics value which when crossed the RAN node is barred or allowed for RedCap/eRedCap UEs"; } @@ -56,20 +56,20 @@ module _3gpp-nr-nrm-redcapaccess { } augment "/subnet3gpp:SubNetwork" { - if-feature redcapaccesscriteriasubnertwork; + if-feature redcapaccesscriteriasubnertwork; list RedCapAccessCriteria { - description "The RedCapAccessCriteria <> contains attributes - to support the controlling of RedCap access in a NR Cell. + description "The RedCapAccessCriteria <> contains attributes + to support the controlling of RedCap access in a NR Cell. It provides information of a condition (for example, KPIs such as Total DRB accessibility, DRB Retainability , Utilization KPI, NG-RAN data Energy Efficiency, Downlink/Uplink delay in gNB-DU etc. - and Performance measurements such as DL/UL Total PRB Usage, + and Performance measurements such as DL/UL Total PRB Usage, Average DL/UL UE throughput in gNB etc.) which can be used to - control decision of barring or allowing access of RedCap/eRedCap - UEs to a NR Cell. This information can be used to decide whether - RedCap/eRedCap UEs are barred or allowed at the time of new UE + control decision of barring or allowing access of RedCap/eRedCap + UEs to a NR Cell. This information can be used to decide whether + RedCap/eRedCap UEs are barred or allowed at the time of new UE access attempt in NR cell during applicable RAN procedures."; - + key id; max-elements 1; uses top3gpp:Top_Grp; diff --git a/yang-models/_3gpp-nr-nrm-rimrsset.yang b/yang-models/_3gpp-nr-nrm-rimrsset.yang index 69caf25ea..2ebfe986d 100755 --- a/yang-models/_3gpp-nr-nrm-rimrsset.yang +++ b/yang-models/_3gpp-nr-nrm-rimrsset.yang @@ -11,51 +11,51 @@ module _3gpp-nr-nrm-rimrsset { contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464"; description "Defines the YANG mapping of the RimRSSet Information Object Class (IOC) that is part of the NR Network Resource Model (NRM). - Copyright 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + Copyright 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved."; reference "3GPP TS 28.541 5G Network Resource Model (NRM)"; - revision 2023-09-18 { reference CR-1043 ; } + revision 2023-09-18 { reference CR-1043 ; } revision 2021-10-28 { reference CR-0607 ; } - + grouping FrequencyDomainParaGrp { - description "Configuration parameters of frequency domain resource to + description "Configuration parameters of frequency domain resource to support RIM RS. "; - + leaf rimRSSubcarrierSpacing { type uint8 { range 0|1 ; } mandatory true; - description - "It is the subcarrier spacing configuration (u) for the RIM-RS. + description + "It is the subcarrier spacing configuration (u) for the RIM-RS. Subcarrier spacing delta-f=2^u*15 kHz. (see 38.211 subclause 5.3.3)."; } - + leaf rIMRSBandwidth { type uint8 { range 1..96 ; } mandatory true; - description "It is the bandwidth of the RIM-RS in resource blocks + description "It is the bandwidth of the RIM-RS in resource blocks (see 38.211 subclause 5.3.3). For carrier bandwidth larger than 20MHz, this attribute should be 96 if subcarrier spacing is15kHz 48 or 96 if subcarrier spacing is 30kHz - For carrier bandwidth smaller than or equal to 20MHz, this attribute + For carrier bandwidth smaller than or equal to 20MHz, this attribute should be - Minimum of {96 , bandwidth of downlink carrier in number of PRBs} if + Minimum of {96 , bandwidth of downlink carrier in number of PRBs} if subcarrier spacing is15kHz - Minimum of {48, bandwidth of downlink carrier in number of PRBs } if + Minimum of {48, bandwidth of downlink carrier in number of PRBs } if subcarrier spacing is 30kHz"; } - + leaf nrofGlobalRIMRSFrequencyCandidates { type uint8 { range 1|2|4 ; } mandatory true; - description "The number of candidate frequency resources in the whole + description "The number of candidate frequency resources in the whole network (N_f^RIM ) (see 38.211 subclause 7.4.1.6)."; } @@ -68,32 +68,32 @@ module _3gpp-nr-nrm-rimrsset { range 0..550; } must 'count(.) = ../nrofGlobalRIMRSFrequencyCandidates' { - error-message + error-message "The multiplicity must be equal to nrofGlobalRIMRSFrequencyCandidates"; } - description "List of configured frequency offsets in units of resource - blocks, where each element is the frequency offset relative to a - configured reference point for RIM-RS. The size of the list is - nrofGlobalRIMRSFrequencyCandidates and the resulting frequency resource - blocks of RIM-RS corresponding to different configured frequency offset + description "List of configured frequency offsets in units of resource + blocks, where each element is the frequency offset relative to a + configured reference point for RIM-RS. The size of the list is + nrofGlobalRIMRSFrequencyCandidates and the resulting frequency resource + blocks of RIM-RS corresponding to different configured frequency offset have no overlapping bandwidth. (see 38.211 subclause 7.4.1.6). - allowedValues: 0..maxNrofPhysicalResourceBlocks-1 where + allowedValues: 0..maxNrofPhysicalResourceBlocks-1 where maxNrofPhysicalResourceBlocks = 550"; } } - + grouping SequenceDomainParaGrp { - description "Configuration parameters of sequence domain resource to + description "Configuration parameters of sequence domain resource to support RIM RS. "; - + leaf nrofRIMRSSequenceCandidatesofRS1 { type uint8 { range 1..8 ; } mandatory true; - description "The number of candidate sequences assigned for RIM RS-1 - (N_s^RIM,1) (see 38.211 [subclause 7.4.1.6). It should be even when + description "The number of candidate sequences assigned for RIM RS-1 + (N_s^RIM,1) (see 38.211 [subclause 7.4.1.6). It should be even when enableEnoughNotEnoughIndication for RS-1 is ON"; } @@ -102,11 +102,11 @@ module _3gpp-nr-nrm-rimrsset { range 0..1023 ; } must 'count(.) = ../nrofRIMRSSequenceCandidatesofRS1' { - error-message + error-message "The multiplicity must be equal to nrofRIMRSSequenceCandidatesofRS1"; } description "List of configured scrambling identities for RIM RS-1 ( - see 38.211 [subclause 7.4.1.6). The size of the list is + see 38.211 [subclause 7.4.1.6). The size of the list is nrofRIMRSSequenceCandidatesofRS1."; } @@ -115,7 +115,7 @@ module _3gpp-nr-nrm-rimrsset { range 1..8 ; } mandatory true; - description "The number of candidate sequences assigned for RIM RS-2 + description "The number of candidate sequences assigned for RIM RS-2 (N_s^RIM,2) (see 38.211 subclause 7.4.1.6)."; } @@ -124,31 +124,31 @@ module _3gpp-nr-nrm-rimrsset { range 0..1023 ; } must 'count(.) = ../nrofRIMRSSequenceCandidatesofRS2' { - error-message + error-message "The multiplicity must be equal to nrofRIMRSSequenceCandidatesofRS2"; } description "List of configured scrambling identities for RIM RS-2 ( - see 38.211 subclause 7.4.1.6). + see 38.211 subclause 7.4.1.6). The size of the list is nrofRIMRSSequenceCandidatesofRS2."; } leaf enableEnoughNotEnoughIndication { type types3gpp:EnabledDisabled; default DISABLED; - description "It is indication of whether 'Enough'/'Not enough' indication + description "It is indication of whether 'Enough'/'Not enough' indication functionality is enabled for RIM RS-1 (see 38.211 subclause 7.4.1.6). - If the indication is 'ENABLED', the first half of - nrofRIMRSSequenceCandidatesofRS1 sequences indicates 'Not enough + If the indication is 'ENABLED', the first half of + nrofRIMRSSequenceCandidatesofRS1 sequences indicates 'Not enough mitigation', and the second half indicates 'Enough mitigation', where, - 'Enough mitigation' indicates that IoT going back to certain level at - victim side and/or no further interference mitigation actions are + 'Enough mitigation' indicates that IoT going back to certain level at + victim side and/or no further interference mitigation actions are needed at aggressor side - 'Not enough mitigation' indicates that IoT exceeding certain level at - victim side and/or further interference mitigation actions are needed + 'Not enough mitigation' indicates that IoT exceeding certain level at + victim side and/or further interference mitigation actions are needed at aggressor side - enableEnoughNotEnoughIndication is equivalent to EnoughIndication + enableEnoughNotEnoughIndication is equivalent to EnoughIndication (see 38.211 subclause 7.4.1.6)"; } @@ -157,8 +157,8 @@ module _3gpp-nr-nrm-rimrsset { range 0..2147483647; } mandatory true; - description "It is parameter multiplier factor gamma for initialization - seed of the pseudo-random sequence c~(i) + description "It is parameter multiplier factor gamma for initialization + seed of the pseudo-random sequence c~(i) (see 38.211 subclause 7.4.1.6.2). allowedValues: 0,1...2^31-1"; } @@ -168,16 +168,16 @@ module _3gpp-nr-nrm-rimrsset { range 0..2147483647; } mandatory true; - description "It is parameter offset delta for initialization seed of + description "It is parameter offset delta for initialization seed of the pseudo-random sequence c~(i) (see 38.211 subclause 7.4.1.6.2). allowedValues: 0,1...2^31-1"; } } - + grouping TimeDomainParaGrp { - description "Configuration parameters of time domain resource to + description "Configuration parameters of time domain resource to support RIM RS. "; - + leaf dlULSwitchingPeriod1 { type enumeration { enum MS0P5; @@ -193,31 +193,31 @@ module _3gpp-nr-nrm-rimrsset { enum MS20; } mandatory true; - description "This attribute is used to configure the first uplink-downlink - switching period (P1) for RIM RS transmission in the network, where one - RIM RS is configured in one uplink-downlink switching period. - (see 38.211 subclause 7.4.1.6). + description "This attribute is used to configure the first uplink-downlink + switching period (P1) for RIM RS transmission in the network, where one + RIM RS is configured in one uplink-downlink switching period. + (see 38.211 subclause 7.4.1.6). - When only one TDD-UL-DL-Pattern is configured, only - dl-UL-SwitchingPeriod1 is configured, where P1 equals to the + When only one TDD-UL-DL-Pattern is configured, only + dl-UL-SwitchingPeriod1 is configured, where P1 equals to the transmission periodicity of the TDD-UL-DL-Pattern. - When two concatenated TDD-UL-DL-Patterns are configured, and RIM-RS - resources is configured only in one of the TDD patterns, only - dl-UL-SwitchingPeriod1 is configured, where P1 equals to the addition - of the concatenated transmission periodicity of the two + When two concatenated TDD-UL-DL-Patterns are configured, and RIM-RS + resources is configured only in one of the TDD patterns, only + dl-UL-SwitchingPeriod1 is configured, where P1 equals to the addition + of the concatenated transmission periodicity of the two TDD-UL-DL-Patterns. - When two concatenated TDD-UL-DL-Patterns are configured, and RIM-RS - resources are configured in both TDD patterns, both - dl-UL-SwitchingPeriod1 and dl-UL-SwitchingPeriod2 are configured, - where P1 equals to the transmission periodicity of the first + When two concatenated TDD-UL-DL-Patterns are configured, and RIM-RS + resources are configured in both TDD patterns, both + dl-UL-SwitchingPeriod1 and dl-UL-SwitchingPeriod2 are configured, + where P1 equals to the transmission periodicity of the first TDD-UL-DL-Pattern. P1 is equivalent to T_(per,1)^RIM (see 38.211, subclause 7.4.1.6). - allowedValues: - MS0P5, MS0P625, MS1, MS1P25, MS2, MS2P5, MS4, MS5, MS10, MS20, + allowedValues: + MS0P5, MS0P625, MS1, MS1P25, MS2, MS2P5, MS4, MS5, MS10, MS20, if a single uplink-downlink period is configured for RIM-RS purposes; - MS0P5, MS0P625, MS1, MS1P25, MS2, MS2P5, MS3, MS4, MS5, MS10, MS20, + MS0P5, MS0P625, MS1, MS1P25, MS2, MS2P5, MS3, MS4, MS5, MS10, MS20, if two uplink-downlink periods are configured for RIM-RS purposes."; } @@ -226,23 +226,23 @@ module _3gpp-nr-nrm-rimrsset { range 2..327679 ; } mandatory true; - description "This attribute is used to configure the reference point in - the first uplink-downlink switching period, which is the symbols offset - of the reference point after the starting boundary of the first - uplink-downlink switching period. It's Configured together with + description "This attribute is used to configure the reference point in + the first uplink-downlink switching period, which is the symbols offset + of the reference point after the starting boundary of the first + uplink-downlink switching period. It's Configured together with dl-UL-SwitchingPeriod1 (see 38.211 subclause 7.4.1.6). - When only one TDD-UL-DL-Pattern is configured, the reference point - configured for the first uplink-downlink switching period is the DL + When only one TDD-UL-DL-Pattern is configured, the reference point + configured for the first uplink-downlink switching period is the DL transmission boundary of the TDD-UL-DL-Pattern. - When two concatenated TDD-UL-DL-Patterns are configured, and RIM-RS - resources is configured only in one of the TDD patterns, the reference - point configured for the first uplink-downlink switching period is the - DL transmission boundary of the TDD-UL-DL-Pattern where the RIM-RS + When two concatenated TDD-UL-DL-Patterns are configured, and RIM-RS + resources is configured only in one of the TDD patterns, the reference + point configured for the first uplink-downlink switching period is the + DL transmission boundary of the TDD-UL-DL-Pattern where the RIM-RS resource is configured. - When two concatenated TDD-UL-DL-Patterns are configured, and RIM-RS - resources are configured in both TDD patterns, the reference points - configured for first uplink-downlink switching period is the DL + When two concatenated TDD-UL-DL-Patterns are configured, and RIM-RS + resources are configured in both TDD patterns, the reference points + configured for first uplink-downlink switching period is the DL transmission boundary of the first TDD-UL-DL-Pattern. allowedValues: 2, 3..20*2*maxNrofSymbols-1, where maxNrofSymbols=14"; @@ -262,20 +262,20 @@ module _3gpp-nr-nrm-rimrsset { enum MS10; } mandatory true; - description "Used to configure the second uplink-downlink switching - period (P2) for RIM RS transmission in the network, where one RIM RS is - configured in one uplink-downlink switching period + description "Used to configure the second uplink-downlink switching + period (P2) for RIM RS transmission in the network, where one RIM RS is + configured in one uplink-downlink switching period (see 38.211 subclause 7.4.1.6). - When two concatenated TDD-UL-DL-Patterns are configured, and RIM-RS - resources are configured in both TDD patterns, both - dl-UL-SwitchingPeriod1 and dl-UL-SwitchingPeriod2 are configured, - where P2 equals to the transmission periodicity of the second + When two concatenated TDD-UL-DL-Patterns are configured, and RIM-RS + resources are configured in both TDD patterns, both + dl-UL-SwitchingPeriod1 and dl-UL-SwitchingPeriod2 are configured, + where P2 equals to the transmission periodicity of the second TDD-UL-DL-Pattern, and where (P1 + P2) divides 20 ms. - allowedValues: MS0P5, MS0P625, MS1, MS1P25, MS2, MS2P5, MS3, MS4, MS5, + allowedValues: MS0P5, MS0P625, MS1, MS1P25, MS2, MS2P5, MS3, MS4, MS5, MS10 - + P2 is equivalent to T_(per,2)^RIM (see 38.211 subclause 7.4.1.6)"; } @@ -284,14 +284,14 @@ module _3gpp-nr-nrm-rimrsset { range 2..327679 ; } mandatory true; - description "This attribute is used to configure the reference point in - the second uplink-downlink switching period, which is the symbol offset - of the reference point after starting boundary of the second - uplink-downlink switching period. Configured together with + description "This attribute is used to configure the reference point in + the second uplink-downlink switching period, which is the symbol offset + of the reference point after starting boundary of the second + uplink-downlink switching period. Configured together with dl-UL-SwitchingPeriod2 (see 38.211 subclause 7.4.1.6). - When two concatenated TDD-UL-DL-Patterns are configured, and RIM-RS - resources are configured in both TDD patterns, the reference points - configured for second uplink-downlink switching period is the + When two concatenated TDD-UL-DL-Patterns are configured, and RIM-RS + resources are configured in both TDD patterns, the reference points + configured for second uplink-downlink switching period is the DL transmission boundary of the second TDD-UL-DL-Pattern. allowedValues: 2, 3..20*2*maxNrofSymbols-1, where maxNrofSymbols=14"; @@ -302,7 +302,7 @@ module _3gpp-nr-nrm-rimrsset { range 0..4194303 ; } mandatory true; - description "It is the total number of set IDs for RIM RS-1 + description "It is the total number of set IDs for RIM RS-1 (N_setID ^RIM,1) (see 38.211 subclause 7.4.1.6). allowedValues: 0,1...2^22-1"; @@ -313,7 +313,7 @@ module _3gpp-nr-nrm-rimrsset { range 0..4194304 ; } mandatory true; - description "It is the total number of set IDs for RIM RS-2 + description "It is the total number of set IDs for RIM RS-2 (N_setID^RIM,2) (see 38.211 subclause 7.4.1.6). allowedValues: 0,1...2^22"; @@ -324,8 +324,8 @@ module _3gpp-nr-nrm-rimrsset { range 1|2|4|8 ; } mandatory true; - description "It is the number of consecutive uplink-downlink switching - periods for RS-1 (R1) for repetition/near-far indication:. + description "It is the number of consecutive uplink-downlink switching + periods for RS-1 (R1) for repetition/near-far indication:. (see 38.211 subclause 7.4.1.6). allowedValues: 1,2,4,8"; @@ -336,8 +336,8 @@ module _3gpp-nr-nrm-rimrsset { range 1|2|4|8 ; } mandatory true; - description "It is the number of consecutive uplink-downlink switching - periods for RS-2 (R2) for repetition/near-far indication. + description "It is the number of consecutive uplink-downlink switching + periods for RS-2 (R2) for repetition/near-far indication. (see 38.211 subclause 7.4.1.6). allowedValues: 1,2,4,8"; @@ -347,12 +347,12 @@ module _3gpp-nr-nrm-rimrsset { type uint32 { range 2..327679 ; } - description "It is used to configure the OFDM symbol position(s) of RIM - RS-1 within the uplink-downlink switching period. It is a list of symbol - offset of RIM RS-1 (N_symb,ref^(RIM,1)) before the reference point. - The size of the list is nrofConsecutiveRIMRS1 + description "It is used to configure the OFDM symbol position(s) of RIM + RS-1 within the uplink-downlink switching period. It is a list of symbol + offset of RIM RS-1 (N_symb,ref^(RIM,1)) before the reference point. + The size of the list is nrofConsecutiveRIMRS1 (see 38.211 subclause 7.4.1.6). - The resulting RIM RS-1 symbols and its reference point shall belong to + The resulting RIM RS-1 symbols and its reference point shall belong to the same 10ms frame. allowedValues: 2,3..20*2**maxNrofSymbols-1, where maxNrofSymbols=14"; @@ -360,14 +360,14 @@ module _3gpp-nr-nrm-rimrsset { leaf-list consecutiveRIMRS2List { type uint32 { - range 2..327679 ; + range 2..327679 ; } - description "It is used to configure the OFDM symbol position(s) of - RIM RS-2 within the uplink-downlink switching period. It is a list of - symbol offset of RIM RS-2 (N_symb,ref^(RIM,2)) before the reference - point. The size of the list is nrofConsecutiveRIMRS2 + description "It is used to configure the OFDM symbol position(s) of + RIM RS-2 within the uplink-downlink switching period. It is a list of + symbol offset of RIM RS-2 (N_symb,ref^(RIM,2)) before the reference + point. The size of the list is nrofConsecutiveRIMRS2 (see 38.211 subclause 7.4.1.6). - The resulting RIM RS-2 symbols and its reference point shall belong to + The resulting RIM RS-2 symbols and its reference point shall belong to the same 10ms frame. allowedValues: 2,3..20*2**maxNrofSymbols-1, where maxNrofSymbols=14"; @@ -376,104 +376,104 @@ module _3gpp-nr-nrm-rimrsset { leaf enablenearfarIndicationRS1 { type types3gpp:EnabledDisabled; default DISABLED; - description "It is indication of whether near-far functionality is enabled + description "It is indication of whether near-far functionality is enabled for RIM RS1. - If the indication is 'ENABLED', - the first half of nrofConsecutiveRIMRS1 (R1) consecutive uplink-downlink + If the indication is 'ENABLED', + the first half of nrofConsecutiveRIMRS1 (R1) consecutive uplink-downlink switching period is for 'Near' indication with R1/2 repetitions, - the second half of R1 consecutive uplink-downlink switching period is + the second half of R1 consecutive uplink-downlink switching period is for 'Far' indication with R1/2 repetitions."; } leaf enablenearfarIndicationRS2 { type types3gpp:EnabledDisabled; default DISABLED; - description "It is indication of whether near-far functionality is enabled + description "It is indication of whether near-far functionality is enabled for RIM RS2. - If the indication is 'enable', - the first half of nrofConsecutiveRIMRS2 (R2) consecutive uplink-downlink + If the indication is 'enable', + the first half of nrofConsecutiveRIMRS2 (R2) consecutive uplink-downlink switching period is for 'Near' indication with R2/2 repetitions, - the second half of R2 consecutive uplink-downlink switching period is + the second half of R2 consecutive uplink-downlink switching period is for 'Far' indication with R2/2 repetitions."; } - } + } grouping RimRSGlobalGrp { description "Represents the RimRSGlobal IOC."; - + list frequencyDomainPara { key rimRSSubcarrierSpacing; min-elements 1; max-elements 1; - description "Configuration parameters of frequency domain resource to + description "Configuration parameters of frequency domain resource to support RIM RS. "; uses FrequencyDomainParaGrp; } - + list sequenceDomainPara { key nrofRIMRSSequenceCandidatesofRS1; min-elements 1; max-elements 1; - description "Configuration parameters of sequence domain resource to + description "Configuration parameters of sequence domain resource to support RIM RS. "; uses SequenceDomainParaGrp; } - + list timeDomainPara { key dlULSwitchingPeriod1; min-elements 1; max-elements 1; - description "Configuration parameters of time domain resource to + description "Configuration parameters of time domain resource to support RIM RS. "; uses TimeDomainParaGrp; } } - + grouping RimRSSetGrp { description "Represents the RimRSSet IOC."; - + leaf setId { type uint32 { range 0..4194303 ; } mandatory true; - description "This specifies the set ID of a victim Set (RIM-RS1 Set) or - aggressor Set (RIM-RS2 set). (See subclause 7.4.1.6 in TS 38.211). + description "This specifies the set ID of a victim Set (RIM-RS1 Set) or + aggressor Set (RIM-RS2 set). (See subclause 7.4.1.6 in TS 38.211). allowedValues: The bit length of the set ID is maximum 22bit."; } - + leaf setType { type enumeration { enum RS1; enum RS2; } mandatory true; - description "The attribute specifies type of a RIM-RS Set . - RIM RS1 is generated and transmitted by victim to indicate its suffering - remote interference, and RIM RS2 is generated and transmitted by + description "The attribute specifies type of a RIM-RS Set . + RIM RS1 is generated and transmitted by victim to indicate its suffering + remote interference, and RIM RS2 is generated and transmitted by aggressor to measure if Remote Interference still exist If the attribute value is 'RS1', the RIM-RS Set is victim set. If the attribute value is 'RS2', the RIM-RS Set is aggressor set."; } - + leaf-list nRCellDURef { type types3gpp:DistinguishedName; config false; description "This attribute contains the DN of a NR Cell (NRCellDU)"; } } - + augment "/subnet3gpp:SubNetwork" { list RimRSGlobal { - description "Represents global/common Remote Interference Management (RIM) - Reference Signal (RS) resource allocated for the whole network. - Resource for RIM-RS transmission is defined by Sequence domain resource, - Time domain resource and Frequency resource. The configure parameters - of the RIM RS resource are applied to all Sets of RIM RS Resource + description "Represents global/common Remote Interference Management (RIM) + Reference Signal (RS) resource allocated for the whole network. + Resource for RIM-RS transmission is defined by Sequence domain resource, + Time domain resource and Frequency resource. The configure parameters + of the RIM RS resource are applied to all Sets of RIM RS Resource across gNBs/cells in the network."; key id; max-elements 1; @@ -483,11 +483,11 @@ module _3gpp-nr-nrm-rimrsset { } list RimRSSet { - description "Represents aggressor or victim Set organized by OAM. - The RIM RS Resource is assigned to each Set, which is identified by - triple indices set of -