diff --git a/OpenAPI/TS28104_MdaNrm.yaml b/OpenAPI/TS28104_MdaNrm.yaml index c229cc7d83a8e88075b1297a3beca6855b6a42f1..4290465aa8cc9e9fda12f6f9b433b7448a648134 100644 --- a/OpenAPI/TS28104_MdaNrm.yaml +++ b/OpenAPI/TS28104_MdaNrm.yaml @@ -1,7 +1,7 @@ openapi: 3.0.1 info: title: MDA NRM - version: 18.4.0 + version: 18.5.0 description: >- OAS 3.0.1 specification of the MDA NRM © 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). @@ -107,6 +107,7 @@ components: format: float minimum: 0 + #-------- Definition of types for name-containments ------ SubNetwork-ncO-MdaNrm: type: object @@ -138,15 +139,17 @@ components: properties: supportedMDACapabilities: $ref: '#/components/schemas/MDATypes' - mlModelRef: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' - aIMLInferenceFunctionRef: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' + mLModelRefList: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList' + aIMLInferenceFunctionRefList: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' - type: object properties: MDARequest: $ref: '#/components/schemas/MDARequest-Multiple' + MDAReport: + $ref: '#/components/schemas/MDAReport-Multiple' MDARequest-Single: allOf: diff --git a/OpenAPI/TS28105_AiMlNrm.yaml b/OpenAPI/TS28105_AiMlNrm.yaml index 7566d90a21594f143cf809d49baa0f4239ab2235..4bdb73a0e7787862d51903c1fd4f65846230569c 100644 --- a/OpenAPI/TS28105_AiMlNrm.yaml +++ b/OpenAPI/TS28105_AiMlNrm.yaml @@ -1,7 +1,7 @@ openapi: 3.0.1 info: title: AI/ML NRM - version: 18.4.0 + version: 18.5.0 description: >- OAS 3.0.1 specification of the AI/ML NRM © 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). @@ -348,9 +348,6 @@ components: attributes: allOf: - type: object - oneOf: - - required: [ requestStatus, mLModelToTestRef ] - - required: [ requestStatus, mLModelCoordinationGroupToTestRef ] properties: requestStatus: $ref: '#/components/schemas/RequestStatus' @@ -358,9 +355,9 @@ components: type: boolean suspendRequest: type: boolean - mLModelToTestRef: + mLModelRef: $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' - mLModelCoordinationGroupToTestRef: + mLModelCoordinationGroupRef: $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' MLTestingReport-Single: @@ -467,6 +464,10 @@ components: $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' sourceTrainedMLModelRef: $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' + aIMLInferenceReportRefList: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList' + usedByFunctionRefList: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList' MLModelRepository-Single: allOf: @@ -542,7 +543,7 @@ components: type: boolean mLUpdateProcessRef: $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' - mLModelRef: + mLModelRefList: $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList' MLUpdateProcess-Single: @@ -555,9 +556,13 @@ components: properties: progressStatus: $ref: '#/components/schemas/ProcessMonitor' - mLModelRef: + cancelProcess: + type: boolean + suspendProcess: + type: boolean + mLModelRefList: $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList' - mLUpdateRequestRef: + mLUpdateRequestRefList: $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList' mLUpdateReportRef: $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' @@ -572,7 +577,7 @@ components: properties: updatedMLCapability: $ref: '#/components/schemas/AvailMLCapabilityReport' - mLModelRef: + mLModelRefList: $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList' mLUpdateProcessRef: $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' @@ -596,7 +601,7 @@ components: $ref: '#/components/schemas/AIMLManagementPolicy' usedByFunctionRefList: $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList' - mLModelRef: + mLModelRefList: $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' - type: object @@ -626,7 +631,7 @@ components: items: $ref: '#/components/schemas/InferenceOutput' minItems: 1 - mLModelRef: + mLModelRefList: $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList' AIMLInferenceEmulationFunction-Single: @@ -639,7 +644,7 @@ components: - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-Attr' - type: object properties: - AIMLInferenceEmulationReport: + AIMLInferenceReport: $ref: '#/components/schemas/AIMLInferenceReport-Multiple' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' diff --git a/OpenAPI/TS28312_IntentExpectations.yaml b/OpenAPI/TS28312_IntentExpectations.yaml index 82031387f92e7b5a1a985d4a895bb530b3aed843..3938719ef007c872ae501ee7bc4374ee18933ecf 100644 --- a/OpenAPI/TS28312_IntentExpectations.yaml +++ b/OpenAPI/TS28312_IntentExpectations.yaml @@ -969,7 +969,7 @@ components: contextValueRange: type: array items: - $ref: "TS28623_GenericNrm.yaml#/components/schemas/NFType" + $ref: "TS28541_5GcNrm.yaml#/components/schemas/NFType" NfInstanceLocationContext: description: >- This data type is the "ObjectContext" data type with specialisations for NfInstanceLocationContext diff --git a/OpenAPI/TS28312_IntentNrm.yaml b/OpenAPI/TS28312_IntentNrm.yaml index dc5c4d4e48ca9d7641779bc7bd27ebe49288c5ec..3d018cb18699e9e39f4220c58e9f6ac3c4e9f368 100644 --- a/OpenAPI/TS28312_IntentNrm.yaml +++ b/OpenAPI/TS28312_IntentNrm.yaml @@ -1,7 +1,7 @@ openapi: 3.0.1 info: title: Intent NRM - version: 18.4.0 + version: 18.5.0 description: >- OAS 3.0.1 definition of the Intent NRM © 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). @@ -64,10 +64,7 @@ components: maximum: 100 description: It expresses the priority of the stated intent within a MnS consumer. intentPreemptionCapability: - type: string - enum: - - TRUE - - FALSE + type: boolean observationPeriod: type: integer description: >- diff --git a/OpenAPI/TS28536_CoslaNrm.yaml b/OpenAPI/TS28536_CoslaNrm.yaml index a81e08261fc6cd845e072718fccae9bdee4553ce..54d2c5898b80ac041fa454e444906e97297d9dab 100755 --- a/OpenAPI/TS28536_CoslaNrm.yaml +++ b/OpenAPI/TS28536_CoslaNrm.yaml @@ -2,7 +2,7 @@ openapi: 3.0.1 info: title: coslaNrm - version: 18.1.0 + version: 18.2.0 description: >- OAS 3.0.1 specification of the Cosla NRM © 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). @@ -156,12 +156,14 @@ components: $ref: '#/components/schemas/ControlLoopLifeCyclePhase' aCCLDisallowedList: $ref: '#/components/schemas/ACCLDisallowedAttributes' + networkSliceRef: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' + networkSliceSubnetRef: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' + AssuranceReport: + $ref: '#/components/schemas/AssuranceReport-Single' 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: diff --git a/OpenAPI/TS28538_EdgeNrm.yaml b/OpenAPI/TS28538_EdgeNrm.yaml index 0848b77d43bfaeb0f655cfe23151d47ccfde4018..83f86744da21584dabaed76065e4cf6c6a23b207 100644 --- a/OpenAPI/TS28538_EdgeNrm.yaml +++ b/OpenAPI/TS28538_EdgeNrm.yaml @@ -1,7 +1,7 @@ openapi: 3.0.1 info: title: 3GPP Edge NRM - version: 18.7.0 + version: 19.0.0 description: >- OAS 3.0.1 specification of the Edge NRM © 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). @@ -88,6 +88,17 @@ components: type: string swImageRef: type: string + RegistrationInfo: + type: object + properties: + registrationExpiry: + type: string + readOnly: true + registrationID: + type: string + readOnly: true + secCredential: + type: string Duration: type: object properties: @@ -158,8 +169,6 @@ components: $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' servedEESList: $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' - - #-------- Definition of types for name-containments ------ SubNetwork-ncO-EdgeNrm: type: object @@ -168,6 +177,8 @@ components: $ref: '#/components/schemas/ECSFunction-Multiple' EdgeDataNetwork: $ref: '#/components/schemas/EdgeDataNetwork-Multiple' + EASBundle: + $ref: '#/components/schemas/EASBundle-Multiple' #-------- Definition of concrete IOCs -------------------------------------------- @@ -205,6 +216,8 @@ components: type: array items: type: string + registrationInfo: + $ref: '#/components/schemas/RegistrationInfo' eASRequirementsRef: $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' eASAddress: @@ -270,7 +283,9 @@ components: serviceContinuitySupport: type: boolean eASFunctionRef: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList' + registrationInfo: + $ref: '#/components/schemas/RegistrationInfo' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' ECSFunction-Single: @@ -382,7 +397,30 @@ components: $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList' edgeDataNetworkRef: $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList' - + EASBundle-Single: + allOf: + - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' + - type: object + properties: + bundleIdentifier: + type: string + bundledEASIdentifier: + type: string + bundleType: + type: string + mainEASIdentifier: + type: string + coordinatedEASDiscovery: + type: boolean + coordinatedACR: + type: boolean + eDNAffinity: + type: string + description: any of enumrated value + enum: + - STRONG + - WEAK + - PREFERRED #-------- Definition of JSON arrays for name-contained IOCs ---------------------- @@ -418,15 +456,17 @@ components: type: array items: $ref: '#/components/schemas/OperatorEdgeDataNetwork-Single' - - + EASBundle-Multiple: + type: array + items: + $ref: '#/components/schemas/EASBundle-Single' #--------------------------------- Definition ------------------------------------ resources-edgeNrm: oneOf: - $ref: '#/components/schemas/EASFunction-Single' - $ref: '#/components/schemas/ECSFunction-Single' - - $ref: '#/components/schemas/EESFunction-Single' + - $ref: '#/components/schemas/EESFunction-Single' - $ref: '#/components/schemas/EdgeDataNetwork-Single' - $ref: '#/components/schemas/EASRequirements-Single' - $ref: '#/components/schemas/EASProfile-Single' @@ -434,3 +474,4 @@ components: - $ref: '#/components/schemas/OperatorEdgeFederation-Single' - $ref: '#/components/schemas/OperatorEdgeDataNetwork-Single' - $ref: '#/components/schemas/EASResourceReservationJob-Single' + - $ref: '#/components/schemas/EASBundle-Single' diff --git a/OpenAPI/TS28541_5GcNrm.yaml b/OpenAPI/TS28541_5GcNrm.yaml index 44dc93e1c80245cd60b6bdd8aef483b28055fe5b..5fe4522ff4a25e39da3cb99a3b1f0810ca58486f 100755 --- a/OpenAPI/TS28541_5GcNrm.yaml +++ b/OpenAPI/TS28541_5GcNrm.yaml @@ -1,7 +1,7 @@ openapi: 3.0.1 info: title: 3GPP 5GC NRM - version: 18.8.0 + version: 19.1.0 description: >- OAS 3.0.1 specification of the 5GC NRM © 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). @@ -59,17 +59,21 @@ components: type: object description: 'NF profile stored in NRF, defined in TS 29.510' properties: - nFInstanceId: + nfInstanceId: type: string description: uuid of NF instance - nFType: - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/NFType' - nFStatus: + nfType: + $ref: '#/components/schemas/NFType' + nfStatus: $ref: '#/components/schemas/NFStatus' plmn: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/PlmnId' + type: array + items: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/PlmnId' sNssais: - $ref: 'TS28541_NrNrm.yaml#/components/schemas/Snssai' + type: array + items: + $ref: 'TS28541_NrNrm.yaml#/components/schemas/Snssai' fqdn: $ref: 'TS28623_ComDefs.yaml#/components/schemas/Fqdn' interPlmnFqdn: @@ -86,8 +90,10 @@ components: type: string serviceName: type: string - version: - type: string + versions: + type: array + items: + type: string schema: type: string fqdn: @@ -98,14 +104,16 @@ components: type: array items: $ref: '#/components/schemas/IpEndPoint' - apiPrfix: + apiPrefix: type: string allowedPlmns: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/PlmnId' + type: array + items: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/PlmnId' allowedNfTypes: type: array items: - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/NFType' + $ref: '#/components/schemas/NFType' allowedNssais: type: array items: @@ -119,10 +127,10 @@ components: CNSIIdList: type: array items: - $ref: '#/components/schemas/CNSIId' + $ref: '#/components/schemas/CNSIId' CNSIId: type: string - description: CNSI Id is defined in TS 29.531, only for Core Network + description: CNSI Id is defined in TS 29.531, only for Core Network. EnergySavingControl: type: string description: any of enumerated value @@ -131,6 +139,7 @@ components: - TO_BE_NOT_ENERGYSAVING EnergySavingState: type: string + readOnly: true description: any of enumerated value enum: - IS_NOT_ENERGYSAVING @@ -150,6 +159,7 @@ components: properties: nFSrvGroupId: type: string + readOnly: true supiRanges: type: array items: @@ -188,6 +198,7 @@ components: - P_NSSCD NotificationType: type: string + readOnly: true enum: - N1_MESSAGES - N2_INFORMATION @@ -204,21 +215,33 @@ components: $ref: '#/components/schemas/NotificationType' callbackURI: type: string + readOnly: true n1MessageClass: type: boolean + readOnly: true n2InformationClass: type: boolean + readOnly: true versions: type: string + readOnly: true binding: type: string + readOnly: true ManagedNFProfile: type: object properties: + hniList: + type: array + items: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/Fqdn' + interPlmnFqdn: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/Fqdn' nfInstanceID: type: string + readOnly: true nfType: - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/NFType' + $ref: '#/components/schemas/NFType' heartbeatTimer: type: integer authzInfo: @@ -240,7 +263,7 @@ components: allowedNfTypes: type: array items: - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/NFType' + $ref: '#/components/schemas/NFType' allowedNfDomains: type: array items: @@ -263,20 +286,23 @@ components: type: string lcHSupportInd: type: boolean + readOnly: true olcHSupportInd: type: boolean + readOnly: true nfSetRecoveryTimeList: type: array items: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTime' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTimeRo' scpDomains: type: array items: type: string recoveryTime: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTime' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTimeRo' nfServicePersistence: type: boolean + readOnly: true nfProfileChangesSupportInd: type: boolean defaultNotificationSubscriptions: @@ -287,12 +313,13 @@ components: serviceSetRecoveryTimeList: type: array items: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTime' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTimeRo' minItems: 1 vendorId: $ref: '#/components/schemas/VendorId' SEPPType: type: string + readOnly: true description: any of enumerated value enum: - CSEPP @@ -550,6 +577,7 @@ components: type: integer eACMode: type: string + readOnly: true enum: - INACTIVE - ACTIVE @@ -559,10 +587,12 @@ components: type: integer numberofUEs: type: integer + readOnly: true uEIdList: type: array items: type: string + readOnly: true maxNumberofPDUSessions: type: integer @@ -575,7 +605,7 @@ components: type: string nRTACpattern: type: string - + TaiRange: type: object properties: @@ -585,7 +615,7 @@ components: type: array items: $ref: '#/components/schemas/NRTACRange' - + GUAMInfo: type: object properties: @@ -647,22 +677,25 @@ components: properties: 5GCNFType: type: string + readOnly: true enum: - PCF - NEF - SCEF 5GCNFIpAddress: type: string + readOnly: true 5GCNFRef: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnRo' UPFConnectionInfo: type: object properties: uPFIpAddress: type: string + readOnly: true uPFRef: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnRo' SnssaiList: type: array items: @@ -679,7 +712,7 @@ components: TaiList: type: array items: - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Tai' + $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Tai' SupiRange: type: object properties: @@ -787,12 +820,10 @@ components: type: array items: $ref: 'TS28623_ComDefs.yaml#/components/schemas/Ipv4Addr' - minItems: 1 ipv6EndpointAddresses: type: array items: $ref: 'TS28623_ComDefs.yaml#/components/schemas/Ipv6Addr' - minItems: 1 fqdn: $ref: 'TS28623_ComDefs.yaml#/components/schemas/Fqdn' networkInstance: @@ -812,9 +843,13 @@ components: type: object properties: ipv4EndpointAddresses: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/Ipv4Addr' + type: array + items: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/Ipv4Addr' ipv6EndpointAddresses: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/Ipv6Addr' + type: array + items: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/Ipv6Addr' fqdn: $ref: 'TS28623_ComDefs.yaml#/components/schemas/Fqdn' @@ -1043,7 +1078,7 @@ components: servingNfTypeList: type: array items: - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/NFType' + $ref: '#/components/schemas/NFType' minItems: 1 mlAnalyticsList: type: array @@ -1130,11 +1165,13 @@ components: items: type: string minItems: 1 + readOnly: true afIds: type: array items: type: string minItems: 1 + readOnly: true AfEvent: description: Represents Application Events. anyOf: @@ -1156,7 +1193,7 @@ components: - type: string description: > This string provides forward-compatibility with future extensions to the enumeration but - is not used to encode content defined in the present version of this API. + is not used to encode content defined in the present version of this API. AfEventExposureData: description: AF Event Exposure data managed by a given NEF Instance type: object @@ -1173,11 +1210,13 @@ components: items: type: string minItems: 1 + readOnly: true appIds: type: array items: type: string minItems: 1 + readOnly: true UnTrustAfInfo: description: Information of a untrusted AF Instance type: object @@ -1516,7 +1555,7 @@ components: servingNfTypeList: type: array items: - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/NFType' + $ref: '#/components/schemas/NFType' minItems: 1 servingNfSetIdList: type: array @@ -1538,7 +1577,7 @@ components: servingNfTypeList: type: array items: - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/NFType' + $ref: '#/components/schemas/NFType' servingNfSetIdList: type: array items: @@ -1721,8 +1760,10 @@ components: iwkEpsInd: type: boolean default: false + readOnly: true sxaInd: type: boolean + readOnly: true pduSessionTypes: type: array items: @@ -1733,6 +1774,7 @@ components: ueIpAddrInd: type: boolean default: false + readOnly: true taiList: type: array items: @@ -1759,6 +1801,7 @@ components: redundantGtpu: type: boolean default: false + readOnly: true ipups: type: boolean default: false @@ -1767,6 +1810,7 @@ components: default: false supportedPfcpFeatures: type: string + readOnly: true # upfEvents: # type: array # items: @@ -1801,9 +1845,11 @@ components: v2xSupportInd: type: boolean default: false + readOnly: true proseSupportInd: type: boolean default: false + readOnly: true proseCapability: $ref: '#/components/schemas/ProseCapability' v2xCapability: @@ -1811,11 +1857,13 @@ components: a2xSupportInd: type: boolean default: false + readOnly: true a2xCapability: $ref: '#/components/schemas/A2xCapability' rangingSlPosSupportInd: type: boolean - default: false + default: false + readOnly: true A2xCapability: description: Information of the supported A2X Capability by the PCF @@ -2328,7 +2376,7 @@ components: blockedDur: $ref: '#/components/schemas/TimeDuration' blockedSlice: - type: string + $ref: 'TS28541_NrNrm.yaml#/components/schemas/Snssai' TimeDuration: description: location for which the PLMN access restrictions are to be applied in case of NTN type: object @@ -2864,7 +2912,7 @@ components: pLMNInfo: $ref: 'TS28541_NrNrm.yaml#/components/schemas/PlmnInfo' expiryTime: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTime' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTimeRo' PcscfInfo: description: Information of a P-CSCF NF Instance type: object @@ -2918,7 +2966,113 @@ components: type: object properties: nfType: - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/NFType' + $ref: '#/components/schemas/NFType' + SAP: + type: object + properties: + host: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/HostAddr' + port: + type: integer + NFServiceType: + type: string + enum: + - NAMF_COMMUNICATION + - NAMF_EVENTEXPOSURE + - NAMF_MT + - NAMF_LOCATION + - NSMF_PDUSESSION + - NSMF_EVENTEXPOSURE + - OTHERS + readOnly: true + Operation: + type: object + properties: + name: + type: string + readOnly: true + allowedNFTypes: + $ref: '#/components/schemas/NFType' + operationSemantics: + $ref: '#/components/schemas/OperationSemantics' + NFType: + description: NF name defined in TS 23.501 or TS 29.510'.This datatype is used for writable attribute + type: string + enum: + - NRF + - UDM + - AMF + - SMF + - AUSF + - NEF + - PCF + - SMSF + - NSSF + - UDR + - LMF + - GMLC + - 5G_EIR + - SEPP + - UPF + - N3IWF + - AF + - UDSF + - DN + - BSF + - CHF + - NWDAF + - PCSCF + - CBCF + - HSS + - UCMF + - SOR_AF + - SPAF + - MME + - SCSAS + - SCEF + - SCP + - NSSAAF + - ICSCF + - SCSCF + - DRA + - IMS_AS + - AANF + - 5G_DDNMF + - NSACF + - MFAF + - EASDF + - DCCF + - MB_SMF + - TSCTSF + - ADRF + - GBA_BSF + - CEF + - MB_UPF + - NSWOF + - PKMF + - MNPF + - SMS_GMSC + - SMS_IWMSC + - MBSF + - MBSTF + - PANF + - TNGF + - W_AGF + - TWIF + - TSN_AF + + OperationSemantics: + type: string + readOnly: true + enum: + - REQUEST_RESPONSE + - SUBSCRIBE_NOTIFY + RegistrationState: + type: string + readOnly: true + enum: + - REGISTERED + - DEREGISTERED #-------- Definition of types for name-containments ------ SubNetwork-ncO-5GcNrm: @@ -3030,8 +3184,6 @@ components: $ref: '#/components/schemas/AmfIdentifier' sBIFqdn: type: string - interPlmnFQDN: - type: string weightFactor: $ref: '#/components/schemas/WeightFactor' cNSIIdList: @@ -3054,7 +3206,9 @@ components: $ref: 'TS28541_NrNrm.yaml#/components/schemas/MappedCellIdInfoList' mdtUserConsentReqList: $ref: 'TS28541_NrNrm.yaml#/components/schemas/MdtUserConsentReqList' + - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' + - $ref: '#/components/schemas/ManagedFunction5GC-nc0' - type: object properties: EP_N2: @@ -3077,8 +3231,8 @@ components: $ref: '#/components/schemas/EP_N22-Multiple' EP_N26: $ref: '#/components/schemas/EP_N26-Multiple' - EP_NLS: - $ref: '#/components/schemas/EP_NLS-Multiple' + EP_NL1: + $ref: '#/components/schemas/EP_NL1-Multiple' EP_NL2: $ref: '#/components/schemas/EP_NL2-Multiple' EP_N58: @@ -3158,16 +3312,19 @@ components: commModelList: $ref: '#/components/schemas/CommModelList' SmfInfo: - $ref: '#/components/schemas/SmfInfo' + type: array + items: + $ref: '#/components/schemas/SmfInfo' configurable5QISetRef: $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' dynamic5QISetRef: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnRo' dnaiSatelliteMappingList: type: array items: $ref: '#/components/schemas/dnaiSatelliteMapping' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' + - $ref: '#/components/schemas/ManagedFunction5GC-nc0' - type: object properties: EP_N4: @@ -3222,8 +3379,11 @@ components: supportedBMOList: $ref: '#/components/schemas/SupportedBMOList' upfInfo: - $ref: '#/components/schemas/UpfInfo' + type: array + items: + $ref: '#/components/schemas/UpfInfo' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' + - $ref: '#/components/schemas/ManagedFunction5GC-nc0' - type: object properties: EP_N3: @@ -3251,6 +3411,7 @@ components: commModelList: $ref: '#/components/schemas/CommModelList' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' + - $ref: '#/components/schemas/ManagedFunction5GC-nc0' - type: object properties: EP_N3: @@ -3278,14 +3439,17 @@ components: supportedBMOList: $ref: '#/components/schemas/SupportedBMOList' PcfInfo: - $ref: '#/components/schemas/PcfInfo' + type: array + items: + $ref: '#/components/schemas/PcfInfo' configurable5QISetRef: $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' dynamic5QISetRef: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnRo' predefinedPccRuleSetRefs: $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' + - $ref: '#/components/schemas/ManagedFunction5GC-nc0' - type: object properties: EP_N5: @@ -3324,6 +3488,7 @@ components: ausfInfo: $ref: '#/components/schemas/AusfInfo' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' + - $ref: '#/components/schemas/ManagedFunction5GC-nc0' - type: object properties: EP_N12: @@ -3355,6 +3520,7 @@ components: udmInfo: $ref: '#/components/schemas/UdmInfo' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' + - $ref: '#/components/schemas/ManagedFunction5GC-nc0' - type: object properties: EP_N8: @@ -3388,6 +3554,7 @@ components: udrInfo: $ref: '#/components/schemas/UdrInfo' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' + - $ref: '#/components/schemas/ManagedFunction5GC-nc0' UdsfFunction-Single: allOf: - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' @@ -3407,6 +3574,7 @@ components: udsfInfo: $ref: '#/components/schemas/UdsfInfo' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' + - $ref: '#/components/schemas/ManagedFunction5GC-nc0' NrfFunction-Single: allOf: - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' @@ -3428,6 +3596,7 @@ components: nrfInfo: $ref: '#/components/schemas/NrfInfo' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' + - $ref: '#/components/schemas/ManagedFunction5GC-nc0' - type: object properties: EP_N27: @@ -3457,6 +3626,7 @@ components: commModelList: $ref: '#/components/schemas/CommModelList' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' + - $ref: '#/components/schemas/ManagedFunction5GC-nc0' - type: object properties: EP_N22: @@ -3486,6 +3656,7 @@ components: smsfInfo: $ref: '#/components/schemas/SmsfInfo' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' + - $ref: '#/components/schemas/ManagedFunction5GC-nc0' - type: object properties: EP_N20: @@ -3519,10 +3690,17 @@ components: mappedCellIdInfoList: $ref: 'TS28541_NrNrm.yaml#/components/schemas/MappedCellIdInfoList' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' + - $ref: '#/components/schemas/ManagedFunction5GC-nc0' - type: object properties: - EP_NLS: - $ref: '#/components/schemas/EP_NLS-Multiple' + EP_NL1: + $ref: '#/components/schemas/EP_NL1-Multiple' + EP_NL8: + $ref: '#/components/schemas/EP_NL8-Multiple' + EP_NL7: + $ref: '#/components/schemas/EP_NL7-Multiple' + EP_NL10: + $ref: '#/components/schemas/EP_NL10-Multiple' NgeirFunction-Single: allOf: - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' @@ -3544,6 +3722,7 @@ components: commModelList: $ref: '#/components/schemas/CommModelList' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' + - $ref: '#/components/schemas/ManagedFunction5GC-nc0' - type: object properties: EP_N17: @@ -3559,16 +3738,18 @@ components: - type: object properties: plmnId: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/PlmnId' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/PlmnIdRo' sEPPType: $ref: '#/components/schemas/SEPPType' sEPPId: type: integer + readOnly: true fqdn: $ref: 'TS28623_ComDefs.yaml#/components/schemas/Fqdn' seppInfo: $ref: '#/components/schemas/SeppInfo' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' + - $ref: '#/components/schemas/ManagedFunction5GC-nc0' - type: object properties: EP_N32: @@ -3601,6 +3782,7 @@ components: $ref: '#/components/schemas/NwdafInfo' nwdafLogicalFuncSupported: type: string + readOnly: true enum: - NWDAF_WITH_ANLF - NWDAF_WITH_MTLF @@ -3614,7 +3796,7 @@ components: AnLFFunction: $ref: '#/components/schemas/AnLFFunction-Single' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' - + - $ref: '#/components/schemas/ManagedFunction5GC-nc0' ScpFunction-Single: allOf: - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' @@ -3632,6 +3814,7 @@ components: scpInfo: $ref: '#/components/schemas/ScpInfo' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' + - $ref: '#/components/schemas/ManagedFunction5GC-nc0' - type: object properties: EP_SM13: @@ -3656,9 +3839,11 @@ components: $ref: '#/components/schemas/CapabilityList' isCAPIFSup: type: boolean + readOnly: true nefInfo: $ref: '#/components/schemas/NefInfo' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' + - $ref: '#/components/schemas/ManagedFunction5GC-nc0' - type: object properties: EP_N33: @@ -3691,6 +3876,7 @@ components: nsacfInfo: $ref: '#/components/schemas/NsacfInfo' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' + - $ref: '#/components/schemas/ManagedFunction5GC-nc0' - type: object properties: EP_N60: @@ -3715,6 +3901,7 @@ components: commModelList: $ref: '#/components/schemas/CommModelList' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' + - $ref: '#/components/schemas/ManagedFunction5GC-nc0' - type: object properties: EP_Npc4: @@ -3747,6 +3934,7 @@ components: easdfInfo: $ref: '#/components/schemas/EasdfInfo' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' + - $ref: '#/components/schemas/ManagedFunction5GC-nc0' - type: object properties: EP_N88: @@ -3802,6 +3990,7 @@ components: amfIdentifier: $ref: '#/components/schemas/AmfIdentifier' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' + - $ref: '#/components/schemas/ManagedFunction5GC-nc0' ExternalNrfFunction-Single: allOf: - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' @@ -3815,6 +4004,7 @@ components: plmnIdList: $ref: 'TS28541_NrNrm.yaml#/components/schemas/PlmnIdList' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' + - $ref: '#/components/schemas/ManagedFunction5GC-nc0' ExternalNssfFunction-Single: allOf: - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' @@ -3828,6 +4018,7 @@ components: plmnIdList: $ref: 'TS28541_NrNrm.yaml#/components/schemas/PlmnIdList' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' + - $ref: '#/components/schemas/ManagedFunction5GC-nc0' ExternalSeppFunction-Single: allOf: - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' @@ -3839,13 +4030,14 @@ components: - type: object properties: plmnId: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/PlmnId' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/PlmnIdRo' sEPPId: type: integer + readOnly: true fqdn: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/Fqdn' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/FqdnRo' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' - + - $ref: '#/components/schemas/ManagedFunction5GC-nc0' EP_N2-Single: allOf: - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' @@ -3875,7 +4067,7 @@ components: remoteAddress: $ref: 'TS28541_NrNrm.yaml#/components/schemas/RemoteAddress' epTransportRefs: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnListRo' EP_N4-Single: allOf: - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' @@ -4267,7 +4459,7 @@ components: $ref: 'TS28541_NrNrm.yaml#/components/schemas/LocalAddress' remoteAddress: $ref: 'TS28541_NrNrm.yaml#/components/schemas/RemoteAddress' - EP_NLS-Single: + EP_NL1-Single: allOf: - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' - type: object @@ -4337,6 +4529,34 @@ components: $ref: 'TS28541_NrNrm.yaml#/components/schemas/LocalAddress' remoteAddress: $ref: 'TS28541_NrNrm.yaml#/components/schemas/RemoteAddress' + EP_NL7-Single: + allOf: + - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' + - type: object + properties: + attributes: + allOf: + - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/EP_RP-Attr' + - type: object + properties: + localAddress: + $ref: 'TS28541_NrNrm.yaml#/components/schemas/LocalAddress' + remoteAddress: + $ref: 'TS28541_NrNrm.yaml#/components/schemas/RemoteAddress' + EP_NL8-Single: + allOf: + - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' + - type: object + properties: + attributes: + allOf: + - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/EP_RP-Attr' + - type: object + properties: + localAddress: + $ref: 'TS28541_NrNrm.yaml#/components/schemas/LocalAddress' + remoteAddress: + $ref: 'TS28541_NrNrm.yaml#/components/schemas/RemoteAddress' EP_NL9-Single: allOf: - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' @@ -4351,7 +4571,20 @@ components: $ref: 'TS28541_NrNrm.yaml#/components/schemas/LocalAddress' remoteAddress: $ref: 'TS28541_NrNrm.yaml#/components/schemas/RemoteAddress' - + EP_NL10-Single: + allOf: + - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' + - type: object + properties: + attributes: + allOf: + - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/EP_RP-Attr' + - type: object + properties: + localAddress: + $ref: 'TS28541_NrNrm.yaml#/components/schemas/LocalAddress' + remoteAddress: + $ref: 'TS28541_NrNrm.yaml#/components/schemas/RemoteAddress' EP_N60-Single: allOf: - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' @@ -4529,10 +4762,13 @@ components: maximum: 255 isEventTriggeredGtpUPathMonitoringSupported: type: boolean + readOnly: true isPeriodicGtpUMonitoringSupported: type: boolean + readOnly: true isImmediateGtpUMonitoringSupported: type: boolean + readOnly: true gtpUPathDelayThresholds: $ref: '#/components/schemas/GtpUPathDelayThresholdsType' gtpUPathMinimumWaitTime: @@ -4566,10 +4802,13 @@ components: maximum: 255 isEventTriggeredQFMonitoringSupported: type: boolean + readOnly: true isPeriodicQFMonitoringSupported: type: boolean + readOnly: true isSessionReleasedQFMonitoringSupported: type: boolean + readOnly: true qFPacketDelayThresholds: $ref: '#/components/schemas/QFPacketDelayThresholdsType' qFMinimumWaitTime: @@ -4610,6 +4849,7 @@ components: trustAfInfo: $ref: '#/components/schemas/TrustAfInfo' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' + - $ref: '#/components/schemas/ManagedFunction5GC-nc0' - type: object properties: EP_N5: @@ -4637,13 +4877,14 @@ components: type: string cNSIIdList: $ref: '#/components/schemas/CNSIIdList' - nFProfileList: - $ref: '#/components/schemas/NFProfileList' + managedNFProfile: + $ref: '#/components/schemas/ManagedNFProfile' commModelList: $ref: '#/components/schemas/CommModelList' nssafInfo: $ref: '#/components/schemas/NssaafInfo' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' + - $ref: '#/components/schemas/ManagedFunction5GC-nc0' EP_N58-Single: allOf: - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' @@ -4695,6 +4936,7 @@ components: dccfInfo: $ref: '#/components/schemas/DccfInfo' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' + - $ref: '#/components/schemas/ManagedFunction5GC-nc0' MfafFunction-Single: allOf: @@ -4717,6 +4959,7 @@ components: mfafInfo: $ref: '#/components/schemas/MfafInfo' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' + - $ref: '#/components/schemas/ManagedFunction5GC-nc0' ChfFunction-Single: allOf: @@ -4739,6 +4982,7 @@ components: chfInfo: $ref: '#/components/schemas/ChfInfo' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' + - $ref: '#/components/schemas/ManagedFunction5GC-nc0' - type: object properties: EP_N28: @@ -4901,6 +5145,7 @@ components: gmlcInfo: $ref: '#/components/schemas/GmlcInfo' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' + - $ref: '#/components/schemas/ManagedFunction5GC-nc0' - type: object properties: EP_NL2: @@ -4913,6 +5158,8 @@ components: $ref: '#/components/schemas/EP_NL6-Multiple' EP_NL9: $ref: '#/components/schemas/EP_NL9-Multiple' + EP_NL10: + $ref: '#/components/schemas/EP_NL10-Multiple' TsctsfFunction-Single: allOf: - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' @@ -4934,6 +5181,7 @@ components: tsctsfInfo: $ref: '#/components/schemas/TsctsfInfo' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' + - $ref: '#/components/schemas/ManagedFunction5GC-nc0' - type: object properties: EP_N84: @@ -5055,8 +5303,11 @@ components: commModelList: $ref: '#/components/schemas/CommModelList' bsfInfo: - $ref: '#/components/schemas/BsfInfo' + type: array + items: + $ref: '#/components/schemas/BsfInfo' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' + - $ref: '#/components/schemas/ManagedFunction5GC-nc0' MbSmfFunction-Single: allOf: @@ -5077,6 +5328,7 @@ components: mbSmfInfo: $ref: '#/components/schemas/MbSmfInfo' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' + - $ref: '#/components/schemas/ManagedFunction5GC-nc0' - type: object properties: EP_N11mb: @@ -5150,6 +5402,7 @@ components: mbUpfInfo: $ref: '#/components/schemas/MbUpfInfo' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' + - $ref: '#/components/schemas/ManagedFunction5GC-nc0' - type: object properties: EP_N3mb: @@ -5180,6 +5433,7 @@ components: mnpfInfo: $ref: '#/components/schemas/MnpfInfo' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' + - $ref: '#/components/schemas/ManagedFunction5GC-nc0' - type: object properties: EP_SM12: @@ -5259,6 +5513,7 @@ components: enum: - ACTIVATED - DEACTIVATED + readOnly: true EP_SM12-Single: allOf: - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' @@ -5301,9 +5556,46 @@ components: $ref: 'TS28541_NrNrm.yaml#/components/schemas/LocalAddress' remoteAddress: $ref: 'TS28541_NrNrm.yaml#/components/schemas/RemoteAddress' +#-------- Definition of abstract IOCs -------------------------------------------- + ManagedFunction5GC-nc0: + type: object + properties: + ManagedNFService: + $ref: '#/components/schemas/ManagedNFService-Multiple' +#-------- Definition of abstract IOCs -------------------------------------------- -#-------- Definition of JSON arrays for name-contained IOCs ---------------------- +#-------- Definition of 5GC common IOCs -------------------------------------------- + ManagedNFService-Single: + allOf: + - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' + - type: object + properties: + attributes: + type: object + properties: + userLabel: + type: string + nFServiceType: + $ref: '#/components/schemas/NFServiceType' + sAP: + $ref: '#/components/schemas/SAP' + operations: + type: array + items: + $ref: '#/components/schemas/Operation' + administrativeState: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/AdministrativeState' + operationalState: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/OperationalState' + usageState: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/UsageState' + registrationState: + $ref: '#/components/schemas/RegistrationState' + +#-------- Definition of 5GC common IOCs -------------------------------------------- + +#-------- Definition of JSON arrays for name-contained IOCs ---------------------- AmfFunction-Multiple: type: array items: @@ -5549,10 +5841,10 @@ components: type: array items: $ref: '#/components/schemas/EP_MAP_SMSC-Single' - EP_NLS-Multiple: + EP_NL1-Multiple: type: array items: - $ref: '#/components/schemas/EP_NLS-Single' + $ref: '#/components/schemas/EP_NL1-Single' EP_NL2-Multiple: type: array items: @@ -5569,10 +5861,22 @@ components: type: array items: $ref: '#/components/schemas/EP_NL6-Single' + EP_NL7-Multiple: + type: array + items: + $ref: '#/components/schemas/EP_NL7-Single' + EP_NL8-Multiple: + type: array + items: + $ref: '#/components/schemas/EP_NL8-Single' EP_NL9-Multiple: type: array items: $ref: '#/components/schemas/EP_NL9-Single' + EP_NL10-Multiple: + type: array + items: + $ref: '#/components/schemas/EP_NL10-Single' EP_N60-Multiple: type: array items: @@ -5741,7 +6045,10 @@ components: type: array items: $ref: '#/components/schemas/MnpfFunction-Single' - + ManagedNFService-Multiple: + type: array + items: + $ref: '#/components/schemas/ManagedNFService-Single' #------------ Definitions in TS 28.541 for TS 28.532 ----------------------------- resources-5gcNrm: @@ -5766,6 +6073,7 @@ components: - $ref: '#/components/schemas/NefFunction-Single' - $ref: '#/components/schemas/NsacfFunction-Single' - $ref: '#/components/schemas/DDNMFFunction-Single' + - $ref: '#/components/schemas/ManagedNFService-Single' - $ref: '#/components/schemas/ExternalAmfFunction-Single' - $ref: '#/components/schemas/ExternalNrfFunction-Single' @@ -5838,12 +6146,15 @@ components: - $ref: '#/components/schemas/EP_S5U-Single' - $ref: '#/components/schemas/EP_Rx-Single' - $ref: '#/components/schemas/EP_MAP_SMSC-Single' - - $ref: '#/components/schemas/EP_NLS-Single' + - $ref: '#/components/schemas/EP_NL1-Single' - $ref: '#/components/schemas/EP_NL2-Single' - $ref: '#/components/schemas/EP_NL3-Single' - $ref: '#/components/schemas/EP_NL5-Single' - $ref: '#/components/schemas/EP_NL6-Single' + - $ref: '#/components/schemas/EP_NL7-Single' + - $ref: '#/components/schemas/EP_NL8-Single' - $ref: '#/components/schemas/EP_NL9-Single' + - $ref: '#/components/schemas/EP_NL10-Single' - $ref: '#/components/schemas/EP_N11mb-Single' - $ref: '#/components/schemas/EP_N16mb-Single' - $ref: '#/components/schemas/EP_Nmb1-Single' diff --git a/OpenAPI/TS28541_NrNrm.yaml b/OpenAPI/TS28541_NrNrm.yaml index 62e23de93760987a78e011b7ca67c887b8be1dac..3aea8f9c8fe1cef764d495848f45351f8cb79780 100755 --- a/OpenAPI/TS28541_NrNrm.yaml +++ b/OpenAPI/TS28541_NrNrm.yaml @@ -1,7 +1,7 @@ openapi: 3.0.1 info: title: NR NRM - version: 18.8.0 + version: 19.1.0 description: >- OAS 3.0.1 specification of the NR NRM © 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). @@ -34,6 +34,7 @@ components: type: integer minimum: 0 maximum: 68719476735 + readOnly: true Sst: type: integer @@ -98,7 +99,7 @@ components: TaiList: type: array items: - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Tai' + $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Tai' BackhaulAddress: type: object properties: @@ -234,6 +235,7 @@ components: - IDLE - INACTIVE - ACTIVE + readOnly: true CyclicPrefix: type: string enum: @@ -310,16 +312,22 @@ components: properties: rsrpOffsetSSB: type: integer + default: 0 rsrqOffsetSSB: type: integer + default: 0 sinrOffsetSSB: type: integer + default: 0 rsrpOffsetCSI-RS: type: integer + default: 0 rsrqOffsetCSI-RS: type: integer + default: 0 sinrOffsetCSI-RS: type: integer + default: 0 QOffsetRange: type: integer enum: @@ -371,6 +379,7 @@ components: $ref: '#/components/schemas/QOffsetRange' QOffsetFreq: type: number + default: 0 TReselectionNRSf: type: integer enum: @@ -462,7 +471,8 @@ components: type: string enum: - ENABLE - - DISABLE + - DISABLE + default: DISABLE rIMRSScrambleTimerMultiplier: type: integer rIMRSScrambleTimerOffset: @@ -523,12 +533,14 @@ components: type: string enum: - ENABLE - - DISABLE + - DISABLE + default: DISABLE enablenearfarIndicationRS2: type: string enum: - ENABLE - - DISABLE + - DISABLE + default: DISABLE RimRSReportInfo: type: object @@ -552,7 +564,8 @@ components: type: string enum: - ENABLE - - DISABLE + - DISABLE + default: DISABLE reportInterval: type: integer nrofRIMRSReportInfo: @@ -628,26 +641,32 @@ components: properties: positionX: type: integer + default: 0 minimum: 0 maximum: 604800 positionY: type: integer + default: 0 minimum: 0 maximum: 604800 positionZ: type: integer + default: 0 minimum: 0 maximum: 604800 velocityVX: type: integer + default: 0 minimum: -131072 maximum: 131071 velocityVY: type: integer + default: 0 minimum: -131072 maximum: 131071 velocityVZ: type: integer + default: 0 minimum: -131072 maximum: 131071 @@ -656,26 +675,32 @@ components: properties: semiMajorAxis: type: integer + default: 0 minimum: 0 maximum: 8589934591 eccentricity: type: integer + default: 0 minimum: -524288 maximum: 524287 periapsis: type: integer + default: 0 minimum: 0 maximum: 16777215 longitude: type: integer + default: 0 minimum: 0 maximum: 2097151 inclination: type: integer + default: 0 minimum: -524288 maximum: 524287 meanAnomaly: type: integer + default: 0 minimum: 0 maximum: 16777215 @@ -823,7 +848,7 @@ components: configurable5QISetRef: $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' dynamic5QISetRef: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnRo' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' - type: object properties: @@ -870,7 +895,7 @@ components: $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' dynamic5QISetRef: description: This attribute is condition optional. The condition is NG-RAN Multi-Operator Core Network (NG-RAN MOCN) network sharing with operator specific 5QI is supported. - $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnRo' NrOperatorCellDu: $ref: '#/components/schemas/NrOperatorCellDu-Multiple' GnbCuUpFunction-Single: @@ -894,7 +919,7 @@ components: configurable5QISetRef: $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' dynamic5QISetRef: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnRo' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' - type: object properties: @@ -954,9 +979,9 @@ components: configurable5QISetRef: $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' dynamic5QISetRef: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnRo' ephemerisInfoSetRef: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnRo' dCHOControl: type: boolean dDAPSHOControl: @@ -996,6 +1021,10 @@ components: $ref: 'TS28541_5GcNrm.yaml#/components/schemas/Configurable5QISet-Multiple' Dynamic5QISet: $ref: 'TS28541_5GcNrm.yaml#/components/schemas/Dynamic5QISet-Multiple' + NRNetwork: + $ref: '#/components/schemas/NRNetwork-Single' + EUtranNetwork: + $ref: '#/components/schemas/EUtraNetwork-Single' NrCellCu-Single: allOf: @@ -1012,7 +1041,7 @@ components: plmnInfoList: $ref: '#/components/schemas/PlmnInfoList' nRFrequencyRef: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnRo' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' - type: object properties: @@ -1102,9 +1131,9 @@ components: description: "Condition is BWP sets are supported" $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList' rimRSMonitoringStartTime: - type: string + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTime' rimRSMonitoringStopTime: - type: string + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTime' rimRSMonitoringWindowDuration: type: integer rimRSMonitoringWindowStartingOffset: @@ -1175,6 +1204,7 @@ components: type: integer minimum: 1 maximum: 256 + readOnly: true EUtranFrequency-Single: allOf: - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' @@ -1274,24 +1304,30 @@ components: properties: beamIndex: type: integer + readOnly: true beamType: type: string + readOnly: true enum: - - SSB_BEAM + - SSB_BEAM beamAzimuth: type: integer + readOnly: true minimum: -1800 maximum: 1800 beamTilt: type: integer + readOnly: true minimum: -900 maximum: 900 beamHorizWidth: type: integer + readOnly: true minimum: 0 maximum: 3599 beamVertWidth: type: integer + readOnly: true minimum: 0 maximum: 1800 RRMPolicyRatio-Single: @@ -1442,6 +1478,7 @@ components: type: integer cellReselectionPriority: type: integer + default: 0 cellReselectionSubPriority: type: number minimum: 0.2 @@ -1524,18 +1561,20 @@ components: $ref: "#/components/schemas/InterRatEsDeactivationCandidateCellParameters" isProbingCapable: type: string + readOnly: true enum: - YES - NO energySavingState: type: string + readOnly: true enum: - IS_NOT_ENERGY_SAVING - IS_ENERGY_SAVING mLModelRefList: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnListRo' aIMLInferenceFunctionRefList: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnListRo' DRACHOptimizationFunction-Single: allOf: - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' @@ -1570,9 +1609,9 @@ components: tstoreUEcntxt: $ref: '#/components/schemas/TstoreUEcntxt' mLModelRefList: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnListRo' aIMLInferenceFunctionRefList: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnListRo' DLBOFunction-Single: allOf: - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' @@ -1588,9 +1627,9 @@ components: minimumTimeBetweenHoTriggerChange: $ref: '#/components/schemas/MinimumTimeBetweenHoTriggerChange' mLModelRefList: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnListRo' aIMLInferenceFunctionRefList: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnListRo' DPCIConfigurationFunction-Single: allOf: - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' @@ -1682,7 +1721,7 @@ components: setType: $ref: '#/components/schemas/RSSetType' nRCellDURefs: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnListRo' ExternalGnbDuFunction-Single: allOf: @@ -1705,6 +1744,16 @@ components: $ref: '#/components/schemas/EP_F1C-Multiple' EP_F1U: $ref: '#/components/schemas/EP_F1U-Multiple' + NRNetwork-Single: + allOf: + - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' + - type: object + properties: + NRFrequency: + $ref: '#/components/schemas/NRFrequency-Multiple' + ExternalGnbCuCpFunction: + $ref: '#/components/schemas/ExternalGnbCuCpFunction-Multiple' + ExternalGnbCuUpFunction-Single: allOf: - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' @@ -1775,6 +1824,16 @@ components: nRFrequencyRef: $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' + EUtraNetwork-Single: + allOf: + - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' + - type: object + properties: + EUtranFrequency: + $ref: '#/components/schemas/EUtranFrequency-Multiple' + ExternalENBFunction: + $ref: '#/components/schemas/ExternalENBFunction-Multiple' + ExternalENBFunction-Single: allOf: - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' @@ -1905,7 +1964,7 @@ components: remoteAddress: $ref: '#/components/schemas/RemoteAddress' epTransportRefs: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnListRo' EP_NgU-Single: allOf: @@ -1922,7 +1981,7 @@ components: remoteAddress: $ref: '#/components/schemas/RemoteAddress' epTransportRefs: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnListRo' EP_X2U-Single: allOf: @@ -2203,6 +2262,9 @@ components: - $ref: '#/components/schemas/NrCellDu-Single' - $ref: '#/components/schemas/NrOperatorCellDu-Single' + - $ref: '#/components/schemas/NRNetwork-Single' + - $ref: '#/components/schemas/EUtraNetwork-Single' + - $ref: '#/components/schemas/NRFrequency-Single' - $ref: '#/components/schemas/EUtranFrequency-Single' diff --git a/OpenAPI/TS28541_SliceNrm.yaml b/OpenAPI/TS28541_SliceNrm.yaml index 121dc8f67f4d2c3a97d27200e1c9a19d54ea757b..1dc47d0e46215e27590fcce4dac5656cd8b4cc38 100755 --- a/OpenAPI/TS28541_SliceNrm.yaml +++ b/OpenAPI/TS28541_SliceNrm.yaml @@ -1,7 +1,7 @@ openapi: 3.0.1 info: title: Slice NRM - version: 18.8.0 + version: 19.0.0 description: >- OAS 3.0.1 specification of the Slice NRM @ 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). @@ -31,6 +31,7 @@ components: - NOT_SUPPORTED - BETWEEN_BS_AND_UE - BETWEEN_BS_AND_UE_AND_UE_AND_UE + readOnly: true PositioningAvailability: type: array items: @@ -42,6 +43,7 @@ components: - AECID - HYBRID_POSITIONING - NET_RTK + readOnly: true PredictionFrequency: type: string enum: @@ -69,14 +71,17 @@ components: enum: - CHARACTER - SCALABILITY + readOnly: true Tagging: type: array + readOnly: true items: type: string enum: - PERFORMANCE - FUNCTION - OPERATION + readOnly: true Exposure: type: string enum: @@ -96,6 +101,7 @@ components: enum: - NOT_SUPPORTED - SUPPORTED + readOnly: true DelayTolerance: type: object properties: @@ -127,9 +133,9 @@ components: servAttrCom: $ref: '#/components/schemas/ServAttrCom' guaThpt: - $ref: '#/components/schemas/Float' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/FloatRo' maxThpt: - $ref: '#/components/schemas/Float' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/FloatRo' MaxPktSize: type: object properties: @@ -144,6 +150,7 @@ components: $ref: '#/components/schemas/ServAttrCom' nOofPDUSessions: type: integer + readOnly: true KPIMonitoring: type: object properties: @@ -153,6 +160,7 @@ components: type: array items: type: string + readOnly: true NBIoT: type: object properties: @@ -210,13 +218,16 @@ components: $ref: '#/components/schemas/ServAttrCom' density: type: integer + readOnly: true NsInfo: type: object properties: nsInstanceId: type: string + readOnly: true nsName: type: string + readOnly: true description: type: string EmbbEEPerfReq: @@ -273,12 +284,14 @@ components: properties: secFunId: type: string + readOnly: true secFunType: type: string secRules: type: array items: type: string + readOnly: true N6Protection: type: object properties: @@ -578,6 +591,7 @@ components: properties: serviceProfileId: type: string + readOnly: true plmnInfoList: $ref: 'TS28541_NrNrm.yaml#/components/schemas/PlmnInfoList' maxNumberofUEs: @@ -674,6 +688,7 @@ components: properties: sliceProfileId: type: string + readOnly: true plmnInfoList: $ref: 'TS28541_NrNrm.yaml#/components/schemas/PlmnInfoList' cNSliceSubnetProfile: @@ -682,11 +697,6 @@ components: $ref: '#/components/schemas/RANSliceSubnetProfile' topSliceSubnetProfile: $ref: '#/components/schemas/TopSliceSubnetProfile' - - IpAddress: - oneOf: - - $ref: 'TS28623_ComDefs.yaml#/components/schemas/Ipv4Addr' - - $ref: 'TS28623_ComDefs.yaml#/components/schemas/Ipv6Addr' LogicalInterfaceInfo: type: object @@ -746,10 +756,12 @@ components: enum: - FEASIBLE - INFEASIBLE + readOnly: true InFeasibleReason: description: >- An attribute that specifies the additional reason information if the feasibility check result is infeasible.The detailed ENUM value is FFS. type: string + readOnly: true RecommendationRequest: description: >- An attribute represents MnS consumer's request for recommended network slice related requirements. @@ -758,6 +770,7 @@ components: description: >- An attribute that specifies the recommended network slicing related requirements (i.e. ServiceProfile and SliceProfile information) which can be supported by the MnS producer.. type: string + readOnly: true ResourceReservation: description: >- An attribute represents MnS consumer's requirements for resource reservation. @@ -774,6 +787,7 @@ components: - RESERVED - UNRESERVED - USED + readOnly: true ReservationExpiration: description: >- An attribute which specifies the actual validity period of the resource reservation.. @@ -782,7 +796,7 @@ components: description: >- An attribute that specifies the additional reason information if the reservation is failed. type: string - + readOnly: true ResourceIsolationRule: type: object properties: @@ -836,7 +850,7 @@ components: - type: object properties: networkSliceSubnetRef: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnRo' operationalState: $ref: 'TS28623_ComDefs.yaml#/components/schemas/OperationalState' administrativeState: @@ -844,7 +858,7 @@ components: serviceProfileList: $ref: '#/components/schemas/ServiceProfileList' networkSliceControllerRef: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnListRo' isolationProfileRef: $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' @@ -858,9 +872,9 @@ components: - type: object properties: managedFunctionRefList: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnListRo' networkSliceSubnetRefList: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnListRo' operationalState: $ref: 'TS28623_ComDefs.yaml#/components/schemas/OperationalState' administrativeState: @@ -880,7 +894,7 @@ components: - RAN_SLICESUBNET - CN_SLICESUBNET networkSliceSubnetControllerRef: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnListRo' isolationProfileRef: $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' @@ -893,7 +907,7 @@ components: type: object properties: ipAddress: - $ref: '#/components/schemas/IpAddress' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/IpAddrRo' localLogicalInterfaceInfo: $ref: '#/components/schemas/LogicalInterfaceInfo' qosProfile: @@ -915,14 +929,16 @@ components: properties: dLlatency: type: integer + readOnly: true uLlatency: type: integer + readOnly: true dLThptPerSliceSubnet: $ref: '#/components/schemas/XLThpt' uLThptPerSliceSubnet: $ref: '#/components/schemas/XLThpt' coverageAreaTAList: - $ref: 'TS28541_NrNrm.yaml#/components/schemas/TaiList' + $ref: 'TS28541_5GcNrm.yaml#/components/schemas/TaiList' FeasibilityCheckAndReservationJob-Single: allOf: - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' @@ -971,6 +987,7 @@ components: $ref: '#/components/schemas/ServiceProfile' serviceProfileId: type: string + readOnly: true operationalState: $ref: 'TS28623_ComDefs.yaml#/components/schemas/OperationalState' administrativeState: @@ -980,7 +997,7 @@ components: processMonitor: $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ProcessMonitor' networkSliceRef: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnRo' NetworkSliceSubnetController-Single: allOf: @@ -1003,7 +1020,7 @@ components: processMonitor: $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ProcessMonitor' networkSliceSubnetRef: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnRo' IsolationProfile-Single: allOf: @@ -1021,9 +1038,9 @@ components: items: $ref: '#/components/schemas/ResourceIsolationRule' networkSliceRefList: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnListRo' networkSliceSubnetRefList: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnListRo' #-------- Definition of JSON arrays for name-contained IOCs ---------------------- diff --git a/OpenAPI/TS28623_ComDefs.yaml b/OpenAPI/TS28623_ComDefs.yaml index f5985b380d3b5e0fe042a76a134ec72c1e6251dc..ff303617cc6b5653408e8a361c90be9b6d72fbab 100755 --- a/OpenAPI/TS28623_ComDefs.yaml +++ b/OpenAPI/TS28623_ComDefs.yaml @@ -1,7 +1,7 @@ openapi: 3.0.1 info: title: Common Type Definitions - version: 18.7.0 + version: 19.1.0 description: >- OAS 3.0.1 specification of common type definitions in the Generic NRM © 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). @@ -14,11 +14,23 @@ components: schemas: Float: + description: This datatype is used for writable attribute type: number format: float + FloatRo: + description: This datatype is used for readOnly attribute + type: number + format: float + readOnly: true DateTime: + description: This datatype is used for writable attribute + type: string + format: date-time + DateTimeRo: + description: This datatype is used for readOnly attribute type: string format: date-time + readOnly: true FullTime: type: string description: format (e.g., full-time) is from RFC 3339 @@ -48,28 +60,60 @@ components: maximum: 180 Dn: + description: This datatype is used for writable attribute + type: string + DnRo: + description: This datatype is used for readOnly attribute type: string + readOnly: true DnList: + description: This datatype is used for writable attribute type: array items: $ref: '#/components/schemas/Dn' + DnListRo: + description: This datatype is used for readOnly attribute + type: array + items: + $ref: '#/components/schemas/DnRo' Mcc: + description: This datatype is used for writable attribut + type: string + pattern: '^[0-9]{3}$' + MccRo: + description: This datatype is used for readOnly attribute type: string pattern: '^[0-9]{3}$' + readOnly: true Mnc: + description: This datatype is used for writable attribut type: string pattern: '^[0-9]{2,3}$' + MncRo: + description: This datatype is used for readOnly attribute + type: string + pattern: '^[0-9]{2,3}$' + readOnly: true Nid: type: string pattern: '^[A-Fa-f0-9]{11}$' PlmnId: + description: This datatype is used for writable attribute type: object properties: mcc: $ref: '#/components/schemas/Mcc' mnc: $ref: '#/components/schemas/Mnc' + PlmnIdRo: + description: This datatype is used for readOnly attribute + type: object + properties: + mcc: + $ref: '#/components/schemas/MccRo' + mnc: + $ref: '#/components/schemas/MncRo' Tac: type: string pattern: '(^[A-Fa-f0-9]{4}$)|(^[A-Fa-f0-9]{6}$)' @@ -80,8 +124,9 @@ components: pattern: '^[A-Fa-f0-9]{7}$' NrCellId: type: string - pattern: '^[A-Fa-f0-9]{9}$' + pattern: '^[A-Fa-f0-9]{9}$' TimeWindow: + description: This datatype is used for writable attribute oneOf: - type: object properties: @@ -96,7 +141,24 @@ components: - type: object properties: endTime: - $ref: '#/components/schemas/DateTime' + $ref: '#/components/schemas/DateTime' + TimeWindowRo: + description: This datatype is used for readOnly attribute + oneOf: + - type: object + properties: + startTime: + $ref: '#/components/schemas/DateTimeRo' + endTime: + $ref: '#/components/schemas/DateTimeRo' + - type: object + properties: + startTime: + $ref: '#/components/schemas/DateTimeRo' + - type: object + properties: + endTime: + $ref: '#/components/schemas/DateTimeRo' GeoCoordinate: type: object properties: @@ -143,27 +205,71 @@ components: Fqdn: type: string + description: This datatype is used for writable attribute + pattern: '^([0-9A-Za-z]([-0-9A-Za-z]{0,61}[0-9A-Za-z])?\.)+[A-Za-z]{2,63}\.?$' + minLength: 4 + maxLength: 253 + FqdnRo: + type: string + description: This datatype is used for readOnly attribute + pattern: '^([0-9A-Za-z]([-0-9A-Za-z]{0,61}[0-9A-Za-z])?\.)+[A-Za-z]{2,63}\.?$' + minLength: 4 + maxLength: 253 + readOnly: true + Ipv4Addr: + description: This datatype is used for writable attribute type: string pattern: '^(([0-9]|[1-9][0-9]|1[0-9][0-9]|2[0-4][0-9]|25[0-5])\.){3}([0-9]|[1-9][0-9]|1[0-9][0-9]|2[0-4][0-9]|25[0-5])$' example: '198.51.100.1' + Ipv4AddrRo: + description: This datatype is used for readOnly attribute + type: string + pattern: '^(([0-9]|[1-9][0-9]|1[0-9][0-9]|2[0-4][0-9]|25[0-5])\.){3}([0-9]|[1-9][0-9]|1[0-9][0-9]|2[0-4][0-9]|25[0-5])$' + example: '198.51.100.1' + readOnly: true Ipv6Addr: + description: This datatype is used for writable attribute + type: string + allOf: + - pattern: '^((:|(0?|([1-9a-f][0-9a-f]{0,3}))):)((0?|([1-9a-f][0-9a-f]{0,3})):){0,6}(:|(0?|([1-9a-f][0-9a-f]{0,3})))$' + - pattern: '^((([^:]+:){7}([^:]+))|((([^:]+:)*[^:]+)?::(([^:]+:)*[^:]+)?))$' + example: '2001:db8:85a3::8a2e:370:7334' + Ipv6AddrRo: + description: This datatype is used for readOnly attribute type: string allOf: - pattern: '^((:|(0?|([1-9a-f][0-9a-f]{0,3}))):)((0?|([1-9a-f][0-9a-f]{0,3})):){0,6}(:|(0?|([1-9a-f][0-9a-f]{0,3})))$' - pattern: '^((([^:]+:){7}([^:]+))|((([^:]+:)*[^:]+)?::(([^:]+:)*[^:]+)?))$' example: '2001:db8:85a3::8a2e:370:7334' + readOnly: true Ipv6Prefix: + description: This datatype is used for writable attribute type: string allOf: - pattern: '^((:|(0?|([1-9a-f][0-9a-f]{0,3}))):)((0?|([1-9a-f][0-9a-f]{0,3})):){0,6}(:|(0?|([1-9a-f][0-9a-f]{0,3})))(\/(([0-9])|([0-9]{2})|(1[0-1][0-9])|(12[0-8])))$' - pattern: '^((([^:]+:){7}([^:]+))|((([^:]+:)*[^:]+)?::(([^:]+:)*[^:]+)?))(\/.+)$' example: '2001:db8:abcd:12::0/64' + Ipv6PrefixRo: + description: This datatype is used for readOnly attribute + type: string + allOf: + - pattern: '^((:|(0?|([1-9a-f][0-9a-f]{0,3}))):)((0?|([1-9a-f][0-9a-f]{0,3})):){0,6}(:|(0?|([1-9a-f][0-9a-f]{0,3})))(\/(([0-9])|([0-9]{2})|(1[0-1][0-9])|(12[0-8])))$' + - pattern: '^((([^:]+:){7}([^:]+))|((([^:]+:)*[^:]+)?::(([^:]+:)*[^:]+)?))(\/.+)$' + example: '2001:db8:abcd:12::0/64' + readOnly: true IpAddr: + description: This datatype is used for writable attribute oneOf: - $ref: '#/components/schemas/Ipv4Addr' - $ref: '#/components/schemas/Ipv6Addr' - $ref: '#/components/schemas/Ipv6Prefix' + IpAddrRo: + description: This datatype is used for readOnly attribute + oneOf: + - $ref: '#/components/schemas/Ipv4AddrRo' + - $ref: '#/components/schemas/Ipv6AddrRo' + - $ref: '#/components/schemas/Ipv6PrefixRo' HostAddr: # This definition will be deprecated, when all occurances of HostAddr # are replaced by Host. @@ -176,7 +282,12 @@ components: - $ref: '#/components/schemas/IpAddr' - $ref: '#/components/schemas/Fqdn' Uri: + description: This datatype is used for writable attribute type: string + UriRo: + type: string + description: This datatype is used for readOnly attribute + readOnly: true TimeInterval: type: object @@ -192,14 +303,21 @@ components: - LOCKED - UNLOCKED default: LOCKED + BasicAdministrativeState: + type: string + enum: + - LOCKED + - UNLOCKED OperationalState: type: string enum: - ENABLED - DISABLED - default: DISABLED + default: DISABLED + readOnly: true UsageState: type: string + readOnly: true enum: - IDLE - ACTIVE @@ -216,6 +334,7 @@ components: - DEGRADED - NOT_INSTALLED - LOG_FULL + readOnly: true AttributeNameValuePairSet: description: >- diff --git a/OpenAPI/TS28623_FileManagementNrm.yaml b/OpenAPI/TS28623_FileManagementNrm.yaml index a0b20fe331eb04fc84b438f734814a577bbc437c..305ba783ad2999b3e002fce451828ae8ed2fd367 100644 --- a/OpenAPI/TS28623_FileManagementNrm.yaml +++ b/OpenAPI/TS28623_FileManagementNrm.yaml @@ -1,7 +1,7 @@ openapi: 3.0.1 info: title: File Management NRM - version: 18.7.0 + version: 19.1.0 description: >- OAS 3.0.1 definition of the File Management NRM fragment © 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). @@ -12,6 +12,25 @@ externalDocs: paths: {} components: schemas: + + #-------- Definition of types for name-containments ------ + SubNetwork-ncO-FileManagementNrm: + type: object + properties: + FileDownloadJob: + $ref: '#/components/schemas/FileDownloadJob-Multiple' + Files: + $ref: '#/components/schemas/Files-Multiple' + ManagedElement-ncO-FileManagementNrm: + type: object + properties: + FileDownloadJob: + $ref: '#/components/schemas/FileDownloadJob-Multiple' + Files: + $ref: '#/components/schemas/Files-Multiple' + #-------Definition of generic IOCs ----------# + + #-------- Definition of types----------------------------------------------------- FileDownloadJobProcessMonitor: description: >- @@ -21,8 +40,10 @@ components: properties: jobId: type: string + readOnly: true status: type: string + readOnly: true enum: - NOT_STARTED - RUNNING @@ -32,13 +53,16 @@ components: - CANCELLED progressPercentage: type: integer + readOnly: true minimum: 0 maximum: 100 progressStateInfo: + readOnly: true type: string resultStateInfo: oneOf: - type: string + readOnly: true enum: - NULL - UNKNOWN @@ -50,10 +74,11 @@ components: - TIMER_EXPIRED - OTHER - type: string + readOnly: true startTime: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTime' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTimeRo' endTime: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTime' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTimeRo' timer: type: integer @@ -90,10 +115,12 @@ components: properties: numberOfFiles: type: integer + readOnly: true jobRef: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnRo' jobId: type: string + readOnly: true File: $ref: '#/components/schemas/File-Multiple' File-Single: @@ -105,13 +132,16 @@ components: type: object properties: fileLocation: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/Uri' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/UriRo' fileCompression: type: string + readOnly: true fileSize: type: integer + readOnly: true fileDataType: type: string + readOnly: true enum: - PERFORMANCE - TRACE @@ -119,16 +149,19 @@ components: - PROPRIETARY fileFormat: type: string + readOnly: true fileReadyTime: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTime' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTimeRo' fileExpirationTime: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTime' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTimeRo' fileContent: type: string + readOnly: true jobRef: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnRo' jobId: type: string + readOnly: true diff --git a/OpenAPI/TS28623_GenericNrm.yaml b/OpenAPI/TS28623_GenericNrm.yaml index 695a96fa442dded3b0438515c7de8c8ad024ef97..1346cf3a95ebc02a366e20b4cc1583e8d7105be0 100755 --- a/OpenAPI/TS28623_GenericNrm.yaml +++ b/OpenAPI/TS28623_GenericNrm.yaml @@ -1,7 +1,7 @@ openapi: 3.0.1 info: title: Generic NRM - version: 18.7.0 + version: 19.1.0 description: >- OAS 3.0.1 definition of the Generic NRM © 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). @@ -15,11 +15,7 @@ components: #-------- Definition of types----------------------------------------------------- - RegistrationState: - type: string - enum: - - REGISTERED - - DEREGISTERED + VnfParameter: type: object properties: @@ -51,103 +47,7 @@ components: type: string powerInterface: type: string - Operation: - type: object - properties: - name: - type: string - allowedNFTypes: - $ref: '#/components/schemas/NFType' - operationSemantics: - $ref: '#/components/schemas/OperationSemantics' - NFType: - type: string - description: ' NF name defined in TS 23.501 or TS 29.510' - enum: - - NRF - - UDM - - AMF - - SMF - - AUSF - - NEF - - PCF - - SMSF - - NSSF - - UDR - - LMF - - GMLC - - 5G_EIR - - SEPP - - UPF - - N3IWF - - AF - - UDSF - - DN - - BSF - - CHF - - NWDAF - - PCSCF - - CBCF - - HSS - - UCMF - - SOR_AF - - SPAF - - MME - - SCSAS - - SCEF - - SCP - - NSSAAF - - ICSCF - - SCSCF - - DRA - - IMS_AS - - AANF - - 5G_DDNMF - - NSACF - - MFAF - - EASDF - - DCCF - - MB_SMF - - TSCTSF - - ADRF - - GBA_BSF - - CEF - - MB_UPF - - NSWOF - - PKMF - - MNPF - - SMS_GMSC - - SMS_IWMSC - - MBSF - - MBSTF - - PANF - - TNGF - - W_AGF - - TWIF - - TSN_AF - OperationSemantics: - type: string - enum: - - REQUEST_RESPONSE - - SUBSCRIBE_NOTIFY - SAP: - type: object - properties: - host: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/HostAddr' - port: - type: integer - NFServiceType: - type: string - enum: - - Namf_Communication - - Namf_EventExposure - - Namf_MT - - Namf_Location - - Nsmf_PDUSession - - Nsmf_EventExposure - - Others TransportProtocol: anyOf: - type: string @@ -161,11 +61,13 @@ components: type: array items: type: string + readOnly: true granularityPeriods: type: array items: type: integer minimum: 1 + readOnly: true reportingMethods: type: array items: @@ -173,12 +75,14 @@ components: enum: - FILE_BASED_LOC_SET_BY_PRODUCER - FILE_BASED_LOC_SET_BY_CONSUMER - - STREAM_BASED + - STREAM_BASED + readOnly: true reportingPeriods: type: array items: type: integer minimum: 1 + readOnly: true ReportingCtrl: oneOf: - type: object @@ -201,23 +105,6 @@ components: properties: streamTarget: $ref: 'TS28623_ComDefs.yaml#/components/schemas/Uri' - Scope: - oneOf: - - type: object - properties: - scopeType: - type: string - enum: - - BASE_ONLY - - BASE_ALL - - BASE_NTH_LEVEL - - BASE_SUBTREE - scopeLevel: - type: integer - - type: object - properties: - dataNodeSelector: - type: string ProcessMonitor: description: >- This data type is the "ProcessMonitor" data type without specialisations. @@ -225,6 +112,7 @@ components: properties: jobId: type: string + readOnly: true status: type: string enum: @@ -235,38 +123,42 @@ components: - PARTIALLY_FAILED - CANCELLING - CANCELLED + readOnly: true progressPercentage: type: integer minimum: 0 maximum: 100 + readOnly: true progressStateInfo: type: string + readOnly: true resultStateInfo: type: string + readOnly: true startTime: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTime' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTimeRo' endTime: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTime' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTimeRo' timer: type: integer AreaScope: - oneOf: - - type: array - items: - $ref: '#/components/schemas/EutraCellId' - - type: array - items: - $ref: '#/components/schemas/NrCellId' - - type: array - items: - $ref: '#/components/schemas/Tac' - - type: array - items: - $ref: '#/components/schemas/Tai' + allOf: - type: array items: $ref: '#/components/schemas/NpnId-Type' - + - oneOf: + - type: array + items: + $ref: '#/components/schemas/EutraCellId' + - type: array + items: + $ref: '#/components/schemas/NrCellId' + - type: array + items: + $ref: '#/components/schemas/Tac' + - type: array + items: + $ref: '#/components/schemas/Tai' Tai: type: object properties: @@ -277,8 +169,8 @@ components: tac: $ref: '#/components/schemas/Tac' Tac: - type: string - pattern: '(^[A-Fa-f0-9]{4}$)|(^[A-Fa-f0-9]{6}$)' + type: string + pattern: '(^[A-Fa-f0-9]{4}$)|(^[A-Fa-f0-9]{6}$)' EutraCellId: type: string pattern: '^[A-Fa-f0-9]{7}$' @@ -398,8 +290,10 @@ components: type: array items: $ref: 'TS28623_ComDefs.yaml#/components/schemas/Mcc' + readOnly: true priorityLabel: type: integer + readOnly: true supportedPerfMetricGroups: type: array items: @@ -425,10 +319,12 @@ components: $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList' vendorName: type: string + readOnly: true userDefinedState: type: string swVersion: type: string + readOnly: true priorityLabel: type: integer supportedPerfMetricGroups: @@ -439,6 +335,7 @@ components: type: array items: type: string + readOnly: true SubNetwork-ncO: type: object @@ -453,60 +350,30 @@ components: $ref: '#/components/schemas/MnsAgent-Multiple' MeContext: $ref: '#/components/schemas/MeContext-Multiple' - PerfMetricJob: - $ref: 'TS28623_PmControlNrm.yaml#/components/schemas/PerfMetricJob-Multiple' - ThresholdMonitor: - $ref: 'TS28623_ThresholdMonitorNrm.yaml#/components/schemas/ThresholdMonitor-Multiple' - TraceJob: - $ref: 'TS28623_TraceControlNrm.yaml#/components/schemas/TraceJob-Multiple' - ManagementDataCollection: - $ref: 'TS28623_ManagementDataCollectionNrm.yaml#/components/schemas/ManagementDataCollection-Multiple' - NtfSubscriptionControl: - $ref: 'TS28623_SubscriptionControlNrm.yaml#/components/schemas/NtfSubscriptionControl-Multiple' AlarmList: $ref: 'TS28111_FaultNrm.yaml#/components/schemas/AlarmList-Single' - FileDownloadJob: - $ref: 'TS28623_FileManagementNrm.yaml#/components/schemas/FileDownloadJob-Multiple' - Files: - $ref: 'TS28623_FileManagementNrm.yaml#/components/schemas/Files-Multiple' - MnsRegistry: - $ref: 'TS28623_MnSRegistryNrm.yaml#/components/schemas/MnsRegistry-Single' Scheduler: $ref: '#/components/schemas/Scheduler-Multiple' ConditionMonitor: $ref: '#/components/schemas/ConditionMonitor-Multiple' SupportedNotifications: $ref: '#/components/schemas/SupportedNotifications-Single' - QMCJobs: - $ref: 'TS28623_QoEMeasurementCollectionNrm.yaml#/components/schemas/QMCJob-Multiple' + ManagedElement-ncO: type: object properties: MnsAgent: $ref: '#/components/schemas/MnsAgent-Multiple' - PerfMetricJob: - $ref: 'TS28623_PmControlNrm.yaml#/components/schemas/PerfMetricJob-Multiple' - ThresholdMonitor: - $ref: 'TS28623_ThresholdMonitorNrm.yaml#/components/schemas/ThresholdMonitor-Multiple' - TraceJob: - $ref: 'TS28623_TraceControlNrm.yaml#/components/schemas/TraceJob-Multiple' - NtfSubscriptionControl: - $ref: 'TS28623_SubscriptionControlNrm.yaml#/components/schemas/NtfSubscriptionControl-Multiple' AlarmList: $ref: 'TS28111_FaultNrm.yaml#/components/schemas/AlarmList-Single' - FileDownloadJob: - $ref: 'TS28623_FileManagementNrm.yaml#/components/schemas/FileDownloadJob-Multiple' - Files: - $ref: 'TS28623_FileManagementNrm.yaml#/components/schemas/Files-Multiple' Scheduler: $ref: '#/components/schemas/Scheduler-Multiple' ConditionMonitor: $ref: '#/components/schemas/ConditionMonitor-Multiple' SupportedNotifications: $ref: '#/components/schemas/SupportedNotifications-Single' - QMCJobs: - $ref: 'TS28623_QoEMeasurementCollectionNrm.yaml#/components/schemas/QMCJob-Multiple' + #-------- Definition of abstract IOCs -------------------------------------------- @@ -540,6 +407,7 @@ components: type: string farEndEntity: type: string + readOnly: true supportedPerfMetricGroups: type: array items: @@ -552,8 +420,6 @@ components: $ref: 'TS28623_PmControlNrm.yaml#/components/schemas/PerfMetricJob-Multiple' ThresholdMonitor: $ref: 'TS28623_ThresholdMonitorNrm.yaml#/components/schemas/ThresholdMonitor-Multiple' - ManagedNFService: - $ref: '#/components/schemas/ManagedNFService-Multiple' TraceJob: $ref: 'TS28623_TraceControlNrm.yaml#/components/schemas/TraceJob-Multiple' @@ -569,38 +435,15 @@ components: properties: vsDataType: type: string + readOnly: true vsDataFormatVersion: type: string + readOnly: true vsData: nullable: true VsDataContainer: $ref: '#/components/schemas/VsDataContainer-Multiple' - ManagedNFService-Single: - allOf: - - $ref: '#/components/schemas/Top' - - type: object - properties: - attributes: - type: object - properties: - userLabel: - type: string - nFServiceType: - $ref: '#/components/schemas/NFServiceType' - sAP: - $ref: '#/components/schemas/SAP' - operations: - type: array - items: - $ref: '#/components/schemas/Operation' - administrativeState: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/AdministrativeState' - operationalState: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/OperationalState' - usageState: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/UsageState' - registrationState: - $ref: '#/components/schemas/RegistrationState' + ManagementNode-Single: allOf: - $ref: '#/components/schemas/Top' @@ -615,12 +458,15 @@ components: $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList' vendorName: type: string + readOnly: true userDefinedState: type: string locationName: type: string + readOnly: true swVersion: type: string + readOnly: true MnsAgent: $ref: '#/components/schemas/MnsAgent-Multiple' MnsAgent-Single: @@ -632,7 +478,7 @@ components: type: object properties: systemDN: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnRo' MeContext-Single: allOf: - $ref: '#/components/schemas/Top' @@ -643,6 +489,7 @@ components: properties: dnPrefix: type: string + readOnly: true Scheduler-Single: allOf: - $ref: '#/components/schemas/Top' @@ -658,6 +505,7 @@ components: minItems: 1 schedulerStatus: type: boolean + readOnly: true ConditionMonitor-Single: allOf: - $ref: '#/components/schemas/Top' @@ -670,6 +518,7 @@ components: type: string conditionStatus: type: boolean + readOnly: true SupportedNotifications-Single: allOf: @@ -691,6 +540,7 @@ components: - HTTP - HTTP_VES_ENCAPS minItems: 1 + readOnly: true SubNetwork-Single: @@ -698,6 +548,16 @@ components: - $ref: '#/components/schemas/Top' - $ref: '#/components/schemas/SubNetwork-Attr' - $ref: '#/components/schemas/SubNetwork-ncO' + - $ref: '#/components/schemas/SubNetwork-Multiple' + - $ref: '#/components/schemas/ManagedElement-Multiple' + - $ref: 'TS28623_FileManagementNrm.yaml#/components/schemas/SubNetwork-ncO-FileManagementNrm' + - $ref: 'TS28623_PmControlNrm.yaml#/components/schemas/SubNetwork-ncO-PmControlNrm' + - $ref: 'TS28623_SubscriptionControlNrm.yaml#/components/schemas/SubNetwork-ncO-SubscriptionControlNrm' + - $ref: 'TS28623_ThresholdMonitorNrm.yaml#/components/schemas/SubNetwork-ncO-ThresholdMonitorNrm' + - $ref: 'TS28623_TraceControlNrm.yaml#/components/schemas/SubNetwork-ncO-TraceControlNrm' + - $ref: 'TS28623_QoEMeasurementCollectionNrm.yaml#/components/schemas/SubNetwork-ncO-QoEMeasurementCollectionNrm' + - $ref: 'TS28623_ManagementDataCollectionNrm.yaml#/components/schemas/SubNetwork-ncO-ManagementDataCollectionNrm' + - $ref: 'TS28623_MnSRegistryNrm.yaml#/components/schemas/SubNetwork-ncO-MnSRegistryNrm' - $ref: 'TS28104_MdaNrm.yaml#/components/schemas/SubNetwork-ncO-MdaNrm' - $ref: 'TS28105_AiMlNrm.yaml#/components/schemas/SubNetwork-ncO-AiMlNrm' - $ref: 'TS28312_IntentNrm.yaml#/components/schemas/SubNetwork-ncO-IntentNrm' @@ -708,12 +568,19 @@ components: - $ref: 'TS28541_NrNrm.yaml#/components/schemas/SubNetwork-ncO-NrNrm' - $ref: 'TS28541_5GcNrm.yaml#/components/schemas/SubNetwork-ncO-5GcNrm' - $ref: 'TS28318_DsoNrm.yaml#/components/schemas/SubNetwork-ncO-DsoNrm' + ManagedElement-Single: allOf: - $ref: '#/components/schemas/Top' - $ref: '#/components/schemas/ManagedElement-Attr' - $ref: '#/components/schemas/ManagedElement-ncO' + - $ref: 'TS28623_FileManagementNrm.yaml#/components/schemas/ManagedElement-ncO-FileManagementNrm' + - $ref: 'TS28623_PmControlNrm.yaml#/components/schemas/ManagedElement-PmControlNrm' + - $ref: 'TS28623_SubscriptionControlNrm.yaml#/components/schemas/ManagedElement-ncO-SubscriptionControlNrm' + - $ref: 'TS28623_ThresholdMonitorNrm.yaml#/components/schemas/ManagedElement-ncO-ThresholdMonitorNrm' + - $ref: 'TS28623_TraceControlNrm.yaml#/components/schemas/SubNetwork-ncO-TraceControlNrm' + - $ref: 'TS28623_QoEMeasurementCollectionNrm.yaml#/components/schemas/ManagedElement-ncO-QoEMeasurementCollectionNrm' - $ref: 'TS28104_MdaNrm.yaml#/components/schemas/ManagedElement-ncO-MdaNrm' - $ref: 'TS28105_AiMlNrm.yaml#/components/schemas/ManagedElement-ncO-AiMlNrm' - $ref: 'TS28536_CoslaNrm.yaml#/components/schemas/ManagedElement-ncO-CoslaNrm' @@ -737,10 +604,6 @@ components: type: array items: $ref: '#/components/schemas/VsDataContainer-Single' - ManagedNFService-Multiple: - type: array - items: - $ref: '#/components/schemas/ManagedNFService-Single' ManagementNode-Multiple: type: array items: @@ -780,7 +643,6 @@ components: - $ref: '#/components/schemas/ManagementNode-Single' - $ref: '#/components/schemas/MnsAgent-Single' - $ref: '#/components/schemas/MeContext-Single' - - $ref: '#/components/schemas/ManagedNFService-Single' - $ref: '#/components/schemas/Scheduler-Single' - $ref: '#/components/schemas/ConditionMonitor-Single' - $ref: '#/components/schemas/SupportedNotifications-Single' diff --git a/OpenAPI/TS28623_ManagementDataCollectionNrm.yaml b/OpenAPI/TS28623_ManagementDataCollectionNrm.yaml index 185272364845362b9300407f310bcb572f64d26c..9424693be95af42123017d9866bbbe12502edb42 100644 --- a/OpenAPI/TS28623_ManagementDataCollectionNrm.yaml +++ b/OpenAPI/TS28623_ManagementDataCollectionNrm.yaml @@ -1,7 +1,7 @@ openapi: 3.0.1 info: title: Management Data Collection NRM - version: 18.6.0 + version: 19.0.0 description: >- OAS 3.0.1 definition of the Management Data Collection NRM fragment © 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). @@ -12,6 +12,15 @@ externalDocs: paths: {} components: schemas: + #-------- Definition of types for name-containments ------ + SubNetwork-ncO-ManagementDataCollectionNrm: + type: object + properties: + ManagementDataCollection: + $ref: '#/components/schemas/ManagementDataCollection-Multiple' + + #-------Definition of generic IOCs ----------# + #-------- Definition of types----------------------------------------------------- ManagementData: diff --git a/OpenAPI/TS28623_MnSRegistryNrm.yaml b/OpenAPI/TS28623_MnSRegistryNrm.yaml index a5a022a43f8b576e39191a012fce3acccae370d9..153a45cc9441d0973786250ca48c8672e5817cc8 100644 --- a/OpenAPI/TS28623_MnSRegistryNrm.yaml +++ b/OpenAPI/TS28623_MnSRegistryNrm.yaml @@ -1,7 +1,7 @@ openapi: 3.0.1 info: title: MnS Registry NRM - version: 18.6.0 + version: 19.1.0 description: >- OAS 3.0.1 definition of the MnS Registry NRM fragment © 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). @@ -12,6 +12,15 @@ externalDocs: paths: {} components: schemas: + #-------- Definition of types for name-containments ------ + SubNetwork-ncO-MnSRegistryNrm: + type: object + properties: + MnsRegistry: + $ref: '#/components/schemas/MnsRegistry-Single' + + #-------Definition of generic IOCs ----------# + #-------- Definition of types----------------------------------------------------- #-------- Definition of concrete IOCs -------------------------------------------- @@ -30,18 +39,21 @@ components: properties: mnsLabel: type: string + readOnly: true mnsType: type: string + readOnly: true enum: - - ProvMnS - - FaultSupervisionMnS - - StreamingDataReportingMnS - - FileDataReportingMnS + - PROV_MNS + - FAULT_SUPERVISION_MNS + - STREAMING_DATA_REPORTING_MNS + - FILE_DATA_REPORTING_MNS mnsVersion: type: string + readOnly: true mnsAddress: description: Resource URI as defined in the relevant Technical Specification - $ref: 'TS28623_ComDefs.yaml#/components/schemas/Uri' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/UriRo' mnsScope: description: >- List of the managed object instances that can be accessed using the MnS. @@ -50,7 +62,7 @@ components: entities within the SubNetwork. type: array items: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnRo' #-------- Definition of YAML arrays for name-contained IOCs ---------------------- diff --git a/OpenAPI/TS28623_PmControlNrm.yaml b/OpenAPI/TS28623_PmControlNrm.yaml index 23581d77711c1ee2a42c43c17f6ff70ea80a265c..720842e2d5fdc2a1da51430b9e15cb3ce9e0421b 100644 --- a/OpenAPI/TS28623_PmControlNrm.yaml +++ b/OpenAPI/TS28623_PmControlNrm.yaml @@ -1,7 +1,7 @@ openapi: 3.0.1 info: title: PM control NRM - version: 18.6.0 + version: 19.0.0 description: >- OAS 3.0.1 definition of the PM control NRM fragment © 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). @@ -12,6 +12,19 @@ externalDocs: paths: {} components: schemas: + #-------- Definition of types for name-containments ------ + SubNetwork-ncO-PmControlNrm: + type: object + properties: + PerfMetricJob: + $ref: '#/components/schemas/PerfMetricJob-Multiple' + ManagedElement-PmControlNrm: + type: object + properties: + PerfMetricJob: + $ref: '#/components/schemas/PerfMetricJob-Multiple' + #-------Definition of generic IOCs ----------# + #-------- Definition of types----------------------------------------------------- diff --git a/OpenAPI/TS28623_QoEMeasurementCollectionNrm.yaml b/OpenAPI/TS28623_QoEMeasurementCollectionNrm.yaml index 0ec934f5540d55813b22b2d71b2987662cf55e39..c7811203e19e34d545a025e518ac795c0680fcbe 100644 --- a/OpenAPI/TS28623_QoEMeasurementCollectionNrm.yaml +++ b/OpenAPI/TS28623_QoEMeasurementCollectionNrm.yaml @@ -1,7 +1,7 @@ openapi: 3.0.1 info: title: QoE Measurement Collection NRM - version: 18.7.0 + version: 19.1.0 description: >- OAS 3.0.1 definition of the QoE Measurement Collection NRM © 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). @@ -12,6 +12,20 @@ externalDocs: paths: {} components: schemas: + #-------- Definition of types for name-containments ------ + SubNetwork-ncO-QoEMeasurementCollectionNrm: + type: object + properties: + QMCJobs: + $ref: '#/components/schemas/QMCJob-Multiple' + ManagedElement-ncO-QoEMeasurementCollectionNrm: + type: object + properties: + QMCJobs: + $ref: '#/components/schemas/QMCJob-Multiple' + #-------Definition of generic IOCs ----------# + + #-------- Definition of types----------------------------------------------------- #-------- Definition of concrete IOCs -------------------------------------------- @@ -62,6 +76,7 @@ components: maxItems: 2 mBSCommunicationServiceType: type: string + readOnly: true enum: - BROADCAST - MULTICAST diff --git a/OpenAPI/TS28623_SubscriptionControlNrm.yaml b/OpenAPI/TS28623_SubscriptionControlNrm.yaml index 5d493262645fbb6458f8ab4ea7730cecd0226216..f077c875dd5aeb2ea22dd609424e155a8e1b4b49 100644 --- a/OpenAPI/TS28623_SubscriptionControlNrm.yaml +++ b/OpenAPI/TS28623_SubscriptionControlNrm.yaml @@ -1,7 +1,7 @@ openapi: 3.0.1 info: title: Subscription Control NRM - version: 18.7.0 + version: 19.1.0 description: >- OAS 3.0.1 definition of the Subscription Control NRM fragment © 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). @@ -12,19 +12,37 @@ externalDocs: paths: {} components: schemas: -#-------- Definition of types----------------------------------------------------- - Scope: + #-------- Definition of types for name-containments ------ + SubNetwork-ncO-SubscriptionControlNrm: + type: object + properties: + NtfSubscriptionControl: + $ref: '#/components/schemas/NtfSubscriptionControl-Multiple' + ManagedElement-ncO-SubscriptionControlNrm: type: object properties: - scopeType: - type: string - enum: - - BASE_ONLY - - BASE_ALL - - BASE_NTH_LEVEL - - BASE_SUBTREE - scopeLevel: - type: integer + NtfSubscriptionControl: + $ref: '#/components/schemas/NtfSubscriptionControl-Multiple' + #-------Definition of generic IOCs ----------# + +#-------- Definition of types----------------------------------------------------- + Scope: + oneOf: + - type: object + properties: + scopeType: + type: string + enum: + - BASE_ONLY + - BASE_ALL + - BASE_NTH_LEVEL + - BASE_SUBTREE + scopeLevel: + type: integer + - type: object + properties: + dataNodeSelector: + type: string #-------- Definition of concrete IOCs -------------------------------------------- NtfSubscriptionControl-Single: diff --git a/OpenAPI/TS28623_ThresholdMonitorNrm.yaml b/OpenAPI/TS28623_ThresholdMonitorNrm.yaml index d4fd1aac13b8626765a66fec90517223ecfea802..84e95a94a738be33ec6ecc3d884f88d1ea3cefdf 100644 --- a/OpenAPI/TS28623_ThresholdMonitorNrm.yaml +++ b/OpenAPI/TS28623_ThresholdMonitorNrm.yaml @@ -1,7 +1,7 @@ openapi: 3.0.1 info: title: Threshold Monitor NRM - version: 18.2.0 + version: 19.0.0 description: >- OAS 3.0.1 definition of the Threshold Monitor NRM fragment © 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). @@ -12,6 +12,19 @@ externalDocs: paths: {} components: schemas: + #-------- Definition of types for name-containments ------ + SubNetwork-ncO-ThresholdMonitorNrm: + type: object + properties: + ThresholdMonitor: + $ref: '#/components/schemas/ThresholdMonitor-Multiple' + ManagedElement-ncO-ThresholdMonitorNrm: + type: object + properties: + ThresholdMonitor: + $ref: '#/components/schemas/ThresholdMonitor-Multiple' + #-------Definition of generic IOCs ----------# + #-------- Definition of types----------------------------------------------------- ThresholdInfo: type: object diff --git a/OpenAPI/TS28623_TraceControlNrm.yaml b/OpenAPI/TS28623_TraceControlNrm.yaml index 0d09284e0e6357c9c2f8d90966a5e65af059ba66..f2d85e495a2efd1e20cff926d9541033bfbcaa92 100644 --- a/OpenAPI/TS28623_TraceControlNrm.yaml +++ b/OpenAPI/TS28623_TraceControlNrm.yaml @@ -1,7 +1,7 @@ openapi: 3.0.1 info: title: Trace Control NRM - version: 18.7.0 + version: 19.1.0 description: >- OAS 3.0.1 definition of the Trace Control NRM fragment © 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). @@ -12,6 +12,19 @@ externalDocs: paths: {} components: schemas: + #-------- Definition of types for name-containments ------ + SubNetwork-ncO-TraceControlNrm: + type: object + properties: + TraceJob: + $ref: '#/components/schemas/TraceJob-Multiple' + ManagedElement-ncO-TraceControlNrm: + type: object + properties: + TraceJob: + $ref: '#/components/schemas/TraceJob-Multiple' + #-------Definition of generic IOCs ----------# + #-------- Definition of types used in Trace control NRM fragment------------------ jobType-Type: @@ -40,8 +53,8 @@ components: type: string enum: - A - - Iu-CS - - Mc + - IU-CS + - MC - MAP-G - MAP-B - MAP-E @@ -54,33 +67,33 @@ components: items: type: string enum: - - Mc - - Nb-UP - - Iu-UP + - MC + - NB-UP + - IU-UP RNCInterfaces: type: array items: type: string enum: - - Iu-CS - - Iu-PS - - Iur - - Iub - - Uu + - IU-CS + - IU-PS + - IUR + - IUB + - UU SGSNInterfaces: type: array items: type: string enum: - - Gb - - Iu-PS - - Gn - - MAP-Gr - - MAP-Gd - - MAP-Gf - - Ge - - Gs - - S6d + - GB + - IU-PS + - GN + - MAP-GR + - MAP-GD + - MAP-GF + - GE + - GS + - S6D - S4 - S3 - S13 @@ -89,34 +102,34 @@ components: items: type: string enum: - - Gn - - Gi - - Gmb + - GN + - GI + - GMB S-CSCFInterfaces: type: array items: type: string enum: - - Mw - - Mg - - Mr - - Mi + - MW + - MG + - MR + - MI P-CSCFInterfaces: type: array items: type: string enum: - - Gm - - Mw + - GM + - MW I-CSCFInterfaces: type: array items: type: string enum: - - Cx - - Dx - - Mg - - Mw + - CX + - DX + - MG + - MW MRFCInterfaces: type: array items: @@ -129,42 +142,42 @@ components: items: type: string enum: - - Mg - - Mj - - Mn + - MG + - MJ + - MN IBCFInterfaces: type: array items: type: string enum: - - Ix - - Mx + - IX + - MX E-CSCFInterfaces: type: array items: type: string enum: - - Mw - - Ml - - Mm - - Mi/Mg + - MW + - ML + - MM + - MI/MG BGCFInterfaces: type: array items: type: string enum: - - Mi - - Mj - - Mk + - MI + - MJ + - MK ASInterfaces: type: array items: type: string enum: - - Dh - - Sh + - DH + - SH - ISC - - Ut + - UT HSSInterfaces: type: array items: @@ -172,12 +185,12 @@ components: enum: - MAP-C - MAP-D - - Gc - - Gr - - Cx - - S6d - - S6a - - Sh + - GC + - GR + - CX + - S6D + - S6A + - SH - N70 - N71 - NU1 @@ -188,13 +201,13 @@ components: enum: - MAP-F - S13 - - MAP-Gf + - MAP-GF BM-SCInterfaces: type: array items: type: string enum: - - Gmb + - GMB MMEInterfaces: type: array items: @@ -202,7 +215,7 @@ components: enum: - S1-MME - S3 - - S6a + - S6A - S10 - S11 - S13 @@ -215,20 +228,20 @@ components: - S5 - S8 - S11 - - Gxc + - GXC PDN_GWInterfaces: type: array items: type: string enum: - - S2a - - S2b - - S2c + - S2A + - S2B + - S2C - S5 - - S6b - - Gx + - S6B + - GX - S8 - - SGi + - SGI eNBInterfaces: type: array items: @@ -243,7 +256,7 @@ components: enum: - S1-MME - X2 - - Uu + - UU - F1-C - E1 AMFInterfaces: @@ -261,6 +274,8 @@ components: - N20 - N22 - N26 + - N41 + - N42 AUSFInterfaces: type: array items: @@ -297,6 +312,7 @@ components: - N5 - N7 - N15 + - N28 SMFInterfaces: type: array items: @@ -307,6 +323,10 @@ components: - N10 - N11 - S5-C + - N16 + - N16a + - N38 + - N40 SMSFInterfaces: type: array items: @@ -336,16 +356,16 @@ components: type: string enum: - NG-C - - Xn-C - - Uu + - XN-C + - UU gNB-CU-CPInterfaces: type: array items: type: string enum: - NG-C - - Xn-C - - Uu + - XN-C + - UU - F1-C - E1 - X2-C @@ -399,16 +419,12 @@ components: $ref: 'TS28623_ComDefs.yaml#/components/schemas/Mcc' mnc: $ref: 'TS28623_ComDefs.yaml#/components/schemas/Mnc' - required: - - mcc - - mnc listOfTraceMetrics: description: The trace metrics to be reported. See 3GPP TS 32.422 clause 10 for additional details. type: array items: type: string - traceDepth-Type: description: Specifies how detailed information should be recorded in the Network Element. The Trace Depth is a paremeter for Trace Session level, i.e., the Trace Depth is the same for all of the NEs to be traced in the same Trace Session. See 3GPP TS 32.422 clause 5.3 for additional details. @@ -432,10 +448,6 @@ components: $ref: 'TS28623_ComDefs.yaml#/components/schemas/Mnc' traceId: type: string - required: - - mcc - - mnc - - traceId traceReportingFormat-Type: type: string @@ -459,19 +471,16 @@ components: - UTRAN_CELL - E-UTRAN_CELL - NG-RAN_CELL - - eNB + - ENB - RNC - - gNB + - GNB - SUPI TargetIdValue: type: string - required: - - TargetIdType - - TargetIdValue triggeringEvents-Type: type: object - description: Specifies when to start a Trace Recording Session and which message shall be recorded first, when to stop a Trace Recording Session and which message shall be recorded last respectively. See 3GPP TS 32.422 clause 5.1 for additional detials. + description: Specifies when to start a Trace Recording Session and which message shall be recorded first, when to stop a Trace Recording Session and which message shall be recorded last respectively. See 3GPP TS 32.422 clause 5.1 for additional details. properties: MSC_SERVER: type: array @@ -480,7 +489,7 @@ components: enum: - MO_MT_CALLS - MO_MT_SMS - - LU_IMSIattach_IMSIdetach + - LU_IMSIATTACH_IMSIDETACH - HANDOVER - SS SGSN: @@ -488,10 +497,10 @@ components: items: type: string enum: - - PDPcontext + - PDPCONTEXT - MO_MT_SMS - - RAU_GPRSattach_GPRSdetach - - MBMScontext + - RAU_GPRSATTACH_GPRSDETACH + - MBMSCONTEXT MGW: type: array items: @@ -503,129 +512,134 @@ components: items: type: string enum: - - PDPcontext - - MBMScontext + - PDPCONTEXT + - MBMSCONTEXT IMS: type: array items: type: string enum: - - SIPsession_StandaloneTransaction + - SIPSESSION_STANDALONETRANSACTION BM_SC: type: array items: type: string enum: - - MBMSactivation + - MBMSACTIVATION MME: type: array items: type: string enum: - - UEinitiatedPDNconnectivityRequest - - ServiceRequest - - InitialAttach_TAU_Detach - - UEinitiatedPDNdisconnection - - BearerActivationModificationDeletion - - Handover + - UE_INITIATEDPDN_CONNECTIVITY_REQUEST + - SERVICE_REQUEST + - INITIALATTACH_TAU_DETACH + - UE_INITIATEDPDN_DISCONNECTION + - BEAR_ACTIVIATION_MODIFICATION_DELETION + - HANDOVER SGW: type: array items: type: string enum: - - PDNconnectionCreation - - PDNconnectionTermination - - BearerActivationModificationDeletion + - PDN_CONNECTION_CREATION + - PDN_CONNECTION_TERMINATION + - BEAR_ACTIVATION_MODIFICATION_DELETION PGW: type: array items: type: string enum: - - PDNconnectionCreation - - PDNconnectionTermination - - BearerActivationModificationDeletion + - PDN_CONNECTION_CREATION + - PDN_CONNECTION_TERMINATION + - BEAR_ACTIVATION_MODIFICATION_DELETION AMF: type: array items: type: string enum: - - Registration - - ServiceRequest - - Handover - - UEderegistration - - NetworkDeregistration - - UEMobilityFromEPC - - UEMobilityToEPC + - REGISTRATION + - SERVICE_REQUEST + - HANDOVER + - UE_DEREGISTRATION + - NETWORK_DEREGISTRATION + - UE_MOBILITY_FROM_EPC + - UE_MOBILITY_TO_EPC + - CONVERGED_CHARGING_SERVICE SMF: type: array items: type: string enum: - - PDUsessionEstablishment - - PDUsessionModification - - PDUsessionRelease - - PDUsessionUPactivationDeactivation - - MobilityBtw3gppAndN3gppTo5GC - - MobilityFromEpc + - PDU_SESSION_ESTABLISHMENT + - PDU_SESSION_MODIFICATION + - PDU_SESSIOON_RELEASE + - PDU_SESSION_UP_ACTIVATION_DEACTIVATION + - MOBILITY_BTW_3GPP_AND_N3GPP_TO_5GC + - MOBILITY_FROM_EPC + - MOBILITY_BTW_ISMF_OR_VSMF + - CONVERGED_CHARGING_SERVICE + - OFFLINE_ONLY_CHARGING PCF: type: array items: type: string enum: - - AMpolicy - - SMpolicy - - Authorization - - BDTpolicy + - AM_POLICY + - SM_POLICY + - AUTHORIZATION + - BDT_POLICY + - SPENDING_LIMIT_CONTROL UPF: type: array items: type: string enum: - - N4Session + - N4SESSION AUSF: type: array items: type: string enum: - - UEauthentication + - UE_AUTHENTICATION NEF: type: array items: type: string enum: - - EventExposure - - PFDmanagement - - ParameterProvision - - Trigger + - EVENT_EXPOSURE + - PFD_MANAGEMENT + - PARAMETER_PROVISION + - TRIGGER NRF: type: array items: type: string enum: - - NFmanagement - - NFdiscovery + - NF_MANAGEMEENT + - NF_DISCOVERY NSSF: type: array items: type: string enum: - - NSSelection + - NS_SELECTION - NSSAI SMSF: type: array items: type: string enum: - - SMservice + - SMSERVICE UDM: type: array items: type: string enum: - - UEcontext - - SubscriberData - - UEauthentication - - EventExposure + - UE_CONTEXT + - SUBSCRIBER_DATA + - UE_AUTHENTICATION + - EVENT_EXPOSURE anonymizationOfMdtData-Type: description: Specifies level of MDT anonymization. For additional details see 3GPP TS 32.422 clause 5.10.12. @@ -639,7 +653,7 @@ components: description: Determines whether beam level measurements shall be included in case of immediate MDT M1 measurement in NR. For additional details see 3GPP TS 32.422 clause 5.10.40. type: boolean - collectionPeriodRrmLte-Type: + collectionPeriodRRMLTE-Type: description: See details in 3GPP TS 32.422 clause 5.10.20. type: string enum: @@ -654,7 +668,7 @@ components: - 10240ms - 60000ms - collectionPeriodM6Lte-Type: + collectionPeriodM6LTE-Type: description: See details in 3GPP TS 32.422 clause 5.10.32. type: string enum: @@ -663,13 +677,13 @@ components: - 5120ms - 10240ms - collectionPeriodM7Lte-Type: + collectionPeriodM7LTE-Type: description: See details in 3GPP TS 32.422 clause 5.10.33. type: integer minimum: 1 maximum: 60 - collectionPeriodRrmUmts-Type: + collectionPeriodRRMUMTS-Type: description: See details in 3GPP TS 32.422 clause 5.10.21. type: string enum: @@ -682,7 +696,7 @@ components: - 4000ms - 6000ms - collectionPeriodRrmNr-Type: + collectionPeriodRRMNR-Type: description: See details in 3GPP TS 32.422 clause 5.10.30. type: string enum: @@ -692,7 +706,7 @@ components: - 10240ms - 60000ms - collectionPeriodM6Nr-Type: + collectionPeriodM6NR-Type: description: See details in 3GPP TS 32.422 clause 5.10.34. type: string enum: @@ -711,7 +725,7 @@ components: - 12min - 30min - collectionPeriodM7Nr-Type: + collectionPeriodM7NR-Type: description: See details in 3GPP TS 32.422 clause 5.10.35. type: integer minimum: 1 @@ -725,7 +739,7 @@ components: - A2_EVENT eventThreshold-Type: - description: See details in 3GPP TS 32.422 clause 5.10.7, 5.10.7a, 5.10.13 and 5.10.14. + description: See details in 3GPP TS 32.422 clause 5.10.7 (LTE/NR Event A2 RSRP, RSRQ, SINR), 5.10.13 (UMTS Event 1f) and 5.10.14 (UMTS Event 1i). type: object properties: EventThresholdRSRP: @@ -744,6 +758,10 @@ components: - type: integer minimum: 0 maximum: 127 + EventThresholdSINR: + type: integer + minimum: 0 + maximum: 127 EventThreshold1F: type: object properties: @@ -872,7 +890,7 @@ components: - INFINITY eventThresholdL1-Type: - description: See details in 3GPP TS 32.422 clause 5.10.X. + description: See details in 3GPP TS 32.422 clause 5.10.36. type: object properties: RSRP: @@ -885,13 +903,13 @@ components: maximum: 127 hysteresisL1-Type: - description: See details in 3GPP TS 32.422 clause 5.10.Y. + description: See details in 3GPP TS 32.422 clause 5.10.37. type: integer minimum: 0 maximum: 30 timeToTriggerL1-Type: - description: See details in 3GPP TS 32.422 clause 5.10.Z. + description: See details in 3GPP TS 32.422 clause 5.10.38. type: string enum: - 0ms @@ -911,7 +929,7 @@ components: - 2560ms - 5120ms - measurementPeriodLte-Type: + measurementPeriodLTE-Type: description: See details in 3GPP TS 32.422 clause 5.10.23. type: string enum: @@ -921,7 +939,7 @@ components: - 10240ms - 1min - measurementPeriodUmts-Type: + measurementPeriodUMTS-Type: description: See details in 3GPP TS 32.422 clause 5.10.22. type: string enum: @@ -943,12 +961,11 @@ components: description: See details in 3GPP TS 32.422 clause 5.10.15. type: string enum: - - CPICH_EcNo + - CPICH_ECNO - CPICH_RSCP - - PathLoss - - eventThresholdUphUmts-Type: - description: See details in 3GPP TS 32.422 clause 5.10.A. + - PATHLOSS + eventThresholdUphUMTS-Type: + description: See details in 3GPP TS 32.422 clause 5.10.39. type: integer minimum: 0 maximum: 31 @@ -963,9 +980,6 @@ components: $ref: 'TS28623_ComDefs.yaml#/components/schemas/Mcc' mnc: $ref: 'TS28623_ComDefs.yaml#/components/schemas/Mnc' - required: - - mcc - - mnc maxItems: 16 positioningMethod-Type: @@ -1299,26 +1313,26 @@ components: $ref: '#/components/schemas/reportInterval-Type' eventThreshold: $ref: '#/components/schemas/eventThreshold-Type' - collectionPeriodRrmLte: - $ref: '#/components/schemas/collectionPeriodRrmLte-Type' - collectionPeriodM6Lte: - $ref: '#/components/schemas/collectionPeriodM6Lte-Type' - collectionPeriodM7Lte: - $ref: '#/components/schemas/collectionPeriodM7Lte-Type' - collectionPeriodRrmUmts: - $ref: '#/components/schemas/collectionPeriodRrmUmts-Type' - collectionPeriodRrmNr: - $ref: '#/components/schemas/collectionPeriodRrmNr-Type' - collectionPeriodM6Nr: - $ref: '#/components/schemas/collectionPeriodM6Nr-Type' - collectionPeriodM7Nr: - $ref: '#/components/schemas/collectionPeriodM7Nr-Type' - eventThresholdUphUmts: - $ref: '#/components/schemas/eventThresholdUphUmts-Type' - measurementPeriodUmts: - $ref: '#/components/schemas/measurementPeriodUmts-Type' - measurementPeriodLte: - $ref: '#/components/schemas/measurementPeriodLte-Type' + collectionPeriodRRMLTE: + $ref: '#/components/schemas/collectionPeriodRRMLTE-Type' + collectionPeriodM6LTE: + $ref: '#/components/schemas/collectionPeriodM6LTE-Type' + collectionPeriodM7LTE: + $ref: '#/components/schemas/collectionPeriodM7LTE-Type' + collectionPeriodRRMUMTS: + $ref: '#/components/schemas/collectionPeriodRRMUMTS-Type' + collectionPeriodRRMNR: + $ref: '#/components/schemas/collectionPeriodRRMNR-Type' + collectionPeriodM6NR: + $ref: '#/components/schemas/collectionPeriodM6NR-Type' + collectionPeriodM7NR: + $ref: '#/components/schemas/collectionPeriodM7NR-Type' + eventThresholdUphUMTS: + $ref: '#/components/schemas/eventThresholdUphUMTS-Type' + measurementPeriodUMTS: + $ref: '#/components/schemas/measurementPeriodUMTS-Type' + measurementPeriodLTE: + $ref: '#/components/schemas/measurementPeriodLTE-Type' measurementQuantity: $ref: '#/components/schemas/measurementQuantity-Type' beamLevelMeasurement: @@ -1348,6 +1362,7 @@ components: type: array items: $ref: '#/components/schemas/MbsfnArea' + maxItems: 8 reportType: $ref: '#/components/schemas/reportType-Type' plmnList: @@ -1355,7 +1370,10 @@ components: eventListForEventTriggeredMeasurement: $ref: '#/components/schemas/eventListForEventTriggeredMeasurement-Type' areaConfigurationForNeighCell: - $ref: '#/components/schemas/AreaConfig' + type: array + items: + $ref: '#/components/schemas/AreaConfig' + maxItems: 32 nPNIdentityList: type: array items: diff --git a/yang-models/_3gpp-5gc-nrm-anlffunction.yang b/yang-models/_3gpp-5gc-nrm-anlffunction.yang index 85673a4c7815f90dfe0f892352e1ee94b186ea80..3bb52fcdd868897c487d58d3aecf3560db79b557 100644 --- a/yang-models/_3gpp-5gc-nrm-anlffunction.yang +++ b/yang-models/_3gpp-5gc-nrm-anlffunction.yang @@ -7,15 +7,17 @@ module _3gpp-5gc-nrm-anlffunction { import _3gpp-common-managed-element { prefix me3gpp; } import _3gpp-common-top { prefix top3gpp; } import _3gpp-5gc-nrm-nwdaffunction { prefix nwdaf3gpp; } + import _3gpp-common-yang-types { prefix types3gpp; } organization "3gpp SA5"; contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464"; description "This IOC represents the AnLF function in 5GC. For more information about the AnLF, see 3GPP TS 23.288. - Copyright 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + Copyright 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved."; reference "3GPP TS 28.541"; + revision 2024-08-07 { reference CR-1331; } revision 2023-11-03 { reference "initial revision"; } grouping AnLFFunctionGrp { @@ -29,6 +31,18 @@ module _3gpp-5gc-nrm-anlffunction { config false; description "It indicates the activation status of the AnLF"; } + leaf-list mLModelRefList { + type types3gpp:DistinguishedName; + description "This attribute holds a DN list of MLModel ¨ + (See TS 28.105)."; + config false; + } + leaf-list aIMLInferenceFunctionRefList { + type types3gpp:DistinguishedName; + description "This attribute holds a DN list of AIMLInferenceFunction + (See TS 28.105) ."; + config false; + } } augment "/me3gpp:ManagedElement/nwdaf3gpp:NWDAFFunction" { diff --git a/yang-models/_3gpp-5gc-nrm-ep.yang b/yang-models/_3gpp-5gc-nrm-ep.yang index 803d3b134c2bb8bdd9171f312d23caf0106bb9c5..73854e5d45fa034761d8579167207f964b15d391 100755 --- a/yang-models/_3gpp-5gc-nrm-ep.yang +++ b/yang-models/_3gpp-5gc-nrm-ep.yang @@ -28,10 +28,11 @@ module _3gpp-5gc-nrm-ep { description "Defines the YANG mapping of the 5GC related endpoint Information Object Classes (IOCs) that are part of the 5G Core Network Resource Model. - Copyright 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + Copyright 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved."; reference "3GPP TS 28.541"; + revision 2024-08-19 { reference CR-1314 ; } revision 2023-09-18 { reference CR-1043 ; } revision 2019-11-18 { description "Ericsson refactoring."; @@ -179,7 +180,7 @@ module _3gpp-5gc-nrm-ep { uses eprp3gpp:EP_Common; } - grouping EP_NLGGrp { + grouping EP_NL2Grp { uses eprp3gpp:EP_Common; } @@ -312,12 +313,12 @@ module _3gpp-5gc-nrm-ep { } } - list EP_NLG { - description "Represents the EP_NLG IOC."; + list EP_NL2 { + description "Represents the EP_NL2 IOC."; key id; uses top3gpp:Top_Grp; container attributes { - uses EP_NLGGrp; + uses EP_NL2Grp; } } } diff --git a/yang-models/_3gpp-5gc-nrm-nwdaffunction.yang b/yang-models/_3gpp-5gc-nrm-nwdaffunction.yang index 5fe7eb7ae142767122d471d1be5edf12e3fed2bf..33033562c97cb2786a484c86444f6faab748eef0 100755 --- a/yang-models/_3gpp-5gc-nrm-nwdaffunction.yang +++ b/yang-models/_3gpp-5gc-nrm-nwdaffunction.yang @@ -21,6 +21,7 @@ module _3gpp-5gc-nrm-nwdaffunction { TTA, TTC). All rights reserved."; reference "3GPP TS 28.541"; + revision 2024-08-07 { reference CR-1329; } revision 2024-04-12 { reference CR-1218; } revision 2023-09-18 { reference CR-1043; } revision 2023-04-26 { reference CR-0916; } @@ -279,7 +280,8 @@ module _3gpp-5gc-nrm-nwdaffunction { } grouping NWDAFFunctionGrp { - description "Represents the NWDAFFunction IOC"; + description "The NWDAFFunction IOC includes attributes inherited from + ManagedFunction IOC(defined in TS 28.622)and the following attributes:"; uses mf3gpp:ManagedFunctionGrp; list pLMNInfoList { @@ -319,9 +321,10 @@ module _3gpp-5gc-nrm-nwdaffunction { key idx; min-elements 1; description "The attribute specifies a list of NetworkSliceInfo which - is defined as a datatype (see clause 5.3.95). It can be used by the - NWDAF to facilitate the data collection from OAM."; - leaf idx { + is defined as a datatype (see clause 5.3.95). It is used by an + authorized consumer, e.g. NWDAF, to facilitate the data collection + from OAM."; + leaf idx { type string; } uses NetworkSliceInfoGrp; @@ -393,4 +396,4 @@ module _3gpp-5gc-nrm-nwdaffunction { uses mf3gpp:ManagedFunctionContainedClasses; } } -} \ No newline at end of file +} diff --git a/yang-models/_3gpp-common-files.yang b/yang-models/_3gpp-common-files.yang index 9317e769fee47aff7c2d02622f000e10b3b99ecd..726292a70f38a5df337c789802c4ac3a423f4c90 100644 --- a/yang-models/_3gpp-common-files.yang +++ b/yang-models/_3gpp-common-files.yang @@ -24,7 +24,7 @@ module _3gpp-common-files { Generic Network Resource Model (NRM) Integration Reference Point (IRP); Information Service (IS)"; - + revision 2024-05-11 { reference CR-0362 ; } revision 2023-09-18 { reference CR-0271 ; } revision 2022-09-28 { reference CR-0191; } diff --git a/yang-models/_3gpp-common-managed-element.yang b/yang-models/_3gpp-common-managed-element.yang index 233aa6f4a2ab338201ffe86eab7eb0c679110085..852218598b4212f89880cca5a82b8b24492bf31f 100755 --- a/yang-models/_3gpp-common-managed-element.yang +++ b/yang-models/_3gpp-common-managed-element.yang @@ -12,6 +12,7 @@ module _3gpp-common-managed-element { import _3gpp-common-files { prefix files3gpp; } import _3gpp-5gc-nrm-configurable5qiset { prefix fiveqi3gpp; } import _3gpp-5gc-nrm-ecmconnectioninfo { prefix econn3gpp ; } + import _3gpp-nr-nrm-ecmappingrule { prefix ecmap3gpp ; } organization "3GPP SA5"; contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464"; @@ -33,6 +34,7 @@ module _3gpp-common-managed-element { 3GPP TS 28.620 Umbrella Information Model (UIM)"; + revision 2024-10-01 { reference "CR-0437,CR-0438" ; } revision 2024-01-30 { reference CR-0328 ; } revision 2023-11-14 { reference CR-0305 ; } revision 2023-09-18 { reference CR-0271 ; } @@ -49,6 +51,10 @@ module _3gpp-common-managed-element { revision 2019-06-17 { reference " S5-203316"; } revision 2019-05-08 { reference "Initial revision"; } + feature ECMappingRuleUnderManagedElement { + description "ECMappingRule shall be contained under ManagedElement."; + } + feature EcmConnectionInfoUnderManagedElement { description "The EcmConnectionInfo shall be contained under ManagedElement"; @@ -304,5 +310,10 @@ module _3gpp-common-managed-element { uses econn3gpp:EcmConnectionInfoSubtree { if-feature EcmConnectionInfoUnderManagedElement; } + + uses ecmap3gpp:NRECMappingRuleSubtree { + if-feature ECMappingRuleUnderManagedElement; + } + } } diff --git a/yang-models/_3gpp-common-mecontext.yang b/yang-models/_3gpp-common-mecontext.yang new file mode 100644 index 0000000000000000000000000000000000000000..ed183f1a72c8e880e788732bdd3edac15487e6f5 --- /dev/null +++ b/yang-models/_3gpp-common-mecontext.yang @@ -0,0 +1,82 @@ +module _3gpp-common-mecontext { + yang-version 1.1; + namespace "urn:3gpp:sa5:_3gpp-common-mecontext"; + prefix "mectx3gpp"; + + import _3gpp-common-yang-types { prefix types3gpp; } + import _3gpp-common-top { prefix top3gpp; } + import _3gpp-common-subnetwork { prefix subnet3gpp; } + import ietf-yang-schema-mount { prefix yangmnt; } + + organization "3GPP SA5"; + contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464"; + + description "Defines basic MeContext which will be augmented by other IOCs + Copyright 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + TTA, TTC). All rights reserved."; + reference "3GPP TS 28.623 + Generic Network Resource Model (NRM) + Integration Reference Point (IRP); + Solution Set (SS) definitions + + 3GPP TS 28.622 + Generic Network Resource Model (NRM) + Integration Reference Point (IRP); + Information Service (IS)"; + + revision 2024-07-17 { reference "CR-0381 CR-0382 CR-0383"; } + + grouping MeContextGrp { + description "Represents the MeContext IOC."; + + leaf dnPrefix { + type types3gpp:DistinguishedName; + description "It carries the DN Prefix information or no information. + The instance of MeContext is the local root instance of the MIB. + Otherwise the attribute shall be absent or carry no information."; + reference "Annex C of 32.300 "; + } + } + + augment "/subnet3gpp:SubNetwork" { + list Mecontext { + description "This IOC is introduced for naming purposes. It may support + creation of unique DNs in scenarios when some MEs have the same RDNs due + to the fact that they have been manufacturer pre-configured. + + If some MEs have the same RDNs (for the above mentioned reason) and they + are contained in the same SubNetwork instance, some measure shall be + taken in order to assure the global uniqueness of DNs for all IOC + instances under those MEs. One way could be to set different dnPrefix + for those NEs, but that would require either that: + + a) all LDNs or DNs are locally modified using the new dnPrefix for the + upper portion of the DNs, or + b) a mapping (translation) of the old LDNs or DNs to the new DNs every + time they are used externally, e.g. in alarm notifications. + + As both the two alternatives above may involve unacceptable drawbacks + (as the old RDNs for the MEs then would have to be changed or mapped to + new values), using MeContext offers a new alternative to resolve the DN + creation. Using MeContext as part of the naming tree (and thus the DN) + means that the dnPrefix, including a unique MeContext for each ME, may + be directly concatenated with the LDNs, without any need to change or + map the existing ME RDNs to new values. + + MeContext have 0..N instances. It may exist even if no SubNetwork exists. + Every instance of MeContext contains exactly one ManagedElement during + steady-state operations."; + + key id; + uses top3gpp:Top_Grp; + container attributes { + uses MeContextGrp; + } + + yangmnt:mount-point children-of-MeContext { + description "Mountpoint for ManagedElement"; + reference "RFC8528 YANG Schema Mount"; + } + } + } +} \ No newline at end of file diff --git a/yang-models/_3gpp-common-qmcjob.yang b/yang-models/_3gpp-common-qmcjob.yang index bd46a03606da1467dab086579490ab72717290d9..5d991ae156ff97a668029c82b778f635865ccec4 100644 --- a/yang-models/_3gpp-common-qmcjob.yang +++ b/yang-models/_3gpp-common-qmcjob.yang @@ -27,6 +27,7 @@ module _3gpp-common-qmcjob { Integration Reference Point (IRP); Information Service (IS)"; + revision 2024-04-04 { reference CR-0334; } revision 2023-09-18 { reference CR-0271 ; } revision 2023-02-14 { reference "CR-0234"; } revision 2022-11-04 { reference "CR-0215"; } @@ -149,6 +150,14 @@ module _3gpp-common-qmcjob { to the gNB. This parameter is optional and is valid for NR only."; } + leaf mBSCommunicationServiceType { + type enumeration { + enum BROADCAST; + enum MULTICAST; + } + description "This attribute indicates which type of MBS communication + service the QoE measurement configuration pertains to."; + } } grouping QMCJobSubTree { diff --git a/yang-models/_3gpp-common-subnetwork.yang b/yang-models/_3gpp-common-subnetwork.yang index d6d5f7010369bea58396611428ff5c1ba8e16cca..ddd472941d58fa4e07081352f39dfd301da42e7b 100755 --- a/yang-models/_3gpp-common-subnetwork.yang +++ b/yang-models/_3gpp-common-subnetwork.yang @@ -13,6 +13,7 @@ module _3gpp-common-subnetwork { import _3gpp-common-files { prefix files3gpp; } import _3gpp-5gc-nrm-configurable5qiset { prefix fiveqi3gpp; } import _3gpp-5gc-nrm-ecmconnectioninfo { prefix econn3gpp ; } + import _3gpp-nr-nrm-ecmappingrule { prefix ecmap3gpp ; } organization "3GPP SA5"; contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464"; @@ -33,6 +34,7 @@ module _3gpp-common-subnetwork { 3GPP TS 28.620 Umbrella Information Model (UIM)"; + revision 2024-01-30 { reference CR-1337 ; } revision 2024-01-30 { reference CR-0328 ; } revision 2023-11-14 { reference CR-0305 ; } revision 2023-09-18 { reference CR-0271 ; } @@ -61,6 +63,10 @@ module _3gpp-common-subnetwork { reference "Initial revision"; } + feature ECMappingRuleUnderSubNetwork { + description "ECMappingRule shall be contained under SubNetwork."; + } + feature EcmConnectionInfoUnderSubNetwork { description "The EcmConnectionInfo shall be contained under Subnetwork"; @@ -264,6 +270,11 @@ module _3gpp-common-subnetwork { if-feature EcmConnectionInfoUnderSubNetwork; } + uses ecmap3gpp:NRECMappingRuleSubtree { + if-feature EcmConnectionInfoUnderSubNetwork; + } + + yangmnt:mount-point children-of-SubNetwork { description "Mountpoint for ManagedElement"; reference "RFC8528 YANG Schema Mount"; @@ -271,4 +282,4 @@ module _3gpp-common-subnetwork { // augment external parts here } -} \ No newline at end of file +} diff --git a/yang-models/_3gpp-common-trace.yang b/yang-models/_3gpp-common-trace.yang index af5327945e8450ecca88f1883152f8593ac64667..30a4db45b2bb86cb8a7377a8b37dad152e80c036 100755 --- a/yang-models/_3gpp-common-trace.yang +++ b/yang-models/_3gpp-common-trace.yang @@ -25,6 +25,8 @@ module _3gpp-common-trace { Integration Reference Point (IRP); Information Service (IS)" ; + revision 2024-08-13 { reference "CR-0387 CR-0377"; } + revision 2024-08-07 { reference "CR-0405 CR-0421 CR-0379"; } revision 2024-05-12 { reference "CR-0401"; } revision 2024-05-06 { reference CR-0359; } revision 2024-04-06 { reference "CR-0342"; } @@ -105,20 +107,9 @@ module _3gpp-common-trace { grouping AreaScopeGrp { description "Represents the AreaScope dataType. - This <> defines the area scope of MDT. - The Area Scope parameter in LTE and NR is either: - - list of Cells, identified by E-UTRAN-CGI or NG-RAN CGI. - Maximum 32 CGI can be defined. - - list of Tracking Area, identified by TAC. - Maximum of 8 TAC can be defined. - - list of Tracking Area Identity, identified by TAC with - associated plmn-Identity perTAC-List containing the - PLMN identity for each TAC. Maximum of 8 TAI can be defined. - The Area Scope parameter in NR can also contain: - - list of NPN-IDs in NR. It is either a list of PNI-NPNs - identified by CAG ID with associated plmn-Identity or a - list of SNPNs identified by Network ID with associated - plmn-Identity ."; + This <> defines the area scope of MDT and QoE. + The Area Scope for MDT is specified in clause 5.10.2 of TS 32.422. + The Area Scope for QoE is specified in clause 5.4 of TS 28.405."; choice AreaScopeChoice { leaf-list eutraCellIdList { @@ -128,11 +119,11 @@ module _3gpp-common-trace { description "List of E-UTRAN cells identified by E-UTRAN-CGI"; } - leaf-list utraCellIdList { + leaf-list nrCellIdList { type string; min-elements 1; max-elements 32; - description "List of UTRAN cells identified by UTRAN CGI"; + description "List of NR cells identified by NG-RAN CGI"; } leaf-list tacList { @@ -690,15 +681,15 @@ module _3gpp-common-trace { -reportingTrigger: conditional for M1 in LTE or NR and M1/M2 in UMTS, -eventThreshold: conditional for A2 event reporting or A2 event triggered periodic reporting, - -collectionPeriodRrmNR: conditional for M4 and M5 in NR, + -collectionPeriodRRMNR: conditional for M4 and M5 in NR, -collectionPeriodM6NR: conditional for M6 in NR, -collectionPeriodM7NR: conditional for M7 in NR, - -collectionPeriodRrmLte (conditional for M3 in LTE), + -collectionPeriodRRMLTE (conditional for M3 in LTE), -measurementPeriodLTE (conditional for M4 and M5 in LTE), - -collectionPeriodM6Lte (conditional for M6 in LTE), - -collectionPeriodM7Lte (conditional for M7 in LTE), - -collectionPeriodRrmUmts (conditional for M4 and M5 in UMTS), - -measurementPeriodUmts (conditional for M6 and M7 in UMTS), + -collectionPeriodM6LTE (conditional for M6 in LTE), + -collectionPeriodM7LTE (conditional for M7 in LTE), + -collectionPeriodRRMUMTS (conditional for M4 and M5 in UMTS), + -measurementPeriodUMTS (conditional for M6 and M7 in UMTS), -measurementQuantity (conditional for 1F event reporting), -beamLevelMeasurement (conditional for M1 in NR), -excessPacketDelayThresholds (conditional for M6 UL measurement in NR). @@ -736,8 +727,8 @@ module _3gpp-common-trace { configuration, see TS 38.321, TS 36.321 and TS 38.331, TS 36.331. For measurement M4 in UMTS, reporting is either according to RRM configuration, see TS 25.321 and TS 25.331 or periodic or event - triggered periodic using parameter collectionPeriodRrmUmts and - eventThresholdUphUmts. + triggered periodic using parameter collectionPeriodRRMUMTS and + eventThresholdUphUMTS. - For measurement M3 in UMTS, the reporting is done upon availability, see TS 37.320. @@ -745,10 +736,10 @@ module _3gpp-common-trace { - For measurements M4, M5, M6 and M7 in NR, for measurements M3, M4, M5, M6 and M7 in LTE and for measurements M5, M6 and M7 in UMTS periodical reporting is applied. The configurable parameter - is the interval between two measurements (collectionPeriodRrmNr, - collectionPeriodM6NR, collectionPeriodM7Nr, collectionPeriodRrmLte, - measurementPeriodLte, collectionPeriodM6Lte, collectionPeriodM7Lte, - collectionPeriodRrmUmts, measurementPeriodUmts). If no collection + is the interval between two measurements (collectionPeriodRRMNR, + collectionPeriodM6NR, collectionPeriodM7NR, collectionPeriodRRMLTE, + measurementPeriodLte, collectionPeriodM6LTE, collectionPeriodM7LTE, + collectionPeriodRRMUMTS, measurementPeriodUMTS). If no collection period is configured for M5 in UMTS, all available measurements are logged according to RRM configuration."; @@ -844,7 +835,7 @@ module _3gpp-common-trace { reference "Clauses 5.10.7 and 5.10.7a of 3GPP TS 32.422"; } - leaf collectionPeriodRrmNr { + leaf collectionPeriodRRMNR { when '../../../jobType = "IMMEDIATE_MDT_ONLY"' + ' or ../../../jobType = "IMMEDIATE_MDT_AND_TRACE"'; type uint32 { @@ -858,7 +849,7 @@ module _3gpp-common-trace { reference "Clause 5.10.30 of 3GPP TS 32.422"; } - leaf collectionPeriodM6Nr { + leaf collectionPeriodM6NR { when '../../../jobType = "IMMEDIATE_MDT_ONLY"' + ' or ../../../jobType = "IMMEDIATE_MDT_AND_TRACE"'; type enumeration { @@ -884,7 +875,7 @@ module _3gpp-common-trace { reference "clause 5.10.34 of TS 32.422"; } - leaf collectionPeriodM7Nr { + leaf collectionPeriodM7NR { when '../../../jobType = "IMMEDIATE_MDT_ONLY"' + ' or ../../../jobType = "IMMEDIATE_MDT_AND_TRACE"'; type uint32 { @@ -897,7 +888,7 @@ module _3gpp-common-trace { reference "clause 5.10.35 of TS 32.422"; } - leaf collectionPeriodRrmLte { + leaf collectionPeriodRRMLTE { when '../../../jobType = "IMMEDIATE_MDT_ONLY"' + ' or ../../../jobType = "IMMEDIATE_MDT_AND_TRACE"'; type uint32 { @@ -928,7 +919,7 @@ module _3gpp-common-trace { reference "Clause 5.10.23 of 3GPP TS 32.422"; } - leaf collectionPeriodM6Lte { + leaf collectionPeriodM6LTE { when '../../../jobType = "IMMEDIATE_MDT_ONLY"' + ' or ../../../jobType = "IMMEDIATE_MDT_AND_TRACE"'; type uint32 { @@ -942,7 +933,7 @@ module _3gpp-common-trace { reference "Clause 5.10.32 of TS 32.422 "; } - leaf collectionPeriodM7Lte { + leaf collectionPeriodM7LTE { when '../../../jobType = "IMMEDIATE_MDT_ONLY"' + ' or ../../../jobType = "IMMEDIATE_MDT_AND_TRACE"'; type uint16 { @@ -955,7 +946,7 @@ module _3gpp-common-trace { reference "Clause 5.10.33 of TS 32.422 ."; } - leaf eventThresholdUphUmts { + leaf eventThresholdUphUMTS { when '../../../jobType = "IMMEDIATE_MDT_ONLY"' + ' or ../../../jobType = "IMMEDIATE_MDT_AND_TRACE"'; type uint16 { @@ -968,7 +959,7 @@ module _3gpp-common-trace { reference "5.10.39 of TS 32.422"; } - leaf collectionPeriodRrmUmts { + leaf collectionPeriodRRMUMTS { when '../../../jobType = "IMMEDIATE_MDT_ONLY"' + ' or ../../../jobType = "IMMEDIATE_MDT_AND_TRACE"'; type uint32 { @@ -983,7 +974,7 @@ module _3gpp-common-trace { reference "Clause 5.10.21 of 3GPP TS 32.422"; } - leaf measurementPeriodUmts { + leaf measurementPeriodUMTS { when '../../../jobType = "IMMEDIATE_MDT_ONLY"' + 'or ../../../jobType = "IMMEDIATE_MDT_AND_TRACE"'; type uint32 { @@ -1519,21 +1510,48 @@ module _3gpp-common-trace { leaf idx { type string; } uses LoggedMdtConfigGrp; } + + leaf mNOnly { + type boolean; + default false; + description "Specifies whether the MDT configuration is for MN + only or not. The value FALSE means the MDT configuration is for + both MN and SN. The value TRUE means the MDT configuration is + for MN only."; + } } - grouping UEMeasConfigGrp { - description "Represents the UEMeasConfig dataType. + grouping UECoreMeasConfigGrp { + description "Represents the UECoreMeasConfig dataType. This <> defines the aconfiguration parameters of IOC TraceJob which are specific for UE level measurements collection."; - leaf-list ueMeasurements { + leaf-list ueCoreMeasurements { type string; - description "It specifies the List of UE level measurements."; - } + min-elements 1; + description "List of 5GC UE level measurements identified by name. - leaf ueMeasGranularityPeriod { + The list may include 5GC UE level measurements defined in TS 28.558, + or vendor specific measurements. + + For 5GC UE level measurements defined in TS 28.558, the name is + constructed as follows: + - 'family.measurementName.subcounter' for measurement type with + specified subcounter + - 'family.measurementName.ALL' for measurement type with all supported + subcounters + - 'family.measurementName' for measurement type without subcounters + - 'family' for measurement family, including all measurement types and + the associated subcounters under this family. + For non-3GPP specified 5GC UE level measurements the name is defined + elsewhere."; + } + + leaf ueCoreMeasGranularityPeriod { type uint32; - description "It specifies the Granularity period used to produce UE level + mandatory true; + units milliseconds; + description "It specifies the Granularity period used to produce 5GC UE level measurements. The period is defined in milliseconds (ms)."; } @@ -1574,18 +1592,34 @@ module _3gpp-common-trace { enum TRACE_AND_5GC_UE_LEVEL_MEASUREMENTS; enum IMMEDIATE_MDT_AND_5GC_UE_LEVEL_MEASUREMENTS; enum TRACE_AND_IMMEDIATE_MDT_AND_5GC_UE_LEVEL_MEASUREMENTS; + enum RRC_REPORT; } default TRACE_ONLY; description "Specifies the MDT mode and it specifies also whether the TraceJob represents only MDT, Logged MBSFN MDT, Trace, or 5GC UE level measurement collection, or any combination - of Trace, immediate MDT and 5GC UE level measurement collection. - The attribute is applicable for Trace, MDT, RCEF and + of Trace, immediate MDT and 5GC UE level measurement collection or RRC + reporting. + The attribute is applicable for Trace, MDT, RCEF, RRC and RLF reporting, and 5GC UE level measurement collection."; reference "Clause 5.9a of 3GPP TS 32.422 for additional details on the allowed values."; } - + leaf-list rrcReportType { + type enumeration { + enum RLF_REPORT; + enum RCEF_REPORT; + enum SHR; + enum SPR; + enum MHI; + enum RA_REPORT; + enum UHI_REPORT; + } + description "Specifies the RRC reports requested. "; + reference "Clause 5.X of 3GPP TS 32.422 for additional details on the + allowed values."; + } + list pLMNTarget { key "mcc mnc"; description "Specifies which PLMN that the subscriber of the session to @@ -1614,6 +1648,7 @@ module _3gpp-common-trace { values."; } + leaf traceReportingConsumerUri { when '../traceReportingFormat = "STREAMING"'; type inet:uri; @@ -1752,7 +1787,7 @@ module _3gpp-common-trace { leaf idx { type string; } } - list ueMeasConfig { + list ueCoreMeasConfig { when '../jobType = "5GC_UE_LEVEL_MEASUREMENTS_ONLY"' + ' or ../jobType = "TRACE_AND_5GC_UE_LEVEL_MEASUREMENTS"' + ' or ../jobType = "IMMEDIATE_MDT_AND_5GC_UE_LEVEL_MEASUREMENTS"' @@ -1761,7 +1796,7 @@ module _3gpp-common-trace { key idx; description "5GC UE level measurements config"; max-elements 1; - uses UEMeasConfigGrp; + uses UECoreMeasConfigGrp; leaf idx { type string; } } @@ -1839,10 +1874,10 @@ module _3gpp-common-trace { only, RCEF reports only and Logged MBSFN MDT, the configuration parameters of attribute mdtConfig or a subset of these shall be applied. In case of UE measurements only, the configuration parameters - of attribute ueMeasConfig shall be applied. In case of any combination + of attribute ueCoreMeasConfig shall be applied. In case of any combination of Trace, Immediate MDT, Trace and UE measurements, the configuration parameters of the corresponding attributes traceConfig, mdtConfig and - ueMeasConfig are applicable. + ueCoreMeasConfig are applicable. Creation and deletion of TraceJob instances by MnS consumers is optional; when not supported, the TraceJob instances may be created diff --git a/yang-models/_3gpp-common-util.yang b/yang-models/_3gpp-common-util.yang index 6e58aa14fcdb98d95f9dc78d1c20c12fcf447b0c..040b1f5010b4f58a92f84213d95b09651f0fd7b4 100644 --- a/yang-models/_3gpp-common-util.yang +++ b/yang-models/_3gpp-common-util.yang @@ -3,6 +3,7 @@ module _3gpp-common-util { namespace urn:3gpp:sa5:_3gpp-common-util; prefix "util3gpp"; + import ietf-yang-types { prefix yang ; } import _3gpp-common-top { prefix top3gpp; } import _3gpp-common-yang-types { prefix types3gpp ; } import _3gpp-common-managed-element { prefix me3gpp ; } @@ -16,6 +17,8 @@ module _3gpp-common-util { TTA, TTC). All rights reserved."; reference "3GPP TS 28.623"; + revision 2024-08-13 { reference CR-0387; } + revision 2024-07-30 { reference "CR-0392 CR-0393"; } revision 2024-05-06 { reference CR-0359; } feature SchedulerUnderManagedElement { @@ -88,7 +91,7 @@ module _3gpp-common-util { must 'not(../daysOfWeek)'; description "Shall be present in case of Monthly periodicity, otherwise not"; - type types3gpp:DaysOfMonth; + type types3gpp:DateMonthDay; } } } @@ -157,14 +160,22 @@ module _3gpp-common-util { description "Represents the Scheduler IOC."; leaf condition { - type string { + type yang:xpath1.0 { length 1..max; } mandatory true; - description "Logical expression of one or several condition(s). - - A restricted XPath may be used. The definition of the exact syntax - is not ready yet. + description "A logical condition containing an XPath expression. + The leaf contains an XPath 1.0 string with the following restrictions + - The accessible tree is the full Network Resource Model + - The root node is the list representing the top level MOI + (E.g. ManagedElement) + - In the accessible tree, all leafs and leaf-lists with default values + in use exist + - The data tree has no concept of document order except when 'ordered-by + user' is declared. + - The set of variable bindings is empty. + - The function library is the core function library defined in XPATH + - Namespaces should be ignored when evaluating the expression An empty string is not allowed."; } @@ -173,7 +184,8 @@ module _3gpp-common-util { type boolean; mandatory true; config false; - description "Switches between TRUE and FALSE depending upon whether the + description "The boolean result of the condition. + Switches between TRUE and FALSE depending upon whether the configured constraints are fulfilled or not."; } } diff --git a/yang-models/_3gpp-common-yang-types.yang b/yang-models/_3gpp-common-yang-types.yang index 3c8b9c7a4299b5a44b8c95d7387ee78f145d5767..25d9a5b5b16205f7252de52c381f6ce87fc822eb 100755 --- a/yang-models/_3gpp-common-yang-types.yang +++ b/yang-models/_3gpp-common-yang-types.yang @@ -16,6 +16,7 @@ module _3gpp-common-yang-types { TTA, TTC). All rights reserved."; reference "3GPP TS 28.623"; + revision 2024-08-13 { reference CR-0387; } revision 2024-05-18 { reference CR-0359; } revision 2024-04-12 { reference CR-0346; } revision 2023-11-06 { reference CR-0305; } @@ -94,7 +95,13 @@ module _3gpp-common-yang-types { } } - typedef DaysOfMonth { + typedef DateMonth { + type uint8 { + range 0..12; + } + } + + typedef DateMonthDay { type uint8 { range 0..31; } @@ -103,6 +110,22 @@ module _3gpp-common-yang-types { typedef FullTime { type yang:time-with-zone-offset; } + + grouping DayInYearGrp { + description "This <> represents a day in a year."; + + leaf month { + description "It indicates the month in a year."; + type DateMonth; + mandatory true; + } + + leaf monthDay { + description "It indicates the day in a month."; + type DateMonthDay; + mandatory true; + } + } grouping TimeWindowGrp { leaf startTime { diff --git a/yang-models/_3gpp-nr-nrm-bwpset.yang b/yang-models/_3gpp-nr-nrm-bwpset.yang index 8b92fa0830d6b4781ca08bb88898ff86dcdf3816..cba0ca407fd9f8445ba55ee37b6c66d826ad4e49 100644 --- a/yang-models/_3gpp-nr-nrm-bwpset.yang +++ b/yang-models/_3gpp-nr-nrm-bwpset.yang @@ -12,10 +12,11 @@ module _3gpp-nr-nrm-bwpset { contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464"; description "Defines the YANG mapping of the BWPSet Information Object Class (IOC) that is part of the NR Network Resource Model (NRM). - Copyright 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + Copyright 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved."; reference "3GPP TS 28.541 5G Network Resource Model (NRM)"; + revision 2024-08-19 { reference CR-1314 ; } revision 2023-09-18 { reference CR-1043 ; } revision 2022-06-29 { reference CR-0756 ; } @@ -26,7 +27,7 @@ module _3gpp-nr-nrm-bwpset { } augment "/me3gpp:ManagedElement/gnbdu3gpp:GNBDUFunction" { - list BWPList { + list BWPLSett { description "Represents a bandwidth part (BWP) set."; key id; uses top3gpp:Top_Grp; diff --git a/yang-models/_3gpp-nr-nrm-danrmanagementfunction.yang b/yang-models/_3gpp-nr-nrm-danrmanagementfunction.yang index d0afa896a0b344c48d377034a81cd083c922a14e..3260d36464076d4366b6329e4609a637028a6e17 100755 --- a/yang-models/_3gpp-nr-nrm-danrmanagementfunction.yang +++ b/yang-models/_3gpp-nr-nrm-danrmanagementfunction.yang @@ -3,45 +3,47 @@ module _3gpp-nr-nrm-danrmanagementfunction { namespace "urn:3gpp:sa5:_3gpp-nr-nrm-danrmanagementfunction"; prefix "danrmanagementfunction3gpp"; - import _3gpp-common-top { prefix top3gpp; } import _3gpp-nr-nrm-gnbcucpfunction { prefix gnbcucp3gpp; } 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 DANRManagementFunction Information Object Class - (IOC) that is part of the NR Network Resource Model (NRM). - Copyright 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + description "Defines the YANG mapping of the DANRManagementFunction IOC + that is part of the NR Network Resource Model (NRM). + Copyright 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved."; reference "3GPP TS 28.541 5G Network Resource Model (NRM)"; + revision 2024-08-19 { reference CR-1314 ; } revision 2023-09-18 { reference CR-1043 ; } revision 2020-05-08 { reference S5-203316; } - grouping DANRManagementFunctionGrp { description "Represents the DANRManagementFunction IOC."; - reference "3GPP TS 28.541"; - uses top3gpp:Top_Grp; leaf intrasystemANRManagementSwitch { - description "This attribute determines whether the intra-system ANR function is activated or deactivated."; - type boolean; + description "This attribute determines whether the intra-system ANR + function is activated or deactivated."; + type boolean; } leaf intersystemANRManagementSwitch { - description "This attribute determines whether the inter-system ANR function is activated or deactivated."; - type boolean; + description "This attribute determines whether the inter-system ANR + function is activated or deactivated."; + type boolean; } - - } augment "/me3gpp:ManagedElement/gnbcucp3gpp:GNBCUCPFunction" { - if-feature gnbcucp3gpp:DANRManagementFunction; - uses DANRManagementFunctionGrp; + list DANRManagementFunction { + description "This IOC contains attributes to support the D-SON function + of ANR Management (See clause 6.4.1.3 in TS 28.313 ."; + key id; + uses top3gpp:Top_Grp; + container attributes { + uses DANRManagementFunctionGrp; + } + } } } \ No newline at end of file diff --git a/yang-models/_3gpp-nr-nrm-desmanagementfunction.yang b/yang-models/_3gpp-nr-nrm-desmanagementfunction.yang index c1201b7fb86b6614652e30739d8e91c3946fd25f..2e1e5bbaaa072d4935e52545b70639b18c9bab06 100755 --- a/yang-models/_3gpp-nr-nrm-desmanagementfunction.yang +++ b/yang-models/_3gpp-nr-nrm-desmanagementfunction.yang @@ -9,16 +9,18 @@ module _3gpp-nr-nrm-desmanagementfunction { import _3gpp-nr-nrm-nrcellcu { prefix nrcellcu3gpp; } import _3gpp-common-subnetwork { prefix subnet3gpp; } import _3gpp-5g-common-yang-types { prefix type5g3gpp; } + import _3gpp-common-yang-types { prefix types3gpp; } organization "3GPP SA5"; contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464"; description "Defines the YANG mapping of the DESManagementFunction Information Object Class (IOC) that is part of the NR Network Resource Model (NRM). - Copyright 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + Copyright 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved."; reference "3GPP TS 28.541 5G Network Resource Model (NRM)"; + revision 2024-08-07 { reference CR-1331; } revision 2023-09-18 { reference CR-1043 ; } revision 2021-08-05 { reference S5-214053/CR-0518; } revision 2020-05-08 { reference S5-203316; } @@ -139,7 +141,19 @@ module _3gpp-nr-nrm-desmanagementfunction { enum yes; enum no; } - } + } + leaf-list mLModelRefList { + type types3gpp:DistinguishedName; + description "This attribute holds a DN list of MLModel ¨ + (See TS 28.105])."; + config false; + } + leaf-list aIMLInferenceFunctionRefList { + type types3gpp:DistinguishedName; + description "This attribute holds a DN list of AIMLInferenceFunction + (See TS 28.105) ."; + config false; + } } grouping EsNotAllowedTimePeriodGrp { @@ -200,4 +214,4 @@ module _3gpp-nr-nrm-desmanagementfunction { if-feature subnet3gpp:DESManagementFunction; uses DESManagementFunctionSubtree; } -} \ No newline at end of file +} diff --git a/yang-models/_3gpp-nr-nrm-dlbofunction.yang b/yang-models/_3gpp-nr-nrm-dlbofunction.yang index 6ae29fa509cee4528a3574f313fd42fbc271729a..9a3781a4560d67a36d6166e52f75fda55627799f 100644 --- a/yang-models/_3gpp-nr-nrm-dlbofunction.yang +++ b/yang-models/_3gpp-nr-nrm-dlbofunction.yang @@ -8,16 +8,18 @@ module _3gpp-nr-nrm-dlbofunction { import _3gpp-nr-nrm-gnbcucpfunction { prefix gnbcucp3gpp; } import _3gpp-common-managed-element { prefix me3gpp; } import _3gpp-nr-nrm-nrcellcu { prefix nrcellcu3gpp; } + import _3gpp-common-yang-types { prefix types3gpp; } organization "3GPP SA5"; contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464"; description "Defines the YANG mapping of the DLBOFunction Information Object Class (IOC) that is part of the NR Network Resource Model (NRM). - Copyright 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + Copyright 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved."; reference "3GPP TS 28.541 5G Network Resource Model (NRM)"; + revision 2024-08-07 { reference CR-1331; } revision 2023-09-18 { reference CR-1043 ; } revision 2022-03-25 { reference "CR-0683"; } revision 2021-10-22 { reference "CR-0577"; } @@ -68,7 +70,18 @@ module _3gpp-nr-nrm-dlbofunction { type int32 { range "0..604800"; } units "1"; } - + leaf-list mLModelRefList { + type types3gpp:DistinguishedName; + description "This attribute holds a DN list of MLModel ¨ + (See TS 28.105)."; + config false; + } + leaf-list aIMLInferenceFunctionRefList { + type types3gpp:DistinguishedName; + description "This attribute holds a DN list of AIMLInferenceFunction + (See TS 28.105) ."; + config false; + } } grouping DLBOFunctionSubtree { @@ -84,7 +97,7 @@ module _3gpp-nr-nrm-dlbofunction { uses top3gpp:Top_Grp; container attributes { uses DLBOFunctionGrp; - } + } } } @@ -101,4 +114,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 ea6ef52b7f65c2f8ea11bfa55949b6a0400ff19e..9c1937e1d7522027358a2a7d39a830140a498d95 100755 --- a/yang-models/_3gpp-nr-nrm-dmrofunction.yang +++ b/yang-models/_3gpp-nr-nrm-dmrofunction.yang @@ -8,16 +8,18 @@ module _3gpp-nr-nrm-dmrofunction { import _3gpp-nr-nrm-gnbcucpfunction { prefix gnbcucp3gpp; } import _3gpp-common-managed-element { prefix me3gpp; } import _3gpp-nr-nrm-nrcellcu { prefix nrcellcu3gpp; } + import _3gpp-common-yang-types { prefix types3gpp; } organization "3GPP SA5"; contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464"; description "Defines the YANG mapping of the DMROFunction Information Object Class (IOC) that is part of the NR Network Resource Model (NRM). - Copyright 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + Copyright 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved."; reference "3GPP TS 28.541 5G Network Resource Model (NRM)"; + revision 2024-08-07 { reference CR-1331; } revision 2023-09-18 { reference CR-1043 ; } revision 2022-01-07 { reference CR-0633; } revision 2021-08-05 { reference S5-214053/CR-0518; } @@ -64,6 +66,18 @@ module _3gpp-nr-nrm-dmrofunction { description "This attribute determines whether the MRO function is enabled or disabled."; type boolean; + } + leaf-list mLModelRefList { + type types3gpp:DistinguishedName; + description "This attribute holds a DN list of MLModel ¨ + (See TS 28.105)."; + config false; + } + leaf-list aIMLInferenceFunctionRefList { + type types3gpp:DistinguishedName; + description "This attribute holds a DN list of AIMLInferenceFunction + (See TS 28.105) ."; + config false; } } @@ -101,4 +115,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-ecmappingrule.yang b/yang-models/_3gpp-nr-nrm-ecmappingrule.yang new file mode 100644 index 0000000000000000000000000000000000000000..ac5fbfe309e502edf1b4eea2cbf2ba2053bdee03 --- /dev/null +++ b/yang-models/_3gpp-nr-nrm-ecmappingrule.yang @@ -0,0 +1,56 @@ +module _3gpp-nr-nrm-ecmappingrule { + yang-version 1.1; + namespace urn:3gpp:sa5:_3gpp-nr-nrm-ecmappingrule; + prefix ecmap3gpp; + + import _3gpp-common-top { prefix top3gpp; } + + organization "3gpp SA5"; + contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464"; + description "This IOC represents the unified mapping rule input to support + Energy Cost Index Mapping when Energy Cost Reporting. + Copyright 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + TTA, TTC). All rights reserved."; + reference "3GPP TS 28.541"; + + revision 2024-08-21 { reference CR-1337 ; } + + grouping NRECMappingRuleGrp { + description "Represents the unified mapping rule to support Energy Cost Mapping + when Energy Cost Reporting is supported. Can be name-contained by SubNetwork + or ManagedElement. It applies to all ManagedEntity contained by the parent."; + leaf eCMRInputMinValue { + type uint8; + description "The minimum value of to be applied + for mapping from this attribute to the energy cost."; + } + + leaf eCMRInputMaxValue { + type uint8; + description "The maximum value of to be applied + for mapping from this attribute to the energy cost."; + } + + leaf eCTimeInterval { + type uint8; + description "Time interval (in seconds) that + should be applied for collecting values of mapping + rule attribute to be used for computing the energy cost."; + units seconds; + } + } + + grouping NRECMappingRuleSubtree { + description "Helps augmenting NRECMappingRule into multiple places."; + list NRECMappingRule { + key id; + uses top3gpp:Top_Grp; + min-elements 1; + max-elements 1; + leaf idx { type uint32; } + container attributes { + uses NRECMappingRuleGrp; + } + } + } +} diff --git a/yang-models/_3gpp-nr-nrm-gnbcucpfunction.yang b/yang-models/_3gpp-nr-nrm-gnbcucpfunction.yang index 7d8eabeec81675750634464c98f6e60d59175eb2..839cb879c47bac02062c1b0a6f2e31a7c7a959e6 100755 --- a/yang-models/_3gpp-nr-nrm-gnbcucpfunction.yang +++ b/yang-models/_3gpp-nr-nrm-gnbcucpfunction.yang @@ -19,6 +19,7 @@ module _3gpp-nr-nrm-gnbcucpfunction { TTA, TTC). All rights reserved."; reference "3GPP TS 28.541 5G Network Resource Model (NRM)"; + revision 2024-08-19 { reference "CR-1337 CR-1352"; } revision 2024-05-24 { reference CR-1273 ; } revision 2024-04-04 { reference CR-1139; } revision 2024-02-24 { reference CR-1218; } @@ -141,6 +142,12 @@ module _3gpp-nr-nrm-gnbcucpfunction { enabled or disabled."; } + leaf dLTMCellSwitchControl { + type boolean; + description "This attribute determines whether the distributed SON + function LTM Cell Switch is enabled or disabled."; + } + leaf dDAPSHOControl { type boolean; description "This attribute determines whether the DAPS handover function @@ -180,6 +187,13 @@ module _3gpp-nr-nrm-gnbcucpfunction { type types3gpp:DistinguishedName; description "This is the DN of EphemerisInfoSet."; } + + leaf nRECMappingRuleRef { + type types3gpp:DistinguishedName; + description "DN of a NRECMappingRule. An empty value indicates the + NRECMappingRule contained by parent, e.g. ManagedElement or + SubNetwork, applies."; + } } grouping QceIdMappingInfoGrp { @@ -223,4 +237,4 @@ module _3gpp-nr-nrm-gnbcucpfunction { } } } -} \ No newline at end of file +}