diff --git a/OpenAPI/TS28536_CoslaNrm.yaml b/OpenAPI/TS28536_CoslaNrm.yaml index 8561a4cccb149e65dcc8b77b1ffbe45e7995813e..a73832385db23f1a785b57dccae29bd1f686afe1 100755 --- a/OpenAPI/TS28536_CoslaNrm.yaml +++ b/OpenAPI/TS28536_CoslaNrm.yaml @@ -54,23 +54,58 @@ components: enum: - FULFILLED - NOT_FULFILLED - + + AssuranceTargetName: + type: string + AssuranceTarget: type: object properties: assuranceTargetName: - type: string + $ref: '#/components/schemas/AssuranceTargetName' assuranceTargetValue: type: string + + AssuranceTargetList: + type: array + items: + $ref: '#/components/schemas/AssuranceTarget' + + AssuranceGoalStatus: + type: object + properties: + assuranceGoalStatusId: + type: string + assuranceGoalId: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' + assuranceGoalStatusObserved: + $ref: '#/components/schemas/AssuranceGoalStatusObserved' + assuranceGoalStatusPredicted: + $ref: '#/components/schemas/AssuranceGoalStatusPredicted' + assuranceGoalRef: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' + + AssuranceGoalStatusList: + type: array + items: + $ref: '#/components/schemas/AssuranceGoalStatus' + + AssuranceTargetStatus: + type: object + properties: + assuranceTargetStatusId: + type: string + assuranceTargetName: + $ref: '#/components/schemas/AssuranceTargetName' assuranceTargetStatusObserved: $ref: '#/components/schemas/AssuranceTargetStatusObserved' assuranceTargetStatusPredicted: $ref: '#/components/schemas/AssuranceTargetStatusPredicted' - AssuranceTargetList: + AssuranceTargetStatusList: type: array items: - $ref: '#/components/schemas/AssuranceTarget' + $ref: '#/components/schemas/AssuranceTargetStatus' AttributeNameList: type: array @@ -149,6 +184,10 @@ components: $ref: '#/components/schemas/ACCLDisallowedAttributes' AssuranceGoal: $ref: '#/components/schemas/AssuranceGoal-Multiple' + networkSliceRef: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' + networkSliceSubnetRef: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' AssuranceGoal-Single: allOf: @@ -163,20 +202,24 @@ components: $ref: '#/components/schemas/ObservationTime' assuranceTargetList: $ref: '#/components/schemas/AssuranceTargetList' - assuranceGoalStatusObserved: - $ref: '#/components/schemas/AssuranceGoalStatusObserved' - assuranceGoalStatusPredicted: - $ref: '#/components/schemas/AssuranceGoalStatusPredicted' assuranceScope: $ref: '#/components/schemas/AssuranceScope' serviceProfileId: type: string sliceProfileId: type: string - networkSliceRef: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' - networkSliceSubnetRef: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' + + AssuranceReport-Single: + allOf: + - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' + - type: object + properties: + attributes: + allOf: + - type: object + properties: + assuranceGoalStatusList: + $ref: '#/components/schemas/AssuranceGoalStatusList' #-------- Definition of JSON arrays for name-contained IOCs ---------------------- SubNetwork-Multiple: @@ -206,5 +249,6 @@ components: - $ref: '#/components/schemas/MnS' - $ref: '#/components/schemas/AssuranceClosedControlLoop-Single' - $ref: '#/components/schemas/AssuranceGoal-Single' + - $ref: '#/components/schemas/AssuranceReport-Single' - $ref: '#/components/schemas/SubNetwork-Single' - $ref: '#/components/schemas/ManagedElement-Single' diff --git a/OpenAPI/TS28623_ComDefs.yaml b/OpenAPI/TS28623_ComDefs.yaml index f7e3867f59f644c86c77eb21aa108f190f3deaa8..b962d1032f47e37769bf31b3709346351b71fd59 100755 --- a/OpenAPI/TS28623_ComDefs.yaml +++ b/OpenAPI/TS28623_ComDefs.yaml @@ -56,12 +56,54 @@ components: Tac: type: string pattern: '(^[A-Fa-f0-9]{4}$)|(^[A-Fa-f0-9]{6}$)' + UtraCellId: + type: integer EutraCellId: type: string pattern: '^[A-Fa-f0-9]{7}$' NrCellId: type: string pattern: '^[A-Fa-f0-9]{9}$' + TimeWindow: + type: object + properties: + startTime: + $ref: '#/components/schemas/DateTime' + endTime: + $ref: '#/components/schemas/DateTime' + GeoCoordinate: + type: object + properties: + latitude: + $ref: '#/components/schemas/Latitude' + longitude: + $ref: '#/components/schemas/Longitude' + ConvexGeoPolygon: + type: array + items: + $ref: '#/components/schemas/GeoCoordinate' + GeoAreaToCellMapping: + type: object + properties: + convexGeoPolygon: + $ref: '#/components/schemas/ConvexGeoPolygon' + associationThreshold: + type: integer + AreaOfInterest: + oneOf: + - $ref: '#/components/schemas/GeoAreaToCellMapping' + - type: array + items: + $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Tai' + - type: array + items: + $ref: '#/components/schemas/NrCellId' + - type: array + items: + $ref: '#/components/schemas/EutraCellId' + - type: array + items: + $ref: '#/components/schemas/UtraCellId' Fqdn: type: string diff --git a/OpenAPI/TS28623_GenericNrm.yaml b/OpenAPI/TS28623_GenericNrm.yaml index 3c71faba713a65373e869f54037af930518d0e5a..adfc72fd66f1a45414370888c8a627baa67bc801 100755 --- a/OpenAPI/TS28623_GenericNrm.yaml +++ b/OpenAPI/TS28623_GenericNrm.yaml @@ -323,6 +323,37 @@ components: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/Ipv4Addr' - $ref: 'TS28623_ComDefs.yaml#/components/schemas/Ipv6Addr' + ManagementData: + oneOf: + - type: array + items: + type: string + enum: + - COVERAGE + - CAPACITY + - ENERGY_EFFICIENCY + - MOBILITY + - ACCESSIBILITY + - type: array + items: + type: string + NodeFilter: + type: object + properties: + areaOfInterest: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/AreaOfInterest' + networkDomain: + type: string + enum: + - CN + - RAN + cpUpType: + type: string + enum: + - CP + - UP + sst: + type: integer #-------- Definition of types used in Trace control NRM fragment------------------ @@ -1441,6 +1472,10 @@ components: type: array items: $ref: '#/components/schemas/SupportedPerfMetricGroup' + supportedTraceMetrics: + type: array + items: + type: string ManagedElement-Attr: type: object properties: @@ -1468,6 +1503,10 @@ components: type: array items: $ref: '#/components/schemas/SupportedPerfMetricGroup' + supportedTraceMetrics: + type: array + items: + type: string SubNetwork-ncO: type: object @@ -1482,10 +1521,12 @@ components: $ref: '#/components/schemas/PerfMetricJob-Multiple' ThresholdMonitor: $ref: '#/components/schemas/ThresholdMonitor-Multiple' - NtfSubscriptionControl: - $ref: '#/components/schemas/NtfSubscriptionControl-Multiple' TraceJob: $ref: '#/components/schemas/TraceJob-Multiple' + ManagementDataCollection: + $ref: '#/components/schemas/ManagementDataCollection-Multiple' + NtfSubscriptionControl: + $ref: '#/components/schemas/NtfSubscriptionControl-Multiple' AlarmList: $ref: '#/components/schemas/AlarmList-Single' FileDownloadJob: @@ -1503,10 +1544,10 @@ components: $ref: '#/components/schemas/PerfMetricJob-Multiple' ThresholdMonitor: $ref: '#/components/schemas/ThresholdMonitor-Multiple' - NtfSubscriptionControl: - $ref: '#/components/schemas/NtfSubscriptionControl-Multiple' TraceJob: $ref: '#/components/schemas/TraceJob-Multiple' + NtfSubscriptionControl: + $ref: '#/components/schemas/NtfSubscriptionControl-Multiple' AlarmList: $ref: '#/components/schemas/AlarmList-Single' FileDownloadJob: @@ -1535,6 +1576,10 @@ components: type: array items: $ref: '#/components/schemas/SupportedPerfMetricGroup' + supportedTraceMetrics: + type: array + items: + type: string EP_RP-Attr: type: object properties: @@ -1849,6 +1894,27 @@ components: $ref: '#/components/schemas/TraceJob-Attr' Files: $ref: '#/components/schemas/Files-Multiple' + ManagementDataCollection-Single: + allOf: + - $ref: '#/components/schemas/Top' + - type: object + properties: + attributes: + type: object + properties: + managementData: + $ref: '#/components/schemas/ManagementData' + targetNodeFilter: + $ref: '#/components/schemas/NodeFilter' + collectionTimeWindow: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/TimeWindow' + reportingCtrl: + type: string + dataScope: + type: string + enum: + - SNSSAI + - 5QI AlarmList-Single: allOf: - $ref: '#/components/schemas/Top' @@ -2001,6 +2067,10 @@ components: type: array items: $ref: '#/components/schemas/TraceJob-Single' + ManagementDataCollection-Multiple: + type: array + items: + $ref: '#/components/schemas/ManagementDataCollection-Single' NtfSubscriptionControl-Multiple: type: array items: @@ -2038,7 +2108,8 @@ components: - $ref: '#/components/schemas/PerfMetricJob-Single' - $ref: '#/components/schemas/ThresholdMonitor-Single' - $ref: '#/components/schemas/TraceJob-Single' - + - $ref: '#/components/schemas/ManagementDataCollection-Single' + - $ref: '#/components/schemas/NtfSubscriptionControl-Single' - $ref: '#/components/schemas/HeartbeatControl-Single' diff --git a/yang-models/_3gpp-common-filemanagement.yang b/yang-models/_3gpp-common-filemanagement.yang index 39dc1093f5a8fce96ae811e71294f2a51f28f54b..3d0df33c82d3c8b411efa90b390f714c4e511406 100644 --- a/yang-models/_3gpp-common-filemanagement.yang +++ b/yang-models/_3gpp-common-filemanagement.yang @@ -92,4 +92,4 @@ module _3gpp-common-filemanagement { augment "/me3gpp:ManagedElement" { uses FileDownloadJobSubtree; } -} +} \ No newline at end of file diff --git a/yang-models/_3gpp-common-managed-function.yang b/yang-models/_3gpp-common-managed-function.yang index 57d745917952e3185b514c928e762d2da64771fb..c950e7563112a04a81b371745aaefd8147fa3d02 100755 --- a/yang-models/_3gpp-common-managed-function.yang +++ b/yang-models/_3gpp-common-managed-function.yang @@ -7,26 +7,26 @@ module _3gpp-common-managed-function { import _3gpp-common-top { prefix top3gpp; } import _3gpp-common-measurements { prefix meas3gpp; } import _3gpp-common-trace { prefix trace3gpp; } - + organization "3GPP SA5"; contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464"; - description "The module defines a base class/grouping for major 3GPP + description "The module defines a base class/grouping for major 3GPP functions."; - reference - "3GPP TS 28.622 + reference + "3GPP TS 28.622 Generic Network Resource Model (NRM) Integration Reference Point (IRP); Information Service (IS) - - 3GPP TS 28.620 + + 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"; } - revision 2020-08-03 { reference "CR-0095"; } + revision 2021-01-25 { reference "CR-0122"; } + revision 2020-09-30 { reference "CR-bbbb"; } + revision 2020-08-06 { reference "CR-0102"; } + revision 2020-08-03 { reference "CR-0095"; } revision 2020-06-23 { reference "CR-085"; } - revision 2020-06-08 { reference "CR-0092"; } + revision 2020-06-08 { reference "CR-0092"; } revision 2019-11-21 { reference "S5-197275, S5-197735"; } revision 2019-10-28 { reference S5-193518 ; } revision 2019-06-18 { reference "Initial revision"; } @@ -38,18 +38,18 @@ module _3gpp-common-managed-function { feature TraceUnderManagedFunction { description "The TraceSubtree shall be contained under ManagedFunction"; } - + grouping Operation { description "This data type represents an Operation."; reference "3gpp TS 28.622"; - + leaf name { type string; mandatory true; } - + leaf-list allowedNFTypes { - type string; + type string; min-elements 1; description "The type of the managed NF service instance The specifc values allowed are described in TS 23.501"; @@ -67,37 +67,37 @@ module _3gpp-common-managed-function { reference "3GPP TS 23.502"; } } - - grouping ManagedNFServiceGrp { + + grouping ManagedNFServiceGrp { description "A ManagedNFService represents a Network Function (NF) service."; reference "Clause 7 of 3GPP TS 23.501."; leaf userLabel { type string; description "A user-friendly (and user assignable) name of this object."; - } - + } + leaf nFServiceType { config false; mandatory true; - type string; + type string; description "The type of the managed NF service instance The specifc values allowed are described in clause 7.2 of TS 23.501"; } - + list sAP { - key "host port"; + key "host port"; min-elements 1; max-elements 1; description "The service access point of the managed NF service instance"; - uses types3gpp:SAP; + uses types3gpp:SAP; } - + list operations { key name; min-elements 1; uses Operation ; - description "Set of operations supported by the managed NF + description "Set of operations supported by the managed NF service instance"; } @@ -113,16 +113,16 @@ module _3gpp-common-managed-function { mandatory true; description "Describes whether the resource is installed and working"; } - + leaf usageState { type types3gpp:usageState ; config false; mandatory true; - description "Describes whether the resource is actively in use at a - specific instant, and if so, whether or not it has spare + description "Describes whether the resource is actively in use at a + specific instant, and if so, whether or not it has spare capacity for additional users."; } - + leaf registrationState { type enumeration { enum REGISTERED; @@ -131,123 +131,123 @@ module _3gpp-common-managed-function { config false; } } - - grouping Function_Grp { + + grouping Function_Grp { description "A base grouping for 3GPP functions."; leaf userLabel { type string; description "A user-friendly (and user assignable) name of this object."; - } + } } - + grouping ManagedFunctionGrp { - description "Abstract root class to be inherited/reused by classes + description "Abstract root class to be inherited/reused by classes representing 3GPP functions. - + Anywhere this grouping is used by classes inheriting from ManagedFunction - the list representing the inheriting class needs to include all - contained classes of ManagedFunction too. Contained classes are - either - - augmented into the Function class or - - shall be included in the list representing the inheriting class + the list representing the inheriting class needs to include all + contained classes of ManagedFunction too. Contained classes are + either + - augmented into the Function class or + - shall be included in the list representing the inheriting class using the grouping ManagedFunctionContainedClasses: 1) EP_RP solved using augment - 2) uses mf3gpp:ManagedFunctionContainedClasses; + 2) uses mf3gpp:ManagedFunctionContainedClasses; "; uses Function_Grp; - + list vnfParametersList { key vnfInstanceId; - description "Contains the parameter set of the VNF + description "Contains the parameter set of the VNF instance(s) corresponding to an NE. The presence of this list indicates that the ManagedFunction - represented is realized by one or more VNF instance(s). Otherwise it - shall be absent. - The presence of a vnfParametersList entry, whose vnfInstanceId with a - string length of zero, in createMO operation can trigger the - instantiation of the related VNF/VNFC instances."; - + represented is realized by one or more VNF instance(s). Otherwise it + shall be absent. + The presence of a vnfParametersList entry, whose vnfInstanceId with a + string length of zero, in createMO operation can trigger the + instantiation of the related VNF/VNFC instances."; + leaf vnfInstanceId { type string ; description "VNF instance identifier"; - reference "ETSI GS NFV-IFA 008 v2.1.1: - Network Functions Virtualisation (NFV); Management and Orchestration; + reference "ETSI GS NFV-IFA 008 v2.1.1: + Network Functions Virtualisation (NFV); Management and Orchestration; Ve-Vnfm reference point - Interface and Information Model Specification - section 9.4.2 - - ETSI GS NFV-IFA 015 v2.1.2: Network Functions Virtualisation (NFV); + section 9.4.2 + + ETSI GS NFV-IFA 015 v2.1.2: Network Functions Virtualisation (NFV); Management and Orchestration; Report on NFV Information Model section B2.4.2.1.2.3"; } - + leaf vnfdId { type string ; description "Identifier of the VNFD on which the VNF instance is based. - The absence of the leaf or a string length of zero for vnfInstanceId - means the VNF instance(s) does not exist (e.g. has not been + The absence of the leaf or a string length of zero for vnfInstanceId + means the VNF instance(s) does not exist (e.g. has not been instantiated yet, has already been terminated)."; - reference "ETSI GS NFV-IFA 008 v2.1.1: - Network Functions Virtualisation (NFV); Management and Orchestration; + reference "ETSI GS NFV-IFA 008 v2.1.1: + Network Functions Virtualisation (NFV); Management and Orchestration; Ve-Vnfm reference point - Interface and Information Model Specification - section 9.4.2"; + section 9.4.2"; } - + leaf flavourId { type string ; - description "Identifier of the VNF Deployment Flavour applied to this + description "Identifier of the VNF Deployment Flavour applied to this VNF instance."; - reference "ETSI GS NFV-IFA 008 v2.1.1: + reference "ETSI GS NFV-IFA 008 v2.1.1: Network Functions Virtualisation (NFV) Management and Orchestration"; } leaf autoScalable { type boolean ; mandatory true; - description "Indicator of whether the auto-scaling of this + description "Indicator of whether the auto-scaling of this VNF instance is enabled or disabled."; - } + } } - + list peeParametersList { key idx; - description "Contains the parameter set for the control - and monitoring of power, energy and environmental parameters of + description "Contains the parameter set for the control + and monitoring of power, energy and environmental parameters of ManagedFunction instance(s)."; - leaf idx { type uint32; } + leaf idx { type uint32; } leaf siteIdentification { type string; mandatory true; - description "The identification of the site where the + description "The identification of the site where the ManagedFunction resides."; } - + leaf siteLatitude { type decimal64 { fraction-digits 4; - range "-90.0000..+90.0000"; + range "-90.0000..+90.0000"; } - 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 - for BTSFunction, RNCFunction, GNBDUFunction and + 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 + for BTSFunction, RNCFunction, GNBDUFunction and NRSectorCarrier instance(s)."; } - + leaf siteLongitude { type decimal64 { fraction-digits 4; - range "-180.0000..+180.0000"; + range "-180.0000..+180.0000"; } - 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 - for BTSFunction, RNCFunction, GNBDUFunction and + 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 + for BTSFunction, RNCFunction, GNBDUFunction and NRSectorCarrier instance(s)."; } @@ -257,43 +257,42 @@ module _3gpp-common-managed-function { 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 + instance resides, in the unit of meter. This attribute is + optional for BTSFunction, RNCFunction, GNBDUFunction and NRSectorCarrier instance(s)."; } - leaf siteDescription { type string; mandatory true; - description "An operator defined description of the site where + description "An operator defined description of the site where the ManagedFunction instance resides."; } - + leaf equipmentType { type string; mandatory true; - description "The type of equipment where the managedFunction + description "The type of equipment where the managedFunction instance resides."; reference "clause 4.4.1 of ETSI ES 202 336-12"; } - + leaf environmentType { type string; mandatory true; - description "The type of environment where the managedFunction + description "The type of environment where the managedFunction instance resides."; reference "clause 4.4.1 of ETSI ES 202 336-12"; } - + leaf powerInterface { type string; mandatory true; description "The type of power."; reference "clause 4.4.1 of ETSI ES 202 336-12"; - } + } } - + leaf priorityLabel { mandatory true; type uint32; @@ -302,7 +301,7 @@ module _3gpp-common-managed-function { } grouping ManagedFunctionContainedClasses { - description "A grouping used to containe classes (lists) contained by + description "A grouping used to containe classes (lists) contained by the abstract IOC ManagedFunction"; list ManagedNFService { description "Represents a Network Function (NF)"; @@ -313,13 +312,13 @@ module _3gpp-common-managed-function { uses ManagedNFServiceGrp; } } - + uses meas3gpp:MeasurementSubtree { if-feature MeasurementsUnderManagedFunction ; - } - + } + uses trace3gpp:TraceSubtree { 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 df01996aa3ae3bb09054e9aba515dc2bd9165b8c..1ca847b43348a784c24bffcf90ebb12ca1491c65 100755 --- a/yang-models/_3gpp-common-mnsregistry.yang +++ b/yang-models/_3gpp-common-mnsregistry.yang @@ -16,16 +16,15 @@ module _3gpp-common-mnsregistry { revision 2021-11-23 { reference "S5-216090"; } revision 2021-10-18 { reference "S5-215263"; } revision 2021-08-29 { reference "Initial revision, S5-214388"; } - - grouping MNSInfoGrp { - description "Represents the MNSInfo IOC."; - reference "3GPP TS 28.622"; + + grouping MnsInfoGrp { + description "Represents the MnsInfo IOC."; leaf mnsLabel { description "Human-readable name of management service."; mandatory true; type string; } - + leaf mnsType { description "Type of management service."; type enumeration { @@ -35,40 +34,60 @@ module _3gpp-common-mnsregistry { enum FileDataReportingMnS; } } - + leaf mnsVersion { description "Version of management service."; type string; - } - + } + leaf mnsAddress { description "Addressing information for Management Service operations."; mandatory true; type string; - } - + } + leaf-list mnsScope { - description "List of the managed object instances that can be accessed using the MnS. If a complete SubNetwork can be accessed using the MnS, this attribute may contain the DN of the SubNetwork instead of the DNs of the individual managed entities within the SubNetwork."; + description "List of the managed object instances that can be accessed + using the MnS. If a complete SubNetwork can be accessed using the MnS, + this attribute may contain the DN of the SubNetwork instead of the + DNs of the individual managed entities within the SubNetwork."; min-elements 1; type types3gpp:DistinguishedName; } - } - + augment "/subnet3gpp:SubNetwork" { list MNSRegistry { - description "Represents the MNSRegistry IOC."; - reference "3GPP TS 28.622"; + description "Represents the MNSRegistry IOC. + The IOC is instantiated by the system."; uses top3gpp:Top_Grp; key id; max-elements 1; + list MNSInfo { - description "Represents the MNSInfo IOC."; - reference "3GPP TS 28.622"; + description "This IOC represents an available Management Service (MnS) + and provides the data required to support its discovery. + It is name-contained by MnsRegistry. + + This information is used by the consumer to discover the producers + of specific Management Services and to derive the addresses of the + Management Service. + + Attributes mnsLabel, mnsType, and mnsVersion are used to describe + the Management Service. + + Attribute mnsAddress is used to provide addressing information for + the Management Service operations. + + Attribute mnsScope is used to provide information about the + management scope of the Management Service. The management scope is + defined as the set of managed object instances that can be accessed + using the Management Service."; + uses top3gpp:Top_Grp; key "mnsType mnsVersion mnsAddress"; - uses MNSInfoGrp; + uses MnsInfoGrp; } } } -} +} \ No newline at end of file diff --git a/yang-models/_3gpp-common-trace.yang b/yang-models/_3gpp-common-trace.yang index 8051893e7a276d0ebdd857711f952eb198bf6cb1..5fd0bc0ebffe4d914a5047dbda3e392b196f12aa 100755 --- a/yang-models/_3gpp-common-trace.yang +++ b/yang-models/_3gpp-common-trace.yang @@ -1117,4 +1117,4 @@ module _3gpp-common-trace { } } } -} +} \ 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 18084a2ebc95c6d1ed2090b6778e4ad9016b3f6a..0986cdefc8c37198f54cce746dd44ef36197bc6b 100755 --- a/yang-models/_3gpp-common-yang-types.yang +++ b/yang-models/_3gpp-common-yang-types.yang @@ -13,8 +13,10 @@ module _3gpp-common-yang-types { network slicing."; reference "3GPP TS 28.623"; + revision 2022-07-26 { reference CR-0180 ; } revision 2022-02-09 { reference "CR-0144"; } revision 2021-11-01 { reference "CR-0141"; } + revision 2021-09-30 { description "Added Longitude, Latitude, TenthOfDegrees, OnOff."; reference "CR-0138"; @@ -68,7 +70,7 @@ module _3gpp-common-yang-types { 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 + the 'status' attribute may be provided by the 'progressStateInfo' and 'resultStateInfo' attributes. When the process is instantiated, the 'status' is set to 'NOT_RUNNING' @@ -80,7 +82,7 @@ module _3gpp-common-yang-types { 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 + further specialisation. The 'progressInfo' 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 @@ -428,6 +430,24 @@ module _3gpp-common-yang-types { } } + typedef BasicAdministrativeState { + reference "3GPP TS 28.625 and ITU-T X.731"; + type enumeration { + enum LOCKED { + value 0; + description "The resource is administratively prohibited from performing + services for its users."; + } + + enum UNLOCKED { + value 1; + description "The resource is administratively permitted to perform + services for its users. This is independent of its inherent + operability."; + } + } + } + typedef AdministrativeState { reference "3GPP TS 28.625 and ITU-T X.731"; type enumeration { diff --git a/yang-models/_3gpp-nr-nrm-dlbofunction.yang b/yang-models/_3gpp-nr-nrm-dlbofunction.yang index a9915f7f3d0905bc477599d83ecdb5b8853c1856..d532fe03792c2ba51b6c39a0fee47589c5e1e676 100644 --- a/yang-models/_3gpp-nr-nrm-dlbofunction.yang +++ b/yang-models/_3gpp-nr-nrm-dlbofunction.yang @@ -16,7 +16,7 @@ module _3gpp-nr-nrm-dlbofunction { Model (NRM)."; reference "3GPP TS 28.541 5G Network Resource Model (NRM)"; - revision 2022-03-25 { reference "CR-XXXX"; } + revision 2022-03-25 { reference "CR-0683"; } revision 2021-10-22 { reference "CR-0577"; } feature DLBOUnderGNBCUCPFunction { @@ -49,6 +49,7 @@ module _3gpp-nr-nrm-dlbofunction { 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 @@ -97,4 +98,4 @@ module _3gpp-nr-nrm-dlbofunction { if-feature DLBOUnderSubNetwork; uses DLBOFunctionSubtree; } -} +} \ No newline at end of file diff --git a/yang-models/_3gpp-nr-nrm-dmrofunction.yang b/yang-models/_3gpp-nr-nrm-dmrofunction.yang index f56ee70128359f01dcca3cfcd75b31ff1af5bf8b..4a065cdf944390ed1d0a196bd6998c41b4c77145 100755 --- a/yang-models/_3gpp-nr-nrm-dmrofunction.yang +++ b/yang-models/_3gpp-nr-nrm-dmrofunction.yang @@ -98,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-gnbcucpfunction.yang b/yang-models/_3gpp-nr-nrm-gnbcucpfunction.yang index 4c4cee4d639b0c079c1c5540374c16ebdd481f8a..9e7db4e5418350764f0404805ccdb669838c995d 100755 --- a/yang-models/_3gpp-nr-nrm-gnbcucpfunction.yang +++ b/yang-models/_3gpp-nr-nrm-gnbcucpfunction.yang @@ -102,7 +102,8 @@ 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)."; @@ -112,6 +113,7 @@ 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)."; diff --git a/yang-models/_3gpp-nr-nrm-nrcelldu.yang b/yang-models/_3gpp-nr-nrm-nrcelldu.yang index 0cb6dce0c84718a82dd025e4f6102ae711bb9779..9380e08554251ebc15c45019a6dede8908a02c12 100755 --- a/yang-models/_3gpp-nr-nrm-nrcelldu.yang +++ b/yang-models/_3gpp-nr-nrm-nrcelldu.yang @@ -12,7 +12,6 @@ module _3gpp-nr-nrm-nrcelldu { import _3gpp-5g-common-yang-types { prefix types5g3gpp; } import ietf-yang-types { prefix yang; } - organization "3GPP SA5"; contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464"; description "Defines the YANG mapping of the NRCellDU Information Object diff --git a/yang-models/_3gpp-ns-nrm-sliceprofile.yang b/yang-models/_3gpp-ns-nrm-sliceprofile.yang index c1441d45aee372db6e9a75c1dcd3b643934762d6..1e3217278cdc341d687651a46a552d9d931112cd 100755 --- a/yang-models/_3gpp-ns-nrm-sliceprofile.yang +++ b/yang-models/_3gpp-ns-nrm-sliceprofile.yang @@ -1049,4 +1049,4 @@ submodule _3gpp-ns-nrm-sliceprofile { uses TopSliceSubnetProfileGrp; } } -} +} \ No newline at end of file