From 1e7e7ea39def9e1b16225045eb4de2acf814719a Mon Sep 17 00:00:00 2001 From: "U-ERICSSON\\ETHBLL" Date: Tue, 16 Apr 2024 17:21:29 +0800 Subject: [PATCH 001/146] 28.624 cr0346 28.541 cd1218 --- yang-models/_3gpp-5gc-nrm-neffunction.yang | 5 +- yang-models/_3gpp-5gc-nrm-nfprofile.yang | 9 +- yang-models/_3gpp-5gc-nrm-nwdaffunction.yang | 354 ++++++++++++++++-- yang-models/_3gpp-common-fm.yang | 7 +- .../_3gpp-common-managed-function.yang | 7 +- ..._3gpp-common-managementdatacollection.yang | 19 +- yang-models/_3gpp-common-measurements.yang | 9 +- yang-models/_3gpp-common-yang-types.yang | 14 +- .../_3gpp-nr-nrm-eutranfreqrelation.yang | 13 +- yang-models/_3gpp-nr-nrm-gnbcucpfunction.yang | 19 +- yang-models/_3gpp-nr-nrm-nrfreqrelation.yang | 17 +- 11 files changed, 392 insertions(+), 81 deletions(-) diff --git a/yang-models/_3gpp-5gc-nrm-neffunction.yang b/yang-models/_3gpp-5gc-nrm-neffunction.yang index f2b6f26f9..12f072aa4 100755 --- a/yang-models/_3gpp-5gc-nrm-neffunction.yang +++ b/yang-models/_3gpp-5gc-nrm-neffunction.yang @@ -17,10 +17,11 @@ module _3gpp-5gc-nrm-neffunction { contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464"; description "This IOC represents the NEF function in 5GC. For more information about the NEF, see 3GPP TS 23.501. - Copyright 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-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 +162,7 @@ module _3gpp-5gc-nrm-neffunction { yext3gpp:notNotifyable; key idx; leaf idx { type uint32 ; } - uses nfp3gpp:TaiRange; + uses nfp3gpp:TaiRangeGrp; } leaf nefId { 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-common-fm.yang b/yang-models/_3gpp-common-fm.yang index 219bb3c0c..b7fa544c1 100755 --- a/yang-models/_3gpp-common-fm.yang +++ b/yang-models/_3gpp-common-fm.yang @@ -12,15 +12,16 @@ 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-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"; } @@ -441,7 +442,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 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..6d9f54ce1 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,9 @@ module _3gpp-common-measurements { Integration Reference Point (IRP); Information Service (IS)"; + 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 +250,7 @@ module _3gpp-common-measurements { leaf administrativeState { default UNLOCKED; - type types3gpp:AdministrativeState ; + type types3gpp:BasicAdministrativeState ; description "Enable or disables production of the metrics"; } @@ -333,7 +334,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-yang-types.yang b/yang-models/_3gpp-common-yang-types.yang index 6a7865341..b80ef6430 100755 --- a/yang-models/_3gpp-common-yang-types.yang +++ b/yang-models/_3gpp-common-yang-types.yang @@ -12,10 +12,11 @@ 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-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 +68,17 @@ module _3gpp-common-yang-types { leaf name { type string; } leaf value { type string; } } + + 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-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..ec2f6db3a 100755 --- a/yang-models/_3gpp-nr-nrm-gnbcucpfunction.yang +++ b/yang-models/_3gpp-nr-nrm-gnbcucpfunction.yang @@ -19,13 +19,14 @@ 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-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 +91,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 +122,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."; } 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"; } } -- GitLab From efc2c4eb8f12d7fdc23ac3855eeb22502d986cbe Mon Sep 17 00:00:00 2001 From: "U-ERICSSON\\ETHBLL" Date: Thu, 18 Apr 2024 02:26:20 +0800 Subject: [PATCH 002/146] corrected gnbdu and operatordu 2 --- yang-models/_3gpp-nr-nrm-gnbdufunction.yang | 5 +++-- yang-models/_3gpp-nr-nrm-operatordu.yang | 25 ++++++++++++++------- 2 files changed, 20 insertions(+), 10 deletions(-) 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-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 -- GitLab From d8efed8592e88ffbe8da66e5c7659f3f45e6b9ed Mon Sep 17 00:00:00 2001 From: scottma Date: Thu, 18 Apr 2024 05:30:54 +0000 Subject: [PATCH 003/146] Update file _3gpp-common-trace.yang --- 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 cd2a69cb7..b2dd6b67d 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,7 @@ module _3gpp-common-trace { Integration Reference Point (IRP); Information Service (IS)" ; + 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 ; } @@ -1303,6 +1304,14 @@ 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 messages to be reported."; + reference "Clause 10 of 3GPP TS 32.422"; + } + leaf traceReportingConsumerUri { when '../traceReportingFormat = "STREAMING"'; type inet:uri; -- GitLab From 6c3b5477bd1bbcb2af10c33383dc0e8e5d6ffea7 Mon Sep 17 00:00:00 2001 From: scottma Date: Thu, 18 Apr 2024 05:50:20 +0000 Subject: [PATCH 004/146] Update file _3gpp-common-trace.yang --- yang-models/_3gpp-common-trace.yang | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/yang-models/_3gpp-common-trace.yang b/yang-models/_3gpp-common-trace.yang index b2dd6b67d..1ccb0a23a 100755 --- a/yang-models/_3gpp-common-trace.yang +++ b/yang-models/_3gpp-common-trace.yang @@ -1285,7 +1285,8 @@ 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."; @@ -1437,7 +1438,8 @@ module _3gpp-common-trace { when '../jobType = "TRACE_ONLY"' + ' or ../jobType = "IMMEDIATE_MDT_AND_TRACE"' + ' or ../jobType = "TRACE_AND_5GC_UE_LEVEL_MEASUREMENTS"' - + ' or ../jobType = "TRACE_AND_IMMEDIATE_MDT_AND_5GC_UE_LEVEL_MEASUREMENTS"'; + + ' or ../jobType = + "TRACE_AND_IMMEDIATE_MDT_AND_5GC_UE_LEVEL_MEASUREMENTS"'; key idx; description "Trace config"; max-elements 1; @@ -1452,7 +1454,8 @@ module _3gpp-common-trace { + ' 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"'; + + ' or ../jobType = + "TRACE_AND_IMMEDIATE_MDT_AND_5GC_UE_LEVEL_MEASUREMENTS"'; key idx; description "MDT config"; max-elements 1; @@ -1464,7 +1467,8 @@ module _3gpp-common-trace { 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"'; + + ' or ../jobType = + "TRACE_AND_IMMEDIATE_MDT_AND_5GC_UE_LEVEL_MEASUREMENTS"'; key idx; description "5GC UE level measurements config"; max-elements 1; @@ -1544,10 +1548,11 @@ module _3gpp-common-trace { 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. + 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 -- GitLab From 0cba192c308885817fb201a76ea3eef95d6d3122 Mon Sep 17 00:00:00 2001 From: scottma Date: Thu, 18 Apr 2024 05:56:36 +0000 Subject: [PATCH 005/146] Update file _3gpp-common-trace.yang --- yang-models/_3gpp-common-trace.yang | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/yang-models/_3gpp-common-trace.yang b/yang-models/_3gpp-common-trace.yang index 1ccb0a23a..767532053 100755 --- a/yang-models/_3gpp-common-trace.yang +++ b/yang-models/_3gpp-common-trace.yang @@ -1546,13 +1546,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 -- GitLab From 40971776f3dc56d5a8cb5cdf9e260bb1e859d761 Mon Sep 17 00:00:00 2001 From: "U-ERICSSON\\ETHBLL" Date: Fri, 3 May 2024 01:08:04 +0200 Subject: [PATCH 006/146] Locally rebased and merged MR1054 --- yang-models/_3gpp-common-fm.yang | 2 ++ yang-models/_3gpp-common-yang-extensions.yang | 26 +++++++++++++++---- 2 files changed, 23 insertions(+), 5 deletions(-) diff --git a/yang-models/_3gpp-common-fm.yang b/yang-models/_3gpp-common-fm.yang index b7fa544c1..c0c1a8d08 100755 --- a/yang-models/_3gpp-common-fm.yang +++ b/yang-models/_3gpp-common-fm.yang @@ -16,6 +16,7 @@ module _3gpp-common-fm { TTA, TTC). All rights reserved."; reference "3GPP TS 28.111"; + 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"; @@ -493,6 +494,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 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 -- GitLab From e57ca17f6d3636153fc3b35783e0519a10695626 Mon Sep 17 00:00:00 2001 From: "U-ERICSSON\\ETHBLL" Date: Fri, 3 May 2024 01:26:36 +0200 Subject: [PATCH 007/146] Locally rebased and merged MR1067 --- yang-models/_3gpp-5gc-nrm-amffunction.yang | 21 +++++++++++++++++- yang-models/_3gpp-5gc-nrm-udmfunction.yang | 22 ++++++++++++++++++- yang-models/_3gpp-nr-nrm-gnbcucpfunction.yang | 20 +++++++++++++++++ 3 files changed, 61 insertions(+), 2 deletions(-) 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-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-nr-nrm-gnbcucpfunction.yang b/yang-models/_3gpp-nr-nrm-gnbcucpfunction.yang index ec2f6db3a..975fced77 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-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; } @@ -154,6 +155,25 @@ 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."; + } } grouping QceIdMappingInfoGrp { -- GitLab From 54aa05670284e9f61c8f070777923a926bbd37f3 Mon Sep 17 00:00:00 2001 From: "U-ERICSSON\\ETHBLL" Date: Mon, 6 May 2024 18:44:37 +0200 Subject: [PATCH 008/146] Added Scheduler and ConditionMonitor --- yang-models/_3gpp-common-measurements.yang | 12 + yang-models/_3gpp-common-util.yang | 218 +++++ yang-models/_3gpp-common-yang-types.yang | 34 + .../external-yams/ietf-inet-types.yang | 746 +++++++++++------- ...s@2013-07-15.yang => ietf-yang-types.yang} | 437 +++++++--- 5 files changed, 1069 insertions(+), 378 deletions(-) create mode 100644 yang-models/_3gpp-common-util.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-common-measurements.yang b/yang-models/_3gpp-common-measurements.yang index 6d9f54ce1..eeba31d79 100755 --- a/yang-models/_3gpp-common-measurements.yang +++ b/yang-models/_3gpp-common-measurements.yang @@ -56,6 +56,7 @@ module _3gpp-common-measurements { Integration Reference Point (IRP); Information Service (IS)"; + revision 2024-05-06 { reference CR-xxxx; } revision 2024-02-24 { reference CR-0346; } revision 2023-11-18 { reference "CR-0299 CR-0305"; } revision 2023-09-18 { reference CR-0271; } @@ -324,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."; + } + } } diff --git a/yang-models/_3gpp-common-util.yang b/yang-models/_3gpp-common-util.yang new file mode 100644 index 000000000..0249a89e6 --- /dev/null +++ b/yang-models/_3gpp-common-util.yang @@ -0,0 +1,218 @@ +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-xxxx; } + + 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). + + The actual syntax and capabilities of condition is SS specific. + However, each SS should support condition consisting of one or several + assertions that may be grouped using the logical operators AND, OR + and NOT. Only if the whole expression of condition evaluates TRUE, + the attribute conditionsSatisfied will be TRUE. + + Each assertion is a pointer to a Boolean parameter or a logical + expression of attribute existence or attribute value comparison + ('equal to X, less than Y' etc.). + + An empty string is not allowed."; + } + + 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-types.yang b/yang-models/_3gpp-common-yang-types.yang index b80ef6430..f43a0fb6a 100755 --- a/yang-models/_3gpp-common-yang-types.yang +++ b/yang-models/_3gpp-common-yang-types.yang @@ -69,6 +69,40 @@ module _3gpp-common-yang-types { 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; 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 2e0cdb1eedb194dcbe42d6e7c796fad1536c9b0e 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 009/146] Update _3gpp-common-files.yang, updating revision number, copyright year and removing "notifyFileDeletion" --- yang-models/_3gpp-common-files.yang | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/yang-models/_3gpp-common-files.yang b/yang-models/_3gpp-common-files.yang index 22e573959..3a43026ef 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) @@ -25,6 +25,7 @@ module _3gpp-common-files { Integration Reference Point (IRP); Information Service (IS)"; + revision 2023-05-11 { reference CR-XXXX ; } revision 2023-09-18 { reference CR-0271 ; } revision 2022-09-28 { reference CR-0191; } @@ -323,4 +324,4 @@ module _3gpp-common-files { } } } -} \ No newline at end of file +} -- GitLab From b050d4f30e21a3da28fa84cdb616bc383e32929d Mon Sep 17 00:00:00 2001 From: lengyelb Date: Mon, 13 May 2024 17:32:36 +0000 Subject: [PATCH 010/146] Revert "Update _3gpp-common-files.yang, updating revision number, copyright year and..." This reverts commit 2e0cdb1eedb194dcbe42d6e7c796fad1536c9b0e --- yang-models/_3gpp-common-files.yang | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/yang-models/_3gpp-common-files.yang b/yang-models/_3gpp-common-files.yang index 3a43026ef..22e573959 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) @@ -25,7 +25,6 @@ module _3gpp-common-files { Integration Reference Point (IRP); Information Service (IS)"; - revision 2023-05-11 { reference CR-XXXX ; } revision 2023-09-18 { reference CR-0271 ; } revision 2022-09-28 { reference CR-0191; } @@ -324,4 +323,4 @@ module _3gpp-common-files { } } } -} +} \ No newline at end of file -- GitLab From 338b5ddcf4bf6370db663fac8e541bda1f492d7b Mon Sep 17 00:00:00 2001 From: "U-ERICSSON\\ETHBLL" Date: Tue, 14 May 2024 03:28:54 +0200 Subject: [PATCH 011/146] Update subscription and trace --- .../_3gpp-common-subscription-control.yang | 57 +- yang-models/_3gpp-common-trace.yang | 617 +++++++++++++----- 2 files changed, 487 insertions(+), 187 deletions(-) diff --git a/yang-models/_3gpp-common-subscription-control.yang b/yang-models/_3gpp-common-subscription-control.yang index ed049c654..9e0cc2209 100755 --- a/yang-models/_3gpp-common-subscription-control.yang +++ b/yang-models/_3gpp-common-subscription-control.yang @@ -26,23 +26,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 +90,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 767532053..2f44d28d2 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-05-06 { reference CR-xxxx; } revision 2024-04-06 { reference "CR-0342"; } revision 2024-01-29 { reference "CR-0316"; } revision 2023-11-06 { reference "CR-0290 CR-0294"; } @@ -249,32 +250,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 @@ -622,6 +613,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 { @@ -703,7 +752,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; @@ -727,7 +776,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; @@ -747,7 +796,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|" @@ -765,7 +814,7 @@ module _3gpp-common-trace { } leaf reportAmount { - when 'jobType = "IMMEDIATE_MDT_ONLY"' + when '../../../jobType = "IMMEDIATE_MDT_ONLY"' + ' and ../reportingTrigger = "PERIODICAL"'; type union { type uint32 { @@ -784,7 +833,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 @@ -794,9 +843,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"; } @@ -808,24 +857,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; @@ -849,9 +883,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"; } @@ -862,9 +896,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"; } @@ -876,9 +941,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 ; } @@ -889,9 +954,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 ; } @@ -902,9 +967,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"; @@ -917,25 +982,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"; @@ -950,8 +999,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; @@ -963,8 +1012,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 @@ -973,8 +1022,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; @@ -991,9 +1040,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 @@ -1020,22 +1279,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"; } @@ -1048,8 +1301,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"; @@ -1063,7 +1316,7 @@ module _3gpp-common-trace { } leaf reportType { - when 'jobType = "IMMEDIATE_MDT_ONLY"'; + when '../../../jobType = "IMMEDIATE_MDT_ONLY"'; type enumeration { enum PERIODICAL; enum EVENT_TRIGGERED; @@ -1073,7 +1326,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 ; @@ -1088,8 +1341,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"; } @@ -1103,8 +1356,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"; } @@ -1117,9 +1370,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; } @@ -1134,7 +1387,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; @@ -1143,8 +1396,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 @@ -1158,8 +1411,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 @@ -1169,6 +1422,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 { @@ -1233,6 +1496,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 { @@ -1293,7 +1578,6 @@ module _3gpp-common-trace { reference "Clause 5.9a of 3GPP TS 32.422 for additional details on the allowed values."; } - list pLMNTarget { key "mcc mnc"; @@ -1305,35 +1589,25 @@ 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 messages 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; @@ -1434,21 +1708,21 @@ 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"' @@ -1456,25 +1730,26 @@ module _3gpp-common-trace { + ' 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; } + 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 -- GitLab From a8268644dee4b2eeb0f5d7f06308a38239bf3f1d Mon Sep 17 00:00:00 2001 From: "U-ERICSSON\\ETHBLL" Date: Mon, 6 May 2024 18:44:37 +0200 Subject: [PATCH 012/146] Added Scheduler and ConditionMonitor --- yang-models/_3gpp-common-measurements.yang | 12 + yang-models/_3gpp-common-util.yang | 218 +++++ yang-models/_3gpp-common-yang-types.yang | 34 + .../external-yams/ietf-inet-types.yang | 746 +++++++++++------- ...s@2013-07-15.yang => ietf-yang-types.yang} | 437 +++++++--- 5 files changed, 1069 insertions(+), 378 deletions(-) create mode 100644 yang-models/_3gpp-common-util.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-common-measurements.yang b/yang-models/_3gpp-common-measurements.yang index 6d9f54ce1..eeba31d79 100755 --- a/yang-models/_3gpp-common-measurements.yang +++ b/yang-models/_3gpp-common-measurements.yang @@ -56,6 +56,7 @@ module _3gpp-common-measurements { Integration Reference Point (IRP); Information Service (IS)"; + revision 2024-05-06 { reference CR-xxxx; } revision 2024-02-24 { reference CR-0346; } revision 2023-11-18 { reference "CR-0299 CR-0305"; } revision 2023-09-18 { reference CR-0271; } @@ -324,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."; + } + } } diff --git a/yang-models/_3gpp-common-util.yang b/yang-models/_3gpp-common-util.yang new file mode 100644 index 000000000..0249a89e6 --- /dev/null +++ b/yang-models/_3gpp-common-util.yang @@ -0,0 +1,218 @@ +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-xxxx; } + + 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). + + The actual syntax and capabilities of condition is SS specific. + However, each SS should support condition consisting of one or several + assertions that may be grouped using the logical operators AND, OR + and NOT. Only if the whole expression of condition evaluates TRUE, + the attribute conditionsSatisfied will be TRUE. + + Each assertion is a pointer to a Boolean parameter or a logical + expression of attribute existence or attribute value comparison + ('equal to X, less than Y' etc.). + + An empty string is not allowed."; + } + + 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-types.yang b/yang-models/_3gpp-common-yang-types.yang index b80ef6430..f43a0fb6a 100755 --- a/yang-models/_3gpp-common-yang-types.yang +++ b/yang-models/_3gpp-common-yang-types.yang @@ -69,6 +69,40 @@ module _3gpp-common-yang-types { 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; 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 3762928758caa4b1cfc7d833a03261a4058ba7a1 Mon Sep 17 00:00:00 2001 From: "U-ERICSSON\\ETHBLL" Date: Tue, 14 May 2024 03:28:54 +0200 Subject: [PATCH 013/146] Update subscription and trace --- .../_3gpp-common-subscription-control.yang | 57 +- yang-models/_3gpp-common-trace.yang | 617 +++++++++++++----- 2 files changed, 487 insertions(+), 187 deletions(-) diff --git a/yang-models/_3gpp-common-subscription-control.yang b/yang-models/_3gpp-common-subscription-control.yang index ed049c654..9e0cc2209 100755 --- a/yang-models/_3gpp-common-subscription-control.yang +++ b/yang-models/_3gpp-common-subscription-control.yang @@ -26,23 +26,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 +90,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 767532053..2f44d28d2 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-05-06 { reference CR-xxxx; } revision 2024-04-06 { reference "CR-0342"; } revision 2024-01-29 { reference "CR-0316"; } revision 2023-11-06 { reference "CR-0290 CR-0294"; } @@ -249,32 +250,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 @@ -622,6 +613,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 { @@ -703,7 +752,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; @@ -727,7 +776,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; @@ -747,7 +796,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|" @@ -765,7 +814,7 @@ module _3gpp-common-trace { } leaf reportAmount { - when 'jobType = "IMMEDIATE_MDT_ONLY"' + when '../../../jobType = "IMMEDIATE_MDT_ONLY"' + ' and ../reportingTrigger = "PERIODICAL"'; type union { type uint32 { @@ -784,7 +833,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 @@ -794,9 +843,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"; } @@ -808,24 +857,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; @@ -849,9 +883,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"; } @@ -862,9 +896,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"; } @@ -876,9 +941,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 ; } @@ -889,9 +954,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 ; } @@ -902,9 +967,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"; @@ -917,25 +982,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"; @@ -950,8 +999,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; @@ -963,8 +1012,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 @@ -973,8 +1022,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; @@ -991,9 +1040,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 @@ -1020,22 +1279,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"; } @@ -1048,8 +1301,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"; @@ -1063,7 +1316,7 @@ module _3gpp-common-trace { } leaf reportType { - when 'jobType = "IMMEDIATE_MDT_ONLY"'; + when '../../../jobType = "IMMEDIATE_MDT_ONLY"'; type enumeration { enum PERIODICAL; enum EVENT_TRIGGERED; @@ -1073,7 +1326,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 ; @@ -1088,8 +1341,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"; } @@ -1103,8 +1356,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"; } @@ -1117,9 +1370,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; } @@ -1134,7 +1387,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; @@ -1143,8 +1396,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 @@ -1158,8 +1411,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 @@ -1169,6 +1422,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 { @@ -1233,6 +1496,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 { @@ -1293,7 +1578,6 @@ module _3gpp-common-trace { reference "Clause 5.9a of 3GPP TS 32.422 for additional details on the allowed values."; } - list pLMNTarget { key "mcc mnc"; @@ -1305,35 +1589,25 @@ 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 messages 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; @@ -1434,21 +1708,21 @@ 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"' @@ -1456,25 +1730,26 @@ module _3gpp-common-trace { + ' 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; } + 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 -- GitLab From 19a19604c9023376e69af13ac495b4f33f912616 Mon Sep 17 00:00:00 2001 From: "U-ERICSSON\\ETHBLL" Date: Tue, 28 May 2024 03:47:37 +0900 Subject: [PATCH 014/146] Added correct revision statements with CR number. --- yang-models/_3gpp-5gc-nrm-neffunction.yang | 25 +++++++++++++++++++ yang-models/_3gpp-5gc-nrm-pcffunction.yang | 9 ++++--- yang-models/_3gpp-common-measurements.yang | 2 +- .../_3gpp-common-subscription-control.yang | 1 + yang-models/_3gpp-common-trace.yang | 12 ++++++--- yang-models/_3gpp-common-util.yang | 13 +++------- yang-models/_3gpp-common-yang-types.yang | 1 + 7 files changed, 45 insertions(+), 18 deletions(-) diff --git a/yang-models/_3gpp-5gc-nrm-neffunction.yang b/yang-models/_3gpp-5gc-nrm-neffunction.yang index 12f072aa4..fec93a992 100755 --- a/yang-models/_3gpp-5gc-nrm-neffunction.yang +++ b/yang-models/_3gpp-5gc-nrm-neffunction.yang @@ -21,6 +21,7 @@ module _3gpp-5gc-nrm-neffunction { TTA, TTC). All rights reserved."; reference "3GPP TS 28.541"; + revision 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 ; } @@ -247,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-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-common-measurements.yang b/yang-models/_3gpp-common-measurements.yang index eeba31d79..e2cf97b8a 100755 --- a/yang-models/_3gpp-common-measurements.yang +++ b/yang-models/_3gpp-common-measurements.yang @@ -56,7 +56,7 @@ module _3gpp-common-measurements { Integration Reference Point (IRP); Information Service (IS)"; - revision 2024-05-06 { reference CR-xxxx; } + 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; } diff --git a/yang-models/_3gpp-common-subscription-control.yang b/yang-models/_3gpp-common-subscription-control.yang index 9e0cc2209..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"; } diff --git a/yang-models/_3gpp-common-trace.yang b/yang-models/_3gpp-common-trace.yang index 2f44d28d2..5e2622027 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-05-06 { reference CR-xxxx; } + 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"; } @@ -1536,9 +1536,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 { diff --git a/yang-models/_3gpp-common-util.yang b/yang-models/_3gpp-common-util.yang index 0249a89e6..6e58aa14f 100644 --- a/yang-models/_3gpp-common-util.yang +++ b/yang-models/_3gpp-common-util.yang @@ -16,7 +16,7 @@ module _3gpp-common-util { TTA, TTC). All rights reserved."; reference "3GPP TS 28.623"; - revision 2024-05-06 { reference CR-xxxx; } + revision 2024-05-06 { reference CR-0359; } feature SchedulerUnderManagedElement { description "Scheduler shall be contained under ManagedElement."; @@ -163,15 +163,8 @@ module _3gpp-common-util { mandatory true; description "Logical expression of one or several condition(s). - The actual syntax and capabilities of condition is SS specific. - However, each SS should support condition consisting of one or several - assertions that may be grouped using the logical operators AND, OR - and NOT. Only if the whole expression of condition evaluates TRUE, - the attribute conditionsSatisfied will be TRUE. - - Each assertion is a pointer to a Boolean parameter or a logical - expression of attribute existence or attribute value comparison - ('equal to X, less than Y' etc.). + A restricted XPath may be used. The definition of the exact syntax + is not ready yet. An empty string is not allowed."; } diff --git a/yang-models/_3gpp-common-yang-types.yang b/yang-models/_3gpp-common-yang-types.yang index f43a0fb6a..3c8b9c7a4 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-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 ; } -- GitLab From 670071feff82291cc613a96e9b929fae568f29cf Mon Sep 17 00:00:00 2001 From: "U-ERICSSON\\ETHBLL" Date: Thu, 30 May 2024 00:27:20 +0900 Subject: [PATCH 015/146] Added CCOFUnction and NTNFunction and related IOCs and datatypes, moved NRTAC type to 5g-common-types --- yang-models/_3gpp-5g-common-yang-types.yang | 17 +- yang-models/_3gpp-5gc-nrm-amfregion.yang | 5 +- yang-models/_3gpp-5gc-nrm-amfset.yang | 2 +- yang-models/_3gpp-5gc-nrm-smffunction.yang | 3 +- yang-models/_3gpp-5gc-nrm-upffunction.yang | 5 +- yang-models/_3gpp-nr-nrm-cco.yang | 210 ++++++++++++ yang-models/_3gpp-nr-nrm-gnbcucpfunction.yang | 6 + yang-models/_3gpp-nr-nrm-gnbcuupfunction.yang | 5 +- yang-models/_3gpp-nr-nrm-nrcelldu.yang | 5 +- .../_3gpp-nr-nrm-nroperatorcelldu.yang | 5 +- yang-models/_3gpp-nr-nrm-ntnfunction.yang | 303 ++++++++++++++++++ 11 files changed, 553 insertions(+), 13 deletions(-) create mode 100644 yang-models/_3gpp-nr-nrm-cco.yang create mode 100644 yang-models/_3gpp-nr-nrm-ntnfunction.yang diff --git a/yang-models/_3gpp-5g-common-yang-types.yang b/yang-models/_3gpp-5g-common-yang-types.yang index 3e1870c6e..012065e2d 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 + [13] 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-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..6550bd36a 100755 --- a/yang-models/_3gpp-5gc-nrm-amfset.yang +++ b/yang-models/_3gpp-5gc-nrm-amfset.yang @@ -44,7 +44,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-smffunction.yang b/yang-models/_3gpp-5gc-nrm-smffunction.yang index 8550fcc3d..68a8c353a 100755 --- a/yang-models/_3gpp-5gc-nrm-smffunction.yang +++ b/yang-models/_3gpp-5gc-nrm-smffunction.yang @@ -17,6 +17,7 @@ module _3gpp-5gc-nrm-smffunction { 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-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-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-gnbcucpfunction.yang b/yang-models/_3gpp-nr-nrm-gnbcucpfunction.yang index 975fced77..7d8eabeec 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-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; } @@ -174,6 +175,11 @@ module _3gpp-nr-nrm-gnbcucpfunction { 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-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-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 -- GitLab From 167a20b7ffba9426bcefeda51836d7d215189b9e Mon Sep 17 00:00:00 2001 From: "U-ERICSSON\\ETHBLL" Date: Thu, 30 May 2024 00:39:11 +0900 Subject: [PATCH 016/146] corrected yang format errors --- yang-models/_3gpp-5g-common-yang-types.yang | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/yang-models/_3gpp-5g-common-yang-types.yang b/yang-models/_3gpp-5g-common-yang-types.yang index 012065e2d..08b8fc721 100755 --- a/yang-models/_3gpp-5g-common-yang-types.yang +++ b/yang-models/_3gpp-5g-common-yang-types.yang @@ -28,12 +28,12 @@ module _3gpp-5g-common-yang-types { for the PLMNs. allowedValues: - a) It is the TAC or Extended-TAC. - b) A cell can only broadcast one TAC or Extended-TAC. See TS 36.300, + a) It is the TAC or Extended-TAC. + b) A cell can only broadcast one TAC or Extended-TAC. See TS 36.300, subclause 10.1.7 (PLMNID and TAC relation). - c) TAC is defined in subclause 19.4.2.3 of 3GPP TS 23.003 - [13] 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."; + 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 { -- GitLab From db6e8993719c754e39086965ca10cdd00c608416 Mon Sep 17 00:00:00 2001 From: "U-ERICSSON\\ETHBLL" Date: Thu, 30 May 2024 01:46:35 +0900 Subject: [PATCH 017/146] corrected revision and copyright --- yang-models/_3gpp-5gc-nrm-amfset.yang | 3 ++- yang-models/_3gpp-5gc-nrm-smffunction.yang | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/yang-models/_3gpp-5gc-nrm-amfset.yang b/yang-models/_3gpp-5gc-nrm-amfset.yang index 6550bd36a..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 ; } diff --git a/yang-models/_3gpp-5gc-nrm-smffunction.yang b/yang-models/_3gpp-5gc-nrm-smffunction.yang index 68a8c353a..ca37a43d4 100755 --- a/yang-models/_3gpp-5gc-nrm-smffunction.yang +++ b/yang-models/_3gpp-5gc-nrm-smffunction.yang @@ -13,7 +13,7 @@ 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"; -- GitLab From 7972b43792e5e75c5759511cdbf7ddb8c63ef6ea Mon Sep 17 00:00:00 2001 From: lengyelb Date: Thu, 16 May 2024 08:49:56 +0000 Subject: [PATCH 018/146] Added missing attribute unreliableAlarmScope and corrected name of corelatedNotifications.notificationIds --- yang-models/_3gpp-common-fm.yang | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/yang-models/_3gpp-common-fm.yang b/yang-models/_3gpp-common-fm.yang index c0c1a8d08..70287588a 100755 --- a/yang-models/_3gpp-common-fm.yang +++ b/yang-models/_3gpp-common-fm.yang @@ -432,7 +432,7 @@ module _3gpp-common-fm { type types3gpp:DistinguishedName; } - leaf-list notificationId { + leaf-list notificationIds { type int32; min-elements 1; } @@ -480,6 +480,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 { -- GitLab From 6662c66b5d2748b40f8c64ed89bb192dd67b0322 Mon Sep 17 00:00:00 2001 From: lengyelb Date: Thu, 16 May 2024 08:56:07 +0000 Subject: [PATCH 019/146] Added dummy revision statement --- yang-models/_3gpp-common-fm.yang | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/yang-models/_3gpp-common-fm.yang b/yang-models/_3gpp-common-fm.yang index 70287588a..95200768f 100755 --- a/yang-models/_3gpp-common-fm.yang +++ b/yang-models/_3gpp-common-fm.yang @@ -16,6 +16,7 @@ module _3gpp-common-fm { TTA, TTC). All rights reserved."; reference "3GPP TS 28.111"; + revision 2024-05-12 { reference CR-0xxx ; } revision 2024-03-06 { reference CR-0333 ; } revision 2024-02-24 { reference CR-0346; } revision 2024-01-18 { @@ -529,4 +530,4 @@ module _3gpp-common-fm { } } -} \ No newline at end of file +} -- GitLab From e2a65e139e3d3aeea4887b542cc8d333a2623bb5 Mon Sep 17 00:00:00 2001 From: lengyelb Date: Wed, 22 May 2024 13:20:21 +0000 Subject: [PATCH 020/146] Update _3gpp-common-fm.yang - updated revision statement --- yang-models/_3gpp-common-fm.yang | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/yang-models/_3gpp-common-fm.yang b/yang-models/_3gpp-common-fm.yang index 95200768f..1d7c76f0b 100755 --- a/yang-models/_3gpp-common-fm.yang +++ b/yang-models/_3gpp-common-fm.yang @@ -16,7 +16,10 @@ module _3gpp-common-fm { TTA, TTC). All rights reserved."; reference "3GPP TS 28.111"; - revision 2024-05-12 { reference CR-0xxx ; } + 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 { -- GitLab From 8648723a61e2456e8daf9db106ad945b992e9a60 Mon Sep 17 00:00:00 2001 From: lengyelb Date: Wed, 22 May 2024 13:25:41 +0000 Subject: [PATCH 021/146] Update _3gpp-common-fm.yang - Added comments to alarmrecord --- yang-models/_3gpp-common-fm.yang | 40 ++++++++++++++++++++++++++++++++ 1 file changed, 40 insertions(+) diff --git a/yang-models/_3gpp-common-fm.yang b/yang-models/_3gpp-common-fm.yang index 1d7c76f0b..223ea0033 100755 --- a/yang-models/_3gpp-common-fm.yang +++ b/yang-models/_3gpp-common-fm.yang @@ -98,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 @@ -351,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 ; -- GitLab From d86766ea30d96c806d7b41086096275d7bb4e822 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 022/146] Update _3gpp-common-files.yang to remove "notifyFileDeletion" notification --- yang-models/_3gpp-common-files.yang | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/yang-models/_3gpp-common-files.yang b/yang-models/_3gpp-common-files.yang index 22e573959..1d1450cbf 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-xxxx ; } 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 +} -- GitLab From dc0a4c5bf3fa49db7c42f89061cbde806e865c0b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jose=20Antonio=20Ordo=C3=B1ez=20Lucena?= Date: Fri, 17 May 2024 07:26:45 +0000 Subject: [PATCH 023/146] Update _3gpp-common-files.yang with the CR number --- 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 1d1450cbf..9317e769f 100644 --- a/yang-models/_3gpp-common-files.yang +++ b/yang-models/_3gpp-common-files.yang @@ -25,7 +25,7 @@ module _3gpp-common-files { Integration Reference Point (IRP); Information Service (IS)"; - revision 2024-05-11 { reference CR-xxxx ; } + revision 2024-05-11 { reference CR-0362 ; } revision 2023-09-18 { reference CR-0271 ; } revision 2022-09-28 { reference CR-0191; } -- GitLab From 107808a6336197761720aaad4340732c38791b49 Mon Sep 17 00:00:00 2001 From: "U-ERICSSON\\ETHBLL" Date: Fri, 7 Jun 2024 17:59:50 +0200 Subject: [PATCH 024/146] locally rebase and commit https://forge.3gpp.org/rep/sa5/MnS/-/merge_requests/1148 --- yang-models/_3gpp-common-trace.yang | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/yang-models/_3gpp-common-trace.yang b/yang-models/_3gpp-common-trace.yang index 5e2622027..af5327945 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-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"; } @@ -1595,6 +1596,14 @@ 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 -- GitLab From d808d3c28f0b0c0096b79f40474d069e77d5f4d3 Mon Sep 17 00:00:00 2001 From: sunse Date: Tue, 9 Apr 2024 12:59:32 +0000 Subject: [PATCH 025/146] 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 119baf4d3674d62f0e341737064c14f79b75bed3 Mon Sep 17 00:00:00 2001 From: ruiyue Date: Sat, 30 Mar 2024 06:52:57 +0000 Subject: [PATCH 026/146] 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 5830c9f7daba5c8d5f43650c80b68ac5e4f43093 Mon Sep 17 00:00:00 2001 From: ruiyue Date: Sat, 30 Mar 2024 07:36:52 +0000 Subject: [PATCH 027/146] 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 1faaf7b473ba8cd1871a660517cc27e66c9ddc74 Mon Sep 17 00:00:00 2001 From: ruiyue Date: Sat, 30 Mar 2024 07:54:40 +0000 Subject: [PATCH 028/146] 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 00ef4c0696b39f790e782a18b9e564b24f87512b Mon Sep 17 00:00:00 2001 From: ruiyue Date: Thu, 18 Apr 2024 01:02:42 +0000 Subject: [PATCH 029/146] 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 17f417fbca869501d129dfaff36f0727a93801a3 Mon Sep 17 00:00:00 2001 From: ruiyue Date: Sat, 30 Mar 2024 08:39:00 +0000 Subject: [PATCH 030/146] 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 cea20722bdd299cdee65d7f7666227154c175d59 Mon Sep 17 00:00:00 2001 From: ruiyue Date: Sat, 30 Mar 2024 08:42:11 +0000 Subject: [PATCH 031/146] 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 07de136ae7a71b4d4cb053ee114ff70c0ac913ce Mon Sep 17 00:00:00 2001 From: ruiyue Date: Sat, 30 Mar 2024 08:49:51 +0000 Subject: [PATCH 032/146] 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 357f20ff7de8a62a8e09c87e6e31d9e68c0bd55c Mon Sep 17 00:00:00 2001 From: ruiyue Date: Mon, 1 Apr 2024 01:04:39 +0000 Subject: [PATCH 033/146] 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 23f101a4d7fc60ed83265570533119e06916408e Mon Sep 17 00:00:00 2001 From: shumim Date: Thu, 25 Apr 2024 05:15:18 +0000 Subject: [PATCH 034/146] 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 7e582c6b56534dd2e622f9cb0154d409704de16f Mon Sep 17 00:00:00 2001 From: Pengxiang Xie Date: Thu, 25 Apr 2024 06:37:58 +0000 Subject: [PATCH 035/146] 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 fd67d2156b6132bf2e1bb9ac887e9c467a60eb89 Mon Sep 17 00:00:00 2001 From: sunse Date: Mon, 1 Apr 2024 14:24:03 +0000 Subject: [PATCH 036/146] 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 adddf3e28828766c1bfd381a95de03dc0fd01a6f Mon Sep 17 00:00:00 2001 From: sunse Date: Sun, 7 Apr 2024 02:04:27 +0000 Subject: [PATCH 037/146] 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 dbe09ec54d800a3a97446ae8d66530bcc833df5e Mon Sep 17 00:00:00 2001 From: sunse Date: Sun, 7 Apr 2024 09:01:01 +0000 Subject: [PATCH 038/146] 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 7fceeca6164106f389ca1294afa9654a0973fa5b Mon Sep 17 00:00:00 2001 From: sunse Date: Sun, 7 Apr 2024 02:00:09 +0000 Subject: [PATCH 039/146] 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 23f118cafc89ff1a9ef71986d4d5fee974fc240a Mon Sep 17 00:00:00 2001 From: shumim Date: Thu, 25 Apr 2024 12:50:30 +0000 Subject: [PATCH 040/146] 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 d4251bf245fc0b8cc879c7d1ab95a196f18b44e6 Mon Sep 17 00:00:00 2001 From: lengyelb Date: Fri, 3 May 2024 08:50:43 +0000 Subject: [PATCH 041/146] 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 ee9c73768b95aa3f0ddd6bdfd8d4c1efd2fc092d Mon Sep 17 00:00:00 2001 From: scottma Date: Fri, 3 May 2024 13:47:01 +0000 Subject: [PATCH 042/146] 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 6e3f057e2d0f1c62b726abddfdd6be9268fa23eb Mon Sep 17 00:00:00 2001 From: shixixi Date: Tue, 14 May 2024 10:30:03 +0000 Subject: [PATCH 043/146] 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 4a98ad1aa3b9718f6696bdc5d19a10c79618a7cb Mon Sep 17 00:00:00 2001 From: shixixi Date: Tue, 14 May 2024 11:44:43 +0000 Subject: [PATCH 044/146] 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 ba92481576779af9006ff5c3196d55a26719cb3a Mon Sep 17 00:00:00 2001 From: sunse Date: Fri, 31 May 2024 01:55:56 +0000 Subject: [PATCH 045/146] 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 0fef08bc101cd60e0a8840ac3ff0b652ab9704c9 Mon Sep 17 00:00:00 2001 From: sunse Date: Fri, 31 May 2024 02:11:07 +0000 Subject: [PATCH 046/146] 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 5dc8ae84b82ef6ed1437da7b1ffdd31cbad45b04 Mon Sep 17 00:00:00 2001 From: sunse Date: Fri, 31 May 2024 02:18:00 +0000 Subject: [PATCH 047/146] 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 ee525dbe3b4cc5ed063a61083ce507ce2191b5dd Mon Sep 17 00:00:00 2001 From: sunse Date: Mon, 13 May 2024 06:03:18 +0000 Subject: [PATCH 048/146] 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 046e8e5aeda311a2ec6c01190eb1bd2b067f6a09 Mon Sep 17 00:00:00 2001 From: ruiyue Date: Fri, 10 May 2024 03:39:24 +0000 Subject: [PATCH 049/146] 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 0698c460da5de6a16d6403c3eaf1f0dedcedc269 Mon Sep 17 00:00:00 2001 From: ruiyue Date: Wed, 15 May 2024 10:02:36 +0000 Subject: [PATCH 050/146] 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 d9f2a8cf24b0001bc6237adac40b973ab3339c00 Mon Sep 17 00:00:00 2001 From: ruiyue Date: Wed, 15 May 2024 10:02:57 +0000 Subject: [PATCH 051/146] 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 a12caec495096a811845da30d0838a56c150eb02 Mon Sep 17 00:00:00 2001 From: ruiyue Date: Fri, 10 May 2024 08:30:20 +0000 Subject: [PATCH 052/146] 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 7f92735e25abecd6daa7d995d57c1dc2a8e77883 Mon Sep 17 00:00:00 2001 From: ruiyue Date: Fri, 31 May 2024 06:31:10 +0000 Subject: [PATCH 053/146] 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 e59570a6dc58da15009d81f2ca0f2fe93cbbb976 Mon Sep 17 00:00:00 2001 From: ruiyue Date: Mon, 3 Jun 2024 00:25:33 +0000 Subject: [PATCH 054/146] 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 a44cb4726be92512c3030a3f52dc84901905f9c0 Mon Sep 17 00:00:00 2001 From: Shitao Li Date: Fri, 17 May 2024 07:03:49 +0000 Subject: [PATCH 055/146] 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 1325e682fdeb1384ac1d6ffeb5d6535f8a6fef49 Mon Sep 17 00:00:00 2001 From: Shitao Li Date: Thu, 30 May 2024 05:57:46 +0000 Subject: [PATCH 056/146] 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 02d61b461337b9915990313a123d3b2676a3c7d2 Mon Sep 17 00:00:00 2001 From: chenxiu Date: Tue, 14 May 2024 09:16:24 +0000 Subject: [PATCH 057/146] 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 d3bc06c37f99bf26aa3d106470429e322e836a61 Mon Sep 17 00:00:00 2001 From: chenxiu Date: Mon, 3 Jun 2024 01:57:36 +0000 Subject: [PATCH 058/146] 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 4ea98af7db0ec6b25cce226109a9cf59eac10a5a Mon Sep 17 00:00:00 2001 From: scottma Date: Mon, 13 May 2024 20:51:02 +0000 Subject: [PATCH 059/146] 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 3c1bd121838465e9f3a85fd3784f742fc379a3fa Mon Sep 17 00:00:00 2001 From: shixixi Date: Thu, 30 May 2024 07:35:55 +0000 Subject: [PATCH 060/146] 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 12572bc1163fd1c81de03b43c08ea59efa0ad06a Mon Sep 17 00:00:00 2001 From: shixixi Date: Mon, 3 Jun 2024 05:09:51 +0000 Subject: [PATCH 061/146] 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 df5338d7fff809cb427cf23aeb66ab11e1b78c39 Mon Sep 17 00:00:00 2001 From: shixixi Date: Tue, 14 May 2024 12:14:00 +0000 Subject: [PATCH 062/146] 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 c3221719bb3360a1a489e92e1cba9736448cb3b8 Mon Sep 17 00:00:00 2001 From: shixixi Date: Wed, 15 May 2024 01:40:37 +0000 Subject: [PATCH 063/146] 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 6b2971d3a16767961440b849609ebc7f486e7dd4 Mon Sep 17 00:00:00 2001 From: shixixi Date: Thu, 30 May 2024 09:28:55 +0000 Subject: [PATCH 064/146] 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 349bc08da62748579180ec977d80a2b0214f4788 Mon Sep 17 00:00:00 2001 From: allwang Date: Fri, 17 May 2024 13:22:03 +0000 Subject: [PATCH 065/146] 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 a63a202c6f22bcb774560b3d47691d86b16d5593 Mon Sep 17 00:00:00 2001 From: swaminathan1 Date: Wed, 15 May 2024 05:20:01 +0000 Subject: [PATCH 066/146] 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 86bdad61fd3fa92c15b87caafc3a730b446b6be8 Mon Sep 17 00:00:00 2001 From: swaminathan1 Date: Fri, 7 Jun 2024 04:13:26 +0000 Subject: [PATCH 067/146] 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 901844abdb7adb6b479852cc3effd2245adc86f7 Mon Sep 17 00:00:00 2001 From: sunse Date: Fri, 7 Jun 2024 04:17:33 +0000 Subject: [PATCH 068/146] 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 eebbf6019d59150930571283822148e52ef0a48a Mon Sep 17 00:00:00 2001 From: rosabolzek Date: Fri, 7 Jun 2024 04:28:20 +0000 Subject: [PATCH 069/146] 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 5ad32d1b142e26428d41650b7b0fe1542ecf8119 Mon Sep 17 00:00:00 2001 From: ayani Date: Fri, 7 Jun 2024 07:44:52 +0000 Subject: [PATCH 070/146] 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 f9c42fba803bfe8d2f6e3978e0cf88b4f05ddbfb Mon Sep 17 00:00:00 2001 From: mcdonnelleo Date: Fri, 7 Jun 2024 08:44:46 +0000 Subject: [PATCH 071/146] 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 9d0748986b6a4bb01e90774856209a4c649a7d30 Mon Sep 17 00:00:00 2001 From: Pengxiang Xie Date: Fri, 7 Jun 2024 10:05:32 +0000 Subject: [PATCH 072/146] 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 3a39cd6c1521dd2c1413eeef4c99de216507f32f Mon Sep 17 00:00:00 2001 From: sunse Date: Fri, 7 Jun 2024 14:58:48 +0000 Subject: [PATCH 073/146] 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 d6f8bd2ac92c3371ea6f52d5be5eed727f64f7a6 Mon Sep 17 00:00:00 2001 From: gautamd Date: Thu, 4 Apr 2024 10:35:38 +0000 Subject: [PATCH 074/146] 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 66bd69727f276878e5f3082c997020315b5438b9 Mon Sep 17 00:00:00 2001 From: gautamd Date: Thu, 4 Apr 2024 11:30:32 +0000 Subject: [PATCH 075/146] 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 cb6232be86992a23ff41ac0ef3ca951a257c5242 Mon Sep 17 00:00:00 2001 From: rosabolzek Date: Tue, 11 Jun 2024 06:20:37 +0000 Subject: [PATCH 076/146] 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 0d128929b421434291a7d974ef6ef5c392e65daa Mon Sep 17 00:00:00 2001 From: sunse Date: Tue, 11 Jun 2024 12:24:38 +0000 Subject: [PATCH 077/146] 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 0ef325a2da0a121dc3fba49751146be266765348 Mon Sep 17 00:00:00 2001 From: sunse Date: Tue, 11 Jun 2024 13:22:54 +0000 Subject: [PATCH 078/146] 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 ae5aa05cf222696f9cb4a18f9aee885324e7063c Mon Sep 17 00:00:00 2001 From: sunse Date: Sun, 23 Jun 2024 03:56:49 +0000 Subject: [PATCH 079/146] 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 fdf40968ff6779a119ae588ce9a1195505d5a2a5 Mon Sep 17 00:00:00 2001 From: sunse Date: Fri, 5 Jul 2024 13:06:18 +0000 Subject: [PATCH 080/146] 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 081/146] 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 082/146] 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 083/146] 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 084/146] 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 085/146] 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 086/146] 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 087/146] 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 088/146] 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 089/146] 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 090/146] 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 091/146] 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 092/146] 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 093/146] 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 094/146] 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 095/146] 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 096/146] 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 097/146] 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 098/146] 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 099/146] 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 100/146] 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 101/146] 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 102/146] 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 103/146] 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 104/146] 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 105/146] 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 106/146] 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 107/146] 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 108/146] 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 109/146] 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 110/146] 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 111/146] 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 112/146] 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 113/146] 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 114/146] 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 115/146] 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 116/146] 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 117/146] 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 118/146] 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 119/146] 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 120/146] 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 121/146] 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 122/146] 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 123/146] 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 124/146] 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 125/146] 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 126/146] 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 127/146] 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 128/146] 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 129/146] 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 130/146] 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 131/146] 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 132/146] 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 133/146] 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 134/146] 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 135/146] 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 136/146] 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 137/146] 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 138/146] 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 139/146] 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 140/146] 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 141/146] 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 142/146] 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 143/146] 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 144/146] 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 145/146] 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 146/146] 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