From 9df6af541f24ea93f71f5b4e5a814aee25e2371f Mon Sep 17 00:00:00 2001 From: "U-ERICSSON\\ETHBLL" Date: Mon, 4 Apr 2022 16:43:01 +0200 Subject: [PATCH 1/2] YANG files to merge into the release branch after SA5#141e and SA#95 --- .../_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-common-filemanagement.yang | 95 +++++++++++ .../_3gpp-common-managed-function.yang | 28 ++- yang-models/_3gpp-common-mnsregistry.yang | 47 +++-- yang-models/_3gpp-common-yang-types.yang | 161 ++++++++++++++++++ yang-models/_3gpp-nr-nrm-beam.yang | 45 +++-- yang-models/_3gpp-nr-nrm-dmrofunction.yang | 26 ++- yang-models/_3gpp-nr-nrm-ep.yang | 3 +- yang-models/_3gpp-nr-nrm-gnbcucpfunction.yang | 8 +- .../_3gpp-nr-nrm-nroperatorcelldu.yang | 10 +- yang-models/_3gpp-nr-nrm-operatordu.yang | 2 +- yang-models/_3gpp-ns-nrm-networkslice.yang | 2 +- yang-models/_3gpp-ns-nrm-sliceprofile.yang | 26 ++- 21 files changed, 422 insertions(+), 78 deletions(-) create mode 100644 yang-models/_3gpp-common-filemanagement.yang 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-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; + } +} 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 +} diff --git a/yang-models/_3gpp-common-mnsregistry.yang b/yang-models/_3gpp-common-mnsregistry.yang index 2783fd385..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,13 +13,13 @@ 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"; } - - grouping MNSRegistryGrp { - description "Represents the MNSRegistry IOC."; - reference "3GPP TS 28.541"; - uses top3gpp:Top_Grp; - + + grouping MNSInfoGrp { + description "Represents the MNSInfo IOC."; + reference "3GPP TS 28.622"; leaf mnsLabel { description "Human-readable name of management service."; mandatory true; @@ -28,9 +29,10 @@ module _3gpp-common-mnsregistry { leaf mnsType { description "Type of management service."; type enumeration { - enum PROVISIONING; - enum FAULT_SUPERVISION; - enum PERFORMANCE_ASSURANCE; + enum ProvMnS; + enum FaultSupervisionMnS; + enum StreamingDataReportingMnS; + enum FileDataReportingMnS; } } @@ -44,16 +46,29 @@ module _3gpp-common-mnsregistry { mandatory true; type string; } + + 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" { + } + + augment "/subnet3gpp:SubNetwork" { list MNSRegistry { description "Represents the MNSRegistry IOC."; - key id; - uses top3gpp:Top_Grp; - container attributes { - uses MNSRegistryGrp; + 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 + } +} diff --git a/yang-models/_3gpp-common-yang-types.yang b/yang-models/_3gpp-common-yang-types.yang index 2a82e1b05..18084a2eb 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-02-09 { reference "CR-0144"; } revision 2021-11-01 { reference "CR-0141"; } revision 2021-09-30 { description "Added Longitude, Latitude, TenthOfDegrees, OnOff."; @@ -50,6 +51,166 @@ module _3gpp-common-yang-types { } } + 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. + For some attributes specialisations may be provided when specifying a + concrete process representation. + + If a management operation on some IOCs triggers an associated + 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. + + 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 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' 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 + 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 process. It is unique within a single + multivalue attribute of type ProcessMonitor."; + } + + leaf status { + type enumeration { + enum NOT_STARTED ; + enum RUNNING ; + enum CANCELLING ; + enum FINISHED ; + enum FAILED ; + enum PARTIALLY_FAILED ; + enum CANCELLED ; + } + config false; + default RUNNING; + description "Represents the status of the associated process, + whether it fails, succeeds etc. + It does not represent the returned values of a successfully finished + process. "; + } + + leaf progressPercentage { + type uint8 { + range 0..100; + } + config false; + description "Progress of the associated process as percentage"; + } + + leaf-list progressStateInfo { + type string; + config false; + 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 resultStateInfo { + type string; + config false; + 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 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. + + 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 process, i.e. the time when the + status changed from 'NOT_STARTED' to 'RUNNING'."; + } + + leaf endTime { + type yang:date-and-time; + config false; + 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 process will end."; + } + + leaf timer { + type uint32; + units minutes; + 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."; + } + } + typedef TenthOfDegrees { type uint16 { range 0..3600; 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-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 +} 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-gnbcucpfunction.yang b/yang-models/_3gpp-nr-nrm-gnbcucpfunction.yang index 39ff1b5f3..4c4cee4d6 100755 --- a/yang-models/_3gpp-nr-nrm-gnbcucpfunction.yang +++ b/yang-models/_3gpp-nr-nrm-gnbcucpfunction.yang @@ -15,8 +15,8 @@ module _3gpp-nr-nrm-gnbcucpfunction { Object Class (IOC) that is part of the NR Network Resource Model (NRM)."; reference "3GPP TS 28.541 5G Network Resource Model (NRM)"; + revision 2021-11-06 { reference "CR-0611" ; } revision 2021-11-05 { reference "CR-0609"; } - revision 2020-11-05 { reference "CR-0611" ; } revision 2020-10-02 { reference CR-0384 ; } revision 2020-08-06 { reference "CR-0333"; } revision 2020-08-03 { reference "CR-0321"; } @@ -102,8 +102,7 @@ module _3gpp-nr-nrm-gnbcucpfunction { leaf-list xnHOBlackList { type string; description "List of nodes to which handovers over Xn are prohibited."; - } - + } leaf configurable5QISetRef { type types3gpp:DistinguishedName; description "DN of the Configurable5QISet that the GNBCUCPFunction supports (is associated to)."; @@ -113,7 +112,6 @@ module _3gpp-nr-nrm-gnbcucpfunction { type string; description "List of nodes to which handovers over X2 are prohibited."; } - leaf dynamic5QISetRef { type types3gpp:DistinguishedName; description "DN of the Dynamic5QISet that the GNBCUCPFunction supports (is associated to)."; @@ -144,4 +142,4 @@ module _3gpp-nr-nrm-gnbcucpfunction { uses mf3gpp:ManagedFunctionContainedClasses; } } -} +} \ No newline at end of file diff --git a/yang-models/_3gpp-nr-nrm-nroperatorcelldu.yang b/yang-models/_3gpp-nr-nrm-nroperatorcelldu.yang index 6f8ac2d06..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 @@ -70,4 +78,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 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 3c4b46ff8cc4a298e8c19e8ed289d05ff987a8ed Mon Sep 17 00:00:00 2001 From: ruiyue Date: Mon, 11 Apr 2022 02:27:56 +0000 Subject: [PATCH 2/2] Update provMnS.yaml --- OpenAPI/provMnS.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/OpenAPI/provMnS.yaml b/OpenAPI/provMnS.yaml index 1dd467e16..b0ad8eec3 100755 --- a/OpenAPI/provMnS.yaml +++ b/OpenAPI/provMnS.yaml @@ -417,6 +417,7 @@ components: - $ref: 'nrNrm.yaml#/components/schemas/resources-nrNrm' - $ref: '5gcNrm.yaml#/components/schemas/resources-5gcNrm' - $ref: 'sliceNrm.yaml#/components/schemas/resources-sliceNrm' + - $ref: 'intentNrm.yaml#/components/schemas/resources-intentNrm' MoiChange: type: object -- GitLab