From e552676811ff575f009881fa8bac03778e57045c Mon Sep 17 00:00:00 2001 From: "U-ERICSSON\\ETHBLL" Date: Wed, 2 Mar 2022 14:26:47 +0100 Subject: [PATCH 01/15] 28.541_Rel17_CR0643_YANG_corrections --- .../_3gpp-5gc-nrm-FiveQiDscpMappingSet.yang | 2 +- yang-models/_3gpp-5gc-nrm-amffunction.yang | 6 ++- yang-models/_3gpp-5gc-nrm-amfregion.yang | 7 +-- yang-models/_3gpp-5gc-nrm-amfset.yang | 4 +- yang-models/_3gpp-5gc-nrm-ausffunction.yang | 4 +- .../_3gpp-5gc-nrm-configurable5qiset.yang | 13 +++--- yang-models/_3gpp-5gc-nrm-dynamic5qiset.yang | 5 ++- yang-models/_3gpp-5gc-nrm-neffunction.yang | 3 +- yang-models/_3gpp-5gc-nrm-ngeirfunction.yang | 3 +- yang-models/_3gpp-nr-nrm-beam.yang | 45 ++++++++++++------- yang-models/_3gpp-nr-nrm-ep.yang | 3 +- .../_3gpp-nr-nrm-nroperatorcelldu.yang | 2 +- yang-models/_3gpp-nr-nrm-operatordu.yang | 2 +- yang-models/_3gpp-ns-nrm-networkslice.yang | 2 +- 14 files changed, 61 insertions(+), 40 deletions(-) diff --git a/yang-models/_3gpp-5gc-nrm-FiveQiDscpMappingSet.yang b/yang-models/_3gpp-5gc-nrm-FiveQiDscpMappingSet.yang index fabfe4336..c3ebfe7a3 100755 --- a/yang-models/_3gpp-5gc-nrm-FiveQiDscpMappingSet.yang +++ b/yang-models/_3gpp-5gc-nrm-FiveQiDscpMappingSet.yang @@ -22,7 +22,7 @@ module _3gpp-5gc-nrm-FiveQiDscpMappingSet { range 0..255 ; } min-elements 1; - description " Identifies the 5QI values that are mapped to a same DSCP, as specified in TS 28.541."; + description " Identifies the 5QI values that are mapped to a same DSCP"; } leaf dscp { diff --git a/yang-models/_3gpp-5gc-nrm-amffunction.yang b/yang-models/_3gpp-5gc-nrm-amffunction.yang index 1ab54a9d3..ef7b462fa 100755 --- a/yang-models/_3gpp-5gc-nrm-amffunction.yang +++ b/yang-models/_3gpp-5gc-nrm-amffunction.yang @@ -13,8 +13,10 @@ 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."; - - revision 2020-11-05 { reference CR-0412 ; } + reference "3GPP TS 28.541 5G Network Resource Model (NRM)"; + + revision 2022-01-07 { reference CR-0643; } + revision 2020-11-06 { 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-5gc-nrm-amfregion.yang b/yang-models/_3gpp-5gc-nrm-amfregion.yang index 3746a58a6..5a9d98914 100755 --- a/yang-models/_3gpp-5gc-nrm-amfregion.yang +++ b/yang-models/_3gpp-5gc-nrm-amfregion.yang @@ -13,11 +13,12 @@ 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."; + reference "3GPP TS 28.541 5G Network Resource Model (NRM)"; - revision 2020-11-05 { reference CR-0412 ; } + revision 2022-01-07 { reference CR-0643; } + revision 2020-11-06 { reference CR-0412 ; } revision 2019-10-28 { reference S5-193518 ; } - revision 2019-06-11 { - reference "Ericsson refactoring."; } + revision 2019-06-11 { reference ""; } grouping AMFRegionGrp { description "Represents the AMFRegion IOC"; diff --git a/yang-models/_3gpp-5gc-nrm-amfset.yang b/yang-models/_3gpp-5gc-nrm-amfset.yang index 8b978160e..9394f45e4 100755 --- a/yang-models/_3gpp-5gc-nrm-amfset.yang +++ b/yang-models/_3gpp-5gc-nrm-amfset.yang @@ -13,8 +13,10 @@ 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."; + reference "3GPP TS 28.541 5G Network Resource Model (NRM)"; - revision 2020-11-05 { reference CR-0412 ; } + revision 2022-01-07 { reference CR-0643; } + revision 2020-11-06 { reference CR-0412 ; } revision 2019-10-28 { reference S5-193518 ; } revision 2019-06-11 { reference "Ericsson refactoring."; } diff --git a/yang-models/_3gpp-5gc-nrm-ausffunction.yang b/yang-models/_3gpp-5gc-nrm-ausffunction.yang index f94b6505e..526aaf86f 100755 --- a/yang-models/_3gpp-5gc-nrm-ausffunction.yang +++ b/yang-models/_3gpp-5gc-nrm-ausffunction.yang @@ -17,8 +17,8 @@ module _3gpp-5gc-nrm-ausffunction { information about the AUSF, see 3GPP TS 23.501."; reference "3GPP TS 28.541"; - - revision 2020-11-05 { reference CR-0412 ; } + revision 2022-01-07 { reference CR-0643; } + revision 2020-11-06 { reference CR-0412 ; } revision 2019-10-25 { reference "S5-194457 S5-193518"; } revision 2019-05-22 {reference "initial revision"; } diff --git a/yang-models/_3gpp-5gc-nrm-configurable5qiset.yang b/yang-models/_3gpp-5gc-nrm-configurable5qiset.yang index 6d3d7a27a..0c7674316 100755 --- a/yang-models/_3gpp-5gc-nrm-configurable5qiset.yang +++ b/yang-models/_3gpp-5gc-nrm-configurable5qiset.yang @@ -15,7 +15,8 @@ module _3gpp-5gc-nrm-configurable5qiset { (and configurable) to the 5G NFs."; reference "3GPP TS 28.541"; - revision 2020-08-03 { reference "CR-0321"; } + revision 2022-01-07 { reference CR-0643; } + revision 2020-08-04 { reference "CR-0321"; } revision 2020-06-03 { reference "CR-0286"; } grouping PacketErrorRate { @@ -41,7 +42,7 @@ module _3gpp-5gc-nrm-configurable5qiset { description "Represents the FiveQICharacteristics IOC."; reference "3GPP TS 28.541"; } - + list configurableFiveQIs { key fiveQIValue; leaf fiveQIValue { @@ -78,7 +79,6 @@ module _3gpp-5gc-nrm-configurable5qiset { list packetErrorRate { key "scalar exponent"; - min-elements 0; max-elements 1; uses PacketErrorRate; reference "TS 23.501"; @@ -109,7 +109,7 @@ module _3gpp-5gc-nrm-configurable5qiset { uses FiveQICharacteristicsGrp; } } -} + } grouping Configurable5QISetGrp { description "Represents the Configurable5QISet IOC."; @@ -120,8 +120,7 @@ module _3gpp-5gc-nrm-configurable5qiset { uses FiveQICharacteristicsGrp; } } -} - + } grouping Configurable5QISetSubtree { list Configurable5QISet { @@ -143,4 +142,4 @@ module _3gpp-5gc-nrm-configurable5qiset { augment "/me3gpp:ManagedElement" { uses Configurable5QISetSubtree; } -} +} \ No newline at end of file diff --git a/yang-models/_3gpp-5gc-nrm-dynamic5qiset.yang b/yang-models/_3gpp-5gc-nrm-dynamic5qiset.yang index 185e46f83..b19c9f6d7 100755 --- a/yang-models/_3gpp-5gc-nrm-dynamic5qiset.yang +++ b/yang-models/_3gpp-5gc-nrm-dynamic5qiset.yang @@ -15,7 +15,8 @@ module _3gpp-5gc-nrm-dynamic5qiset { characteristics."; reference "3GPP TS 28.541"; - revision 2020-09-30 { reference "CR-0393"; } + revision 2022-01-07 { reference CR-0643; } + revision 2020-10-01 { reference "CR-0393"; } revision 2020-08-06 { reference "CR-0333"; } grouping Dynamic5QISetGrp { @@ -49,4 +50,4 @@ module _3gpp-5gc-nrm-dynamic5qiset { augment "/me3gpp:ManagedElement" { uses Dynamic5QISetSubtree; } -} +} \ No newline at end of file diff --git a/yang-models/_3gpp-5gc-nrm-neffunction.yang b/yang-models/_3gpp-5gc-nrm-neffunction.yang index 7ab28015d..cdbf93c49 100755 --- a/yang-models/_3gpp-5gc-nrm-neffunction.yang +++ b/yang-models/_3gpp-5gc-nrm-neffunction.yang @@ -16,7 +16,8 @@ module _3gpp-5gc-nrm-neffunction { information about the NEF, see 3GPP TS 23.501."; reference "3GPP TS 28.541"; - revision 2020-11-05 { reference CR-0412 ; } + revision 2022-01-07 { reference CR-0643; } + revision 2020-11-06 { reference CR-0412 ; } revision 2019-10-20 { reference "initial revision"; } grouping NEFFunctionGrp { diff --git a/yang-models/_3gpp-5gc-nrm-ngeirfunction.yang b/yang-models/_3gpp-5gc-nrm-ngeirfunction.yang index 9edbd01f0..f9b7638ea 100755 --- a/yang-models/_3gpp-5gc-nrm-ngeirfunction.yang +++ b/yang-models/_3gpp-5gc-nrm-ngeirfunction.yang @@ -16,7 +16,8 @@ module _3gpp-5gc-nrm-ngeirfunction { information about the 5G-EIR, see 3GPP TS 23.501."; reference "3GPP TS 28.541"; - revision 2020-11-05 { reference CR-0412 ; } + 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"; } revision 2019-05-15 {reference "initial revision"; } diff --git a/yang-models/_3gpp-nr-nrm-beam.yang b/yang-models/_3gpp-nr-nrm-beam.yang index 95f4677b7..64cdd8dcf 100755 --- a/yang-models/_3gpp-nr-nrm-beam.yang +++ b/yang-models/_3gpp-nr-nrm-beam.yang @@ -1,6 +1,6 @@ module _3gpp-nr-nrm-beam { yang-version 1.1; - namespace "urn:3gpp:sa5:_3gpp-nr-nrm-nrnetwork-beam"; + namespace "urn:3gpp:sa5:_3gpp-nr-nrm-beam"; prefix "beam3gpp"; import _3gpp-nr-nrm-commonbeamformingfunction { prefix cbeamff3gpp; } @@ -11,6 +11,7 @@ module _3gpp-nr-nrm-beam { import _3gpp-nr-nrm-nrsectorcarrier { prefix nrsectcarr3gpp; } 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)."; reference "3GPP TS 28.541 5G Network Resource Model (NRM)"; @@ -39,23 +40,30 @@ module _3gpp-nr-nrm-beam { leaf beamType { description "The type of the beam. "; - mandatory false; type BeamType; } leaf beamAzimuth { - description "The azimuth of a beam transmission, which means the horizontal beamforming pointing angle (beam peak direction) in the (Phi) ?-axis in 1/10th degree resolution. The pointing angle is the direction equal to the geometric centre of the half-power contour of the beam relative to the reference plane. Zero degree implies explicit antenna bearing (boresight). Positive angle implies clockwise from the antenna bearing."; + description "The azimuth of a beam transmission, which means the + horizontal beamforming pointing angle (beam peak direction) in the + Phi-axis in 1/10th degree resolution. The pointing angle is the + direction equal to the geometric centre of the half-power contour + of the beam relative to the reference plane. Zero degree implies + explicit antenna bearing (boresight). Positive angle implies clockwise + from the antenna bearing."; reference "3GPP TS 38.104, TS 38.901, TS 28.662"; - mandatory false; type int32 { range "-1800..1800"; } units "0.1"; } leaf beamTilt { - description "The tilt of a beam transmission, which means the vertical beamforming pointing angle (beam peak direction) in the (Theta) ?-axis in 1/10th degree resolution. -The pointing angle is the direction equal to the geometric centre of the half-power contour of the beam relative to the reference plane. Positive value implies downtilt."; + description "The tilt of a beam transmission, which means the vertical + beamforming pointing angle (beam peak direction) in the Theta-axis in + 1/10th degree resolution. + The pointing angle is the direction equal to the geometric centre of + the half-power contour of the beam relative to the reference plane. + Positive value implies downtilt."; reference "3GPP TS 38.104, TS 38.901, TS 28.662"; - mandatory false; type int32 { range "-900..900"; } units "0.1"; } @@ -63,28 +71,33 @@ The pointing angle is the direction equal to the geometric centre of the half-po leaf beamHorizWidth { - description " The Horizontal beamWidth of a beam transmission, which means the horizontal beamforming half-power (3dB down) beamwidth in the (Phi) ?-axis in 1/10th degree resolution."; + description " The Horizontal beamWidth of a beam transmission, which + means the horizontal beamforming half-power (3dB down) beamwidth in the + Phi-axis in 1/10th degree resolution."; reference "3GPP TS 38.104, TS 38.901"; - mandatory false; type int32 { range "0..3599"; } units "0.1"; } leaf beamVertWidth { - description " The Vertical beamWidth of a beam transmission, which means the vertical beamforming half-power (3dB down) beamwidth in the (Theta) ?-axis in 1/10th degree resolution."; + description " The Vertical beamWidth of a beam transmission, which means + the vertical beamforming half-power (3dB down) beamwidth in the + Theta-axis in 1/10th degree resolution."; reference "3GPP TS 38.104, TS 38.901"; - mandatory false; type int32 { range "0..1800"; } units "0.1"; } + } - - } - - augment "/me3gpp:ManagedElement/gnbdu3gpp:GNBDUFunction/nrsectcarr3gpp:NRSectorCarrier/cbeamff3gpp:CommonBeamformingFunction" { + augment "/me3gpp:ManagedElement/gnbdu3gpp:GNBDUFunction/" + + "nrsectcarr3gpp:NRSectorCarrier/cbeamff3gpp:CommonBeamformingFunction" { list Beam { - description "Represents the per-Beam information required for, e.g. beam performance management utilizing measurements generated in the RAN. Can have spatial attributes of horizontal/azimuth (ie: Phi ?-axis) and vertical/tilt (ie: Theta ?-axis) beam pointing direction and beam width attributes."; + description "Represents the per-Beam information required for, + e.g. beam performance management utilizing measurements generated in + the RAN. Can have spatial attributes of horizontal/azimuth + (ie: Phi-axis) and vertical/tilt (ie: Theta-axis) beam pointing + direction and beam width attributes."; reference "3GPP TS 28.541"; key id; uses top3gpp:Top_Grp; diff --git a/yang-models/_3gpp-nr-nrm-ep.yang b/yang-models/_3gpp-nr-nrm-ep.yang index 2bf583e78..f36653ea7 100755 --- a/yang-models/_3gpp-nr-nrm-ep.yang +++ b/yang-models/_3gpp-nr-nrm-ep.yang @@ -17,7 +17,8 @@ module _3gpp-nr-nrm-ep { Resource Model (NRM)."; reference "3GPP TS 28.541 5G Network Resource Model (NRM)"; - revision 2021-04-30 { reference CR-0490 ; } + revision 2022-01-07 { reference CR-0643; } + revision 2021-05-01 { reference CR-0490; } revision 2021-03-03 { reference CR-0435 ; } revision 2021-02-17 { reference CR-0470; } revision 2020-11-17 { reference CR-0410 ; } diff --git a/yang-models/_3gpp-nr-nrm-nroperatorcelldu.yang b/yang-models/_3gpp-nr-nrm-nroperatorcelldu.yang index 6f8ac2d06..7b2c3f6b7 100755 --- a/yang-models/_3gpp-nr-nrm-nroperatorcelldu.yang +++ b/yang-models/_3gpp-nr-nrm-nroperatorcelldu.yang @@ -70,4 +70,4 @@ module _3gpp-nr-nrm-nroperatorcelldu { uses gnbdu3gpp:GNBDUFunctionGrp; } } -} +} \ No newline at end of file diff --git a/yang-models/_3gpp-nr-nrm-operatordu.yang b/yang-models/_3gpp-nr-nrm-operatordu.yang index f0536c43b..f0214a3bb 100755 --- a/yang-models/_3gpp-nr-nrm-operatordu.yang +++ b/yang-models/_3gpp-nr-nrm-operatordu.yang @@ -41,4 +41,4 @@ module _3gpp-nr-nrm-operatordu { uses gnbdu3gpp:GNBDUFunctionGrp; } } -} +} \ No newline at end of file diff --git a/yang-models/_3gpp-ns-nrm-networkslice.yang b/yang-models/_3gpp-ns-nrm-networkslice.yang index 22ad9c7c5..f187bd1a9 100755 --- a/yang-models/_3gpp-ns-nrm-networkslice.yang +++ b/yang-models/_3gpp-ns-nrm-networkslice.yang @@ -75,4 +75,4 @@ module _3gpp-ns-nrm-networkslice { uses top3gpp:Top_Grp; } -} +} \ No newline at end of file -- GitLab From c725f50d589fafd6a5f3756591100b549653a298 Mon Sep 17 00:00:00 2001 From: Weihong Zhu Date: Fri, 21 Jan 2022 04:06:45 +0000 Subject: [PATCH 02/15] Update _3gpp-nr-nrm-nroperatorcelldu.yang --- yang-models/_3gpp-nr-nrm-nroperatorcelldu.yang | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/yang-models/_3gpp-nr-nrm-nroperatorcelldu.yang b/yang-models/_3gpp-nr-nrm-nroperatorcelldu.yang index 7b2c3f6b7..ac3624520 100755 --- a/yang-models/_3gpp-nr-nrm-nroperatorcelldu.yang +++ b/yang-models/_3gpp-nr-nrm-nroperatorcelldu.yang @@ -30,6 +30,14 @@ module _3gpp-nr-nrm-nroperatorcelldu { type int32 { range "0..16383"; } } + leaf administrativeState { + description "Administrative state of the NROperatorCellDU. Indicates the + permission to use or prohibition against using the cell, imposed + through the OAM services."; + type types3gpp:AdministrativeState; + default LOCKED; + } + list pLMNInfoList { description "The PLMNInfoList is a list of PLMNInfo data type. It defines which PLMNs that can be served by the NR cell, and which -- GitLab From 801637d4126f45aa99dc27a09e3ab9d493ba224a Mon Sep 17 00:00:00 2001 From: "U-ERICSSON\\ETHBLL" Date: Wed, 2 Mar 2022 17:02:19 +0100 Subject: [PATCH 03/15] 28541_Rel17_CR0645_Update_RANSliceSubnetProfile_attributes_YANG --- yang-models/_3gpp-ns-nrm-sliceprofile.yang | 26 +++++++++++++++++++++- 1 file changed, 25 insertions(+), 1 deletion(-) diff --git a/yang-models/_3gpp-ns-nrm-sliceprofile.yang b/yang-models/_3gpp-ns-nrm-sliceprofile.yang index cd5247d46..c1441d45a 100755 --- a/yang-models/_3gpp-ns-nrm-sliceprofile.yang +++ b/yang-models/_3gpp-ns-nrm-sliceprofile.yang @@ -692,6 +692,18 @@ submodule _3gpp-ns-nrm-sliceprofile { mandatory true; type uint64; } + list dLThptPerSliceSubnet { + description "This attribute defines achievable data rate of the + network slice subnet in downlink that is available ubiquitously + across the coverage area of the slice"; + key idx; + max-elements 1; + leaf idx { + description "Synthetic index for the element."; + type uint32; + } + uses ns3cmn3gpp:XLThptGrp; + } list dLThptPerUE { description "This attribute defines data rate supported by the network slice per UE, refer NG.116."; @@ -703,6 +715,18 @@ submodule _3gpp-ns-nrm-sliceprofile { } uses ns3cmn3gpp:XLThptGrp; } + list uLThptPerSliceSubnet { + description "This attribute defines achievable data rate of the + network slice subnet in uplink that is available ubiquitously + across the coverage area of the slice"; + key idx; + max-elements 1; + leaf idx { + description "Synthetic index for the element."; + type uint32; + } + uses ns3cmn3gpp:XLThptGrp; + } list uLThptPerUE { description "This attribute defines data rate supported by the network slice per UE, refer NG.116"; @@ -1025,4 +1049,4 @@ submodule _3gpp-ns-nrm-sliceprofile { uses TopSliceSubnetProfileGrp; } } -} \ No newline at end of file +} -- GitLab From f80d2f96b96ac754de09514ffa1c93e55733944f Mon Sep 17 00:00:00 2001 From: "U-ERICSSON\\ETHBLL" Date: Wed, 2 Mar 2022 17:23:16 +0100 Subject: [PATCH 04/15] 28.623_Rel17_CR0146_Enhance_NRM_with_geographical_information_supporting_MDA only YANG parts --- .../_3gpp-common-managed-function.yang | 28 ++++++++++++++----- 1 file changed, 21 insertions(+), 7 deletions(-) diff --git a/yang-models/_3gpp-common-managed-function.yang b/yang-models/_3gpp-common-managed-function.yang index a46d86482..57d745917 100755 --- a/yang-models/_3gpp-common-managed-function.yang +++ b/yang-models/_3gpp-common-managed-function.yang @@ -20,7 +20,7 @@ module _3gpp-common-managed-function { 3GPP TS 28.620 Umbrella Information Model (UIM)"; - + revision 2022-01-07 { reference "CR-0146"; } revision 2021-01-25 { reference "CR-0122"; } revision 2020-09-30 { reference "CR-bbbb"; } revision 2020-08-06 { reference "CR-0102"; } @@ -129,7 +129,7 @@ module _3gpp-common-managed-function { enum DEREGISTERED; } config false; - } +} } grouping Function_Grp { @@ -233,8 +233,9 @@ module _3gpp-common-managed-function { description "The latitude of the site where the ManagedFunction instance resides, based on World Geodetic System (1984 version) global reference frame (WGS 84). Positive values correspond to - the northern hemisphere. This attribute is optional in case of - BTSFunction and RNCFunction instance(s)."; + the northern hemisphere. This attribute is optional + for BTSFunction, RNCFunction, GNBDUFunction and + NRSectorCarrier instance(s)."; } leaf siteLongitude { @@ -245,9 +246,22 @@ module _3gpp-common-managed-function { description "The longitude of the site where the ManagedFunction instance resides, based on World Geodetic System (1984 version) global reference frame (WGS 84). Positive values correspond to - degrees east of 0 degrees longitude. This attribute is optional in - case of BTSFunction and RNCFunction instance(s)."; + degrees east of 0 degrees longitude. This attribute is optional + for BTSFunction, RNCFunction, GNBDUFunction and + NRSectorCarrier + instance(s)."; } + + leaf siteAltitude { + type decimal64 { + fraction-digits 4; + } + description "The altitude of the site where the ManagedFunction + instance resides, in the unit of meter. This attribute is + optional for BTSFunction, RNCFunction, GNBDUFunction and + NRSectorCarrier instance(s)."; + } + leaf siteDescription { type string; @@ -308,4 +322,4 @@ module _3gpp-common-managed-function { if-feature TraceUnderManagedFunction ; } } -} \ No newline at end of file +} -- GitLab From 69f5bee563fe0845a0c479524e0fe58431997e73 Mon Sep 17 00:00:00 2001 From: "U-ERICSSON\\ETHBLL" Date: Mon, 3 Jan 2022 20:45:02 +0100 Subject: [PATCH 05/15] S5-221024 CR-0144 jobProgress --- yang-models/_3gpp-common-yang-types.yang | 118 +++++++++++++++++++++++ 1 file changed, 118 insertions(+) diff --git a/yang-models/_3gpp-common-yang-types.yang b/yang-models/_3gpp-common-yang-types.yang index 2a82e1b05..230ca4804 100755 --- a/yang-models/_3gpp-common-yang-types.yang +++ b/yang-models/_3gpp-common-yang-types.yang @@ -13,6 +13,7 @@ module _3gpp-common-yang-types { network slicing."; reference "3GPP TS 28.623"; + revision 2022-01-03 { reference "CR-0144"; } revision 2021-11-01 { reference "CR-0141"; } revision 2021-09-30 { description "Added Longitude, Latitude, TenthOfDegrees, OnOff."; @@ -50,6 +51,123 @@ module _3gpp-common-yang-types { } } + grouping JobProgress { + description "Provides attributes to monitor the progress of a job. + + The mandatory attributes provide an identifier and status for the + associated job. + + For jobs which are long-running or need more detailed progress or result + information other attributes, such as jobProgressInfo, can be used. + + If a management operation results in starting an assosiacted job it + should also result in the setting and updating of an attribute named + 'jobProgress' that has the type 'JobProgress'. The jobProgress + attribute should be accompanied by use-case specific additional data + items as needed."; + + leaf jobId { + type string; + config false; + mandatory true; + description "Id of the associated job. It is unique within a single + multivalue attribute of type JobProgress."; + } + + leaf jobStatus { + type enumeration { + enum RUNNING { + description "Execution of the associated job is currently in + progress"; + } + enum FINISHED { + description "The job stopped, finished succesfully"; + } + enum CANCELLING { + description "Cancellation is in progress"; + } + enum CANCELLED { + description "The job stopped, it was cancelled"; + } + enum FAILED { + description "The job stopped, but failed"; + } + enum PARTIALLY_FAILED { + description "The job stopped, partly succeeded, partly failed"; + } + } + config false; + default RUNNING; + description "Represents the status of the associated job, + whether it fails, succeeds etc. + It does not represent the returned values of a successfully finished + job. + Even a successfully finished job may report back, the task for which + it was started is unsuccessful. + E.g. a reserve-resource-job finished the reservation process + successfully, but it reports back that the resource is not available."; + } + + leaf jobProgressPercentage { + type uint8 { + range 0..100; + } + config false; + description "Progress of the associated job as percentage"; + } + + leaf-list jobProgressInfo { + type string; + config false; + description "Textual information about the state and progress + of the associated job. + Specific jobs may define specific well-defined strings to be used + in this attribute using e.g. string patterns or enums."; + } + + leaf jobResult { + type string; + config false; + description "Detailed result or reason. + Specific jobs may define specific well-defined strings to be used + in this attribute using e.g. string patterns or enums."; + } + + leaf jobStartTime { + type yang:date-and-time; + config false; + description "Date and time when associated job started."; + } + + leaf jobEndTime { + type yang:date-and-time; + config false; + description "Date and time when jobStatus changed to + FINISHED, CANCELLED, FAILED or PARTIALLY_FAILED. + If the time is in the future, it is the estimated time + the job will end."; + } + + leaf jobTimer { + type uint32; + units seconds; + description "Time until the associated job is automatically cancelled + by the provider. If set, the system decreases the jobTimer with time. + When it reaches zero the cancellation of the associated job is + initiated. If not set, there is no time limit for the job."; + } + + leaf cancelJob { + type boolean; + default false; + description "If set to True, the job is requested to be cancelled. + Once set to true, it is not possible to stop the cancellation. + Further changes to the attribute have no effect. + In case cancellation fails the job might stay in + jobStatus=CANCELLING indefinitely."; + } + } + typedef TenthOfDegrees { type uint16 { range 0..3600; -- GitLab From abeabd2cf047cbd3e18cd3b07baa697fb6214d8a Mon Sep 17 00:00:00 2001 From: "U-ERICSSON\\ETHBLL" Date: Wed, 5 Jan 2022 11:14:14 +0100 Subject: [PATCH 06/15] producer -> MnsProvider in common-yang-types --- yang-models/_3gpp-common-yang-types.yang | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/yang-models/_3gpp-common-yang-types.yang b/yang-models/_3gpp-common-yang-types.yang index 230ca4804..f461f4b50 100755 --- a/yang-models/_3gpp-common-yang-types.yang +++ b/yang-models/_3gpp-common-yang-types.yang @@ -152,7 +152,7 @@ module _3gpp-common-yang-types { type uint32; units seconds; description "Time until the associated job is automatically cancelled - by the provider. If set, the system decreases the jobTimer with time. + by the MnSProducer. If set, the system decreases the jobTimer with time. When it reaches zero the cancellation of the associated job is initiated. If not set, there is no time limit for the job."; } -- GitLab From f572db03eb5afb02d0fc3f47a7c0455a1b9f7ac9 Mon Sep 17 00:00:00 2001 From: lengyelb Date: Fri, 7 Jan 2022 17:52:26 +0000 Subject: [PATCH 07/15] Update _3gpp-common-yang-types.yang Removed config false; from jobId as that should be used as a key in a config=true list. --- yang-models/_3gpp-common-yang-types.yang | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/yang-models/_3gpp-common-yang-types.yang b/yang-models/_3gpp-common-yang-types.yang index f461f4b50..e814383b8 100755 --- a/yang-models/_3gpp-common-yang-types.yang +++ b/yang-models/_3gpp-common-yang-types.yang @@ -68,7 +68,6 @@ module _3gpp-common-yang-types { leaf jobId { type string; - config false; mandatory true; description "Id of the associated job. It is unique within a single multivalue attribute of type JobProgress."; @@ -674,4 +673,4 @@ module _3gpp-common-yang-types { } units dB; } -} \ No newline at end of file +} -- GitLab From 5eb5104ae7a80ecbfb6368005dd839aa3575ec09 Mon Sep 17 00:00:00 2001 From: "U-ERICSSON\\ETHBLL" Date: Tue, 8 Feb 2022 10:20:09 +0100 Subject: [PATCH 08/15] updates based on Nokia comments --- yang-models/_3gpp-common-yang-types.yang | 144 ++++++++++++++--------- 1 file changed, 87 insertions(+), 57 deletions(-) diff --git a/yang-models/_3gpp-common-yang-types.yang b/yang-models/_3gpp-common-yang-types.yang index e814383b8..024f5b1b2 100755 --- a/yang-models/_3gpp-common-yang-types.yang +++ b/yang-models/_3gpp-common-yang-types.yang @@ -51,49 +51,75 @@ module _3gpp-common-yang-types { } } - grouping JobProgress { + grouping JobMonitor { description "Provides attributes to monitor the progress of a job. - The mandatory attributes provide an identifier and status for the - associated job. + The attributes in this clause are defined in a generic way. + Specialisations may be provided when specifying a concrete job. + + The progess of the job is described by the 'status' and + 'progressPercentage' attributes. + + When the associated job is created, the 'status' is set to 'NOT_RUNNING' + and the 'progressPercentage' to '0'. The MnS producer decides when to + start exceting the job and to transition into the 'RUNNING' state. This + time is captured in the 'startTime' attribute. During the 'RUNNING' + state the 'progressPercentage' attribute may be repeatedly updated. The + exact semantic of this attribute is subject to further specialisation. + The 'progessInfo' attribute may be used to provide additional textual + information in the 'NOT_RUNNING', 'CANCELLING' and 'RUNNING' states. + Further specialisation of 'progressInfo' may be provided where this data + type is used. - For jobs which are long-running or need more detailed progress or result - information other attributes, such as jobProgressInfo, can be used. + Upon successful completion of the job, the 'status' attribute is set to + 'FINISHED', the 'progressPercentage' to 100%. The time is captured in the + 'endTime' attribute. Additional textual information may be provided in the + 'resultInfo' attribute. The type of 'resultInfo' in this data type + definition is 'String'. Further specialisation of 'resultInfo' may be + provided where this data type is used. + In case the job fails to complete, the 'status' attribute is set to + 'FAILURE' or - PARTIALLY_FAILED, the current value of 'progressPercentage' + is frozen, and the time captured in 'endTime'. The 'resultInfo' specifies + the reason for the failure. Specific failure reasons may be specified + where the data type defined in this clause is used. The exact semantic of + failure may be subject for further specialisation as well. + + In case the job is cancelled, the 'status' attribue is first set to + 'CANCELLING' and when the job is really cancelled to 'CANCELLED'. The + transition to 'CANCELLED' is captured in the 'endTime' attribute. + The value of 'progressPercentage' is frozen. Additional textual + information may be provided in the 'resultInfo' attribute. + + The job may have to be completed within a certain time after its creation, + for example because required data may not be available any more after a + certain time, or the job outcome is needed until a certain time and when + not provided by this time is not needed any more. The time until the MnS + producer automatically cancels the job is indicated by the 'timer' + attribute. + If a management operation results in starting an assosiacted job it should also result in the setting and updating of an attribute named - 'jobProgress' that has the type 'JobProgress'. The jobProgress - attribute should be accompanied by use-case specific additional data - items as needed."; + 'jobMonitor' that has the type 'JobMonitor'. The jobMonitor attribute + may be accompanied by use-case specific additional data items."; - leaf jobId { + leaf id { type string; mandatory true; description "Id of the associated job. It is unique within a single - multivalue attribute of type JobProgress."; + multivalue attribute of type JobMonitor."; } - leaf jobStatus { + leaf status { type enumeration { - enum RUNNING { - description "Execution of the associated job is currently in - progress"; - } - enum FINISHED { - description "The job stopped, finished succesfully"; - } - enum CANCELLING { - description "Cancellation is in progress"; - } - enum CANCELLED { - description "The job stopped, it was cancelled"; - } - enum FAILED { - description "The job stopped, but failed"; - } - enum PARTIALLY_FAILED { - description "The job stopped, partly succeeded, partly failed"; - } + enum NOT_STARTED ; + enum RUNNING ; + enum SUSPENDED ; + enum CANCELLING ; + enum FINISHED ; + enum FAILURE ; + enum PARTIALLY_FAILED ; + enum CANCELLED ; } config false; default RUNNING; @@ -107,7 +133,7 @@ module _3gpp-common-yang-types { successfully, but it reports back that the resource is not available."; } - leaf jobProgressPercentage { + leaf progressPercentage { type uint8 { range 0..100; } @@ -115,55 +141,59 @@ module _3gpp-common-yang-types { description "Progress of the associated job as percentage"; } - leaf-list jobProgressInfo { + leaf-list progressInfo { type string; config false; - description "Textual information about the state and progress - of the associated job. + description "Additional textual information about the state and progress + of the associated job. The attribute is updated during the + 'NOT_STARTED', 'CANCELLING' and 'RUNNING' states. Specific jobs may define specific well-defined strings to be used in this attribute using e.g. string patterns or enums."; } - leaf jobResult { + leaf resultInfo { type string; config false; - description "Detailed result or reason. + description "Additional textual information about the final result of + the associated job. The attribute is populated when transitioning in + the 'FINISHED', 'FAILURE', 'PARTIALLY_FAILED' or 'CANCELLED' state. + In the failure state it shall provide the failure reasons. + + This attribue shall not be used to make the outcome of the job + available for retrieval, if any. For this purpose, dedicated + attributes shall be specified when specifying a specific job. + Specific jobs may define specific well-defined strings to be used in this attribute using e.g. string patterns or enums."; } - leaf jobStartTime { + leaf startTime { type yang:date-and-time; config false; - description "Date and time when associated job started."; + description "Start time of the associated job, i.e. the time when the + status changed from 'NOT_STARTED' to 'RUNNING'."; } - leaf jobEndTime { + leaf endTime { type yang:date-and-time; config false; - description "Date and time when jobStatus changed to - FINISHED, CANCELLED, FAILED or PARTIALLY_FAILED. + description "Date and time when status changed to 'SUCCESS', 'CANCELLED', + 'FAILED' or 'PARTIALLY_FAILED'. + If the time is in the future, it is the estimated time the job will end."; } - leaf jobTimer { + leaf timer { type uint32; - units seconds; - description "Time until the associated job is automatically cancelled - by the MnSProducer. If set, the system decreases the jobTimer with time. - When it reaches zero the cancellation of the associated job is - initiated. If not set, there is no time limit for the job."; - } - - leaf cancelJob { - type boolean; - default false; - description "If set to True, the job is requested to be cancelled. - Once set to true, it is not possible to stop the cancellation. - Further changes to the attribute have no effect. - In case cancellation fails the job might stay in - jobStatus=CANCELLING indefinitely."; + units minutes; + description "Time until the associated job is automatically cancelled. + If set, the system decreases the timer with time. When it reaches zero + the cancellation of the associated job is initiated by the MnS_Producer. + If not set, there is no time limit for the job. + + Once the timer is set, the consumer can not change it anymore. + If the consumer has not set the timer the MnS Producer may set it."; } } -- GitLab From c46cd3b62da54036db8bce2106837e418f1fce20 Mon Sep 17 00:00:00 2001 From: "U-ERICSSON\\ETHBLL" Date: Tue, 8 Feb 2022 10:25:34 +0100 Subject: [PATCH 09/15] removed unneeded newline at file-end --- yang-models/_3gpp-common-yang-types.yang | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/yang-models/_3gpp-common-yang-types.yang b/yang-models/_3gpp-common-yang-types.yang index 024f5b1b2..89b8a9306 100755 --- a/yang-models/_3gpp-common-yang-types.yang +++ b/yang-models/_3gpp-common-yang-types.yang @@ -703,4 +703,4 @@ module _3gpp-common-yang-types { } units dB; } -} +} \ No newline at end of file -- GitLab From 12c1a22c0602bf68e61ffc72079c95146b2cb704 Mon Sep 17 00:00:00 2001 From: "U-ERICSSON\\ETHBLL" Date: Thu, 10 Feb 2022 17:36:03 +0100 Subject: [PATCH 10/15] CR0144 TS 221549d5 level --- yang-models/_3gpp-common-yang-types.yang | 184 ++++++++++++----------- 1 file changed, 99 insertions(+), 85 deletions(-) diff --git a/yang-models/_3gpp-common-yang-types.yang b/yang-models/_3gpp-common-yang-types.yang index 89b8a9306..625fcf3e0 100755 --- a/yang-models/_3gpp-common-yang-types.yang +++ b/yang-models/_3gpp-common-yang-types.yang @@ -13,7 +13,7 @@ module _3gpp-common-yang-types { network slicing."; reference "3GPP TS 28.623"; - revision 2022-01-03 { reference "CR-0144"; } + revision 2022-02-09 { reference "CR-0144"; } revision 2021-11-01 { reference "CR-0141"; } revision 2021-09-30 { description "Added Longitude, Latitude, TenthOfDegrees, OnOff."; @@ -51,86 +51,98 @@ module _3gpp-common-yang-types { } } - grouping JobMonitor { - description "Provides attributes to monitor the progress of a job. - + grouping ProcessMonitor { + description "Provides attributes to monitor the progress of processes + with specific purpose and limited lifetime running on MnS producers. + It may be used as data type for dedicated progress monitor attributes + when specifying the management representation of these processes. The attributes in this clause are defined in a generic way. - Specialisations may be provided when specifying a concrete job. + For some attributes specialisations may be provided when specifying a + concrete process representation. - The progess of the job is described by the 'status' and - 'progressPercentage' attributes. - - When the associated job is created, the 'status' is set to 'NOT_RUNNING' + If a management operation on some IOCs triggers an associated + asynchronous process (whose progess shall be monitored), this should + also result in creating an attribute named 'processMonitor' (of type + 'ProcessMonitor') in these IOC(s). The processMonitor attribute may be + accompanied by use-case specific additional data items. + + The progress of the process is described by the 'status' and + 'progressPercentage' attributes. Additional textual qualifications for + the 'status' attribute may be provided by the 'progessStateInfo' and + 'resultStateInfo' attributes. + + When the process is instantiated, the 'status' is set to 'NOT_RUNNING' and the 'progressPercentage' to '0'. The MnS producer decides when to - start exceting the job and to transition into the 'RUNNING' state. This - time is captured in the 'startTime' attribute. During the 'RUNNING' - state the 'progressPercentage' attribute may be repeatedly updated. The - exact semantic of this attribute is subject to further specialisation. - The 'progessInfo' attribute may be used to provide additional textual - information in the 'NOT_RUNNING', 'CANCELLING' and 'RUNNING' states. - Further specialisation of 'progressInfo' may be provided where this data - type is used. - - Upon successful completion of the job, the 'status' attribute is set to - 'FINISHED', the 'progressPercentage' to 100%. The time is captured in the - 'endTime' attribute. Additional textual information may be provided in the - 'resultInfo' attribute. The type of 'resultInfo' in this data type - definition is 'String'. Further specialisation of 'resultInfo' may be - provided where this data type is used. - - In case the job fails to complete, the 'status' attribute is set to - 'FAILURE' or - PARTIALLY_FAILED, the current value of 'progressPercentage' - is frozen, and the time captured in 'endTime'. The 'resultInfo' specifies - the reason for the failure. Specific failure reasons may be specified - where the data type defined in this clause is used. The exact semantic of - failure may be subject for further specialisation as well. - - In case the job is cancelled, the 'status' attribue is first set to - 'CANCELLING' and when the job is really cancelled to 'CANCELLED'. The - transition to 'CANCELLED' is captured in the 'endTime' attribute. + start executing the process and to transition into the 'RUNNING' state. + This time is captured in the 'startTime' attribute. Alternatively, the + process may start to execute directly upon its instantiation. One + alternative must be selected when using this data type. + + During the 'RUNNING' state the 'progressPercentage' attribute may be + repeatedly updated. The exact semantic of this attribute is subject to + further specialisation. The 'progessInfo' attribute may be used to + provide additional textual information in the 'NOT_RUNNING', 'CANCELLING' + and 'RUNNING' states. Further specialisation of + 'progressStateInfo' may be provided where this data type is + used. + + Upon successful completion of the process, the 'status' attribute is set + to 'FINISHED', the 'progressPercentage' to 100%. The time is captured in + the 'endTime' attribute. Additional textual information may be provided + in the 'resultStateInfo' attribute. The type of + 'resultStateInfo' in this data type definition is 'String'. + Further specialisation of 'resultStateInfo' may be provided + where this data type is used. + + In case the process fails to complete successfully, the 'status' + attribute is set to 'FAILED' or 'PARTIALLY_FAILED', the current value of + 'progressPercentage' is frozen, and the time captured in 'endTime'. The + 'resultStateInfo' specifies the reason for the failure. + Specific failure reasons may be specified where the data type defined in + this clause is used. The exact semantic of failure may be subject for + further specialisation as well. + + In case the process is cancelled, the 'status' attribue is first set to + 'CANCELLING' and when the process is really cancelled then to 'CANCELLED'. + The transition to 'CANCELLED' is captured in the 'endTime' attribute. The value of 'progressPercentage' is frozen. Additional textual - information may be provided in the 'resultInfo' attribute. - - The job may have to be completed within a certain time after its creation, - for example because required data may not be available any more after a - certain time, or the job outcome is needed until a certain time and when - not provided by this time is not needed any more. The time until the MnS - producer automatically cancels the job is indicated by the 'timer' - attribute. - - If a management operation results in starting an assosiacted job it - should also result in the setting and updating of an attribute named - 'jobMonitor' that has the type 'JobMonitor'. The jobMonitor attribute - may be accompanied by use-case specific additional data items."; + information may be provided in the 'resultStateInfo' attribute. + + The 'resultStateInfo' attribute is provided only for additional textual + qualification of the states 'FINISHED', 'FAILED', 'PARTIALLY_FAILED' or + 'CANCELLED'. It shall not be used for making the outcome, that the + process may produce in case of success, available. + + The process may have to be completed within a certain time after its + creation, for example because required data may not be available any + more after a certain time, or the process outcome is needed until a + certain time and when not provided by this time is not needed any more. + The time until the MnS producer automatically cancels the process is + indicated by the 'timer' attribute."; leaf id { type string; mandatory true; - description "Id of the associated job. It is unique within a single - multivalue attribute of type JobMonitor."; + description "Id of the process. It is unique within a single + multivalue attribute of type ProcessMonitor."; } leaf status { type enumeration { enum NOT_STARTED ; enum RUNNING ; - enum SUSPENDED ; enum CANCELLING ; enum FINISHED ; - enum FAILURE ; + enum FAILED ; enum PARTIALLY_FAILED ; enum CANCELLED ; } config false; default RUNNING; - description "Represents the status of the associated job, + description "Represents the status of the associated process, whether it fails, succeeds etc. It does not represent the returned values of a successfully finished - job. - Even a successfully finished job may report back, the task for which - it was started is unsuccessful. - E.g. a reserve-resource-job finished the reservation process - successfully, but it reports back that the resource is not available."; + process. "; } leaf progressPercentage { @@ -138,39 +150,40 @@ module _3gpp-common-yang-types { range 0..100; } config false; - description "Progress of the associated job as percentage"; + description "Progress of the associated process as percentage"; } - leaf-list progressInfo { + leaf-list progressStateInfo { type string; config false; - description "Additional textual information about the state and progress - of the associated job. The attribute is updated during the - 'NOT_STARTED', 'CANCELLING' and 'RUNNING' states. - Specific jobs may define specific well-defined strings to be used - in this attribute using e.g. string patterns or enums."; + description "Additional textual qualification of the states + 'NOT_STARTED', 'CANCELLING' and 'RUNNING'. + + For specific processes, specific well-defined strings (e.g. string + patterns or enums) may be defined as a specialisation."; } - leaf resultInfo { + leaf resultStateInfo { type string; config false; - description "Additional textual information about the final result of - the associated job. The attribute is populated when transitioning in - the 'FINISHED', 'FAILURE', 'PARTIALLY_FAILED' or 'CANCELLED' state. - In the failure state it shall provide the failure reasons. - - This attribue shall not be used to make the outcome of the job + description "Additional textual qualification of the states + 'FINISHED', 'FAILED', 'PARTIALLY_FAILED and 'CANCELLED'. + For example, in the 'FAILED' or 'PARTIALLY_FAILED' state this + attribute may be used to provide error reasons. + + This attribue shall not be used to make the outcome of the process available for retrieval, if any. For this purpose, dedicated - attributes shall be specified when specifying a specific job. - - Specific jobs may define specific well-defined strings to be used - in this attribute using e.g. string patterns or enums."; + attributes shall be specified when specifying the representation of + a specific process. + + For specific processes, specific well-defined strings (e.g. string + patterns or enums) may be defined as a specialisation."; } leaf startTime { type yang:date-and-time; config false; - description "Start time of the associated job, i.e. the time when the + description "Start time of the associated process, i.e. the time when the status changed from 'NOT_STARTED' to 'RUNNING'."; } @@ -181,19 +194,20 @@ module _3gpp-common-yang-types { 'FAILED' or 'PARTIALLY_FAILED'. If the time is in the future, it is the estimated time - the job will end."; + the process will end."; } leaf timer { type uint32; units minutes; - description "Time until the associated job is automatically cancelled. - If set, the system decreases the timer with time. When it reaches zero - the cancellation of the associated job is initiated by the MnS_Producer. - If not set, there is no time limit for the job. - - Once the timer is set, the consumer can not change it anymore. - If the consumer has not set the timer the MnS Producer may set it."; + description "Time until the associated process is automatically cancelled. + If set, the system decreases the timer with time. When it reaches zero + the cancellation of the associated process is initiated by the + MnS_Producer. + If not set, there is no time limit for the process. + + Once the timer is set, the consumer can not change it anymore. + If the consumer has not set the timer the MnS Producer may set it."; } } -- GitLab From 17f16082bc521f5a265806d5caf88b6f8d8333b8 Mon Sep 17 00:00:00 2001 From: "U-ERICSSON\\ETHBLL" Date: Thu, 10 Feb 2022 23:11:54 +0100 Subject: [PATCH 11/15] CR0144 TS 221549d6 level - some type corrections --- yang-models/_3gpp-common-yang-types.yang | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/yang-models/_3gpp-common-yang-types.yang b/yang-models/_3gpp-common-yang-types.yang index 625fcf3e0..18084a2eb 100755 --- a/yang-models/_3gpp-common-yang-types.yang +++ b/yang-models/_3gpp-common-yang-types.yang @@ -61,7 +61,7 @@ module _3gpp-common-yang-types { concrete process representation. If a management operation on some IOCs triggers an associated - asynchronous process (whose progess shall be monitored), this should + asynchronous process (whose progress shall be monitored), this should also result in creating an attribute named 'processMonitor' (of type 'ProcessMonitor') in these IOC(s). The processMonitor attribute may be accompanied by use-case specific additional data items. @@ -102,7 +102,7 @@ module _3gpp-common-yang-types { this clause is used. The exact semantic of failure may be subject for further specialisation as well. - In case the process is cancelled, the 'status' attribue is first set to + In case the process is cancelled, the 'status' attribute is first set to 'CANCELLING' and when the process is really cancelled then to 'CANCELLED'. The transition to 'CANCELLED' is captured in the 'endTime' attribute. The value of 'progressPercentage' is frozen. Additional textual @@ -171,7 +171,7 @@ module _3gpp-common-yang-types { For example, in the 'FAILED' or 'PARTIALLY_FAILED' state this attribute may be used to provide error reasons. - This attribue shall not be used to make the outcome of the process + This attribute shall not be used to make the outcome of the process available for retrieval, if any. For this purpose, dedicated attributes shall be specified when specifying the representation of a specific process. -- GitLab From 7869fd357e729c401adf49910f5b293d83eb2edf Mon Sep 17 00:00:00 2001 From: "U-ERICSSON\\ETHBLL" Date: Wed, 2 Mar 2022 17:50:19 +0100 Subject: [PATCH 12/15] 28.541_Rel17_CR0633_Correct_maximumDeviationHoTrigger_SA5_141_e only YANG part --- yang-models/_3gpp-nr-nrm-dmrofunction.yang | 26 ++++++++++++++-------- 1 file changed, 17 insertions(+), 9 deletions(-) diff --git a/yang-models/_3gpp-nr-nrm-dmrofunction.yang b/yang-models/_3gpp-nr-nrm-dmrofunction.yang index 2b7de1349..f56ee7012 100755 --- a/yang-models/_3gpp-nr-nrm-dmrofunction.yang +++ b/yang-models/_3gpp-nr-nrm-dmrofunction.yang @@ -16,22 +16,30 @@ module _3gpp-nr-nrm-dmrofunction { Model (NRM)."; reference "3GPP TS 28.541 5G Network Resource Model (NRM)"; + revision 2022-01-07 { reference CR-0633; } revision 2021-08-05 { reference S5-214053/CR-0518; } revision 2020-05-08 { reference S5-203316; } grouping DMROFunctionGrp { description "Represents the DMROFunction IOC."; - leaf maximumDeviationHoTrigger { - description "This parameter defines the maximum allowed absolute + + leaf maximumDeviationHoTriggerLow { + description "This parameter defines the maximum allowed lower deviation of the Handover Trigger, from the default point of - operation. Range -20 to 20 in .5 dB steps. "; - type string { - pattern '-?((20)|(1?[0-9]))\.[05]'; - // -20.0, -19.5, -19.0, ..., -0.5, 0.0, 0.5, 1.0, ... 19.5, 20.0 - } - units dB; + operation."; + type int32 {range "-20..20";} + units "0.5 dB"; } + + leaf maximumDeviationHoTriggerHigh { + description "This parameter defines the maximum allowed upper + deviation of the Handover Trigger, from the default point of + operation."; + type int32 {range "-20..20";} + units "0.5 dB"; + } + leaf minimumTimeBetweenHoTriggerChange { description "This parameter defines the minimum allowed time interval between two Handover Trigger change performed by MRO. This is used to @@ -90,4 +98,4 @@ module _3gpp-nr-nrm-dmrofunction { if-feature subnet3gpp:DMROFunction; uses DMROFunctionSubtree; } -} \ No newline at end of file +} -- GitLab From be931a5c6bbd719733932a59d61c5148424f0651 Mon Sep 17 00:00:00 2001 From: "U-ERICSSON\\ETHBLL" Date: Wed, 2 Mar 2022 18:05:15 +0100 Subject: [PATCH 13/15] 28.623_Rel17_CR0147_YANG_Add_support_for_discovery_of_managed_entities --- yang-models/_3gpp-common-mnsregistry.yang | 52 ++++++++++------------- 1 file changed, 23 insertions(+), 29 deletions(-) diff --git a/yang-models/_3gpp-common-mnsregistry.yang b/yang-models/_3gpp-common-mnsregistry.yang index 52163902b..45737c161 100755 --- a/yang-models/_3gpp-common-mnsregistry.yang +++ b/yang-models/_3gpp-common-mnsregistry.yang @@ -5,6 +5,7 @@ module _3gpp-common-mnsregistry { import _3gpp-common-subnetwork { prefix subnet3gpp; } 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"; @@ -12,6 +13,7 @@ module _3gpp-common-mnsregistry { Class (IOC) that is part of the Generic Network Resource Model (NRM)."; reference "3GPP TS 28.623 Generic Network Resource Model (NRM)"; + revision 2021-11-23 { reference "S5-216090"; } revision 2021-10-18 { reference "S5-215263"; } revision 2021-08-29 { reference "Initial revision, S5-214388"; } @@ -44,37 +46,29 @@ module _3gpp-common-mnsregistry { mandatory true; type string; } - } - - grouping MNSInfo { - description "Represents the MNSInfo IOC."; - reference "3GPP TS 28.622"; - uses top3gpp:Top_Grp; - container attributes { - uses MNSInfoGrp; - } - } - - grouping MNSRegistryGrp { - description "Represents the MNSRegistry IOC."; - reference "3GPP TS 28.622"; - uses top3gpp:Top_Grp; - } - - grouping MNSRegistry { - list mnsRegistry { - description "Represents the MNSRegistry IOC."; - reference "3GPP TS 28.622"; - uses top3gpp:Top_Grp; - key "mnsType mnsVersion mnsAddress"; - container attributes { - uses MNSInfoGrp; + + leaf-list mnsScope { + description "List of top level addresses (Root DN) of the supported 3GPP models."; + min-elements 1; + type types3gpp:DistinguishedName; } - } + } augment "/subnet3gpp:SubNetwork" { - uses MNSRegistryGrp; + list MNSRegistry { + description "Represents the MNSRegistry IOC."; + reference "3GPP TS 28.622"; + uses top3gpp:Top_Grp; + key id; + max-elements 1; + list MNSInfo { + description "Represents the MNSInfo IOC."; + reference "3GPP TS 28.622"; + uses top3gpp:Top_Grp; + key "mnsType mnsVersion mnsAddress"; + uses MNSInfoGrp; + } + } } - -} \ No newline at end of file +} -- GitLab From 6708d4c3a6fd842b8782cdcbc851dd75b9b347b3 Mon Sep 17 00:00:00 2001 From: "U-ERICSSON\\ETHBLL" Date: Wed, 2 Mar 2022 18:17:47 +0100 Subject: [PATCH 14/15] S5-221330_28.622_Rel-17_Input_to_DraftCR_Add_file_download_control_NRM_fragment --- yang-models/_3gpp-common-filemanagement.yang | 95 ++++++++++++++++++++ 1 file changed, 95 insertions(+) create mode 100644 yang-models/_3gpp-common-filemanagement.yang diff --git a/yang-models/_3gpp-common-filemanagement.yang b/yang-models/_3gpp-common-filemanagement.yang new file mode 100644 index 000000000..39dc1093f --- /dev/null +++ b/yang-models/_3gpp-common-filemanagement.yang @@ -0,0 +1,95 @@ +module _3gpp-common-filemanagement { + yang-version 1.1; + namespace "urn:3gpp:sa5:_3gpp-common-filemanagement"; + prefix "filemgmt3gpp"; + + import _3gpp-common-subnetwork { prefix subnet3gpp; } + import _3gpp-common-top { prefix top3gpp; } + import _3gpp-common-yang-types { prefix yang3gpp; } + import _3gpp-common-managed-element { prefix me3gpp; } + + organization "3GPP SA5"; + contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464"; + description "Defines the YANG mapping of the FileDownloadJob Information Object + Class (IOC) that is part of the Generic Network Resource Model (NRM)."; + reference "3GPP TS 28.623 Generic Network Resource Model (NRM)"; + + revision 2022-02-10 { reference "Initial revision, S5-221757"; } + + grouping FileDownloadProcessMonitor { + description "Provides specialisations of the ProcessMonitor datatype."; + uses yang3gpp:ProcessMonitor { + refine resultStateInfo { + description "If status is FAILED resultStateInfo will be one of + the following or empty."; + must '../status != "FAILED" + or . = "UNKNOWN" + or . = "NO_STORAGE" + or . = "LOW_MEMORY" + or . = "NO_CONNECTION_TO_REMOTE_SERVER" + or . = "FILE_NOT_AVAILABLE" + or . = "DNS_CANNOT_BE_RESOLVED" + or . = "TIMER_EXPIRED" + or . = "OTHER" + or . = "NULL" '; + } + refine status { + description "Status must not be 'PARTIALLY_FAILED'."; + must '. != "PARTIALLY_FAILED" '; + } + } + } + + grouping FileDownloadJobGrp { + description "Represents the FileDownloadJob IOC."; + reference "3GPP TS 28.622"; + uses top3gpp:Top_Grp; + + leaf fileLocation { + description "Provides the location of a file. + allowedValues: File URI (See RFC 8089)"; + mandatory true; + type string; + } + + leaf notificationRecipientAddress { + description "Address of the notification recipient."; + type string; + } + + leaf cancelJob { + description "Setting this attribute to TRUE cancels the file download job. + As specified in the definition of ProcessMonitor, cancellation is possible in + the NOT_STARTED and RUNNING state. Setting the attribute to FALSE has no + observable result."; + type boolean; + mandatory true; + } + + list jobMonitor { + key "id"; + description "Provides monitoring for the file download job."; + uses FileDownloadProcessMonitor; + } + } + + grouping FileDownloadJobSubtree { + description "Helps augmenting FileDownloadJob into multiple places."; + list FileDownloadJob { + description "Specifies the FileDownloadJob IOC, see 3GPP TS 28.622."; + key "id"; + uses top3gpp:Top_Grp; + container attributes { + uses FileDownloadJobGrp; + } + } + } + + augment "/subnet3gpp:SubNetwork" { + uses FileDownloadJobSubtree; + } + + augment "/me3gpp:ManagedElement" { + uses FileDownloadJobSubtree; + } +} -- GitLab From 50bdd5dedb97ffcb7b3f212b1642c4aed947fd68 Mon Sep 17 00:00:00 2001 From: lengyelb Date: Thu, 3 Mar 2022 13:59:48 +0000 Subject: [PATCH 15/15] Update README.md, updates only by code moderator --- README.md | 20 ++------------------ 1 file changed, 2 insertions(+), 18 deletions(-) diff --git a/README.md b/README.md index d48cceab2..ed71b17c3 100644 --- a/README.md +++ b/README.md @@ -1,19 +1,3 @@ -# Management and Orchestration - 3GPP SA Working Group 5 (SA5) +Integration branch Integration_Rel17_SA5_141_YANG -The Rel-16 branch represents the latest Rel-16 content approved and published after each TSG SA plenary. - -Rel17-draft branch represents the current working in progress release status. - -(c) 2020, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). -All rights reserved. - -Branch {+Rel17-draft+} validation status: - -[![pipeline status](https://forge.3gpp.org/rep/SA5/MnS/badges/Rel17-draft/pipeline.svg)](https://forge.3gpp.org/rep/SA5/MnS/commits/Rel17-draft) - -## Data models validation - -The YANG data models in the present projects are validated by an automated CI agent. Learn more at: - -* [Jenkins job run for this project](https://forge.3gpp.org/jenkins/view/SA5/) -* [Validation scripts repository](https://forge.3gpp.org/rep/tools/3gpp-scripts) +MUST NOT be updated by anyone except the code moderator Balazs Lengyel -- GitLab