diff --git a/yang-models/_3gpp-common-fm.yang b/yang-models/_3gpp-common-fm.yang index 10ea1a9c3a3c3e51f7f04cfe5e4d49e484c7eede..c6b4d33cba5cfe459de19150e7d1781583d4ddec 100755 --- a/yang-models/_3gpp-common-fm.yang +++ b/yang-models/_3gpp-common-fm.yang @@ -1,184 +1,185 @@ module _3gpp-common-fm { - yang-version 1.1; + yang-version 1.1; namespace "urn:3gpp:sa5:_3gpp-common-fm"; prefix "fm3gpp"; - + import ietf-yang-types { prefix yang; } 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"; - + contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464"; + description "Defines a Fault Management model"; - + reference "3GPP TS 28.623 Generic Network Resource Model (NRM) Integration Reference Point (IRP); Solution Set (SS) definitions - + 3GPP TS 28.622 Generic Network Resource Model (NRM) Integration Reference Point (IRP); Information Service (IS)"; + revision 2021-06-02 { reference "CR-0130"; } revision 2020-06-03 { reference "CR-0091"; } revision 2020-02-24 { reference "S5-201365"; } - - typedef eventType { - type enumeration { - enum COMMUNICATIONS_ALARM { - value 2; - } - - enum QUALITY_OF_SERVICE_ALARM { - value 3; - } - - enum PROCESSING_ERROR_ALARM { - value 4; - } - - enum EQUIPMENT_ALARM { - value 5; - } - - enum ENVIRONMENTAL_ALARM { - value 6; - } - - enum INTEGRITY_VIOLATION { - value 7; - } - - enum OPERATIONAL_VIOLATION { - value 8; - } - - enum PHYSICAL_VIOLATIONu { - value 9; - } - - enum SECURITY_SERVICE_OR_MECHANISM_VIOLATION { - value 10; - } - - enum TIME_DOMAIN_VIOLATION { - value 11; - } - } - - description "General category for the alarm."; - } - - typedef severity-level { - type enumeration { - enum CRITICAL { value 3; } - enum MAJOR { value 4; } - enum MINOR { value 5; } - enum WARNING { value 6; } - enum INDETERMINATE { value 7; } - enum CLEARED { value 8; } - } - - description "The possible alarm serverities. - Aligned with ERICSSON-ALARM-MIB."; - } - - grouping AlarmRecordGrp { - description "Contains alarm information of an alarmed object instance. - A new record is created in the alarm list when an alarmed object - instance generates an alarm and no alarm record exists with the same - values for objectInstance, alarmType, probableCause and specificProblem. - When a new record is created the MnS producer creates an alarmId, that + + typedef eventType { + type enumeration { + enum COMMUNICATIONS_ALARM { + value 2; + } + + enum QUALITY_OF_SERVICE_ALARM { + value 3; + } + + enum PROCESSING_ERROR_ALARM { + value 4; + } + + enum EQUIPMENT_ALARM { + value 5; + } + + enum ENVIRONMENTAL_ALARM { + value 6; + } + + enum INTEGRITY_VIOLATION { + value 7; + } + + enum OPERATIONAL_VIOLATION { + value 8; + } + + enum PHYSICAL_VIOLATIONu { + value 9; + } + + enum SECURITY_SERVICE_OR_MECHANISM_VIOLATION { + value 10; + } + + enum TIME_DOMAIN_VIOLATION { + value 11; + } + } + + description "General category for the alarm."; + } + + typedef severity-level { + type enumeration { + enum CRITICAL { value 3; } + enum MAJOR { value 4; } + enum MINOR { value 5; } + enum WARNING { value 6; } + enum INDETERMINATE { value 7; } + enum CLEARED { value 8; } + } + + description "The possible alarm serverities. + Aligned with ERICSSON-ALARM-MIB."; + } + + grouping AlarmRecordGrp { + description "Contains alarm information of an alarmed object instance. + A new record is created in the alarm list when an alarmed object + instance generates an alarm and no alarm record exists with the same + values for objectInstance, alarmType, probableCause and specificProblem. + When a new record is created the MnS producer creates an alarmId, that unambiguously identifies an alarm record in the AlarmList. - Alarm records are maintained only for active alarms. Inactive alarms are - automatically deleted by the MnS producer from the AlarmList. - Active alarms are alarms whose - a) perceivedSeverity is not CLEARED, or whose - b) perceivedSeverity is CLEARED and its ackState is not ACKNOWLEDED."; - + Alarm records are maintained only for active alarms. Inactive alarms are + automatically deleted by the MnS producer from the AlarmList. + Active alarms are alarms whose + a) perceivedSeverity is not CLEARED, or whose + b) perceivedSeverity is CLEARED and its ackState is not ACKNOWLEDED."; + leaf alarmId { type string; mandatory true; description "Identifies the alarmRecord"; } - + leaf objectInstance { type string; config false ; mandatory true; } - + leaf notificationId { type string; config false ; mandatory true; } - + leaf alarmRaisedTime { type yang:date-and-time ; config false ; } - + leaf alarmChangedTime { - type yang:date-and-time ; + type yang:date-and-time ; config false ; description "not applicable if related alarm has not changed"; } - + leaf alarmClearedTime { type yang:date-and-time ; config false ; description "not applicable if related alarm was not cleared"; } - + leaf alarmType { type eventType; config false ; - description "General category for the alarm."; + description "General category for the alarm."; } - + leaf probableCause { type string; config false ; } - + leaf specificProblem { type string; config false ; reference "ITU-T Recommendation X.733 clause 8.1.2.2."; } - + leaf perceivedSeverity { type severity-level; - description "This is Writable only if producer supports consumer + description "This is Writable only if producer supports consumer to set perceivedSeverity to CLEARED"; } - + leaf backedUpStatus { type string; config false ; - description "Indicates if an object (the MonitoredEntity) has a back + description "Indicates if an object (the MonitoredEntity) has a back up. See definition in ITU-T Recommendation X.733 clause 8.1.2.4."; } - + leaf backUpObject { type string; config false ; } - + leaf trendIndication { type string; config false ; - description "Indicates if some observed condition is getting better, + description "Indicates if some observed condition is getting better, worse, or not changing. "; reference "ITU-T Recommendation X.733 clause 8.1.2.6."; } - + grouping ThresholdPackGrp { leaf thresholdLevel { type string; @@ -188,21 +189,21 @@ module _3gpp-common-fm { } leaf hysteresis { type string; - description "The hysteresis has a threshold high and a threshold - low value that are different from the threshold value. - A hysteresis, therefore, defines the threshold-high and - threshold-low levels within which the measurementType value is - allowed to oscillate without triggering the threshold crossing + description "The hysteresis has a threshold high and a threshold + low value that are different from the threshold value. + A hysteresis, therefore, defines the threshold-high and + threshold-low levels within which the measurementType value is + allowed to oscillate without triggering the threshold crossing notification."; } } - + grouping ThresholdInfoGrp { leaf measurementType { type string; mandatory true; } - + leaf direction { type enumeration { enum INCREASING; @@ -210,149 +211,149 @@ module _3gpp-common-fm { } mandatory true; description " - If it is 'Increasing', the threshold crossing notification is - triggered when the measurement value equals or exceeds a + If it is 'Increasing', the threshold crossing notification is + triggered when the measurement value equals or exceeds a thresholdValue. - - If it is 'Decreasing', the threshold crossing notification is - triggered when the measurement value equals or below a + + If it is 'Decreasing', the threshold crossing notification is + triggered when the measurement value equals or below a thresholdValue."; } - + uses ThresholdPackGrp; } - - list thresholdInfo { + + list thresholdInfo { config false ; uses ThresholdInfoGrp; } - + leaf stateChangeDefinition { type string; config false ; - description "Indicates MO attribute value changes. See definition + description "Indicates MO attribute value changes. See definition in ITU-T Recommendation X.733 clause 8.1.2.11."; } - + leaf monitoredAttributes { type string; config false ; - description "Indicates MO attributes whose value changes are being - monitored. See definition in ITU-T Recommendation X.733 clause 8.1.2.11."; + description "Indicates MO attributes whose value changes are being + monitored."; + reference "ITU-T Recommendation X.733 clause 8.1.2.11."; } - + leaf proposedRepairActions { type string; config false ; - description "Indicates proposed repair actions. See definition in + description "Indicates proposed repair actions. See definition in ITU-T Recommendation X.733 clause 8.1.2.12."; } - + leaf additionalText { type string; config false ; } - - leaf additionalInformation { - type string; + + anydata additionalInformation { config false ; } - + leaf rootCauseIndicator { type enumeration { enum YES; enum NO; } config false ; - description "It indicates that this AlarmInformation is the root cause - of the events captured by the notifications whose identifiers are in + description "It indicates that this AlarmInformation is the root cause + of the events captured by the notifications whose identifiers are in the related CorrelatedNotification instances."; } - + leaf ackTime { type yang:date-and-time ; config false ; - description "It identifies the time when the alarm has been - acknowledged or unacknowledged the last time, i.e. it registers the + description "It identifies the time when the alarm has been + acknowledged or unacknowledged the last time, i.e. it registers the time when ackState changes."; } - + leaf ackUserId { type string; - description "It identifies the last user who has changed the + description "It identifies the last user who has changed the Acknowledgement State."; } - + leaf ackSystemId { type string; - description "It identifies the system (Management System) that last - changed the ackState of an alarm, i.e. acknowledged or unacknowledged + description "It identifies the system (Management System) that last + changed the ackState of an alarm, i.e. acknowledged or unacknowledged the alarm."; } - + leaf ackState { type enumeration { enum ACKNOWLEDGED { description "The alarm has been acknowledged."; } enum UNACKNOWLEDGED { - description "The alarm has unacknowledged or the alarm has never + description "The alarm has unacknowledged or the alarm has never been acknowledged."; } } } - + leaf clearUserId { type string; - description "Carries the identity of the user who invokes the + description "Carries the identity of the user who invokes the clearAlarms operation."; } - + leaf clearSystemId { type string; } - + leaf serviceUser { type string; config false ; - description "It identifies the service-user whose request for service - provided by the serviceProvider led to the generation of the + description "It identifies the service-user whose request for service + provided by the serviceProvider led to the generation of the security alarm."; } - + leaf serviceProvider { type string; config false ; - description "It identifies the service-provider whose service is - requested by the serviceUser and the service request provokes the + description "It identifies the service-provider whose service is + requested by the serviceUser and the service request provokes the generation of the security alarm."; } - + leaf securityAlarmDetector { type string; config false ; - } + } } - + grouping AlarmListGrp { description "Represents the AlarmList IOC."; - + leaf administrativeState { type types3gpp:AdministrativeState ; default LOCKED; - description "When set to UNLOCKED, the alarm list is updated. - When the set to LOCKED, the existing alarm records are not + description "When set to UNLOCKED, the alarm list is updated. + When the set to LOCKED, the existing alarm records are not updated, and new alarm records are not added to the alarm list."; } - + leaf operationalState { type types3gpp:OperationalState ; default DISABLED; config false; - description "The producer sets this attribute to ENABLED, indicating - that it has the resource and ability to record alarm in AlarmList - else, it sets the attribute to DISABLED."; - } + description "The producer sets this attribute to ENABLED, indicating + that it has the resource and ability to record alarm in AlarmList + else, it sets the attribute to DISABLED."; + } leaf numOfAlarmRecords { type uint32 ; @@ -360,49 +361,49 @@ module _3gpp-common-fm { mandatory true; description "The number of alarm records in the AlarmList"; } - + leaf lastModification { type yang:date-and-time ; config false; description "The last time when an alarm record was modified"; - } - + } + list alarmRecords { key alarmId; description "List of alarmRecords"; uses AlarmRecordGrp; - } + } } - + grouping FmSubtree { - description "Contains FM related classes. - Should be used in all classes (or classes inheriting from) + description "Contains FM related classes. + Should be used in all classes (or classes inheriting from) - SubNetwork - ManagedElement - - If some YAM wants to augment these classes/list/groupings they must + + If some YAM wants to augment these classes/list/groupings they must augment all user classes!"; - + list AlarmList { - key id; + key id; max-elements 1; - description "The AlarmList represents the capability to store and manage - alarm records. The management scope of an AlarmList is defined by all - descendant objects of the base managed object, which is the object + description "The AlarmList represents the capability to store and manage + alarm records. The management scope of an AlarmList is defined by all + descendant objects of the base managed object, which is the object name-containing the AlarmList, and the base object itself. - - AlarmList instances are created by the system or are pre-installed. + + AlarmList instances are created by the system or are pre-installed. They cannot be created nor deleted by MnS consumers. - - When the alarm list is locked or disabled, the existing alarm records + + When the alarm list is locked or disabled, the existing alarm records are not updated, and new alarm records are not added to the alarm list"; - - uses top3gpp:Top_Grp ; + + uses top3gpp:Top_Grp ; container attributes { uses AlarmListGrp ; - } + } } } - + } \ No newline at end of file diff --git a/yang-models/_3gpp-nr-nrm-cesmanagementfunction.yang b/yang-models/_3gpp-nr-nrm-cesmanagementfunction.yang index 8aa498d81f783f515353dec752e7c008d32ecf18..39b4f5fc442cbdd56b5620333b4fbb9b66890e67 100755 --- a/yang-models/_3gpp-nr-nrm-cesmanagementfunction.yang +++ b/yang-models/_3gpp-nr-nrm-cesmanagementfunction.yang @@ -25,9 +25,73 @@ module _3gpp-nr-nrm-cesmanagementfunction { uses top3gpp:Top_Grp; leaf cesSwitch { - description "This attribute determines whether the Cross Domain-Centralized SON energy saving function is enabled or disabled."; + description "This attribute determines whether the Centralized SON energy saving function is enabled or disabled."; type boolean; } + list intraRatEsActivationOriginalCellLoadParameters { + key loadThreshold; + description "This attributes is relevant, if the cell acts as an original cell.This attribute indicates the traffic load threshold and the time duration, which are used by distributed ES algorithms to allow a cell to enter the energySaving state."; + leaf loadThreshold {type int32;} + container attributes { + uses IntraRatEsActivationOriginalCellLoadParametersGrp; + } + } + + + list intraRatEsActivationCandidateCellsLoadParameters { + key loadThreshold; + description "This attribute indicates the traffic load threshold and the time duration, which are used by distributed ES algorithms level to allow a n ‘original’ cell to enter the energySaving state."; + leaf loadThreshold {type int32;} + container attributes { + uses IntraRatEsActivationCandidateCellsLoadParametersGrp; + } + } + + list intraRatEsDeactivationCandidateCellsLoadParameters { + key loadThreshold; + description "This attributes is relevant, if the cell acts as a candidate cell.This attribute indicates the traffic load threshold and the time duration which is used by distributed ES algorithms to allow a cell to leave the energySaving state."; + leaf loadThreshold {type int32;} + container attributes { + uses IntraRatEsDeactivationCandidateCellsLoadParametersGrp; + } + } + + list esNotAllowedTimePeriod { + key startTimeandendTime; + description "This attribute indicates a list of time periods during which inter-RAT energy saving is not allowed."; + leaf startTimeandendTime {type string;} + container attributes { + uses EsNotAllowedTimePeriodGrp; + } + } + + list interRatEsActivationOriginalCellParameters { + key loadThreshold; + description "This attribute indicates the traffic load threshold and the time duration, which are used by distributed inter-RAT ES algorithms to allow an original cell to enter the energySaving state."; + leaf loadThreshold {type int32;} + container attributes { + uses InterRatEsActivationOriginalCellParametersGrp; + } + } + + list interRatEsActivationCandidateCellParameters { + key loadThreshold; + description "This attribute indicates the traffic load threshold and the time duration, which are used by distributed inter-RAT ES algorithms to allow an original cell to enter the energySaving state."; + leaf loadThreshold {type int32;} + container attributes { + uses InterRatEsActivationCandidateCellParametersGrp; + } + } + + list interRatEsDeactivationCandidateCellParameters { + key loadThreshold; + description "This attribute indicates the traffic load threshold and the time duration which is used by distributed inter-RAT ES algorithms to allow an original cell to leave the energySaving state."; + leaf loadThreshold {type int32;} + container attributes { + uses InterRatEsDeactivationCandidateCellParametersGrp; + } + } + leaf energySavingState { description "Specifies the status regarding the energy saving in the cell. If the value of energySavingControl is toBeEnergySaving, then it shall be tried to achieve the value isEnergySaving for the energySavingState. If the value of energySavingControl is toBeNotEnergySaving, then it shall be tried to achieve the value isNotEnergySaving for the energySavingState. "; @@ -48,6 +112,135 @@ module _3gpp-nr-nrm-cesmanagementfunction { } + grouping IntraRatEsActivationOriginalCellLoadParametersGrp { + description "Represents the the traffic load threshold and the time duration."; + + leaf loadThreshold { + description "This attribute is used by distributed ES algorithms to allow a cell to enter the energySaving state."; + type int32 { range "0..10000"; } + units "1"; + } + + + leaf timeDuration { + description " The time duration indicates how long the load needs to have been below the threshold."; + type int32 { range "0..900"; } + units "1"; + } + } + + grouping IntraRatEsActivationCandidateCellsLoadParametersGrp { + description "Represents the the traffic load threshold and the time duration."; + + leaf loadThreshold { + description "This attribute is used by distributed ES algorithms to allow a cell to enter the energySaving state."; + type int32 { range "0..10000"; } + units "1"; + } + + + leaf timeDuration { + description " The time duration indicates how long the load needs to have been below the threshold."; + type int32 { range "0..900"; } + units "1"; + } + } + + grouping IntraRatEsDeactivationCandidateCellsLoadParametersGrp { + description "Represents the the traffic load threshold and the time duration."; + + leaf loadThreshold { + description "This attribute is used by distributed ES algorithms to allow a cell to enter the energySaving state."; + type int32 { range "0..10000"; } + units "1"; + } + + + leaf timeDuration { + description " The time duration indicates how long the load needs to have been below the threshold."; + type int32 { range "0..900"; } + units "1"; + } + } + + grouping EsNotAllowedTimePeriodGrp { + description "Represents the the traffic load threshold and the time duration."; + + leaf startTimeandendTime { + description "This field indicate valid UTC time."; + type string; + } + + + leaf periodOfDay { + description "This field indicate the period of day."; + type string; + } + + leaf daysOfWeekList { + description "This field indicate the list of weekday."; + type string; + } + + leaf listoftimeperiods { + description "This field indicate the list of time periods."; + type string; + } + + } + + grouping InterRatEsActivationOriginalCellParametersGrp { + description "Represents the the traffic load threshold and the time duration."; + + leaf loadThreshold { + description "The time duration indicates how long the traffic load (both for UL and DL) needs to have been below the threshold."; + type int32 { range "0..10000"; } + units "1"; + } + + + leaf timeDuration { + description " The time duration indicates how long the load needs to have been below the threshold."; + type int32 { range "0..900"; } + units "1"; + } + } + + grouping InterRatEsActivationCandidateCellParametersGrp { + description "Represents the the traffic load threshold and the time duration."; + + leaf loadThreshold { + description "This attribute is used by distributed ES algorithms to allow a cell to enter the energySaving state."; + type int32 { range "0..10000"; } + units "1"; + } + + + leaf timeDuration { + description "The time duration indicates how long the traffic load (both for UL and DL) in the candidate cell needs to have been below the threshold before any original cells which will be provided backup coverage by the candidate cell enters energySaving state."; + type int32 { range "0..900"; } + units "1"; + } + } + + grouping InterRatEsDeactivationCandidateCellParametersGrp { + description "Represents the the traffic load threshold and the time duration."; + + leaf loadThreshold { + description "This attribute is used by distributed ES algorithms to allow a cell to enter the energySaving state."; + type int32 { range "0..10000"; } + units "1"; + } + + + leaf timeDuration { + description "The time duration indicates how long the traffic load (either for UL or DL) in the candidate cell needs to have been above the threshold to wake up one or more original cells which have been provided backup coverage by the candidate cell."; + type int32 { range "0..900"; } + units "1"; + } + } + + augment "/me3gpp:ManagedElement/gnbcucp3gpp:GNBCUCPFunction/nrcellcu3gpp:NRCellCU" { if-feature nrcellcu3gpp:CESManagementFunction; diff --git a/yang-models/_3gpp-nr-nrm-cpciconfigurationfunction.yang b/yang-models/_3gpp-nr-nrm-cpciconfigurationfunction.yang index 1437acece70c3f883c48a21a66547f036f816e51..918c0581fdaba52fe6de4a359dd5d6b271ff0716 100755 --- a/yang-models/_3gpp-nr-nrm-cpciconfigurationfunction.yang +++ b/yang-models/_3gpp-nr-nrm-cpciconfigurationfunction.yang @@ -35,7 +35,7 @@ module _3gpp-nr-nrm-cpciconfigurationfunction { leaf cPciConfigurationControl { - description "This attribute determines whether the Cross Domain-Centralized SON PCI configuration function is enabled or disabled."; + description "This attribute determines whether the Centralized SON PCI configuration function is enabled or disabled."; type boolean; } diff --git a/yang-models/_3gpp-nr-nrm-desmanagementfunction.yang b/yang-models/_3gpp-nr-nrm-desmanagementfunction.yang index b4b86d2b00dd57e362b5690967ba67c6e9873028..a69c94e792122b2cdcb6821b96e8826233f603a8 100755 --- a/yang-models/_3gpp-nr-nrm-desmanagementfunction.yang +++ b/yang-models/_3gpp-nr-nrm-desmanagementfunction.yang @@ -26,7 +26,7 @@ module _3gpp-nr-nrm-desmanagementfunction { uses top3gpp:Top_Grp; leaf desSwitch { - description "This attribute determines whether the Distributed SON or Domain-Centralized SON energy saving function is enabled or disabled."; + description "This attribute determines whether the Distributed SON energy saving function is enabled or disabled."; type boolean; } diff --git a/yang-models/_3gpp-nr-nrm-dpciconfigurationfunction.yang b/yang-models/_3gpp-nr-nrm-dpciconfigurationfunction.yang index b449e02000052725b1a0383a77a88519316a6440..bc46a30babeed0ba996c61fba50270ca8ab41091 100755 --- a/yang-models/_3gpp-nr-nrm-dpciconfigurationfunction.yang +++ b/yang-models/_3gpp-nr-nrm-dpciconfigurationfunction.yang @@ -27,7 +27,7 @@ module _3gpp-nr-nrm-dpciconfigurationfunction { list nRPciList { key NRPci; - description "This holds a list of physical cell identities that can be assigned to the NR cells. This attribute shall be supported if D-SON PCI configuration or domain Centralized SON PCI configuration function is supported."; + description "This holds a list of physical cell identities that can be assigned to the NR cells. This attribute shall be supported if D-SON PCI configuration function is supported."; leaf NRPci {type int32;} container attributes { uses NRPciListGrp; @@ -36,7 +36,7 @@ module _3gpp-nr-nrm-dpciconfigurationfunction { leaf dPciConfigurationControl { - description " This attribute determines whether the Distributed SON or Domain-Centralized SON PCI configuration Function is enabled or disabled."; + description " This attribute determines whether the Distributed SON PCI configuration Function is enabled or disabled."; type boolean; } diff --git a/yang-models/_3gpp-nr-nrm-ep.yang b/yang-models/_3gpp-nr-nrm-ep.yang index 1d2a88725c1e6808970a954f3f7d94b77c59c8f0..f54e781546514717f1143d07bd17a20ebd3eb383 100755 --- a/yang-models/_3gpp-nr-nrm-ep.yang +++ b/yang-models/_3gpp-nr-nrm-ep.yang @@ -17,6 +17,7 @@ module _3gpp-nr-nrm-ep { Resource Model (NRM)."; reference "3GPP TS 28.541 5G Network Resource Model (NRM)"; + revision 2021-04-30 { reference CR-0489; } revision 2021-03-02 { reference CR-0434; } revision 2021-01-16 { reference CR-0447; } revision 2020-11-02 { reference CR-0409; } @@ -111,7 +112,7 @@ module _3gpp-nr-nrm-ep { list EP_F1C { description "Represents the local end point of the control plane - interface (F1-C) between the DU and CU or CU-CP."; + interface (F1-C) between the gNB-DU and gNB-CU or gNB-CU-CP."; reference "3GPP TS 28.541, 3GPP TS 38.470"; key id; uses top3gpp:Top_Grp; @@ -122,7 +123,7 @@ module _3gpp-nr-nrm-ep { list EP_NgC { description "Represents the local end point of the control plane - interface (NG-C) between the gNB and NG-Core entity."; + interface (NG-C) between the gNB and AMF."; reference "3GPP TS 28.541, 3GPP TS 38.470"; key id; uses top3gpp:Top_Grp; @@ -173,7 +174,7 @@ module _3gpp-nr-nrm-ep { list EP_F1U { description "Represents the local end point of the user plane - interface (F1-U) between the DU and CU or CU-UP."; + interface (F1-U) between the gNB-DU and gNB-CU or gNB-CU-UP."; reference "3GPP TS 28.541, 3GPP TS 38.470"; key id; uses top3gpp:Top_Grp; diff --git a/yang-models/_3gpp-nr-nrm-gnbcucpfunction.yang b/yang-models/_3gpp-nr-nrm-gnbcucpfunction.yang index 4332f3ab923b2cb1b195e4dc40f6fdfb2fa41594..9734a9c7b4f672d5259eb83069baa65be03ac948 100755 --- a/yang-models/_3gpp-nr-nrm-gnbcucpfunction.yang +++ b/yang-models/_3gpp-nr-nrm-gnbcucpfunction.yang @@ -28,7 +28,7 @@ module _3gpp-nr-nrm-gnbcucpfunction { } feature DESManagementFunction { - description "Classs representing Distributed SON or Domain-Centralized SON Energy Saving feature"; + description "Classs representing Distributed SON Energy Saving feature"; } feature DANRManagementFunction { diff --git a/yang-models/_3gpp-nr-nrm-gnbdufunction.yang b/yang-models/_3gpp-nr-nrm-gnbdufunction.yang index 19c61caad456a493ac44afa004f430aa7ceea501..6e967056f6eab6d3a8c1138914323a717447fe2b 100755 --- a/yang-models/_3gpp-nr-nrm-gnbdufunction.yang +++ b/yang-models/_3gpp-nr-nrm-gnbdufunction.yang @@ -13,6 +13,7 @@ module _3gpp-nr-nrm-gnbdufunction { Object Class (IOC) that is part of the NR Network Resource Model (NRM)."; reference "3GPP TS 28.541 5G Network Resource Model (NRM)"; + revision 2021-04-30 { reference CR-0489 ; } revision 2020-10-02 { reference CR-0383 ; } revision 2020-03-12 { reference "SP-200233 S5-201547" ; } revision 2020-02-14 { reference S5-20XXXX ; } @@ -34,7 +35,6 @@ feature"; leaf gNBId { type int64 { range "0..4294967295"; } - config false; mandatory true; description "Identifies a gNB within a PLMN. The gNB Identifier (gNB ID) is part of the NR Cell Identifier (NCI) of the gNB cells."; diff --git a/yang-models/_3gpp-nr-nrm-nrcellcu.yang b/yang-models/_3gpp-nr-nrm-nrcellcu.yang index 8aef25a6074f50a74a8b24f7aace6019c3b5e987..cee68fc5fbe8e847f647973dbc9b175f40a278dd 100755 --- a/yang-models/_3gpp-nr-nrm-nrcellcu.yang +++ b/yang-models/_3gpp-nr-nrm-nrcellcu.yang @@ -25,12 +25,12 @@ module _3gpp-nr-nrm-nrcellcu { revision 2019-06-17 { reference "Initial revision"; } feature DPCIConfigurationFunction { - description "Classs representing Distributed SON or Domain-Centralized SON + description "Classs representing Distributed SON function of PCI configuration feature"; } feature DESManagementFunction { - description "Class representing Distributed SON or Domain-Centralized SON + description "Class representing Distributed SON Energy Saving feature"; } @@ -40,7 +40,7 @@ module _3gpp-nr-nrm-nrcellcu { } feature CESManagementFunction { - description "Class representing Cross Domain-Centralized SON Energy Saving + description "Class representing Centralized SON Energy Saving feature"; } diff --git a/yang-models/_3gpp-nr-nrm-nrcelldu.yang b/yang-models/_3gpp-nr-nrm-nrcelldu.yang index ce6c5d0f50f0095681ad23a181148c83f2072b57..d6e0b595a823e9b3769fac7c6ed7197ace7ebd4f 100755 --- a/yang-models/_3gpp-nr-nrm-nrcelldu.yang +++ b/yang-models/_3gpp-nr-nrm-nrcelldu.yang @@ -33,7 +33,7 @@ feature"; feature CPCIConfigurationFunction { - description "Class representing Cross Domain-Centralized SON function of + description "Class representing Centralized SON function of PCI configuration feature"; } diff --git a/yang-models/_3gpp-nr-nrm-nrcellrelation.yang b/yang-models/_3gpp-nr-nrm-nrcellrelation.yang index f9757380e973d006d2e025b6aa56427260679a61..6e2a77b91f1efa13784d9fa48e2cc19319e1cfdb 100755 --- a/yang-models/_3gpp-nr-nrm-nrcellrelation.yang +++ b/yang-models/_3gpp-nr-nrm-nrcellrelation.yang @@ -15,6 +15,7 @@ module _3gpp-nr-nrm-nrcellrelation { Object Class (IOC) that is part of the NR Network Resource Model (NRM)."; reference "3GPP TS 28.541 5G Network Resource Model (NRM)"; + revision 2021-01-25 { reference CR-0454 ; } revision 2020-06-03 { reference S5-202333 ; } revision 2020-04-23 { reference CR0281 ; } revision 2019-10-28 { reference S5-193518 ; } @@ -35,11 +36,11 @@ module _3gpp-nr-nrm-nrcellrelation { description "Represents the NRCellRelation IOC."; reference "3GPP TS 28.541"; - leaf nRTCI { + leaf nRTCI { description "Target NR Cell Identifier. It consists of NR Cell Identifier (NCI) and Physical Cell Identifier of the target NR cell (nRPCI)."; - type uint64; + type uint64; } container cellIndividualOffset { @@ -86,13 +87,13 @@ module _3gpp-nr-nrm-nrcellrelation { } } - leaf nRFreqRelationRef { + leaf nRFreqRelationRef { description "Reference to a corresponding NRFreqRelation instance."; mandatory true; type types3gpp:DistinguishedName; } - leaf adjacentNRCellRef { + leaf adjacentNRCellRef { description "Reference to an adjacent NR cell (NRCellCU or ExternalNRCellCU)."; mandatory true; @@ -110,7 +111,6 @@ module _3gpp-nr-nrm-nrcellrelation { default true; description "True if handovers are allowed over this relation."; } - } leaf isESCoveredBy { description "Indicates whether the adjacent cell @@ -124,6 +124,7 @@ module _3gpp-nr-nrm-nrcellrelation { changed to energy saving state."; type EnergySavingCoverage; } + } augment /me3gpp:ManagedElement/gnbcucp3gpp:GNBCUCPFunction/nrcellcu3gpp:NRCellCU {