diff --git a/yang-models/_3gpp-5g-common-yang-types.yang b/yang-models/_3gpp-5g-common-yang-types.yang index 7101b213ce2ab4223a9fc8457f3d47ff96ba58f2..3fa4360215ec927f28cfdeb62e40286af1154487 100755 --- a/yang-models/_3gpp-5g-common-yang-types.yang +++ b/yang-models/_3gpp-5g-common-yang-types.yang @@ -4,6 +4,7 @@ module _3gpp-5g-common-yang-types { prefix "types5g3gpp"; + import ietf-yang-types { prefix yang; } import _3gpp-common-yang-types { prefix types3gpp; } organization "3GPP SA5"; @@ -12,6 +13,7 @@ module _3gpp-5g-common-yang-types { network slicing."; reference "3GPP TS 28.541"; + 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."; } @@ -24,9 +26,8 @@ module _3gpp-5g-common-yang-types { leaf sd { description "Slice Differentiator If not needed, the value can be set to FFFFFF."; - type string{ + type yang:hex-string { length 6; - pattern '[a-fA-F0-9]*'; } reference "3GPP TS 23.003"; } diff --git a/yang-models/_3gpp-5gc-nrm-QFQoSMonitoringControl.yang b/yang-models/_3gpp-5gc-nrm-QFQoSMonitoringControl.yang index a7290eb818034aa64431d8cb86046b6506a004ee..6f3ae35267ae83b1c302fd60c4f11abee0eee6da 100755 --- a/yang-models/_3gpp-5gc-nrm-QFQoSMonitoringControl.yang +++ b/yang-models/_3gpp-5gc-nrm-QFQoSMonitoringControl.yang @@ -9,14 +9,16 @@ module _3gpp-5gc-nrm-QFQoSMonitoringControl { import _3gpp-common-top { prefix top3gpp; } import _3gpp-5g-common-yang-types { prefix types5g3gpp; } - organization "3gpp SA5"; contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464"; + organization "3gpp SA5"; + contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464"; description "This IOC represents the capabilities and properties for control of QoS monitoring per QoS flow per UE for URLLC service defined in 3GPP TS 23.501."; reference "3GPP TS 28.541"; - revision 2020-11-05 { reference CR-0412 ; } + revision 2023-04-26 { reference CR-0916; } + revision 2020-11-08 { reference CR-0412 ; } revision 2020-08-03 { reference "CR-0321"; } revision 2020-04-10 { reference "S5-202101"; } diff --git a/yang-models/_3gpp-5gc-nrm-affunction.yang b/yang-models/_3gpp-5gc-nrm-affunction.yang index a668b8a3a595aff54725be35d7c8ef3158f27cbd..c40025f72d5a4274852b582a6382d4018086b506 100755 --- a/yang-models/_3gpp-5gc-nrm-affunction.yang +++ b/yang-models/_3gpp-5gc-nrm-affunction.yang @@ -9,16 +9,15 @@ module _3gpp-5gc-nrm-affunction { import _3gpp-common-top { prefix top3gpp; } organization "3gpp SA5"; + contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464"; description "This IOC is defined only to describe the IOCs representing its interaction interface with 5GC (i.e. EP_Rx and EP_N5). It has no attributes defined."; reference "3GPP TS 28.541"; + revision 2023-04-26 { reference CR-0916; } revision 2019-10-28 { reference S5-193518 ; } - - revision 2019-05-15 { - description "initial revision"; - } + revision 2019-05-15 {reference "initial revision"; } grouping AFFunctionGrp { uses mf3gpp:ManagedFunctionGrp; @@ -33,6 +32,7 @@ module _3gpp-5gc-nrm-affunction { container attributes { uses AFFunctionGrp; } + uses mf3gpp:ManagedFunctionContainedClasses; } } } \ No newline at end of file diff --git a/yang-models/_3gpp-5gc-nrm-externalseppfunction.yang b/yang-models/_3gpp-5gc-nrm-externalseppfunction.yang index 38496aaaae2394b2bbebc945d4b924efb5d2dc2c..b7080fc3ae96f67b03afc3a5cbc253a85fae21cf 100755 --- a/yang-models/_3gpp-5gc-nrm-externalseppfunction.yang +++ b/yang-models/_3gpp-5gc-nrm-externalseppfunction.yang @@ -11,34 +11,33 @@ module _3gpp-5gc-nrm-externalseppfunction { import ietf-inet-types { prefix inet; } organization "3gpp SA5"; - description "This IOC represents the external SEPP function which support message filtering - and policing on inter-PLMN control plane interface. For more information about the SEPP, see 3GPP TS 23.501."; + contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464"; + description "This IOC represents the external SEPP function which support + message filtering and policing on inter-PLMN control plane interface. + For more information about the SEPP, see 3GPP TS 23.501."; reference "3GPP TS 28.541"; - revision 2019-11-17 { - description "initial revision"; - reference "Based on - 3GPP TS 28.541 V16.X.XX"; - } + revision 2023-04-26 { reference CR-0916; } + revision 2019-11-17 {reference "initial revision"; } grouping ExternalSEPPFunctionGrp { uses mf3gpp:ManagedFunctionGrp; container pLMNId { description "PLMN Identifiers of the sepp. - The PLMN Identifier is composed of a Mobile Country Code (MCC) and a Mobile Network Code (MNC)."; + The PLMN Identifier is composed of a Mobile Country Code (MCC) and a + Mobile Network Code (MNC)."; uses types3gpp:PLMNId; } - leaf sEPPId { + leaf sEPPId { type uint16; } - leaf fqdn { + leaf fqdn { description "The domain name of the SEPP."; type inet:domain-name; } - } augment "/me3gpp:ManagedElement" { @@ -50,6 +49,7 @@ module _3gpp-5gc-nrm-externalseppfunction { container attributes { uses ExternalSEPPFunctionGrp; } + uses mf3gpp:ManagedFunctionContainedClasses; } } } \ No newline at end of file diff --git a/yang-models/_3gpp-5gc-nrm-neffunction.yang b/yang-models/_3gpp-5gc-nrm-neffunction.yang index cdbf93c49d59ec94470aaf772046099996ea3172..2509f23b9cb943129280b23c7cd8690b443f8791 100755 --- a/yang-models/_3gpp-5gc-nrm-neffunction.yang +++ b/yang-models/_3gpp-5gc-nrm-neffunction.yang @@ -16,6 +16,7 @@ module _3gpp-5gc-nrm-neffunction { information about the NEF, see 3GPP TS 23.501."; reference "3GPP TS 28.541"; + revision 2023-04-26 { reference CR-0916; } revision 2022-01-07 { reference CR-0643; } revision 2020-11-06 { reference CR-0412 ; } revision 2019-10-20 { reference "initial revision"; } @@ -60,6 +61,7 @@ module _3gpp-5gc-nrm-neffunction { container attributes { uses NEFFunctionGrp; } + uses mf3gpp:ManagedFunctionContainedClasses; } } } \ No newline at end of file diff --git a/yang-models/_3gpp-5gc-nrm-nrffunction.yang b/yang-models/_3gpp-5gc-nrm-nrffunction.yang index 62e0ca74cce7cc84a2d1beea319c9eae958366e3..8da30c339ec7fb8b17b20d3fcfa6442e29cae426 100755 --- a/yang-models/_3gpp-5gc-nrm-nrffunction.yang +++ b/yang-models/_3gpp-5gc-nrm-nrffunction.yang @@ -18,7 +18,8 @@ module _3gpp-5gc-nrm-nrffunction { For more information about the NRF, see 3GPP TS 23.501 [2]."; reference "3GPP TS 28.541"; - revision 2020-11-05 { reference CR-0412 ; } + revision 2023-04-26 { reference CR-0916; } + revision 2020-11-08 { reference CR-0412 ; } revision 2020-08-03 { reference "CR-0321"; } revision 2019-10-28 { reference S5-193518 ; } revision 2019-05-15 { reference "initial revision"; } diff --git a/yang-models/_3gpp-5gc-nrm-nssffunction.yang b/yang-models/_3gpp-5gc-nrm-nssffunction.yang index b68d988ecf5de2be280cbcbebf06f2f424e30c1f..3a65b82725180d10ac7293399cf1d8c77e5077a6 100755 --- a/yang-models/_3gpp-5gc-nrm-nssffunction.yang +++ b/yang-models/_3gpp-5gc-nrm-nssffunction.yang @@ -17,7 +17,8 @@ module _3gpp-5gc-nrm-nssffunction { information about the NSSF, see 3GPP TS 23.501."; reference "3GPP TS 28.541"; - revision 2020-11-05 { reference CR-0412 ; } + revision 2023-04-26 { reference CR-0916; } + revision 2020-11-08 { reference CR-0412 ; } revision 2020-08-03 { reference "CR-0321"; } revision 2019-10-25 { reference "S5-194457 S5-195427 S5-193518"; } revision 2019-05-15 { reference "initial revision"; } @@ -68,6 +69,7 @@ module _3gpp-5gc-nrm-nssffunction { key idx; min-elements 1; max-elements 1; + description "Profile definition of a Managed NF (See TS 23.501)"; uses types3gpp:ManagedNFProfile; } } diff --git a/yang-models/_3gpp-5gc-nrm-nwdaffunction.yang b/yang-models/_3gpp-5gc-nrm-nwdaffunction.yang index bf143ba350e6b91599f8f3fd8d7ad39a732049ee..41fae36b7fba218b0af9e31ad90cd51038b230e2 100755 --- a/yang-models/_3gpp-5gc-nrm-nwdaffunction.yang +++ b/yang-models/_3gpp-5gc-nrm-nwdaffunction.yang @@ -13,10 +13,12 @@ module _3gpp-5gc-nrm-nwdaffunction { 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."; + description "This IOC represents the NWDAF function in 5GC. For more + information about the NWDAF, see 3GPP TS 23.501."; reference "3GPP TS 28.541"; - revision 2020-11-05 { reference CR-0412 ; } + revision 2023-04-26 { reference CR-0916; } + revision 2020-11-08 { reference CR-0412 ; } revision 2019-10-25 { reference "S5-194457 S5-195427 S5-193518"; } revision 2019-05-15 {reference "initial revision"; } @@ -58,6 +60,7 @@ module _3gpp-5gc-nrm-nwdaffunction { key idx; min-elements 1; max-elements 1; + description "Profile definition of a Managed NF (See TS 23.501)"; uses types3gpp:ManagedNFProfile; } diff --git a/yang-models/_3gpp-5gc-nrm-pcffunction.yang b/yang-models/_3gpp-5gc-nrm-pcffunction.yang index a7f9bd152503fd84b45d5709f5744f13c3608871..ed91be05211660427c104f1401d9f05f01e1eae9 100755 --- a/yang-models/_3gpp-5gc-nrm-pcffunction.yang +++ b/yang-models/_3gpp-5gc-nrm-pcffunction.yang @@ -17,7 +17,8 @@ module _3gpp-5gc-nrm-pcffunction { information about the PCF, see 3GPP TS 23.501."; reference "3GPP TS 28.541"; - revision 2020-11-05 { reference CR-0412 ; } + revision 2023-04-26 { reference CR-0916; } + revision 2020-11-08 { reference CR-0412 ; } revision 2020-08-06 { reference "CR-0333"; } revision 2020-08-06 { reference "CR-0331"; } revision 2019-10-25 { reference "S5-194457 S5-193518"; } @@ -60,6 +61,7 @@ module _3gpp-5gc-nrm-pcffunction { key idx; min-elements 1; max-elements 1; + description "Profile definition of a Managed NF (See TS 23.501)"; uses types3gpp:ManagedNFProfile; } list commModelList { diff --git a/yang-models/_3gpp-5gc-nrm-predefinedpccruleset.yang b/yang-models/_3gpp-5gc-nrm-predefinedpccruleset.yang index ac3faf5c6a071aea4f808a82edb886b6b2a1a643..04ff3a0b6d1ff675e48119e416493aa94dd1b300 100755 --- a/yang-models/_3gpp-5gc-nrm-predefinedpccruleset.yang +++ b/yang-models/_3gpp-5gc-nrm-predefinedpccruleset.yang @@ -16,7 +16,8 @@ module _3gpp-5gc-nrm-predefinedpccruleset { configured to SMF and referenced by PCF."; reference "3GPP TS 28.541"; - revision 2020-09-30 { reference "CR-0393"; } + revision 2023-04-26 { reference CR-0916; } + revision 2020-10-04 { reference "CR-0393"; } revision 2020-08-21 { reference "CR-0330"; } grouping TscaiInputContainer { @@ -281,7 +282,6 @@ module _3gpp-5gc-nrm-predefinedpccruleset { } leaf trafficSteeringPolIdUl { type string; - mandatory false; description "It references to a pre-configured traffic steering policy for uplink traffic at the SMF, see TS 29.512"; } @@ -562,7 +562,6 @@ module _3gpp-5gc-nrm-predefinedpccruleset { leaf isAppRelocatable { type boolean; default false; - mandatory false; description "It indicates the application relocation possibility, the default value is NO_INFORMATION."; } diff --git a/yang-models/_3gpp-5gc-nrm-scpfunction.yang b/yang-models/_3gpp-5gc-nrm-scpfunction.yang index d4a129194dae6546b4f1ba7c572c67febe7f7cce..aecd4a48c28cdda62b79d8f0b8c3e49b7edd2057 100755 --- a/yang-models/_3gpp-5gc-nrm-scpfunction.yang +++ b/yang-models/_3gpp-5gc-nrm-scpfunction.yang @@ -11,14 +11,13 @@ module _3gpp-5gc-nrm-scpfunction { import _3gpp-common-top { prefix top3gpp; } organization "3gpp SA5"; - description "This IOC represents the SCP function in 5GC. For more information about the SCP, see 3GPP TS 23.501."; + contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464"; + description "This IOC represents the SCP function in 5GC. For more + information about the SCP, see 3GPP TS 23.501."; reference "3GPP TS 28.541"; - revision 2019-10-20 { - description "initial revision"; - reference "Based on - 3GPP TS 28.541"; - } + revision 2023-04-26 { reference CR-0916; } + revision 2019-10-24 { reference "initial revision"; } grouping SCPFunctionGrp { uses mf3gpp:ManagedFunctionGrp; @@ -27,12 +26,14 @@ module _3gpp-5gc-nrm-scpfunction { description "The host address of the SCP."; type inet:host; } - + list supportedFuncList { min-elements 1; key "function"; + description "This parameter lists functionalities supported by a SCP. + Refer to TS 23.501 "; uses types5g3gpp:SupportedFunc; - } + } } @@ -45,6 +46,7 @@ module _3gpp-5gc-nrm-scpfunction { container attributes { uses SCPFunctionGrp; } + uses mf3gpp:ManagedFunctionContainedClasses; } } } \ No newline at end of file diff --git a/yang-models/_3gpp-5gc-nrm-smffunction.yang b/yang-models/_3gpp-5gc-nrm-smffunction.yang index 04659fb7177c0faa018a10b85ac6eea4b630428c..93d224ffb9188b59ef1d1af89b70bea902443720 100755 --- a/yang-models/_3gpp-5gc-nrm-smffunction.yang +++ b/yang-models/_3gpp-5gc-nrm-smffunction.yang @@ -13,8 +13,10 @@ 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."; + reference "3GPP TS 28.541"; - revision 2020-11-05 { reference CR-0412 ; } + revision 2023-04-26 { reference CR-0916; } + revision 2020-11-08 { reference CR-0412 ; } revision 2020-08-06 { reference "CR-0333"; } revision 2020-06-03 { reference "CR-0286"; } revision 2019-10-25 { reference "S5-194457 S5-193518"; } @@ -62,6 +64,7 @@ module _3gpp-5gc-nrm-smffunction { key idx; min-elements 1; max-elements 1; + description "Profile definition of a Managed NF (See TS 23.501)"; uses types3gpp:ManagedNFProfile; } diff --git a/yang-models/_3gpp-5gc-nrm-udmfunction.yang b/yang-models/_3gpp-5gc-nrm-udmfunction.yang index 74965272afb49cd82bef6c063cd0815e141fc157..9bf8971d3f8ac0c332b6a3df15bb5d047dd06edc 100755 --- a/yang-models/_3gpp-5gc-nrm-udmfunction.yang +++ b/yang-models/_3gpp-5gc-nrm-udmfunction.yang @@ -17,7 +17,8 @@ module _3gpp-5gc-nrm-udmfunction { information about the UDM, see 3GPP TS 23.501."; reference "3GPP TS 28.541"; - revision 2020-11-05 { reference CR-0412 ; } + revision 2023-04-26 { reference CR-0916; } + revision 2020-11-08 { reference CR-0412 ; } revision 2019-10-25 { reference "S5-194457 S5-195427 S5-193518"; } revision 2019-05-22 { reference "initial revision";} @@ -58,6 +59,7 @@ module _3gpp-5gc-nrm-udmfunction { key idx; min-elements 1; max-elements 1; + description "Profile definition of a Managed NF (See TS 23.501)"; uses types3gpp:ManagedNFProfile; } diff --git a/yang-models/_3gpp-5gc-nrm-udrfunction.yang b/yang-models/_3gpp-5gc-nrm-udrfunction.yang index 5eabaac8b2eafee0b8dbfb53a595821b2dd990ff..4815c6e29e5704b803734c1f6f4d47fbc4016281 100755 --- a/yang-models/_3gpp-5gc-nrm-udrfunction.yang +++ b/yang-models/_3gpp-5gc-nrm-udrfunction.yang @@ -17,7 +17,8 @@ module _3gpp-5gc-nrm-udrfunction { about the UDR, see 3GPP TS 23.501."; reference "3GPP TS 28.541"; - revision 2020-11-05 { reference CR-0412 ; } + revision 2023-04-26 { reference CR-0916; } + revision 2020-11-08 { reference CR-0412 ; } revision 2019-10-25 { reference "S5-194457 S5-195427 S5-193518"; } revision 2019-05-22 {reference "initial revision"; } @@ -59,6 +60,7 @@ module _3gpp-5gc-nrm-udrfunction { key idx; min-elements 1; max-elements 1; + description "Profile definition of a Managed NF (See TS 23.501)"; uses types3gpp:ManagedNFProfile; } } diff --git a/yang-models/_3gpp-5gc-nrm-udsffunction.yang b/yang-models/_3gpp-5gc-nrm-udsffunction.yang index c0ef6f2176a74924cbc62eba684453c4a6cd239c..533c1097970cbeb25b322176f15f75f293418921 100755 --- a/yang-models/_3gpp-5gc-nrm-udsffunction.yang +++ b/yang-models/_3gpp-5gc-nrm-udsffunction.yang @@ -17,7 +17,8 @@ module _3gpp-5gc-nrm-udsffunction { with any other 5GC NF defined in 3GPP TS 23.501."; reference "3GPP TS 28.541"; - revision 2020-11-05 { reference CR-0412 ; } + revision 2023-04-26 { reference CR-0916; } + revision 2020-11-08 { reference CR-0412 ; } revision 2019-10-25 { reference "S5-194457 S5-195427 S5-193518"; } revision 2019-05-22 { reference "initial revision"; } diff --git a/yang-models/_3gpp-5gc-nrm-upffunction.yang b/yang-models/_3gpp-5gc-nrm-upffunction.yang index 1443942e5bcdc28914c0404296b2736dad2f2505..cdb1487d46534b40fe5d11a853fb329ffef6d800 100755 --- a/yang-models/_3gpp-5gc-nrm-upffunction.yang +++ b/yang-models/_3gpp-5gc-nrm-upffunction.yang @@ -14,7 +14,8 @@ module _3gpp-5gc-nrm-upffunction { description "UPFFunction derived from basic ManagedFunction."; reference "3GPP TS 28.541 5G Network Resource Model (NRM)"; - revision 2020-11-05 { reference CR-0412 ; } + revision 2023-04-26 { reference CR-0916; } + revision 2020-11-08 { reference CR-0412 ; } revision 2019-10-25 { reference "S5-194457 S5-193518"; } revision 2019-05-31 { reference "Ericsson refactoring."; } revision 2018-08-07 { reference "Initial revision"; } @@ -54,7 +55,7 @@ module _3gpp-5gc-nrm-upffunction { key idx; min-elements 1; max-elements 1; - reference "3GPP TS 23.003"; + description "Profile definition of a Managed NF (See TS 23.501)"; uses types3gpp:ManagedNFProfile; } diff --git a/yang-models/_3gpp-common-fm.yang b/yang-models/_3gpp-common-fm.yang index 6f7eec49eaf5e44bc4a818ea169a4db9c77856e0..4b2e137042eb853ae6021332ce3e8ffa163fde34 100755 --- a/yang-models/_3gpp-common-fm.yang +++ b/yang-models/_3gpp-common-fm.yang @@ -23,14 +23,18 @@ module _3gpp-common-fm { Integration Reference Point (IRP); Information Service (IS)"; + revision 2023-05-10 { reference CR-0250; } revision 2022-10-24 { reference CR-0196; } revision 2021-08-08 { reference "CR-0132"; } revision 2021-06-02 { reference "CR-0130"; } revision 2020-06-03 { reference "CR-0091"; } - revision 2020-02-24 { - reference "S5-201365"; - } + revision 2020-02-24 { reference "S5-201365"; } + feature AcknowledgeByConsumer { + description "Indicates whether alarm acknowledgement by the consumer is + supported."; + } + typedef eventType { type enumeration { enum COMMUNICATIONS_ALARM { @@ -61,7 +65,7 @@ module _3gpp-common-fm { value 8; } - enum PHYSICAL_VIOLATIONu { + enum PHYSICAL_VIOLATION { value 9; } @@ -87,8 +91,7 @@ module _3gpp-common-fm { enum CLEARED { value 8; } } - description "The possible alarm serverities. - Aligned with ERICSSON-ALARM-MIB."; + description "The possible alarm severities"; } grouping AlarmRecordGrp { @@ -105,266 +108,330 @@ module _3gpp-common-fm { a) perceivedSeverity is not CLEARED, or whose b) perceivedSeverity is CLEARED and its ackState is not ACKNOWLEDED."; - leaf alarmId { - type string; - mandatory true; - description "Identifies the alarmRecord"; - yext3gpp:notNotifyable; - } + leaf alarmId { + type string; + mandatory true; + description "Identifies the alarmRecord"; + yext3gpp:notNotifyable; + } - leaf objectInstance { - type string; - config false ; - mandatory true; - yext3gpp:notNotifyable; - } + leaf objectInstance { + type types3gpp:DistinguishedName; + config false ; + mandatory true; + yext3gpp:notNotifyable; + } - leaf notificationId { - type int32; - config false ; - mandatory true; - yext3gpp:notNotifyable; - } + leaf notificationId { + type int32; + config false ; + mandatory true; + description "The Id of the last notification updating the AlarmRecord."; + yext3gpp:notNotifyable; + } - leaf alarmRaisedTime { - type yang:date-and-time ; - config false ; - yext3gpp:notNotifyable; - } + leaf alarmRaisedTime { + type yang:date-and-time ; + mandatory true; + config false ; + yext3gpp:notNotifyable; + } - leaf alarmChangedTime { - type yang:date-and-time ; - config false ; - description "not applicable if related alarm has not changed"; - yext3gpp:notNotifyable; - } + leaf alarmChangedTime { + type yang:date-and-time ; + config false ; + description "not applicable if related alarm has not changed"; + yext3gpp:notNotifyable; + } - leaf alarmClearedTime { - type yang:date-and-time ; - config false ; - description "not applicable if related alarm was not cleared"; - yext3gpp:notNotifyable; - } + leaf alarmClearedTime { + type yang:date-and-time ; + config false ; + description "not applicable if related alarm was not cleared"; + yext3gpp:notNotifyable; + } - leaf alarmType { - type eventType; - config false ; - description "General category for the alarm."; - yext3gpp:notNotifyable; - } + leaf alarmType { + type eventType; + config false ; + mandatory true; + description "General category for the alarm."; + yext3gpp:notNotifyable; + } - leaf probableCause { + leaf probableCause { + type union { + type int32; type string; - config false ; - yext3gpp:notNotifyable; } + config false ; + mandatory true; + yext3gpp:notNotifyable; + } - leaf specificProblem { + leaf specificProblem { + type union { + type int32; type string; - config false ; - reference "ITU-T Recommendation X.733 clause 8.1.2.2."; - yext3gpp:notNotifyable; } + config false ; + reference "ITU-T Recommendation X.733 clause 8.1.2.2."; + yext3gpp:notNotifyable; + } - leaf perceivedSeverity { - type severity-level; - description "This is Writable only if producer supports consumer - to set perceivedSeverity to CLEARED"; - yext3gpp:notNotifyable; - } + leaf perceivedSeverity { + type severity-level; + mandatory true; + description "This is Writable only if producer supports consumer + to set perceivedSeverity to CLEARED"; + yext3gpp:notNotifyable; + } - leaf backedUpStatus { - type string; - config false ; - description "Indicates if an object (the MonitoredEntity) has a back - up. See definition in ITU-T Recommendation X.733 clause 8.1.2.4."; - yext3gpp:notNotifyable; - } + leaf backedUpStatus { + type boolean; + config false ; + description "Indicates if an object (the MonitoredEntity) has a back + up. See definition in ITU-T Recommendation X.733 clause 8.1.2.4."; + yext3gpp:notNotifyable; + } - leaf backUpObject { - type string; - config false ; - yext3gpp:notNotifyable; - } + leaf backUpObject { + type types3gpp:DistinguishedName; + config false ; + description "Backup object of the alarmed object as defined in + ITU-T Rec. X. 733"; + yext3gpp:notNotifyable; + } - leaf trendIndication { - type string; - config false ; - description "Indicates if some observed condition is getting better, - worse, or not changing. "; - reference "ITU-T Recommendation X.733 clause 8.1.2.6."; - yext3gpp:notNotifyable; + leaf trendIndication { + type enumeration { + enum MORE_SEVERE; + enum NO_CHANGE; + enum LESS_SEVERE; } + config false ; + description "Indicates if some observed condition is getting better, + worse, or not changing. "; + reference "ITU-T Recommendation X.733 clause 8.1.2.6."; + yext3gpp:notNotifyable; + } - grouping ThresholdPackGrp { - leaf thresholdLevel { - type string; - } - leaf thresholdValue { - type string; - } - leaf hysteresis { - type string; - description "The hysteresis has a threshold high and a threshold - low value that are different from the threshold value. - A hysteresis, therefore, defines the threshold-high and - threshold-low levels within which the measurementType value is - allowed to oscillate without triggering the threshold crossing - notification."; - } + grouping ThresholdInfoGrp { + leaf measurementType { + type string; + mandatory true; } - grouping ThresholdInfoGrp { - leaf measurementType { - type string; - mandatory true; - } - - leaf direction { - type enumeration { - enum INCREASING; - enum DECREASING; - } - mandatory true; - description " - If it is 'Increasing', the threshold crossing notification is - triggered when the measurement value equals or exceeds a - thresholdValue. - - If it is 'Decreasing', the threshold crossing notification is - triggered when the measurement value equals or below a - thresholdValue."; + leaf direction { + type enumeration { + enum INCREASING; + enum DECREASING; } + mandatory true; + description " + If it is 'Increasing', the threshold crossing notification is + triggered when the measurement value equals or exceeds a + thresholdValue. - uses ThresholdPackGrp; - } - - list thresholdInfo { - config false ; - yext3gpp:notNotifyable; - uses ThresholdInfoGrp; + If it is 'Decreasing', the threshold crossing notification is + triggered when the measurement value equals or below a + thresholdValue."; } - leaf stateChangeDefinition { + leaf thresholdLevel { type string; - config false ; - description "Indicates MO attribute value changes. See definition - in ITU-T Recommendation X.733 clause 8.1.2.11."; - yext3gpp:notNotifyable; } - - leaf monitoredAttributes { + + leaf thresholdValue { type string; - config false ; - description "Indicates MO attributes whose value changes are being - monitored."; - reference "ITU-T Recommendation X.733 clause 8.1.2.11."; - yext3gpp:notNotifyable; } - - leaf proposedRepairActions { + + leaf hysteresis { type string; - config false ; - description "Indicates proposed repair actions. See definition in - ITU-T Recommendation X.733 clause 8.1.2.12."; - yext3gpp:notNotifyable; + description "The hysteresis has a threshold high and a threshold + low value that are different from the threshold value. + A hysteresis, therefore, defines the threshold-high and + threshold-low levels within which the measurementType value is + allowed to oscillate without triggering the threshold crossing + notification."; } + } - leaf additionalText { + list thresholdInfo { + config false ; + yext3gpp:notNotifyable; + description "Indicates the crossed threshold"; + uses ThresholdInfoGrp; + } + + list stateChangeDefinition { + key attributeName; + config false ; + description "Indicates MO attribute value changes associated with the + alarm for state attributes of the monitored entity (state transitions). + The change is reported with the name of the state attribute, the new + value and an optional old value. + See definition in ITU-T Recommendation X.733 [4] clause 8.1.2.10."; + yext3gpp:notNotifyable; + + leaf attributeName { type string; - config false ; - yext3gpp:notNotifyable; } - - anydata additionalInformation { - config false ; - yext3gpp:notNotifyable; + + anydata newValue { + mandatory true; + description "The new value of the attribute. The content of this data + node shall be in accordance with the data model for the attribute."; } - - leaf rootCauseIndicator { - type enumeration { - enum YES; - enum NO; - } - config false ; - description "It indicates that this AlarmInformation is the root cause - of the events captured by the notifications whose identifiers are in - the related CorrelatedNotification instances."; - yext3gpp:notNotifyable; + + anydata oldValue{ + description "The old value of the attribute. The content of this data + node shall be in accordance with the data model for the attribute."; } + } - leaf ackTime { - type yang:date-and-time ; - config false ; - description "It identifies the time when the alarm has been - acknowledged or unacknowledged the last time, i.e. it registers the - time when ackState changes."; - yext3gpp:notNotifyable; - } + list monitoredAttributes { + key attributeName; + config false ; + yext3gpp:notNotifyable; + description "Attributes of the monitored entity and their + values at the time the alarm occurred that are of interest for the + alarm report."; + reference "ITU-T Recommendation X.733 clause 8.1.2.11."; - leaf ackUserId { + leaf attributeName { type string; - description "It identifies the last user who has changed the - Acknowledgement State."; - yext3gpp:notNotifyable; } - - leaf ackSystemId { - type string; - description "It identifies the system (Management System) that last - changed the ackState of an alarm, i.e. acknowledged or unacknowledged - the alarm."; - yext3gpp:notNotifyable; + + anydata value { + mandatory true; + description "The value of the attribute. The content of this data + node shall be in accordance with the data model for the attribute."; } + } - leaf ackState { - type enumeration { - enum ACKNOWLEDGED { - description "The alarm has been acknowledged."; - } - enum UNACKNOWLEDGED { - description "The alarm has unacknowledged or the alarm has never - been acknowledged."; - } + leaf proposedRepairActions { + type string; + config false ; + description "Indicates proposed repair actions. See definition in + ITU-T Recommendation X.733 clause 8.1.2.12."; + yext3gpp:notNotifyable; + } + + leaf additionalText { + type string; + config false ; + yext3gpp:notNotifyable; + } + + list additionalInformation { + key name; + config false ; + yext3gpp:notNotifyable; + description "Vendor specific alarm information in the alarm."; + uses types3gpp:nameValuePair; + } + + leaf rootCauseIndicator { + type boolean; + default false; + config false ; + description "It indicates that this AlarmInformation is the root cause + of the events captured by the notifications whose identifiers are in + the related CorrelatedNotification instances."; + yext3gpp:notNotifyable; + } + + leaf ackTime { + if-feature AcknowledgeByConsumer; + type yang:date-and-time ; + config false ; + description "It identifies the time when the alarm has been + acknowledged or unacknowledged the last time, i.e. it registers the + time when ackState changes."; + yext3gpp:notNotifyable; + } + + leaf ackUserId { + if-feature AcknowledgeByConsumer; + type string; + description "It identifies the last user who has changed the + Acknowledgement State."; + yext3gpp:notNotifyable; + } + + leaf ackSystemId { + if-feature AcknowledgeByConsumer; + type string; + description "It identifies the system (Management System) that last + changed the ackState of an alarm, i.e. acknowledged or unacknowledged + the alarm."; + yext3gpp:notNotifyable; + } + + leaf ackState { + if-feature AcknowledgeByConsumer; + type enumeration { + enum ACKNOWLEDGED { + description "The alarm has been acknowledged."; + } + enum UNACKNOWLEDGED { + description "The alarm has unacknowledged or the alarm has never + been acknowledged."; } - yext3gpp:notNotifyable; } + yext3gpp:notNotifyable; + } - leaf clearUserId { - type string; - description "Carries the identity of the user who invokes the - clearAlarms operation."; - yext3gpp:notNotifyable; - } + leaf clearUserId { + type string; + description "Carries the identity of the user who invokes the + clearAlarms operation."; + yext3gpp:notNotifyable; + } - leaf clearSystemId { - type string; - yext3gpp:notNotifyable; - } + leaf clearSystemId { + type string; + yext3gpp:notNotifyable; + } - leaf serviceUser { - type string; - config false ; - description "It identifies the service-user whose request for service - provided by the serviceProvider led to the generation of the - security alarm."; - yext3gpp:notNotifyable; - } + leaf serviceUser { + type string; + config false ; + description "It identifies the service-user whose request for service + provided by the serviceProvider led to the generation of the + security alarm."; + yext3gpp:notNotifyable; + } - leaf serviceProvider { - type string; - config false ; - description "It identifies the service-provider whose service is - requested by the serviceUser and the service request provokes the - generation of the security alarm."; - yext3gpp:notNotifyable; - } + leaf serviceProvider { + type string; + config false ; + description "It identifies the service-provider whose service is + requested by the serviceUser and the service request provokes the + generation of the security alarm."; + yext3gpp:notNotifyable; + } - leaf securityAlarmDetector { - type string; - config false ; - yext3gpp:notNotifyable; + leaf securityAlarmDetector { + type string; + config false ; + yext3gpp:notNotifyable; + } + + list correlatedNotifications { + key sourceObjectInstance; + description "List of correlated notifications"; + + leaf sourceObjectInstance { + type types3gpp:DistinguishedName; + } + + leaf-list notificationId { + type int32; + min-elements 1; } + } } grouping AlarmListGrp { diff --git a/yang-models/_3gpp-common-managed-element.yang b/yang-models/_3gpp-common-managed-element.yang index b9cb823c27f1b15c683671ff13f82dec9de153db..9a99b2658adf10c48a331bda9889d66f85a99bcf 100755 --- a/yang-models/_3gpp-common-managed-element.yang +++ b/yang-models/_3gpp-common-managed-element.yang @@ -10,6 +10,7 @@ module _3gpp-common-managed-element { import _3gpp-common-fm { prefix fm3gpp; } import _3gpp-common-trace { prefix trace3gpp; } import _3gpp-common-files { prefix files3gpp; } + import _3gpp-5gc-nrm-configurable5qiset { prefix fiveqi3gpp; } organization "3GPP SA5"; contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464"; @@ -29,6 +30,7 @@ module _3gpp-common-managed-element { 3GPP TS 28.620 Umbrella Information Model (UIM)"; + revision 2023-04-26 { reference CR-0250; } revision 2023-02-14 { reference "CR-0234"; } revision 2022-09-30 { reference "CR-0191"; } revision 2021-01-16 { reference "CR-0120"; } @@ -40,6 +42,15 @@ module _3gpp-common-managed-element { revision 2019-06-17 { reference " S5-203316"; } revision 2019-05-08 { reference "Initial revision"; } + feature Configurable5QISetUnderManagedElement { + description "The Configurable5QISet shall be contained under + ManagedElement"; + } + + feature FilesUnderManagedElement { + description "Files shall be contained under ManagedElement"; + } + feature MeasurementsUnderManagedElement { description "The MeasurementSubtree shall be contained under ManagedElement"; @@ -262,6 +273,12 @@ module _3gpp-common-managed-element { if-feature TraceUnderManagedElement; } - uses files3gpp:FilesSubtree; + uses files3gpp:FilesSubtree { + if-feature FilesUnderManagedElement; + } + + uses fiveqi3gpp:Configurable5QISetSubtree { + if-feature Configurable5QISetUnderManagedElement; + } } } \ No newline at end of file diff --git a/yang-models/_3gpp-common-managed-function.yang b/yang-models/_3gpp-common-managed-function.yang index 6d22a70500d71cd79efe409e070c273ea732d6f3..cf63a5bfcf5fa161c1bba1e812adafd6a67f8653 100755 --- a/yang-models/_3gpp-common-managed-function.yang +++ b/yang-models/_3gpp-common-managed-function.yang @@ -8,7 +8,6 @@ module _3gpp-common-managed-function { import _3gpp-common-top { prefix top3gpp; } import _3gpp-common-measurements { prefix meas3gpp; } import _3gpp-common-trace { prefix trace3gpp; } - import _3gpp-5gc-nrm-configurable5qiset { prefix fiveqi3gpp; } organization "3GPP SA5"; contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464"; @@ -23,6 +22,7 @@ module _3gpp-common-managed-function { 3GPP TS 28.620 Umbrella Information Model (UIM)"; + revision 2023-04-26 { reference CR-0250; } revision 2023-02-14 { reference "CR-0234"; } revision 2022-11-02 { reference "CR-0753"; } revision 2022-10-24 { reference CR-0196; } @@ -37,11 +37,6 @@ module _3gpp-common-managed-function { revision 2019-10-28 { reference S5-193518 ; } revision 2019-06-18 { reference "Initial revision"; } - feature Configurable5QISetUnderManagedFunction { - description "The Configurable5QISet shall be contained under - ManagedFunction"; - } - feature MeasurementsUnderManagedFunction { description "The MeasurementSubtree shall be contained under ManageElement"; } @@ -349,9 +344,5 @@ module _3gpp-common-managed-function { uses trace3gpp:TraceSubtree { if-feature TraceUnderManagedFunction ; } - - uses fiveqi3gpp:Configurable5QISetSubtree { - if-feature Configurable5QISetUnderManagedFunction; - } } } \ No newline at end of file diff --git a/yang-models/_3gpp-common-measurements.yang b/yang-models/_3gpp-common-measurements.yang index b3a6d6911d0d0523448ff2fb0959c5cbf1c1d0b5..2a669aa3f215c5591cd906d32d980735527a01ec 100755 --- a/yang-models/_3gpp-common-measurements.yang +++ b/yang-models/_3gpp-common-measurements.yang @@ -55,6 +55,7 @@ module _3gpp-common-measurements { Integration Reference Point (IRP); Information Service (IS)"; + revision 2023-04-26 { reference CR-0250; } revision 2023-02-18 { reference "CR-0240"; } revision 2023-02-14 { reference "CR-0234"; } revision 2022-11-04 { reference "CR-0212 CR-0194"; } @@ -70,6 +71,10 @@ module _3gpp-common-measurements { revision 2019-10-28 { reference "S5-193516"; } revision 2019-06-17 { reference " "; } + feature FilesUnderPerfMetricJob { + description "Files shall be contained under PerfMetricJob"; + } + grouping ThresholdInfoGrp { description "Defines a single threshold level."; @@ -452,7 +457,9 @@ module _3gpp-common-measurements { container attributes { uses PerfMetricJobGrp ; } - uses files3gpp:FilesSubtree; + uses files3gpp:FilesSubtree { + if-feature FilesUnderPerfMetricJob; + } } list ThresholdMonitor { @@ -462,7 +469,7 @@ module _3gpp-common-measurements { A threshold monitor checks for threshold crossings of performance metric values and generates a notification when that happens. - The ThresholdMonitor is used only when NRM based threshold + The ThresholdMonitor shall be used only when NRM based threshold monitoring is supported. To activate threshold monitoring, a MnS consumer needs to create a @@ -496,8 +503,8 @@ module _3gpp-common-measurements { Multiple thresholds can be defined for multiple performance metric sets in a single monitor using thresholdInfoList. The attribute monitorGranularityPeriod defines the granularity period to be applied. - The value is a multiple of a supported granularity period for the - measurements being monitored. + The value is a supported GP for the measurements being monitored. + Threshold crossing behaviour is as defined in [54], Annex F. Each threshold is identified with a number (key) called thresholdLevel. A threshold is defined using the attributes thresholdValue , @@ -537,4 +544,4 @@ module _3gpp-common-measurements { } } } -} +} \ No newline at end of file diff --git a/yang-models/_3gpp-common-subnetwork.yang b/yang-models/_3gpp-common-subnetwork.yang index 0476bb7fde5d24cfd7e5d704f0b63181c961b784..3701700e7e4dfd04f68480f8d83374d3f172f38b 100755 --- a/yang-models/_3gpp-common-subnetwork.yang +++ b/yang-models/_3gpp-common-subnetwork.yang @@ -11,6 +11,7 @@ module _3gpp-common-subnetwork { import _3gpp-common-trace { prefix trace3gpp; } import ietf-yang-schema-mount { prefix yangmnt; } import _3gpp-common-files { prefix files3gpp; } + import _3gpp-5gc-nrm-configurable5qiset { prefix fiveqi3gpp; } organization "3GPP SA5"; contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464"; @@ -29,6 +30,7 @@ module _3gpp-common-subnetwork { 3GPP TS 28.620 Umbrella Information Model (UIM)"; + revision 2023-04-26 { reference CR-0250; } revision 2023-02-14 { reference CR-0234; } revision 2022-09-30 { reference CR-0191 ; } revision 2021-01-16 { reference "CR-0120"; } @@ -52,6 +54,15 @@ module _3gpp-common-subnetwork { reference "Initial revision"; } + feature Configurable5QISetUnderSubNetwork { + description "The Configurable5QISet shall be contained under + Subnetwork"; + } + + feature FilesUnderSubNetwork { + description "Files shall be contained under Subnetwork"; + } + feature ExternalsUnderSubNetwork { description "Classes representing external entities like EUtranFrequency, ExternalGNBCUCPFunction, ExternalENBFunction @@ -220,7 +231,13 @@ module _3gpp-common-subnetwork { if-feature TraceUnderSubNetwork; } - uses files3gpp:FilesSubtree; + uses files3gpp:FilesSubtree { + if-feature FilesUnderSubNetwork; + } + + uses fiveqi3gpp:Configurable5QISetSubtree { + if-feature Configurable5QISetUnderSubNetwork; + } yangmnt:mount-point children-of-SubNetwork { description "Mountpoint for ManagedElement"; diff --git a/yang-models/_3gpp-common-trace.yang b/yang-models/_3gpp-common-trace.yang index f5f28429e97801e5fce0c222f1891e15050a6a42..efa9dcfe5f36738c0e1fef3ab36ddc2cc8449478 100755 --- a/yang-models/_3gpp-common-trace.yang +++ b/yang-models/_3gpp-common-trace.yang @@ -24,6 +24,7 @@ module _3gpp-common-trace { Integration Reference Point (IRP); Information Service (IS)" ; + revision 2023-04-26 { reference CR-0250; } revision 2023-02-18 { reference "CR-0234"; } revision 2023-02-16 { reference "CR-0233"; } revision 2022-09-30 { reference CR-0191 ; } @@ -34,6 +35,10 @@ module _3gpp-common-trace { revision 2020-11-16 { reference "CR-0117"; } revision 2020-08-06 { reference "CR-0102"; } + feature FilesUnderTraceJob { + description "Files shall be contained under TraceJob"; + } + grouping FreqInfoGrp { description "Represents the FreqInfo dataType. This <> defines the RF reference frequency and the frequency @@ -1393,7 +1398,9 @@ module _3gpp-common-trace { container attributes { uses TraceJobGrp ; } - uses files3gpp:FilesSubtree; + uses files3gpp:FilesSubtree { + if-feature FilesUnderTraceJob; + } } } } \ 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 f7708b9ba747f7ef7b70aa92f26daf4a5a90803b..491f418f38171aa154c27debb9a63d83f6f19434 100755 --- a/yang-models/_3gpp-common-yang-types.yang +++ b/yang-models/_3gpp-common-yang-types.yang @@ -14,6 +14,7 @@ module _3gpp-common-yang-types { network slicing."; reference "3GPP TS 28.623"; + revision 2023-05-10 { reference CR-0250; } revision 2023-02-14 { reference CR-0234; } revision 2022-11-04 { reference "CR-0194"; } revision 2022-10-24 { reference CR-0196; } @@ -57,6 +58,11 @@ module _3gpp-common-yang-types { } } + grouping nameValuePair { + leaf name { type string; } + leaf value { type string; } + } + grouping ProcessMonitorGrp { description "Provides attributes to monitor the progress of processes with specific purpose and limited lifetime running on MnS producers. diff --git a/yang-models/_3gpp-nr-nrm-beam.yang b/yang-models/_3gpp-nr-nrm-beam.yang index 64cdd8dcf78e613dc55c4a99215330119a10d333..2d64d36475254a88a77a298d11471d851939e650 100755 --- a/yang-models/_3gpp-nr-nrm-beam.yang +++ b/yang-models/_3gpp-nr-nrm-beam.yang @@ -5,7 +5,6 @@ module _3gpp-nr-nrm-beam { import _3gpp-nr-nrm-commonbeamformingfunction { prefix cbeamff3gpp; } import _3gpp-common-top { prefix top3gpp; } - import _3gpp-common-managed-function { prefix mf3gpp; } import _3gpp-common-managed-element { prefix me3gpp; } import _3gpp-nr-nrm-gnbdufunction { prefix gnbdu3gpp; } import _3gpp-nr-nrm-nrsectorcarrier { prefix nrsectcarr3gpp; } @@ -16,10 +15,8 @@ module _3gpp-nr-nrm-beam { Object Class (IOC) that is part of the NR Network Resource Model (NRM)."; reference "3GPP TS 28.541 5G Network Resource Model (NRM)"; - revision 2019-11-22 { - description "Initial revision"; - reference "S5-197643"; - } + revision 2023-04-26 { reference CR-0916 ; } + revision 2019-11-26 { reference "S5-197643"; } typedef BeamType { type enumeration { @@ -30,7 +27,6 @@ module _3gpp-nr-nrm-beam { grouping BeamGrp { description "Represents the Beam IOC."; reference "3GPP TS 28.541"; - uses mf3gpp:ManagedFunctionGrp; leaf beamIndex { description "Index of the beam. "; diff --git a/yang-models/_3gpp-nr-nrm-commonbeamformingfunction.yang b/yang-models/_3gpp-nr-nrm-commonbeamformingfunction.yang index e900d4fc4db4a669ed99d85ea8bbedfe98d747cb..dd7285b8f00dac13a7278ae8ca6028ac58e4c676 100755 --- a/yang-models/_3gpp-nr-nrm-commonbeamformingfunction.yang +++ b/yang-models/_3gpp-nr-nrm-commonbeamformingfunction.yang @@ -1,38 +1,42 @@ module _3gpp-nr-nrm-commonbeamformingfunction { yang-version 1.1; - namespace "urn:3gpp:sa5:_3gpp-nr-nrm-nrnetwork-commonbeamformingfunction"; - prefix "combeamformfunc3gpp"; + namespace "urn:3gpp:sa5:_3gpp-nr-nrm-commonbeamformingfunction"; + prefix "cbeamform3gpp"; import _3gpp-nr-nrm-nrsectorcarrier { prefix nrsectcarr3gpp; } import _3gpp-common-top { prefix top3gpp; } - import _3gpp-common-managed-function { prefix mf3gpp; } import _3gpp-common-managed-element { prefix me3gpp; } import _3gpp-nr-nrm-gnbdufunction { prefix gnbdu3gpp; } organization "3GPP SA5"; - description "Defines the YANG mapping of the CommonBeamformingFuntion Information - Object Class (IOC) that is part of the NR Network Resource Model (NRM)."; + contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464"; + description "Defines the YANG mapping of the CommonBeamformingFuntion IOC + that is part of the NR Network Resource Model (NRM)."; reference "3GPP TS 28.541 5G Network Resource Model (NRM)"; - revision 2019-11-22 { - description "Initial revision"; - reference "S5-197643"; - } + revision 2023-04-26 { reference CR-0916 ; } + revision 2019-11-22 { reference "S5-197643"; } grouping CommonBeamformingFunctionGrp { description "Represents the CommonBeamformingFunction IOC."; reference "3GPP TS 28.541"; - uses mf3gpp:ManagedFunctionGrp; leaf coverageShape { - description "Identifies the sector carrier coverage shape described by the envelope of the contained SSB beams. The coverage shape is implementation dependent."; + description "Identifies the sector carrier coverage shape described by + the envelope of the contained SSB beams. The coverage shape is + implementation dependent."; mandatory true; type int32 { range "0..65535"; } } leaf digitalAzimuth { - description "Digitally-controlled azimuth through beamforming. It represents the horizontal pointing direction of the antenna relative to the antenna bore sight, representing the total non-mechanical horizontal pan of the selected coverageShape. Positive value gives azimuth to the right and negative value gives an azimuth to the left."; + description "Digitally-controlled azimuth through beamforming. + It represents the horizontal pointing direction of the antenna + relative to the antenna bore sight, representing the total + non-mechanical horizontal pan of the selected coverageShape. + Positive value gives azimuth to the right and negative value gives + an azimuth to the left."; reference "3GPP TS 38.104, TS 38.901, TS 28.662"; type int32 { range "-1800..1800"; } @@ -40,18 +44,23 @@ module _3gpp-nr-nrm-commonbeamformingfunction { } leaf digitalTilt { - description "Digitally-controlled tilt through beamforming. It represents the vertical pointing direction of the antenna relative to the antenna bore sight, representing the total non-mechanical vertical tilt of the selected coverageShape. Positive value gives downwards tilt and negative value gives upwards tilt."; + description "Digitally-controlled tilt through beamforming. + It represents the vertical pointing direction of the antenna relative + to the antenna bore sight, representing the total non-mechanical + vertical tilt of the selected coverageShape. Positive value gives + downwards tilt and negative value gives upwards tilt."; reference "3GPP TS 38.104, TS 38.901, TS 28.662"; type int32 { range "-900..900"; } units "0.1"; - } - } + } + } - augment "/me3gpp:ManagedElement/gnbdu3gpp:GNBDUFunction/nrsectcarr3gpp:NRSectorCarrier" { + augment "/me3gpp:ManagedElement/gnbdu3gpp:GNBDUFunction/" + + "nrsectcarr3gpp:NRSectorCarrier" { list CommonBeamformingFunction { - description "Represents common beamforming functionality (eg: SSB beams) for the NRSectorCarrier."; - reference "3GPP TS 28.541"; + description "Represents common beamforming functionality (eg: SSB beams) + for the NRSectorCarrier."; key id; uses top3gpp:Top_Grp; container attributes { diff --git a/yang-models/_3gpp-nr-nrm-gnbcucpfunction.yang b/yang-models/_3gpp-nr-nrm-gnbcucpfunction.yang index dcc5aac9c30537e60fa30ce800783347bda85f4f..68d2bc8d62f3f382d9768e6fe491c7525c5b8721 100755 --- a/yang-models/_3gpp-nr-nrm-gnbcucpfunction.yang +++ b/yang-models/_3gpp-nr-nrm-gnbcucpfunction.yang @@ -7,6 +7,7 @@ module _3gpp-nr-nrm-gnbcucpfunction { import _3gpp-common-managed-function { prefix mf3gpp; } import _3gpp-common-managed-element { prefix me3gpp; } import _3gpp-common-top { prefix top3gpp; } + import _3gpp-5gc-nrm-configurable5qiset { prefix fiveqi3gpp; } organization "3GPP SA5"; contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464"; @@ -14,6 +15,7 @@ module _3gpp-nr-nrm-gnbcucpfunction { Object Class (IOC) that is part of the NR Network Resource Model (NRM)."; reference "3GPP TS 28.541 5G Network Resource Model (NRM)"; + 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"; } @@ -27,6 +29,11 @@ module _3gpp-nr-nrm-gnbcucpfunction { revision 2019-10-28 { reference S5-193518 ; } revision 2019-06-17 { reference "Initial revision"; } + feature Configurable5QISetUnderGNBCUCPFunction { + description "The Configurable5QISet shall be contained under + GNBCUCPFunction"; + } + feature DESManagementFunction { description "Classs representing Distributed SON Energy Saving feature"; } @@ -142,6 +149,10 @@ module _3gpp-nr-nrm-gnbcucpfunction { uses GNBCUCPFunctionGrp; } uses mf3gpp:ManagedFunctionContainedClasses; + + uses fiveqi3gpp:Configurable5QISetSubtree { + if-feature Configurable5QISetUnderGNBCUCPFunction; + } } } } \ No newline at end of file diff --git a/yang-models/_3gpp-nr-nrm-gnbcuupfunction.yang b/yang-models/_3gpp-nr-nrm-gnbcuupfunction.yang index 2de8aaf6523448338220651cf6108dcc6f32eba5..66bc771a5b26379e03f3ad0923bdebb0e94826e6 100755 --- a/yang-models/_3gpp-nr-nrm-gnbcuupfunction.yang +++ b/yang-models/_3gpp-nr-nrm-gnbcuupfunction.yang @@ -8,6 +8,7 @@ module _3gpp-nr-nrm-gnbcuupfunction { import _3gpp-common-managed-element { prefix me3gpp; } import _3gpp-common-top { prefix top3gpp; } import _3gpp-5g-common-yang-types { prefix types5g3gpp; } + import _3gpp-5gc-nrm-configurable5qiset { prefix fiveqi3gpp; } organization "3GPP SA5"; contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464"; @@ -15,6 +16,7 @@ module _3gpp-nr-nrm-gnbcuupfunction { Object Class (IOC) that is part of the NR Network Resource Model (NRM)."; reference "3GPP TS 28.541 5G Network Resource Model (NRM)"; + revision 2023-04-26 { reference CR-0916; } revision 2022-07-28 { reference "CR-0770"; } revision 2020-11-05 { reference CR-0412 ; } revision 2020-08-06 { reference "CR-0333"; } @@ -26,6 +28,11 @@ module _3gpp-nr-nrm-gnbcuupfunction { revision 2019-10-28 { reference S5-193518 ; } revision 2019-08-21 { reference "Initial revision"; } + feature Configurable5QISetUnderGNBCUUPFunction { + description "The Configurable5QISet shall be contained under + GNBCUUPFunction"; + } + grouping TAIGrp { description "Tracking Area Identity"; @@ -166,6 +173,10 @@ module _3gpp-nr-nrm-gnbcuupfunction { uses GNBCUUPFunctionGrp; } uses mf3gpp:ManagedFunctionContainedClasses; + + uses fiveqi3gpp:Configurable5QISetSubtree { + if-feature Configurable5QISetUnderGNBCUUPFunction; + } } } } \ No newline at end of file diff --git a/yang-models/_3gpp-nr-nrm-gnbdufunction.yang b/yang-models/_3gpp-nr-nrm-gnbdufunction.yang index 9aba64d7c18d1ffe8339830cbb2f26ac975ee227..a00c5759b81ce3a15828c8a0da18c5784579f24c 100755 --- a/yang-models/_3gpp-nr-nrm-gnbdufunction.yang +++ b/yang-models/_3gpp-nr-nrm-gnbdufunction.yang @@ -7,6 +7,7 @@ module _3gpp-nr-nrm-gnbdufunction { import _3gpp-common-managed-element { prefix me3gpp; } import _3gpp-common-top { prefix top3gpp; } import _3gpp-common-yang-types { prefix types3gpp; } + import _3gpp-5gc-nrm-configurable5qiset { prefix fiveqi3gpp; } organization "3GPP SA5"; contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464"; @@ -14,6 +15,7 @@ module _3gpp-nr-nrm-gnbdufunction { Object Class (IOC) that is part of the NR Network Resource Model (NRM)."; reference "3GPP TS 28.541 5G Network Resource Model (NRM)"; + revision 2023-04-26 { reference CR-0916; } revision 2022-11-02 { reference "CR-0753"; } revision 2022-07-28 { reference "CR-0770"; } revision 2021-10-28 { reference CR-0607 ; } @@ -24,6 +26,11 @@ module _3gpp-nr-nrm-gnbdufunction { revision 2019-10-28 { reference S5-193518 ; } revision 2019-08-21 {reference "Initial revision."; } + feature Configurable5QISetUnderGNBDUFunction { + description "The Configurable5QISet shall be contained under + GNBDUFunction"; + } + feature DRACHOptimizationFunction { description "Class representing D-SON function of RACH optimization feature"; @@ -187,7 +194,7 @@ module _3gpp-nr-nrm-gnbdufunction { augment "/me3gpp:ManagedElement" { list GNBDUFunction { - key id; + key id; description "Represents the logical function DU of gNB or en-gNB."; reference "3GPP TS 28.541"; uses top3gpp:Top_Grp; @@ -195,6 +202,10 @@ module _3gpp-nr-nrm-gnbdufunction { uses GNBDUFunctionGrp; } uses mf3gpp:ManagedFunctionContainedClasses; + + uses fiveqi3gpp:Configurable5QISetSubtree { + if-feature Configurable5QISetUnderGNBDUFunction; + } } } } \ No newline at end of file diff --git a/yang-models/_3gpp-nr-nrm-nrcellrelation.yang b/yang-models/_3gpp-nr-nrm-nrcellrelation.yang index 6e2a77b91f1efa13784d9fa48e2cc19319e1cfdb..d278ebf80ee976a5ef95bd2e100a4cd958bab762 100755 --- a/yang-models/_3gpp-nr-nrm-nrcellrelation.yang +++ b/yang-models/_3gpp-nr-nrm-nrcellrelation.yang @@ -4,7 +4,6 @@ module _3gpp-nr-nrm-nrcellrelation { prefix "nrcellrel3gpp"; import _3gpp-common-yang-types { prefix types3gpp; } - import _3gpp-common-managed-function { prefix mf3gpp; } import _3gpp-common-managed-element { prefix me3gpp; } import _3gpp-common-top { prefix top3gpp; } import _3gpp-nr-nrm-gnbcucpfunction { prefix gnbcucp3gpp; } @@ -15,6 +14,7 @@ module _3gpp-nr-nrm-nrcellrelation { Object Class (IOC) that is part of the NR Network Resource Model (NRM)."; reference "3GPP TS 28.541 5G Network Resource Model (NRM)"; + revision 2023-04-26 { reference CR-0916; } revision 2021-01-25 { reference CR-0454 ; } revision 2020-06-03 { reference S5-202333 ; } revision 2020-04-23 { reference CR0281 ; } @@ -138,7 +138,6 @@ module _3gpp-nr-nrm-nrcellrelation { container attributes { uses NRCellRelationGrp; } - uses mf3gpp:ManagedFunctionContainedClasses; } } } \ No newline at end of file diff --git a/yang-models/_3gpp-nr-nrm-nrfreqrelation.yang b/yang-models/_3gpp-nr-nrm-nrfreqrelation.yang index 3d25d85d05bdaba7a313347b3ef7d8f49c032fbd..ea6e980e9ed1a0b783d1fc91660b0c4894933e39 100755 --- a/yang-models/_3gpp-nr-nrm-nrfreqrelation.yang +++ b/yang-models/_3gpp-nr-nrm-nrfreqrelation.yang @@ -4,7 +4,6 @@ module _3gpp-nr-nrm-nrfreqrelation { prefix "nrfreqrel3gpp"; import _3gpp-common-yang-types { prefix types3gpp; } - import _3gpp-common-managed-function { prefix mf3gpp; } import _3gpp-common-managed-element { prefix me3gpp; } import _3gpp-common-top { prefix top3gpp; } import _3gpp-nr-nrm-gnbcucpfunction { prefix gnbcucp3gpp; } @@ -15,6 +14,7 @@ module _3gpp-nr-nrm-nrfreqrelation { Object Class (IOC) that is part of the NR Network Resource Model (NRM)."; reference "3GPP TS 28.541 5G Network Resource Model (NRM)"; + revision 2023-04-26 { reference CR-0916; } revision 2020-04-23 { reference CR0281 ; } revision 2019-10-28 { reference S5-193518 ; } revision 2019-06-17 { @@ -239,7 +239,6 @@ module _3gpp-nr-nrm-nrfreqrelation { container attributes { uses NRFreqRelationGrp; } - uses mf3gpp:ManagedFunctionContainedClasses; } } } \ No newline at end of file diff --git a/yang-models/_3gpp-ns-nrm-sliceprofile.yang b/yang-models/_3gpp-ns-nrm-sliceprofile.yang index 1e3217278cdc341d687651a46a552d9d931112cd..715e055047a5d927731cc10c8edae7f7a8bd156f 100755 --- a/yang-models/_3gpp-ns-nrm-sliceprofile.yang +++ b/yang-models/_3gpp-ns-nrm-sliceprofile.yang @@ -19,11 +19,9 @@ submodule _3gpp-ns-nrm-sliceprofile { Information model definitions for network slice NRM (chapter 6) "; - revision 2021-07-16 { reference CR-0566 ; } - revision 2021-05-05 { - description "replace perfReq with 3 new datatypes xxxSliceSubnetProfile"; - reference "CR-0485"; - } + revision 2023-04-26 { reference CR-0916; } + revision 2021-07-20 { reference CR-0566; } + revision 2021-05-05 { reference CR-0485; } revision 2020-02-19 { description "Introduction of YANG definitions for network slice NRM";