From bf76172b63f99c7f21b47184c99a7f157c033564 Mon Sep 17 00:00:00 2001 From: "U-ERICSSON\\ETHBLL" Date: Thu, 28 Sep 2023 11:26:28 +0200 Subject: [PATCH 01/17] added copyright and some of invariant and some other minors --- yang-models/_3gpp-5g-common-yang-types.yang | 5 ++- .../_3gpp-5gc-nrm-FiveQiDscpMappingSet.yang | 5 ++- ...-5gc-nrm-GtpUPathQoSMonitoringControl.yang | 5 ++- .../_3gpp-5gc-nrm-QFQoSMonitoringControl.yang | 6 ++- yang-models/_3gpp-5gc-nrm-affunction.yang | 5 ++- yang-models/_3gpp-5gc-nrm-amffunction.yang | 5 ++- yang-models/_3gpp-5gc-nrm-amfregion.yang | 5 ++- yang-models/_3gpp-5gc-nrm-amfset.yang | 5 ++- yang-models/_3gpp-5gc-nrm-ausffunction.yang | 5 ++- .../_3gpp-5gc-nrm-configurable5qiset.yang | 5 ++- yang-models/_3gpp-5gc-nrm-dnfunction.yang | 5 ++- yang-models/_3gpp-5gc-nrm-dynamic5qiset.yang | 5 ++- yang-models/_3gpp-5gc-nrm-ep.yang | 5 ++- .../_3gpp-5gc-nrm-externalnrffunction.yang | 6 ++- .../_3gpp-5gc-nrm-externalnssffunction.yang | 6 ++- .../_3gpp-5gc-nrm-externalseppfunction.yang | 6 ++- yang-models/_3gpp-5gc-nrm-lmffunction.yang | 5 ++- yang-models/_3gpp-5gc-nrm-n3iwffunction.yang | 5 ++- yang-models/_3gpp-5gc-nrm-neffunction.yang | 5 ++- yang-models/_3gpp-5gc-nrm-nfprofile.yang | 5 ++- yang-models/_3gpp-5gc-nrm-nfservice.yang | 5 ++- yang-models/_3gpp-5gc-nrm-ngeirfunction.yang | 5 ++- yang-models/_3gpp-5gc-nrm-nrffunction.yang | 5 ++- yang-models/_3gpp-5gc-nrm-nssffunction.yang | 5 ++- yang-models/_3gpp-5gc-nrm-nwdaffunction.yang | 6 ++- yang-models/_3gpp-5gc-nrm-pcffunction.yang | 5 ++- .../_3gpp-5gc-nrm-predefinedpccruleset.yang | 5 ++- yang-models/_3gpp-5gc-nrm-scpfunction.yang | 5 ++- yang-models/_3gpp-5gc-nrm-seppfunction.yang | 5 ++- yang-models/_3gpp-5gc-nrm-smffunction.yang | 5 ++- yang-models/_3gpp-5gc-nrm-smsffunction.yang | 5 ++- yang-models/_3gpp-5gc-nrm-udmfunction.yang | 5 ++- yang-models/_3gpp-5gc-nrm-udrfunction.yang | 5 ++- yang-models/_3gpp-5gc-nrm-udsffunction.yang | 5 ++- yang-models/_3gpp-5gc-nrm-upffunction.yang | 5 ++- yang-models/_3gpp-common-ep-rp.yang | 5 ++- yang-models/_3gpp-common-filemanagement.yang | 7 +++- yang-models/_3gpp-common-fm.yang | 37 +++++++++++-------- yang-models/_3gpp-common-managed-element.yang | 5 ++- .../_3gpp-common-managed-function.yang | 9 ++++- ..._3gpp-common-managementdatacollection.yang | 8 +++- yang-models/_3gpp-common-measurements.yang | 15 +++++++- yang-models/_3gpp-common-mnsregistry.yang | 5 ++- yang-models/_3gpp-common-subnetwork.yang | 5 ++- .../_3gpp-common-subscription-control.yang | 5 ++- yang-models/_3gpp-common-top.yang | 5 ++- yang-models/_3gpp-common-trace.yang | 14 ++++++- yang-models/_3gpp-common-yang-extensions.yang | 4 +- yang-models/_3gpp-common-yang-types.yang | 5 ++- yang-models/_3gpp-nr-nrm-beam.yang | 5 ++- yang-models/_3gpp-nr-nrm-bwp.yang | 5 ++- .../_3gpp-nr-nrm-cesmanagementfunction.yang | 5 ++- ...3gpp-nr-nrm-commonbeamformingfunction.yang | 5 ++- ...3gpp-nr-nrm-cpciconfigurationfunction.yang | 5 ++- .../_3gpp-nr-nrm-danrmanagementfunction.yang | 5 ++- .../_3gpp-nr-nrm-desmanagementfunction.yang | 5 ++- yang-models/_3gpp-nr-nrm-dlbofunction.yang | 5 ++- yang-models/_3gpp-nr-nrm-dmrofunction.yang | 5 ++- ...3gpp-nr-nrm-dpciconfigurationfunction.yang | 5 ++- ...3gpp-nr-nrm-drachoptimizationfunction.yang | 5 ++- yang-models/_3gpp-nr-nrm-ep.yang | 5 ++- .../_3gpp-nr-nrm-eutrancellrelation.yang | 5 ++- yang-models/_3gpp-nr-nrm-eutranetwork.yang | 5 ++- .../_3gpp-nr-nrm-eutranfreqrelation.yang | 5 ++- yang-models/_3gpp-nr-nrm-eutranfrequency.yang | 5 ++- .../_3gpp-nr-nrm-externalamffunction.yang | 5 ++- .../_3gpp-nr-nrm-externalenbfunction.yang | 5 ++- .../_3gpp-nr-nrm-externaleutrancell.yang | 5 ++- .../_3gpp-nr-nrm-externalgnbcucpfunction.yang | 5 ++- .../_3gpp-nr-nrm-externalgnbcuupfunction.yang | 5 ++- .../_3gpp-nr-nrm-externalgnbdufunction.yang | 7 +++- .../_3gpp-nr-nrm-externalnrcellcu.yang | 5 ++- ...3gpp-nr-nrm-externalservinggwfunction.yang | 5 ++- .../_3gpp-nr-nrm-externalupffunction.yang | 5 ++- yang-models/_3gpp-nr-nrm-gnbcucpfunction.yang | 7 +++- yang-models/_3gpp-nr-nrm-gnbcuupfunction.yang | 7 +++- yang-models/_3gpp-nr-nrm-gnbdufunction.yang | 7 +++- yang-models/_3gpp-nr-nrm-nrcellcu.yang | 5 ++- yang-models/_3gpp-nr-nrm-nrcelldu.yang | 5 ++- yang-models/_3gpp-nr-nrm-nrcellrelation.yang | 5 ++- yang-models/_3gpp-nr-nrm-nrfreqrelation.yang | 5 ++- yang-models/_3gpp-nr-nrm-nrfrequency.yang | 5 ++- yang-models/_3gpp-nr-nrm-nrnetwork.yang | 5 ++- .../_3gpp-nr-nrm-nroperatorcelldu.yang | 5 ++- yang-models/_3gpp-nr-nrm-nrsectorcarrier.yang | 5 ++- yang-models/_3gpp-nr-nrm-operatordu.yang | 5 ++- yang-models/_3gpp-nr-nrm-rimrsset.yang | 5 ++- yang-models/_3gpp-nr-nrm-rrmpolicy.yang | 5 ++- yang-models/_3gpp-ns-nrm-common.yang | 5 ++- yang-models/_3gpp-ns-nrm-networkslice.yang | 5 ++- .../_3gpp-ns-nrm-networkslicesubnet.yang | 5 ++- yang-models/_3gpp-ns-nrm-serviceprofile.yang | 5 ++- yang-models/_3gpp-ns-nrm-sliceprofile.yang | 5 ++- 93 files changed, 428 insertions(+), 109 deletions(-) diff --git a/yang-models/_3gpp-5g-common-yang-types.yang b/yang-models/_3gpp-5g-common-yang-types.yang index bd7d6a198..f1da20430 100755 --- a/yang-models/_3gpp-5g-common-yang-types.yang +++ b/yang-models/_3gpp-5g-common-yang-types.yang @@ -9,9 +9,12 @@ module _3gpp-5g-common-yang-types { 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."; + network slicing. + Copyright 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + TTA, TTC) 2019-2023. All rights reserved."; reference "3GPP TS 28.541"; + revision 2023-09-17 { reference CR-1042 ; } revision 2023-05-09 { reference CR-0915; } revision 2021-08-05 { reference S5-214053/CR-0518; } revision 2020-11-05 { reference CR-0412 ; } diff --git a/yang-models/_3gpp-5gc-nrm-FiveQiDscpMappingSet.yang b/yang-models/_3gpp-5gc-nrm-FiveQiDscpMappingSet.yang index c3ebfe7a3..ad8e586e8 100755 --- a/yang-models/_3gpp-5gc-nrm-FiveQiDscpMappingSet.yang +++ b/yang-models/_3gpp-5gc-nrm-FiveQiDscpMappingSet.yang @@ -10,9 +10,12 @@ module _3gpp-5gc-nrm-FiveQiDscpMappingSet { organization "3gpp SA5"; contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464"; - description " This IOC represents the set of mapping between 5QIs and DSCP."; + description " This IOC represents the set of mapping between 5QIs and DSCP. + Copyright 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + TTA, TTC) 2019-2023. All rights reserved."; reference "3GPP TS 28.541"; + revision 2023-09-17 { reference CR-1042 ; } revision 2020-08-03 { reference "CR-0321"; } revision 2020-05-27 { reference "CR-0287"; } diff --git a/yang-models/_3gpp-5gc-nrm-GtpUPathQoSMonitoringControl.yang b/yang-models/_3gpp-5gc-nrm-GtpUPathQoSMonitoringControl.yang index d29d6d21a..4e01f9ca9 100755 --- a/yang-models/_3gpp-5gc-nrm-GtpUPathQoSMonitoringControl.yang +++ b/yang-models/_3gpp-5gc-nrm-GtpUPathQoSMonitoringControl.yang @@ -12,9 +12,12 @@ module _3gpp-5gc-nrm-GtpUPathQoSMonitoringControl { 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."; + of GTP-U path QoS monitoring defined in 3GPP TS 23.501. + Copyright 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + TTA, TTC) 2019-2023. All rights reserved."; reference "3GPP TS 28.541"; + revision 2023-09-17 { reference CR-1042 ; } revision 2020-11-05 { reference CR-0412 ; } revision 2020-09-30 { reference "CR-0393"; } revision 2020-08-03 { reference "CR-0321"; } diff --git a/yang-models/_3gpp-5gc-nrm-QFQoSMonitoringControl.yang b/yang-models/_3gpp-5gc-nrm-QFQoSMonitoringControl.yang index a0c284c60..bf72c1645 100755 --- a/yang-models/_3gpp-5gc-nrm-QFQoSMonitoringControl.yang +++ b/yang-models/_3gpp-5gc-nrm-QFQoSMonitoringControl.yang @@ -12,10 +12,12 @@ module _3gpp-5gc-nrm-QFQoSMonitoringControl { 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."; + in 3GPP TS 23.501. + Copyright 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + TTA, TTC) 2019-2023. All rights reserved."; reference "3GPP TS 28.541"; + revision 2023-09-17 { reference CR-1042 ; } revision 2020-11-07 { 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 a668b8a3a..0d41b9c45 100755 --- a/yang-models/_3gpp-5gc-nrm-affunction.yang +++ b/yang-models/_3gpp-5gc-nrm-affunction.yang @@ -11,9 +11,12 @@ module _3gpp-5gc-nrm-affunction { organization "3gpp SA5"; 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."; + It has no attributes defined. + Copyright 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + TTA, TTC) 2019-2023. All rights reserved."; reference "3GPP TS 28.541"; + revision 2023-09-17 { reference CR-1042 ; } revision 2019-10-28 { reference S5-193518 ; } revision 2019-05-15 { diff --git a/yang-models/_3gpp-5gc-nrm-amffunction.yang b/yang-models/_3gpp-5gc-nrm-amffunction.yang index ef7b462fa..73487e557 100755 --- a/yang-models/_3gpp-5gc-nrm-amffunction.yang +++ b/yang-models/_3gpp-5gc-nrm-amffunction.yang @@ -12,9 +12,12 @@ module _3gpp-5gc-nrm-amffunction { organization "3gpp SA5"; contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464"; - description "AMFFunction derived from basic ManagedFunction."; + description "AMFFunction derived from basic ManagedFunction. + Copyright 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + TTA, TTC) 2019-2023. All rights reserved."; reference "3GPP TS 28.541 5G Network Resource Model (NRM)"; + revision 2023-09-17 { reference CR-1042 ; } revision 2022-01-07 { reference CR-0643; } revision 2020-11-06 { reference CR-0412 ; } revision 2019-10-25 { reference "S5-194457 S5-193518"; } diff --git a/yang-models/_3gpp-5gc-nrm-amfregion.yang b/yang-models/_3gpp-5gc-nrm-amfregion.yang index 5a9d98914..5c06f0581 100755 --- a/yang-models/_3gpp-5gc-nrm-amfregion.yang +++ b/yang-models/_3gpp-5gc-nrm-amfregion.yang @@ -12,9 +12,12 @@ module _3gpp-5gc-nrm-amfregion { organization "3gpp SA5"; 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."; + multiple AMF Sets. + Copyright 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + TTA, TTC) 2019-2023. All rights reserved."; reference "3GPP TS 28.541 5G Network Resource Model (NRM)"; + revision 2023-09-17 { reference CR-1042 ; } revision 2022-01-07 { reference CR-0643; } revision 2020-11-06 { reference CR-0412 ; } revision 2019-10-28 { reference S5-193518 ; } diff --git a/yang-models/_3gpp-5gc-nrm-amfset.yang b/yang-models/_3gpp-5gc-nrm-amfset.yang index 9394f45e4..2e76f3e71 100755 --- a/yang-models/_3gpp-5gc-nrm-amfset.yang +++ b/yang-models/_3gpp-5gc-nrm-amfset.yang @@ -12,9 +12,12 @@ module _3gpp-5gc-nrm-amfset { organization "3gpp SA5"; contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464"; description "This IOC represents the AMF Set which consists of some AMFs - that serve a given area and Network Slice."; + that serve a given area and Network Slice. + Copyright 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + TTA, TTC) 2019-2023. All rights reserved."; reference "3GPP TS 28.541 5G Network Resource Model (NRM)"; + revision 2023-09-17 { reference CR-1042 ; } revision 2022-01-07 { reference CR-0643; } revision 2020-11-06 { reference CR-0412 ; } revision 2019-10-28 { reference S5-193518 ; } diff --git a/yang-models/_3gpp-5gc-nrm-ausffunction.yang b/yang-models/_3gpp-5gc-nrm-ausffunction.yang index 526aaf86f..5da92b8a2 100755 --- a/yang-models/_3gpp-5gc-nrm-ausffunction.yang +++ b/yang-models/_3gpp-5gc-nrm-ausffunction.yang @@ -14,9 +14,12 @@ module _3gpp-5gc-nrm-ausffunction { organization "3gpp SA5"; contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464"; description "This IOC represents the AUSF function in 5GC. For more - information about the AUSF, see 3GPP TS 23.501."; + information about the AUSF, see 3GPP TS 23.501. + Copyright 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + TTA, TTC) 2019-2023. All rights reserved."; reference "3GPP TS 28.541"; + revision 2023-09-17 { reference CR-1042 ; } revision 2022-01-07 { reference CR-0643; } revision 2020-11-06 { reference CR-0412 ; } revision 2019-10-25 { reference "S5-194457 S5-193518"; } diff --git a/yang-models/_3gpp-5gc-nrm-configurable5qiset.yang b/yang-models/_3gpp-5gc-nrm-configurable5qiset.yang index 855d9ea76..f14da0734 100755 --- a/yang-models/_3gpp-5gc-nrm-configurable5qiset.yang +++ b/yang-models/_3gpp-5gc-nrm-configurable5qiset.yang @@ -9,9 +9,12 @@ module _3gpp-5gc-nrm-configurable5qiset { contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464"; description "This IOC represents the configurable 5QIs, including their QoS characteristics, that need to be pre-configured - (and configurable) to the 5G NFs."; + (and configurable) to the 5G NFs. + Copyright 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + TTA, TTC) 2019-2023. All rights reserved."; reference "3GPP TS 28.541"; + revision 2023-09-17 { reference CR-1042 ; } revision 2022-07-27 { reference "CR-0769"; } revision 2022-04-29 { reference "CR-0729"; } revision 2022-01-07 { reference CR-0643; } diff --git a/yang-models/_3gpp-5gc-nrm-dnfunction.yang b/yang-models/_3gpp-5gc-nrm-dnfunction.yang index 675c3b1aa..89a042ba1 100755 --- a/yang-models/_3gpp-5gc-nrm-dnfunction.yang +++ b/yang-models/_3gpp-5gc-nrm-dnfunction.yang @@ -11,9 +11,12 @@ module _3gpp-5gc-nrm-dnfunction { organization "3gpp SA5"; description "This IOC is defined only to describe the IOCs representing Data Network (DN) interaction interface with 5GC (i.e. EP_N6). - It has no attributes defined."; + It has no attributes defined. + Copyright 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + TTA, TTC) 2019-2023. All rights reserved."; reference "3GPP TS 28.541"; + revision 2023-09-17 { reference CR-1042 ; } revision 2019-10-28 { reference S5-193518 ; } revision 2019-05-15 { diff --git a/yang-models/_3gpp-5gc-nrm-dynamic5qiset.yang b/yang-models/_3gpp-5gc-nrm-dynamic5qiset.yang index 275507d95..0f370924c 100755 --- a/yang-models/_3gpp-5gc-nrm-dynamic5qiset.yang +++ b/yang-models/_3gpp-5gc-nrm-dynamic5qiset.yang @@ -11,9 +11,12 @@ module _3gpp-5gc-nrm-dynamic5qiset { organization "3gpp SA5"; contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464"; description "This IOC represents the dynamic 5QIs including their QoS - characteristics."; + characteristics. + Copyright 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + TTA, TTC) 2019-2023. All rights reserved."; reference "3GPP TS 28.541"; + revision 2023-09-17 { reference CR-1042 ; } revision 2022-07-27 { reference "CR-0769"; } revision 2022-01-07 { reference CR-0643; } revision 2020-10-01 { reference "CR-0393"; } diff --git a/yang-models/_3gpp-5gc-nrm-ep.yang b/yang-models/_3gpp-5gc-nrm-ep.yang index fdd210297..65f154d5c 100755 --- a/yang-models/_3gpp-5gc-nrm-ep.yang +++ b/yang-models/_3gpp-5gc-nrm-ep.yang @@ -27,9 +27,12 @@ module _3gpp-5gc-nrm-ep { organization "3GPP SA5"; description "Defines the YANG mapping of the 5GC related endpoint Information Object Classes (IOCs) that are part of the 5G Core - Network Resource Model."; + Network Resource Model. + Copyright 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + TTA, TTC) 2019-2023. All rights reserved."; reference "3GPP TS 28.541"; + revision 2023-09-17 { reference CR-1042 ; } revision 2019-11-18 { description "Ericsson refactoring."; } diff --git a/yang-models/_3gpp-5gc-nrm-externalnrffunction.yang b/yang-models/_3gpp-5gc-nrm-externalnrffunction.yang index 95f1cea5e..d38d38df1 100755 --- a/yang-models/_3gpp-5gc-nrm-externalnrffunction.yang +++ b/yang-models/_3gpp-5gc-nrm-externalnrffunction.yang @@ -8,8 +8,12 @@ module _3gpp-5gc-nrm-externalnrffunction { import _3gpp-common-top { prefix top3gpp; } import _3gpp-common-managed-function { prefix mf3gpp; } - description "This IOC represents external NRF function controlled by another management domain."; + description "This IOC represents external NRF function controlled by + another management domain. + Copyright 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + TTA, TTC) 2019-2023. All rights reserved."; + revision 2023-09-17 { reference CR-1042 ; } revision 2019-10-28 { reference S5-193518 ; } revision 2019-06-11 { description "Ericsson refactoring."; diff --git a/yang-models/_3gpp-5gc-nrm-externalnssffunction.yang b/yang-models/_3gpp-5gc-nrm-externalnssffunction.yang index 665977805..188704fa5 100755 --- a/yang-models/_3gpp-5gc-nrm-externalnssffunction.yang +++ b/yang-models/_3gpp-5gc-nrm-externalnssffunction.yang @@ -8,8 +8,12 @@ module _3gpp-5gc-nrm-externalnssffunction { import _3gpp-common-top { prefix top3gpp; } import _3gpp-common-managed-function { prefix mf3gpp; } - description "This IOC represents external NSSF function controlled by another management domain."; + description "This IOC represents external NSSF function controlled by + another management domain. + Copyright 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + TTA, TTC) 2019-2023. All rights reserved."; + revision 2023-09-17 { reference CR-1042 ; } revision 2019-10-28 { reference S5-193518 ; } revision 2019-06-11 { description "Ericsson refactoring."; diff --git a/yang-models/_3gpp-5gc-nrm-externalseppfunction.yang b/yang-models/_3gpp-5gc-nrm-externalseppfunction.yang index 4d1277562..f874782e7 100755 --- a/yang-models/_3gpp-5gc-nrm-externalseppfunction.yang +++ b/yang-models/_3gpp-5gc-nrm-externalseppfunction.yang @@ -12,9 +12,13 @@ module _3gpp-5gc-nrm-externalseppfunction { 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."; + and policing on inter-PLMN control plane interface. For more information + about the SEPP, see 3GPP TS 23.501. + Copyright 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + TTA, TTC) 2019-2023. All rights reserved."; reference "3GPP TS 28.541"; + revision 2023-09-17 { reference CR-1042 ; } revision 2019-11-19 { description "initial revision"; reference "Based on diff --git a/yang-models/_3gpp-5gc-nrm-lmffunction.yang b/yang-models/_3gpp-5gc-nrm-lmffunction.yang index ee9ec056a..6468cac35 100755 --- a/yang-models/_3gpp-5gc-nrm-lmffunction.yang +++ b/yang-models/_3gpp-5gc-nrm-lmffunction.yang @@ -11,9 +11,12 @@ module _3gpp-5gc-nrm-lmffunction { import _3gpp-common-top { prefix top3gpp; } organization "3gpp SA5"; - description "This IOC represents the LMF function defined in 3GPP TS 23.501."; + description "This IOC represents the LMF function defined in 3GPP TS 23.501. + Copyright 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + TTA, TTC) 2019-2023. All rights reserved."; reference "3GPP TS 28.541"; + revision 2023-09-17 { reference CR-1042 ; } revision 2019-10-25 { reference "S5-194457 S5193518"; } revision 2019-05-15 { diff --git a/yang-models/_3gpp-5gc-nrm-n3iwffunction.yang b/yang-models/_3gpp-5gc-nrm-n3iwffunction.yang index 05ca146ca..acaf2bc40 100755 --- a/yang-models/_3gpp-5gc-nrm-n3iwffunction.yang +++ b/yang-models/_3gpp-5gc-nrm-n3iwffunction.yang @@ -12,9 +12,12 @@ module _3gpp-5gc-nrm-n3iwffunction { organization "3gpp SA5"; description "This IOC represents the N3IWF function which is used to enable non-3GPP - access networks connected to the 5GC. For more information about the N3IWF, see 3GPP TS 23.501."; + access networks connected to the 5GC. For more information about the N3IWF, see 3GPP TS 23.501. + Copyright 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + TTA, TTC) 2019-2023. All rights reserved."; reference "3GPP TS 28.541"; + revision 2023-09-17 { reference CR-1042 ; } revision 2019-10-28 { reference S5-193518 ; } revision 2019-05-22 { description "initial revision"; diff --git a/yang-models/_3gpp-5gc-nrm-neffunction.yang b/yang-models/_3gpp-5gc-nrm-neffunction.yang index cdbf93c49..9459be889 100755 --- a/yang-models/_3gpp-5gc-nrm-neffunction.yang +++ b/yang-models/_3gpp-5gc-nrm-neffunction.yang @@ -13,9 +13,12 @@ module _3gpp-5gc-nrm-neffunction { organization "3gpp SA5"; contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464"; description "This IOC represents the NEF function in 5GC. For more - information about the NEF, see 3GPP TS 23.501."; + information about the NEF, see 3GPP TS 23.501. + Copyright 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + TTA, TTC) 2019-2023. All rights reserved."; reference "3GPP TS 28.541"; + revision 2023-09-17 { reference CR-1042 ; } revision 2022-01-07 { reference CR-0643; } revision 2020-11-06 { reference CR-0412 ; } revision 2019-10-20 { reference "initial revision"; } diff --git a/yang-models/_3gpp-5gc-nrm-nfprofile.yang b/yang-models/_3gpp-5gc-nrm-nfprofile.yang index c5b0d609a..3e38b8dc8 100755 --- a/yang-models/_3gpp-5gc-nrm-nfprofile.yang +++ b/yang-models/_3gpp-5gc-nrm-nfprofile.yang @@ -10,9 +10,12 @@ module _3gpp-5gc-nrm-nfprofile { import _3gpp-5gc-nrm-nfservice { prefix nfs3gpp; } organization "3gpp SA5"; - description "NF profile class."; + description "NF profile class. + Copyright 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + TTA, TTC) 2019-2023. All rights reserved."; reference "3GPP TS 29.510"; + revision 2023-09-17 { reference CR-1042 ; } revision 2019-06-17 { description "initial revision"; } diff --git a/yang-models/_3gpp-5gc-nrm-nfservice.yang b/yang-models/_3gpp-5gc-nrm-nfservice.yang index 3d3856931..f1f1d5175 100755 --- a/yang-models/_3gpp-5gc-nrm-nfservice.yang +++ b/yang-models/_3gpp-5gc-nrm-nfservice.yang @@ -11,9 +11,12 @@ module _3gpp-5gc-nrm-nfservice { organization "3gpp SA5"; contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464"; - description "NF service class."; + description "NF service class. + Copyright 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + TTA, TTC) 2019-2023. All rights reserved."; reference "3GPP TS 29.510"; + revision 2023-09-17 { reference CR-1042 ; } revision 2021-01-25 { reference CR-0454 ; } revision 2020-11-05 { reference CR-0412 ; } revision 2019-06-17 { reference "initial revision"; } diff --git a/yang-models/_3gpp-5gc-nrm-ngeirfunction.yang b/yang-models/_3gpp-5gc-nrm-ngeirfunction.yang index f9b7638ea..4e1a1fa50 100755 --- a/yang-models/_3gpp-5gc-nrm-ngeirfunction.yang +++ b/yang-models/_3gpp-5gc-nrm-ngeirfunction.yang @@ -13,9 +13,12 @@ module _3gpp-5gc-nrm-ngeirfunction { organization "3gpp SA5"; contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464"; description "This IOC represents the 5G-EIR function in 5GC. For more - information about the 5G-EIR, see 3GPP TS 23.501."; + information about the 5G-EIR, see 3GPP TS 23.501. + Copyright 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + TTA, TTC) 2019-2023. All rights reserved."; reference "3GPP TS 28.541"; + revision 2023-09-17 { reference CR-1042 ; } revision 2022-01-07 { reference CR-0643; } revision 2020-11-06 { reference CR-0412 ; } revision 2019-10-25 { reference "S5-194457 S5-195427 S5-193518"; } diff --git a/yang-models/_3gpp-5gc-nrm-nrffunction.yang b/yang-models/_3gpp-5gc-nrm-nrffunction.yang index 6356fe127..7fe7c8b83 100755 --- a/yang-models/_3gpp-5gc-nrm-nrffunction.yang +++ b/yang-models/_3gpp-5gc-nrm-nrffunction.yang @@ -15,9 +15,12 @@ module _3gpp-5gc-nrm-nrffunction { organization "3gpp SA5"; contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464"; description "This IOC represents the NRF function in 5GC. - For more information about the NRF, see 3GPP TS 23.501 [2]."; + For more information about the NRF, see 3GPP TS 23.501 [2]. + Copyright 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + TTA, TTC) 2019-2023. All rights reserved."; reference "3GPP TS 28.541"; + revision 2023-09-17 { reference CR-1042 ; } revision 2020-11-07 { reference CR-0412 ; } revision 2020-08-03 { reference "CR-0321"; } revision 2019-10-28 { reference S5-193518 ; } diff --git a/yang-models/_3gpp-5gc-nrm-nssffunction.yang b/yang-models/_3gpp-5gc-nrm-nssffunction.yang index 737b630f0..2b4525f57 100755 --- a/yang-models/_3gpp-5gc-nrm-nssffunction.yang +++ b/yang-models/_3gpp-5gc-nrm-nssffunction.yang @@ -14,9 +14,12 @@ module _3gpp-5gc-nrm-nssffunction { 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."; + information about the NSSF, see 3GPP TS 23.501. + Copyright 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + TTA, TTC) 2019-2023. All rights reserved."; reference "3GPP TS 28.541"; + revision 2023-09-17 { reference CR-1042 ; } revision 2020-11-07 { reference CR-0412 ; } revision 2020-08-03 { reference "CR-0321"; } revision 2019-10-25 { reference "S5-194457 S5-195427 S5-193518"; } diff --git a/yang-models/_3gpp-5gc-nrm-nwdaffunction.yang b/yang-models/_3gpp-5gc-nrm-nwdaffunction.yang index 4c91c240a..f138575e2 100755 --- a/yang-models/_3gpp-5gc-nrm-nwdaffunction.yang +++ b/yang-models/_3gpp-5gc-nrm-nwdaffunction.yang @@ -13,9 +13,13 @@ 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. + Copyright 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + TTA, TTC) 2019-2023. All rights reserved."; reference "3GPP TS 28.541"; + revision 2023-09-17 { reference CR-1042 ; } revision 2020-11-07 { reference CR-0412 ; } revision 2019-10-25 { reference "S5-194457 S5-195427 S5-193518"; } diff --git a/yang-models/_3gpp-5gc-nrm-pcffunction.yang b/yang-models/_3gpp-5gc-nrm-pcffunction.yang index 9fc1c558d..c18972ec6 100755 --- a/yang-models/_3gpp-5gc-nrm-pcffunction.yang +++ b/yang-models/_3gpp-5gc-nrm-pcffunction.yang @@ -14,9 +14,12 @@ module _3gpp-5gc-nrm-pcffunction { organization "3gpp SA5"; contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464"; description "This IOC represents the PCF function in 5GC. For more - information about the PCF, see 3GPP TS 23.501."; + information about the PCF, see 3GPP TS 23.501. + Copyright 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + TTA, TTC) 2019-2023. All rights reserved."; reference "3GPP TS 28.541"; + revision 2023-09-17 { reference CR-1042 ; } revision 2020-11-07 { reference CR-0412 ; } revision 2020-08-06 { reference "CR-0333"; } revision 2020-08-06 { reference "CR-0331"; } diff --git a/yang-models/_3gpp-5gc-nrm-predefinedpccruleset.yang b/yang-models/_3gpp-5gc-nrm-predefinedpccruleset.yang index ac3faf5c6..5a60ab32f 100755 --- a/yang-models/_3gpp-5gc-nrm-predefinedpccruleset.yang +++ b/yang-models/_3gpp-5gc-nrm-predefinedpccruleset.yang @@ -13,9 +13,12 @@ module _3gpp-5gc-nrm-predefinedpccruleset { organization "3gpp SA5"; contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464"; description "This IOC represents the predefined PCC rules, which are - configured to SMF and referenced by PCF."; + configured to SMF and referenced by PCF. + Copyright 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + TTA, TTC) 2019-2023. All rights reserved."; reference "3GPP TS 28.541"; + revision 2023-09-17 { reference CR-1042 ; } revision 2020-09-30 { reference "CR-0393"; } revision 2020-08-21 { reference "CR-0330"; } diff --git a/yang-models/_3gpp-5gc-nrm-scpfunction.yang b/yang-models/_3gpp-5gc-nrm-scpfunction.yang index 8e86bc5a2..7e367d4f4 100755 --- a/yang-models/_3gpp-5gc-nrm-scpfunction.yang +++ b/yang-models/_3gpp-5gc-nrm-scpfunction.yang @@ -11,9 +11,12 @@ 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."; + description "This IOC represents the SCP function in 5GC. For more information about the SCP, see 3GPP TS 23.501. + Copyright 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + TTA, TTC) 2019-2023. All rights reserved."; reference "3GPP TS 28.541"; + revision 2023-09-17 { reference CR-1042 ; } revision 2019-10-21 { description "initial revision"; reference "Based on diff --git a/yang-models/_3gpp-5gc-nrm-seppfunction.yang b/yang-models/_3gpp-5gc-nrm-seppfunction.yang index e4793dd3f..b8cb29385 100755 --- a/yang-models/_3gpp-5gc-nrm-seppfunction.yang +++ b/yang-models/_3gpp-5gc-nrm-seppfunction.yang @@ -12,9 +12,12 @@ module _3gpp-5gc-nrm-seppfunction { organization "3gpp SA5"; description "This IOC represents the SEPP function which support message filtering - and policing on inter-PLMN control plane interface. For more information about the SEPP, see 3GPP TS 23.501."; + and policing on inter-PLMN control plane interface. For more information about the SEPP, see 3GPP TS 23.501. + Copyright 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + TTA, TTC) 2019-2023. All rights reserved."; reference "3GPP TS 28.541"; + revision 2023-09-17 { reference CR-1042 ; } revision 2020-08-03 { reference "CR-0321"; } revision 2019-10-28 { reference S5-193518 ; } diff --git a/yang-models/_3gpp-5gc-nrm-smffunction.yang b/yang-models/_3gpp-5gc-nrm-smffunction.yang index 99469f4b8..3cc10f581 100755 --- a/yang-models/_3gpp-5gc-nrm-smffunction.yang +++ b/yang-models/_3gpp-5gc-nrm-smffunction.yang @@ -12,8 +12,11 @@ module _3gpp-5gc-nrm-smffunction { organization "3gpp SA5"; contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464"; - description "SMFFunction derived from basic ManagedFunction."; + description "SMFFunction derived from basic ManagedFunction. + Copyright 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + TTA, TTC) 2019-2023. All rights reserved."; + revision 2023-09-17 { reference CR-1042 ; } revision 2020-11-07 { reference CR-0412 ; } revision 2020-08-06 { reference "CR-0333"; } revision 2020-06-03 { reference "CR-0286"; } diff --git a/yang-models/_3gpp-5gc-nrm-smsffunction.yang b/yang-models/_3gpp-5gc-nrm-smsffunction.yang index 720d90417..739ad5650 100755 --- a/yang-models/_3gpp-5gc-nrm-smsffunction.yang +++ b/yang-models/_3gpp-5gc-nrm-smsffunction.yang @@ -11,9 +11,12 @@ module _3gpp-5gc-nrm-smsffunction { import _3gpp-common-top { prefix top3gpp; } organization "3gpp SA5"; - description "This IOC represents the SMSF function defined in 3GPP TS 23.501."; + description "This IOC represents the SMSF function defined in 3GPP TS 23.501. + Copyright 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + TTA, TTC) 2019-2023. All rights reserved."; reference "3GPP TS 28.541"; + revision 2023-09-17 { reference CR-1042 ; } revision 2019-10-25 { reference "S5-194457 S5-195427 S5-193518"; } revision 2019-05-15 { diff --git a/yang-models/_3gpp-5gc-nrm-udmfunction.yang b/yang-models/_3gpp-5gc-nrm-udmfunction.yang index 14c0cf9ec..8576faf3a 100755 --- a/yang-models/_3gpp-5gc-nrm-udmfunction.yang +++ b/yang-models/_3gpp-5gc-nrm-udmfunction.yang @@ -14,9 +14,12 @@ module _3gpp-5gc-nrm-udmfunction { organization "3gpp SA5"; contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464"; description "This IOC represents the UDM function in 5GC. For more - information about the UDM, see 3GPP TS 23.501."; + information about the UDM, see 3GPP TS 23.501. + Copyright 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + TTA, TTC) 2019-2023. All rights reserved."; reference "3GPP TS 28.541"; + revision 2023-09-17 { reference CR-1042 ; } revision 2020-11-07 { 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-udrfunction.yang b/yang-models/_3gpp-5gc-nrm-udrfunction.yang index 3c2fb27dc..856d78e38 100755 --- a/yang-models/_3gpp-5gc-nrm-udrfunction.yang +++ b/yang-models/_3gpp-5gc-nrm-udrfunction.yang @@ -14,9 +14,12 @@ module _3gpp-5gc-nrm-udrfunction { organization "3gpp SA5"; contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464"; description "This IOC represents the UDR function in 5GC. For more information - about the UDR, see 3GPP TS 23.501."; + about the UDR, see 3GPP TS 23.501. + Copyright 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + TTA, TTC) 2019-2023. All rights reserved."; reference "3GPP TS 28.541"; + revision 2023-09-17 { reference CR-1042 ; } revision 2020-11-07 { reference CR-0412 ; } revision 2019-10-25 { reference "S5-194457 S5-195427 S5-193518"; } diff --git a/yang-models/_3gpp-5gc-nrm-udsffunction.yang b/yang-models/_3gpp-5gc-nrm-udsffunction.yang index e6d4d3683..86b452c0e 100755 --- a/yang-models/_3gpp-5gc-nrm-udsffunction.yang +++ b/yang-models/_3gpp-5gc-nrm-udsffunction.yang @@ -14,9 +14,12 @@ module _3gpp-5gc-nrm-udsffunction { organization "3gpp SA5"; contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464"; description "This IOC represents the UDSF function which can be interacted - with any other 5GC NF defined in 3GPP TS 23.501."; + with any other 5GC NF defined in 3GPP TS 23.501. + Copyright 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + TTA, TTC) 2019-2023. All rights reserved."; reference "3GPP TS 28.541"; + revision 2023-09-17 { reference CR-1042 ; } revision 2020-11-07 { reference CR-0412 ; } revision 2019-10-25 { reference "S5-194457 S5-195427 S5-193518"; } diff --git a/yang-models/_3gpp-5gc-nrm-upffunction.yang b/yang-models/_3gpp-5gc-nrm-upffunction.yang index e09f6eb69..a6b2525de 100755 --- a/yang-models/_3gpp-5gc-nrm-upffunction.yang +++ b/yang-models/_3gpp-5gc-nrm-upffunction.yang @@ -11,9 +11,12 @@ 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."; + description "UPFFunction derived from basic ManagedFunction. + Copyright 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + TTA, TTC) 2019-2023. All rights reserved."; reference "3GPP TS 28.541 5G Network Resource Model (NRM)"; + revision 2023-09-17 { reference CR-1042 ; } revision 2020-11-07 { reference CR-0412 ; } revision 2019-10-25 { reference "S5-194457 S5-193518"; } revision 2019-05-31 { reference "Ericsson refactoring."; } diff --git a/yang-models/_3gpp-common-ep-rp.yang b/yang-models/_3gpp-common-ep-rp.yang index 0dc1ddc30..13a685b3a 100755 --- a/yang-models/_3gpp-common-ep-rp.yang +++ b/yang-models/_3gpp-common-ep-rp.yang @@ -11,7 +11,9 @@ module _3gpp-common-ep-rp { contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464"; description "Common/basic class/grouping to be inherited/reused. This IOC represents an end point of a link used across a reference - point between two network entities."; + point between two network entities. + Copyright 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + TTA, TTC) 2019-2023. All rights reserved."; reference "3GPP TS 28.622 Generic Network Resource Model (NRM) @@ -21,6 +23,7 @@ module _3gpp-common-ep-rp { 3GPP TS 28.620 Umbrella Information Model (UIM)"; + revision 2023-09-17 { reference CR-0270 ; } revision 2020-06-08 { reference "CR-0092"; } revision 2019-06-17 { diff --git a/yang-models/_3gpp-common-filemanagement.yang b/yang-models/_3gpp-common-filemanagement.yang index 34c6d9ae6..bee65e62f 100644 --- a/yang-models/_3gpp-common-filemanagement.yang +++ b/yang-models/_3gpp-common-filemanagement.yang @@ -12,9 +12,12 @@ module _3gpp-common-filemanagement { organization "3GPP SA5"; contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464"; description "Defines the YANG mapping of the FileDownloadJob Information Object - Class (IOC) that is part of the Generic Network Resource Model (NRM)."; + Class (IOC) that is part of the Generic Network Resource Model (NRM). + Copyright 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + TTA, TTC) 2019-2023. All rights reserved."; reference "3GPP TS 28.623 Generic Network Resource Model (NRM)"; + revision 2023-09-17 { reference CR-0270 ; } revision 2022-10-31 { reference CR-0195; } revision 2022-02-10 { reference "Initial revision, S5-221757"; } @@ -53,12 +56,14 @@ module _3gpp-common-filemanagement { mandatory true; type string; yext3gpp:notNotifyable; + yext3gpp:inVariant; } leaf notificationRecipientAddress { description "Address of the notification recipient."; type string; yext3gpp:notNotifyable; + yext3gpp:inVariant; } leaf cancelJob { diff --git a/yang-models/_3gpp-common-fm.yang b/yang-models/_3gpp-common-fm.yang index 4e4d2b9a3..8e522e51e 100755 --- a/yang-models/_3gpp-common-fm.yang +++ b/yang-models/_3gpp-common-fm.yang @@ -11,7 +11,9 @@ module _3gpp-common-fm { organization "3GPP SA5"; contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464"; - description "Defines a Fault Management model"; + description "Defines a Fault Management model + Copyright 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + TTA, TTC) 2019-2023. All rights reserved."; reference "3GPP TS 28.623 Generic Network Resource Model (NRM) @@ -23,6 +25,7 @@ module _3gpp-common-fm { Integration Reference Point (IRP); Information Service (IS)"; + revision 2023-09-17 { reference CR-0270 ; } revision 2023-05-09 { reference CR-0249; } revision 2022-10-31 { reference CR-0195; } revision 2021-08-08 { reference "CR-0132"; } @@ -116,23 +119,24 @@ module _3gpp-common-fm { } leaf objectInstance { - type types3gpp:DistinguishedName; + type types3gpp:DistinguishedName; config false ; mandatory true; yext3gpp:notNotifyable; + yext3gpp:inVariant; } leaf notificationId { type int32; config false ; mandatory true; - description "The Id of the last notification updating the AlarmRecord."; + description "The Id of the last notification updating the AlarmRecord."; yext3gpp:notNotifyable; } leaf alarmRaisedTime { type yang:date-and-time ; - mandatory true; + mandatory true; config false ; yext3gpp:notNotifyable; } @@ -148,35 +152,38 @@ module _3gpp-common-fm { type yang:date-and-time ; config false ; description "not applicable if related alarm was not cleared"; - yext3gpp:notNotifyable; + yext3gpp:notNotifyable; } leaf alarmType { type eventType; config false ; - mandatory true; + mandatory true; description "General category for the alarm."; yext3gpp:notNotifyable; + yext3gpp:inVariant; } leaf probableCause { - type union { - type int32; - type string; - } + type union { + type int32; + type string; + } config false ; - mandatory true; + mandatory true; yext3gpp:notNotifyable; + yext3gpp:inVariant; } leaf specificProblem { - type union { - type int32; - type string; - } + type union { + type int32; + type string; + } config false ; reference "ITU-T Recommendation X.733 clause 8.1.2.2."; yext3gpp:notNotifyable; + yext3gpp:inVariant; } leaf perceivedSeverity { diff --git a/yang-models/_3gpp-common-managed-element.yang b/yang-models/_3gpp-common-managed-element.yang index 066b356aa..ceb21297b 100755 --- a/yang-models/_3gpp-common-managed-element.yang +++ b/yang-models/_3gpp-common-managed-element.yang @@ -15,7 +15,9 @@ module _3gpp-common-managed-element { contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464"; description "Defines ManagedElement which will be augmented - by other IOCs"; + by other IOCs + Copyright 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + TTA, TTC) 2019-2023. All rights reserved."; reference "3GPP TS 28.623 Generic Network Resource Model (NRM) Integration Reference Point (IRP); @@ -29,6 +31,7 @@ module _3gpp-common-managed-element { 3GPP TS 28.620 Umbrella Information Model (UIM)"; + revision 2023-09-17 { reference CR-0270 ; } revision 2022-07-26 { reference CR-0180 ; } revision 2021-01-16 { reference "CR-0120"; } revision 2020-08-06 { reference "CR-0102"; } diff --git a/yang-models/_3gpp-common-managed-function.yang b/yang-models/_3gpp-common-managed-function.yang index 608ced296..a34a14be3 100755 --- a/yang-models/_3gpp-common-managed-function.yang +++ b/yang-models/_3gpp-common-managed-function.yang @@ -12,7 +12,9 @@ module _3gpp-common-managed-function { organization "3GPP SA5"; contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464"; description "The module defines a base class/grouping for major 3GPP - functions."; + functions. + Copyright 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + TTA, TTC) 2019-2023. All rights reserved."; reference "3GPP TS 28.622 Generic Network Resource Model (NRM) @@ -21,6 +23,8 @@ module _3gpp-common-managed-function { 3GPP TS 28.620 Umbrella Information Model (UIM)"; + + revision 2023-09-17 { reference CR-0270 ; } revision 2022-10-31 { reference CR-0195; } revision 2022-01-07 { reference "CR-0146"; } revision 2021-01-25 { reference "CR-0122"; } @@ -49,6 +53,7 @@ module _3gpp-common-managed-function { type string; mandatory true; yext3gpp:notNotifyable; + yext3gpp:inVariant; } leaf-list allowedNFTypes { @@ -68,6 +73,7 @@ module _3gpp-common-managed-function { mandatory true; description "Semantics type of the operation."; reference "3GPP TS 23.502"; + yext3gpp:inVariant; } } @@ -87,6 +93,7 @@ module _3gpp-common-managed-function { description "The type of the managed NF service instance The specifc values allowed are described in clause 7.2 of TS 23.501"; yext3gpp:notNotifyable; + yext3gpp:inVariant; } list sAP { diff --git a/yang-models/_3gpp-common-managementdatacollection.yang b/yang-models/_3gpp-common-managementdatacollection.yang index 0704facf5..e792e2578 100644 --- a/yang-models/_3gpp-common-managementdatacollection.yang +++ b/yang-models/_3gpp-common-managementdatacollection.yang @@ -8,11 +8,14 @@ module _3gpp-common-managementdatacollection { //import ietf-inet-types { prefix inet; } import ietf-yang-types { prefix yang; } import _3gpp-common-subnetwork { prefix subnet3gpp; } + import _3gpp-common-yang-extensions { prefix yext3gpp; } organization "3GPP SA5"; contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464"; - description "Handling management data collection"; + description "Handling management data collection + Copyright 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + TTA, TTC) 2019-2023. All rights reserved."; reference "3GPP TS 28.623 Generic Network Resource Model (NRM) @@ -24,6 +27,7 @@ module _3gpp-common-managementdatacollection { Integration Reference Point (IRP); Information Service (IS)"; + revision 2023-09-17 { reference CR-0270 ; } revision 2022-11-03 { reference "CR-0193"; } @@ -99,9 +103,11 @@ module _3gpp-common-managementdatacollection { grouping TimeWindowGrp { leaf startTime { type yang:date-and-time; + yext3gpp:inVariant; } leaf endTime { type yang:date-and-time; + yext3gpp:inVariant; } } diff --git a/yang-models/_3gpp-common-measurements.yang b/yang-models/_3gpp-common-measurements.yang index 9162c103d..290dc9bd1 100755 --- a/yang-models/_3gpp-common-measurements.yang +++ b/yang-models/_3gpp-common-measurements.yang @@ -42,7 +42,9 @@ module _3gpp-common-measurements { Measurements can be contained under ManagedElement, SubNetwork, or any list representing a class inheriting from Subnetwork or - ManagedFunction. Note: KPIs will only be supported under SubNetwork"; + ManagedFunction. Note: KPIs will only be supported under SubNetwork + Copyright 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + TTA, TTC) 2019-2023. All rights reserved."; reference "3GPP TS 28.623 Generic Network Resource Model (NRM) @@ -54,6 +56,7 @@ module _3gpp-common-measurements { Integration Reference Point (IRP); Information Service (IS)"; + revision 2023-09-17 { reference CR-0270 ; } revision 2023-02-15 { reference "CR-0239";} revision 2022-11-03 { reference "CR-0193"; } revision 2022-10-31 { reference CR-0195; } @@ -237,6 +240,7 @@ module _3gpp-common-measurements { leaf jobId { type string; description "Id for a PerfMetricJob job."; + yext3gpp:inVariant; } leaf-list performanceMetrics { @@ -287,6 +291,15 @@ module _3gpp-common-measurements { } } } + + leaf _linkToFiles { + type string; + mandatory true; + config false; + description "Link to a 'Files' object."; + yext3gpp:inVariant; + yext3gpp:notNotifyable; + } } diff --git a/yang-models/_3gpp-common-mnsregistry.yang b/yang-models/_3gpp-common-mnsregistry.yang index f0c3a3d07..d034a57c5 100755 --- a/yang-models/_3gpp-common-mnsregistry.yang +++ b/yang-models/_3gpp-common-mnsregistry.yang @@ -10,9 +10,12 @@ module _3gpp-common-mnsregistry { organization "3GPP SA5"; contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464"; description "Defines the YANG mapping of the MNSRegistry Information Object - Class (IOC) that is part of the Generic Network Resource Model (NRM)."; + Class (IOC) that is part of the Generic Network Resource Model (NRM). + Copyright 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + TTA, TTC) 2019-2023. All rights reserved."; reference "3GPP TS 28.623 Generic Network Resource Model (NRM)"; + revision 2023-09-17 { reference CR-0270 ; } revision 2023-09-09 { reference CR0242; } revision 2023-07-25 { reference CR00252; } revision 2021-11-23 { reference "S5-216090"; } diff --git a/yang-models/_3gpp-common-subnetwork.yang b/yang-models/_3gpp-common-subnetwork.yang index 777936f24..8c0d99e79 100755 --- a/yang-models/_3gpp-common-subnetwork.yang +++ b/yang-models/_3gpp-common-subnetwork.yang @@ -15,7 +15,9 @@ module _3gpp-common-subnetwork { organization "3GPP SA5"; contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464"; - description "Defines basic SubNetwork which will be augmented by other IOCs"; + description "Defines basic SubNetwork which will be augmented by other IOCs + Copyright 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + TTA, TTC) 2019-2023. All rights reserved."; reference "3GPP TS 28.623 Generic Network Resource Model (NRM) Integration Reference Point (IRP); @@ -29,6 +31,7 @@ module _3gpp-common-subnetwork { 3GPP TS 28.620 Umbrella Information Model (UIM)"; + revision 2023-09-17 { reference CR-0270 ; } revision 2022-07-26 { reference CR-0180 ; } revision 2021-01-16 { reference "CR-0120"; } revision 2020-08-06 { reference "CR-0102"; } diff --git a/yang-models/_3gpp-common-subscription-control.yang b/yang-models/_3gpp-common-subscription-control.yang index 58688a029..4a2828bf2 100755 --- a/yang-models/_3gpp-common-subscription-control.yang +++ b/yang-models/_3gpp-common-subscription-control.yang @@ -9,13 +9,16 @@ module _3gpp-common-subscription-control { organization "3GPP SA5"; contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464"; - description "Defines IOCs for subscription and heartbeat control."; + description "Defines IOCs for subscription and heartbeat control. + Copyright 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + TTA, TTC) 2019-2023. All rights reserved."; reference "3GPP TS 28.623 Generic Network Resource Model (NRM) Integration Reference Point (IRP); Solution Set (SS) definitions 3GPP TS 28.623"; + revision 2023-09-17 { reference CR-0270 ; } revision 2023-08-11 { reference "CR-0259"; } revision 2022-10-31 { reference CR-0195; } revision 2021-01-16 { reference "CR-0120"; } diff --git a/yang-models/_3gpp-common-top.yang b/yang-models/_3gpp-common-top.yang index c58adbea7..8ba19bb27 100755 --- a/yang-models/_3gpp-common-top.yang +++ b/yang-models/_3gpp-common-top.yang @@ -7,7 +7,9 @@ module _3gpp-common-top { organization "3gpp SA5"; description "The model defines a YANG mapping of the top level information classes used for management of 5G networks and - network slicing."; + network slicing. + Copyright 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + TTA, TTC) 2019-2023. All rights reserved."; reference "3GPP TS 28.622 Generic Network Resource Model (NRM) @@ -17,6 +19,7 @@ module _3gpp-common-top { 3GPP TS 28.620 Umbrella Information Model (UIM)"; + revision 2023-09-17 { reference CR-0270 ; } revision 2019-06-17 { description "Initial revision"; } diff --git a/yang-models/_3gpp-common-trace.yang b/yang-models/_3gpp-common-trace.yang index a1fdd2546..795bff442 100755 --- a/yang-models/_3gpp-common-trace.yang +++ b/yang-models/_3gpp-common-trace.yang @@ -5,12 +5,15 @@ module _3gpp-common-trace { import _3gpp-common-top { prefix top3gpp; } import _3gpp-common-yang-types {prefix types3gpp; } + import _3gpp-common-yang-extensions { prefix yext3gpp; } import ietf-inet-types { prefix inet; } organization "3GPP SA5"; contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464"; - description "Trace handling"; + description "Trace handling + Copyright 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + TTA, TTC) 2019-2023. All rights reserved."; reference "3GPP TS 28.623 Generic Network Resource Model (NRM) @@ -22,6 +25,7 @@ module _3gpp-common-trace { Integration Reference Point (IRP); Information Service (IS)"; + revision 2023-09-17 { reference CR-0270 ; } revision 2023-07-25 { reference CR00252; } revision 2023-02-17 { reference "CR-0232"; } revision 2023-02-15 { reference "CR-0236"; } @@ -472,6 +476,12 @@ module _3gpp-common-trace { The attribute is applicable for both Trace and MDT."; } + leaf jobId { + type string; + description "Identifier of a TraceJob"; + yext3gpp:inVariant; + } + leaf traceReportingFormat { type enumeration { enum FILE_BASED; @@ -550,7 +560,7 @@ module _3gpp-common-trace { reference "3GPP TS 32.422"; } - leaf triggeringEvent { + leaf triggeringEvents { when '../jobType = "TRACE_ONLY" or ' + '../jobType = "IMMEDIATE_MDT_AND_TRACE"'; type string ; diff --git a/yang-models/_3gpp-common-yang-extensions.yang b/yang-models/_3gpp-common-yang-extensions.yang index fe703ee2b..8f6738867 100755 --- a/yang-models/_3gpp-common-yang-extensions.yang +++ b/yang-models/_3gpp-common-yang-extensions.yang @@ -7,7 +7,8 @@ module _3gpp-common-yang-extensions { description "The module defines YANG extensions needed 3GPP YANG modeling. - Copyright (c) 2019 3GPP. All rights reserved. + Copyright 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + TTA, TTC) 2019-2023. All rights reserved. Extensions MUST be defined with the following structure in the description statement: @@ -40,6 +41,7 @@ module _3gpp-common-yang-extensions { the extension e.g. with a deviation. "; + revision 2023-09-17 { reference CR-0270 ; } revision 2022-10-31 { reference CR-0195; } revision 2019-06-23 { reference "Initial version"; } diff --git a/yang-models/_3gpp-common-yang-types.yang b/yang-models/_3gpp-common-yang-types.yang index cc2323312..856e2e56a 100755 --- a/yang-models/_3gpp-common-yang-types.yang +++ b/yang-models/_3gpp-common-yang-types.yang @@ -11,9 +11,12 @@ module _3gpp-common-yang-types { contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464"; description "The model defines a YANG mapping of the top level information classes used for management of 5G networks and - network slicing."; + network slicing. + Copyright 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + TTA, TTC) 2019-2023. All rights reserved."; reference "3GPP TS 28.623"; + revision 2023-09-17 { reference CR-0270 ; } revision 2023-08-09 { reference CR-0265; } revision 2023-05-09 { reference CR-0249; } revision 2022-11-03 { reference "CR-0193"; } diff --git a/yang-models/_3gpp-nr-nrm-beam.yang b/yang-models/_3gpp-nr-nrm-beam.yang index ae97f88d6..cf161f83c 100755 --- a/yang-models/_3gpp-nr-nrm-beam.yang +++ b/yang-models/_3gpp-nr-nrm-beam.yang @@ -13,9 +13,12 @@ module _3gpp-nr-nrm-beam { organization "3GPP SA5"; contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464"; description "Defines the YANG mapping of the Beam Information - Object Class (IOC) that is part of the NR Network Resource Model (NRM)."; + Object Class (IOC) that is part of the NR Network Resource Model (NRM). + Copyright 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + TTA, TTC) 2019-2023. All rights reserved."; reference "3GPP TS 28.541 5G Network Resource Model (NRM)"; + revision 2023-09-17 { reference CR-1042 ; } revision 2019-11-23 { description "Initial revision"; reference "S5-197643"; diff --git a/yang-models/_3gpp-nr-nrm-bwp.yang b/yang-models/_3gpp-nr-nrm-bwp.yang index bd18865a6..038ed4c57 100755 --- a/yang-models/_3gpp-nr-nrm-bwp.yang +++ b/yang-models/_3gpp-nr-nrm-bwp.yang @@ -11,9 +11,12 @@ module _3gpp-nr-nrm-bwp { organization "3GPP SA5"; contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464"; description "Defines the YANG mapping of the BWP Information Object Class - (IOC) that is part of the NR Network Resource Model (NRM)."; + (IOC) that is part of the NR Network Resource Model (NRM). + Copyright 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + TTA, TTC) 2019-2023. All rights reserved."; reference "3GPP TS 28.541 5G Network Resource Model (NRM)"; + revision 2023-09-17 { reference CR-1042 ; } revision 2020-11-17 { reference CR-0410 ; } revision 2019-10-28 { reference S5-193518 ; } revision 2019-06-17 { reference "Initial revision"; } diff --git a/yang-models/_3gpp-nr-nrm-cesmanagementfunction.yang b/yang-models/_3gpp-nr-nrm-cesmanagementfunction.yang index f438d0b22..2a312c5b5 100755 --- a/yang-models/_3gpp-nr-nrm-cesmanagementfunction.yang +++ b/yang-models/_3gpp-nr-nrm-cesmanagementfunction.yang @@ -14,9 +14,12 @@ module _3gpp-nr-nrm-cesmanagementfunction { contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464"; description "Defines the YANG mapping of the CESManagementFunction Information Object Class (IOC) that is part of the NR Network Resource Model - (NRM)."; + (NRM). + Copyright 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + TTA, TTC) 2019-2023. All rights reserved."; reference "3GPP TS 28.541 5G Network Resource Model (NRM)"; + revision 2023-09-17 { reference CR-1042 ; } revision 2021-08-05 { reference S5-214053/CR-0518; } revision 2020-05-08 { reference S5-203316; } diff --git a/yang-models/_3gpp-nr-nrm-commonbeamformingfunction.yang b/yang-models/_3gpp-nr-nrm-commonbeamformingfunction.yang index e900d4fc4..a9e17a303 100755 --- a/yang-models/_3gpp-nr-nrm-commonbeamformingfunction.yang +++ b/yang-models/_3gpp-nr-nrm-commonbeamformingfunction.yang @@ -12,9 +12,12 @@ module _3gpp-nr-nrm-commonbeamformingfunction { 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)."; + Object Class (IOC) that is part of the NR Network Resource Model (NRM). + Copyright 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + TTA, TTC) 2019-2023. All rights reserved."; reference "3GPP TS 28.541 5G Network Resource Model (NRM)"; + revision 2023-09-17 { reference CR-1042 ; } revision 2019-11-22 { description "Initial revision"; reference "S5-197643"; diff --git a/yang-models/_3gpp-nr-nrm-cpciconfigurationfunction.yang b/yang-models/_3gpp-nr-nrm-cpciconfigurationfunction.yang index 2a704d3aa..a72c586f2 100755 --- a/yang-models/_3gpp-nr-nrm-cpciconfigurationfunction.yang +++ b/yang-models/_3gpp-nr-nrm-cpciconfigurationfunction.yang @@ -12,9 +12,12 @@ module _3gpp-nr-nrm-cpciconfigurationfunction { organization "3GPP SA5"; contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464"; description "Represents the CPCIConfigurationFunction Information Object - Class(IOC) that is part of the NR Network Resource Model."; + Class(IOC) that is part of the NR Network Resource Model. + Copyright 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + TTA, TTC) 2019-2023. All rights reserved."; reference "3GPP TS 28.541 5G Network Resource Model (NRM)"; + revision 2023-09-17 { reference CR-1042 ; } revision 2021-08-05 { reference S5-214053/CR-0518; } revision 2020-05-08 { reference S5-203316; } diff --git a/yang-models/_3gpp-nr-nrm-danrmanagementfunction.yang b/yang-models/_3gpp-nr-nrm-danrmanagementfunction.yang index 9ec94fc20..7473a729b 100755 --- a/yang-models/_3gpp-nr-nrm-danrmanagementfunction.yang +++ b/yang-models/_3gpp-nr-nrm-danrmanagementfunction.yang @@ -13,9 +13,12 @@ module _3gpp-nr-nrm-danrmanagementfunction { organization "3GPP SA5"; contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464"; description "Defines the YANG mapping of the DANRManagementFunction Information Object Class - (IOC) that is part of the NR Network Resource Model (NRM)."; + (IOC) that is part of the NR Network Resource Model (NRM). + Copyright 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + TTA, TTC) 2019-2023. All rights reserved."; reference "3GPP TS 28.541 5G Network Resource Model (NRM)"; + revision 2023-09-17 { reference CR-1042 ; } revision 2020-05-08 { reference S5-203316; } diff --git a/yang-models/_3gpp-nr-nrm-desmanagementfunction.yang b/yang-models/_3gpp-nr-nrm-desmanagementfunction.yang index 6df736c4d..f9bca8aba 100755 --- a/yang-models/_3gpp-nr-nrm-desmanagementfunction.yang +++ b/yang-models/_3gpp-nr-nrm-desmanagementfunction.yang @@ -14,9 +14,12 @@ module _3gpp-nr-nrm-desmanagementfunction { contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464"; description "Defines the YANG mapping of the DESManagementFunction Information Object Class (IOC) that is part of the NR Network Resource - Model (NRM)."; + Model (NRM). + Copyright 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + TTA, TTC) 2019-2023. All rights reserved."; reference "3GPP TS 28.541 5G Network Resource Model (NRM)"; + revision 2023-09-17 { reference CR-1042 ; } revision 2021-08-05 { reference S5-214053/CR-0518; } revision 2020-05-08 { reference S5-203316; } diff --git a/yang-models/_3gpp-nr-nrm-dlbofunction.yang b/yang-models/_3gpp-nr-nrm-dlbofunction.yang index d532fe037..013239169 100644 --- a/yang-models/_3gpp-nr-nrm-dlbofunction.yang +++ b/yang-models/_3gpp-nr-nrm-dlbofunction.yang @@ -13,9 +13,12 @@ module _3gpp-nr-nrm-dlbofunction { contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464"; description "Defines the YANG mapping of the DLBOFunction Information Object Class (IOC) that is part of the NR Network Resource - Model (NRM)."; + Model (NRM). + Copyright 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + TTA, TTC) 2019-2023. All rights reserved."; reference "3GPP TS 28.541 5G Network Resource Model (NRM)"; + revision 2023-09-17 { reference CR-1042 ; } revision 2022-03-25 { reference "CR-0683"; } revision 2021-10-22 { reference "CR-0577"; } diff --git a/yang-models/_3gpp-nr-nrm-dmrofunction.yang b/yang-models/_3gpp-nr-nrm-dmrofunction.yang index 4a065cdf9..05169e0e5 100755 --- a/yang-models/_3gpp-nr-nrm-dmrofunction.yang +++ b/yang-models/_3gpp-nr-nrm-dmrofunction.yang @@ -13,9 +13,12 @@ module _3gpp-nr-nrm-dmrofunction { contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464"; description "Defines the YANG mapping of the DMROFunction Information Object Class (IOC) that is part of the NR Network Resource - Model (NRM)."; + Model (NRM). + Copyright 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + TTA, TTC) 2019-2023. All rights reserved."; reference "3GPP TS 28.541 5G Network Resource Model (NRM)"; + revision 2023-09-17 { reference CR-1042 ; } revision 2022-01-07 { reference CR-0633; } revision 2021-08-05 { reference S5-214053/CR-0518; } revision 2020-05-08 { reference S5-203316; } diff --git a/yang-models/_3gpp-nr-nrm-dpciconfigurationfunction.yang b/yang-models/_3gpp-nr-nrm-dpciconfigurationfunction.yang index 806b0d659..23400743a 100755 --- a/yang-models/_3gpp-nr-nrm-dpciconfigurationfunction.yang +++ b/yang-models/_3gpp-nr-nrm-dpciconfigurationfunction.yang @@ -14,9 +14,12 @@ module _3gpp-nr-nrm-dpciconfigurationfunction { contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464"; description "Defines the YANG mapping of the DPCIConfigurationFunction Information Object Class (IOC) that is part of the NR Network Resource - Model (NRM)."; + Model (NRM). + Copyright 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + TTA, TTC) 2019-2023. All rights reserved."; reference "3GPP TS 28.541 5G Network Resource Model (NRM)"; + revision 2023-09-17 { reference CR-1042 ; } revision 2021-08-05 { reference S5-214053/CR-0518; } revision 2021-01-25 { reference CR-0454 ; } revision 2020-11-25 { reference CR-0386 ; } diff --git a/yang-models/_3gpp-nr-nrm-drachoptimizationfunction.yang b/yang-models/_3gpp-nr-nrm-drachoptimizationfunction.yang index 314372c38..0ba8dbab5 100755 --- a/yang-models/_3gpp-nr-nrm-drachoptimizationfunction.yang +++ b/yang-models/_3gpp-nr-nrm-drachoptimizationfunction.yang @@ -13,9 +13,12 @@ module _3gpp-nr-nrm-drachoptimizationfunction { contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464"; description "Defines the YANG mapping of the DRACHOptimizationFunction Information Object Class (IOC) that is part of the NR Network Resource - Model (NRM)."; + Model (NRM). + Copyright 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + TTA, TTC) 2019-2023. All rights reserved."; reference "3GPP TS 28.541 5G Network Resource Model (NRM)"; + revision 2023-09-17 { reference CR-1042 ; } revision 2021-08-05 { reference S5-214053/CR-0518; } revision 2021-01-25 { reference CR-0454 ; } revision 2020-10-02 { reference "CR-0384, CR-0382" ; } diff --git a/yang-models/_3gpp-nr-nrm-ep.yang b/yang-models/_3gpp-nr-nrm-ep.yang index f36653ea7..0d9190fad 100755 --- a/yang-models/_3gpp-nr-nrm-ep.yang +++ b/yang-models/_3gpp-nr-nrm-ep.yang @@ -14,9 +14,12 @@ module _3gpp-nr-nrm-ep { contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464"; description "Defines the YANG mapping of the NR related endpoint Information Object Classes (IOCs) that are part of the NR Network - Resource Model (NRM)."; + Resource Model (NRM). + Copyright 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + TTA, TTC) 2019-2023. All rights reserved."; reference "3GPP TS 28.541 5G Network Resource Model (NRM)"; + revision 2023-09-17 { reference CR-1042 ; } revision 2022-01-07 { reference CR-0643; } revision 2021-05-01 { reference CR-0490; } revision 2021-03-03 { reference CR-0435 ; } diff --git a/yang-models/_3gpp-nr-nrm-eutrancellrelation.yang b/yang-models/_3gpp-nr-nrm-eutrancellrelation.yang index 29d2d1d1e..9d39e9980 100755 --- a/yang-models/_3gpp-nr-nrm-eutrancellrelation.yang +++ b/yang-models/_3gpp-nr-nrm-eutrancellrelation.yang @@ -12,9 +12,12 @@ module _3gpp-nr-nrm-eutrancellrelation { organization "3GPP SA5"; contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464"; description "Defines the YANG mapping of the EUtranCellRelation Information - Object Class (IOC) that is part of the NR Network Resource Model (NRM)."; + Object Class (IOC) that is part of the NR Network Resource Model (NRM). + Copyright 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + TTA, TTC) 2019-2023. All rights reserved."; reference "3GPP TS 28.541 5G Network Resource Model (NRM)"; + revision 2023-09-17 { reference CR-1042 ; } revision 2023-06-25 { reference CR0932 ; } revision 2019-10-28 { reference S5-193518 ; } revision 2019-06-17 { reference "Initial revision"; } diff --git a/yang-models/_3gpp-nr-nrm-eutranetwork.yang b/yang-models/_3gpp-nr-nrm-eutranetwork.yang index 068bc246c..3dc8193bd 100755 --- a/yang-models/_3gpp-nr-nrm-eutranetwork.yang +++ b/yang-models/_3gpp-nr-nrm-eutranetwork.yang @@ -8,9 +8,12 @@ module _3gpp-nr-nrm-eutranetwork { organization "3GPP SA5"; description "Defines the YANG mapping of the EUtraNetwork Information Object - Class (IOC) that is part of the NR Network Resource Model (NRM)."; + Class (IOC) that is part of the NR Network Resource Model (NRM). + Copyright 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + TTA, TTC) 2019-2023. All rights reserved."; reference "3GPP TS 28.541 5G Network Resource Model (NRM)"; + revision 2023-09-17 { reference CR-1042 ; } revision 2019-06-17 { description "Initial revision"; } diff --git a/yang-models/_3gpp-nr-nrm-eutranfreqrelation.yang b/yang-models/_3gpp-nr-nrm-eutranfreqrelation.yang index 38d337f0c..7444790e2 100755 --- a/yang-models/_3gpp-nr-nrm-eutranfreqrelation.yang +++ b/yang-models/_3gpp-nr-nrm-eutranfreqrelation.yang @@ -12,9 +12,12 @@ module _3gpp-nr-nrm-eutranfreqrelation { organization "3GPP SA5"; contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464"; description "Defines the YANG mapping of the EUtranFreqRelation Information - Object Class (IOC) that is part of the NR Network Resource Model (NRM)."; + Object Class (IOC) that is part of the NR Network Resource Model (NRM). + Copyright 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + TTA, TTC) 2019-2023. All rights reserved."; reference "3GPP TS 28.541 5G Network Resource Model (NRM)"; + revision 2023-09-17 { reference CR-1042 ; } revision 2023-06-25 { reference CR0932 ; } revision 2019-10-28 { reference S5-193518 ; } revision 2019-06-17 { reference "Initial revision"; } diff --git a/yang-models/_3gpp-nr-nrm-eutranfrequency.yang b/yang-models/_3gpp-nr-nrm-eutranfrequency.yang index 2d8a4534a..5bbf68840 100755 --- a/yang-models/_3gpp-nr-nrm-eutranfrequency.yang +++ b/yang-models/_3gpp-nr-nrm-eutranfrequency.yang @@ -10,10 +10,13 @@ module _3gpp-nr-nrm-eutranfrequency { organization "3GPP SA5"; description "Defines the YANG mapping of the EUtranFrequency Information - Object Class (IOC), that is part of the NR Network Resource Model (NRM)."; + Object Class (IOC), that is part of the NR Network Resource Model (NRM). + Copyright 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + TTA, TTC) 2019-2023. All rights reserved."; reference "3GPP TS 28.541 5G Network Resource Model (NRM), 3GPP TS 28.658 (E-UTRAN) Network Resource Model (NRM)"; + revision 2023-09-17 { reference CR-1042 ; } revision 2019-10-28 { reference S5-193518 ; } revision 2019-06-17 { description "Initial revision"; diff --git a/yang-models/_3gpp-nr-nrm-externalamffunction.yang b/yang-models/_3gpp-nr-nrm-externalamffunction.yang index bfd30c58a..aac6c9af2 100755 --- a/yang-models/_3gpp-nr-nrm-externalamffunction.yang +++ b/yang-models/_3gpp-nr-nrm-externalamffunction.yang @@ -11,9 +11,12 @@ module _3gpp-nr-nrm-externalamffunction { organization "3GPP SA5"; description "Defines the YANG mapping of the ExternalAMFFunction Information - Object Class (IOC) that is part of the NR Network Resource Model (NRM)."; + Object Class (IOC) that is part of the NR Network Resource Model (NRM). + Copyright 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + TTA, TTC) 2019-2023. All rights reserved."; reference "3GPP TS 28.541 5G Network Resource Model (NRM)"; + revision 2023-09-17 { reference CR-1042 ; } revision 2019-10-28 { reference S5-193518 ; } revision 2019-06-17 { description "Initial revision"; diff --git a/yang-models/_3gpp-nr-nrm-externalenbfunction.yang b/yang-models/_3gpp-nr-nrm-externalenbfunction.yang index 7dab2e970..b66726267 100755 --- a/yang-models/_3gpp-nr-nrm-externalenbfunction.yang +++ b/yang-models/_3gpp-nr-nrm-externalenbfunction.yang @@ -11,10 +11,13 @@ module _3gpp-nr-nrm-externalenbfunction { organization "3GPP SA5"; description "Defines the YANG mapping of the ExternalENBFunction Information Object Class (IOC) that is part of the NR Network Resource - Model (NRM)."; + Model (NRM). + Copyright 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + TTA, TTC) 2019-2023. All rights reserved."; reference "3GPP TS 28.541 5G Network Resource Model (NRM), 3GPP TS 28.658 (E-UTRAN) Network Resource Model (NRM)"; + revision 2023-09-17 { reference CR-1042 ; } revision 2019-10-28 { reference S5-193518 ; } revision 2019-06-17 { description "Initial revision"; diff --git a/yang-models/_3gpp-nr-nrm-externaleutrancell.yang b/yang-models/_3gpp-nr-nrm-externaleutrancell.yang index df62f1c5f..9788adfc3 100755 --- a/yang-models/_3gpp-nr-nrm-externaleutrancell.yang +++ b/yang-models/_3gpp-nr-nrm-externaleutrancell.yang @@ -13,10 +13,13 @@ module _3gpp-nr-nrm-externaleutrancell { organization "3GPP SA5"; description "Defines the YANG mapping of the ExternalEUtranCellFDD and ExternalEUtranCellTDD Information Object Classes (IOCs) that are part - of the NR Network Resource Model (NRM)."; + of the NR Network Resource Model (NRM). + Copyright 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + TTA, TTC) 2019-2023. All rights reserved."; reference "3GPP TS 28.541 5G Network Resource Model (NRM), 3GPP TS 28.658 (E-UTRAN) Network Resource Model (NRM)"; + revision 2023-09-17 { reference CR-1042 ; } revision 2019-10-28 { reference S5-193518 ; } revision 2019-06-17 { description "Initial revision"; diff --git a/yang-models/_3gpp-nr-nrm-externalgnbcucpfunction.yang b/yang-models/_3gpp-nr-nrm-externalgnbcucpfunction.yang index 531e45bed..52c7f0a2d 100755 --- a/yang-models/_3gpp-nr-nrm-externalgnbcucpfunction.yang +++ b/yang-models/_3gpp-nr-nrm-externalgnbcucpfunction.yang @@ -12,9 +12,12 @@ module _3gpp-nr-nrm-externalgnbcucpfunction { organization "3GPP SA5"; description "Defines the YANG mapping of the ExternalGNBCUCPFunction Information Object Class (IOC), that is part of the NR Network Resource - Model (NRM)."; + Model (NRM). + Copyright 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + TTA, TTC) 2019-2023. All rights reserved."; reference "3GPP TS 28.541 5G Network Resource Model (NRM)"; + revision 2023-09-17 { reference CR-1042 ; } revision 2019-10-28 { reference S5-193518 ; } revision 2019-06-17 { description "Initial revision"; diff --git a/yang-models/_3gpp-nr-nrm-externalgnbcuupfunction.yang b/yang-models/_3gpp-nr-nrm-externalgnbcuupfunction.yang index bcdeecbcc..ddf52fdb2 100755 --- a/yang-models/_3gpp-nr-nrm-externalgnbcuupfunction.yang +++ b/yang-models/_3gpp-nr-nrm-externalgnbcuupfunction.yang @@ -11,9 +11,12 @@ module _3gpp-nr-nrm-externalgnbcuupfunction { organization "3GPP SA5"; description "Defines the YANG mapping of the ExternalGNBCUUPFunction Information Object Class (IOC), that is part of the NR Network - Resource Model (NRM)."; + Resource Model (NRM). + Copyright 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + TTA, TTC) 2019-2023. All rights reserved."; reference "3GPP TS 28.541 5G Network Resource Model (NRM)"; + revision 2023-09-17 { reference CR-1042 ; } revision 2019-10-28 { reference S5-193518 ; } revision 2019-06-17 { description "Initial revision"; diff --git a/yang-models/_3gpp-nr-nrm-externalgnbdufunction.yang b/yang-models/_3gpp-nr-nrm-externalgnbdufunction.yang index 844933025..0af375644 100755 --- a/yang-models/_3gpp-nr-nrm-externalgnbdufunction.yang +++ b/yang-models/_3gpp-nr-nrm-externalgnbdufunction.yang @@ -8,13 +8,17 @@ module _3gpp-nr-nrm-externalgnbdufunction { import _3gpp-nr-nrm-nrnetwork { prefix nrnet3gpp; } import _3gpp-common-subnetwork { prefix subnet3gpp; } import _3gpp-common-top { prefix top3gpp; } + import _3gpp-common-yang-extensions { prefix yext3gpp; } organization "3GPP SA5"; description "Defines the YANG mapping of the ExternalGNBDUFunction Information Object Class (IOC) that is part of the NR Network Resource - Model (NRM)."; + Model (NRM). + Copyright 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + TTA, TTC) 2019-2023. All rights reserved."; reference "3GPP TS 28.541 5G Network Resource Model (NRM)"; + revision 2023-09-17 { reference CR-1042 ; } revision 2019-10-28 { reference S5-193518 ; } revision 2019-06-17 { description "Initial revision"; @@ -38,6 +42,7 @@ module _3gpp-nr-nrm-externalgnbdufunction { reference "gNB ID in 3GPP TS 38.300, Global gNB ID in 3GPP TS 38.413"; mandatory true; type int32 { range "22..32"; } + yext3gpp:inVariant; } list pLMNId { diff --git a/yang-models/_3gpp-nr-nrm-externalnrcellcu.yang b/yang-models/_3gpp-nr-nrm-externalnrcellcu.yang index 78e4671f0..14c33d109 100755 --- a/yang-models/_3gpp-nr-nrm-externalnrcellcu.yang +++ b/yang-models/_3gpp-nr-nrm-externalnrcellcu.yang @@ -12,9 +12,12 @@ module _3gpp-nr-nrm-externalnrcellcu { organization "3GPP SA5"; description "Defines the YANG mapping of the ExternalNRCellCU Information - Object Class (IOC), that is part of the NR Network Resource Model (NRM)."; + Object Class (IOC), that is part of the NR Network Resource Model (NRM). + Copyright 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + TTA, TTC) 2019-2023. All rights reserved."; reference "3GPP TS 28.541 5G Network Resource Model (NRM)"; + revision 2023-09-17 { reference CR-1042 ; } revision 2019-10-28 { reference S5-193518 ; } revision 2019-06-17 { diff --git a/yang-models/_3gpp-nr-nrm-externalservinggwfunction.yang b/yang-models/_3gpp-nr-nrm-externalservinggwfunction.yang index 96f51bd22..1de089fe3 100755 --- a/yang-models/_3gpp-nr-nrm-externalservinggwfunction.yang +++ b/yang-models/_3gpp-nr-nrm-externalservinggwfunction.yang @@ -11,9 +11,12 @@ module _3gpp-nr-nrm-externalservinggwfunction { organization "3GPP SA5"; description "Defines the YANG mapping of the ExternalServingGWFunction Information Object Class (IOC) that is part of the NR Network Resource - Model (NRM)."; + Model (NRM). + Copyright 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + TTA, TTC) 2019-2023. All rights reserved."; reference "3GPP TS 28.541 5G Network Resource Model (NRM)"; + revision 2023-09-17 { reference CR-1042 ; } revision 2019-10-28 { reference S5-193518 ; } revision 2019-06-17 { description "Initial revision"; diff --git a/yang-models/_3gpp-nr-nrm-externalupffunction.yang b/yang-models/_3gpp-nr-nrm-externalupffunction.yang index 1175c8c60..e6278836e 100755 --- a/yang-models/_3gpp-nr-nrm-externalupffunction.yang +++ b/yang-models/_3gpp-nr-nrm-externalupffunction.yang @@ -10,9 +10,12 @@ module _3gpp-nr-nrm-externalupffunction { organization "3GPP SA5"; description "Defines the YANG mapping of the ExternalUPFFunction Information - Object Class (IOC) that is part of the NR Network Resource Model (NRM)."; + Object Class (IOC) that is part of the NR Network Resource Model (NRM). + Copyright 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + TTA, TTC) 2019-2023. All rights reserved."; reference "3GPP TS 28.541 5G Network Resource Model (NRM)"; + revision 2023-09-17 { reference CR-1042 ; } revision 2019-10-28 { reference S5-193518 ; } revision 2019-06-17 { description "Initial revision"; diff --git a/yang-models/_3gpp-nr-nrm-gnbcucpfunction.yang b/yang-models/_3gpp-nr-nrm-gnbcucpfunction.yang index ccfc57f6c..b8840b5dc 100755 --- a/yang-models/_3gpp-nr-nrm-gnbcucpfunction.yang +++ b/yang-models/_3gpp-nr-nrm-gnbcucpfunction.yang @@ -7,13 +7,17 @@ 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-common-yang-extensions { prefix yext3gpp; } organization "3GPP SA5"; contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464"; description "Defines the YANG mapping of the GNBCUCPFunction Information - Object Class (IOC) that is part of the NR Network Resource Model (NRM)."; + Object Class (IOC) that is part of the NR Network Resource Model (NRM). + Copyright 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + TTA, TTC) 2019-2023. All rights reserved."; reference "3GPP TS 28.541 5G Network Resource Model (NRM)"; + revision 2023-09-17 { reference CR-1042 ; } revision 2022-07-27 { reference "CR-0769"; } revision 2021-11-06 { reference "CR-0611" ; } revision 2021-11-05 { reference "CR-0609"; } @@ -73,6 +77,7 @@ module _3gpp-nr-nrm-gnbcucpfunction { key "mcc mnc"; min-elements 1; max-elements 1; + yext3gpp:inVariant; uses types3gpp:PLMNId; } diff --git a/yang-models/_3gpp-nr-nrm-gnbcuupfunction.yang b/yang-models/_3gpp-nr-nrm-gnbcuupfunction.yang index 973689b39..b48cb954e 100755 --- a/yang-models/_3gpp-nr-nrm-gnbcuupfunction.yang +++ b/yang-models/_3gpp-nr-nrm-gnbcuupfunction.yang @@ -8,13 +8,17 @@ 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-common-yang-extensions { prefix yext3gpp; } organization "3GPP SA5"; contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464"; description "Defines the YANG mapping of the GNBCUUPFunction Information - Object Class (IOC) that is part of the NR Network Resource Model (NRM)."; + Object Class (IOC) that is part of the NR Network Resource Model (NRM). + Copyright 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + TTA, TTC) 2019-2023. All rights reserved."; reference "3GPP TS 28.541 5G Network Resource Model (NRM)"; + revision 2023-09-17 { reference CR-1042 ; } revision 2022-07-27 { reference "CR-0769"; } revision 2020-11-05 { reference CR-0412 ; } revision 2020-08-06 { reference "CR-0333"; } @@ -107,6 +111,7 @@ module _3gpp-nr-nrm-gnbcuupfunction { mandatory true; description "Identifies the gNB-CU-UP at least within a gNB-CU-CP"; reference "'gNB-CU-UP ID' in subclause 9.3.1.15 of 3GPP TS 38.463"; + yext3gpp:inVariant; } leaf gNBId { diff --git a/yang-models/_3gpp-nr-nrm-gnbdufunction.yang b/yang-models/_3gpp-nr-nrm-gnbdufunction.yang index 1428af023..b54db62a8 100755 --- a/yang-models/_3gpp-nr-nrm-gnbdufunction.yang +++ b/yang-models/_3gpp-nr-nrm-gnbdufunction.yang @@ -7,13 +7,17 @@ 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-common-yang-extensions { prefix yext3gpp; } organization "3GPP SA5"; contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464"; description "Defines the YANG mapping of the GNBDUFunction Information - Object Class (IOC) that is part of the NR Network Resource Model (NRM)."; + Object Class (IOC) that is part of the NR Network Resource Model (NRM). + Copyright 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + TTA, TTC) 2019-2023. All rights reserved."; reference "3GPP TS 28.541 5G Network Resource Model (NRM)"; + revision 2023-09-17 { reference CR-1042 ; } revision 2022-07-27 { reference "CR-0769"; } revision 2021-10-28 { reference CR-0607 ; } revision 2021-04-30 { reference CR-0490 ; } @@ -168,6 +172,7 @@ module _3gpp-nr-nrm-gnbdufunction { max-elements 1; description "Used to configure gNBs to report the all necessary information derived from the detected RIM-RS to OAM."; + yext3gpp:inVariant; uses RimRSReportConfGrp; } } diff --git a/yang-models/_3gpp-nr-nrm-nrcellcu.yang b/yang-models/_3gpp-nr-nrm-nrcellcu.yang index a0a3e9889..0462f35a4 100755 --- a/yang-models/_3gpp-nr-nrm-nrcellcu.yang +++ b/yang-models/_3gpp-nr-nrm-nrcellcu.yang @@ -13,9 +13,12 @@ module _3gpp-nr-nrm-nrcellcu { organization "3GPP SA5"; contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464"; description "Defines the YANG mapping of the NRCellCU Information Object - Class (IOC) that is part of the NR Network Resource Model (NRM)."; + Class (IOC) that is part of the NR Network Resource Model (NRM). + Copyright 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + TTA, TTC) 2019-2023. All rights reserved."; reference "3GPP TS 28.541 5G Network Resource Model (NRM)"; + revision 2023-09-17 { reference CR-1042 ; } revision 2021-01-25 { reference CR-0454 ; } revision 2020-11-25 { reference CR-0386 ; } revision 2020-11-05 { reference CR-0412 ; } diff --git a/yang-models/_3gpp-nr-nrm-nrcelldu.yang b/yang-models/_3gpp-nr-nrm-nrcelldu.yang index 48c399e32..1fd8cbcf5 100755 --- a/yang-models/_3gpp-nr-nrm-nrcelldu.yang +++ b/yang-models/_3gpp-nr-nrm-nrcelldu.yang @@ -14,9 +14,12 @@ module _3gpp-nr-nrm-nrcelldu { organization "3GPP SA5"; contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464"; description "Defines the YANG mapping of the NRCellDU Information Object - Class (IOC) that is part of the NR Network Resource Model (NRM)."; + Class (IOC) that is part of the NR Network Resource Model (NRM). + Copyright 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + TTA, TTC) 2019-2023. All rights reserved."; reference "3GPP TS 28.541 5G Network Resource Model (NRM)"; + revision 2023-09-17 { reference CR-1042 ; } revision 2022-07-27 { reference "CR-0769"; } revision 2021-10-28 { reference CR-0607 ; } revision 2021-01-25 { reference CR-0454 ; } diff --git a/yang-models/_3gpp-nr-nrm-nrcellrelation.yang b/yang-models/_3gpp-nr-nrm-nrcellrelation.yang index 861b3b370..b5843b500 100755 --- a/yang-models/_3gpp-nr-nrm-nrcellrelation.yang +++ b/yang-models/_3gpp-nr-nrm-nrcellrelation.yang @@ -12,9 +12,12 @@ module _3gpp-nr-nrm-nrcellrelation { organization "3GPP SA5"; description "Defines the YANG mapping of the NRCellRelation Information - Object Class (IOC) that is part of the NR Network Resource Model (NRM)."; + Object Class (IOC) that is part of the NR Network Resource Model (NRM). + Copyright 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + TTA, TTC) 2019-2023. All rights reserved."; reference "3GPP TS 28.541 5G Network Resource Model (NRM)"; + revision 2023-09-17 { reference CR-1042 ; } revision 2023-06-25 { reference CR0932 ; } revision 2021-01-25 { reference CR-0454 ; } revision 2020-06-03 { reference S5-202333 ; } diff --git a/yang-models/_3gpp-nr-nrm-nrfreqrelation.yang b/yang-models/_3gpp-nr-nrm-nrfreqrelation.yang index 0c571f295..f9fa3edeb 100755 --- a/yang-models/_3gpp-nr-nrm-nrfreqrelation.yang +++ b/yang-models/_3gpp-nr-nrm-nrfreqrelation.yang @@ -12,9 +12,12 @@ module _3gpp-nr-nrm-nrfreqrelation { organization "3GPP SA5"; description "Defines the YANG mapping of the NRFreqRelation Information - Object Class (IOC) that is part of the NR Network Resource Model (NRM)."; + Object Class (IOC) that is part of the NR Network Resource Model (NRM). + Copyright 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + TTA, TTC) 2019-2023. All rights reserved."; reference "3GPP TS 28.541 5G Network Resource Model (NRM)"; + revision 2023-09-17 { reference CR-1042 ; } revision 2023-06-25 { reference CR0932 ; } revision 2020-04-23 { reference CR0281 ; } revision 2019-10-28 { reference S5-193518 ; } diff --git a/yang-models/_3gpp-nr-nrm-nrfrequency.yang b/yang-models/_3gpp-nr-nrm-nrfrequency.yang index 77c905ead..a3a5ad10b 100755 --- a/yang-models/_3gpp-nr-nrm-nrfrequency.yang +++ b/yang-models/_3gpp-nr-nrm-nrfrequency.yang @@ -10,9 +10,12 @@ module _3gpp-nr-nrm-nrfrequency { organization "3GPP SA5"; description "Defines the YANG mapping of the NRFrequency Information Object - Class (IOC) that is part of the NR Network Resource Model (NRM)."; + Class (IOC) that is part of the NR Network Resource Model (NRM). + Copyright 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + TTA, TTC) 2019-2023. All rights reserved."; reference "3GPP TS 28.541 5G Network Resource Model (NRM)"; + revision 2023-09-17 { reference CR-1042 ; } revision 2019-10-28 { reference S5-193518 ; } revision 2019-06-17 { description "Initial revision"; diff --git a/yang-models/_3gpp-nr-nrm-nrnetwork.yang b/yang-models/_3gpp-nr-nrm-nrnetwork.yang index 0e0bfc559..5ef823917 100755 --- a/yang-models/_3gpp-nr-nrm-nrnetwork.yang +++ b/yang-models/_3gpp-nr-nrm-nrnetwork.yang @@ -8,9 +8,12 @@ module _3gpp-nr-nrm-nrnetwork { organization "3GPP SA5"; description "Defines the YANG mapping of the NRNetwork Information Object - Class (IOC) that is part of the NR Network Resource Model (NRM)."; + Class (IOC) that is part of the NR Network Resource Model (NRM). + Copyright 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + TTA, TTC) 2019-2023. All rights reserved."; reference "3GPP TS 28.541 5G Network Resource Model (NRM)"; + revision 2023-09-17 { reference CR-1042 ; } revision 2019-06-17 { description "Initial revision"; } diff --git a/yang-models/_3gpp-nr-nrm-nroperatorcelldu.yang b/yang-models/_3gpp-nr-nrm-nroperatorcelldu.yang index ac3624520..5e7874cea 100755 --- a/yang-models/_3gpp-nr-nrm-nroperatorcelldu.yang +++ b/yang-models/_3gpp-nr-nrm-nroperatorcelldu.yang @@ -13,9 +13,12 @@ module _3gpp-nr-nrm-nroperatorcelldu { organization "3GPP SA5"; contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464"; description "Defines the YANG mapping of the OperatorDU Information Object - Class (IOC) that is part of the NR Network Resource Model (NRM)."; + Class (IOC) that is part of the NR Network Resource Model (NRM). + Copyright 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + TTA, TTC) 2021-2023. All rights reserved."; reference "3GPP TS 28.541 5G Network Resource Model (NRM)"; + revision 2023-09-17 { reference CR-1042 ; } revision 2021-10-01 { reference "Initial revision"; } grouping NROperatorCellDUGrp { diff --git a/yang-models/_3gpp-nr-nrm-nrsectorcarrier.yang b/yang-models/_3gpp-nr-nrm-nrsectorcarrier.yang index 2f55cf1db..31d74e94e 100755 --- a/yang-models/_3gpp-nr-nrm-nrsectorcarrier.yang +++ b/yang-models/_3gpp-nr-nrm-nrsectorcarrier.yang @@ -12,9 +12,12 @@ module _3gpp-nr-nrm-nrsectorcarrier { organization "3GPP SA5"; contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464"; description "Defines the YANG mapping of the NRSectorCarrier Information - Object Class (IOC) that is part of the NR Network Resource Model (NRM)."; + Object Class (IOC) that is part of the NR Network Resource Model (NRM). + Copyright 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + TTA, TTC) 2019-2023. All rights reserved."; reference "3GPP TS 28.541 5G Network Resource Model (NRM)"; + revision 2023-09-17 { reference CR-1042 ; } revision 2020-05-28 { reference CR-0316 ; } revision 2019-10-28 { reference S5-193518 ; } revision 2019-06-17 { diff --git a/yang-models/_3gpp-nr-nrm-operatordu.yang b/yang-models/_3gpp-nr-nrm-operatordu.yang index f0214a3bb..9086e5003 100755 --- a/yang-models/_3gpp-nr-nrm-operatordu.yang +++ b/yang-models/_3gpp-nr-nrm-operatordu.yang @@ -10,9 +10,12 @@ module _3gpp-nr-nrm-operatordu { organization "3GPP SA5"; contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464"; description "Defines the YANG mapping of the OperatorDU Information Object - Class (IOC) that is part of the NR Network Resource Model (NRM)."; + Class (IOC) that is part of the NR Network Resource Model (NRM). + Copyright 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + TTA, TTC) 2021-2023. All rights reserved."; reference "3GPP TS 28.541 5G Network Resource Model (NRM)"; + revision 2023-09-17 { reference CR-1042 ; } revision 2021-10-01 { reference "Initial revision"; } grouping OperatorDUGrp { diff --git a/yang-models/_3gpp-nr-nrm-rimrsset.yang b/yang-models/_3gpp-nr-nrm-rimrsset.yang index 9f285a623..a53615aa7 100755 --- a/yang-models/_3gpp-nr-nrm-rimrsset.yang +++ b/yang-models/_3gpp-nr-nrm-rimrsset.yang @@ -10,9 +10,12 @@ module _3gpp-nr-nrm-rimrsset { organization "3GPP SA5"; contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464"; description "Defines the YANG mapping of the RimRSSet Information Object - Class (IOC) that is part of the NR Network Resource Model (NRM)."; + Class (IOC) that is part of the NR Network Resource Model (NRM). + Copyright 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + TTA, TTC) 2021-2023. All rights reserved."; reference "3GPP TS 28.541 5G Network Resource Model (NRM)"; + revision 2023-09-17 { reference CR-1042 ; } revision 2021-10-28 { reference CR-0607 ; } grouping FrequencyDomainParaGrp { diff --git a/yang-models/_3gpp-nr-nrm-rrmpolicy.yang b/yang-models/_3gpp-nr-nrm-rrmpolicy.yang index 65a7ac1a4..840f3e79f 100755 --- a/yang-models/_3gpp-nr-nrm-rrmpolicy.yang +++ b/yang-models/_3gpp-nr-nrm-rrmpolicy.yang @@ -15,9 +15,12 @@ module _3gpp-nr-nrm-rrmpolicy { organization "3GPP SA5"; contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464"; description "Defines the YANG mapping of the RRMPolicy abstract class that - is part of the NR Network Resource Model (NRM)."; + is part of the NR Network Resource Model (NRM). + Copyright 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + TTA, TTC) 2020-2023. All rights reserved."; reference "3GPP TS 28.541 5G Network Resource Model (NRM)"; + revision 2023-09-17 { reference CR-1042 ; } revision 2022-07-27 { reference "CR-0769"; } revision 2020-11-05 { reference CR-0412 ; } revision 2020-04-28 { reference "CR0285"; } diff --git a/yang-models/_3gpp-ns-nrm-common.yang b/yang-models/_3gpp-ns-nrm-common.yang index 3b03adda2..b69df8f70 100755 --- a/yang-models/_3gpp-ns-nrm-common.yang +++ b/yang-models/_3gpp-ns-nrm-common.yang @@ -10,13 +10,16 @@ module _3gpp-ns-nrm-common { organization "3GPP SA5"; contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464"; - description "Common network slice definitions"; + description "Common network slice definitions + Copyright 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + TTA, TTC) 2021-2023. All rights reserved."; reference "3GPP TS 28.541 Management and orchestration; 5G Network Resource Model (NRM); Information model definitions for network slice NRM (chapter 6) "; + revision 2023-09-17 { reference CR-1042 ; } revision 2021-07-16 { reference CR-0566 ; } revision 2021-05-17 { description "Introduction of Common Data types"; diff --git a/yang-models/_3gpp-ns-nrm-networkslice.yang b/yang-models/_3gpp-ns-nrm-networkslice.yang index 671affd81..ae2ab34a6 100755 --- a/yang-models/_3gpp-ns-nrm-networkslice.yang +++ b/yang-models/_3gpp-ns-nrm-networkslice.yang @@ -12,13 +12,16 @@ module _3gpp-ns-nrm-networkslice { 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."; + description "A network slice instance in a 5G network. + Copyright 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + TTA, TTC) 2020-2023. All rights reserved."; reference "3GPP TS 28.541 Management and orchestration; 5G Network Resource Model (NRM); Information model definitions for network slice NRM (chapter 6) "; + revision 2023-09-17 { reference CR-1042 ; } revision 2022-07-27 { reference CR-0769; } revision 2020-06-02 { reference "CR-0485, CR-0508"; diff --git a/yang-models/_3gpp-ns-nrm-networkslicesubnet.yang b/yang-models/_3gpp-ns-nrm-networkslicesubnet.yang index f433c4d20..468576b7b 100755 --- a/yang-models/_3gpp-ns-nrm-networkslicesubnet.yang +++ b/yang-models/_3gpp-ns-nrm-networkslicesubnet.yang @@ -14,13 +14,16 @@ module _3gpp-ns-nrm-networkslicesubnet { contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464"; description "This IOC represents the properties of a network slice subnet - instance in a 5G network."; + instance in a 5G network. + Copyright 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + TTA, TTC) 2019-2023. All rights reserved."; reference "3GPP TS 28.541 Management and orchestration; 5G Network Resource Model (NRM); Information model definitions for network slice NRM (chapter 6) "; + revision 2023-09-17 { reference CR-1042 ; } revision 2022-07-27 { reference CR-0769; } revision 2021-05-05 { description "replace perfReq with 3 new datatypes xxxSliceSubnetProfile"; diff --git a/yang-models/_3gpp-ns-nrm-serviceprofile.yang b/yang-models/_3gpp-ns-nrm-serviceprofile.yang index db3fcd9e7..0c85af17a 100755 --- a/yang-models/_3gpp-ns-nrm-serviceprofile.yang +++ b/yang-models/_3gpp-ns-nrm-serviceprofile.yang @@ -9,13 +9,16 @@ submodule _3gpp-ns-nrm-serviceprofile { 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."; + description "A network slice instance in a 5G network. + Copyright 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + TTA, TTC) 2020-2023. All rights reserved."; reference "3GPP TS 28.541 Management and orchestration; 5G Network Resource Model (NRM); Information model definitions for network slice NRM (chapter 6) "; + revision 2023-09-17 { reference CR-1042 ; } revision 2020-06-02 { reference "CR-0485, CR-0508"; } diff --git a/yang-models/_3gpp-ns-nrm-sliceprofile.yang b/yang-models/_3gpp-ns-nrm-sliceprofile.yang index c653df698..27031c4b3 100755 --- a/yang-models/_3gpp-ns-nrm-sliceprofile.yang +++ b/yang-models/_3gpp-ns-nrm-sliceprofile.yang @@ -12,13 +12,16 @@ submodule _3gpp-ns-nrm-sliceprofile { "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464"; description "Represents the properties of network slice subnet related requirement that should be supported by the network slice subnet - instance in a 5G network."; + instance in a 5G network. + Copyright 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + TTA, TTC) 2019-2023. All rights reserved."; reference "3GPP TS 28.541 Management and orchestration; 5G Network Resource Model (NRM); Information model definitions for network slice NRM (chapter 6) "; + revision 2023-09-17 { reference CR-1042 ; } revision 2021-07-17 { reference CR-0566 ; } revision 2021-05-05 { description "replace perfReq with 3 new datatypes xxxSliceSubnetProfile"; -- GitLab From 70d757c70895ee86f9ca1e0ebb5ddf13865b18f1 Mon Sep 17 00:00:00 2001 From: "U-ERICSSON\\ETHBLL" Date: Thu, 28 Sep 2023 15:55:23 +0200 Subject: [PATCH 02/17] Updated inVariant in 28622 and 28541 NR and 5gc NRM --- .../_3gpp-5gc-nrm-externalseppfunction.yang | 9 +- yang-models/_3gpp-5gc-nrm-neffunction.yang | 35 ++++ yang-models/_3gpp-5gc-nrm-nfprofile.yang | 165 +++++------------- yang-models/_3gpp-5gc-nrm-nwdaffunction.yang | 50 ++++++ yang-models/_3gpp-5gc-nrm-seppfunction.yang | 4 + yang-models/_3gpp-common-yang-types.yang | 1 + 6 files changed, 142 insertions(+), 122 deletions(-) diff --git a/yang-models/_3gpp-5gc-nrm-externalseppfunction.yang b/yang-models/_3gpp-5gc-nrm-externalseppfunction.yang index f874782e7..bdc584ebd 100755 --- a/yang-models/_3gpp-5gc-nrm-externalseppfunction.yang +++ b/yang-models/_3gpp-5gc-nrm-externalseppfunction.yang @@ -7,6 +7,7 @@ module _3gpp-5gc-nrm-externalseppfunction { import _3gpp-common-managed-function { prefix mf3gpp; } import _3gpp-common-managed-element { prefix me3gpp; } import _3gpp-common-yang-types { prefix types3gpp; } + import _3gpp-common-yang-extensions { prefix yext3gpp; } import _3gpp-common-top { prefix top3gpp; } import ietf-inet-types { prefix inet; } @@ -34,15 +35,15 @@ module _3gpp-5gc-nrm-externalseppfunction { uses types3gpp:PLMNId; } - leaf sEPPId { + leaf sEPPId { type uint16; + yext3gpp:inVariant; } - - leaf fqdn { + + leaf fqdn { description "The domain name of the SEPP."; type inet:domain-name; } - } augment "/me3gpp:ManagedElement" { diff --git a/yang-models/_3gpp-5gc-nrm-neffunction.yang b/yang-models/_3gpp-5gc-nrm-neffunction.yang index 9459be889..078babbe6 100755 --- a/yang-models/_3gpp-5gc-nrm-neffunction.yang +++ b/yang-models/_3gpp-5gc-nrm-neffunction.yang @@ -7,7 +7,10 @@ module _3gpp-5gc-nrm-neffunction { import _3gpp-common-managed-function { prefix mf3gpp; } import _3gpp-common-managed-element { prefix me3gpp; } import ietf-inet-types { prefix inet; } + import _3gpp-common-yang-extensions { prefix yext3gpp; } import _3gpp-common-top { prefix top3gpp; } + import _3gpp-5gc-nrm-predefinedpccruleset { prefix PredPccRules3gpp; } + import _3gpp-5gc-nrm-nfprofile { prefix nfp3gpp; } import _3gpp-5g-common-yang-types { prefix types5g3gpp; } organization "3gpp SA5"; @@ -50,8 +53,40 @@ module _3gpp-5gc-nrm-neffunction { leaf isCAPIFSup { type boolean; + config false; + yext3gpp:inVariant; + yext3gpp:notNotifyable; } + list taiList { + config false; + description "List of TAIs"; + yext3gpp:inVariant; + yext3gpp:notNotifyable; + key idx; + leaf idx { type uint32 ; } + uses nfp3gpp:Tai; + } + + list taiRangelist { + config false; + description "Range of TAIs"; + yext3gpp:inVariant; + yext3gpp:notNotifyable; + key idx; + leaf idx { type uint32 ; } + uses nfp3gpp:TaiRange; + } + + list routeToLocsdnai { + config false; + description ""; + yext3gpp:inVariant; + yext3gpp:notNotifyable; + key idx; + leaf idx { type uint32 ; } + uses PredPccRules3gpp:RouteToLocation; + } } augment "/me3gpp:ManagedElement" { diff --git a/yang-models/_3gpp-5gc-nrm-nfprofile.yang b/yang-models/_3gpp-5gc-nrm-nfprofile.yang index 3e38b8dc8..b0eaaa119 100755 --- a/yang-models/_3gpp-5gc-nrm-nfprofile.yang +++ b/yang-models/_3gpp-5gc-nrm-nfprofile.yang @@ -1,6 +1,5 @@ module _3gpp-5gc-nrm-nfprofile { yang-version 1.1; - namespace urn:3gpp:sa5:_3gpp-5gc-nrm-nfprofile; prefix nfp3gpp; @@ -43,7 +42,6 @@ module _3gpp-5gc-nrm-nfprofile { 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."; - //conditional support type uint16; } @@ -52,17 +50,15 @@ module _3gpp-5gc-nrm-nfprofile { This IE shall be present if this information is available for the NF. If not provided, PLMN ID(s) of the PLMN of the NRF are assumed for the NF."; - //conditional support min-elements 1; key "mcc mnc"; uses types3gpp:PLMNId; } - list sNssais { //is the key unique + list sNssais { description "S-NSSAIs of the Network Function. If not provided, the NF can serve any S-NSSAI. When present this IE represents the list of S-NSSAIs supported in all the PLMNs listed in the plmnList IE."; min-elements 1; - //optional support key "sst sd"; uses Snssai; } @@ -72,8 +68,7 @@ module _3gpp-5gc-nrm-nfprofile { 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; - //optional support - key idx; //no obvious leaf to use as a key + key idx; leaf idx { type uint32; } uses PlmnSnssai; } @@ -81,7 +76,6 @@ module _3gpp-5gc-nrm-nfprofile { leaf-list nsiList { description "NSI identities of the Network Function. If not provided, the NF can serve any NSI."; - //optional support min-elements 1; type string; } @@ -89,28 +83,24 @@ module _3gpp-5gc-nrm-nfprofile { leaf fqdn { description "FQDN of the Network Function. For AMF, the FQDN registered with the NRF shall be that of the AMF Name."; - //conditional support type inet:domain-name; } leaf interPlmnFqdn { description "If the NF needs to be discoverable by other NFs in a different PLMN, then an FQDN that is used for inter-PLMN routing is specified."; - //conditional support type inet:domain-name; } leaf-list ipv4Addresses { description "IPv4 address(es) of the Network Function."; min-elements 1; - //conditional support type inet:ipv4-address; } leaf-list ipv6Addresses { description "IPv6 address(es) of the Network Function."; min-elements 1; - //conditional support type inet:ipv6-address; } @@ -119,7 +109,6 @@ module _3gpp-5gc-nrm-nfprofile { If not provided, any PLMN is allowed to access the NF."; min-elements 1; - //optional support key "mcc mnc"; uses types3gpp:PLMNId; } @@ -128,7 +117,6 @@ module _3gpp-5gc-nrm-nfprofile { 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; - //optional support type types3gpp:NfType; } @@ -136,15 +124,13 @@ module _3gpp-5gc-nrm-nfprofile { 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; - //optional support type string; } - list allowedNssais { //is the key unique + 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; - //optional support key "sst sd"; uses Snssai; } @@ -154,7 +140,6 @@ module _3gpp-5gc-nrm-nfprofile { 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."; - //optional support type uint16; } @@ -162,29 +147,24 @@ module _3gpp-5gc-nrm-nfprofile { 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."; - //optional support type uint16; } leaf load { description "Dynamic load information, ranged from 0 to 100, indicates the current load percentage of the NF."; - //optional support type types3gpp:Load; } leaf locality { description "Operator defined information about the location of the NF instance (e.g. geographic location, data center)."; - //optional support type string; } grouping udrInfo { - //optional support leaf groupId { description "Identity of the UDR group that is served by the UDR instance. If not provided, the UDR instance does not pertain to any UDR group."; - //optional support type string; } @@ -192,7 +172,6 @@ module _3gpp-5gc-nrm-nfprofile { description "List of ranges of SUPI's whose profile data is available in the UDR instance."; key "start end pattern"; min-elements 1; - //optional support uses SupiRange; } @@ -200,7 +179,6 @@ module _3gpp-5gc-nrm-nfprofile { description "List of ranges of GPSIs whose profile data is available in the UDR instance."; key "start end pattern"; min-elements 1; - //optional support uses IdentityRange; } @@ -208,7 +186,6 @@ module _3gpp-5gc-nrm-nfprofile { description "List of ranges of external groups whose profile data is available in the UDR instance."; key "start end pattern"; min-elements 1; - //optional support uses IdentityRange; } @@ -216,18 +193,15 @@ module _3gpp-5gc-nrm-nfprofile { description "List of supported data sets in the UDR instance. If not provided, the UDR supports all data sets."; min-elements 1; - //optional support type DataSetId; } } grouping udmInfo { - //optional support leaf groupId { description "Identity of the UDM group that is served by the UDM instance. If not provided, the UDM instance does not pertain to any UDM group."; - //optional support type string; } @@ -235,7 +209,6 @@ module _3gpp-5gc-nrm-nfprofile { description "List of ranges of SUPI's whose profile data is available in the UDM instance."; key "start end pattern"; min-elements 1; - //optional support uses SupiRange; } @@ -243,7 +216,6 @@ module _3gpp-5gc-nrm-nfprofile { description "List of ranges of GPSIs whose profile data is available in the UDM instance."; key "start end pattern"; min-elements 1; - //optional support uses IdentityRange; } @@ -251,7 +223,6 @@ module _3gpp-5gc-nrm-nfprofile { description "List of ranges of external groups whose profile data is available in the UDM instance."; key "start end pattern"; min-elements 1; - //optional support uses IdentityRange; } @@ -259,18 +230,15 @@ module _3gpp-5gc-nrm-nfprofile { description "List of Routing Indicator information that allows to route network signalling with SUCI to the UDM instance. If not provided, the UDM can serve any Routing Indicator. Pattern: '^[0-9]{1,4}$'."; - //optional support min-elements 1; type string; } } grouping ausfInfo { - //optional support leaf groupId { description "Identity of the AUSF group. If not provided, the AUSF instance does not pertain to any AUSF group."; - //optional support type string; } @@ -278,7 +246,6 @@ module _3gpp-5gc-nrm-nfprofile { description "List of ranges of SUPIs that can be served by the AUSF instance. If not provided, the AUSF can serve any SUPI."; key "start end pattern"; min-elements 1; - //optional support uses SupiRange; } @@ -286,14 +253,12 @@ module _3gpp-5gc-nrm-nfprofile { description "List of Routing Indicator information that allows to route network signalling with SUCI to the AUSF instance. If not provided, the AUSF can serve any Routing Indicator. Pattern: '^[0-9]{1,4}$'."; - //optional support min-elements 1; type string; } } grouping amfInfo { - //optional support leaf amfRegionId { description "AMF region identifier"; @@ -308,7 +273,7 @@ module _3gpp-5gc-nrm-nfprofile { list guamiList { description "List of supported GUAMIs."; - key idx; //no obvious leaf to use as a key + key idx; leaf idx { type uint32; } min-elements 1; @@ -320,10 +285,9 @@ module _3gpp-5gc-nrm-nfprofile { The absence of this attribute and the taiRangeList attribute indicate that the AMF can be selected for any TAI in the serving network."; - key idx; //no obvious leaf to use as a key + key idx; leaf idx { type uint32; } - //optional support min-elements 1; uses Tai; } @@ -331,9 +295,8 @@ module _3gpp-5gc-nrm-nfprofile { list taiRangeList { description "The range of TAIs the AMF can serve. The absence of this attribute and the taiList attribute indicate that the AMF can be selected for any TAI in the serving network."; - //optional support min-elements 1; - key idx; //no obvious leaf to use as a key + key idx; leaf idx { type uint32; } uses TaiRange; } @@ -341,10 +304,9 @@ module _3gpp-5gc-nrm-nfprofile { list backupInfoAmfFailure { description "List of GUAMIs for which the AMF acts as a backup for AMF failure."; - key idx; //no obvious leaf to use as a key + key idx; leaf idx { type uint32; } - //optional support min-elements 1; uses Guami; } @@ -352,10 +314,9 @@ module _3gpp-5gc-nrm-nfprofile { list backupInfoAmfRemoval { description "List of GUAMIs for which the AMF acts as a backup for planned AMF removal."; - key idx; //no obvious leaf to use as a key + key idx; leaf idx { type uint32; } - //optional support min-elements 1; uses Guami; } @@ -364,21 +325,19 @@ module _3gpp-5gc-nrm-nfprofile { description "N2 interface information of the AMF. This information needs not be sent in NF Discovery responses. It may be used by the NRF to update the DNS for AMF discovery by the 5G Access Network."; - //optional support max-elements 1; - key idx; //no obvious leaf to use as a key + key idx; leaf idx { type uint32; } uses N2InterfaceAmfInfo; } } grouping smfInfo { - //optional support list sNssaiSmfInfoList { description "List of parameters supported by the SMF per S-NSSAI."; min-elements 1; - key idx; //no obvious leaf to use as a key + key idx; leaf idx { type uint32; } uses sNssaiSmfInfoItem; } @@ -388,10 +347,9 @@ module _3gpp-5gc-nrm-nfprofile { The absence of this attribute and the taiRangeList attribute indicate that the SMF can be selected for any TAI in the serving network."; - key idx; //no obvious leaf to use as a key + key idx; leaf idx { type uint32; } - //optional support min-elements 1; uses Tai; } @@ -399,16 +357,14 @@ module _3gpp-5gc-nrm-nfprofile { list taiRangeList { description "The range of TAIs the SMF can serve. The absence of this attribute and the taiList attribute indicate that the SMF can be selected for any TAI in the serving network."; - //optional support min-elements 1; - key idx; //no obvious leaf to use as a key + key idx; leaf idx { type uint32; } uses TaiRange; } leaf pgwFqdn { description "The FQDN of the PGW if the SMF is a combined SMF/PGW-C."; - //optional support type inet:domain-name; } @@ -416,7 +372,6 @@ module _3gpp-5gc-nrm-nfprofile { description "If included, this IE shall contain the access type (3GPP_ACCESS and/or NON_3GPP_ACCESS) supported by the SMF. If not included, it shall be assumed the both access types are supported."; - //conditional support min-elements 1; max-elements 2; type AccessType; @@ -424,12 +379,11 @@ module _3gpp-5gc-nrm-nfprofile { } grouping upfInfo { - //optional support list sNssaiUpfInfoList { description "List of parameters supported by the UPF per S-NSSAI."; min-elements 1; - key idx; //no obvious leaf to use as a key + key idx; leaf idx { type uint32; } uses SnssaiUpfInfoItem; } @@ -438,7 +392,6 @@ module _3gpp-5gc-nrm-nfprofile { description "The SMF service area(s) the UPF can serve. If not provided, the UPF can serve any SMF service area."; - //optional support min-elements 1; type string; } @@ -447,10 +400,9 @@ module _3gpp-5gc-nrm-nfprofile { description "List of User Plane interfaces configured on the UPF. When this IE is provided in the NF Discovery response, the NF Service Consumer (e.g. SMF) may use this information for UPF selection."; - key idx; //no obvious leaf to use as a key + key idx; leaf idx { type uint32; } - //optional support min-elements 1; uses InterfaceUpfInfoItem; } @@ -460,7 +412,6 @@ module _3gpp-5gc-nrm-nfprofile { true: Supported false (default): Not Supported"; - //optional support type boolean; } @@ -468,20 +419,17 @@ module _3gpp-5gc-nrm-nfprofile { description "List of PDU session type(s) supported by the UPF. The absence of this attribute indicates that the UPF can be selected for any PDU session type."; - //optional support min-elements 1; type PduSessionType; } } grouping pcfInfo { - //optional support leaf-list dnnList { description "DNNs supported by the PCF. If not provided, the PCF can serve any DNN."; - //optional support min-elements 1; type string; } @@ -490,7 +438,6 @@ module _3gpp-5gc-nrm-nfprofile { description "List of ranges of SUPIs that can be served by the PCF instance. If not provided, the PCF can serve any SUPI."; key "start end pattern"; min-elements 1; - //optional support uses SupiRange; } @@ -499,7 +446,6 @@ module _3gpp-5gc-nrm-nfprofile { When present, this IE shall indicate the Diameter host of the Rx interface for the PCF. Pattern: '^([A-Za-z0-9]+(-[A-Za-z0-9]+).)+[a-z]{2,}$'."; - //conditional support type string; } @@ -508,18 +454,15 @@ module _3gpp-5gc-nrm-nfprofile { When present, this IE shall indicate the Diameter realm of the Rx interface for the PCF. Pattern: '^([A-Za-z0-9]+(-[A-Za-z0-9]+).)+[a-z]{2,}$'."; - //conditional support type string; } } grouping bsfInfo { - //optional support list ipv4AddressRanges { description "List of ranges of IPv4 addresses handled by BSF. If not provided, the BSF can serve any IPv4 address."; - //optional support key "start end"; uses types3gpp:Ipv4AddressRange; } @@ -528,7 +471,6 @@ module _3gpp-5gc-nrm-nfprofile { description "List of DNNs handled by the BSF If not provided, the BSF can serve any DNN."; - //optional support min-elements 1; type string; } @@ -536,7 +478,6 @@ module _3gpp-5gc-nrm-nfprofile { leaf-list ipDomainList { description "List of IPv4 address domains, as described in subclause 6.2 of 3GPP TS 29.513, handled by the BSF. If not provided, the BSF can serve any IP domain."; - //optional support min-elements 1; type string; } @@ -544,20 +485,17 @@ module _3gpp-5gc-nrm-nfprofile { list ipv6PrefixRanges { description "List of ranges of IPv6 prefixes handled by the BSF. If not provided, the BSF can serve any IPv6 prefix."; - //optional support key "start end"; uses types3gpp:Ipv6PrefixRange; } } grouping chfInfo { - //optional support list supiRangeList { description "List of ranges of SUPIs that can be served by the CHF instance. If not provided, the CHF can serve any SUPI."; key "start end pattern"; min-elements 1; - //optional support uses SupiRange; } @@ -565,7 +503,6 @@ module _3gpp-5gc-nrm-nfprofile { description "List of ranges of GPSI that can be served by the CHF instance. If not provided, the CHF can serve any GPSI."; key "start end pattern"; min-elements 1; - //optional support uses IdentityRange; } @@ -574,18 +511,15 @@ module _3gpp-5gc-nrm-nfprofile { If not provided, the CHF can serve any PLMN."; min-elements 1; - //optional support key "mcc mnc"; uses types3gpp:PLMNId; } } grouping nrfInfoGrp { - //optional support list servedUdrInfo { description "This attribute contains all the udrInfo attributes locally configured in the NRF or the NRF received during NF registration."; - //optional support key nfInstanceID; leaf nfInstanceID { @@ -599,7 +533,6 @@ module _3gpp-5gc-nrm-nfprofile { list servedUdmInfo { description "This attribute contains all the udmInfo attributes locally configured in the NRF or the NRF received during NF registration."; - //optional support key nfInstanceID; leaf nfInstanceID { @@ -613,7 +546,6 @@ module _3gpp-5gc-nrm-nfprofile { list servedAusfInfo { description "This attribute contains all the ausfInfo attributes locally configured in the NRF or the NRF received during NF registration."; - //optional support key nfInstanceID; leaf nfInstanceID { @@ -627,7 +559,6 @@ module _3gpp-5gc-nrm-nfprofile { list servedAmfInfo { description "This attribute contains all the amfInfo attributes locally configured in the NRF or the NRF received during NF registration."; - //optional support key nfInstanceID; leaf nfInstanceID { @@ -641,7 +572,6 @@ module _3gpp-5gc-nrm-nfprofile { list servedSmfInfo { description "This attribute contains all the smfInfo attributes locally configured in the NRF or the NRF received during NF registration."; - //optional support key nfInstanceID; leaf nfInstanceID { @@ -655,7 +585,6 @@ module _3gpp-5gc-nrm-nfprofile { list servedUpfInfo { description "This attribute contains all the upfInfo attributes locally configured in the NRF or the NRF received during NF registration."; - //optional support key nfInstanceID; leaf nfInstanceID { @@ -669,7 +598,6 @@ module _3gpp-5gc-nrm-nfprofile { list servedPcfInfo { description "This attribute contains all the pcfInfo attributes locally configured in the NRF or the NRF received during NF registration."; - //optional support key nfInstanceID; leaf nfInstanceID { @@ -683,7 +611,6 @@ module _3gpp-5gc-nrm-nfprofile { list servedBsfInfo { description "This attribute contains all the bsfInfo attributes locally configured in the NRF or the NRF received during NF registration."; - //optional support key nfInstanceID; leaf nfInstanceID { @@ -697,7 +624,6 @@ module _3gpp-5gc-nrm-nfprofile { list servedChfInfo { description "This attribute contains all the bsfInfo attributes locally configured in the NRF or the NRF received during NF registration."; - //optional support key nfInstanceID; leaf nfInstanceID { @@ -711,7 +637,7 @@ module _3gpp-5gc-nrm-nfprofile { } list nrfInfo { - key idx; //no obvious leaf to use as a key + key idx; leaf idx { type uint32; } max-elements 1; uses nrfInfoGrp; @@ -724,7 +650,6 @@ module _3gpp-5gc-nrm-nfprofile { leaf recoveryTime { description "Timestamp when the NF was (re)started."; - //optional support type yang:date-and-time; } @@ -734,14 +659,12 @@ module _3gpp-5gc-nrm-nfprofile { are available after a new NF service instance supporting the same API version is selected by a NF Service Consumer (see 3GPP TS 23.527). Otherwise, it indicates that the NF Service Instances of a same NF Service are not capable to share resource state inside the NF Instance."; - //optional support type boolean; } list nfServices { description "List of NF Service Instances. It shall include the services produced by the NF that can be discovered by other NFs."; key serviceInstanceID; - //optional support min-elements 1; uses nfs3gpp:NFServiceGrp; } @@ -751,7 +674,6 @@ module _3gpp-5gc-nrm-nfprofile { true: the NF Service Consumer supports receiving NF Profile Changes in the response. false (default): the NF Service Consumer does not support receiving NF Profile Changes in the response."; - //optional support type boolean; } @@ -760,14 +682,12 @@ module _3gpp-5gc-nrm-nfprofile { true: the NF Profile contains NF Profile changes. false (default): complete NF Profile."; - //optional support type boolean; } list defaultNotificationSubscriptions { description "Notification endpoints for different notification types."; key notificationType; - //optional support min-elements 1; uses types3gpp:DefaultNotificationSubscription; } @@ -833,29 +753,47 @@ module _3gpp-5gc-nrm-nfprofile { } } - grouping TacRange { - leaf start { - description "First value identifying the start of a TAC range, to be used when the range of TAC's can be represented as a hexadecimal range (e.g., TAC ranges)."; + grouping nRTacRangeGrp { + leaf nRTACstart { + description "First value identifying the start of a TAC range, to be + used when the range of TAC's can be represented as a hexadecimal range ( + e.g., TAC ranges). + 3-octet string identifying a tracking area code, each character in + the string shall take a value of '0' to '9' or 'A' to 'F' and shall + represent 4 bits. The most significant character representing the 4 + most significant bits of the TAC shall appear first in the string, + and the character representing the 4 least significant bit of the TAC + shall appear last in the string."; type string { pattern '^([A-Fa-f0-9]{4}|[A-Fa-f0-9]{6}$)'; } } - leaf end { - description "Last value identifying the end of a TAC range, to be used when the range of TAC's can be represented as a hexadecimal range (e.g. TAC ranges)."; + leaf nRTACend { + description "Last value identifying the end of a TAC range, to be used + when the range of TAC's can be represented as a hexadecimal range + (e.g. TAC ranges). 3-octet string identifying a tracking area code, + each character in the string shall take a value of '0' to '9' or + 'A' to 'F' and shall represent 4 bits. The most significant character + representing the 4 most significant bits of the TAC shall appear first + in the string, and the character representing the 4 least significant + bit of the TAC shall appear last in the string."; type string { pattern '^([A-Fa-f0-9]{4}|[A-Fa-f0-9]{6})$'; } } - leaf pattern { - description "Pattern representing the set of TAC's belonging to this range."; + leaf nRTACpattern { + description "Pattern (regular expression according to the ECMA-262) + representing the set of TAC's belonging to this range. + A TAC value is considered part of the range if and only if the + TAC string fully matches the regular expression."; type string; } } grouping SnssaiUpfInfoItem { - list sNssai { //is the key unique + list sNssai { description "Supported S-NSSAI."; min-elements 1; max-elements 1; @@ -902,7 +840,6 @@ module _3gpp-5gc-nrm-nfprofile { leaf sd { description "3-octet string, representing the Slice Differentiator, in hexadecimal representation."; - //optional type string { pattern '^[A-Fa-f0-9]{6}$'; } @@ -958,12 +895,10 @@ module _3gpp-5gc-nrm-nfprofile { type UPInterfaceType; } - ////At least one of the addressing parameters (ipv4address, ipv6adress or endpointFqdn) shall be included in the InterfaceUpfInfoItem. choice address { case ipv4EndpointAddresses { leaf-list ipv4EndpointAddresses { description "Available endpoint IPv4 address(es) of the User Plane interface."; - //conditional support min-elements 1; type inet:ipv4-address; } @@ -972,7 +907,6 @@ module _3gpp-5gc-nrm-nfprofile { case ipv6EndpointAddresses { leaf-list ipv6EndpointAddresses { description "Available endpoint IPv6 address(es) of the User Plane interface."; - //conditional support min-elements 1; type inet:ipv6-address; } @@ -981,7 +915,6 @@ module _3gpp-5gc-nrm-nfprofile { case endpointFqdn { leaf endpointFqdn { description "FQDN of available endpoint of the User Plane interface."; - //conditional support type inet:domain-name; } } @@ -989,7 +922,6 @@ module _3gpp-5gc-nrm-nfprofile { leaf networkInstance { description "Network Instance associated to the User Plane interface."; - //optional support type string; } } @@ -1011,11 +943,11 @@ module _3gpp-5gc-nrm-nfprofile { uses types3gpp:PLMNId; } - list tacRangeList { //is this key unique + list tacRangeList { description "The range of the TACs."; min-elements 1; - key "start end"; - uses TacRange; + key "nRTACstart nRTACend"; + uses nRTacRangeGrp; } } @@ -1027,12 +959,10 @@ module _3gpp-5gc-nrm-nfprofile { } grouping N2InterfaceAmfInfo { - //At least one of the addressing parameters (ipv4address or ipv6adress) shall be included. choice address { case ipv4EndpointAddress { leaf-list ipv4EndpointAddress { description "Available AMF endpoint IPv4 address(es) for N2."; - //conditional support min-elements 1; type inet:ipv4-address; } @@ -1041,7 +971,6 @@ module _3gpp-5gc-nrm-nfprofile { case ipv6EndpointAddress { leaf-list ipv6EndpointAddress { description "Available AMF endpoint IPv6 address(es) for N2."; - //conditional support min-elements 1; type inet:ipv6-address; } @@ -1055,7 +984,7 @@ module _3gpp-5gc-nrm-nfprofile { } grouping sNssaiSmfInfoItem { - list sNssai { //is the key unique + list sNssai { description "Supported S-NSSAI."; min-elements 1; max-elements 1; @@ -1063,7 +992,7 @@ module _3gpp-5gc-nrm-nfprofile { uses Snssai; } - list dnnSmfInfoList { //is the key unique + list dnnSmfInfoList { description "List of parameters supported by the SMF per DNN."; min-elements 1; key dnn; @@ -1088,7 +1017,7 @@ module _3gpp-5gc-nrm-nfprofile { uses types3gpp:PLMNId; } - list sNssaiList { //is the key unique + list sNssaiList { description "The specific list of S-NSSAIs supported by the given PLMN."; min-elements 1; key "sst sd"; diff --git a/yang-models/_3gpp-5gc-nrm-nwdaffunction.yang b/yang-models/_3gpp-5gc-nrm-nwdaffunction.yang index f138575e2..f681547d6 100755 --- a/yang-models/_3gpp-5gc-nrm-nwdaffunction.yang +++ b/yang-models/_3gpp-5gc-nrm-nwdaffunction.yang @@ -8,6 +8,7 @@ module _3gpp-5gc-nrm-nwdaffunction { import _3gpp-common-managed-element { prefix me3gpp; } import ietf-inet-types { prefix inet; } import _3gpp-common-yang-types { prefix types3gpp; } + import _3gpp-common-yang-extensions { prefix yext3gpp; } import _3gpp-5g-common-yang-types { prefix types5g3gpp; } import _3gpp-common-top { prefix top3gpp; } @@ -25,6 +26,42 @@ module _3gpp-5gc-nrm-nwdaffunction { revision 2019-05-15 {reference "initial revision"; } + grouping NetworkSliceInfoGrp { + description "Represents information of network slice when the NWDAF is + authorized to collect the management data of the network slice. "; + + list sNSSAI { + description "It represents the S-NSSAI the NetworkSlice managed object + is supporting. The S-NSSAI is defined in TS 23.003 "; + key idx; + min-elements 1; + max-elements 1; + + leaf idx { + type string; + } + uses types5g3gpp:SNssai; + } + + leaf-list cNSIId { + type string; + description "It represents NSI ID which is an identifier for identifying + the Core Network part of a Network Slice instance when multiple + Network Slice instances of the same Network Slice are deployed, + and there is a need to differentiate between them in the 5GC. + See NSI ID definition in clause 3.1 of TS 23.501 and + subclause 6.1.6.2.7 of TS 29.531."; + } + + leaf networkSliceRef { + type types3gpp:DistinguishedName; + mandatory true; + description "This holds a DN of the NetworkSlice managed object relating + to the NetworkSlice instance differentiated by sNSSAI and optional + cNSIId."; + } + } + grouping NWDAFFunctionGrp { description "Represents the NWDAFFunction IOC"; uses mf3gpp:ManagedFunctionGrp; @@ -73,6 +110,19 @@ module _3gpp-5gc-nrm-nwdaffunction { reference "3GPP TS 23.501"; uses types5g3gpp:CommModel; } + + list networkSliceInfoList { + key idx; + min-elements 1; + description "The attribute specifies a list of NetworkSliceInfo which + is defined as a datatype (see clause 5.3.95). It can be used by the + NWDAF to facilitate the data collection from OAM."; + leaf idx { + type string; + } + uses NetworkSliceInfoGrp; + yext3gpp:inVariant; + } } augment "/me3gpp:ManagedElement" { diff --git a/yang-models/_3gpp-5gc-nrm-seppfunction.yang b/yang-models/_3gpp-5gc-nrm-seppfunction.yang index b8cb29385..5ee1c2924 100755 --- a/yang-models/_3gpp-5gc-nrm-seppfunction.yang +++ b/yang-models/_3gpp-5gc-nrm-seppfunction.yang @@ -7,6 +7,7 @@ module _3gpp-5gc-nrm-seppfunction { import _3gpp-common-managed-function { prefix mf3gpp; } import _3gpp-common-managed-element { prefix me3gpp; } import _3gpp-common-yang-types { prefix types3gpp; } + import _3gpp-common-yang-extensions { prefix yext3gpp; } import _3gpp-common-top { prefix top3gpp; } import ietf-inet-types { prefix inet; } @@ -42,15 +43,18 @@ module _3gpp-5gc-nrm-seppfunction { container pLMNId { description "PLMN Identifiers of the sepp. The PLMN Identifier is composed of a Mobile Country Code (MCC) and a Mobile Network Code (MNC)."; + yext3gpp:inVariant; uses types3gpp:PLMNId; } leaf sEPPType { type sepp3gpp:SEPPType; + yext3gpp:inVariant; } leaf sEPPId { type uint16; + yext3gpp:inVariant; } leaf fqdn { diff --git a/yang-models/_3gpp-common-yang-types.yang b/yang-models/_3gpp-common-yang-types.yang index 856e2e56a..a02c219a4 100755 --- a/yang-models/_3gpp-common-yang-types.yang +++ b/yang-models/_3gpp-common-yang-types.yang @@ -275,6 +275,7 @@ module _3gpp-common-yang-types { The format of the NF Instance ID shall be a Universally Unique Identifier (UUID) version 4, as described in IETF RFC 4122 " ; + yext3gpp:inVariant; } leaf-list nfType { -- GitLab From c39355967d81a485e6153815edf50bbcf07ef181 Mon Sep 17 00:00:00 2001 From: "U-ERICSSON\\ETHBLL" Date: Thu, 28 Sep 2023 17:30:13 +0200 Subject: [PATCH 03/17] added File and Files IOC --- yang-models/_3gpp-common-files.yang | 311 ++++++++++++++++++ yang-models/_3gpp-common-managed-element.yang | 37 ++- yang-models/_3gpp-common-measurements.yang | 14 +- yang-models/_3gpp-common-subnetwork.yang | 37 ++- yang-models/_3gpp-common-trace.yang | 8 + 5 files changed, 391 insertions(+), 16 deletions(-) create mode 100644 yang-models/_3gpp-common-files.yang diff --git a/yang-models/_3gpp-common-files.yang b/yang-models/_3gpp-common-files.yang new file mode 100644 index 000000000..313386e9d --- /dev/null +++ b/yang-models/_3gpp-common-files.yang @@ -0,0 +1,311 @@ +module _3gpp-common-files { + yang-version 1.1; + namespace "urn:3gpp:sa5:_3gpp-common-files"; + prefix "files3gpp"; + + import _3gpp-common-top { prefix top3gpp; } + import _3gpp-common-yang-types { prefix types3gpp; } + import _3gpp-common-yang-extensions { prefix yext3gpp; } + import ietf-yang-types { prefix yang; } + import ietf-inet-types { prefix inet; } + + organization "3GPP SA5"; + contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464"; + description "Defines the YANG mapping of File retrieval NRM fragment + including the IOCs File and Files."; + reference "3GPP TS 28.623 + Generic Network Resource Model (NRM) + Integration Reference Point (IRP); + Solution Set (SS) definitions + + 3GPP TS 28.622 + Generic Network Resource Model (NRM) + Integration Reference Point (IRP); + Information Service (IS)"; + + revision 2022-09-28 { reference CR-0191; } + + grouping FileGrp { + description "Represents the File IOC."; + + leaf fileLocation { + type inet:uri ; + mandatory true; + yext3gpp:notNotifyable ; + description "Location of the file incl. the file transfer protocol, + and the file name for the case the file content cannot be retrieved + by reading the 'fileContent' attribute. + + The allowed file transfer protocols are: + - sftp + - ftpes + - https + + Examples: + 'sftp://companyA.com/datastore/fileName.xml', + 'https://companyA.com/ManagedElement=1/Files=1/File=1' + "; + } + + leaf fileCompression { + type string ; + mandatory true; + yext3gpp:notNotifyable ; + description "Name of the algorithm used for compressing the file. + An empty or absent 'fileCompression' parameter indicates the file is + not compressed. The MnS producer selects the compression algorithm. + It is encouraged to use popular algorithms such as GZIP."; + } + + leaf fileSize { + type uint64 ; + mandatory true; + units bytes; + yext3gpp:notNotifyable ; + description "Size of the file"; + } + + leaf fileDataType { + type enumeration { + enum PERFORMANCE { + description "The value 'PERFORMANCE' refers to measurements and KPIs"; + } + enum TRACE; + enum ANALYTICS; + enum PROPRIETARY; + } + mandatory true; + yext3gpp:notNotifyable ; + description "Type of the management data stored in the file."; + } + + leaf fileFormat { + type string ; + mandatory true; + yext3gpp:notNotifyable ; + description "Identifier of the XML or ASN.1 schema (incl. its version) + used to produce the file content."; + } + + leaf fileReadyTime { + type yang:date-and-time ; + mandatory true; + yext3gpp:notNotifyable ; + description "Date and time, when the file was closed (the last time) + and made available on the MnS producer. + The file content will not be changed anymore."; + } + + leaf fileExpirationTime { + type yang:date-and-time ; + mandatory true; + yext3gpp:notNotifyable ; + description "Date and time after which the file may be deleted."; + } + + leaf fileContent { + type string ; // String is very restrictive + mandatory true; + yext3gpp:notNotifyable ; + description "File content"; + } + + leaf-list jobRef { + type types3gpp:DistinguishedName ; + yext3gpp:notNotifyable ; + description "Object instance of the 'PerfMetricJob' or 'TraceJob' + that produced the file."; + } + + leaf jobId { + type string ; + yext3gpp:notNotifyable ; + description "Identifier of a PerfMetricJob job or a TraceJob."; + } + } + + grouping FilesGrp { + description "Represents the Files IOC."; + leaf numberOfFiles { + type uint64 ; + yext3gpp:notNotifyable ; + description "Number of files in a file collection."; + } + + leaf-list jobRef { + type types3gpp:DistinguishedName ; + yext3gpp:notNotifyable ; + description "Object instance of the 'PerfMetricJob' or 'TraceJob' + that produced the file."; + } + + leaf jobId { + type string ; + yext3gpp:notNotifyable ; + description "Identifier of a PerfMetricJob job or a TraceJob."; + } + } + + grouping FilesSubtree { + description "Contains classes of the File retrieval NRM fragment. + Should be used in classes (or classes inheriting from) + - SubNnetwork + - ManagedElement + - PerfMetricJob + - TraceJob + + If a YANG module wants to augment these classes/list/groupings they must + augment all user classes!"; + + list Files { + description "This IOC represents a collection of files. It can be + name-contained by 'SubNetwork', 'ManagedElement', 'PerfMetricJob' or + 'TraceJob'. The 'Files' object name-contains 'File' objects, that + represent the files of the collection. File collections allow to + structure related files under a common root. + + Instances of 'Files' are created by MnS producers. They shall be + created at latest when the first file of the collection becomes + available for retrieval by MnS consumers. + + The attributes of 'Files' represent properties of the file collection + and not properties of individual files. + + When the file retrieval NRM fragment is used together with a data + collection job ('PerfMetricJob' or 'TraceJob') the following + provisions shall apply: + - The 'Files' object shall be created at the same time as the object + representing the data collection job. + - The attributes 'jobRef' and 'jobId' shall be supported and present + in a 'Files' instance. They shall identify the job that the files in + the file collection relate to. + - A 'Files' instance shall contain files related to one and only one + job. + - The files produced by one job shall be contained in one and only + one 'Files' instance. + - The job object shall support an attribute with a link to the + created 'Files' instance ('_linkToFiles'). + - The attribute '_linkToFiles' shall be returned in the job creation + response, if the stage 3 protocol supports returning attributes in an + object creation response. + - The MnS producer decides where to name-contain the 'Files' instance + related to a job. + + The attribute '_linkToFiles' allows a MnS consumer to create simple + and targeted subscriptions for 'notifyFileReady', + 'notifyFilePreparationError' and 'notifyFileDeletion', or + 'notifyMOICreation', 'notifyMOIChanges', 'notifyFilePreparationError' + and 'notifyFileDeletion' related to 'File' instances created or deleted + under the 'Files' instance of a specific job. The subscription needs + to scope simply objects one level below the 'Files' object. + + In addition, the attribute '_linkToFiles' allows for simple + deployments not relying on notifications for reporting the + availability of new files, where the MnS consumer polls regularly + for new files under 'Files'."; + + key id; + config false; + uses top3gpp:Top_Grp ; + container attributes { + uses FilesGrp ; + } + + list File { + description "Represents a file. It is name-contained by 'Files'. + + When a file becomes available on a MnS producer for retrieval by a + MnS consumer, the MnS producer shall create a 'File' instance + representing that file. + + The time of creation shall be captured by the MnS producer in the + 'fileReadyTime' attribute. The MnS producer shall keep the file at + least until the time specified by 'fileExpirationTime'. After that + time the MnS producer may delete the 'File' instance. + The 'fileExpirationTime' is determined by the MnS producer based on + considerations such as available storage space or file retention + policies. + + 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. + + When the file retrieval NRM fragment is used together with a data + collection job ('PerfMetricJob' or 'TraceJob') the following + provisions shall apply: + - The attributes 'jobRef' and 'jobId' shall be supported and + present. They shall identify the job that the file is related to. + + The attributes 'jobRef' and 'jobId' allow to set notification filters + in the subscription in such a way that only 'notifyMOICreation', + notifyMOIChanges and + 'notifyMOIDeletion' notifications are sent to subscribed MnS consumers + if the created or deleted 'File' instance represents data related to + jobs the subscribed MnS consumer created or is interested in. + + Upon creation of a 'File' instance, a notification of type + 'notifyMOICreation' or 'notifyMOIChanges' shall be emitted to + subscribed MnS consumers as + usual. For the case that the file contains performance metric data + ('fileDataType' is 'PERFORMANCE') the MnS producer shall emit either + a notification of type 'notifyMOICreation', 'notifyMOICreation' or + of type + 'notifyFileReady'. The MnS consumer selects the notification type he + wishes to receive with the subscription created on the MnS producer. + + The 'objectClass' and 'objectInstance' parameters in the notification + header of 'notifyFileReady' shall identify the new 'File' instance, + instead of the related 'PerfMetricJob', 'TraceJob', 'ManagedElement' + or 'ManagementNode'as described in 3GPP TS 28.532, + clause 11.6.1.1.1 for the case that 'notifyFileReady' is used as + part of the file data reporting MnS. + + The notification 'notifyFilePreparationError' shall be supported as + well by the 'File' object. It shall be sent when an error occurs + during the preparation of the file. No 'notifyFileReady' or + 'notifMOICreation shall be sent in that case. The 'objectClass' + and 'objectInstance' parameters of the notification header shall + identify the new 'File' instance representing the corrupted file, + instead of the related 'PerfMetricJob', 'TraceJob', 'ManagedElement' + or 'ManagementNode'as described in 3GPP TS 28.532, clause 11.6.1.1.1 + for the case that 'notifyFilePreparationError' is used as part of + the file data reporting MnS. When the file is not created at all or + deleted, the 'objectClass' and 'objectInstance' parameters of the + notification header are populated as described in 3GPP TS 28.532, + clause 11.6.1.1.1. Note that to receive 'notifyFilePreparationError' + in that case the notification subscription needs to include these + objects in its scope."; + key id; + uses top3gpp:Top_Grp ; + container attributes { + uses FileGrp ; + } + } + } + } +} \ No newline at end of file diff --git a/yang-models/_3gpp-common-managed-element.yang b/yang-models/_3gpp-common-managed-element.yang index ceb21297b..5296297d9 100755 --- a/yang-models/_3gpp-common-managed-element.yang +++ b/yang-models/_3gpp-common-managed-element.yang @@ -9,7 +9,8 @@ module _3gpp-common-managed-element { import _3gpp-common-subscription-control { prefix subscr3gpp; } import _3gpp-common-fm { prefix fm3gpp; } import _3gpp-common-trace { prefix trace3gpp; } - import _3gpp-5gc-nrm-configurable5qiset { prefix conf5QIs3gpp; } + 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"; @@ -42,8 +43,13 @@ 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 Configurable5QISetUnderManagedElement { + description "The Configurable5QISet shall be contained under + ManagedElement"; + } + + feature FilesUnderManagedElement { + description "Files shall be contained under ManagedElement"; } feature MeasurementsUnderManagedElement { @@ -169,7 +175,6 @@ module _3gpp-common-managed-element { and/or service to the subscriber."; uses ManagedElement_Grp; - uses meas3gpp:SupportedPerfMetricGroupGrp; leaf vendorName { config false; @@ -190,6 +195,22 @@ module _3gpp-common-managed-element { type uint32; mandatory true; } + + uses meas3gpp:SupportedPerfMetricGroupGrp; + + leaf-list supportedTraceMetrics { + type string; + config false; + description "List of trace metrics. When this attribute is contained in + a managed object it defines the trace metrics supported for this + object and all descendant objects. + + Trace metrics include trace messages, MDT measurements + (Immediate MDT, Logged MDT, Logged MBSFN MDT), RLF and RCEF reports, + see TS 32.422. Trace metrics are identified with their metric + identifier. The metric identifier is constructed as defined + in clause 10 of TS 32.422."; + } } list ManagedElement { @@ -253,8 +274,12 @@ module _3gpp-common-managed-element { if-feature TraceUnderManagedElement; } - uses conf5QIs3gpp:Configurable5QISetSubtree { - if-feature Configurable5qisetUnderManagedElement; + 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-measurements.yang b/yang-models/_3gpp-common-measurements.yang index 290dc9bd1..a58f7e0e0 100755 --- a/yang-models/_3gpp-common-measurements.yang +++ b/yang-models/_3gpp-common-measurements.yang @@ -6,6 +6,7 @@ module _3gpp-common-measurements { import _3gpp-common-top { prefix top3gpp; } import _3gpp-common-yang-types { prefix types3gpp; } import _3gpp-common-yang-extensions { prefix yext3gpp; } + import _3gpp-common-files { prefix files3gpp; } organization "3GPP SA5"; contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464"; @@ -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."; @@ -160,7 +165,7 @@ module _3gpp-common-measurements { } grouping SupportedPerfMetricGroupGrp { - list SupportedPerfMetricGroup { + list SupportedPerfMetricGroups { config false; description "Captures a group of supported performance metrics and associated parameters related to their production and reporting. @@ -294,11 +299,11 @@ module _3gpp-common-measurements { leaf _linkToFiles { type string; - mandatory true; config false; + mandatory true; + yext3gpp:notNotifyable ; description "Link to a 'Files' object."; yext3gpp:inVariant; - yext3gpp:notNotifyable; } } @@ -454,6 +459,9 @@ module _3gpp-common-measurements { container attributes { uses PerfMetricJobGrp ; } + uses files3gpp:FilesSubtree { + if-feature FilesUnderPerfMetricJob; + } } list ThresholdMonitor { diff --git a/yang-models/_3gpp-common-subnetwork.yang b/yang-models/_3gpp-common-subnetwork.yang index 8c0d99e79..7658e3168 100755 --- a/yang-models/_3gpp-common-subnetwork.yang +++ b/yang-models/_3gpp-common-subnetwork.yang @@ -10,7 +10,8 @@ module _3gpp-common-subnetwork { import _3gpp-common-fm { prefix fm3gpp; } import _3gpp-common-trace { prefix trace3gpp; } import ietf-yang-schema-mount { prefix yangmnt; } - import _3gpp-5gc-nrm-configurable5qiset { prefix conf5QIs3gpp; } + 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"; @@ -54,8 +55,13 @@ module _3gpp-common-subnetwork { reference "Initial revision"; } - feature Configurable5qisetUnderSubNetwork { - description "The Configurable5qiset shall be contained under SubNetwork"; + feature Configurable5QISetUnderSubNetwork { + description "The Configurable5QISet shall be contained under + Subnetwork"; + } + + feature FilesUnderSubNetwork { + description "Files shall be contained under Subnetwork"; } feature ExternalsUnderSubNetwork { @@ -140,8 +146,6 @@ module _3gpp-common-subnetwork { grouping SubNetworkGrp { uses Domain_Grp; - uses meas3gpp:SupportedPerfMetricGroupGrp; - leaf-list setOfMcc { description "Set of Mobile Country Code (MCC). @@ -163,6 +167,21 @@ module _3gpp-common-subnetwork { type uint32; } + uses meas3gpp:SupportedPerfMetricGroupGrp; + + leaf-list supportedTraceMetrics { + type string; + config false; + description "List of trace metrics. When this attribute is contained in + a managed object it defines the trace metrics supported for this + object and all descendant objects. + + Trace metrics include trace messages, MDT measurements + (Immediate MDT, Logged MDT, Logged MBSFN MDT), RLF and RCEF reports, + see TS 32.422. Trace metrics are identified with their metric + identifier. The metric identifier is constructed as defined + in clause 10 of TS 32.422."; + } } list SubNetwork { @@ -213,8 +232,12 @@ module _3gpp-common-subnetwork { if-feature TraceUnderSubNetwork; } - uses conf5QIs3gpp:Configurable5QISetSubtree { - if-feature Configurable5qisetUnderSubNetwork; + uses files3gpp:FilesSubtree { + if-feature FilesUnderSubNetwork; + } + + uses fiveqi3gpp:Configurable5QISetSubtree { + if-feature Configurable5QISetUnderSubNetwork; } yangmnt:mount-point children-of-SubNetwork { diff --git a/yang-models/_3gpp-common-trace.yang b/yang-models/_3gpp-common-trace.yang index 795bff442..9b2d3260a 100755 --- a/yang-models/_3gpp-common-trace.yang +++ b/yang-models/_3gpp-common-trace.yang @@ -7,6 +7,7 @@ module _3gpp-common-trace { import _3gpp-common-yang-types {prefix types3gpp; } import _3gpp-common-yang-extensions { prefix yext3gpp; } import ietf-inet-types { prefix inet; } + import _3gpp-common-files { prefix files3gpp; } organization "3GPP SA5"; contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464"; @@ -36,6 +37,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 TraceReference { leaf mcc { mandatory true; @@ -1147,6 +1152,9 @@ module _3gpp-common-trace { container attributes { uses TraceJobGrp ; } + uses files3gpp:FilesSubtree { + if-feature FilesUnderTraceJob; + } } } } -- GitLab From 3f893b8a7ef3c2b9718fa90547eaa1a5662d9596 Mon Sep 17 00:00:00 2001 From: "U-ERICSSON\\ETHBLL" Date: Fri, 29 Sep 2023 21:40:59 +0200 Subject: [PATCH 04/17] corrected inVariant and a 5g datatype --- yang-models/_3gpp-5g-common-yang-types.yang | 4 ++-- yang-models/_3gpp-common-yang-extensions.yang | 15 +++++++++++---- 2 files changed, 13 insertions(+), 6 deletions(-) diff --git a/yang-models/_3gpp-5g-common-yang-types.yang b/yang-models/_3gpp-5g-common-yang-types.yang index f1da20430..bef735ceb 100755 --- a/yang-models/_3gpp-5g-common-yang-types.yang +++ b/yang-models/_3gpp-5g-common-yang-types.yang @@ -27,9 +27,9 @@ module _3gpp-5g-common-yang-types { leaf sd { description "Slice Differentiator - If not needed, the value can be set to FFFFFF."; + If not needed, the value can be set to ff:ff:ff."; type yang:hex-string { - length 6; + length 8; } reference "3GPP TS 23.003"; } diff --git a/yang-models/_3gpp-common-yang-extensions.yang b/yang-models/_3gpp-common-yang-extensions.yang index 8f6738867..7a5e13f62 100755 --- a/yang-models/_3gpp-common-yang-extensions.yang +++ b/yang-models/_3gpp-common-yang-extensions.yang @@ -66,15 +66,22 @@ module _3gpp-common-yang-extensions { extension inVariant { description - "Indicates that the value for the data node can only be set when its - parent data node is being created. To change the value after that, the - parent data node must be deleted and recreated with the data node + "Indicates that the value for the data node can only be set when the list + data node representing the containing object(MOI) is created. + The above statement in YANG terms means, that the value for the data + node can only be set when the list entry that is the parent of the + restricted node's ancestor container named 'attributes' is being created. + To change the value after that, the mentioned + list data node must be deleted and recreated with the restricted data node having the new value. + If a list or container already has the inVariant + extension, that is also valid for all contained data nodes. + It is unnecessary to use and MUST NOT be used for key leafs. The statement MUST only be a substatement of a leaf, leaf-list, list - statements that is config=true. + statement that is config=true. Zero or one inVariant statement is allowed per parent statement. NO substatements are allowed. -- GitLab From 3cf0b27ca1947ec9111749c066b7538230770f98 Mon Sep 17 00:00:00 2001 From: "U-ERICSSON\\ETHBLL" Date: Fri, 29 Sep 2023 21:53:50 +0200 Subject: [PATCH 05/17] Added copyright and invariant to files --- yang-models/_3gpp-common-files.yang | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/yang-models/_3gpp-common-files.yang b/yang-models/_3gpp-common-files.yang index 313386e9d..ff848fd18 100644 --- a/yang-models/_3gpp-common-files.yang +++ b/yang-models/_3gpp-common-files.yang @@ -12,7 +12,9 @@ module _3gpp-common-files { organization "3GPP SA5"; contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464"; description "Defines the YANG mapping of File retrieval NRM fragment - including the IOCs File and Files."; + including the IOCs File and Files. + Copyright 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + TTA, TTC) 2019-2023. All rights reserved."; reference "3GPP TS 28.623 Generic Network Resource Model (NRM) Integration Reference Point (IRP); @@ -23,6 +25,7 @@ module _3gpp-common-files { Integration Reference Point (IRP); Information Service (IS)"; + revision 2023-09-17 { reference CR-0270 ; } revision 2022-09-28 { reference CR-0191; } grouping FileGrp { @@ -32,6 +35,7 @@ module _3gpp-common-files { type inet:uri ; 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. @@ -51,6 +55,7 @@ module _3gpp-common-files { type string ; mandatory true; yext3gpp:notNotifyable ; + yext3gpp:inVariant ; description "Name of the algorithm used for compressing the file. An empty or absent 'fileCompression' parameter indicates the file is not compressed. The MnS producer selects the compression algorithm. @@ -62,6 +67,7 @@ module _3gpp-common-files { mandatory true; units bytes; yext3gpp:notNotifyable ; + yext3gpp:inVariant ; description "Size of the file"; } @@ -76,6 +82,7 @@ module _3gpp-common-files { } mandatory true; yext3gpp:notNotifyable ; + yext3gpp:inVariant ; description "Type of the management data stored in the file."; } @@ -83,6 +90,7 @@ module _3gpp-common-files { type string ; mandatory true; yext3gpp:notNotifyable ; + yext3gpp:inVariant ; description "Identifier of the XML or ASN.1 schema (incl. its version) used to produce the file content."; } @@ -91,6 +99,7 @@ module _3gpp-common-files { type yang:date-and-time ; mandatory true; yext3gpp:notNotifyable ; + yext3gpp:inVariant ; description "Date and time, when the file was closed (the last time) and made available on the MnS producer. The file content will not be changed anymore."; @@ -100,6 +109,7 @@ module _3gpp-common-files { type yang:date-and-time ; mandatory true; yext3gpp:notNotifyable ; + yext3gpp:inVariant ; description "Date and time after which the file may be deleted."; } @@ -107,12 +117,14 @@ module _3gpp-common-files { type string ; // String is very restrictive mandatory true; yext3gpp:notNotifyable ; + yext3gpp:inVariant ; description "File content"; } leaf-list jobRef { type types3gpp:DistinguishedName ; yext3gpp:notNotifyable ; + yext3gpp:inVariant ; description "Object instance of the 'PerfMetricJob' or 'TraceJob' that produced the file."; } @@ -120,6 +132,7 @@ module _3gpp-common-files { leaf jobId { type string ; yext3gpp:notNotifyable ; + yext3gpp:inVariant ; description "Identifier of a PerfMetricJob job or a TraceJob."; } } @@ -135,6 +148,7 @@ module _3gpp-common-files { leaf-list jobRef { type types3gpp:DistinguishedName ; yext3gpp:notNotifyable ; + yext3gpp:inVariant ; description "Object instance of the 'PerfMetricJob' or 'TraceJob' that produced the file."; } @@ -142,6 +156,7 @@ module _3gpp-common-files { leaf jobId { type string ; yext3gpp:notNotifyable ; + yext3gpp:inVariant ; description "Identifier of a PerfMetricJob job or a TraceJob."; } } -- GitLab From d716c38f813c651e860ceafe3452807fdb781ff2 Mon Sep 17 00:00:00 2001 From: "U-ERICSSON\\ETHBLL" Date: Tue, 10 Oct 2023 17:33:24 +0800 Subject: [PATCH 06/17] correct invariant in extgnbdu --- yang-models/_3gpp-nr-nrm-externalgnbdufunction.yang | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/yang-models/_3gpp-nr-nrm-externalgnbdufunction.yang b/yang-models/_3gpp-nr-nrm-externalgnbdufunction.yang index 0af375644..fa4f179d3 100755 --- a/yang-models/_3gpp-nr-nrm-externalgnbdufunction.yang +++ b/yang-models/_3gpp-nr-nrm-externalgnbdufunction.yang @@ -35,6 +35,7 @@ module _3gpp-nr-nrm-externalgnbdufunction { in 3GPP TS 38.413"; mandatory true; type int64 { range "0..4294967295"; } + yext3gpp:inVariant; } leaf gNBIdLength { @@ -42,7 +43,6 @@ module _3gpp-nr-nrm-externalgnbdufunction { reference "gNB ID in 3GPP TS 38.300, Global gNB ID in 3GPP TS 38.413"; mandatory true; type int32 { range "22..32"; } - yext3gpp:inVariant; } list pLMNId { -- GitLab From e1a3896d55fe02d564257e26af97378eead2c702 Mon Sep 17 00:00:00 2001 From: "U-ERICSSON\\ETHBLL" Date: Thu, 12 Oct 2023 16:24:00 +0800 Subject: [PATCH 07/17] Update copyright --- yang-models/_3gpp-5g-common-yang-types.yang | 4 ++-- yang-models/_3gpp-5gc-nrm-FiveQiDscpMappingSet.yang | 4 ++-- yang-models/_3gpp-5gc-nrm-GtpUPathQoSMonitoringControl.yang | 4 ++-- yang-models/_3gpp-5gc-nrm-QFQoSMonitoringControl.yang | 4 ++-- yang-models/_3gpp-5gc-nrm-affunction.yang | 4 ++-- yang-models/_3gpp-5gc-nrm-amffunction.yang | 4 ++-- yang-models/_3gpp-5gc-nrm-amfregion.yang | 4 ++-- yang-models/_3gpp-5gc-nrm-amfset.yang | 4 ++-- yang-models/_3gpp-5gc-nrm-ausffunction.yang | 4 ++-- yang-models/_3gpp-5gc-nrm-configurable5qiset.yang | 4 ++-- yang-models/_3gpp-5gc-nrm-dnfunction.yang | 4 ++-- yang-models/_3gpp-5gc-nrm-dynamic5qiset.yang | 4 ++-- yang-models/_3gpp-5gc-nrm-ep.yang | 4 ++-- yang-models/_3gpp-5gc-nrm-externalnrffunction.yang | 4 ++-- yang-models/_3gpp-5gc-nrm-externalnssffunction.yang | 4 ++-- yang-models/_3gpp-5gc-nrm-externalseppfunction.yang | 4 ++-- yang-models/_3gpp-5gc-nrm-lmffunction.yang | 4 ++-- yang-models/_3gpp-5gc-nrm-n3iwffunction.yang | 4 ++-- yang-models/_3gpp-5gc-nrm-neffunction.yang | 4 ++-- yang-models/_3gpp-5gc-nrm-nfprofile.yang | 4 ++-- yang-models/_3gpp-5gc-nrm-nfservice.yang | 4 ++-- yang-models/_3gpp-5gc-nrm-ngeirfunction.yang | 4 ++-- yang-models/_3gpp-5gc-nrm-nrffunction.yang | 4 ++-- yang-models/_3gpp-5gc-nrm-nssffunction.yang | 4 ++-- yang-models/_3gpp-5gc-nrm-nwdaffunction.yang | 4 ++-- yang-models/_3gpp-5gc-nrm-pcffunction.yang | 4 ++-- yang-models/_3gpp-5gc-nrm-predefinedpccruleset.yang | 4 ++-- yang-models/_3gpp-5gc-nrm-scpfunction.yang | 4 ++-- yang-models/_3gpp-5gc-nrm-seppfunction.yang | 4 ++-- yang-models/_3gpp-5gc-nrm-smffunction.yang | 4 ++-- yang-models/_3gpp-5gc-nrm-smsffunction.yang | 4 ++-- yang-models/_3gpp-5gc-nrm-udmfunction.yang | 4 ++-- yang-models/_3gpp-5gc-nrm-udrfunction.yang | 4 ++-- yang-models/_3gpp-5gc-nrm-udsffunction.yang | 4 ++-- yang-models/_3gpp-5gc-nrm-upffunction.yang | 4 ++-- yang-models/_3gpp-common-ep-rp.yang | 4 ++-- yang-models/_3gpp-common-filemanagement.yang | 4 ++-- yang-models/_3gpp-common-files.yang | 4 ++-- yang-models/_3gpp-common-fm.yang | 4 ++-- yang-models/_3gpp-common-managed-element.yang | 4 ++-- yang-models/_3gpp-common-managed-function.yang | 4 ++-- yang-models/_3gpp-common-managementdatacollection.yang | 4 ++-- yang-models/_3gpp-common-measurements.yang | 4 ++-- yang-models/_3gpp-common-mnsregistry.yang | 4 ++-- yang-models/_3gpp-common-subnetwork.yang | 4 ++-- yang-models/_3gpp-common-subscription-control.yang | 4 ++-- yang-models/_3gpp-common-top.yang | 4 ++-- yang-models/_3gpp-common-trace.yang | 4 ++-- yang-models/_3gpp-common-yang-extensions.yang | 4 ++-- yang-models/_3gpp-common-yang-types.yang | 4 ++-- yang-models/_3gpp-nr-nrm-beam.yang | 4 ++-- yang-models/_3gpp-nr-nrm-bwp.yang | 4 ++-- yang-models/_3gpp-nr-nrm-cesmanagementfunction.yang | 4 ++-- yang-models/_3gpp-nr-nrm-commonbeamformingfunction.yang | 4 ++-- yang-models/_3gpp-nr-nrm-cpciconfigurationfunction.yang | 4 ++-- yang-models/_3gpp-nr-nrm-danrmanagementfunction.yang | 4 ++-- yang-models/_3gpp-nr-nrm-desmanagementfunction.yang | 4 ++-- yang-models/_3gpp-nr-nrm-dlbofunction.yang | 4 ++-- yang-models/_3gpp-nr-nrm-dmrofunction.yang | 4 ++-- yang-models/_3gpp-nr-nrm-dpciconfigurationfunction.yang | 4 ++-- yang-models/_3gpp-nr-nrm-drachoptimizationfunction.yang | 4 ++-- yang-models/_3gpp-nr-nrm-ep.yang | 4 ++-- yang-models/_3gpp-nr-nrm-eutrancellrelation.yang | 4 ++-- yang-models/_3gpp-nr-nrm-eutranetwork.yang | 4 ++-- yang-models/_3gpp-nr-nrm-eutranfreqrelation.yang | 4 ++-- yang-models/_3gpp-nr-nrm-eutranfrequency.yang | 4 ++-- yang-models/_3gpp-nr-nrm-externalamffunction.yang | 4 ++-- yang-models/_3gpp-nr-nrm-externalenbfunction.yang | 4 ++-- yang-models/_3gpp-nr-nrm-externaleutrancell.yang | 4 ++-- yang-models/_3gpp-nr-nrm-externalgnbcucpfunction.yang | 4 ++-- yang-models/_3gpp-nr-nrm-externalgnbcuupfunction.yang | 4 ++-- yang-models/_3gpp-nr-nrm-externalgnbdufunction.yang | 4 ++-- yang-models/_3gpp-nr-nrm-externalnrcellcu.yang | 4 ++-- yang-models/_3gpp-nr-nrm-externalservinggwfunction.yang | 4 ++-- yang-models/_3gpp-nr-nrm-externalupffunction.yang | 4 ++-- yang-models/_3gpp-nr-nrm-gnbcucpfunction.yang | 4 ++-- yang-models/_3gpp-nr-nrm-gnbcuupfunction.yang | 4 ++-- yang-models/_3gpp-nr-nrm-gnbdufunction.yang | 4 ++-- yang-models/_3gpp-nr-nrm-nrcellcu.yang | 4 ++-- yang-models/_3gpp-nr-nrm-nrcelldu.yang | 4 ++-- yang-models/_3gpp-nr-nrm-nrcellrelation.yang | 4 ++-- yang-models/_3gpp-nr-nrm-nrfreqrelation.yang | 4 ++-- yang-models/_3gpp-nr-nrm-nrfrequency.yang | 4 ++-- yang-models/_3gpp-nr-nrm-nrnetwork.yang | 4 ++-- yang-models/_3gpp-nr-nrm-nroperatorcelldu.yang | 4 ++-- yang-models/_3gpp-nr-nrm-nrsectorcarrier.yang | 4 ++-- yang-models/_3gpp-nr-nrm-operatordu.yang | 4 ++-- yang-models/_3gpp-nr-nrm-rimrsset.yang | 4 ++-- yang-models/_3gpp-nr-nrm-rrmpolicy.yang | 4 ++-- yang-models/_3gpp-ns-nrm-common.yang | 4 ++-- yang-models/_3gpp-ns-nrm-networkslice.yang | 4 ++-- yang-models/_3gpp-ns-nrm-networkslicesubnet.yang | 4 ++-- yang-models/_3gpp-ns-nrm-serviceprofile.yang | 4 ++-- yang-models/_3gpp-ns-nrm-sliceprofile.yang | 4 ++-- 94 files changed, 188 insertions(+), 188 deletions(-) diff --git a/yang-models/_3gpp-5g-common-yang-types.yang b/yang-models/_3gpp-5g-common-yang-types.yang index bef735ceb..d9408e0c7 100755 --- a/yang-models/_3gpp-5g-common-yang-types.yang +++ b/yang-models/_3gpp-5g-common-yang-types.yang @@ -10,8 +10,8 @@ module _3gpp-5g-common-yang-types { contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464"; description "The model defines common types for 5G networks and network slicing. - Copyright 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, - TTA, TTC) 2019-2023. All rights reserved."; + Copyright 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + TTA, TTC). All rights reserved."; reference "3GPP TS 28.541"; revision 2023-09-17 { reference CR-1042 ; } diff --git a/yang-models/_3gpp-5gc-nrm-FiveQiDscpMappingSet.yang b/yang-models/_3gpp-5gc-nrm-FiveQiDscpMappingSet.yang index ad8e586e8..92cf03095 100755 --- a/yang-models/_3gpp-5gc-nrm-FiveQiDscpMappingSet.yang +++ b/yang-models/_3gpp-5gc-nrm-FiveQiDscpMappingSet.yang @@ -11,8 +11,8 @@ module _3gpp-5gc-nrm-FiveQiDscpMappingSet { organization "3gpp SA5"; contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464"; description " This IOC represents the set of mapping between 5QIs and DSCP. - Copyright 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, - TTA, TTC) 2019-2023. All rights reserved."; + Copyright 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + TTA, TTC). All rights reserved."; reference "3GPP TS 28.541"; revision 2023-09-17 { reference CR-1042 ; } diff --git a/yang-models/_3gpp-5gc-nrm-GtpUPathQoSMonitoringControl.yang b/yang-models/_3gpp-5gc-nrm-GtpUPathQoSMonitoringControl.yang index 4e01f9ca9..1f7faa31e 100755 --- a/yang-models/_3gpp-5gc-nrm-GtpUPathQoSMonitoringControl.yang +++ b/yang-models/_3gpp-5gc-nrm-GtpUPathQoSMonitoringControl.yang @@ -13,8 +13,8 @@ module _3gpp-5gc-nrm-GtpUPathQoSMonitoringControl { 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 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, - TTA, TTC) 2019-2023. All rights reserved."; + Copyright 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + TTA, TTC). All rights reserved."; reference "3GPP TS 28.541"; revision 2023-09-17 { reference CR-1042 ; } diff --git a/yang-models/_3gpp-5gc-nrm-QFQoSMonitoringControl.yang b/yang-models/_3gpp-5gc-nrm-QFQoSMonitoringControl.yang index bf72c1645..f3f7d7086 100755 --- a/yang-models/_3gpp-5gc-nrm-QFQoSMonitoringControl.yang +++ b/yang-models/_3gpp-5gc-nrm-QFQoSMonitoringControl.yang @@ -13,8 +13,8 @@ module _3gpp-5gc-nrm-QFQoSMonitoringControl { description "This IOC represents the capabilities and properties for control of QoS monitoring per QoS flow per UE for URLLC service defined in 3GPP TS 23.501. - Copyright 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, - TTA, TTC) 2019-2023. All rights reserved."; + Copyright 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + TTA, TTC). All rights reserved."; reference "3GPP TS 28.541"; revision 2023-09-17 { reference CR-1042 ; } diff --git a/yang-models/_3gpp-5gc-nrm-affunction.yang b/yang-models/_3gpp-5gc-nrm-affunction.yang index 0d41b9c45..f79931c22 100755 --- a/yang-models/_3gpp-5gc-nrm-affunction.yang +++ b/yang-models/_3gpp-5gc-nrm-affunction.yang @@ -12,8 +12,8 @@ module _3gpp-5gc-nrm-affunction { description "This IOC is defined only to describe the IOCs representing its interaction interface with 5GC (i.e. EP_Rx and EP_N5). It has no attributes defined. - Copyright 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, - TTA, TTC) 2019-2023. All rights reserved."; + Copyright 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + TTA, TTC). All rights reserved."; reference "3GPP TS 28.541"; revision 2023-09-17 { reference CR-1042 ; } diff --git a/yang-models/_3gpp-5gc-nrm-amffunction.yang b/yang-models/_3gpp-5gc-nrm-amffunction.yang index 73487e557..d22a1e494 100755 --- a/yang-models/_3gpp-5gc-nrm-amffunction.yang +++ b/yang-models/_3gpp-5gc-nrm-amffunction.yang @@ -13,8 +13,8 @@ module _3gpp-5gc-nrm-amffunction { organization "3gpp SA5"; contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464"; description "AMFFunction derived from basic ManagedFunction. - Copyright 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, - TTA, TTC) 2019-2023. All rights reserved."; + Copyright 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + TTA, TTC). All rights reserved."; reference "3GPP TS 28.541 5G Network Resource Model (NRM)"; revision 2023-09-17 { reference CR-1042 ; } diff --git a/yang-models/_3gpp-5gc-nrm-amfregion.yang b/yang-models/_3gpp-5gc-nrm-amfregion.yang index 5c06f0581..af3ca1ea3 100755 --- a/yang-models/_3gpp-5gc-nrm-amfregion.yang +++ b/yang-models/_3gpp-5gc-nrm-amfregion.yang @@ -13,8 +13,8 @@ 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 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, - TTA, TTC) 2019-2023. All rights reserved."; + Copyright 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + TTA, TTC). All rights reserved."; reference "3GPP TS 28.541 5G Network Resource Model (NRM)"; revision 2023-09-17 { reference CR-1042 ; } diff --git a/yang-models/_3gpp-5gc-nrm-amfset.yang b/yang-models/_3gpp-5gc-nrm-amfset.yang index 2e76f3e71..394f8e807 100755 --- a/yang-models/_3gpp-5gc-nrm-amfset.yang +++ b/yang-models/_3gpp-5gc-nrm-amfset.yang @@ -13,8 +13,8 @@ module _3gpp-5gc-nrm-amfset { contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464"; description "This IOC represents the AMF Set which consists of some AMFs that serve a given area and Network Slice. - Copyright 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, - TTA, TTC) 2019-2023. All rights reserved."; + Copyright 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + TTA, TTC). All rights reserved."; reference "3GPP TS 28.541 5G Network Resource Model (NRM)"; revision 2023-09-17 { reference CR-1042 ; } diff --git a/yang-models/_3gpp-5gc-nrm-ausffunction.yang b/yang-models/_3gpp-5gc-nrm-ausffunction.yang index 5da92b8a2..91ada8313 100755 --- a/yang-models/_3gpp-5gc-nrm-ausffunction.yang +++ b/yang-models/_3gpp-5gc-nrm-ausffunction.yang @@ -15,8 +15,8 @@ module _3gpp-5gc-nrm-ausffunction { contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464"; description "This IOC represents the AUSF function in 5GC. For more information about the AUSF, see 3GPP TS 23.501. - Copyright 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, - TTA, TTC) 2019-2023. All rights reserved."; + Copyright 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + TTA, TTC). All rights reserved."; reference "3GPP TS 28.541"; revision 2023-09-17 { reference CR-1042 ; } diff --git a/yang-models/_3gpp-5gc-nrm-configurable5qiset.yang b/yang-models/_3gpp-5gc-nrm-configurable5qiset.yang index f14da0734..7c4cff90b 100755 --- a/yang-models/_3gpp-5gc-nrm-configurable5qiset.yang +++ b/yang-models/_3gpp-5gc-nrm-configurable5qiset.yang @@ -10,8 +10,8 @@ module _3gpp-5gc-nrm-configurable5qiset { description "This IOC represents the configurable 5QIs, including their QoS characteristics, that need to be pre-configured (and configurable) to the 5G NFs. - Copyright 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, - TTA, TTC) 2019-2023. All rights reserved."; + Copyright 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + TTA, TTC). All rights reserved."; reference "3GPP TS 28.541"; revision 2023-09-17 { reference CR-1042 ; } diff --git a/yang-models/_3gpp-5gc-nrm-dnfunction.yang b/yang-models/_3gpp-5gc-nrm-dnfunction.yang index 89a042ba1..76806cc7a 100755 --- a/yang-models/_3gpp-5gc-nrm-dnfunction.yang +++ b/yang-models/_3gpp-5gc-nrm-dnfunction.yang @@ -12,8 +12,8 @@ module _3gpp-5gc-nrm-dnfunction { description "This IOC is defined only to describe the IOCs representing Data Network (DN) interaction interface with 5GC (i.e. EP_N6). It has no attributes defined. - Copyright 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, - TTA, TTC) 2019-2023. All rights reserved."; + Copyright 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + TTA, TTC). All rights reserved."; reference "3GPP TS 28.541"; revision 2023-09-17 { reference CR-1042 ; } diff --git a/yang-models/_3gpp-5gc-nrm-dynamic5qiset.yang b/yang-models/_3gpp-5gc-nrm-dynamic5qiset.yang index 0f370924c..f65e535e7 100755 --- a/yang-models/_3gpp-5gc-nrm-dynamic5qiset.yang +++ b/yang-models/_3gpp-5gc-nrm-dynamic5qiset.yang @@ -12,8 +12,8 @@ module _3gpp-5gc-nrm-dynamic5qiset { contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464"; description "This IOC represents the dynamic 5QIs including their QoS characteristics. - Copyright 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, - TTA, TTC) 2019-2023. All rights reserved."; + Copyright 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + TTA, TTC). All rights reserved."; reference "3GPP TS 28.541"; revision 2023-09-17 { reference CR-1042 ; } diff --git a/yang-models/_3gpp-5gc-nrm-ep.yang b/yang-models/_3gpp-5gc-nrm-ep.yang index 65f154d5c..988eebd49 100755 --- a/yang-models/_3gpp-5gc-nrm-ep.yang +++ b/yang-models/_3gpp-5gc-nrm-ep.yang @@ -28,8 +28,8 @@ module _3gpp-5gc-nrm-ep { description "Defines the YANG mapping of the 5GC related endpoint Information Object Classes (IOCs) that are part of the 5G Core Network Resource Model. - Copyright 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, - TTA, TTC) 2019-2023. All rights reserved."; + Copyright 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + TTA, TTC). All rights reserved."; reference "3GPP TS 28.541"; revision 2023-09-17 { reference CR-1042 ; } diff --git a/yang-models/_3gpp-5gc-nrm-externalnrffunction.yang b/yang-models/_3gpp-5gc-nrm-externalnrffunction.yang index d38d38df1..dc5fd8b09 100755 --- a/yang-models/_3gpp-5gc-nrm-externalnrffunction.yang +++ b/yang-models/_3gpp-5gc-nrm-externalnrffunction.yang @@ -10,8 +10,8 @@ module _3gpp-5gc-nrm-externalnrffunction { description "This IOC represents external NRF function controlled by another management domain. - Copyright 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, - TTA, TTC) 2019-2023. All rights reserved."; + Copyright 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + TTA, TTC). All rights reserved."; revision 2023-09-17 { reference CR-1042 ; } revision 2019-10-28 { reference S5-193518 ; } diff --git a/yang-models/_3gpp-5gc-nrm-externalnssffunction.yang b/yang-models/_3gpp-5gc-nrm-externalnssffunction.yang index 188704fa5..6474c05ea 100755 --- a/yang-models/_3gpp-5gc-nrm-externalnssffunction.yang +++ b/yang-models/_3gpp-5gc-nrm-externalnssffunction.yang @@ -10,8 +10,8 @@ module _3gpp-5gc-nrm-externalnssffunction { description "This IOC represents external NSSF function controlled by another management domain. - Copyright 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, - TTA, TTC) 2019-2023. All rights reserved."; + Copyright 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + TTA, TTC). All rights reserved."; revision 2023-09-17 { reference CR-1042 ; } revision 2019-10-28 { reference S5-193518 ; } diff --git a/yang-models/_3gpp-5gc-nrm-externalseppfunction.yang b/yang-models/_3gpp-5gc-nrm-externalseppfunction.yang index bdc584ebd..bb841e4d1 100755 --- a/yang-models/_3gpp-5gc-nrm-externalseppfunction.yang +++ b/yang-models/_3gpp-5gc-nrm-externalseppfunction.yang @@ -15,8 +15,8 @@ module _3gpp-5gc-nrm-externalseppfunction { description "This IOC represents the external SEPP function which support message filtering and policing on inter-PLMN control plane interface. For more information about the SEPP, see 3GPP TS 23.501. - Copyright 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, - TTA, TTC) 2019-2023. All rights reserved."; + Copyright 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + TTA, TTC). All rights reserved."; reference "3GPP TS 28.541"; revision 2023-09-17 { reference CR-1042 ; } diff --git a/yang-models/_3gpp-5gc-nrm-lmffunction.yang b/yang-models/_3gpp-5gc-nrm-lmffunction.yang index 6468cac35..85e0d3cfb 100755 --- a/yang-models/_3gpp-5gc-nrm-lmffunction.yang +++ b/yang-models/_3gpp-5gc-nrm-lmffunction.yang @@ -12,8 +12,8 @@ module _3gpp-5gc-nrm-lmffunction { organization "3gpp SA5"; description "This IOC represents the LMF function defined in 3GPP TS 23.501. - Copyright 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, - TTA, TTC) 2019-2023. All rights reserved."; + Copyright 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + TTA, TTC). All rights reserved."; reference "3GPP TS 28.541"; revision 2023-09-17 { reference CR-1042 ; } diff --git a/yang-models/_3gpp-5gc-nrm-n3iwffunction.yang b/yang-models/_3gpp-5gc-nrm-n3iwffunction.yang index acaf2bc40..48ecf295a 100755 --- a/yang-models/_3gpp-5gc-nrm-n3iwffunction.yang +++ b/yang-models/_3gpp-5gc-nrm-n3iwffunction.yang @@ -13,8 +13,8 @@ module _3gpp-5gc-nrm-n3iwffunction { organization "3gpp SA5"; description "This IOC represents the N3IWF function which is used to enable non-3GPP access networks connected to the 5GC. For more information about the N3IWF, see 3GPP TS 23.501. - Copyright 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, - TTA, TTC) 2019-2023. All rights reserved."; + Copyright 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + TTA, TTC). All rights reserved."; reference "3GPP TS 28.541"; revision 2023-09-17 { reference CR-1042 ; } diff --git a/yang-models/_3gpp-5gc-nrm-neffunction.yang b/yang-models/_3gpp-5gc-nrm-neffunction.yang index 078babbe6..887b51c34 100755 --- a/yang-models/_3gpp-5gc-nrm-neffunction.yang +++ b/yang-models/_3gpp-5gc-nrm-neffunction.yang @@ -17,8 +17,8 @@ module _3gpp-5gc-nrm-neffunction { contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464"; description "This IOC represents the NEF function in 5GC. For more information about the NEF, see 3GPP TS 23.501. - Copyright 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, - TTA, TTC) 2019-2023. All rights reserved."; + Copyright 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + TTA, TTC). All rights reserved."; reference "3GPP TS 28.541"; revision 2023-09-17 { reference CR-1042 ; } diff --git a/yang-models/_3gpp-5gc-nrm-nfprofile.yang b/yang-models/_3gpp-5gc-nrm-nfprofile.yang index b0eaaa119..49d61d75d 100755 --- a/yang-models/_3gpp-5gc-nrm-nfprofile.yang +++ b/yang-models/_3gpp-5gc-nrm-nfprofile.yang @@ -10,8 +10,8 @@ module _3gpp-5gc-nrm-nfprofile { organization "3gpp SA5"; description "NF profile class. - Copyright 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, - TTA, TTC) 2019-2023. All rights reserved."; + Copyright 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + TTA, TTC). All rights reserved."; reference "3GPP TS 29.510"; revision 2023-09-17 { reference CR-1042 ; } diff --git a/yang-models/_3gpp-5gc-nrm-nfservice.yang b/yang-models/_3gpp-5gc-nrm-nfservice.yang index f1f1d5175..f7213d18f 100755 --- a/yang-models/_3gpp-5gc-nrm-nfservice.yang +++ b/yang-models/_3gpp-5gc-nrm-nfservice.yang @@ -12,8 +12,8 @@ module _3gpp-5gc-nrm-nfservice { organization "3gpp SA5"; contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464"; description "NF service class. - Copyright 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, - TTA, TTC) 2019-2023. All rights reserved."; + Copyright 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + TTA, TTC). All rights reserved."; reference "3GPP TS 29.510"; revision 2023-09-17 { reference CR-1042 ; } diff --git a/yang-models/_3gpp-5gc-nrm-ngeirfunction.yang b/yang-models/_3gpp-5gc-nrm-ngeirfunction.yang index 4e1a1fa50..12f3d57d1 100755 --- a/yang-models/_3gpp-5gc-nrm-ngeirfunction.yang +++ b/yang-models/_3gpp-5gc-nrm-ngeirfunction.yang @@ -14,8 +14,8 @@ module _3gpp-5gc-nrm-ngeirfunction { contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464"; description "This IOC represents the 5G-EIR function in 5GC. For more information about the 5G-EIR, see 3GPP TS 23.501. - Copyright 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, - TTA, TTC) 2019-2023. All rights reserved."; + Copyright 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + TTA, TTC). All rights reserved."; reference "3GPP TS 28.541"; revision 2023-09-17 { reference CR-1042 ; } diff --git a/yang-models/_3gpp-5gc-nrm-nrffunction.yang b/yang-models/_3gpp-5gc-nrm-nrffunction.yang index 7fe7c8b83..277617c9c 100755 --- a/yang-models/_3gpp-5gc-nrm-nrffunction.yang +++ b/yang-models/_3gpp-5gc-nrm-nrffunction.yang @@ -16,8 +16,8 @@ module _3gpp-5gc-nrm-nrffunction { contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464"; description "This IOC represents the NRF function in 5GC. For more information about the NRF, see 3GPP TS 23.501 [2]. - Copyright 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, - TTA, TTC) 2019-2023. All rights reserved."; + Copyright 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + TTA, TTC). All rights reserved."; reference "3GPP TS 28.541"; revision 2023-09-17 { reference CR-1042 ; } diff --git a/yang-models/_3gpp-5gc-nrm-nssffunction.yang b/yang-models/_3gpp-5gc-nrm-nssffunction.yang index 2b4525f57..fc9456a27 100755 --- a/yang-models/_3gpp-5gc-nrm-nssffunction.yang +++ b/yang-models/_3gpp-5gc-nrm-nssffunction.yang @@ -15,8 +15,8 @@ module _3gpp-5gc-nrm-nssffunction { 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 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, - TTA, TTC) 2019-2023. All rights reserved."; + Copyright 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + TTA, TTC). All rights reserved."; reference "3GPP TS 28.541"; revision 2023-09-17 { reference CR-1042 ; } diff --git a/yang-models/_3gpp-5gc-nrm-nwdaffunction.yang b/yang-models/_3gpp-5gc-nrm-nwdaffunction.yang index f681547d6..4d677f6a1 100755 --- a/yang-models/_3gpp-5gc-nrm-nwdaffunction.yang +++ b/yang-models/_3gpp-5gc-nrm-nwdaffunction.yang @@ -16,8 +16,8 @@ module _3gpp-5gc-nrm-nwdaffunction { contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464"; description "This IOC represents the NWDAF function in 5GC. For more information about the NWDAF, see 3GPP TS 23.501. - Copyright 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, - TTA, TTC) 2019-2023. All rights reserved."; + Copyright 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + TTA, TTC). All rights reserved."; reference "3GPP TS 28.541"; revision 2023-09-17 { reference CR-1042 ; } diff --git a/yang-models/_3gpp-5gc-nrm-pcffunction.yang b/yang-models/_3gpp-5gc-nrm-pcffunction.yang index c18972ec6..36d94ef4f 100755 --- a/yang-models/_3gpp-5gc-nrm-pcffunction.yang +++ b/yang-models/_3gpp-5gc-nrm-pcffunction.yang @@ -15,8 +15,8 @@ module _3gpp-5gc-nrm-pcffunction { contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464"; description "This IOC represents the PCF function in 5GC. For more information about the PCF, see 3GPP TS 23.501. - Copyright 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, - TTA, TTC) 2019-2023. All rights reserved."; + Copyright 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + TTA, TTC). All rights reserved."; reference "3GPP TS 28.541"; revision 2023-09-17 { reference CR-1042 ; } diff --git a/yang-models/_3gpp-5gc-nrm-predefinedpccruleset.yang b/yang-models/_3gpp-5gc-nrm-predefinedpccruleset.yang index 5a60ab32f..4a8b98ed5 100755 --- a/yang-models/_3gpp-5gc-nrm-predefinedpccruleset.yang +++ b/yang-models/_3gpp-5gc-nrm-predefinedpccruleset.yang @@ -14,8 +14,8 @@ module _3gpp-5gc-nrm-predefinedpccruleset { contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464"; description "This IOC represents the predefined PCC rules, which are configured to SMF and referenced by PCF. - Copyright 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, - TTA, TTC) 2019-2023. All rights reserved."; + Copyright 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + TTA, TTC). All rights reserved."; reference "3GPP TS 28.541"; revision 2023-09-17 { reference CR-1042 ; } diff --git a/yang-models/_3gpp-5gc-nrm-scpfunction.yang b/yang-models/_3gpp-5gc-nrm-scpfunction.yang index 7e367d4f4..7920c7665 100755 --- a/yang-models/_3gpp-5gc-nrm-scpfunction.yang +++ b/yang-models/_3gpp-5gc-nrm-scpfunction.yang @@ -12,8 +12,8 @@ module _3gpp-5gc-nrm-scpfunction { organization "3gpp SA5"; description "This IOC represents the SCP function in 5GC. For more information about the SCP, see 3GPP TS 23.501. - Copyright 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, - TTA, TTC) 2019-2023. All rights reserved."; + Copyright 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + TTA, TTC). All rights reserved."; reference "3GPP TS 28.541"; revision 2023-09-17 { reference CR-1042 ; } diff --git a/yang-models/_3gpp-5gc-nrm-seppfunction.yang b/yang-models/_3gpp-5gc-nrm-seppfunction.yang index 5ee1c2924..5aa1e63e4 100755 --- a/yang-models/_3gpp-5gc-nrm-seppfunction.yang +++ b/yang-models/_3gpp-5gc-nrm-seppfunction.yang @@ -14,8 +14,8 @@ module _3gpp-5gc-nrm-seppfunction { organization "3gpp SA5"; description "This IOC represents the SEPP function which support message filtering and policing on inter-PLMN control plane interface. For more information about the SEPP, see 3GPP TS 23.501. - Copyright 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, - TTA, TTC) 2019-2023. All rights reserved."; + Copyright 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + TTA, TTC). All rights reserved."; reference "3GPP TS 28.541"; revision 2023-09-17 { reference CR-1042 ; } diff --git a/yang-models/_3gpp-5gc-nrm-smffunction.yang b/yang-models/_3gpp-5gc-nrm-smffunction.yang index 3cc10f581..595d81159 100755 --- a/yang-models/_3gpp-5gc-nrm-smffunction.yang +++ b/yang-models/_3gpp-5gc-nrm-smffunction.yang @@ -13,8 +13,8 @@ module _3gpp-5gc-nrm-smffunction { organization "3gpp SA5"; contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464"; description "SMFFunction derived from basic ManagedFunction. - Copyright 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, - TTA, TTC) 2019-2023. All rights reserved."; + Copyright 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + TTA, TTC). All rights reserved."; revision 2023-09-17 { reference CR-1042 ; } revision 2020-11-07 { reference CR-0412 ; } diff --git a/yang-models/_3gpp-5gc-nrm-smsffunction.yang b/yang-models/_3gpp-5gc-nrm-smsffunction.yang index 739ad5650..9fbc7c5ec 100755 --- a/yang-models/_3gpp-5gc-nrm-smsffunction.yang +++ b/yang-models/_3gpp-5gc-nrm-smsffunction.yang @@ -12,8 +12,8 @@ module _3gpp-5gc-nrm-smsffunction { organization "3gpp SA5"; description "This IOC represents the SMSF function defined in 3GPP TS 23.501. - Copyright 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, - TTA, TTC) 2019-2023. All rights reserved."; + Copyright 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + TTA, TTC). All rights reserved."; reference "3GPP TS 28.541"; revision 2023-09-17 { reference CR-1042 ; } diff --git a/yang-models/_3gpp-5gc-nrm-udmfunction.yang b/yang-models/_3gpp-5gc-nrm-udmfunction.yang index 8576faf3a..b7a8b3cca 100755 --- a/yang-models/_3gpp-5gc-nrm-udmfunction.yang +++ b/yang-models/_3gpp-5gc-nrm-udmfunction.yang @@ -15,8 +15,8 @@ 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 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, - TTA, TTC) 2019-2023. All rights reserved."; + Copyright 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + TTA, TTC). All rights reserved."; reference "3GPP TS 28.541"; revision 2023-09-17 { reference CR-1042 ; } diff --git a/yang-models/_3gpp-5gc-nrm-udrfunction.yang b/yang-models/_3gpp-5gc-nrm-udrfunction.yang index 856d78e38..62c3cb084 100755 --- a/yang-models/_3gpp-5gc-nrm-udrfunction.yang +++ b/yang-models/_3gpp-5gc-nrm-udrfunction.yang @@ -15,8 +15,8 @@ module _3gpp-5gc-nrm-udrfunction { 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 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, - TTA, TTC) 2019-2023. All rights reserved."; + Copyright 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + TTA, TTC). All rights reserved."; reference "3GPP TS 28.541"; revision 2023-09-17 { reference CR-1042 ; } diff --git a/yang-models/_3gpp-5gc-nrm-udsffunction.yang b/yang-models/_3gpp-5gc-nrm-udsffunction.yang index 86b452c0e..7cb61bf4a 100755 --- a/yang-models/_3gpp-5gc-nrm-udsffunction.yang +++ b/yang-models/_3gpp-5gc-nrm-udsffunction.yang @@ -15,8 +15,8 @@ module _3gpp-5gc-nrm-udsffunction { contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464"; description "This IOC represents the UDSF function which can be interacted with any other 5GC NF defined in 3GPP TS 23.501. - Copyright 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, - TTA, TTC) 2019-2023. All rights reserved."; + Copyright 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + TTA, TTC). All rights reserved."; reference "3GPP TS 28.541"; revision 2023-09-17 { reference CR-1042 ; } diff --git a/yang-models/_3gpp-5gc-nrm-upffunction.yang b/yang-models/_3gpp-5gc-nrm-upffunction.yang index a6b2525de..1526335ea 100755 --- a/yang-models/_3gpp-5gc-nrm-upffunction.yang +++ b/yang-models/_3gpp-5gc-nrm-upffunction.yang @@ -12,8 +12,8 @@ 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 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, - TTA, TTC) 2019-2023. All rights reserved."; + Copyright 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + TTA, TTC). All rights reserved."; reference "3GPP TS 28.541 5G Network Resource Model (NRM)"; revision 2023-09-17 { reference CR-1042 ; } diff --git a/yang-models/_3gpp-common-ep-rp.yang b/yang-models/_3gpp-common-ep-rp.yang index 13a685b3a..4bdf19ce3 100755 --- a/yang-models/_3gpp-common-ep-rp.yang +++ b/yang-models/_3gpp-common-ep-rp.yang @@ -12,8 +12,8 @@ module _3gpp-common-ep-rp { description "Common/basic class/grouping to be inherited/reused. This IOC represents an end point of a link used across a reference point between two network entities. - Copyright 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, - TTA, TTC) 2019-2023. All rights reserved."; + Copyright 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + TTA, TTC). All rights reserved."; reference "3GPP TS 28.622 Generic Network Resource Model (NRM) diff --git a/yang-models/_3gpp-common-filemanagement.yang b/yang-models/_3gpp-common-filemanagement.yang index bee65e62f..271fbac9b 100644 --- a/yang-models/_3gpp-common-filemanagement.yang +++ b/yang-models/_3gpp-common-filemanagement.yang @@ -13,8 +13,8 @@ module _3gpp-common-filemanagement { contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464"; description "Defines the YANG mapping of the FileDownloadJob Information Object Class (IOC) that is part of the Generic Network Resource Model (NRM). - Copyright 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, - TTA, TTC) 2019-2023. All rights reserved."; + Copyright 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + TTA, TTC). All rights reserved."; reference "3GPP TS 28.623 Generic Network Resource Model (NRM)"; revision 2023-09-17 { reference CR-0270 ; } diff --git a/yang-models/_3gpp-common-files.yang b/yang-models/_3gpp-common-files.yang index ff848fd18..464be0ab7 100644 --- a/yang-models/_3gpp-common-files.yang +++ b/yang-models/_3gpp-common-files.yang @@ -13,8 +13,8 @@ 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 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, - TTA, TTC) 2019-2023. All rights reserved."; + Copyright 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + TTA, TTC). All rights reserved."; reference "3GPP TS 28.623 Generic Network Resource Model (NRM) Integration Reference Point (IRP); diff --git a/yang-models/_3gpp-common-fm.yang b/yang-models/_3gpp-common-fm.yang index 8e522e51e..ca4d7eaca 100755 --- a/yang-models/_3gpp-common-fm.yang +++ b/yang-models/_3gpp-common-fm.yang @@ -12,8 +12,8 @@ module _3gpp-common-fm { contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464"; description "Defines a Fault Management model - Copyright 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, - TTA, TTC) 2019-2023. All rights reserved."; + Copyright 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + TTA, TTC). All rights reserved."; reference "3GPP TS 28.623 Generic Network Resource Model (NRM) diff --git a/yang-models/_3gpp-common-managed-element.yang b/yang-models/_3gpp-common-managed-element.yang index 5296297d9..38d8f7040 100755 --- a/yang-models/_3gpp-common-managed-element.yang +++ b/yang-models/_3gpp-common-managed-element.yang @@ -17,8 +17,8 @@ module _3gpp-common-managed-element { description "Defines ManagedElement which will be augmented by other IOCs - Copyright 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, - TTA, TTC) 2019-2023. All rights reserved."; + Copyright 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + TTA, TTC). All rights reserved."; reference "3GPP TS 28.623 Generic Network Resource Model (NRM) Integration Reference Point (IRP); diff --git a/yang-models/_3gpp-common-managed-function.yang b/yang-models/_3gpp-common-managed-function.yang index a34a14be3..189e0330d 100755 --- a/yang-models/_3gpp-common-managed-function.yang +++ b/yang-models/_3gpp-common-managed-function.yang @@ -13,8 +13,8 @@ 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 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, - TTA, TTC) 2019-2023. All rights reserved."; + Copyright 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + TTA, TTC). All rights reserved."; reference "3GPP TS 28.622 Generic Network Resource Model (NRM) diff --git a/yang-models/_3gpp-common-managementdatacollection.yang b/yang-models/_3gpp-common-managementdatacollection.yang index e792e2578..5c75fd889 100644 --- a/yang-models/_3gpp-common-managementdatacollection.yang +++ b/yang-models/_3gpp-common-managementdatacollection.yang @@ -14,8 +14,8 @@ module _3gpp-common-managementdatacollection { contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464"; description "Handling management data collection - Copyright 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, - TTA, TTC) 2019-2023. All rights reserved."; + Copyright 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + TTA, TTC). All rights reserved."; reference "3GPP TS 28.623 Generic Network Resource Model (NRM) diff --git a/yang-models/_3gpp-common-measurements.yang b/yang-models/_3gpp-common-measurements.yang index a58f7e0e0..c4cd4bddb 100755 --- a/yang-models/_3gpp-common-measurements.yang +++ b/yang-models/_3gpp-common-measurements.yang @@ -44,8 +44,8 @@ module _3gpp-common-measurements { Measurements can be contained under ManagedElement, SubNetwork, or any list representing a class inheriting from Subnetwork or ManagedFunction. Note: KPIs will only be supported under SubNetwork - Copyright 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, - TTA, TTC) 2019-2023. All rights reserved."; + Copyright 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + TTA, TTC). All rights reserved."; reference "3GPP TS 28.623 Generic Network Resource Model (NRM) diff --git a/yang-models/_3gpp-common-mnsregistry.yang b/yang-models/_3gpp-common-mnsregistry.yang index d034a57c5..ce5d285bc 100755 --- a/yang-models/_3gpp-common-mnsregistry.yang +++ b/yang-models/_3gpp-common-mnsregistry.yang @@ -11,8 +11,8 @@ module _3gpp-common-mnsregistry { contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464"; description "Defines the YANG mapping of the MNSRegistry Information Object Class (IOC) that is part of the Generic Network Resource Model (NRM). - Copyright 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, - TTA, TTC) 2019-2023. All rights reserved."; + Copyright 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + TTA, TTC). All rights reserved."; reference "3GPP TS 28.623 Generic Network Resource Model (NRM)"; revision 2023-09-17 { reference CR-0270 ; } diff --git a/yang-models/_3gpp-common-subnetwork.yang b/yang-models/_3gpp-common-subnetwork.yang index 7658e3168..89ca61fc2 100755 --- a/yang-models/_3gpp-common-subnetwork.yang +++ b/yang-models/_3gpp-common-subnetwork.yang @@ -17,8 +17,8 @@ module _3gpp-common-subnetwork { contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464"; description "Defines basic SubNetwork which will be augmented by other IOCs - Copyright 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, - TTA, TTC) 2019-2023. All rights reserved."; + Copyright 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + TTA, TTC). All rights reserved."; reference "3GPP TS 28.623 Generic Network Resource Model (NRM) Integration Reference Point (IRP); diff --git a/yang-models/_3gpp-common-subscription-control.yang b/yang-models/_3gpp-common-subscription-control.yang index 4a2828bf2..f494e8f51 100755 --- a/yang-models/_3gpp-common-subscription-control.yang +++ b/yang-models/_3gpp-common-subscription-control.yang @@ -10,8 +10,8 @@ module _3gpp-common-subscription-control { contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464"; description "Defines IOCs for subscription and heartbeat control. - Copyright 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, - TTA, TTC) 2019-2023. All rights reserved."; + Copyright 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + TTA, TTC). All rights reserved."; reference "3GPP TS 28.623 Generic Network Resource Model (NRM) Integration Reference Point (IRP); diff --git a/yang-models/_3gpp-common-top.yang b/yang-models/_3gpp-common-top.yang index 8ba19bb27..eaa26cda8 100755 --- a/yang-models/_3gpp-common-top.yang +++ b/yang-models/_3gpp-common-top.yang @@ -8,8 +8,8 @@ module _3gpp-common-top { description "The model defines a YANG mapping of the top level information classes used for management of 5G networks and network slicing. - Copyright 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, - TTA, TTC) 2019-2023. All rights reserved."; + Copyright 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + TTA, TTC). All rights reserved."; reference "3GPP TS 28.622 Generic Network Resource Model (NRM) diff --git a/yang-models/_3gpp-common-trace.yang b/yang-models/_3gpp-common-trace.yang index 9b2d3260a..a23656324 100755 --- a/yang-models/_3gpp-common-trace.yang +++ b/yang-models/_3gpp-common-trace.yang @@ -13,8 +13,8 @@ module _3gpp-common-trace { contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464"; description "Trace handling - Copyright 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, - TTA, TTC) 2019-2023. All rights reserved."; + Copyright 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + TTA, TTC). All rights reserved."; reference "3GPP TS 28.623 Generic Network Resource Model (NRM) diff --git a/yang-models/_3gpp-common-yang-extensions.yang b/yang-models/_3gpp-common-yang-extensions.yang index 7a5e13f62..d98af752c 100755 --- a/yang-models/_3gpp-common-yang-extensions.yang +++ b/yang-models/_3gpp-common-yang-extensions.yang @@ -7,8 +7,8 @@ module _3gpp-common-yang-extensions { description "The module defines YANG extensions needed 3GPP YANG modeling. - Copyright 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, - TTA, TTC) 2019-2023. All rights reserved. + Copyright 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + TTA, TTC). All rights reserved. Extensions MUST be defined with the following structure in the description statement: diff --git a/yang-models/_3gpp-common-yang-types.yang b/yang-models/_3gpp-common-yang-types.yang index a02c219a4..b454dde8e 100755 --- a/yang-models/_3gpp-common-yang-types.yang +++ b/yang-models/_3gpp-common-yang-types.yang @@ -12,8 +12,8 @@ module _3gpp-common-yang-types { description "The model defines a YANG mapping of the top level information classes used for management of 5G networks and network slicing. - Copyright 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, - TTA, TTC) 2019-2023. All rights reserved."; + Copyright 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + TTA, TTC). All rights reserved."; reference "3GPP TS 28.623"; revision 2023-09-17 { reference CR-0270 ; } diff --git a/yang-models/_3gpp-nr-nrm-beam.yang b/yang-models/_3gpp-nr-nrm-beam.yang index cf161f83c..ba721133e 100755 --- a/yang-models/_3gpp-nr-nrm-beam.yang +++ b/yang-models/_3gpp-nr-nrm-beam.yang @@ -14,8 +14,8 @@ module _3gpp-nr-nrm-beam { contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464"; description "Defines the YANG mapping of the Beam Information Object Class (IOC) that is part of the NR Network Resource Model (NRM). - Copyright 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, - TTA, TTC) 2019-2023. All rights reserved."; + Copyright 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + TTA, TTC). All rights reserved."; reference "3GPP TS 28.541 5G Network Resource Model (NRM)"; revision 2023-09-17 { reference CR-1042 ; } diff --git a/yang-models/_3gpp-nr-nrm-bwp.yang b/yang-models/_3gpp-nr-nrm-bwp.yang index 038ed4c57..2504390da 100755 --- a/yang-models/_3gpp-nr-nrm-bwp.yang +++ b/yang-models/_3gpp-nr-nrm-bwp.yang @@ -12,8 +12,8 @@ module _3gpp-nr-nrm-bwp { contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464"; description "Defines the YANG mapping of the BWP Information Object Class (IOC) that is part of the NR Network Resource Model (NRM). - Copyright 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, - TTA, TTC) 2019-2023. All rights reserved."; + Copyright 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + TTA, TTC). All rights reserved."; reference "3GPP TS 28.541 5G Network Resource Model (NRM)"; revision 2023-09-17 { reference CR-1042 ; } diff --git a/yang-models/_3gpp-nr-nrm-cesmanagementfunction.yang b/yang-models/_3gpp-nr-nrm-cesmanagementfunction.yang index 2a312c5b5..b67906797 100755 --- a/yang-models/_3gpp-nr-nrm-cesmanagementfunction.yang +++ b/yang-models/_3gpp-nr-nrm-cesmanagementfunction.yang @@ -15,8 +15,8 @@ module _3gpp-nr-nrm-cesmanagementfunction { description "Defines the YANG mapping of the CESManagementFunction Information Object Class (IOC) that is part of the NR Network Resource Model (NRM). - Copyright 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, - TTA, TTC) 2019-2023. All rights reserved."; + Copyright 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + TTA, TTC). All rights reserved."; reference "3GPP TS 28.541 5G Network Resource Model (NRM)"; revision 2023-09-17 { reference CR-1042 ; } diff --git a/yang-models/_3gpp-nr-nrm-commonbeamformingfunction.yang b/yang-models/_3gpp-nr-nrm-commonbeamformingfunction.yang index a9e17a303..a751d19bc 100755 --- a/yang-models/_3gpp-nr-nrm-commonbeamformingfunction.yang +++ b/yang-models/_3gpp-nr-nrm-commonbeamformingfunction.yang @@ -13,8 +13,8 @@ module _3gpp-nr-nrm-commonbeamformingfunction { 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). - Copyright 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, - TTA, TTC) 2019-2023. All rights reserved."; + Copyright 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + TTA, TTC). All rights reserved."; reference "3GPP TS 28.541 5G Network Resource Model (NRM)"; revision 2023-09-17 { reference CR-1042 ; } diff --git a/yang-models/_3gpp-nr-nrm-cpciconfigurationfunction.yang b/yang-models/_3gpp-nr-nrm-cpciconfigurationfunction.yang index a72c586f2..b19b7afca 100755 --- a/yang-models/_3gpp-nr-nrm-cpciconfigurationfunction.yang +++ b/yang-models/_3gpp-nr-nrm-cpciconfigurationfunction.yang @@ -13,8 +13,8 @@ module _3gpp-nr-nrm-cpciconfigurationfunction { contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464"; description "Represents the CPCIConfigurationFunction Information Object Class(IOC) that is part of the NR Network Resource Model. - Copyright 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, - TTA, TTC) 2019-2023. All rights reserved."; + Copyright 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + TTA, TTC). All rights reserved."; reference "3GPP TS 28.541 5G Network Resource Model (NRM)"; revision 2023-09-17 { reference CR-1042 ; } diff --git a/yang-models/_3gpp-nr-nrm-danrmanagementfunction.yang b/yang-models/_3gpp-nr-nrm-danrmanagementfunction.yang index 7473a729b..32a9a3032 100755 --- a/yang-models/_3gpp-nr-nrm-danrmanagementfunction.yang +++ b/yang-models/_3gpp-nr-nrm-danrmanagementfunction.yang @@ -14,8 +14,8 @@ module _3gpp-nr-nrm-danrmanagementfunction { contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464"; description "Defines the YANG mapping of the DANRManagementFunction Information Object Class (IOC) that is part of the NR Network Resource Model (NRM). - Copyright 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, - TTA, TTC) 2019-2023. All rights reserved."; + Copyright 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + TTA, TTC). All rights reserved."; reference "3GPP TS 28.541 5G Network Resource Model (NRM)"; revision 2023-09-17 { reference CR-1042 ; } diff --git a/yang-models/_3gpp-nr-nrm-desmanagementfunction.yang b/yang-models/_3gpp-nr-nrm-desmanagementfunction.yang index f9bca8aba..ba2e00ec4 100755 --- a/yang-models/_3gpp-nr-nrm-desmanagementfunction.yang +++ b/yang-models/_3gpp-nr-nrm-desmanagementfunction.yang @@ -15,8 +15,8 @@ module _3gpp-nr-nrm-desmanagementfunction { description "Defines the YANG mapping of the DESManagementFunction Information Object Class (IOC) that is part of the NR Network Resource Model (NRM). - Copyright 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, - TTA, TTC) 2019-2023. All rights reserved."; + Copyright 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + TTA, TTC). All rights reserved."; reference "3GPP TS 28.541 5G Network Resource Model (NRM)"; revision 2023-09-17 { reference CR-1042 ; } diff --git a/yang-models/_3gpp-nr-nrm-dlbofunction.yang b/yang-models/_3gpp-nr-nrm-dlbofunction.yang index 013239169..4cc7cb246 100644 --- a/yang-models/_3gpp-nr-nrm-dlbofunction.yang +++ b/yang-models/_3gpp-nr-nrm-dlbofunction.yang @@ -14,8 +14,8 @@ module _3gpp-nr-nrm-dlbofunction { description "Defines the YANG mapping of the DLBOFunction Information Object Class (IOC) that is part of the NR Network Resource Model (NRM). - Copyright 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, - TTA, TTC) 2019-2023. All rights reserved."; + Copyright 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + TTA, TTC). All rights reserved."; reference "3GPP TS 28.541 5G Network Resource Model (NRM)"; revision 2023-09-17 { reference CR-1042 ; } diff --git a/yang-models/_3gpp-nr-nrm-dmrofunction.yang b/yang-models/_3gpp-nr-nrm-dmrofunction.yang index 05169e0e5..2d2012ec2 100755 --- a/yang-models/_3gpp-nr-nrm-dmrofunction.yang +++ b/yang-models/_3gpp-nr-nrm-dmrofunction.yang @@ -14,8 +14,8 @@ module _3gpp-nr-nrm-dmrofunction { description "Defines the YANG mapping of the DMROFunction Information Object Class (IOC) that is part of the NR Network Resource Model (NRM). - Copyright 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, - TTA, TTC) 2019-2023. All rights reserved."; + Copyright 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + TTA, TTC). All rights reserved."; reference "3GPP TS 28.541 5G Network Resource Model (NRM)"; revision 2023-09-17 { reference CR-1042 ; } diff --git a/yang-models/_3gpp-nr-nrm-dpciconfigurationfunction.yang b/yang-models/_3gpp-nr-nrm-dpciconfigurationfunction.yang index 23400743a..052e5cfa2 100755 --- a/yang-models/_3gpp-nr-nrm-dpciconfigurationfunction.yang +++ b/yang-models/_3gpp-nr-nrm-dpciconfigurationfunction.yang @@ -15,8 +15,8 @@ module _3gpp-nr-nrm-dpciconfigurationfunction { description "Defines the YANG mapping of the DPCIConfigurationFunction Information Object Class (IOC) that is part of the NR Network Resource Model (NRM). - Copyright 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, - TTA, TTC) 2019-2023. All rights reserved."; + Copyright 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + TTA, TTC). All rights reserved."; reference "3GPP TS 28.541 5G Network Resource Model (NRM)"; revision 2023-09-17 { reference CR-1042 ; } diff --git a/yang-models/_3gpp-nr-nrm-drachoptimizationfunction.yang b/yang-models/_3gpp-nr-nrm-drachoptimizationfunction.yang index 0ba8dbab5..55c1b68a2 100755 --- a/yang-models/_3gpp-nr-nrm-drachoptimizationfunction.yang +++ b/yang-models/_3gpp-nr-nrm-drachoptimizationfunction.yang @@ -14,8 +14,8 @@ module _3gpp-nr-nrm-drachoptimizationfunction { description "Defines the YANG mapping of the DRACHOptimizationFunction Information Object Class (IOC) that is part of the NR Network Resource Model (NRM). - Copyright 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, - TTA, TTC) 2019-2023. All rights reserved."; + Copyright 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + TTA, TTC). All rights reserved."; reference "3GPP TS 28.541 5G Network Resource Model (NRM)"; revision 2023-09-17 { reference CR-1042 ; } diff --git a/yang-models/_3gpp-nr-nrm-ep.yang b/yang-models/_3gpp-nr-nrm-ep.yang index 0d9190fad..201390fc2 100755 --- a/yang-models/_3gpp-nr-nrm-ep.yang +++ b/yang-models/_3gpp-nr-nrm-ep.yang @@ -15,8 +15,8 @@ module _3gpp-nr-nrm-ep { description "Defines the YANG mapping of the NR related endpoint Information Object Classes (IOCs) that are part of the NR Network Resource Model (NRM). - Copyright 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, - TTA, TTC) 2019-2023. All rights reserved."; + Copyright 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + TTA, TTC). All rights reserved."; reference "3GPP TS 28.541 5G Network Resource Model (NRM)"; revision 2023-09-17 { reference CR-1042 ; } diff --git a/yang-models/_3gpp-nr-nrm-eutrancellrelation.yang b/yang-models/_3gpp-nr-nrm-eutrancellrelation.yang index 9d39e9980..01fd6b14c 100755 --- a/yang-models/_3gpp-nr-nrm-eutrancellrelation.yang +++ b/yang-models/_3gpp-nr-nrm-eutrancellrelation.yang @@ -13,8 +13,8 @@ module _3gpp-nr-nrm-eutrancellrelation { contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464"; description "Defines the YANG mapping of the EUtranCellRelation Information Object Class (IOC) that is part of the NR Network Resource Model (NRM). - Copyright 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, - TTA, TTC) 2019-2023. All rights reserved."; + Copyright 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + TTA, TTC). All rights reserved."; reference "3GPP TS 28.541 5G Network Resource Model (NRM)"; revision 2023-09-17 { reference CR-1042 ; } diff --git a/yang-models/_3gpp-nr-nrm-eutranetwork.yang b/yang-models/_3gpp-nr-nrm-eutranetwork.yang index 3dc8193bd..817dd6abd 100755 --- a/yang-models/_3gpp-nr-nrm-eutranetwork.yang +++ b/yang-models/_3gpp-nr-nrm-eutranetwork.yang @@ -9,8 +9,8 @@ module _3gpp-nr-nrm-eutranetwork { organization "3GPP SA5"; description "Defines the YANG mapping of the EUtraNetwork Information Object Class (IOC) that is part of the NR Network Resource Model (NRM). - Copyright 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, - TTA, TTC) 2019-2023. All rights reserved."; + Copyright 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + TTA, TTC). All rights reserved."; reference "3GPP TS 28.541 5G Network Resource Model (NRM)"; revision 2023-09-17 { reference CR-1042 ; } diff --git a/yang-models/_3gpp-nr-nrm-eutranfreqrelation.yang b/yang-models/_3gpp-nr-nrm-eutranfreqrelation.yang index 7444790e2..5eb39ca13 100755 --- a/yang-models/_3gpp-nr-nrm-eutranfreqrelation.yang +++ b/yang-models/_3gpp-nr-nrm-eutranfreqrelation.yang @@ -13,8 +13,8 @@ module _3gpp-nr-nrm-eutranfreqrelation { contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464"; description "Defines the YANG mapping of the EUtranFreqRelation Information Object Class (IOC) that is part of the NR Network Resource Model (NRM). - Copyright 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, - TTA, TTC) 2019-2023. All rights reserved."; + Copyright 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + TTA, TTC). All rights reserved."; reference "3GPP TS 28.541 5G Network Resource Model (NRM)"; revision 2023-09-17 { reference CR-1042 ; } diff --git a/yang-models/_3gpp-nr-nrm-eutranfrequency.yang b/yang-models/_3gpp-nr-nrm-eutranfrequency.yang index 5bbf68840..f31c81c87 100755 --- a/yang-models/_3gpp-nr-nrm-eutranfrequency.yang +++ b/yang-models/_3gpp-nr-nrm-eutranfrequency.yang @@ -11,8 +11,8 @@ module _3gpp-nr-nrm-eutranfrequency { organization "3GPP SA5"; description "Defines the YANG mapping of the EUtranFrequency Information Object Class (IOC), that is part of the NR Network Resource Model (NRM). - Copyright 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, - TTA, TTC) 2019-2023. All rights reserved."; + Copyright 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + TTA, TTC). All rights reserved."; reference "3GPP TS 28.541 5G Network Resource Model (NRM), 3GPP TS 28.658 (E-UTRAN) Network Resource Model (NRM)"; diff --git a/yang-models/_3gpp-nr-nrm-externalamffunction.yang b/yang-models/_3gpp-nr-nrm-externalamffunction.yang index aac6c9af2..f89874f59 100755 --- a/yang-models/_3gpp-nr-nrm-externalamffunction.yang +++ b/yang-models/_3gpp-nr-nrm-externalamffunction.yang @@ -12,8 +12,8 @@ module _3gpp-nr-nrm-externalamffunction { organization "3GPP SA5"; description "Defines the YANG mapping of the ExternalAMFFunction Information Object Class (IOC) that is part of the NR Network Resource Model (NRM). - Copyright 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, - TTA, TTC) 2019-2023. All rights reserved."; + Copyright 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + TTA, TTC). All rights reserved."; reference "3GPP TS 28.541 5G Network Resource Model (NRM)"; revision 2023-09-17 { reference CR-1042 ; } diff --git a/yang-models/_3gpp-nr-nrm-externalenbfunction.yang b/yang-models/_3gpp-nr-nrm-externalenbfunction.yang index b66726267..1635258d1 100755 --- a/yang-models/_3gpp-nr-nrm-externalenbfunction.yang +++ b/yang-models/_3gpp-nr-nrm-externalenbfunction.yang @@ -12,8 +12,8 @@ module _3gpp-nr-nrm-externalenbfunction { description "Defines the YANG mapping of the ExternalENBFunction Information Object Class (IOC) that is part of the NR Network Resource Model (NRM). - Copyright 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, - TTA, TTC) 2019-2023. All rights reserved."; + Copyright 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + TTA, TTC). All rights reserved."; reference "3GPP TS 28.541 5G Network Resource Model (NRM), 3GPP TS 28.658 (E-UTRAN) Network Resource Model (NRM)"; diff --git a/yang-models/_3gpp-nr-nrm-externaleutrancell.yang b/yang-models/_3gpp-nr-nrm-externaleutrancell.yang index 9788adfc3..45d8a7c74 100755 --- a/yang-models/_3gpp-nr-nrm-externaleutrancell.yang +++ b/yang-models/_3gpp-nr-nrm-externaleutrancell.yang @@ -14,8 +14,8 @@ module _3gpp-nr-nrm-externaleutrancell { description "Defines the YANG mapping of the ExternalEUtranCellFDD and ExternalEUtranCellTDD Information Object Classes (IOCs) that are part of the NR Network Resource Model (NRM). - Copyright 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, - TTA, TTC) 2019-2023. All rights reserved."; + Copyright 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + TTA, TTC). All rights reserved."; reference "3GPP TS 28.541 5G Network Resource Model (NRM), 3GPP TS 28.658 (E-UTRAN) Network Resource Model (NRM)"; diff --git a/yang-models/_3gpp-nr-nrm-externalgnbcucpfunction.yang b/yang-models/_3gpp-nr-nrm-externalgnbcucpfunction.yang index 52c7f0a2d..b2169505b 100755 --- a/yang-models/_3gpp-nr-nrm-externalgnbcucpfunction.yang +++ b/yang-models/_3gpp-nr-nrm-externalgnbcucpfunction.yang @@ -13,8 +13,8 @@ module _3gpp-nr-nrm-externalgnbcucpfunction { description "Defines the YANG mapping of the ExternalGNBCUCPFunction Information Object Class (IOC), that is part of the NR Network Resource Model (NRM). - Copyright 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, - TTA, TTC) 2019-2023. All rights reserved."; + Copyright 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + TTA, TTC). All rights reserved."; reference "3GPP TS 28.541 5G Network Resource Model (NRM)"; revision 2023-09-17 { reference CR-1042 ; } diff --git a/yang-models/_3gpp-nr-nrm-externalgnbcuupfunction.yang b/yang-models/_3gpp-nr-nrm-externalgnbcuupfunction.yang index ddf52fdb2..0c3752035 100755 --- a/yang-models/_3gpp-nr-nrm-externalgnbcuupfunction.yang +++ b/yang-models/_3gpp-nr-nrm-externalgnbcuupfunction.yang @@ -12,8 +12,8 @@ module _3gpp-nr-nrm-externalgnbcuupfunction { description "Defines the YANG mapping of the ExternalGNBCUUPFunction Information Object Class (IOC), that is part of the NR Network Resource Model (NRM). - Copyright 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, - TTA, TTC) 2019-2023. All rights reserved."; + Copyright 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + TTA, TTC). All rights reserved."; reference "3GPP TS 28.541 5G Network Resource Model (NRM)"; revision 2023-09-17 { reference CR-1042 ; } diff --git a/yang-models/_3gpp-nr-nrm-externalgnbdufunction.yang b/yang-models/_3gpp-nr-nrm-externalgnbdufunction.yang index fa4f179d3..2d7475195 100755 --- a/yang-models/_3gpp-nr-nrm-externalgnbdufunction.yang +++ b/yang-models/_3gpp-nr-nrm-externalgnbdufunction.yang @@ -14,8 +14,8 @@ module _3gpp-nr-nrm-externalgnbdufunction { description "Defines the YANG mapping of the ExternalGNBDUFunction Information Object Class (IOC) that is part of the NR Network Resource Model (NRM). - Copyright 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, - TTA, TTC) 2019-2023. All rights reserved."; + Copyright 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + TTA, TTC). All rights reserved."; reference "3GPP TS 28.541 5G Network Resource Model (NRM)"; revision 2023-09-17 { reference CR-1042 ; } diff --git a/yang-models/_3gpp-nr-nrm-externalnrcellcu.yang b/yang-models/_3gpp-nr-nrm-externalnrcellcu.yang index 14c33d109..78cde3f83 100755 --- a/yang-models/_3gpp-nr-nrm-externalnrcellcu.yang +++ b/yang-models/_3gpp-nr-nrm-externalnrcellcu.yang @@ -13,8 +13,8 @@ module _3gpp-nr-nrm-externalnrcellcu { organization "3GPP SA5"; description "Defines the YANG mapping of the ExternalNRCellCU Information Object Class (IOC), that is part of the NR Network Resource Model (NRM). - Copyright 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, - TTA, TTC) 2019-2023. All rights reserved."; + Copyright 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + TTA, TTC). All rights reserved."; reference "3GPP TS 28.541 5G Network Resource Model (NRM)"; revision 2023-09-17 { reference CR-1042 ; } diff --git a/yang-models/_3gpp-nr-nrm-externalservinggwfunction.yang b/yang-models/_3gpp-nr-nrm-externalservinggwfunction.yang index 1de089fe3..dba94db27 100755 --- a/yang-models/_3gpp-nr-nrm-externalservinggwfunction.yang +++ b/yang-models/_3gpp-nr-nrm-externalservinggwfunction.yang @@ -12,8 +12,8 @@ module _3gpp-nr-nrm-externalservinggwfunction { description "Defines the YANG mapping of the ExternalServingGWFunction Information Object Class (IOC) that is part of the NR Network Resource Model (NRM). - Copyright 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, - TTA, TTC) 2019-2023. All rights reserved."; + Copyright 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + TTA, TTC). All rights reserved."; reference "3GPP TS 28.541 5G Network Resource Model (NRM)"; revision 2023-09-17 { reference CR-1042 ; } diff --git a/yang-models/_3gpp-nr-nrm-externalupffunction.yang b/yang-models/_3gpp-nr-nrm-externalupffunction.yang index e6278836e..6a12c97f7 100755 --- a/yang-models/_3gpp-nr-nrm-externalupffunction.yang +++ b/yang-models/_3gpp-nr-nrm-externalupffunction.yang @@ -11,8 +11,8 @@ module _3gpp-nr-nrm-externalupffunction { organization "3GPP SA5"; description "Defines the YANG mapping of the ExternalUPFFunction Information Object Class (IOC) that is part of the NR Network Resource Model (NRM). - Copyright 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, - TTA, TTC) 2019-2023. All rights reserved."; + Copyright 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + TTA, TTC). All rights reserved."; reference "3GPP TS 28.541 5G Network Resource Model (NRM)"; revision 2023-09-17 { reference CR-1042 ; } diff --git a/yang-models/_3gpp-nr-nrm-gnbcucpfunction.yang b/yang-models/_3gpp-nr-nrm-gnbcucpfunction.yang index b8840b5dc..8122bcc3b 100755 --- a/yang-models/_3gpp-nr-nrm-gnbcucpfunction.yang +++ b/yang-models/_3gpp-nr-nrm-gnbcucpfunction.yang @@ -13,8 +13,8 @@ module _3gpp-nr-nrm-gnbcucpfunction { contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464"; description "Defines the YANG mapping of the GNBCUCPFunction Information Object Class (IOC) that is part of the NR Network Resource Model (NRM). - Copyright 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, - TTA, TTC) 2019-2023. All rights reserved."; + Copyright 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + TTA, TTC). All rights reserved."; reference "3GPP TS 28.541 5G Network Resource Model (NRM)"; revision 2023-09-17 { reference CR-1042 ; } diff --git a/yang-models/_3gpp-nr-nrm-gnbcuupfunction.yang b/yang-models/_3gpp-nr-nrm-gnbcuupfunction.yang index b48cb954e..50d06eea3 100755 --- a/yang-models/_3gpp-nr-nrm-gnbcuupfunction.yang +++ b/yang-models/_3gpp-nr-nrm-gnbcuupfunction.yang @@ -14,8 +14,8 @@ module _3gpp-nr-nrm-gnbcuupfunction { contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464"; description "Defines the YANG mapping of the GNBCUUPFunction Information Object Class (IOC) that is part of the NR Network Resource Model (NRM). - Copyright 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, - TTA, TTC) 2019-2023. All rights reserved."; + Copyright 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + TTA, TTC). All rights reserved."; reference "3GPP TS 28.541 5G Network Resource Model (NRM)"; revision 2023-09-17 { reference CR-1042 ; } diff --git a/yang-models/_3gpp-nr-nrm-gnbdufunction.yang b/yang-models/_3gpp-nr-nrm-gnbdufunction.yang index b54db62a8..2f622b87f 100755 --- a/yang-models/_3gpp-nr-nrm-gnbdufunction.yang +++ b/yang-models/_3gpp-nr-nrm-gnbdufunction.yang @@ -13,8 +13,8 @@ module _3gpp-nr-nrm-gnbdufunction { contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464"; description "Defines the YANG mapping of the GNBDUFunction Information Object Class (IOC) that is part of the NR Network Resource Model (NRM). - Copyright 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, - TTA, TTC) 2019-2023. All rights reserved."; + Copyright 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + TTA, TTC). All rights reserved."; reference "3GPP TS 28.541 5G Network Resource Model (NRM)"; revision 2023-09-17 { reference CR-1042 ; } diff --git a/yang-models/_3gpp-nr-nrm-nrcellcu.yang b/yang-models/_3gpp-nr-nrm-nrcellcu.yang index 0462f35a4..2e622741d 100755 --- a/yang-models/_3gpp-nr-nrm-nrcellcu.yang +++ b/yang-models/_3gpp-nr-nrm-nrcellcu.yang @@ -14,8 +14,8 @@ module _3gpp-nr-nrm-nrcellcu { contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464"; description "Defines the YANG mapping of the NRCellCU Information Object Class (IOC) that is part of the NR Network Resource Model (NRM). - Copyright 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, - TTA, TTC) 2019-2023. All rights reserved."; + Copyright 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + TTA, TTC). All rights reserved."; reference "3GPP TS 28.541 5G Network Resource Model (NRM)"; revision 2023-09-17 { reference CR-1042 ; } diff --git a/yang-models/_3gpp-nr-nrm-nrcelldu.yang b/yang-models/_3gpp-nr-nrm-nrcelldu.yang index 1fd8cbcf5..6e6235a97 100755 --- a/yang-models/_3gpp-nr-nrm-nrcelldu.yang +++ b/yang-models/_3gpp-nr-nrm-nrcelldu.yang @@ -15,8 +15,8 @@ module _3gpp-nr-nrm-nrcelldu { contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464"; description "Defines the YANG mapping of the NRCellDU Information Object Class (IOC) that is part of the NR Network Resource Model (NRM). - Copyright 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, - TTA, TTC) 2019-2023. All rights reserved."; + Copyright 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + TTA, TTC). All rights reserved."; reference "3GPP TS 28.541 5G Network Resource Model (NRM)"; revision 2023-09-17 { reference CR-1042 ; } diff --git a/yang-models/_3gpp-nr-nrm-nrcellrelation.yang b/yang-models/_3gpp-nr-nrm-nrcellrelation.yang index b5843b500..0378efee8 100755 --- a/yang-models/_3gpp-nr-nrm-nrcellrelation.yang +++ b/yang-models/_3gpp-nr-nrm-nrcellrelation.yang @@ -13,8 +13,8 @@ module _3gpp-nr-nrm-nrcellrelation { organization "3GPP SA5"; description "Defines the YANG mapping of the NRCellRelation Information Object Class (IOC) that is part of the NR Network Resource Model (NRM). - Copyright 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, - TTA, TTC) 2019-2023. All rights reserved."; + Copyright 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + TTA, TTC). All rights reserved."; reference "3GPP TS 28.541 5G Network Resource Model (NRM)"; revision 2023-09-17 { reference CR-1042 ; } diff --git a/yang-models/_3gpp-nr-nrm-nrfreqrelation.yang b/yang-models/_3gpp-nr-nrm-nrfreqrelation.yang index f9fa3edeb..7cd7a7ac9 100755 --- a/yang-models/_3gpp-nr-nrm-nrfreqrelation.yang +++ b/yang-models/_3gpp-nr-nrm-nrfreqrelation.yang @@ -13,8 +13,8 @@ module _3gpp-nr-nrm-nrfreqrelation { organization "3GPP SA5"; description "Defines the YANG mapping of the NRFreqRelation Information Object Class (IOC) that is part of the NR Network Resource Model (NRM). - Copyright 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, - TTA, TTC) 2019-2023. All rights reserved."; + Copyright 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + TTA, TTC). All rights reserved."; reference "3GPP TS 28.541 5G Network Resource Model (NRM)"; revision 2023-09-17 { reference CR-1042 ; } diff --git a/yang-models/_3gpp-nr-nrm-nrfrequency.yang b/yang-models/_3gpp-nr-nrm-nrfrequency.yang index a3a5ad10b..32ca67ff4 100755 --- a/yang-models/_3gpp-nr-nrm-nrfrequency.yang +++ b/yang-models/_3gpp-nr-nrm-nrfrequency.yang @@ -11,8 +11,8 @@ module _3gpp-nr-nrm-nrfrequency { organization "3GPP SA5"; description "Defines the YANG mapping of the NRFrequency Information Object Class (IOC) that is part of the NR Network Resource Model (NRM). - Copyright 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, - TTA, TTC) 2019-2023. All rights reserved."; + Copyright 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + TTA, TTC). All rights reserved."; reference "3GPP TS 28.541 5G Network Resource Model (NRM)"; revision 2023-09-17 { reference CR-1042 ; } diff --git a/yang-models/_3gpp-nr-nrm-nrnetwork.yang b/yang-models/_3gpp-nr-nrm-nrnetwork.yang index 5ef823917..8f9b5a9e6 100755 --- a/yang-models/_3gpp-nr-nrm-nrnetwork.yang +++ b/yang-models/_3gpp-nr-nrm-nrnetwork.yang @@ -9,8 +9,8 @@ module _3gpp-nr-nrm-nrnetwork { organization "3GPP SA5"; description "Defines the YANG mapping of the NRNetwork Information Object Class (IOC) that is part of the NR Network Resource Model (NRM). - Copyright 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, - TTA, TTC) 2019-2023. All rights reserved."; + Copyright 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + TTA, TTC). All rights reserved."; reference "3GPP TS 28.541 5G Network Resource Model (NRM)"; revision 2023-09-17 { reference CR-1042 ; } diff --git a/yang-models/_3gpp-nr-nrm-nroperatorcelldu.yang b/yang-models/_3gpp-nr-nrm-nroperatorcelldu.yang index 5e7874cea..6b0e15d66 100755 --- a/yang-models/_3gpp-nr-nrm-nroperatorcelldu.yang +++ b/yang-models/_3gpp-nr-nrm-nroperatorcelldu.yang @@ -14,8 +14,8 @@ module _3gpp-nr-nrm-nroperatorcelldu { contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464"; description "Defines the YANG mapping of the OperatorDU Information Object Class (IOC) that is part of the NR Network Resource Model (NRM). - Copyright 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, - TTA, TTC) 2021-2023. All rights reserved."; + Copyright 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + TTA, TTC). All rights reserved."; reference "3GPP TS 28.541 5G Network Resource Model (NRM)"; revision 2023-09-17 { reference CR-1042 ; } diff --git a/yang-models/_3gpp-nr-nrm-nrsectorcarrier.yang b/yang-models/_3gpp-nr-nrm-nrsectorcarrier.yang index 31d74e94e..fa893e902 100755 --- a/yang-models/_3gpp-nr-nrm-nrsectorcarrier.yang +++ b/yang-models/_3gpp-nr-nrm-nrsectorcarrier.yang @@ -13,8 +13,8 @@ module _3gpp-nr-nrm-nrsectorcarrier { contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464"; description "Defines the YANG mapping of the NRSectorCarrier Information Object Class (IOC) that is part of the NR Network Resource Model (NRM). - Copyright 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, - TTA, TTC) 2019-2023. All rights reserved."; + Copyright 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + TTA, TTC). All rights reserved."; reference "3GPP TS 28.541 5G Network Resource Model (NRM)"; revision 2023-09-17 { reference CR-1042 ; } diff --git a/yang-models/_3gpp-nr-nrm-operatordu.yang b/yang-models/_3gpp-nr-nrm-operatordu.yang index 9086e5003..bcc2163d1 100755 --- a/yang-models/_3gpp-nr-nrm-operatordu.yang +++ b/yang-models/_3gpp-nr-nrm-operatordu.yang @@ -11,8 +11,8 @@ module _3gpp-nr-nrm-operatordu { contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464"; description "Defines the YANG mapping of the OperatorDU Information Object Class (IOC) that is part of the NR Network Resource Model (NRM). - Copyright 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, - TTA, TTC) 2021-2023. All rights reserved."; + Copyright 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + TTA, TTC). All rights reserved."; reference "3GPP TS 28.541 5G Network Resource Model (NRM)"; revision 2023-09-17 { reference CR-1042 ; } diff --git a/yang-models/_3gpp-nr-nrm-rimrsset.yang b/yang-models/_3gpp-nr-nrm-rimrsset.yang index a53615aa7..776b20fc9 100755 --- a/yang-models/_3gpp-nr-nrm-rimrsset.yang +++ b/yang-models/_3gpp-nr-nrm-rimrsset.yang @@ -11,8 +11,8 @@ module _3gpp-nr-nrm-rimrsset { contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464"; description "Defines the YANG mapping of the RimRSSet Information Object Class (IOC) that is part of the NR Network Resource Model (NRM). - Copyright 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, - TTA, TTC) 2021-2023. All rights reserved."; + Copyright 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + TTA, TTC). All rights reserved."; reference "3GPP TS 28.541 5G Network Resource Model (NRM)"; revision 2023-09-17 { reference CR-1042 ; } diff --git a/yang-models/_3gpp-nr-nrm-rrmpolicy.yang b/yang-models/_3gpp-nr-nrm-rrmpolicy.yang index 840f3e79f..4e597786e 100755 --- a/yang-models/_3gpp-nr-nrm-rrmpolicy.yang +++ b/yang-models/_3gpp-nr-nrm-rrmpolicy.yang @@ -16,8 +16,8 @@ module _3gpp-nr-nrm-rrmpolicy { contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464"; description "Defines the YANG mapping of the RRMPolicy abstract class that is part of the NR Network Resource Model (NRM). - Copyright 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, - TTA, TTC) 2020-2023. All rights reserved."; + Copyright 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + TTA, TTC). All rights reserved."; reference "3GPP TS 28.541 5G Network Resource Model (NRM)"; revision 2023-09-17 { reference CR-1042 ; } diff --git a/yang-models/_3gpp-ns-nrm-common.yang b/yang-models/_3gpp-ns-nrm-common.yang index b69df8f70..2fde9d802 100755 --- a/yang-models/_3gpp-ns-nrm-common.yang +++ b/yang-models/_3gpp-ns-nrm-common.yang @@ -11,8 +11,8 @@ module _3gpp-ns-nrm-common { contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464"; description "Common network slice definitions - Copyright 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, - TTA, TTC) 2021-2023. All rights reserved."; + Copyright 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + TTA, TTC). All rights reserved."; reference "3GPP TS 28.541 Management and orchestration; 5G Network Resource Model (NRM); diff --git a/yang-models/_3gpp-ns-nrm-networkslice.yang b/yang-models/_3gpp-ns-nrm-networkslice.yang index ae2ab34a6..f882a2cb0 100755 --- a/yang-models/_3gpp-ns-nrm-networkslice.yang +++ b/yang-models/_3gpp-ns-nrm-networkslice.yang @@ -13,8 +13,8 @@ module _3gpp-ns-nrm-networkslice { contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464"; description "A network slice instance in a 5G network. - Copyright 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, - TTA, TTC) 2020-2023. All rights reserved."; + Copyright 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + TTA, TTC). All rights reserved."; reference "3GPP TS 28.541 Management and orchestration; 5G Network Resource Model (NRM); diff --git a/yang-models/_3gpp-ns-nrm-networkslicesubnet.yang b/yang-models/_3gpp-ns-nrm-networkslicesubnet.yang index 468576b7b..a8078873e 100755 --- a/yang-models/_3gpp-ns-nrm-networkslicesubnet.yang +++ b/yang-models/_3gpp-ns-nrm-networkslicesubnet.yang @@ -15,8 +15,8 @@ module _3gpp-ns-nrm-networkslicesubnet { "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464"; description "This IOC represents the properties of a network slice subnet instance in a 5G network. - Copyright 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, - TTA, TTC) 2019-2023. All rights reserved."; + Copyright 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + TTA, TTC). All rights reserved."; reference "3GPP TS 28.541 Management and orchestration; 5G Network Resource Model (NRM); diff --git a/yang-models/_3gpp-ns-nrm-serviceprofile.yang b/yang-models/_3gpp-ns-nrm-serviceprofile.yang index 0c85af17a..c2f3a7971 100755 --- a/yang-models/_3gpp-ns-nrm-serviceprofile.yang +++ b/yang-models/_3gpp-ns-nrm-serviceprofile.yang @@ -10,8 +10,8 @@ submodule _3gpp-ns-nrm-serviceprofile { contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464"; description "A network slice instance in a 5G network. - Copyright 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, - TTA, TTC) 2020-2023. All rights reserved."; + Copyright 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + TTA, TTC). All rights reserved."; reference "3GPP TS 28.541 Management and orchestration; 5G Network Resource Model (NRM); diff --git a/yang-models/_3gpp-ns-nrm-sliceprofile.yang b/yang-models/_3gpp-ns-nrm-sliceprofile.yang index 27031c4b3..3bd9e7627 100755 --- a/yang-models/_3gpp-ns-nrm-sliceprofile.yang +++ b/yang-models/_3gpp-ns-nrm-sliceprofile.yang @@ -13,8 +13,8 @@ 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 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, - TTA, TTC) 2019-2023. All rights reserved."; + Copyright 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + TTA, TTC). All rights reserved."; reference "3GPP TS 28.541 Management and orchestration; 5G Network Resource Model (NRM); -- GitLab From b60a08eba5cb858ce4328d215dbddbc872628616 Mon Sep 17 00:00:00 2001 From: "U-ERICSSON\\ETHBLL" Date: Tue, 17 Oct 2023 19:45:50 +0800 Subject: [PATCH 08/17] merge_requests/806 locally merged; TS28.623_Rel17_CR0277_Clarify_MnS_scope_definition_for_ME_yang --- yang-models/_3gpp-common-mnsregistry.yang | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/yang-models/_3gpp-common-mnsregistry.yang b/yang-models/_3gpp-common-mnsregistry.yang index ce5d285bc..d5d355d1c 100755 --- a/yang-models/_3gpp-common-mnsregistry.yang +++ b/yang-models/_3gpp-common-mnsregistry.yang @@ -15,7 +15,8 @@ module _3gpp-common-mnsregistry { TTA, TTC). All rights reserved."; reference "3GPP TS 28.623 Generic Network Resource Model (NRM)"; - revision 2023-09-17 { reference CR-0270 ; } + revision 2023-09-29 { reference CR0277; } + revision 2023-09-17 { reference CR0270 ; } revision 2023-09-09 { reference CR0242; } revision 2023-07-25 { reference CR00252; } revision 2021-11-23 { reference "S5-216090"; } @@ -55,7 +56,10 @@ module _3gpp-common-mnsregistry { description "List of the managed object instances that can be accessed using the MnS. If a complete SubNetwork can be accessed using the MnS, this attribute may contain the DN of the SubNetwork instead of the - DNs of the individual managed entities within the SubNetwork."; + DNs of the individual managed entities within the SubNetwork. If a + complete ManagedElement can be accessed using the MnS, this attribute + may contain the DN of the ManagedElement instead of the DNs of the + individual managed entities within the ManagedElement."; min-elements 1; type types3gpp:DistinguishedName; } @@ -69,7 +73,7 @@ module _3gpp-common-mnsregistry { key id; max-elements 1; - list MNSInfo { + list MnsInfo { description "This IOC represents an available Management Service (MnS) and provides the data required to support its discovery. It is name-contained by MnsRegistry. -- GitLab From 6888bbe8e6214182a678ee5aa0fc16c08727c397 Mon Sep 17 00:00:00 2001 From: "U-ERICSSON\\ETHBLL" Date: Mon, 13 Nov 2023 23:28:18 +0100 Subject: [PATCH 09/17] added ecmconnectioninfo --- yang-models/_3gpp-5gc-ecmconnectioninfo.yang | 252 ++++++++++++++++++ yang-models/_3gpp-common-managed-element.yang | 11 + yang-models/_3gpp-common-subnetwork.yang | 11 + yang-models/_3gpp-common-yang-types.yang | 50 +++- yang-models/_3gpp-nr-nrm-operatordu.yang | 16 +- 5 files changed, 336 insertions(+), 4 deletions(-) create mode 100644 yang-models/_3gpp-5gc-ecmconnectioninfo.yang diff --git a/yang-models/_3gpp-5gc-ecmconnectioninfo.yang b/yang-models/_3gpp-5gc-ecmconnectioninfo.yang new file mode 100644 index 000000000..75fdfe54e --- /dev/null +++ b/yang-models/_3gpp-5gc-ecmconnectioninfo.yang @@ -0,0 +1,252 @@ +module _3gpp-5gc-ecmconnectioninfo { + yang-version 1.1; + namespace "urn:3gpp:sa5:_3gpp-5gc-ecmconnectioninfo"; + prefix "econn3gpp"; + + import ietf-inet-types { prefix inet; } + import _3gpp-common-top { prefix top3gpp; } + import _3gpp-common-yang-types { prefix types3gpp; } + + organization "3GPP SA5"; + contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464"; + description "Defines the YANG mapping of the EcmConnectionInfo Information + Object Class (IOC) that is part of the NR Network Resource Model (NRM). + Copyright 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + TTA, TTC). All rights reserved."; + reference "3GPP TS 28.541 5G Network Resource Model (NRM)"; + + revision 2023-11-05 { reference CR-1131 ; } + + grouping GeoLocGrp { + description "This datatype represent the geographical location."; + reference "3GPP 28.538 clause 6.3.4"; + + list geographicalCoordinates { + description "This refers to the Topological Service Area, + (see clause 7.3.3.2 in TS 23.558) that is defined as a datatype + (see clause 6.3.8)."; + key latitude; + max-elements 1; + uses types3gpp:GeographicalCoordinates; + } + + leaf civicLocations { + type string; + } + } + + grouping TopologicalServiceAreaGrp { + description "This datatype represents the topological service area."; + reference "3GPP TS 28.538 clause 6.3.7"; + + leaf-list cellIDList { + description "It represents the list of NR cells. + + The cell ID, together with the gNB Identifier (using gNBId of the + parent GNBCUCPFunction or GNBDUFunction or ExternalCUCPFunction), + identifies a NR cell within a PLMN. This is the NR Cell Identity(NCI). + See subclause 8.2 of TS 38.300"; + type int32; + } + + list trackingAreaIdList { + description "It represents the list of tracking areas within a PLMN."; + min-elements 1; + key idx; + + leaf idx { type uint32; } + uses types3gpp:TaiGrp; + } + + list servingPLMN { + description "It specifies the PLMN to be served."; + max-elements 1; + key idx; + + leaf idx { type uint32; } + uses types3gpp:PLMNId; + } + } + + grouping ServingLocationGrp { + description "This datatype represents the location which is to be served + by the node."; + reference "3GPP TS 28.536 clause 6.3.3"; + + list geographicalLocation { + description "This refers to the Geographical Service Area, + (see clause 7.3.3.3 in TS 23.558 that is defined as a datatype + (see clause 6.3.4)."; + max-elements 1; + key idx; + + leaf idx { type uint32; } + uses GeoLocGrp; + } + + list topologicalLocation { + description "This refers to the Topological Service Area, + (see clause 7.3.3.2 in TS 23.558) that is defined as a datatype + (see clause 6.3.7). "; + max-elements 1; + key idx; + + leaf idx { type uint32; } + uses TopologicalServiceAreaGrp; + } + } + + grouping _5GCNfConnEcmInfoGrp { + description "This data type specifies the 5GC NF connection information."; + + leaf _5GCNFType { + type enumeration { + enum PCF; + enum NEF; + enum SCEF; + } + description "It indicates the type of a NF instance."; + } + + leaf _5GCNFIpAddress { + type inet:host; + mandatory true; + description "This parameter defines address of a NF instance, + It can be IP address (either IPv4 address (See RFC 791) or + IPv6 address (See RFC 2373) or FQDN (See TS 23.003). "; + } + + + leaf _5GCNFRef { + type types3gpp:DistinguishedName; + description "This attribute holds the DN of a NF instance."; + } + } + + grouping UPFConnInfoGrp { + description "This data type specifies the UPF connection information."; + + leaf uPFIpAddress { + type inet:host; + description "This parameter defines address of an UPF instance, + It can be IP address (either IPv4 address (See RFC 791) or + IPv6 address (See RFC 2373) or FQDN (See TS 23.003). "; + } + + leaf uPFRef { + type types3gpp:DistinguishedName; + description "This attribute holds the DN of an UPF instance."; + } + } + + grouping EcmConnectionInfoGrp { + description "Represents the EcmConnectionInfo IOC."; + + list eASServiceArea { + description "This parameter defines the EAS service area + (see clause 7.3.3.6 in TS 23.558)."; + min-elements 1; + max-elements 1; + key idx; + leaf idx { type uint32 ; } + uses ServingLocationGrp; + } + + list eESServiceArea { + description "This parameter defines the EES service area + (see clause 7.3.3.5 in TS 23.558)."; + min-elements 1; + max-elements 1; + key idx; + leaf idx { type uint32 ; } + uses ServingLocationGrp; + } + + list eDNServiceArea { + description "This parameter defines the EDN service area + (see clause 7.3.3.4 in TS 23.558)"; + min-elements 1; + max-elements 1; + key idx; + leaf idx { type uint32 ; } + uses ServingLocationGrp; + } + + leaf eASIpAddress { + type inet:ip-address; + mandatory true; + description "This parameter defines address of an EAS instance. + It can be IP address (either IPv4 address (See RFC 791) or IPv6 + address (See RFC 2373)."; + } + + leaf eESIpAddress { + type inet:ip-address; + mandatory true; + description "This parameter defines address of an EES instance. + It can be IP address (either IPv4 address (See RFC 791) or IPv6 + address (See RFC 2373). "; + } + + leaf eCSIpAddress { + type inet:ip-address; + mandatory true; + description "This parameter defines address of an ECS instance. + It can be IP address (either IPv4 address (See RFC 791) or IPv6 + address (See RFC 2373)."; + } + + leaf ednIdentifier { + type string; + description "The identifier of the edge data network (See TS 23.558)."; + } + + leaf ecmConnectionType { + type enumeration { + enum USERPLANE; + enum CONTROLPLANE; + enum BOTH; + } + description "It indicates the type of ECM connection (i.e., user plane + connection via UPF, control plane connection via PCF or NEF."; + } + + list _5GCNfConnEcmInfoList { + description "The attribute specifies a list of 5GCNfConnInfo which is + defined as a datatype (see clause 5.3.120). It is used to + provide 5GC NFs, such as PCF, NEF, SCEF, that are connected EDN NFs, + such as EAS, EES, and ECS."; + config false; + min-elements 1; + key idx; + leaf idx { type uint32 ; } + uses _5GCNfConnEcmInfoGrp; + } + + list uPFConnectionInfo { + description "The attribute is defined as a datatype UPFConnInfo + (see clause 5.3.121). It is used to provide the UPF IP address and + UPF DN. "; + config false; + min-elements 1; + key idx; + leaf idx { type uint32 ; } + uses UPFConnInfoGrp; + } + } + + grouping EcmConnectionInfoSubtree { + description "Subtree containing EcmConnectionInfo."; + + list EcmConnectionInfo { + description "This IOC contains attributes to enable ECSP management + system to connect EDN NFs (i.e., EAS, ECS, and EES) to 5GC NFs + (i.e. UPF, PCF, NEF, SCEF) (See clause 7.4.3 and 7.4.4 in TS 28.538). "; + key id; + uses top3gpp:Top_Grp; + container attributes { + uses EcmConnectionInfoGrp; + } + } + } +} \ No newline at end of file diff --git a/yang-models/_3gpp-common-managed-element.yang b/yang-models/_3gpp-common-managed-element.yang index 38d8f7040..69b9f3251 100755 --- a/yang-models/_3gpp-common-managed-element.yang +++ b/yang-models/_3gpp-common-managed-element.yang @@ -11,6 +11,7 @@ module _3gpp-common-managed-element { import _3gpp-common-trace { prefix trace3gpp; } import _3gpp-common-files { prefix files3gpp; } import _3gpp-5gc-nrm-configurable5qiset { prefix fiveqi3gpp; } + import _3gpp-5gc-ecmconnectioninfo { prefix econn3gpp ; } organization "3GPP SA5"; contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464"; @@ -32,6 +33,7 @@ module _3gpp-common-managed-element { 3GPP TS 28.620 Umbrella Information Model (UIM)"; + revision 2023-11-05 { reference CR-0306 ; } revision 2023-09-17 { reference CR-0270 ; } revision 2022-07-26 { reference CR-0180 ; } revision 2021-01-16 { reference "CR-0120"; } @@ -43,6 +45,11 @@ module _3gpp-common-managed-element { revision 2019-06-17 { reference " S5-203316"; } revision 2019-05-08 { reference "Initial revision"; } + feature EcmConnectionInfoUnderManagedElement { + description "The EcmConnectionInfo shall be contained under + ManagedElement"; + } + feature Configurable5QISetUnderManagedElement { description "The Configurable5QISet shall be contained under ManagedElement"; @@ -281,5 +288,9 @@ module _3gpp-common-managed-element { uses fiveqi3gpp:Configurable5QISetSubtree { if-feature Configurable5QISetUnderManagedElement; } + + uses econn3gpp:EcmConnectionInfoSubtree { + if-feature EcmConnectionInfoUnderManagedElement; + } } } \ No newline at end of file diff --git a/yang-models/_3gpp-common-subnetwork.yang b/yang-models/_3gpp-common-subnetwork.yang index 89ca61fc2..ea698414a 100755 --- a/yang-models/_3gpp-common-subnetwork.yang +++ b/yang-models/_3gpp-common-subnetwork.yang @@ -12,6 +12,7 @@ module _3gpp-common-subnetwork { import ietf-yang-schema-mount { prefix yangmnt; } import _3gpp-common-files { prefix files3gpp; } import _3gpp-5gc-nrm-configurable5qiset { prefix fiveqi3gpp; } + import _3gpp-5gc-ecmconnectioninfo { prefix econn3gpp ; } organization "3GPP SA5"; contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464"; @@ -32,6 +33,7 @@ module _3gpp-common-subnetwork { 3GPP TS 28.620 Umbrella Information Model (UIM)"; + revision 2023-11-05 { reference CR-0306 ; } revision 2023-09-17 { reference CR-0270 ; } revision 2022-07-26 { reference CR-0180 ; } revision 2021-01-16 { reference "CR-0120"; } @@ -55,6 +57,11 @@ module _3gpp-common-subnetwork { reference "Initial revision"; } + feature EcmConnectionInfoUnderSubNetwork { + description "The EcmConnectionInfo shall be contained under + Subnetwork"; + } + feature Configurable5QISetUnderSubNetwork { description "The Configurable5QISet shall be contained under Subnetwork"; @@ -240,6 +247,10 @@ module _3gpp-common-subnetwork { if-feature Configurable5QISetUnderSubNetwork; } + uses econn3gpp:EcmConnectionInfoSubtree { + if-feature EcmConnectionInfoUnderSubNetwork; + } + yangmnt:mount-point children-of-SubNetwork { description "Mountpoint for ManagedElement"; reference "RFC8528 YANG Schema Mount"; diff --git a/yang-models/_3gpp-common-yang-types.yang b/yang-models/_3gpp-common-yang-types.yang index b454dde8e..26b7a1ad7 100755 --- a/yang-models/_3gpp-common-yang-types.yang +++ b/yang-models/_3gpp-common-yang-types.yang @@ -16,6 +16,7 @@ module _3gpp-common-yang-types { TTA, TTC). All rights reserved."; reference "3GPP TS 28.623"; + revision 2023-11-05 { reference CR-0306 ; } revision 2023-09-17 { reference CR-0270 ; } revision 2023-08-09 { reference CR-0265; } revision 2023-05-09 { reference CR-0249; } @@ -251,6 +252,35 @@ module _3gpp-common-yang-types { } description "Longitude values"; } + + typedef Altitude { + type decimal64 { + fraction-digits 6; + } + units "meters"; + description + "Height from a reference 0 value."; + } + + grouping GeographicalCoordinates { + description "This datatype represents the geographical coordinates"; + reference "#GPP TS 28.558 clause 6.3.8"; + + leaf latitude { + type Latitude; + mandatory true; + } + + leaf longitude { + type Longitude; + mandatory true; + } + + leaf altitude { + type Altitude; + } + + } typedef OnOff { type enumeration { @@ -409,7 +439,7 @@ module _3gpp-common-yang-types { mandatory true; type Mnc; } - reference "TS 23.658"; + reference "TS 38.413 clause 9.3.3.5"; } typedef Nci { @@ -714,6 +744,22 @@ module _3gpp-common-yang-types { type uint16; } } + grouping TaiGrp { + description "This <> defines a Tracking Area Identity (TAI) + as specified in clause 28.6 of TS 23.003, clause 8.2 of TS 38.300 + and clause 9.3.3.11 of TS 38.413. It is composed of the PLMN + identifier (PLMN-Id, which is composed of the MCC and MNC) and + the Tracking Area Code (TAC). "; + list plmnId { + description "PLMN Identity."; + min-elements 1; + max-elements 1; + key "mcc mnc"; + uses types3gpp:PLMNId; + } + + leaf tac { type Tac; } + } /* DistinguishedName pattern is built up based on the EBNF in 32.300 clause 7.3 EBNF of DN String Representation @@ -758,7 +804,7 @@ module _3gpp-common-yang-types { pattern '[A-Z][^,=+<>#;\\"\r\n*.]*|([A-Z][^,=+<>#;\\"\r\n*.]*\.[a-z][^,=+<>#;\\"\r\n*.]*)'; } } - leaf RegularAttributeValue { type string { // ( AttributeValueChar – SpaceChar ) , [ { AttributeValueChar } , ( AttributeValueChar – SpaceChar ) ] + leaf RegularAttributeValue { type string { // ( AttributeValueChar - SpaceChar ) , [ { AttributeValueChar } , ( AttributeValueChar - SpaceChar ) ] pattern '([^,=+<>#;\\"\r\n* ]|(\\[a-fA-F0-9]{2}))(([^,=+<>#;\\"\r\n*]|(\\[a-fA-F0-9]{2}))*([^,=+<>#;\\"\r\n* ]|(\\[a-fA-F0-9]{2})))?' ; } } diff --git a/yang-models/_3gpp-nr-nrm-operatordu.yang b/yang-models/_3gpp-nr-nrm-operatordu.yang index bcc2163d1..721c06674 100755 --- a/yang-models/_3gpp-nr-nrm-operatordu.yang +++ b/yang-models/_3gpp-nr-nrm-operatordu.yang @@ -15,6 +15,7 @@ module _3gpp-nr-nrm-operatordu { TTA, TTC). All rights reserved."; reference "3GPP TS 28.541 5G Network Resource Model (NRM)"; + revision 2023-11-05 { reference CR-1131 ; } revision 2023-09-17 { reference CR-1042 ; } revision 2021-10-01 { reference "Initial revision"; } @@ -34,8 +35,19 @@ module _3gpp-nr-nrm-operatordu { augment "/me3gpp:ManagedElement/gnbdu3gpp:GNBDUFunction" { list OperatorDU { - description "Contains attributes to support the 5G MOCN network sharing."; - reference "3GPP TS 28.541"; + description "This IOC contains attributes to support operator specific + gNB-DU level information to support the NG-RAN Multi-Operator Core + Network (NG-RAN MOCN) network sharing with multiple Cell Identity + broadcast feature. An instance of OperatorDU <> should be created + and configured for each POP. When configured the attributes override + those in parent GNBDUFunction instance. + + The OperatorDU <> is only used to support NG-RAN MOCN with + multiple cell identity broadcast feature. If NG-RAN MOCN with multiple + cell identity broadcast feature is not supported, is not used. + For scenarios with an F1 interface supporting multiple PLMN broadcast, + the values of the EP_F1C and EP_F1U attributes contained by different + OperatorDU of the same GNBDUFunction should be same."; key id; uses top3gpp:Top_Grp; container attributes { -- GitLab From 0e8be29acb6bc96d6efadc21a0b56fbc3937ce5e Mon Sep 17 00:00:00 2001 From: "U-ERICSSON\\ETHBLL" Date: Tue, 14 Nov 2023 00:01:36 +0100 Subject: [PATCH 10/17] Update thresholdinfo --- yang-models/_3gpp-common-measurements.yang | 27 +++++++++++++++++----- 1 file changed, 21 insertions(+), 6 deletions(-) diff --git a/yang-models/_3gpp-common-measurements.yang b/yang-models/_3gpp-common-measurements.yang index c4cd4bddb..68a2b18cb 100755 --- a/yang-models/_3gpp-common-measurements.yang +++ b/yang-models/_3gpp-common-measurements.yang @@ -85,13 +85,27 @@ module _3gpp-common-measurements { vendor-specific."; } - leaf thresholdLevel { - type uint64; - mandatory true; - description "Number (key) for a single threshold in the threshold list - applicable to the monitored performance metric."; - } + leaf-list performanceMetrics { + type string; + min-elements 1; + description "List of performance metrics. + Performance metrics include measurements defined in TS 28.552 and KPIs + defined in TS 28.554 [28]. Performance metrics can also be specified + by other SDOs, or be vendor specific. Performance metrics are + identified with their names. + + For measurements defined in TS 28.552 the name is constructed as follows: + - 'family.measurementName.subcounter' for measurement types with + subcounters + - 'family.measurementName' for measurement types without subcounters + `- 'family' for measurement families + For KPIs defined in TS 28.554 [28] the name is defined in the KPI + definitions template as the component designated with e). + A name can also identify a vendor specific performance metric or a + group of vendor specific performance metrics."; + } + leaf thresholdDirection { type enumeration { enum UP; @@ -145,6 +159,7 @@ module _3gpp-common-measurements { range "0..max"; } } + must '. >= 0'; description "Hysteresis of a threshold. If this attribute is present the monitored performance metric is not compared against the threshold value as specified by the thresholdValue attribute but -- GitLab From 545b95ec1720590b2e73ac015c78273c6521d1f9 Mon Sep 17 00:00:00 2001 From: "U-ERICSSON\\ETHBLL" Date: Tue, 14 Nov 2023 00:06:23 +0100 Subject: [PATCH 11/17] Update thresholdinfo 2 --- yang-models/_3gpp-common-measurements.yang | 7 ------- 1 file changed, 7 deletions(-) diff --git a/yang-models/_3gpp-common-measurements.yang b/yang-models/_3gpp-common-measurements.yang index 68a2b18cb..2ac0e879b 100755 --- a/yang-models/_3gpp-common-measurements.yang +++ b/yang-models/_3gpp-common-measurements.yang @@ -78,13 +78,6 @@ module _3gpp-common-measurements { grouping ThresholdInfoGrp { description "Defines a single threshold level."; - leaf-list measurementTypes { - type string; - description "The Measurement type can be those specified in TS 28.552, - TS 32.404 and can be those specified by other SDOs or can be - vendor-specific."; - } - leaf-list performanceMetrics { type string; min-elements 1; -- GitLab From 2170baae2452defd0ae9d536681f92251cd61a33 Mon Sep 17 00:00:00 2001 From: "U-ERICSSON\\ETHBLL" Date: Tue, 14 Nov 2023 00:10:19 +0100 Subject: [PATCH 12/17] added missing revision info --- yang-models/_3gpp-common-measurements.yang | 1 + 1 file changed, 1 insertion(+) diff --git a/yang-models/_3gpp-common-measurements.yang b/yang-models/_3gpp-common-measurements.yang index 2ac0e879b..f8617d1dd 100755 --- a/yang-models/_3gpp-common-measurements.yang +++ b/yang-models/_3gpp-common-measurements.yang @@ -57,6 +57,7 @@ module _3gpp-common-measurements { Integration Reference Point (IRP); Information Service (IS)"; + revision 2023-11-05 { reference CR-0306 ; } revision 2023-09-17 { reference CR-0270 ; } revision 2023-02-15 { reference "CR-0239";} revision 2022-11-03 { reference "CR-0193"; } -- GitLab From 323a86732a5c64d1feb4cd0da8e81a0992520f07 Mon Sep 17 00:00:00 2001 From: "U-ERICSSON\\ETHBLL" Date: Wed, 15 Nov 2023 12:19:06 -0600 Subject: [PATCH 13/17] Corrected a reference and a multiplicity --- yang-models/_3gpp-5gc-ecmconnectioninfo.yang | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/yang-models/_3gpp-5gc-ecmconnectioninfo.yang b/yang-models/_3gpp-5gc-ecmconnectioninfo.yang index 75fdfe54e..07b5dc50e 100644 --- a/yang-models/_3gpp-5gc-ecmconnectioninfo.yang +++ b/yang-models/_3gpp-5gc-ecmconnectioninfo.yang @@ -23,7 +23,7 @@ module _3gpp-5gc-ecmconnectioninfo { list geographicalCoordinates { description "This refers to the Topological Service Area, - (see clause 7.3.3.2 in TS 23.558) that is defined as a datatype + (see clause 7.3.3.2 in TS 23.538) that is defined as a datatype (see clause 6.3.8)."; key latitude; max-elements 1; @@ -229,6 +229,7 @@ module _3gpp-5gc-ecmconnectioninfo { UPF DN. "; config false; min-elements 1; + max-elements 1; key idx; leaf idx { type uint32 ; } uses UPFConnInfoGrp; -- GitLab From d4ff982e695d2247e2ebc6d22aacad02044ec0a9 Mon Sep 17 00:00:00 2001 From: "U-ERICSSON\\ETHBLL" Date: Wed, 22 Nov 2023 17:19:30 +0100 Subject: [PATCH 14/17] Local rebasing and merging of MR924 Rel17 28.541 CR 1057 28.623 CR1130 Correction of TAI type in YANG --- yang-models/_3gpp-common-yang-types.yang | 2 +- yang-models/_3gpp-ns-nrm-sliceprofile.yang | 40 ++++++++++------------ 2 files changed, 20 insertions(+), 22 deletions(-) diff --git a/yang-models/_3gpp-common-yang-types.yang b/yang-models/_3gpp-common-yang-types.yang index 26b7a1ad7..95d93c149 100755 --- a/yang-models/_3gpp-common-yang-types.yang +++ b/yang-models/_3gpp-common-yang-types.yang @@ -16,7 +16,7 @@ module _3gpp-common-yang-types { TTA, TTC). All rights reserved."; reference "3GPP TS 28.623"; - revision 2023-11-05 { reference CR-0306 ; } + revision 2023-11-05 { reference "CR-0306 CR-1130zz" ; } revision 2023-09-17 { reference CR-0270 ; } revision 2023-08-09 { reference CR-0265; } revision 2023-05-09 { reference CR-0249; } diff --git a/yang-models/_3gpp-ns-nrm-sliceprofile.yang b/yang-models/_3gpp-ns-nrm-sliceprofile.yang index 3bd9e7627..aa5fa220c 100755 --- a/yang-models/_3gpp-ns-nrm-sliceprofile.yang +++ b/yang-models/_3gpp-ns-nrm-sliceprofile.yang @@ -18,9 +18,9 @@ submodule _3gpp-ns-nrm-sliceprofile { reference "3GPP TS 28.541 Management and orchestration; 5G Network Resource Model (NRM); - Information model definitions for network slice NRM (chapter 6) - "; - + Information model definitions for network slice NRM (chapter 6)"; + + revision 2023-11-05 { reference CR-1057 ; } revision 2023-09-17 { reference CR-1042 ; } revision 2021-07-17 { reference CR-0566 ; } revision 2021-05-05 { @@ -109,11 +109,6 @@ submodule _3gpp-ns-nrm-sliceprofile { } grouping TopSliceSubnetProfileGrp { - leaf-list coverageArea { - min-elements 1; - description "A list of TrackingAreas where the NSI can be selected."; - type types3gpp:Tac; - } leaf latency { description "The packet transmission latency (milliseconds) through the RAN, CN, and TN part of 5G network, used to evaluate @@ -311,11 +306,13 @@ submodule _3gpp-ns-nrm-sliceprofile { fraction-digits 1; } } - leaf-list coverageAreaTAList { + list coverageAreaTAList { description "A list of TrackingAreas where the NSI can be selected."; + key idx; //no obvious leaf to use as a key + leaf idx { type uint32; } //optional support min-elements 1; - type types3gpp:Tac; + uses types3gpp:TaiGrp; } leaf uEMobilityLevel { description "The mobility level of UE accessing the network slice @@ -411,11 +408,6 @@ submodule _3gpp-ns-nrm-sliceprofile { } grouping CNSliceSubnetProfileGrp { - leaf-list coverageArea { - min-elements 1; - description "A list of TrackingAreas where the NSI can be selected."; - type types3gpp:Tac; - } leaf latency { description "The packet transmission latency (milliseconds) through the RAN, CN, and TN part of 5G network, used to evaluate @@ -574,11 +566,13 @@ submodule _3gpp-ns-nrm-sliceprofile { type ns3cmn3gpp:Support-enum; } } - leaf-list coverageAreaTAList { + list coverageAreaTAList { description "A list of TrackingAreas where the NSI can be selected."; + key idx; //no obvious leaf to use as a key + leaf idx { type uint32; } //optional support min-elements 1; - type types3gpp:Tac; + uses types3gpp:TaiGrp; } leaf resourceSharingLevel { description "Specifies whether the resources to be allocated to the @@ -847,11 +841,13 @@ submodule _3gpp-ns-nrm-sliceprofile { fraction-digits 1; } } - leaf-list coverageAreaTAList { + list coverageAreaTAList { description "A list of TrackingAreas where the NSI can be selected."; + key idx; //no obvious leaf to use as a key + leaf idx { type uint32; } //optional support min-elements 1; - type types3gpp:Tac; + uses types3gpp:TaiGrp; } leaf uEMobilityLevel { description "The mobility level of UE accessing the network slice @@ -986,11 +982,13 @@ submodule _3gpp-ns-nrm-sliceprofile { type uint64; } - leaf-list coverageAreaTAList { + list coverageAreaTAList { description "A list of TrackingAreas where the NSI can be selected."; + key idx; //no obvious leaf to use as a key + leaf idx { type uint32; } //optional support min-elements 1; - type types3gpp:Tac; + uses types3gpp:TaiGrp; } leaf latency { -- GitLab From 14a7ca343bf86eaaccf0ede848558c2ae080e16a Mon Sep 17 00:00:00 2001 From: zu Date: Fri, 3 Nov 2023 17:10:58 +0000 Subject: [PATCH 15/17] Update file _3gpp-common-trace.yang --- yang-models/_3gpp-common-trace.yang | 3 +++ 1 file changed, 3 insertions(+) diff --git a/yang-models/_3gpp-common-trace.yang b/yang-models/_3gpp-common-trace.yang index a23656324..1c1dddd8e 100755 --- a/yang-models/_3gpp-common-trace.yang +++ b/yang-models/_3gpp-common-trace.yang @@ -26,6 +26,7 @@ module _3gpp-common-trace { Integration Reference Point (IRP); Information Service (IS)"; + revision 2023-11-03 { reference CR-0301 ; } revision 2023-09-17 { reference CR-0270 ; } revision 2023-07-25 { reference CR00252; } revision 2023-02-17 { reference "CR-0232"; } @@ -339,6 +340,8 @@ module _3gpp-common-trace { enum N10 ; enum N11 ; enum S5-C ; + enum N16 ; + enum N16a ; } } leaf-list SMSFInterfaces { -- GitLab From eaa2c02c8f6e09fd51ca4771490cb1cbd73864e7 Mon Sep 17 00:00:00 2001 From: "U-ERICSSON\\ETHBLL" Date: Wed, 29 Nov 2023 18:21:15 +0100 Subject: [PATCH 16/17] Locally merged MR912 based on S5-238250 --- yang-models/_3gpp-common-trace.yang | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/yang-models/_3gpp-common-trace.yang b/yang-models/_3gpp-common-trace.yang index 1c1dddd8e..e719feb99 100755 --- a/yang-models/_3gpp-common-trace.yang +++ b/yang-models/_3gpp-common-trace.yang @@ -26,7 +26,7 @@ module _3gpp-common-trace { Integration Reference Point (IRP); Information Service (IS)"; - revision 2023-11-03 { reference CR-0301 ; } + revision 2023-11-05 { reference "CR-0293 CR-0301" ; } revision 2023-09-17 { reference CR-0270 ; } revision 2023-07-25 { reference CR00252; } revision 2023-02-17 { reference "CR-0232"; } @@ -340,6 +340,7 @@ module _3gpp-common-trace { enum N10 ; enum N11 ; enum S5-C ; + enum N38 ; enum N16 ; enum N16a ; } -- GitLab From 4315b21e741ed31df3d5e95528d4fef06c8653f2 Mon Sep 17 00:00:00 2001 From: "U-ERICSSON\\ETHBLL" Date: Thu, 30 Nov 2023 02:03:32 +0100 Subject: [PATCH 17/17] Locally merged MR942 based on S5-238316 --- .../_3gpp-common-managementdatacollection.yang | 10 +++++++--- yang-models/_3gpp-common-measurements.yang | 11 ++++++----- 2 files changed, 13 insertions(+), 8 deletions(-) diff --git a/yang-models/_3gpp-common-managementdatacollection.yang b/yang-models/_3gpp-common-managementdatacollection.yang index 5c75fd889..7809dbf5e 100644 --- a/yang-models/_3gpp-common-managementdatacollection.yang +++ b/yang-models/_3gpp-common-managementdatacollection.yang @@ -27,6 +27,7 @@ module _3gpp-common-managementdatacollection { Integration Reference Point (IRP); Information Service (IS)"; + revision 2023-11-17 { reference "CR-0298"; } revision 2023-09-17 { reference CR-0270 ; } revision 2022-11-03 { reference "CR-0193"; } @@ -151,10 +152,10 @@ module _3gpp-common-managementdatacollection { leaf-list name { type string; min-elements 1; - description "The list may include metrics or set of metrics defined + description "A list of management data identified by name. + The list may include metrics or set of metrics defined in TS 28.552, TS 28.554 and TS 32.422. - The metrics are identified with their names/identifiers. For performance measurements defined in TS 28.552 the name is constructed as follows: - 'family.measurementName.subcounter' for measurement types with @@ -169,7 +170,10 @@ module _3gpp-common-managementdatacollection { For trace metrics (including trace messages, MDT measurements (Immediate MDT, Logged MDT, Logged MBSFN MDT), RLF and RCEF reports) defined in TS 32.422, the name (metric identifier) is - defined in clause 10 of TS 32.422."; + defined in clause 10 of TS 32.422. + + For non-3GPP specified management data the name is defined + elsewhere."; } } mandatory true; diff --git a/yang-models/_3gpp-common-measurements.yang b/yang-models/_3gpp-common-measurements.yang index f8617d1dd..5bc22dcb9 100755 --- a/yang-models/_3gpp-common-measurements.yang +++ b/yang-models/_3gpp-common-measurements.yang @@ -57,6 +57,7 @@ module _3gpp-common-measurements { Integration Reference Point (IRP); Information Service (IS)"; + revision 2023-11-17 { reference "CR-0298"; } revision 2023-11-05 { reference CR-0306 ; } revision 2023-09-17 { reference CR-0270 ; } revision 2023-02-15 { reference "CR-0239";} @@ -188,9 +189,9 @@ module _3gpp-common-measurements { type string; min-elements 1; description "Performance metrics include measurements defined in - TS 28.552 and KPIs defined in TS 28.554. Performance metrics can - also be specified by other SDOs or be vendor specific. - Performance metrics are identfied with their names. + TS 28.552 and KPIs defined in TS 28.554. + + Performance metrics are identified by name. For measurements defined in TS 28.552 the name is constructed as follows: @@ -202,8 +203,8 @@ module _3gpp-common-measurements { For KPIs defined in TS 28.554 the name is defined in the KPI definitions template as the component designated with e). - A name can also identify a vendor specific performance metric or a - group of vendor specific performance metrics."; + For non-3GPP specified measurements the name is defined + elsewhere."; } leaf-list granularityPeriods { -- GitLab