From 683765c7e5ab201cfb9618993178aaa9226cc4c9 Mon Sep 17 00:00:00 2001 From: Zu Qiang Date: Wed, 3 Apr 2024 13:16:10 +0000 Subject: [PATCH 001/203] 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/203] 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/203] 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/203] 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/203] 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/203] 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/203] 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/203] 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/203] 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/203] 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/203] 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/203] 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/203] 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/203] 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/203] 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/203] 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/203] 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/203] 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/203] 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/203] 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/203] 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/203] 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/203] 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/203] 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/203] 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/203] 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/203] 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/203] 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/203] 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/203] 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/203] 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/203] 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/203] 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/203] 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/203] 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/203] 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/203] 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/203] 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/203] 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/203] 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/203] 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/203] 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/203] 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/203] 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/203] 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/203] 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/203] 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/203] 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/203] 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/203] 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/203] 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/203] 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/203] 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/203] 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/203] 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/203] 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/203] 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/203] 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/203] 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/203] 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/203] 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/203] 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/203] 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/203] 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/203] 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/203] 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/203] 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/203] 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/203] 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/203] 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/203] 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/203] 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/203] 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/203] 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/203] 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/203] 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/203] 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/203] 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/203] 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/203] 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/203] 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/203] 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/203] 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/203] 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/203] 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/203] 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/203] 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/203] 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/203] 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/203] 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/203] 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/203] 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/203] 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/203] 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/203] 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/203] 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/203] 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/203] 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/203] 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/203] 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/203] 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/203] 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/203] 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/203] 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/203] 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/203] 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/203] 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/203] 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/203] 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/203] 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/203] 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/203] 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/203] 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/203] 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/203] 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/203] 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/203] 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/203] 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/203] 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/203] 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/203] 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/203] 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/203] 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/203] 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/203] 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/203] 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/203] 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/203] 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/203] 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/203] 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/203] 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/203] 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/203] 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/203] 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/203] 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/203] 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/203] 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/203] 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/203] 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/203] 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/203] 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/203] 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/203] 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/203] 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/203] 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/203] 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/203] 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/203] 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/203] 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/203] 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/203] 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/203] 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/203] 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/203] 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/203] 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/203] 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/203] 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/203] 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/203] 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/203] 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/203] 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/203] 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/203] 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/203] 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/203] 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/203] 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/203] 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/203] 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/203] 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/203] 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/203] 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/203] 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/203] 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/203] 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/203] 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/203] 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/203] 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/203] 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/203] 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/203] 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/203] 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/203] 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/203] 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/203] 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/203] 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/203] 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/203] 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/203] 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/203] 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/203] 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/203] 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/203] 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/203] 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/203] 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/203] 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/203] 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/203] 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/203] 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/203] 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/203] 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/203] 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/203] 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/203] 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