diff --git a/yang-models/_3gpp-5g-common-yang-types.yang b/yang-models/_3gpp-5g-common-yang-types.yang index 75786fb27af3923b91782746359c9cd448eb42fc..e78863dec45599ec60d1b8e0a229632a422f33cd 100755 --- a/yang-models/_3gpp-5g-common-yang-types.yang +++ b/yang-models/_3gpp-5g-common-yang-types.yang @@ -3,17 +3,18 @@ module _3gpp-5g-common-yang-types { namespace "urn:3gpp:sa5:_3gpp-5g-common-yang-types"; prefix "types5g3gpp"; - import ietf-yang-types { prefix yang; } + import _3gpp-common-yang-types { prefix types3gpp; } organization "3GPP SA5"; contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464"; description "The model defines common types for 5G networks and network slicing. - Copyright 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + Copyright 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved."; reference "3GPP TS 28.541"; + revision 2025-08-18 { reference CR-1557; } revision 2024-10-06 { reference CR-1389; } revision 2024-05-24 { reference CR-1273 ; } revision 2023-09-18 { reference CR-1043 ; } @@ -76,27 +77,6 @@ module _3gpp-5g-common-yang-types { d) For a 5G SA (Stand Alone), it has a non-null value."; } - grouping SNssai { - description - "Single Network Slice Selection Assistance Information(S-NSSAI)"; - reference "3GPP TS 23.003"; - - leaf sd { - description "Slice Differentiator - If not needed, the value can be set to ff:ff:ff."; - type yang:hex-string { - length 8; - } - reference "3GPP TS 23.003"; - } - - leaf sst { - type uint8; - description "Slice/Service Type. - Values 0 to 127 belong to standardized SST range and are defined in - 3GPP TS 23.501. Values 128 to 255 belong to operator-specific range."; - } - } grouping PlmnIdNid { description "Represents the SCP domain specific information as defined @@ -120,7 +100,7 @@ module _3gpp-5g-common-yang-types { comprised of an SST (Slice/Service type) and an optional SD (Slice Differentiator) field"; uses types3gpp:PLMNId; - uses SNssai; + uses types3gpp:SNssai; } typedef CommModelType { diff --git a/yang-models/_3gpp-5gc-nrm-GtpUPathQoSMonitoringControl.yang b/yang-models/_3gpp-5gc-nrm-GtpUPathQoSMonitoringControl.yang index 58ece735b655411f76a9c28422358c38268e97bd..a4ce535e2d90053a63e603a31217489aace20d48 100755 --- a/yang-models/_3gpp-5gc-nrm-GtpUPathQoSMonitoringControl.yang +++ b/yang-models/_3gpp-5gc-nrm-GtpUPathQoSMonitoringControl.yang @@ -5,18 +5,19 @@ module _3gpp-5gc-nrm-GtpUPathQoSMonitoringControl { prefix gtpUPathQMCtrl3gpp; import _3gpp-common-managed-element { prefix me3gpp; } - import _3gpp-5g-common-yang-types { prefix types5g3gpp; } import _3gpp-5gc-nrm-smffunction { prefix smf3gpp; } import _3gpp-common-top { prefix top3gpp; } + import _3gpp-common-yang-types { prefix types3gpp; } organization "3gpp SA5"; contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464"; description "This IOC represents the capabilities and properties for control of GTP-U path QoS monitoring defined in 3GPP TS 23.501. - Copyright 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + Copyright 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved."; reference "3GPP TS 28.541"; + revision 2025-08-18 { reference CR-1557 ; } revision 2023-09-18 { reference CR-1043 ; } revision 2020-11-05 { reference CR-0412 ; } revision 2020-09-30 { reference "CR-0393"; } @@ -70,7 +71,7 @@ module _3gpp-5gc-nrm-GtpUPathQoSMonitoringControl { description "The S-NSSAIs for which the the GTP-U path QoS monitoring is to be performed."; reference "3GPP TS 23.003"; - uses types5g3gpp:SNssai; + uses types3gpp:SNssai; } leaf-list monitoredDSCPs { diff --git a/yang-models/_3gpp-5gc-nrm-QFQoSMonitoringControl.yang b/yang-models/_3gpp-5gc-nrm-QFQoSMonitoringControl.yang index e951d0cf2e7821f0d6e307db3da79ab005fcdf0e..9985b8e1cf61431620ee26d46e301b80e836f91a 100755 --- a/yang-models/_3gpp-5gc-nrm-QFQoSMonitoringControl.yang +++ b/yang-models/_3gpp-5gc-nrm-QFQoSMonitoringControl.yang @@ -7,8 +7,7 @@ module _3gpp-5gc-nrm-QFQoSMonitoringControl { import _3gpp-common-managed-element { prefix me3gpp; } import _3gpp-5gc-nrm-smffunction { prefix smf3gpp; } import _3gpp-common-top { prefix top3gpp; } - import _3gpp-5g-common-yang-types { prefix types5g3gpp; } - + import _3gpp-common-yang-types { prefix types3gpp; } organization "3gpp SA5"; contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464"; description "This IOC represents the capabilities and properties for control @@ -19,6 +18,7 @@ in 3GPP TS 23.501. TTA, TTC). All rights reserved."; reference "3GPP TS 28.541"; + revision 2025-08-18 { reference CR-1557 ; } revision 2023-09-24 { reference CR-0916; } revision 2020-11-08 { reference CR-0412 ; } revision 2020-08-03 { reference "CR-0321"; } @@ -63,7 +63,7 @@ in 3GPP TS 23.501. per UE is to be performed."; reference "3GPP TS 23.003"; key "sd sst"; - uses types5g3gpp:SNssai;} + uses types3gpp:SNssai;} leaf-list qFMonitored5QIs { description "The 5QIs for which the QoS monitoring per QoS flow diff --git a/yang-models/_3gpp-5gc-nrm-amffunction.yang b/yang-models/_3gpp-5gc-nrm-amffunction.yang index b28a1a52179696bd6ca57b02c45a3c4d303cf8a2..9cfa036173ea4cf43e8eaf6eb82d05a0024d5e1c 100755 --- a/yang-models/_3gpp-5gc-nrm-amffunction.yang +++ b/yang-models/_3gpp-5gc-nrm-amffunction.yang @@ -10,7 +10,7 @@ module _3gpp-5gc-nrm-amffunction { import ietf-inet-types { prefix inet; } import ietf-yang-types { prefix yang; } import _3gpp-common-top { prefix top3gpp; } - import _3gpp-nr-nrm-gnbcuupfunction { prefix gnbcuup3gpp ;} + import _3gpp-nr-nrm-gnbcuupfunction { prefix gnbcuup3gpp; } import _3gpp-5gc-nrm-nfprofile { prefix nfp3gpp; } organization "3gpp SA5"; @@ -20,6 +20,7 @@ module _3gpp-5gc-nrm-amffunction { TTA, TTC). All rights reserved."; reference "3GPP TS 28.541 5G Network Resource Model (NRM)"; + revision 2025-08-18 { reference CR-1557 ; } revision 2024-10-06 { reference CR-1389; } revision 2024-04-04 { reference CR-1139; } revision 2023-09-18 { reference CR-1043 ; } @@ -236,7 +237,7 @@ module _3gpp-5gc-nrm-amffunction { key idx; unique "sst sd"; leaf idx { type uint32; } - uses types5g3gpp:SNssai; + uses types3gpp:SNssai; } } diff --git a/yang-models/_3gpp-5gc-nrm-amfregion.yang b/yang-models/_3gpp-5gc-nrm-amfregion.yang index f44940dac5113e4e07c949c76da0e2164d07c2a0..f1b85d44d7db295ddcb7cab59e45f645f0450957 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 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + Copyright 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved."; reference "3GPP TS 28.541 5G Network Resource Model (NRM)"; + revision 2025-08-18 { reference CR-1557 ; } revision 2024-05-24 { reference CR-1273 ; } revision 2023-09-18 { reference CR-1043 ; } revision 2022-01-07 { reference CR-0643; } @@ -57,7 +58,7 @@ module _3gpp-5gc-nrm-amfregion { //conditional support only if the network slicing feature is supported. reference "3GPP TS 23.003"; key "sd sst"; - uses types5g3gpp:SNssai; + uses types3gpp:SNssai; } leaf aMFRegionId { diff --git a/yang-models/_3gpp-5gc-nrm-amfset.yang b/yang-models/_3gpp-5gc-nrm-amfset.yang index 9473afee3fec86eabc21c7af67455943287243a5..e9a16136f65af5f5eb288034f50682a1b0bedcd2 100755 --- a/yang-models/_3gpp-5gc-nrm-amfset.yang +++ b/yang-models/_3gpp-5gc-nrm-amfset.yang @@ -17,6 +17,7 @@ module _3gpp-5gc-nrm-amfset { TTA, TTC). All rights reserved."; reference "3GPP TS 28.541 5G Network Resource Model (NRM)"; + revision 2025-08-18 { reference CR-1557 ; } revision 2024-05-24 { reference CR-1273 ; } revision 2023-09-18 { reference CR-1043 ; } revision 2022-01-07 { reference CR-0643; } @@ -56,7 +57,7 @@ module _3gpp-5gc-nrm-amfset { //conditional support only if the network slicing feature is supported. reference "3GPP TS 23.003"; key "sd sst"; - uses types5g3gpp:SNssai; + uses types3gpp:SNssai; } leaf aMFRegion { diff --git a/yang-models/_3gpp-5gc-nrm-neffunction.yang b/yang-models/_3gpp-5gc-nrm-neffunction.yang index fec93a992b19aa759b837ad63150e5ea8292deeb..c62337c47ff158232998116299db1db38d5c1e29 100755 --- a/yang-models/_3gpp-5gc-nrm-neffunction.yang +++ b/yang-models/_3gpp-5gc-nrm-neffunction.yang @@ -10,7 +10,6 @@ module _3gpp-5gc-nrm-neffunction { import _3gpp-common-yang-types { prefix types3gpp; } import _3gpp-common-yang-extensions { prefix yext3gpp; } import _3gpp-common-top { prefix top3gpp; } - import _3gpp-5g-common-yang-types { prefix types5g3gpp; } import _3gpp-5gc-nrm-nfprofile { prefix nfp3gpp; } organization "3gpp SA5"; @@ -21,6 +20,7 @@ module _3gpp-5gc-nrm-neffunction { TTA, TTC). All rights reserved."; reference "3GPP TS 28.541"; + revision 2025-08-18 { reference CR-1557 ; } revision 2024-05-18 { reference CR-1273 ; } revision 2024-04-12 { reference CR-1218 ; } revision 2023-09-18 { reference CR-1103 ; } @@ -55,7 +55,7 @@ module _3gpp-5gc-nrm-neffunction { min-elements 1; key idx; leaf idx { type uint32 ; } - uses types5g3gpp:SNssai; + uses types3gpp:SNssai; } list dnnInfoList{ @@ -290,7 +290,7 @@ module _3gpp-5gc-nrm-neffunction { An S-NSSAI has an SST (Slice/Service type) and an optional SD (Slice Differentiator) field."; key "sd sst"; - uses types5g3gpp:SNssai; + uses types3gpp:SNssai; } list managedNFProfile { diff --git a/yang-models/_3gpp-5gc-nrm-nfprofile.yang b/yang-models/_3gpp-5gc-nrm-nfprofile.yang index 15dc5e0a1b9c10f942fe333f4f00e11d5da889a5..0cc63e3d6a1c83dc5eea3d7cd2a1b4d9cdba0215 100755 --- a/yang-models/_3gpp-5gc-nrm-nfprofile.yang +++ b/yang-models/_3gpp-5gc-nrm-nfprofile.yang @@ -12,10 +12,11 @@ module _3gpp-5gc-nrm-nfprofile { organization "3gpp SA5"; contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464"; description "NF profile class. - Copyright 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + Copyright 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved."; reference "3GPP TS 29.510"; + revision 2025-08-25 { reference CR-1557 ; } revision 2024-04-12 { reference CR-1218 ; } revision 2023-11-18 { reference CR-1103 ; } revision 2023-09-18 { reference CR-1043 ; } @@ -40,16 +41,7 @@ module _3gpp-5gc-nrm-nfprofile { mandatory true; type NFStatus; } - - leaf heartBeatTimer { - description "Time in seconds expected between 2 consecutive - heart-beat messages from an NF Instance to the NRF. - It may be included in the registration request. - When present in the request it shall contain the - heartbeat time proposed by the NF service consumer."; - type uint16; - } - + list plmnList { description "PLMN(s) of the Network Function. This IE shall be present if this information @@ -70,27 +62,7 @@ module _3gpp-5gc-nrm-nfprofile { key "sst sd"; uses Snssai; } - - list perPlmnSnssaiList { - description "This IE may be included when the list of - S-NSSAIs supported by the NF for each PLMN it is supporting - is different. When present, this IE shall include the S-NSSAIs - supported by the Network Function for each PLMN supported by - the Network Function. When present, this IE shall - override sNssais IE."; - min-elements 1; - key idx; - leaf idx { type uint32; } - uses PlmnSnssai; - } - - leaf-list nsiList { - description "NSI identities of the Network Function. - If not provided, the NF can serve any NSI."; - min-elements 1; - type string; - } - + leaf fqdn { description "FQDN of the Network Function. For AMF, the FQDN registered with the NRF shall be that of the AMF Name."; @@ -103,83 +75,7 @@ module _3gpp-5gc-nrm-nfprofile { for inter-PLMN routing is specified."; type inet:domain-name; } - - leaf-list ipv4Addresses { - description "IPv4 address(es) of the Network Function."; - min-elements 1; - type inet:ipv4-address; - } - - leaf-list ipv6Addresses { - description "IPv6 address(es) of the Network Function."; - min-elements 1; - type inet:ipv6-address; - } - - list allowedPlmns { - description "PLMNs allowed to access the NF instance. - If not provided, any PLMN is allowed to access the NF."; - - min-elements 1; - key "mcc mnc"; - uses types3gpp:PLMNId; - } - - leaf-list allowedNfTypes { - description "Type of the NFs allowed to access the NF instance. - If not provided, any NF type is allowed to access the NF."; - min-elements 1; - type types3gpp:NfType; - } - - leaf-list allowedNfDomains { - description "Pattern representing the NF domain names allowed - to access the NF instance. If not provided, - any NF domain is allowed to access the NF."; - min-elements 1; - type string; - } - - list allowedNssais { - description "S-NSSAI of the allowed slices to access the NF instance. - If not provided, any slice is allowed to access the NF."; - min-elements 1; - key "sst sd"; - uses Snssai; - } - - leaf priority { - description "Priority (relative to other NFs of the same type) - in the range of 0-65535, to be used for NF selection; - lower values indicate a higher priority. - If priority is also present in the nfServiceList - parameters, - those will have precedence over this value. - The NRF may overwrite the received priority value - when exposing - an NFProfile with the Nnrf_NFDiscovery service."; - type uint16; - } - - leaf capacity { - description "Static capacity information in the range of 0-65535, - expressed as a weight relative to other NF instances of - the same type; if capacity is also present in the nfServiceList - parameters, those will have precedence over this value."; - type uint16; - } - - leaf load { - description "Dynamic load information, ranged from 0 to 100, - indicates the current load percentage of the NF."; - type types3gpp:Load; - } - - leaf locality { - description "Operator defined information about the location - of the NF instance (e.g. geographic location, data center)."; - type string; - } + grouping udrInfo { diff --git a/yang-models/_3gpp-5gc-nrm-nfservice.yang b/yang-models/_3gpp-5gc-nrm-nfservice.yang index 82cf61e877afc9c176cef6aa8af3b5df98617b2b..2dfd8ea5d8cc66331e1cd2764d42a39585988da4 100755 --- a/yang-models/_3gpp-5gc-nrm-nfservice.yang +++ b/yang-models/_3gpp-5gc-nrm-nfservice.yang @@ -7,7 +7,6 @@ module _3gpp-5gc-nrm-nfservice { import _3gpp-common-yang-types { prefix types3gpp; } import ietf-yang-types { prefix yang; } import ietf-inet-types { prefix inet; } - import _3gpp-5g-common-yang-types { prefix types5g3gpp; } organization "3gpp SA5"; contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464"; @@ -16,6 +15,7 @@ module _3gpp-5gc-nrm-nfservice { TTA, TTC). All rights reserved."; reference "3GPP TS 29.510"; + revision 2025-08-18 { reference CR-1557; } revision 2023-09-18 { reference CR-1043 ; } revision 2021-01-25 { reference CR-0454 ; } revision 2020-11-05 { reference CR-0412 ; } @@ -133,7 +133,7 @@ module _3gpp-5gc-nrm-nfservice { min-elements 1; //optional support key "sd sst"; - uses types5g3gpp:SNssai; + uses types3gpp:SNssai; } leaf priority { diff --git a/yang-models/_3gpp-5gc-nrm-ngeirfunction.yang b/yang-models/_3gpp-5gc-nrm-ngeirfunction.yang index 2c8c1a4fb08a95567e2143ae740828119f1a1e8c..b7fdcfd3998b0e5b11b4f0feff5f1deeeec2f2bb 100755 --- a/yang-models/_3gpp-5gc-nrm-ngeirfunction.yang +++ b/yang-models/_3gpp-5gc-nrm-ngeirfunction.yang @@ -49,7 +49,7 @@ module _3gpp-5gc-nrm-ngeirfunction { //optional support reference "3GPP TS 23.003"; key "sd sst"; - uses types5g3gpp:SNssai; + uses types3gpp:SNssai; } list managedNFProfile { diff --git a/yang-models/_3gpp-5gc-nrm-nrffunction.yang b/yang-models/_3gpp-5gc-nrm-nrffunction.yang index 25507c96a06d34749cc73e19bfcd27090210c93f..bb4f311161d62f84291fa8fab8e336f2742c85b0 100755 --- a/yang-models/_3gpp-5gc-nrm-nrffunction.yang +++ b/yang-models/_3gpp-5gc-nrm-nrffunction.yang @@ -10,7 +10,6 @@ module _3gpp-5gc-nrm-nrffunction { import _3gpp-common-yang-types { prefix types3gpp; } import _3gpp-5gc-nrm-nfprofile { prefix nfp3gpp; } import _3gpp-common-top { prefix top3gpp; } - import _3gpp-5g-common-yang-types { prefix types5g3gpp; } organization "3gpp SA5"; contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464"; @@ -20,6 +19,7 @@ module _3gpp-5gc-nrm-nrffunction { TTA, TTC). All rights reserved."; reference "3GPP TS 28.541"; + revision 2025-08-18 { reference CR-1557; } revision 2023-09-18 { reference CR-1043 ; } revision 2023-04-26 { reference CR-0916; } revision 2020-11-08 { reference CR-0412 ; } @@ -66,7 +66,7 @@ module _3gpp-5gc-nrm-nrffunction { //optional support reference "3GPP TS 23.003"; key "sd sst"; - uses types5g3gpp:SNssai; + uses types3gpp:SNssai; } list nFProfileList { diff --git a/yang-models/_3gpp-5gc-nrm-nssffunction.yang b/yang-models/_3gpp-5gc-nrm-nssffunction.yang index 315ae9ebcb5fe386566487b0defd21c051c147e8..ec22c27b5ee2dd3577b81ec3c953be9ce416322c 100755 --- a/yang-models/_3gpp-5gc-nrm-nssffunction.yang +++ b/yang-models/_3gpp-5gc-nrm-nssffunction.yang @@ -9,16 +9,16 @@ module _3gpp-5gc-nrm-nssffunction { import ietf-inet-types { prefix inet; } import _3gpp-common-yang-types { prefix types3gpp; } import _3gpp-common-top { prefix top3gpp; } - import _3gpp-5g-common-yang-types { prefix types5g3gpp; } organization "3gpp SA5"; contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464"; description "This IOC represents the NSSF function in 5GC. For more information about the NSSF, see 3GPP TS 23.501. - Copyright 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + Copyright 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved."; reference "3GPP TS 28.541"; + revision 2025-08-18 { reference CR-1557; } revision 2023-09-18 { reference CR-1043 ; } revision 2023-04-26 { reference CR-0916; } revision 2020-11-08 { reference CR-0412 ; } @@ -56,7 +56,7 @@ module _3gpp-5gc-nrm-nssffunction { reference "3GPP TS 23.003"; key "sd sst"; - uses types5g3gpp:SNssai; + uses types3gpp:SNssai; } leaf-list cNSIIdList { diff --git a/yang-models/_3gpp-5gc-nrm-nwdaffunction.yang b/yang-models/_3gpp-5gc-nrm-nwdaffunction.yang index a5256f4c745a525022cda8b95b9a94592bb6c3bc..8c39bda67f4cb5060b08cfad2066bce6c1aac89c 100755 --- a/yang-models/_3gpp-5gc-nrm-nwdaffunction.yang +++ b/yang-models/_3gpp-5gc-nrm-nwdaffunction.yang @@ -21,6 +21,7 @@ module _3gpp-5gc-nrm-nwdaffunction { TTA, TTC). All rights reserved."; reference "3GPP TS 28.541"; + revision 2025-08-18 { reference CR-1557; } revision 2024-08-06 { reference CR-1130; } revision 2024-04-12 { reference CR-1218; } revision 2023-09-18 { reference CR-1043; } @@ -100,7 +101,7 @@ module _3gpp-5gc-nrm-nwdaffunction { supporting."; reference "3GPP TS 23.003"; key "sd sst"; - uses types5g3gpp:SNssai; + uses types3gpp:SNssai; } list trackingAreaList { @@ -257,7 +258,7 @@ module _3gpp-5gc-nrm-nwdaffunction { leaf idx { type string; } - uses types5g3gpp:SNssai; + uses types3gpp:SNssai; } leaf-list cNSIId { @@ -291,7 +292,6 @@ module _3gpp-5gc-nrm-nwdaffunction { key "idx"; leaf idx { type uint32; } uses types3gpp:PLMNId; - uses types5g3gpp:SNssai; } leaf sBIFQDN { diff --git a/yang-models/_3gpp-5gc-nrm-pcffunction.yang b/yang-models/_3gpp-5gc-nrm-pcffunction.yang index 673c13acc2eb11880d4c3a42dcaace31ff520599..39c04624bfd91c1a3587ba533267364703c22d00 100755 --- a/yang-models/_3gpp-5gc-nrm-pcffunction.yang +++ b/yang-models/_3gpp-5gc-nrm-pcffunction.yang @@ -19,6 +19,7 @@ module _3gpp-5gc-nrm-pcffunction { TTA, TTC). All rights reserved."; reference "3GPP TS 28.541"; + revision 2025-08-18 { reference CR-1557; } revision 2024-05-24 { reference CR-1273 ; } revision 2023-09-18 { reference CR-1043 ; } revision 2023-04-26 { reference CR-0916; } @@ -58,7 +59,7 @@ module _3gpp-5gc-nrm-pcffunction { //optional support reference "3GPP TS 23.003"; key "sd sst"; - uses types5g3gpp:SNssai; + uses types3gpp:SNssai; } list managedNFProfile { diff --git a/yang-models/_3gpp-5gc-nrm-smffunction.yang b/yang-models/_3gpp-5gc-nrm-smffunction.yang index ca37a43d4c235d3cd8fa4b866f4f5c4e03a38fe8..3434b290c77a7166bfab3bd5604276b6ac7a9f24 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 2025-08-18 { reference CR-1557; } revision 2024-05-24 { reference CR-1273 ; } revision 2023-09-18 { reference CR-1043 ; } revision 2023-04-26 { reference CR-0916; } @@ -61,7 +62,7 @@ module _3gpp-5gc-nrm-smffunction { (Slice Differentiator) field."; reference "3GPP TS 23.003"; key "sd sst"; - uses types5g3gpp:SNssai; + uses types3gpp:SNssai; } list managedNFProfile { diff --git a/yang-models/_3gpp-5gc-nrm-udmfunction.yang b/yang-models/_3gpp-5gc-nrm-udmfunction.yang index 319015d161e6b5a43788d8085889afe7453c88d9..4cb9781030ff40b7827571661464a1c9f20a9d52 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 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + Copyright 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved."; reference "3GPP TS 28.541"; + revision 2025-08-18 { reference CR-1557; } revision 2024-04-04 { reference CR-1139; } revision 2023-09-18 { reference CR-1043 ; } revision 2023-04-26 { reference CR-0916; } @@ -56,7 +57,7 @@ module _3gpp-5gc-nrm-udmfunction { //optional support reference "3GPP TS 23.003"; key "sd sst"; - uses types5g3gpp:SNssai; + uses types3gpp:SNssai; } list managedNFProfile { diff --git a/yang-models/_3gpp-5gc-nrm-udrfunction.yang b/yang-models/_3gpp-5gc-nrm-udrfunction.yang index 1118fd1431dbcd7d2f73380054494f9fe96194fa..c8524d627071fdafe4311792f11b0da3e623e1d7 100755 --- a/yang-models/_3gpp-5gc-nrm-udrfunction.yang +++ b/yang-models/_3gpp-5gc-nrm-udrfunction.yang @@ -9,16 +9,16 @@ module _3gpp-5gc-nrm-udrfunction { import ietf-inet-types { prefix inet; } import _3gpp-common-yang-types { prefix types3gpp; } import _3gpp-common-top { prefix top3gpp; } - import _3gpp-5g-common-yang-types { prefix types5g3gpp; } organization "3gpp SA5"; contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464"; description "This IOC represents the UDR function in 5GC. For more information about the UDR, see 3GPP TS 23.501. - Copyright 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + Copyright 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved."; reference "3GPP TS 28.541"; + revision 2025-08-18 { reference CR-1557; } revision 2023-09-18 { reference CR-1043 ; } revision 2023-04-26 { reference CR-0916; } revision 2020-11-08 { reference CR-0412 ; } @@ -56,7 +56,7 @@ module _3gpp-5gc-nrm-udrfunction { //optional support reference "3GPP TS 23.003"; key "sd sst"; - uses types5g3gpp:SNssai; + uses types3gpp:SNssai; } list managedNFProfile { diff --git a/yang-models/_3gpp-5gc-nrm-udsffunction.yang b/yang-models/_3gpp-5gc-nrm-udsffunction.yang index 553ca7d5aa35cc2a288da7e5de96d66b71323d9f..fb11ce46db9cc169edb71a43455ae2c060ee2f66 100755 --- a/yang-models/_3gpp-5gc-nrm-udsffunction.yang +++ b/yang-models/_3gpp-5gc-nrm-udsffunction.yang @@ -9,7 +9,6 @@ module _3gpp-5gc-nrm-udsffunction { import ietf-inet-types { prefix inet; } import _3gpp-common-yang-types { prefix types3gpp; } import _3gpp-common-top { prefix top3gpp; } - import _3gpp-5g-common-yang-types { prefix types5g3gpp; } organization "3gpp SA5"; contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464"; @@ -19,6 +18,7 @@ module _3gpp-5gc-nrm-udsffunction { TTA, TTC). All rights reserved."; reference "3GPP TS 28.541"; + revision 2025-08-18 { reference CR-1557; } revision 2023-09-18 { reference CR-1043 ; } revision 2023-04-26 { reference CR-0916; } revision 2020-11-08 { reference CR-0412 ; } @@ -56,7 +56,7 @@ module _3gpp-5gc-nrm-udsffunction { //optional support reference "3GPP TS 23.003"; key "sd sst"; - uses types5g3gpp:SNssai; + uses types3gpp:SNssai; } list managedNFProfile { diff --git a/yang-models/_3gpp-5gc-nrm-upffunction.yang b/yang-models/_3gpp-5gc-nrm-upffunction.yang index 0c4a89df44c48865d6feb192e050397147fd531a..460f26a1d9b9fb30d66a04967b7e1c8a051c3fd0 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 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + Copyright 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved."; reference "3GPP TS 28.541 5G Network Resource Model (NRM)"; + revision 2025-08-18 { reference CR-1557; } revision 2024-05-24 { reference CR-1273 ; } revision 2023-09-18 { reference CR-1043 ; } revision 2023-04-26 { reference CR-0916; } @@ -52,7 +53,7 @@ module _3gpp-5gc-nrm-upffunction { (Slice Differentiator) field."; reference "3GPP TS 23.003"; key "sd sst"; - uses types5g3gpp:SNssai; + uses types3gpp:SNssai; } list managedNFProfile { diff --git a/yang-models/_3gpp-common-files.yang b/yang-models/_3gpp-common-files.yang index 3a4ba43dcbeafffc4253e8f33491e29993c73059..a9c934a71b0270bbc36c2bb86e2a7630b01ee20b 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 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved."; reference "3GPP TS 28.623 Generic Network Resource Model (NRM) @@ -24,41 +24,54 @@ module _3gpp-common-files { Generic Network Resource Model (NRM) Integration Reference Point (IRP); Information Service (IS)"; - - revision 2024-05-12 { reference CR-0362 ; } - revision 2023-09-18 { reference CR-0271 ; } + + // the file is common for r17,18,19 + revision 2025-07-01 { reference "CR-0557 CR-0558 CR-0559"; } + revision 2024-05-25 { reference "CR-0361 CR-0362"; } + revision 2023-09-18 { reference "CR-0270 CR-0271"; } revision 2022-09-28 { reference CR-0191; } grouping FileGrp { description "Represents the File IOC."; - leaf fileLocation { - type inet:uri ; + choice fileRetrievalMethod { mandatory true; - yext3gpp:notNotifyable ; - yext3gpp:inVariant ; - description "Location of the file incl. the file transfer protocol, - and the file name for the case the file content cannot be retrieved - by reading the 'fileContent' attribute. - - The allowed file transfer protocols are: - - sftp - - ftpes - - https - - Examples: - 'sftp://companyA.com/datastore/fileName.xml', - 'https://companyA.com/ManagedElement=1/Files=1/File=1' - "; + leaf fileLocation { + type inet:uri ; + config false; + yext3gpp:notNotifyable ; + yext3gpp:inVariant ; + description "Location of the file incl. the file transfer protocol, + and the file name. + + The allowed file transfer protocols are: + - sftp + - ftpes + - https + + Examples: + 'sftp://companyA.com/datastore/fileName.xml', + 'https://companyA.com/ManagedElement=1/Files=1/File=1' + "; + } + + leaf fileContent { + type binary ; + config false; + yext3gpp:notNotifyable ; + yext3gpp:inVariant ; + description "File content as a Base64 encoded string according to + RFC 4648 section 4."; + } } leaf fileCompression { type string ; - mandatory true; + config false; yext3gpp:notNotifyable ; yext3gpp:inVariant ; description "Name of the algorithm used for compressing the file. - An empty or absent 'fileCompression' parameter indicates the file is + An absent 'fileCompression' parameter indicates the file is not compressed. The MnS producer selects the compression algorithm. It is encouraged to use popular algorithms such as GZIP."; } @@ -67,6 +80,7 @@ module _3gpp-common-files { type uint64 ; mandatory true; units bytes; + config false; yext3gpp:notNotifyable ; yext3gpp:inVariant ; description "Size of the file"; @@ -82,6 +96,7 @@ module _3gpp-common-files { enum PROPRIETARY; } mandatory true; + config false; yext3gpp:notNotifyable ; yext3gpp:inVariant ; description "Type of the management data stored in the file."; @@ -89,16 +104,18 @@ module _3gpp-common-files { leaf fileFormat { type string ; - mandatory true; + config false; yext3gpp:notNotifyable ; yext3gpp:inVariant ; - description "Identifier of the XML or ASN.1 schema (incl. its version) - used to produce the file content."; + description "Identifier of the schema (incl. its version) + used to produce the file content. If there is no schema for the file + or it is not available, the fileFormat parameter is absent."; } leaf fileReadyTime { type yang:date-and-time ; mandatory true; + config false; yext3gpp:notNotifyable ; yext3gpp:inVariant ; description "Date and time, when the file was closed (the last time) @@ -108,22 +125,15 @@ module _3gpp-common-files { leaf fileExpirationTime { type yang:date-and-time ; - mandatory true; + config false; yext3gpp:notNotifyable ; yext3gpp:inVariant ; description "Date and time after which the file may be deleted."; } - - leaf fileContent { - type string ; // String is very restrictive - mandatory true; - yext3gpp:notNotifyable ; - yext3gpp:inVariant ; - description "File content"; - } leaf-list jobRef { type types3gpp:DistinguishedName ; + config false; yext3gpp:notNotifyable ; yext3gpp:inVariant ; description "Object instance of the 'PerfMetricJob' or 'TraceJob' @@ -132,6 +142,7 @@ module _3gpp-common-files { leaf jobId { type string ; + config false; yext3gpp:notNotifyable ; yext3gpp:inVariant ; description "Identifier of a PerfMetricJob job or a TraceJob."; @@ -142,12 +153,14 @@ module _3gpp-common-files { description "Represents the Files IOC."; leaf numberOfFiles { type uint64 ; + config false; yext3gpp:notNotifyable ; description "Number of files in a file collection."; } leaf-list jobRef { type types3gpp:DistinguishedName ; + config false; yext3gpp:notNotifyable ; yext3gpp:inVariant ; description "Object instance of the 'PerfMetricJob' or 'TraceJob' @@ -156,6 +169,7 @@ module _3gpp-common-files { leaf jobId { type string ; + config false; yext3gpp:notNotifyable ; yext3gpp:inVariant ; description "Identifier of a PerfMetricJob job or a TraceJob."; @@ -210,7 +224,7 @@ module _3gpp-common-files { The attribute '_linkToFiles' allows a MnS consumer to create simple and targeted subscriptions for 'notifyFileReady'and 'notifyFilePreparationError', or - 'notifyMOICreation', 'notifyMOIChanges' and 'notifyFilePreparationError' + '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. @@ -244,36 +258,20 @@ module _3gpp-common-files { The attributes 'fileSize', 'fileCompression', 'fileDataType' and 'fileFormat' describe the file properties. - - The 'fileLocation' attribute indicates the address where the file can - be retrieved. The address includes the file transfer protocol (schema). - Allowed file transfer protocols are 'sftp', 'ftpes' and 'https'. - - The value of 'fileLocation' can be identical to or different from the - address of the 'File' instance. The attribute 'fileContent' is - provided for retrieving the actual file content. When identifying in - the Read request a 'File' instance and specifying only the - 'fileContent' attribute be returned, then only the file content shall - be returned in the response. Note, as usual, multiple attributes can - be specified to be returned, so that the file content together with - some or all file meta data attributes can be returned in response to - a single request. - - In case the 'fileLocation' specifies a location different than the - 'File' object location, then the attribute 'fileContent' cannot be - used for retrieving the file content. For example, the 'File' object - location may be given by - 'https://companyA.com/ManagedElement=1/Files=1/File=1' - and the value of the 'fileLocation' attribute by - 'sftp://companyA.com/datastore/fileName.xml' - - In this case the file needs to be retrieved using 'sftp' from - 'sftp://companyA.com/datastore/fileName.xml'. Attempts to read the - 'fileContent' attribute shall return an error. + + The MnS producer makes the file available by one of the following means: + - For retrieval via a file transfer protocol. The fileLocation attribute + indicates the address from where the file can be retrieved. The + address includes the file transfer protocol (schema). Allowed file + transfer protocols are 'sftp', 'ftpes' and 'https'. + - For retrieval of the file contents via a CM read operation. The + attribute fileContent is provided for retrieving the actual file + content. In this case, the name of the file is equal to the identity + of the File instance. When the file retrieval NRM fragment is used together with a data - collection job ('PerfMetricJob' or 'TraceJob') the following - provisions shall apply: + collection job (PerfMetricJob or TraceJob) the following provisions + shall apply: - The attributes 'jobRef' and 'jobId' shall be supported and present. They shall identify the job that the file is related to. diff --git a/yang-models/_3gpp-common-fm.yang b/yang-models/_3gpp-common-fm.yang index 0d1d8a2767e4e344a4ac8d4fdb2a9db9be47fd91..f557faf94ff055342252f003edb5f1f553d85458 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 2025-08-13 { reference "CR-0053 CR-0054"; } revision 2025-05-01 { reference "CR-0042 CR-0043"; } // common for R18, R19 revision 2025-03-25 { reference "CR-0025 CR-0026"; } revision 2024-05-12 { @@ -46,7 +47,7 @@ module _3gpp-common-fm { enum OTHER { value 1; } - + enum COMMUNICATIONS_ALARM { value 2; } @@ -104,6 +105,218 @@ module _3gpp-common-fm { description "The possible alarm severities"; } + typedef probable-causes { + type enumeration { + enum INDETERMINATE { value 0; } + enum ALARM_INDICATION_SIGNAL { value 1; } + enum CALL_SETUP_FAILURE { value 2; } + enum DEGRADED_SIGNAL { value 3; } + enum FAR_END_RECEIVER_FAILURE { value 4; } + enum FRAMING_ERROR { value 5; } + enum LOSS_OF_FRAME { value 6; } + enum LOSS_OF_POINTER { value 7; } + enum LOSS_OF_SIGNAL { value 8; } + enum PAYLOAD_TYPE_MISMATCH { value 9; } + enum REMOTE_ALARM_INTERFACE { value 11; } + enum EXCESSIVE_BIT_ERROR_RATE { value 12; } + enum PATH_TRACE_MISMATCH { value 13; } + enum UNAVAILABLE { value 14; } + enum SIGNAL_LABEL_MISMATCH { value 15; } + enum LOSS_OF_MULTI_FRAME { value 16; } + enum COMMUNICATIONS_RECEIVE_FAILURE { value 17; } + enum COMMUNICATIONS_TRANSMIT_FAILURE { value 18; } + enum MODULATION_FAILURE { value 19; } + enum DEMODULATION_FAILURE { value 20; } + enum BACK_PLANE_FAILURE { value 51; } + enum DATA_SET_PROBLEM { value 52; } + enum EQUIPMENT_IDENTIFIER_DUPLICATION { value 53; } + enum EXTERNAL_IF_DEVICE_PROBLEM { value 54; } + enum LINE_CARD_PROBLEM { value 55; } + enum MULTIPLEXER_PROBLEM { value 56; } + enum NE_IDENTIFIER_DUPLICATION { value 57; } + enum POWER_PROBLEM { value 58; } + enum PROCESSOR_PROBLEM { value 59; } + enum PROTECTION_PATH_FAILURE { value 60; } + enum RECEIVER_FAILURE { value 61; } + enum REPLACEABLE_UNIT_MISSING { value 62; } + enum REPLACEABLE_UNIT_TYPE_MISMATCH { value 63; } + enum SYNCHRONIZATION_SOURCE_MISMATCH { value 64; } + enum TERMINAL_PROBLEM { value 65; } + enum TIMING_PROBLEM { value 66; } + enum TRANSMITTER_FAILURE { value 67; } + enum TRUNK_CARD_PROBLEM { value 68; } + enum REPLACEABLE_UNIT_PROBLEM { value 69; } + enum REAL_TIME_CLOCK_FAILURE { value 70; } + enum PROTECTION_MECHANISM_FAILURE { value 81; } + enum PROTECTING_RESOURCE_FAILURE { value 82; } + enum AIR_COMPRESSOR_FAILURE { value 101; } + enum AIR_CONDITIONING_FAILURE { value 102; } + enum AIR_DRYER_FAILURE { value 103; } + enum BATTERY_DISCHARGING { value 104; } + enum BATTERY_FAILURE { value 105; } + enum COMMERCIAL_POWER_FAILURE { value 106; } + enum COOLING_FAN_FAILURE { value 107; } + enum ENGINE_FAILURE { value 108; } + enum FIRE_DETECTOR_FAILURE { value 109; } + enum FUSE_FAILURE { value 110; } + enum GENERATOR_FAILURE { value 111; } + enum LOW_BATTERY_THRESHOLD { value 112; } + enum PUMP_FAILURE { value 113; } + enum RECTIFIER_FAILURE { value 114; } + enum RECTIFIER_HIGH_VOLTAGE { value 115; } + enum RECTIFIER_LOW_F_VOLTAGE { value 116; } + enum VENTILATION_SYSTEM_FAILURE { value 117; } + enum ENCLOSURE_DOOR_OPEN { value 118; } + enum EXPLOSIVE_GAS { value 119; } + enum FIRE { value 120; } + enum FLOOD { value 121; } + enum HIGH_HUMIDITY { value 122; } + enum HIGH_TEMPERATURE { value 123; } + enum HIGH_WIND { value 124; } + enum ICE_BUILD_UP { value 125; } + enum INTRUSION_DETECTION { value 126; } + enum LOW_FUEL { value 127; } + enum LOW_HUMIDITY { value 128; } + enum LOW_CABLE_PRESSURE { value 129; } + enum LOW_TEMPERATURE { value 130; } + enum LOW_WATER { value 131; } + enum SMOKE { value 132; } + enum TOXIC_GAS { value 133; } + enum EXTERNAL_POINT_FAILURE { value 136; } + enum STORAGE_CAPACITY_PROBLEM { value 151; } + enum MEMORY_MISMATCH { value 152; } + enum CORRUPT_DATA { value 153; } + enum OUT_OF_CPU_CYCLES { value 154; } + enum SOFTWARE_ENVIRONMENT_PROBLEM { value 155; } + enum SOFTWARE_DOWNLOAD_FAILURE { value 156; } + enum LOSS_OF_REAL_TIME { value 157; } + enum REINITIALIZED { value 158; } + enum EXCESSIVE_ERROR_RATE { value 203; } + enum ADAPTER_ERROR { value 301; } + enum APPLICATION_SUBSYSTEM_FAILURE { value 302; } + enum BANDWIDTH_REDUCED { value 303; } + enum COMMUNICATIONS_PROTOCOL_ERROR { value 305; } + enum COMMUNICATIONS_SUBSYSTEM_FAILURE { value 306; } + enum CONFIGURATION_OR_CUSTOMIZATION_ERROR { value 307; } + enum CONGESTION { value 308; } + enum CPU_CYCLES_LIMIT_EXCEEDED { value 310; } + enum DATA_SET_OR_MODEM_ERROR { value 311; } + enum DTE_DCE_INTERFACE_ERROR { value 313; } + enum EQUIPMENT_MALFUNCTION { value 315; } + enum EXCESSIVE_VIBRATION { value 316; } + enum FILE_ERROR { value 317; } + enum HEATING_OR_VENTILATION_OR_COOLING_SYSTEM_PROBLEM { value 321; } + enum HUMIDITY_UNACCEPTABLE { value 322; } + enum INPUT_OUTPUT_DEVICE_ERROR { value 323; } + enum INPUT_DEVICE_ERROR { value 324; } + enum LAN_ERROR { value 325; } + enum LEAK_DETECTED { value 326; } + enum LOCAL_NODE_TRANSMISSION_ERROR { value 327; } + enum MATERIAL_SUPPLY_EXHAUSTED { value 330; } + enum OUT_OF_MEMORY { value 332; } + enum OUTPUT_DEVICE_ERROR { value 333; } + enum PERFORMANCE_DEGRADED { value 334; } + enum PRESSURE_UNACCEPTABLE { value 336; } + enum QUEUE_SIZE_EXCEEDED { value 339; } + enum RECEIVE_FAILURE { value 340; } + enum REMOTE_NODE_TRANSMISSION_ERROR { value 342; } + enum RESOURCE_AT_OR_NEARING_CAPACITY { value 343; } + enum RESPONSE_TIME_EXCESSIVE { value 344; } + enum RETRANSMISSION_RATE_EXCESSIVE { value 345; } + enum SOFTWARE_ERROR { value 346; } + enum SOFTWARE_PROGRAM_ABNORMALLY_TERMINATED { value 347; } + enum SOFTWARE_PROGRAM_ERROR { value 348; } + enum TEMPERATURE_UNACCEPTABLE { value 350; } + enum THRESHOLD_CROSSED { value 351; } + enum TOXIC_LEAK_DETECTED { value 353; } + enum TRANSMIT_FAILURE { value 354; } + enum UNDERLYING_RESOURCE_UNAVAILABLE { value 356; } + enum VERSION_MISMATCH { value 357; } + enum A_BIS_TO_BTS_INTERFACE_FAILURE { value 501; } + enum A_BIS_TO_TRX_INTERFACE_FAILURE { value 502; } + enum ANTENNA_PROBLEM { value 503; } + enum BATTERY_BREAKDOWN { value 504; } + enum BATTERY_CHARGING_FAULT { value 505; } + enum CLOCK_SYNCHRONIZATION_PROBLEM { value 506; } + enum COMBINER_PROBLEM { value 507; } + enum DISK_PROBLEM { value 508; } + enum EXCESSIVE_RECEIVER_TEMPERATURE { value 510; } + enum EXCESSIVE_TRANSMITTER_OUTPUT_POWER { value 511; } + enum EXCESSIVE_TRANSMITTER_TEMPERATURE { value 512; } + enum FREQUENCY_HOPPING_DEGRADED { value 513; } + enum FREQUENCY_HOPPING_FAILURE { value 514; } + enum FREQUENCY_REDEFINITION_FAILED { value 515; } + enum LINE_INTERFACE_FAILURE { value 516; } + enum LINK_FAILURE { value 517; } + enum LOSS_OF_SYNCHRONIZATION { value 518; } + enum LOST_REDUNDANCY { value 519; } + enum MAINS_BREAKDOWN_WITH_BATTERY_BACKUP { value 520; } + enum MAINS_BREAKDOWN_WITHOUT_BATTERY_BACKUP { value 521; } + enum POWER_SUPPLY_FAILURE { value 522; } + enum RECEIVER_ANTENNA_FAULT { value 523; } + enum RECEIVER_MULTICOUPLER_FAILURE { value 525; } + enum REDUCED_TRANSMITTER_OUTPUT_POWER { value 526; } + enum SIGNAL_QUALITY_EVALUATION_FAULT { value 527; } + enum TIMESLOT_HARDWARE_FAILURE { value 528; } + enum TRANSCEIVER_PROBLEM { value 529; } + enum TRANSCODER_PROBLEM { value 530; } + enum TRANSCODER_OR_RATE_ADAPTER_PROBLEM { value 531; } + enum TRANSMITTER_ANTENNA_FAILURE { value 532; } + enum TRANSMITTER_ANTENNA_NOT_ADJUSTED { value 533; } + enum TRANSMITTER_LOW_VOLTAGE_OR_CURRENT { value 535; } + enum TRANSMITTER_OFF_FREQUENCY { value 536; } + enum DATABASE_INCONSISTENCY { value 537; } + enum FILE_SYSTEM_CALL_UNSUCCESSFUL { value 538; } + enum INPUT_PARAMETER_OUT_OF_RANGE { value 539; } + enum INVALID_PARAMETER { value 540; } + enum INVALID_POINTER { value 541; } + enum MESSAGE_NOT_EXPECTED { value 542; } + enum MESSAGE_NOT_INITIALIZED { value 543; } + enum MESSAGE_OUT_OF_SEQUENCE { value 544; } + enum SYSTEM_CALL_UNSUCCESSFUL { value 545; } + enum TIMEOUT_EXPIRED { value 546; } + enum VARIABLE_OUT_OF_RANGE { value 547; } + enum WATCH_DOG_TIMER_EXPIRED { value 548; } + enum COOLING_SYSTEM_FAILURE { value 549; } + enum EXTERNAL_EQUIPMENT_FAILURE { value 550; } + enum EXTERNAL_POWER_SUPPLY_FAILURE { value 551; } + enum EXTERNAL_TRANSMISSION_DEVICE_FAILURE { value 552; } + enum REDUCED_ALARM_REPORTING { value 561; } + enum REDUCED_EVENT_REPORTING { value 562; } + enum RECUCED_LOGGING_CAPABILITY { value 563; } + enum SYSTEM_RESOURCES_OVERLOAD { value 564; } + enum BROADCAST_CHANNEL_FAILURE { value 565; } + enum CONNECTION_ESTABLISHMENT_ERROR { value 566; } + enum INVALID_MESSAGE_RECEIVED { value 567; } + enum INVALID_MSU_RECEIVED { value 568; } + enum LAPD_LINK_PROTOCOL_FAILURE { value 569; } + enum LOCAL_ALARM_INDICATION { value 570; } + enum REMOTE_ALARM_INDICATION { value 571; } + enum ROUTING_FAILURE { value 572; } + enum SS7_PROTOCOL_FAILURE { value 573; } + enum TRANSMISSION_ERROR { value 574; } + enum AUTHENTICATION_FAILURE { value 701; } + enum BREACH_OF_CONFIDENTIALITY { value 702; } + enum CABLE_TAMPER { value 703; } + enum DELAYED_INFORMATION { value 704; } + enum DENIAL_OF_SERVICE { value 705; } + enum DUPLICATE_INFORMATION { value 706; } + enum INFORMATION_MISSING { value 707; } + enum INFORMATION_MODIFICATION_DETECTED { value 708; } + enum INFORMATION_OUT_OF_SEQUENCE { value 709; } + enum INTRUSION_DETECTED { value 710; } + enum KEY_EXPIRED { value 711; } + enum NON_REPUDIATION_FAILURE { value 712; } + enum OUT_OF_HOURS_ACTIVITY { value 713; } + enum OUT_OF_SERVICE { value 714; } + enum PROCEDURAL_ERROR { value 715; } + enum UNAUTHORISED_ACCESS_ATTEMPT { value 716; } + enum UNEXPECTED_INFORMATION { value 717; } + enum UNSPECIFIED_REASON { value 718; } + } + description "Values are from the (informative) Annex B of 3GPP TS 28.111."; + } + grouping AlarmCommentGrp { leaf commentTime { type yang:date-and-time; @@ -343,6 +556,7 @@ module _3gpp-common-fm { leaf probableCause { type union { + type probable-causes; type int32; type string; } diff --git a/yang-models/_3gpp-common-managed-function.yang b/yang-models/_3gpp-common-managed-function.yang index ea4390cc348f5167fb4501fdb3fcbd70c2a9d8a3..efa2a1f3a9508e7d4de7a17e8657abd5c99a4f1f 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 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + Copyright 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved."; reference "3GPP TS 28.622 @@ -24,6 +24,7 @@ module _3gpp-common-managed-function { 3GPP TS 28.620 Umbrella Information Model (UIM)"; + revision 2025-08-06 { reference CR-0550; } revision 2024-02-24 { reference CR-0346; } revision 2023-09-18 { reference CR-0271; } revision 2023-04-26 { reference CR-0250; } @@ -118,7 +119,7 @@ module _3gpp-common-managed-function { leaf administrativeState { type types3gpp:BasicAdministrativeState; - mandatory true; + default LOCKED; description "Permission to use or prohibition against using the instance"; } diff --git a/yang-models/_3gpp-common-measurements.yang b/yang-models/_3gpp-common-measurements.yang index a1c17734b7a65ca18bb540ca9c97b91f717e7831..31f7e901edc1fd9533023de9f319cce3e31c2080 100755 --- a/yang-models/_3gpp-common-measurements.yang +++ b/yang-models/_3gpp-common-measurements.yang @@ -56,6 +56,7 @@ module _3gpp-common-measurements { Integration Reference Point (IRP); Information Service (IS)"; + revision 2025-08-06 { reference CR-0550; } revision 2025-05-18 { reference CR-0531; } revision 2025-02-05 { reference CR-0460; } revision 2025-01-28 { reference CR-0511; } @@ -103,12 +104,6 @@ module _3gpp-common-measurements { group of vendor specific performance metrics."; } - leaf thresholdLevel { - type uint64; - mandatory true; - description "Number (key) for a single threshold in the threshold list - applicable to the monitored performance metric."; - } leaf thresholdDirection { type enumeration { @@ -248,7 +243,7 @@ module _3gpp-common-measurements { description "Represents the attributes of the IOC PerfMetricJob"; leaf administrativeState { - default UNLOCKED; + default LOCKED; type types3gpp:BasicAdministrativeState ; description "Enable or disables production of the metrics"; } @@ -339,7 +334,7 @@ module _3gpp-common-measurements { to monitor."; leaf administrativeState { - default UNLOCKED; + default LOCKED; type types3gpp:BasicAdministrativeState ; description "Enables or disables the ThresholdMonitor."; } diff --git a/yang-models/_3gpp-common-qmcjob.yang b/yang-models/_3gpp-common-qmcjob.yang index 9ae62e2144a9c410553de03eb57f14a0b269bcda..c450b1cb16554759abd4c4bf9e6d69a522993aec 100644 --- a/yang-models/_3gpp-common-qmcjob.yang +++ b/yang-models/_3gpp-common-qmcjob.yang @@ -7,7 +7,6 @@ module _3gpp-common-qmcjob { import _3gpp-common-subnetwork { prefix subnet3gpp; } 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-managed-element { prefix me3gpp; } import _3gpp-common-trace { prefix trace3gpp; } import ietf-inet-types { prefix inet; } @@ -27,6 +26,7 @@ module _3gpp-common-qmcjob { Integration Reference Point (IRP); Information Service (IS)"; + revision 2025-08-18 { reference CR-1557; } revision 2024-11-05 { reference "CR-0470"; } revision 2023-09-18 { reference CR-0271 ; } revision 2023-02-14 { reference "CR-0234"; } @@ -111,7 +111,7 @@ module _3gpp-common-qmcjob { Assistance Information). A Network Slice end to end is identified by S-NSSAI."; key "sd sst"; - uses types5g3gpp:SNssai; + uses types3gpp:SNssai; } leaf qMCConfigFile { diff --git a/yang-models/_3gpp-common-trace.yang b/yang-models/_3gpp-common-trace.yang index 460ea4b21b417a4178973eb99b3604e698991fb7..55db59b19b6c9d2b3873a1e275a96f3f4eddc9ee 100755 --- a/yang-models/_3gpp-common-trace.yang +++ b/yang-models/_3gpp-common-trace.yang @@ -25,6 +25,8 @@ module _3gpp-common-trace { Integration Reference Point (IRP); Information Service (IS)" ; + revision 2025-08-06 { reference CR-0563; } + revision 2025-06-24 { reference "CR-0550"; } revision 2025-05-06 { reference "CR-0531 CR-0535" ; } revision 2025-02-06 { reference "CR-0503 CR-0507" ; } revision 2025-02-05 { reference "CR-0460" ; } @@ -114,47 +116,58 @@ module _3gpp-common-trace { This <> defines an area scope"; choice AreaScopeChoice { - leaf-list eutraCellIdList { - type string; - min-elements 1; - max-elements 32; - description "List of E-UTRAN cells identified by E-UTRAN-CGI"; - } - - leaf-list nrCellIdList { - type string; - min-elements 1; - max-elements 32; - description "List of NR cells identified by NG-RAN CGI"; - } - - leaf-list tacList { - type types3gpp:Tac; - min-elements 1; - max-elements 8; - description "Tracking Area Code list"; + case eutran-only { + leaf-list eutraCellIdList { + type string; + min-elements 1; + max-elements 32; + description "List of E-UTRAN cells identified by E-UTRAN-CGI"; + } + } + case tac { + leaf-list tacList { + type types3gpp:Tac; + min-elements 1; + max-elements 8; + description "Tracking Area Code list"; + } + leaf-list cAGIdList { + type string; + max-elements 256; + description "It identifies a CAG list containing up to + 256 CAG-identifiers per UE or up to 12 CAG-identifiers + per cell, see TS 38.331 [38]. CAG ID is used to combine + with PLMN ID to identify a PNI-NPN.AG ID is a hexadecimal + range with size 32 bit."; + } } - - list taiList { - description "Tracking Area Identity list"; - key idx; - min-elements 1; - max-elements 8; - leaf idx { type string; } - uses types3gpp:TaiGrp; + case else { + 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 types3gpp:NpnIdGrp; + leaf idx { type string; } + } + leaf-list nrCellIdList { + must 'not(../taiList)'; + type string; + max-elements 32; + description "List of NR cells identified by NG-RAN CGI"; + } + list taiList { + must 'not(../nrCellIdList)'; + description "Tracking Area Identity list"; + key idx; + max-elements 8; + leaf idx { type string; } + uses types3gpp:TaiGrp; + } } } - - 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 in case of the cell is NPN-only cell. - (NPN-Identity referring to TS 38.331)."; - key idx; - min-elements 1; - uses NpnIdGrp; - leaf idx { type string; } - } } grouping NpnIdGrp { @@ -225,10 +238,13 @@ module _3gpp-common-trace { uses types3gpp:PLMNId; // mcc+mnc leaf traceId { - type string; + type string { + pattern "[0-9a-fA-F]{6}"; + } mandatory true; description "An identifier, which identifies the Trace - (together with MCC and MNC). This is a 3 byte Octet String."; + (together with MCC and MNC). This is a 3 byte Octet String, + expressed in hexadecimal form e.g., '1a7b3d')."; } } diff --git a/yang-models/_3gpp-common-yang-types.yang b/yang-models/_3gpp-common-yang-types.yang index e8bd963e1b98c392c1b151e0c49371b99b0c10a9..815d55d571ab1986664842d8441f300797d2bff9 100755 --- a/yang-models/_3gpp-common-yang-types.yang +++ b/yang-models/_3gpp-common-yang-types.yang @@ -16,6 +16,8 @@ module _3gpp-common-yang-types { TTA, TTC). All rights reserved."; reference "3GPP TS 28.623"; + revision 2025-08-18 { reference CR-1557; } + revision 2025-08-06 { reference CR-0563; } revision 2025-02-18 { reference CR-0511; } revision 2025-02-06 { reference CR-0507; } revision 2024-05-18 { reference CR-0359; } @@ -72,24 +74,12 @@ 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 THURSDAY; enum FRIDAY; enum SATURDAY; enum SUNDAY; @@ -116,7 +106,27 @@ module _3gpp-common-yang-types { yext3gpp:inVariant; } } + grouping SNssai { + description + "Single Network Slice Selection Assistance Information(S-NSSAI)"; + reference "3GPP TS 23.003"; + leaf sd { + description "Slice Differentiator + If not needed, the value can be set to ff:ff:ff."; + type yang:hex-string { + length 8; + } + reference "3GPP TS 23.003"; + } + + leaf sst { + type uint8; + description "Slice/Service Type. + Values 0 to 127 belong to standardized SST range and are defined in + 3GPP TS 23.501. Values 128 to 255 belong to operator-specific range."; + } + } grouping ProcessMonitorGrp { description "Provides attributes to monitor the progress of processes with specific purpose and limited lifetime running on MnS producers. @@ -278,6 +288,47 @@ module _3gpp-common-yang-types { } } + grouping NpnIdGrp { + description "Represents the NPN supported by the <> using this + <> as one of its attributes in case of the cell is a + NPN-only cell."; + + list plmnId { + key "mcc mnc"; + min-elements 1; + description "It specifies the PLMN Id of the NPN network."; + uses types3gpp:PLMNId; + } + + choice npnidChoice { + leaf-list cAGIdList { + type string { + pattern '^[A-Fa-f0-9]{8}$'; + } + max-elements 256; + description "It identifies a CAG list containing up to 12 + CAG-identifiers per Ue or up to 12 CAG-identifiers per cell, + see TS 38.331. + CAG ID is used to combine with PLMN ID to identify a PNI-NPN.CAG ID is + a hexadecimal range with size 32 bit"; + } + + leaf-list nIDList { + type string { + pattern '^[A-Fa-f0-9]{11}$'; + } + max-elements 16; + description "It identifies a list of NIDs containing up to 16 NIDs, see + TS 38.331. NID is used to combine with PLMN ID to identify an SNPN. + NID is a hexadecimal range with size 44 bit."; + } + } + } + + + + + typedef TenthOfDegrees { type uint16 { range 0..3600; @@ -333,7 +384,43 @@ module _3gpp-common-yang-types { enum OFF; } } - + grouping SPNInfoIdGrp { + description "This data type represents the SNPN identification + consisting of MCC, MNC, and optionally NID."; + leaf mcc { + type string; + description "Mobile Country Code (MCC) of the SNPN."; + } + + leaf mnc { + type string; + description "Mobile Network Code (MNC) of the SNPN."; + } + + leaf nId { + type string; + description "Network Identifier (NID) of the SNPN."; + } + } + grouping SNPNIdGrp { + description "This <> represents the information of a SNPN + identification"; + leaf mCC { + description "This is the Mobile Country Code (MCC) of the PLMN + identifier. See TS 23.003 [13] subclause 2.2 and 12.1"; + type string; + } + leaf mNC { + description "This is the Mobile Network Code (MNC) of the PLMN + identifier. See TS 23.003 [13] subclause 2.2 and 12.1."; + type string; + } + leaf nId { + description "Network Identity; Shall be present if PlmnIdNid + identifies an SNPN"; + type string; + } + } // grouping ManagedNFProfile will be removed as it is // being moved to _3gpp-5gc-nrm-nfprofile grouping ManagedNFProfile { @@ -359,6 +446,14 @@ module _3gpp-common-yang-types { type NfType; description "Type of the Network Function" ; } + leaf heartBeatTimer { + description "Time in seconds expected between 2 consecutive + heart-beat messages from an NF Instance to the NRF. + It may be included in the registration request. + When present in the request it shall contain the + heartbeat time proposed by the NF service consumer."; + type uint16; + } leaf hostAddr { mandatory true; @@ -373,6 +468,51 @@ module _3gpp-common-yang-types { allowed to consume NF Service(s) of NF Service Producer."; reference "See TS 23.501" ; } + list allowedPlmns { + description "PLMNs allowed to access the NF instance. + If not provided, any PLMN is allowed to access the NF."; + min-elements 1; + key "mcc mnc"; + uses types3gpp:PLMNId; + } + + list sNPNList { + key "mcc mnc nId"; + description "SNPN(s) of the Network Function. This attributeIE shall be + present if the NF pertains to one or more SNPNs."; + reference "TS 29.510"; + uses SPNInfoIdGrp; + } + list allowedSNPNs { + description "SNPNs allowed to access the NF instance. + The absence of this attribute in the NF profile indicates that no SNPN, + other than the SNPN(s) registered in the snpnList attribute of the + NF Profile, is allowed to access the service instance"; + key "mCC mNC"; + uses SNPNIdGrp; + } + + leaf-list allowedNfTypes { + description "Type of the NFs allowed to access the NF instance. + If not provided, any NF type is allowed to access the NF."; + min-elements 1; + type types3gpp:NfType; + } + + leaf-list allowedNfDomains { + description "Pattern (regular expression according to the ECMA-262 + dialect [75]) representing the NF domain names within the PLMN of + the NRF allowed to access the NF instance If not provided, + any NF domain is allowed to access the NF."; + type string; + } + + list allowedNSSAIs { + description "S-NSSAI of the allowed slices to access the NF instance. + If not provided, any slice is allowed to access the NF."; + key "sst sd"; + uses SNssai; + } leaf location { type string ; @@ -390,28 +530,106 @@ module _3gpp-common-yang-types { nfServiceList parameters, those will have precedence over this value."; reference "TS 29.510" ; } - - leaf nFSrvGroupId { + leaf-list recoveryTime { + description "Timestamp when the NF was (re)started. The NRF shall notify + NFs subscribed to receiving notifications of changes of the NF profile, + if the NF recoveryTime is changed"; + type yang:date-and-time; + } + leaf nfServicePersistence { + description "This parameter indicates whether the different service + instances of a same NF Service in the NF instance, supporting a same + API version, are capable to persist their resource state in shared + storage and therefore these resources are available after a new NF + service instance supporting the same API version is selected by a NF + Service Consumer "; + reference "TS 29.510"; + type boolean; + } + leaf-list nfSetIdList { type string ; - description "This parameter defines identity of the group that is - served by the NF instance. - May be config false or true depending on the ManagedFunction. - Config=true for Udrinfo. Config=false for UdmInfo and AusfInfo. - Shall be present if ../nfType = UDM or AUSF or UDR. "; - reference "TS 29.510" ; + min-elements 1; + description "A NF Set Identifier is a globally unique identifier of + a set of equivalent and interchangeable CP NFs from a given network + that provide distribution, redundancy and scalability + (see clause 5.21.3 of 3GPP TS 23.501 [2]).An NF Set Identifier shall + be constructed from the MCC, MNC, NID (for SNPN), NF type and a Set ID. + A NF Set Identifier shall be formatted as the following string: + set.set.5gc.mnc.mcc for a NF Set in a PLMN, or + set.set.5gc.nid.mnc.mcc for a NF Set + in a SNPN.At most one NF Set ID shall be indicated per PLMN-ID or SNPN + of the NF."; } - - leaf-list supportedDataSetIds { - type enumeration { - enum SUBSCRIPTION; - enum POLICY; - enum EXPOSURE; - enum APPLICATION; - } - description "List of supported data sets in the UDR instance. - May be present if ../nfType = UDR"; - reference "TS 29.510" ; + leaf-list nfProfileChangesSupportInd { + description "This parameter indicates if the NF Service Consumer supports + or does not support receiving NF Profile Changes. It may be present in + the NFRegister or NFUpdate (NF Profile Complete Replacement) request and + shall be absent in the response (see Annex B 3GPP TS 29.510 [23]). "; + max-elements 1; + type boolean; + } + list defaultNotificationSubscriptions { + description "Notification endpoints for different notification types. + This attribute may contain multiple default subscriptions for a same + notification type; in that case, those default subscriptions are used + as alternative notification endpoints."; + key notificationType; + min-elements 1; + uses types3gpp:DefaultNotificationSubscription; + } + leaf servingScope { + description "This parameter indicates the served geographical areas + of a NF instance."; + type string; + } + leaf-list lcHSupportInd { + description "This parameter indicates whether the NF supports or does + not support Load Control based on LCI Header."; + reference "clause 6.3 of 3gpp TS 29.500"; + max-elements 1; + type boolean; + } + leaf-list olcHSupportInd { + description "This parameter indicates whether the NF supports or does + not support Overload Control based on OCI Header ."; + reference "clause 6.4 of 3gpp TS 29.500"; + max-elements 1; + type boolean; + } + leaf-list nfSetRecoveryTimeList { + description "This parameter contains the recovery time of NF Set(s) + indicated by the NfSetId, where the NF instance belongs."; + type yang:date-and-time ; + max-elements 1; } + leaf-list serviceSetRecoveryTimeList { + description "This parameter contains the recovery time of NF Service + Set(s) configured in the NF instance, which are indicated by the + NfServiceSetId"; + type yang:date-and-time ; + max-elements 1; + } + leaf scpDomains { + description "This parameter shall carry the list of SCP domains the + SCP belongs to, or the SCP domain the NF (other than SCP) or the SEPP + belongs to.."; + type string; + } + leaf vendorId { + description "Vendor ID of the NF instance, according to the + IANA-assigned SMI Network Management Private Enterprise Codes [77]. + allowedValues: 6 decimal digits; if the SMI code has less than + 6 digits, it shall be padded with leading digits 0 to complete + a 6-digit string value."; + type string; + } + leaf-list interPlmnFqdn { + description "If the NF needs to be discoverable by other + NFs in a different PLMN, then an FQDN that is used + for inter-PLMN routing is specified."; + type inet:domain-name; + } + leaf-list smfServingAreas { type string ; @@ -419,16 +637,7 @@ module _3gpp-common-yang-types { Shall be present if ../nfType = UPF"; reference "TS 29.510" ; } - - leaf priority { - type uint16; - description "This parameter defines Priority (relative to other NFs - of the same type) in the range of 0-65535, to be used for NF selection; - lower values indicate a higher priority. If priority is also present - in the nfServiceList parameters, those will have precedence over - this value. Shall be present if ../nfType = AMF "; - reference "TS 29.510" ; - } + } typedef usageState { diff --git a/yang-models/_3gpp-common-antennafunction.yang b/yang-models/_3gpp-eqp-antennafunction.yang similarity index 84% rename from yang-models/_3gpp-common-antennafunction.yang rename to yang-models/_3gpp-eqp-antennafunction.yang index 3ad251f21924f7784c49880d4503727342533a6e..0497c401179294db263f32d455ec3f6cee4f6ada 100644 --- a/yang-models/_3gpp-common-antennafunction.yang +++ b/yang-models/_3gpp-eqp-antennafunction.yang @@ -1,197 +1,195 @@ -module _3gpp-common-antennafunction { - yang-version 1.1; - namespace "urn:3gpp:sa5:_3gpp-common-antennafunction"; - prefix "antfunc3gpp"; - - import _3gpp-common-yang-types { prefix types3gpp; } - import _3gpp-common-managed-function { prefix mf3gpp; } - import _3gpp-common-managed-element { prefix me3gpp; } - import _3gpp-common-top { prefix top3gpp; } - - organization "3GPP SA5"; - contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464"; - description "Defines the YANG mapping of the Antenna Function Information - Object Class (IOC) that is part of the Generic Network Resource Model (NRM). - Copyright 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, - TTA, TTC). All rights reserved."; - reference "3GPP TS 28.662 Generic Network Resource Model (NRM)"; - - revision 2025-03-27 { - description "Initial revision"; - } -grouping AntennaFunctionGrp { - description "Represents the AntennaFunction."; - uses mf3gpp:ManagedFunctionGrp; - - leaf beamTilt { - description "The beam tilt of the wanted antenna beam - in the vertical plane. A positive value on the - beamtilt indicates an antenna beam direction below the - vertical plane."; - units degree; - type types3gpp:TenthOfDegrees; - } - - leaf bearing { - description "The bearing in degrees that the antenna is pointing in. - AllowedValues: See \"Antenna bearing\" in 3GPP TS 25.463."; - reference "3GPP TS 25.463, UTRAN Iuant interface: - Remote Electrical Tilting (RET) - antennas Application Part (RETAP) signalling"; - type types3gpp:TenthOfDegrees; - } - - leaf elevation { - description "The elevation the antenna function should have, - based on World Geodetic System (1984 version) global - reference frame (WGS 84). Positive values correspond to - meters above sea level, negative values correspond to meters - below sea level. If empty, value is not defined."; - type types3gpp:Altitude; - } - - leaf horizBeamWidth { - description "The 3 dB power beamwidth of the antenna pattern - in the horizontal plane. - A value of 360 indicates an omnidirectional antenna. - Note: The value of this attribute has no operational impact - on the network, e.g. the NE behaviour is not affected by the - value setting of this attribute. - Note as well that this attribute is not supported over the - Iuant interface according to 3GPP TS37.466. - A single integral value corresponding to an angle in degrees - between 0 and 360."; - reference "3GPP TS 37.466, Iuant interface: Application part"; - type types3gpp:TenthOfDegrees; - } - - leaf latitude { - description "Latitude of transmitter antenna position. - Positive value means north, negative value means south. - - Specification: WGS 84 - Allowed Values: { -90.000000..90.000000 }"; - units degree; - type types3gpp:Latitude; - } - - leaf longititude { - description "Longitude of transmitter antenna position. - Positive value means east, negative value means west. - Specification: WGS 84 - Allowed Values: { -180.000000..180.000000 }"; - units degree; - type types3gpp:Longitude; - } - - leaf maxAzimuthValue { - description "The maximum amount of change of azimuth the RET - system can support. This is the change in degrees clockwise - from bearing. - Note: The value of this attribute has no operational impact - on the network, e.g. the NE behaviour is not affected by the - value setting of this attribute. - Note as well that this attribute is not supported over the - Iuant interface according to Ref. 3GPP TS 37.466. - A single decimal value corresponding to an angle in degrees - between 0 and 360 with a resolution of 0.1 degrees."; - reference "3GPP TS 37.466, Iuant interface: Application part"; - units degree; - type decimal64 { - range "0..360"; - fraction-digits 1; - } - } - leaf minAzimuthValue { - description "The minimum amount of change of azimuth the RET - system can support. This is the change in degrees clockwise - from bearing. - Note: The value of this attribute has no operational impact - on the network, e.g. the NE behaviour is not affected by the - value setting of this attribute. - Note as well that this attribute is not supported over the - Iuant interface according to Ref. 3GPP TS 37.466. - A single decimal value corresponding to an angle in degrees - between 0 and 360 with a resolution of 0.1 degrees."; - reference "3GPP TS 37.466, Iuant interface: Application part"; - units degree; - type decimal64 { - range "0..360"; - fraction-digits 1; - } - } - - leaf-list referencedBy { - description "This attribute contains the DNs of one or more objects - that refer to this object. - - In the case of AntennaFunction, these referring objects may - include DNs of SectorEquipmentFunction instances if associations - between them and the AntennaFunction exist. - - Note: referencedBy is a DN datatype and so can reference an MOI - under a different ME"; - config false; - type types3gpp:DistinguishedName; - } - - - leaf retGroupName { - description "The group name is a textual, alpha-numeric string to - define a logical grouping of antennas which may be in different cells. - - This attribute permits the definition of a logical grouping - of the antennas. This may be defined either at - installation time, or by management activity"; - type string; - } - - leaf retTiltValue { - description "The electrical tilt setting of the antenna, \"Tilt value\" in - 3GPP TS 37.466."; - reference "3GPP TS 37.466, Iuant interface: Application part"; - type types3gpp:TenthOfDegrees; - } - - leaf vertBeamWidth { - description "The 3 dB power beamwidth of the antenna pattern in - the vertical plane. - The value of this attribute has no operational impact on - the network, e.g. the NE behaviour is not affected by the - value setting of this attribute. - This attribute is not supported over the Iuant interface - according to Ref. 3GPP TS 37.466."; - reference "3GPP TS 37.466, Iuant interface: Application part"; - units degree; - type uint32 { - range "0..180"; - } - } - - leaf-list theCellList { - description "This attribute contains the DNs of EUtranGenericCell - or UtranGenericCell if associations between them exist. - This attribute contains the DNs of GSMCellPart if association - between them exist. "; - config false; - status deprecated; - type types3gpp:DistinguishedName; - } - - } - - augment "/me3gpp:ManagedElement" { - - list AntennaFunction { - key id; - uses top3gpp:Top_Grp; - description "This MOI represents an array of radiating elements that - may be tilted to adjust the RF coverage of a cell(s)."; - - container attributes { - uses AntennaFunctionGrp; - } - uses mf3gpp:ManagedFunctionContainedClasses; - } - } -} +module _3gpp-eqp-antennafunction { + yang-version 1.1; + namespace "urn:3gpp:sa5:_3gpp-eqp-antennafunction"; + prefix "ant3gpp"; + + import _3gpp-common-yang-types { prefix types3gpp; } + import _3gpp-common-managed-function { prefix mf3gpp; } + import _3gpp-common-managed-element { prefix me3gpp; } + import _3gpp-common-top { prefix top3gpp; } + + organization "3GPP SA5"; + contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464"; + description "Defines the YANG mapping of the Antenna Function Information + Object Class (IOC) that is part of the Generic Network Resource Model (NRM). + Copyright 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + TTA, TTC). All rights reserved."; + reference "3GPP TS 28.541 5G Network Resource Model (NRM)"; + + revision 2025-08-12 { reference "CR1580"; } + revision 2025-03-27 { reference "Initial revision"; } + + grouping AntennaFunctionGrp { + description "Represents the AntennaFunction."; + uses mf3gpp:ManagedFunctionGrp; + + leaf beamTilt { + description "The beam tilt of the wanted antenna beam + in the vertical plane. A positive value on the + beamtilt indicates an antenna beam direction below the + vertical plane."; + units degree; + type types3gpp:TenthOfDegrees; + } + + leaf bearing { + description "The bearing in degrees that the antenna is pointing in. + AllowedValues: See \"Antenna bearing\" in 3GPP TS 25.463."; + reference "3GPP TS 25.463, UTRAN Iuant interface: + Remote Electrical Tilting (RET) + antennas Application Part (RETAP) signalling"; + type types3gpp:TenthOfDegrees; + } + + leaf elevation { + description "The elevation the antenna function should have, + based on World Geodetic System (1984 version) global + reference frame (WGS 84). Positive values correspond to + meters above sea level, negative values correspond to meters + below sea level. If empty, value is not defined."; + type types3gpp:Altitude; + } + + leaf horizBeamWidth { + description "The 3 dB power beamwidth of the antenna pattern + in the horizontal plane. + A value of 360 indicates an omnidirectional antenna. + Note: The value of this attribute has no operational impact + on the network, e.g. the NE behaviour is not affected by the + value setting of this attribute. + Note as well that this attribute is not supported over the + Iuant interface according to 3GPP TS37.466. + A single integral value corresponding to an angle in degrees + between 0 and 360."; + reference "3GPP TS 37.466, Iuant interface: Application part"; + type types3gpp:TenthOfDegrees; + } + + leaf latitude { + description "Latitude of transmitter antenna position. + Positive value means north, negative value means south. + + Specification: WGS 84 + Allowed Values: { -90.000000..90.000000 }"; + units degree; + type types3gpp:Latitude; + } + + leaf longititude { + description "Longitude of transmitter antenna position. + Positive value means east, negative value means west. + Specification: WGS 84 + Allowed Values: { -180.000000..180.000000 }"; + units degree; + type types3gpp:Longitude; + } + + leaf maxAzimuthValue { + description "The maximum amount of change of azimuth the RET + system can support. This is the change in degrees clockwise + from bearing. + Note: The value of this attribute has no operational impact + on the network, e.g. the NE behaviour is not affected by the + value setting of this attribute. + Note as well that this attribute is not supported over the + Iuant interface according to Ref. 3GPP TS 37.466. + A single decimal value corresponding to an angle in degrees + between 0 and 360 with a resolution of 0.1 degrees."; + reference "3GPP TS 37.466, Iuant interface: Application part"; + units degree; + type decimal64 { + range "0..360"; + fraction-digits 1; + } + } + + leaf minAzimuthValue { + description "The minimum amount of change of azimuth the RET + system can support. This is the change in degrees clockwise + from bearing. + Note: The value of this attribute has no operational impact + on the network, e.g. the NE behaviour is not affected by the + value setting of this attribute. + Note as well that this attribute is not supported over the + Iuant interface according to Ref. 3GPP TS 37.466. + A single decimal value corresponding to an angle in degrees + between 0 and 360 with a resolution of 0.1 degrees."; + reference "3GPP TS 37.466, Iuant interface: Application part"; + units degree; + type decimal64 { + range "0..360"; + fraction-digits 1; + } + } + + leaf-list referencedBy { + description "This attribute contains the DNs of one or more objects + that refer to this object. + + In the case of AntennaFunction, these referring objects may + include DNs of SectorEquipmentFunction instances if associations + between them and the AntennaFunction exist. + + Note: referencedBy is a DN datatype and so can reference an MOI + under a different ME"; + config false; + type types3gpp:DistinguishedName; + } + + + leaf retGroupName { + description "The group name is a textual, alpha-numeric string to + define a logical grouping of antennas which may be in different cells. + + This attribute permits the definition of a logical grouping + of the antennas. This may be defined either at + installation time, or by management activity"; + type string; + } + + leaf retTiltValue { + description "The electrical tilt setting of the antenna, \"Tilt value\" in + 3GPP TS 37.466."; + reference "3GPP TS 37.466, Iuant interface: Application part"; + type types3gpp:TenthOfDegrees; + } + + leaf vertBeamWidth { + description "The 3 dB power beamwidth of the antenna pattern in + the vertical plane. + The value of this attribute has no operational impact on + the network, e.g. the NE behaviour is not affected by the + value setting of this attribute. + This attribute is not supported over the Iuant interface + according to Ref. 3GPP TS 37.466."; + reference "3GPP TS 37.466, Iuant interface: Application part"; + units degree; + type uint32 { + range "0..180"; + } + } + + leaf-list theCellList { + description "This attribute contains the DNs of EUtranGenericCell + or UtranGenericCell if associations between them exist. + This attribute contains the DNs of GSMCellPart if association + between them exist. "; + config false; + status deprecated; + type types3gpp:DistinguishedName; + } + } + + augment "/me3gpp:ManagedElement" { + list AntennaFunction { + key id; + uses top3gpp:Top_Grp; + description "This MOI represents an array of radiating elements that + may be tilted to adjust the RF coverage of a cell(s)."; + container attributes { + uses AntennaFunctionGrp; + } + uses mf3gpp:ManagedFunctionContainedClasses; + } + } +} \ No newline at end of file diff --git a/yang-models/_3gpp-common-sectorequipmentfunction.yang b/yang-models/_3gpp-eqp-sectorequipmentfunction.yang similarity index 84% rename from yang-models/_3gpp-common-sectorequipmentfunction.yang rename to yang-models/_3gpp-eqp-sectorequipmentfunction.yang index e125a28bd4bb61c03e7a91286676e0625c38f978..a710ec19247da9950b1f3b24a10731a7d1a7f9b2 100644 --- a/yang-models/_3gpp-common-sectorequipmentfunction.yang +++ b/yang-models/_3gpp-eqp-sectorequipmentfunction.yang @@ -1,88 +1,84 @@ -module _3gpp-common-sectorequipmentfunction { - yang-version 1.1; - namespace "urn:3gpp:sa5:_3gpp-common-sectorequipmentfunction"; - prefix "scteqpfun3gpp"; - - import _3gpp-common-yang-types { prefix types3gpp; } - import _3gpp-common-managed-function { prefix mf3gpp; } - import _3gpp-common-managed-element { prefix me3gpp; } - import _3gpp-common-top { prefix top3gpp; } - - organization "3GPP SA5"; - contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464"; - description "Defines the YANG mapping of the Sector Equipment Function - Information Object Class (IOC) that is part of the Generic Network Resource - Model (NRM). - Copyright 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, - TTA, TTC). All rights reserved."; - reference "3GPP TS 28.662 Generic Network Resource Model (NRM)"; - - revision 2025-05-06 { description "Initial revision"; } - - grouping SectorEquipmentFunctionGrp { - description "Represents the SectorEquipmentFunction."; - uses mf3gpp:ManagedFunctionGrp; - - leaf confOutputPower { - description "It defines the allowed total power to use for all - cells together in this sector. - It may be set by the operator and/or limited by HW limitation - or licensed power, e.g.: 20, 40, 60, 80,120 watts"; - type uint32; - } - - leaf-list fqBandList { - description "The list of frequency bands/ranges supported by the - hardware associated with the SectorEquipmentFunction. The - earfcnDl and earfcnUl or earfcn of cells associated with the - SectorEquipmentFunction must be assigned one of the specified - frequency range values within the supported range. - - Valid frequency bands/ranges may be found in 3GPP TS 25.104 (UTRA), - 36.104 (E-UTRA) and 38.104 (NR). - - AllowedValues: - Operating band id or supported frequency tuple - expressed as a string. - - Examples for NR: - Bands: {'n1', 'n12'} - Frequencies: {'1920–1980, 2110–2170, FDD', '699–716, 729–746, FDD'}"; - config false; - type string; - } - - leaf-list referencedBy { - description "This attribute contains the DNs of one or more objects - that refer to this object. - - In the case of SectorEquipmentFunction , these referring objects - may include Cells, NRSectorCarriers if associations between them - and the SectorEquipmentFunction exist. - - Note: referencedBy is a DN datatype and so can reference an MOI - under a different ME"; - config false; - type types3gpp:DistinguishedName; - } - } - - augment "/me3gpp:ManagedElement" { - list SectorEquipmentFunction { - key id; - uses top3gpp:Top_Grp; - description "This IOC represents a set of cells within a geographical - area that has common functions relating to AntennaFunction, TMAFunction - and supporting equipment, such as power amplifier."; - - must 'id != ""' { - error-message "Empty id value is not allowed."; - } - - container attributes { - uses SectorEquipmentFunctionGrp; - } - uses mf3gpp:ManagedFunctionContainedClasses; - } -} +module _3gpp-eqp-sectorequipmentfunction { + yang-version 1.1; + namespace "urn:3gpp:sa5:_3gpp-eqp-sectorequipmentfunction"; + prefix "scteqp3gpp"; + + import _3gpp-common-yang-types { prefix types3gpp; } + import _3gpp-common-managed-function { prefix mf3gpp; } + import _3gpp-common-managed-element { prefix me3gpp; } + import _3gpp-common-top { prefix top3gpp; } + + organization "3GPP SA5"; + contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464"; + description "Defines the YANG mapping of the Sector Equipment Function + Information Object Class (IOC) that is part of the Generic Network Resource + Model (NRM). + Copyright 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + TTA, TTC). All rights reserved."; + reference "3GPP TS 28.541 5G Network Resource Model (NRM)"; + + revision 2025-08-12 { reference "CR1580"; } + revision 2025-05-06 { reference "Initial revision"; } + + grouping SectorEquipmentFunctionGrp { + description "Represents the SectorEquipmentFunction."; + uses mf3gpp:ManagedFunctionGrp; + + leaf confOutputPower { + description "It defines the allowed total power to use for all + cells together in this sector. + It may be set by the operator and/or limited by HW limitation + or licensed power, e.g.: 20, 40, 60, 80,120 watts"; + type uint32; + } + + leaf-list fqBandList { + description "The list of frequency bands/ranges supported by the + hardware associated with the SectorEquipmentFunction. The + earfcnDl and earfcnUl or earfcn of cells associated with the + SectorEquipmentFunction must be assigned one of the specified + frequency range values within the supported range. + + Valid frequency bands/ranges may be found in 3GPP TS 25.104 (UTRA), + 36.104 (E-UTRA) and 38.104 (NR). + + AllowedValues: + Operating band id or supported frequency tuple + expressed as a string. + + Examples for NR: + Bands: {'n1', 'n12'} + Frequencies: {'1920–1980, 2110–2170, FDD', '699–716, 729–746, FDD'}"; + config false; + type string; + } + + leaf-list referencedBy { + description "This attribute contains the DNs of one or more objects + that refer to this object. + + In the case of SectorEquipmentFunction , these referring objects + may include Cells, NRSectorCarriers if associations between them + and the SectorEquipmentFunction exist. + + Note: referencedBy is a DN datatype and so can reference an MOI + under a different ME"; + config false; + type types3gpp:DistinguishedName; + } + } + + augment "/me3gpp:ManagedElement" { + list SectorEquipmentFunction { + key id; + uses top3gpp:Top_Grp; + description "This IOC represents a set of cells within a geographical + area that has common functions relating to AntennaFunction, TMAFunction + and supporting equipment, such as power amplifier."; + container attributes { + uses SectorEquipmentFunctionGrp; + } + uses mf3gpp:ManagedFunctionContainedClasses; + } + } } \ No newline at end of file diff --git a/yang-models/_3gpp-nr-nrm-eutranfrequency.yang b/yang-models/_3gpp-nr-nrm-eutranfrequency.yang index eebe52d4af8242c48fe2bb37bdd7ebfa86e3ad50..70508b134f6e24b19f192b3983a54914a32745fa 100755 --- a/yang-models/_3gpp-nr-nrm-eutranfrequency.yang +++ b/yang-models/_3gpp-nr-nrm-eutranfrequency.yang @@ -54,22 +54,22 @@ module _3gpp-nr-nrm-eutranfrequency { } } - feature ExternalENBFunctionUnderSubNetwork { - description "The ExternalENBFunction shall be contained under SubNetwork"; + feature EUtranFrequencyUnderSubNetwork { + description "The EUtranFrequency shall be contained under SubNetwork"; } augment "/subnet3gpp:SubNetwork" { - if-feature ExternalENBFunctionUnderSubNetwork ; - uses EUtranFrequencyWrapper ; + if-feature EUtranFrequencyUnderSubNetwork ; + uses EUtranFrequencyWrapper; } - feature ExternalENBFunctionUnderEUtraNetwork { - description "The ExternalENBFunction shall be contained under EUtraNetwork"; + feature EUtranFrequencyUnderEUtraNetwork { + description "The EUtranFrequency shall be contained under EUtraNetwork"; } - augment "/me3gpp:ManagedElement/gnbcucp3gpp:GNBCUCPFunction/" - + "eutranet3gpp:EUtraNetwork" { - if-feature ExternalENBFunctionUnderEUtraNetwork; - uses EUtranFrequencyWrapper ; + augment "/me3gpp:ManagedElement/gnbcucp3gpp:GNBCUCPFunction/" + + "eutranet3gpp:EUtraNetwork" { + if-feature EUtranFrequencyUnderEUtraNetwork; + uses EUtranFrequencyWrapper; } } \ No newline at end of file diff --git a/yang-models/_3gpp-nr-nrm-nrfrequency.yang b/yang-models/_3gpp-nr-nrm-nrfrequency.yang index 7dc30104915e292cc33a9fd470a9fae63145f0ad..bd045b52d19a16b42e9779d4680fb790c392baf9 100755 --- a/yang-models/_3gpp-nr-nrm-nrfrequency.yang +++ b/yang-models/_3gpp-nr-nrm-nrfrequency.yang @@ -17,7 +17,7 @@ module _3gpp-nr-nrm-nrfrequency { TTA, TTC). All rights reserved."; reference "3GPP TS 28.541 5G Network Resource Model (NRM)"; - revision 2025-04-25 { reference CR-1526 ; } + revision 2025-04-25 { reference "CR-1526 CR-1527"; } // common for r18, r19 revision 2023-09-18 { reference CR-1043 ; } revision 2019-10-28 { reference S5-193518 ; } revision 2019-06-17 { reference "Initial version"; } diff --git a/yang-models/_3gpp-ns-nrm-serviceprofile.yang b/yang-models/_3gpp-ns-nrm-serviceprofile.yang index 190bc24e0f2280e446f4b45e5f44f33ed42220ee..c4a18084eaa2be3ccc5da6bc528c655ee8b94e39 100755 --- a/yang-models/_3gpp-ns-nrm-serviceprofile.yang +++ b/yang-models/_3gpp-ns-nrm-serviceprofile.yang @@ -3,14 +3,13 @@ submodule _3gpp-ns-nrm-serviceprofile { belongs-to _3gpp-ns-nrm-networkslice { prefix ns3gpp; } import _3gpp-common-yang-types { prefix types3gpp; } - import _3gpp-5g-common-yang-types { prefix types5g3gpp; } import _3gpp-ns-nrm-common { prefix ns3cmn; } organization "3GPP SA5"; contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464"; description "A network slice instance in a 5G network. - Copyright 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + Copyright 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved."; reference "3GPP TS 28.541 Management and orchestration; @@ -18,6 +17,7 @@ submodule _3gpp-ns-nrm-serviceprofile { Information model definitions for network slice NRM (chapter 6) "; + revision 2025-08-18 { reference CR-1557; } revision 2023-09-18 { reference CR-1043 ; } revision 2020-06-02 { reference "CR-0485, CR-0508"; @@ -70,7 +70,7 @@ submodule _3gpp-ns-nrm-serviceprofile { description "Synthetic index for the element."; type uint32; } - uses types5g3gpp:SNssai; + uses types3gpp:SNssai; } list pLMNIdList { diff --git a/yang-models/_3gpp-ns-nrm-sliceprofile.yang b/yang-models/_3gpp-ns-nrm-sliceprofile.yang index 8745dd815c46bb79dc4cffde7069b1fa53c853c0..d3617e32633cea9a95d5f0d3ed077cbc0b128c2d 100755 --- a/yang-models/_3gpp-ns-nrm-sliceprofile.yang +++ b/yang-models/_3gpp-ns-nrm-sliceprofile.yang @@ -3,7 +3,6 @@ submodule _3gpp-ns-nrm-sliceprofile { belongs-to _3gpp-ns-nrm-networkslicesubnet { prefix nss3gpp; } import _3gpp-common-yang-types { prefix types3gpp; } - import _3gpp-5g-common-yang-types { prefix types5g3gpp; } // import _3gpp-ns-nrm-networkslice { prefix ns3gpp; } import _3gpp-ns-nrm-common { prefix ns3cmn3gpp; } @@ -13,7 +12,7 @@ submodule _3gpp-ns-nrm-sliceprofile { description "Represents the properties of network slice subnet related requirement that should be supported by the network slice subnet instance in a 5G network. - Copyright 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + Copyright 2025 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved."; reference "3GPP TS 28.541 Management and orchestration; @@ -21,6 +20,7 @@ submodule _3gpp-ns-nrm-sliceprofile { Information model definitions for network slice NRM (chapter 6) "; + revision 2025-08-18 { reference CR-1557; } revision 2023-11-04 { reference CR-1129; } revision 2023-09-18 { reference CR-1043 ; } revision 2023-04-26 { reference CR-0916; } @@ -959,7 +959,7 @@ submodule _3gpp-ns-nrm-sliceprofile { description "Synthetic index for the element."; type uint32; } - uses types5g3gpp:SNssai; + uses types3gpp:SNssai; } list pLMNIdList {