diff --git a/OpenAPI/5gcNrm.yaml b/OpenAPI/5gcNrm.yaml index e4c4b2619fdedf368a7c1100bf2d238b214a63ff..91383acfebb60d137e03bdaccbce47da7c271d18 100755 --- a/OpenAPI/5gcNrm.yaml +++ b/OpenAPI/5gcNrm.yaml @@ -1,7 +1,7 @@ openapi: 3.0.1 info: title: 3GPP 5GC NRM - version: 17.4.0 + version: 17.5.0 description: >- OAS 3.0.1 specification of the 5GC NRM © 2020, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). @@ -41,11 +41,11 @@ components: type: object properties: ipv4Address: - $ref: 'genericNrm.yaml#/components/schemas/Ipv4Addr' + $ref: 'comDefs.yaml#/components/schemas/Ipv4Addr' ipv6Address: - $ref: 'genericNrm.yaml#/components/schemas/Ipv6Addr' + $ref: 'comDefs.yaml#/components/schemas/Ipv6Addr' ipv6Prefix: - $ref: 'genericNrm.yaml#/components/schemas/Ipv6Prefix' + $ref: 'comDefs.yaml#/components/schemas/Ipv6Prefix' transport: $ref: 'genericNrm.yaml#/components/schemas/TransportProtocol' port: @@ -71,9 +71,9 @@ components: sNssais: $ref: 'nrNrm.yaml#/components/schemas/Snssai' fqdn: - $ref: 'genericNrm.yaml#/components/schemas/Fqdn' + $ref: 'comDefs.yaml#/components/schemas/Fqdn' interPlmnFqdn: - $ref: 'genericNrm.yaml#/components/schemas/Fqdn' + $ref: 'comDefs.yaml#/components/schemas/Fqdn' nfServices: type: array items: @@ -91,9 +91,9 @@ components: schema: type: string fqdn: - $ref: 'genericNrm.yaml#/components/schemas/Fqdn' + $ref: 'comDefs.yaml#/components/schemas/Fqdn' interPlmnFqdn: - $ref: 'genericNrm.yaml#/components/schemas/Fqdn' + $ref: 'comDefs.yaml#/components/schemas/Fqdn' ipEndPoints: type: array items: @@ -144,11 +144,6 @@ components: properties: smfServingAreas: type: string - AmfInfo: - type: object - properties: - priority: - type: integer SupportedDataSetId: type: string description: any of enumrated value @@ -171,8 +166,33 @@ components: - $ref: '#/components/schemas/UdmInfo' - $ref: '#/components/schemas/AusfInfo' - $ref: '#/components/schemas/UpfInfo' - - $ref: '#/components/schemas/AmfInfo' - $ref: '#/components/schemas/Udrinfo' + NotificationType: + type: string + enum: + - N1_MESSAGES + - N2_INFORMATION + - LOCATION_NOTIFICATION + - DATA_REMOVAL_NOTIFICATION + - DATA_CHANGE_NOTIFICATION + - LOCATION_UPDATE_NOTIFICATION + - NSSAA_REAUTH_NOTIFICATION + - NSSAA_REVOC_NOTIFICATION + DefaultNotificationSubscription: + type: object + properties: + notificationType: + $ref: '#/components/schemas/NotificationType' + callbackURI: + type: string + n1MessageClass: + type: boolean + n2InfroamtionClass: + type: boolean + versions: + type: string + binding: + type: string ManagedNFProfile: type: object properties: @@ -180,16 +200,56 @@ components: type: string nfType: $ref: 'genericNrm.yaml#/components/schemas/NFType' + heartbeatTimer: + type: integer authzInfo: type: string hostAddr: - $ref: 'genericNrm.yaml#/components/schemas/HostAddr' + $ref: 'comDefs.yaml#/components/schemas/HostAddr' + allowedPLMNs: + type: array + items: + $ref: 'nrNrm.yaml#/components/schemas/PlmnId' + allowedSNPNs: + type: array + items: + $ref: 'nrNrm.yaml#/components/schemas/SnpnInfo' + allowedNfTypes: + type: array + items: + $ref: 'genericNrm.yaml#/components/schemas/NFType' + allowedNfDomains: + type: array + items: + type: string + allowedNSSAIs: + type: array + items: + $ref: 'nrNrm.yaml#/components/schemas/Snssai' locality: type: string nFInfo: $ref: '#/components/schemas/NFInfo' capacity: type: integer + nfSetIdList: + type: array + items: + type: string + servingScope: + type: array + items: + type: string + nfSetRecoveryTimeList: + type: array + items: + $ref: 'comDefs.yaml#/components/schemas/DateTime' + scpDomains: + type: array + items: + type: string + vendorId: + type: string SEPPType: type: string description: any of enumrated value @@ -223,7 +283,7 @@ components: commModelType: $ref: '#/components/schemas/CommModelType' targetNFServiceList: - $ref: 'genericNrm.yaml#/components/schemas/DnList' + $ref: 'comDefs.yaml#/components/schemas/DnList' commModelConfiguration: type: string CommModelList: @@ -251,13 +311,12 @@ components: cNSIId: $ref: '#/components/schemas/CNSIId' networkSliceRef: - $ref: 'genericNrm.yaml#/components/schemas/DnList' + $ref: 'comDefs.yaml#/components/schemas/DnList' NetworkSliceInfoList: type: array items: $ref: '#/components/schemas/NetworkSliceInfo' - PacketErrorRate: type: object properties: @@ -266,8 +325,6 @@ components: exponent: type: integer - - GtpUPathDelayThresholdsType: type: object properties: @@ -382,6 +439,8 @@ components: $ref: '#/components/schemas/SteeringMode' mulAccCtrl: $ref: 'https://forge.3gpp.org/rep/all/5G_APIs/raw/REL-16/TS29512_Npcf_SMPolicyControl.yaml#/components/schemas/MulticastAccessControl' + snssaiList: + $ref: 'nrNrm.yaml#/components/schemas/SnssaiList' TrafficControlDataList: type: array @@ -437,7 +496,7 @@ components: plmnInfo: $ref: 'nrNrm.yaml#/components/schemas/PlmnInfo' administrativeState: - $ref: 'genericNrm.yaml#/components/schemas/AdministrativeState' + $ref: 'comDefs.yaml#/components/schemas/AdministrativeState' NsacfInfoSnssai: type: object @@ -463,8 +522,47 @@ components: type: array items: type: string - - + maxNumberofPDUSessions: + type: integer + + NRTACRange: + type: object + properties: + nRTACstart: + type: string + nRTACend: + type: string + nRTACpattern: + type: string + + TaiRange: + type: object + properties: + plmnId: + $ref: 'nrNrm.yaml#/components/schemas/PlmnId' + nRTACRangelist: + type: array + items: + $ref: '#/components/schemas/NRTACRange' + + GUAMInfo: + type: object + properties: + pLMNId: + $ref: 'nrNrm.yaml#/components/schemas/PlmnId' + aMFIdentifier: + type: integer + + SupportedBMOList: + type: array + items: + type: string + + ECSAddrConfigInfo: + type: array + items: + type: string + #-------- Definition of concrete IOCs -------------------------------------------- SubNetwork-Single: @@ -548,7 +646,7 @@ components: $ref: '#/components/schemas/Configurable5QISet-Multiple' Dynamic5QISet: $ref: '#/components/schemas/Dynamic5QISet-Multiple' - + AmfFunction-Single: allOf: - $ref: 'genericNrm.yaml#/components/schemas/Top' @@ -565,12 +663,26 @@ components: $ref: '#/components/schemas/AmfIdentifier' sBIFqdn: type: string + interPlmnFQDN: + type: string + taiList: + $ref: 'nrNrm.yaml#/components/schemas/Tai' + taiRangeList: + $ref: 'nrNrm.yaml#/components/schemas/TaiRange' weightFactor: $ref: '#/components/schemas/WeightFactor' snssaiList: $ref: 'nrNrm.yaml#/components/schemas/SnssaiList' - amfSet: - $ref: 'genericNrm.yaml#/components/schemas/Dn' + cNSIIdList: + $ref: '#/components/schemas/CNSIIdList' + gUAMIdList: + $ref: '#/components/schemas/GUAMInfo' + backupInfoAmfFailure: + $ref: '#/components/schemas/GUAMInfo' + backupInfoAmfRemoval: + $ref: '#/components/schemas/GUAMInfo' + amfSetRef: + $ref: 'comDefs.yaml#/components/schemas/Dn' managedNFProfile: $ref: '#/components/schemas/ManagedNFProfile' commModelList: @@ -620,6 +732,10 @@ components: $ref: '#/components/schemas/AmfSetId' snssaiList: $ref: 'nrNrm.yaml#/components/schemas/SnssaiList' + aMFRegionRef: + $ref: 'comDefs.yaml#/components/schemas/Dn' + aMFSetMemberList: + $ref: 'comDefs.yaml#/components/schemas/DnList' AmfRegion-Single: allOf: - $ref: 'genericNrm.yaml#/components/schemas/Top' @@ -638,6 +754,8 @@ components: $ref: '#/components/schemas/AmfRegionId' snssaiList: $ref: 'nrNrm.yaml#/components/schemas/SnssaiList' + aMFSetListRef: + $ref: 'comDefs.yaml#/components/schemas/DnList' SmfFunction-Single: allOf: - $ref: 'genericNrm.yaml#/components/schemas/Top' @@ -661,9 +779,9 @@ components: commModelList: $ref: '#/components/schemas/CommModelList' configurable5QISetRef: - $ref: 'genericNrm.yaml#/components/schemas/Dn' + $ref: 'comDefs.yaml#/components/schemas/Dn' dynamic5QISetRef: - $ref: 'genericNrm.yaml#/components/schemas/Dn' + $ref: 'comDefs.yaml#/components/schemas/Dn' - $ref: 'genericNrm.yaml#/components/schemas/ManagedFunction-ncO' - type: object @@ -707,8 +825,8 @@ components: $ref: 'nrNrm.yaml#/components/schemas/SnssaiList' managedNFProfile: $ref: '#/components/schemas/ManagedNFProfile' - commModelList: - $ref: '#/components/schemas/CommModelList' + supportedBMOList: + $ref: '#/components/schemas/SupportedBMOList' - $ref: 'genericNrm.yaml#/components/schemas/ManagedFunction-ncO' - type: object properties: @@ -764,9 +882,11 @@ components: commModelList: $ref: '#/components/schemas/CommModelList' configurable5QISetRef: - $ref: 'genericNrm.yaml#/components/schemas/Dn' + $ref: 'comDefs.yaml#/components/schemas/Dn' dynamic5QISetRef: - $ref: 'genericNrm.yaml#/components/schemas/Dn' + $ref: 'comDefs.yaml#/components/schemas/Dn' + supportedBMOList: + $ref: '#/components/schemas/SupportedBMOList' - $ref: 'genericNrm.yaml#/components/schemas/ManagedFunction-ncO' - type: object @@ -831,6 +951,8 @@ components: $ref: '#/components/schemas/ManagedNFProfile' commModelList: $ref: '#/components/schemas/CommModelList' + eCSAddrConfigInfo: + $ref: '#/components/schemas/ECSAddrConfigInfo' - $ref: 'genericNrm.yaml#/components/schemas/ManagedFunction-ncO' - type: object properties: @@ -1020,7 +1142,7 @@ components: sEPPId: type: integer fqdn: - $ref: 'genericNrm.yaml#/components/schemas/Fqdn' + $ref: 'comDefs.yaml#/components/schemas/Fqdn' - $ref: 'genericNrm.yaml#/components/schemas/ManagedFunction-ncO' - type: object properties: @@ -1062,7 +1184,7 @@ components: supportedFuncList: $ref: '#/components/schemas/SupportedFuncList' address: - $ref: 'genericNrm.yaml#/components/schemas/HostAddr' + $ref: 'comDefs.yaml#/components/schemas/HostAddr' - $ref: 'genericNrm.yaml#/components/schemas/ManagedFunction-ncO' NefFunction-Single: allOf: @@ -1084,6 +1206,16 @@ components: $ref: '#/components/schemas/CapabilityList' isCAPIFSup: type: boolean + taiList: + items: + $ref: 'nrNrm.yaml#/components/schemas/TaiList' + taiRangeList: + type: array + items: + $ref: '#/components/schemas/TaiRange' + dnai: + type: string + - $ref: 'genericNrm.yaml#/components/schemas/ManagedFunction-ncO' - type: object properties: @@ -1105,6 +1237,9 @@ components: type: array items: $ref: '#/components/schemas/NsacfInfoSnssai' + taiList: + items: + $ref: 'nrNrm.yaml#/components/schemas/TaiList' - $ref: 'genericNrm.yaml#/components/schemas/ManagedFunction-ncO' - type: object properties: @@ -1132,12 +1267,39 @@ components: - $ref: 'genericNrm.yaml#/components/schemas/ManagedFunction-ncO' - type: object properties: - EP_N64: - $ref: '#/components/schemas/EP_N64-Multiple' - EP_N65: - $ref: '#/components/schemas/EP_N65-Multiple' - EP_N66: - $ref: '#/components/schemas/EP_N66-Multiple' + EP_Npc4: + $ref: '#/components/schemas/EP_Npc4-Multiple' + EP_Npc6: + $ref: '#/components/schemas/EP_Npc6-Multiple' + EP_Npc7: + $ref: '#/components/schemas/EP_Npc7-Multiple' + EP_Npc8: + $ref: '#/components/schemas/EP_Npc8-Multiple' + + EASDFFunction-Single: + allOf: + - $ref: 'genericNrm.yaml#/components/schemas/Top' + - type: object + properties: + attributes: + allOf: + - $ref: 'genericNrm.yaml#/components/schemas/ManagedFunction-Attr' + - type: object + properties: + plmnId: + $ref: 'nrNrm.yaml#/components/schemas/PlmnId' + sBIFqdn: + type: string + managedNFProfile: + $ref: '#/components/schemas/ManagedNFProfile' + serverAddr: + type: string + - $ref: 'genericNrm.yaml#/components/schemas/ManagedFunction-ncO' + - type: object + properties: + EP_Nxx: + $ref: '#/components/schemas/EP_Nxx-Multiple' + ExternalAmfFunction-Single: allOf: @@ -1192,7 +1354,7 @@ components: sEPPId: type: integer fqdn: - $ref: 'genericNrm.yaml#/components/schemas/Fqdn' + $ref: 'comDefs.yaml#/components/schemas/Fqdn' EP_N2-Single: @@ -1224,7 +1386,7 @@ components: remoteAddress: $ref: 'nrNrm.yaml#/components/schemas/RemoteAddress' epTransportRefs: - $ref: 'genericNrm.yaml#/components/schemas/DnList' + $ref: 'comDefs.yaml#/components/schemas/DnList' EP_N4-Single: allOf: - $ref: 'genericNrm.yaml#/components/schemas/Top' @@ -1523,7 +1685,7 @@ components: remotePlmnId: $ref: 'nrNrm.yaml#/components/schemas/PlmnId' remoteSeppAddress: - $ref: 'genericNrm.yaml#/components/schemas/HostAddr' + $ref: 'comDefs.yaml#/components/schemas/HostAddr' remoteSeppId: type: integer n32cParas: @@ -1645,7 +1807,7 @@ components: $ref: 'nrNrm.yaml#/components/schemas/LocalAddress' remoteAddress: $ref: 'nrNrm.yaml#/components/schemas/RemoteAddress' - EP_N64-Single: + EP_Npc4-Single: allOf: - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr' - type: object @@ -1659,7 +1821,7 @@ components: $ref: 'nrNrm.yaml#/components/schemas/LocalAddress' remoteAddress: $ref: 'nrNrm.yaml#/components/schemas/RemoteAddress' - EP_N65-Single: + EP_Npc6-Single: allOf: - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr' - type: object @@ -1673,7 +1835,7 @@ components: $ref: 'nrNrm.yaml#/components/schemas/LocalAddress' remoteAddress: $ref: 'nrNrm.yaml#/components/schemas/RemoteAddress' - EP_N66-Single: + EP_Npc7-Single: allOf: - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr' - type: object @@ -1687,7 +1849,36 @@ components: $ref: 'nrNrm.yaml#/components/schemas/LocalAddress' remoteAddress: $ref: 'nrNrm.yaml#/components/schemas/RemoteAddress' - + EP_Npc8-Single: + allOf: + - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr' + - type: object + properties: + attributes: + allOf: + - $ref: 'genericNrm.yaml#/components/schemas/EP_RP-Attr' + - type: object + properties: + localAddress: + $ref: 'nrNrm.yaml#/components/schemas/LocalAddress' + remoteAddress: + $ref: 'nrNrm.yaml#/components/schemas/RemoteAddress' + + EP_Nxx-Single: + allOf: + - $ref: 'genericNrm.yaml#/components/schemas/Top' + - type: object + properties: + attributes: + allOf: + - $ref: 'genericNrm.yaml#/components/schemas/EP_RP-Attr' + - type: object + properties: + localAddress: + $ref: 'nrNrm.yaml#/components/schemas/LocalAddress' + remoteAddress: + $ref: 'nrNrm.yaml#/components/schemas/RemoteAddress' + FiveQiDscpMappingSet-Single: allOf: - $ref: 'genericNrm.yaml#/components/schemas/Top' @@ -2085,18 +2276,26 @@ components: type: array items: $ref: '#/components/schemas/EP_N60-Single' - EP_N64-Multiple: + EP_Npc4-Multiple: + type: array + items: + $ref: '#/components/schemas/EP_Npc4-Single' + EP_Npc6-Multiple: + type: array + items: + $ref: '#/components/schemas/EP_Npc6-Single' + EP_Npc7-Multiple: type: array items: - $ref: '#/components/schemas/EP_N64-Single' - EP_N65-Multiple: + $ref: '#/components/schemas/EP_Npc7-Single' + EP_Npc8-Multiple: type: array items: - $ref: '#/components/schemas/EP_N65-Single' - EP_N66-Multiple: + $ref: '#/components/schemas/EP_Npc8-Single' + EP_Nxx-Multiple: type: array items: - $ref: '#/components/schemas/EP_N66-Single' + $ref: '#/components/schemas/EP_Nxx-Single' Configurable5QISet-Multiple: type: array items: @@ -2172,6 +2371,7 @@ components: - $ref: '#/components/schemas/EP_N32-Single' - $ref: '#/components/schemas/EP_N33-Single' - $ref: '#/components/schemas/EP_N60-Single' + - $ref: '#/components/schemas/EP_Nxx-Single' - $ref: '#/components/schemas/EP_S5C-Single' - $ref: '#/components/schemas/EP_S5U-Single' @@ -2183,3 +2383,4 @@ components: - $ref: '#/components/schemas/FiveQiDscpMappingSet-Single' - $ref: '#/components/schemas/PredefinedPccRuleSet-Single' - $ref: '#/components/schemas/Dynamic5QISet-Single' + - $ref: '#/components/schemas/EASDFFunction-Single' diff --git a/OpenAPI/PerDataFileReportMnS.yaml b/OpenAPI/PerDataFileReportMnS.yaml deleted file mode 100755 index 83fd77acb7ff591a51a20ba0a1c1473b9a3b5376..0000000000000000000000000000000000000000 --- a/OpenAPI/PerDataFileReportMnS.yaml +++ /dev/null @@ -1,13 +0,0 @@ -openapi: 3.0.1 -info: - title: TS 28.532 File data reporting Service - version: 16.6.0 - description: >- - OAS 3.0.1 specification of the File data reporting Management Service © 2020, - 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All - rights reserved. -externalDocs: - description: 3GPP TS 28.532 V16.5.0; Generic management services - url: 'http://www.3gpp.org/ftp/Specs/archive/28_series/28.532/' -paths: {} - diff --git a/OpenAPI/PerMeasJobCtlMnS.yaml b/OpenAPI/PerMeasJobCtlMnS.yaml index b6abe58b22ae893e3add0f00d1d7417fdcb95ca9..50fea5a73f82f4664253663228ea45e99750ac5a 100755 --- a/OpenAPI/PerMeasJobCtlMnS.yaml +++ b/OpenAPI/PerMeasJobCtlMnS.yaml @@ -1,26 +1,23 @@ openapi: 3.0.1 info: title: TS 28.550 Performance Measurement Job Control Service - version: 16.5.0 + version: 16.8.0 description: >- OAS 3.0.1 specification of the Performance Measurement Job Control Service @ 2020, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved. externalDocs: - description: 3GPP TS 28.550 V16.5.0; Performance assurance + description: 3GPP TS 28.550 V16.8.0; Performance assurance url: http://www.3gpp.org/ftp/Specs/archive/28_series/28.550/ servers: - - url: 'http://{URI-DN-prefix}/{root}/PerfMeasJobCtrlMnS/v1650/{LDN-first-part}' + - url: '{MnSRoot}/PerfMeasJobCtrlMnS/{MnSVersion}' variables: - URI-DN-prefix: - description: See subclause 4.4 of TS 32.158 - default: example.com - root: - description: See subclause 4.4 of TS 32.158 - default: 3GPPManagement - LDN-first-part: - description: See subclause 4.4 of TS 32.158 - default: '' + MnSRoot: + description: See clause 4.4.2 of TS 32.158 + default: http://example.com/3GPPManagement + MnSVersion: + description: Version number of the OpenAPI definition + default: XXX paths: /measJobs: post: diff --git a/OpenAPI/PerThresMonMnS.yaml b/OpenAPI/PerThresMonMnS.yaml deleted file mode 100755 index 923640a11e3f578a9887d4a8699d3b8814085353..0000000000000000000000000000000000000000 --- a/OpenAPI/PerThresMonMnS.yaml +++ /dev/null @@ -1,102 +0,0 @@ -openapi: 3.0.1 -info: - title: TS 28.532 Performance Threshold Monitoring Service - version: 16.4.0 - description: OAS 3.0.1 specification of the Performance Threshold Monitoring Service -servers: - - url: 'http://{monitoringNotifTarget}' - variables: - monitoringNotifTarget: - description: >- - The open API server of the performance threshold monitoring service is - located in the consumer side, see monitoringNotifTarget attribute of - the IOC ThresholdMonitor defined in 3GPP TS 28.622 [11]. - default: example.com -paths: - /notificationSink: - post: - summary: Send notifications about performance threshold crossing - description: To send a notifyThresholdCrossing notification - requestBody: - required: true - content: - application/json: - schema: - $ref: '#/components/schemas/notifyThresholdCrossing-NotifType' - responses: - '204': - description: >- - Success case ("204 No Content"). The notification is successfully - delivered. The response message body is absent. - default: - description: Error case. - content: - application/json: - schema: - $ref: '#/components/schemas/error-ResponseType' -components: - schemas: - dateTime-Type: - type: string - format: date-Time - uri-Type: - type: string - long-Type: - type: string - format: long - thresholdLevel-Type: - type: integer - measurementTypeName-Type: - type: string - measurementValue-Type: - type: string - additionalText-Type: - type: string - error-ResponseType: - type: object - properties: - error: - type: object - properties: - errorInfo: - type: string - header-Type: - description: Header used in notifications as notification header - type: object - properties: - uri: - $ref: '#/components/schemas/uri-Type' - notificationId: - $ref: '#/components/schemas/notificationId-Type' - notificationType: - $ref: '#/components/schemas/notificationType-Type' - eventTime: - $ref: '#/components/schemas/dateTime-Type' - notificationId-Type: - $ref: '#/components/schemas/long-Type' - notificationType-Type: - type: string - enum: - - notifyThresholdCrossing - notifyThresholdCrossing-NotifType: - type: object - properties: - header: - $ref: '#/components/schemas/header-Type' - body: - type: object - properties: - startOfMonitoringGP: - $ref: '#/components/schemas/dateTime-Type' - endOfMonitoringGP: - $ref: '#/components/schemas/dateTime-Type' - monitoredObjectInstance: - $ref: '#/components/schemas/uri-Type' - thresholdLevel: - $ref: '#/components/schemas/thresholdLevel-Type' - measurementTypeName: - $ref: '#/components/schemas/measurementTypeName-Type' - measurementValue: - $ref: '#/components/schemas/measurementValue-Type' - additionalText: - $ref: '#/components/schemas/additionalText-Type' diff --git a/OpenAPI/PerfDataStreamingMnS.yaml b/OpenAPI/PerfDataStreamingMnS.yaml deleted file mode 100755 index e040e14c80af94fc200a0b40424c35ddc6aa29eb..0000000000000000000000000000000000000000 --- a/OpenAPI/PerfDataStreamingMnS.yaml +++ /dev/null @@ -1,363 +0,0 @@ -openapi: 3.0.1 -info: - title: TS 28.550 Performance Data Streaming Service - version: 16.3.0 - description: OAS 3.0.1 specification of the Performance Data Streaming Service -servers: - - url: 'http://{streamTarget}/PerfDataStreamMnS/v1630' - description: This URL is used for posting the set of information about streams supported on the connection between the producer and the consumer. - variables: - streamTarget: - description: 'The open API server of the performance data streaming service is located in the consumer side,and the “streamTarget” part corresponds to the streamTarget parameter provided in the createMeasurementJob operation (see clause 6.1.1.2) or the streamTarget attribute of the MOI of MeasurementControlor MeasurementReader, see 3GPP TS 28.622 [5]).' - default: example.com - - url: 'wss://{streamTarget}/PerfDataStreamMnS/v1630/streamingConnection' - description: This URL is used for establishing the WebSocket connection for the performance data streaming service. - variables: - streamTarget: - description: 'The open API server of the performance data streaming service is located in the consumer side,and the “streamTarget” part corresponds to the streamTarget parameter provided in the createMeasurementJob operation (see clause 6.1.1.2) or the streamTarget attribute of the MOI of MeasurementControlor MeasurementReader, see 3GPP TS 28.622 [5]).' - default: example.com -paths: - /streamInfoList: - post: - summary: The set of information about the streams sent from the producer to the consumer - description: To send the streamInfoList from the producer to the consumer - requestBody: - required: true - content: - application/json: - schema: - $ref: '#/components/schemas/streamInfoListPost-RequestType' - responses: - '201': - description: Success case ("201 Posted"). The streamInfoList is successfully posted. - content: - application/json: - schema: - $ref: '#/components/schemas/streamInfoListPost-ResponseType' - '202': - description: Partial success case ("202 Partially posted"). The representation of the posted resource on stream information. - content: - application/json: - schema: - $ref: '#/components/schemas/streamInfoListPost-ResponseType' - default: - description: Error case. - content: - application/json: - schema: - $ref: '#/components/schemas/error-ResponseType' - get: - summary: Read resources of stream information from the streaming consumer - description: 'With HTTP GET, resources of stream information are read. The resources to be read are identified with the path component (base resource) and the query component (streamIdList) of the URI. The fields query component allows to select the resource properties to be returned.' - parameters: - - name: streamIdList - in: query - description: This parameter identifies the list of streamId to select from the collection resources identified with the path component of the URI. - required: true - schema: - type: array - items: - type: integer - responses: - '200': - description: 'Success case ("200 OK"). The resources identified in the request for retrieval are returned in the response message body. In case the fields query parameter is used, the selected resources are returned.' - content: - application/json: - schema: - $ref: '#/components/schemas/listOfStreamInfoRetrieval-ResponseType' - '202': - description: Partial success case ("202 Partially retrieved"). The representation of the retrieved resources on stream information. - content: - application/json: - schema: - $ref: '#/components/schemas/listOfStreamInfoRetrieval-ResponseType' - default: - description: Error case. - content: - application/json: - schema: - $ref: '#/components/schemas/error-ResponseType' - patch: - summary: Update resources of stream information to the streaming consumer - description: 'With HTTP PATCH, resources of stream information are to be updated. The resources to be updated are identified with the path component (base resource) and the query component (streamIdList) of the URI. The fields query component allows to select the resource properties to be updated.' - parameters: - - name: streamIdList - in: query - description: This parameter identifies the list of streamId to select from the collection resources identified with the path component of the URI. - required: true - schema: - type: array - items: - type: integer - requestBody: - required: true - content: - application/json: - schema: - $ref: '#/components/schemas/listOfStreamInfoToUpdate-RequestType' - responses: - '200': - description: Success case ("200 OK"). The resources selected by the query parameter are updated and returned in the response message body. - content: - application/json: - schema: - $ref: '#/components/schemas/listOfStreamInfoUpdate-ResponseType' - '202': - description: Partial success case ("202 Partially updated"). The representation of the updated resources on stream information - content: - application/json: - schema: - $ref: '#/components/schemas/listOfStreamInfoUpdate-ResponseType' - default: - description: Error case. - content: - application/json: - schema: - $ref: '#/components/schemas/error-ResponseType' - delete: - summary: The information of streams to be deleted by the producer to the consumer - description: 'With HTTP DELETE, resources of stream information are to be deleted. The resources to be deleted are identified with the path component (base resource) and the query component (streamIdList) of the URI. The fields query component allows to select the resource properties to be deleted.' - parameters: - - name: streamIdList - in: query - description: This parameter identifies the list of streamId to select from the collection resources identified with the path component of the URI. - required: true - schema: - type: array - items: - type: integer - responses: - '204': - description: Success case ("204 No Content"). The stream information resource has been deleted. The response message body is absent. - default: - description: Error case. - content: - application/json: - schema: - $ref: '#/components/schemas/error-ResponseType' - '/streamInfoList/{streamId}': - get: - summary: Read resource of the stream information from the streaming consumer - description: 'With HTTP GET, resource of stream information is read. The resource to be read is identified with the path component the URI.' - parameters: - - name: streamId - in: path - description: Identifies the stream for which the information is to be retrieved. - required: true - schema: - $ref: '#/components/schemas/uri-Type' - responses: - '200': - description: Success case ("200 OK"). The resource identified in the request for retrieval is returned in the response message body. - content: - application/json: - schema: - $ref: '#/components/schemas/listOfStreamInfoRetrieval-ResponseType' - default: - description: Error case. - content: - application/json: - schema: - $ref: '#/components/schemas/error-ResponseType' - patch: - summary: Update the resource of stream information to the streaming consumer - description: 'With HTTP PATCH, resource of stream information is to be updated. The resource to be updated is identified by the path component of the URI. ' - parameters: - - name: streamId - in: path - description: Identifies the stream for which the information is to be updated. - required: true - schema: - $ref: '#/components/schemas/uri-Type' - requestBody: - required: true - content: - application/json: - schema: - $ref: '#/components/schemas/streamInfoToUpdate-RequestType' - responses: - '200': - description: Success case ("200 OK"). The resources identified by the path of the URI is updated and returned in the response message body. - content: - application/json: - schema: - $ref: '#/components/schemas/streamInfoUpdate-ResponseType' - default: - description: Error case. - content: - application/json: - schema: - $ref: '#/components/schemas/error-ResponseType' - delete: - summary: The stream information to be deleted by the producer to the consumer - description: 'With HTTP DELETE, resource of stream information identified by the path component of the URI is to be deleted.' - parameters: - - name: streamId - in: path - description: Identifies the stream for which the information is to be deleted - required: true - schema: - $ref: '#/components/schemas/uri-Type' - responses: - '204': - description: Success case ("204 No Content"). The stream information resource has been deleted. The response message body is absent. - default: - description: Error case. - content: - application/json: - schema: - $ref: '#/components/schemas/error-ResponseType' - /streamConnection: - get: - summary: The connection for streaming from the producer to the consumer - description: To establish the WebSocket connection between the producer and the consumer. The HTTP version of this operation shall not be earlier than HTTP/1.1 - parameters: - - in: header - name: Upgrade - required: true - schema: - $ref: '#/components/schemas/Upgrade-HeaderType' - - in: header - name: Connection - required: true - schema: - $ref: '#/components/schemas/Connection-HeaderType' - - in: header - name: Sec-WebSocket-Key - required: true - schema: - $ref: '#/components/schemas/Sec-WebSocket-Key-HeaderType' - - in: header - name: Sec-WebSocket-Version - required: true - schema: - $ref: '#/components/schemas/Sec-WebSocket-Version-HeaderType' - responses: - '101': - description: Success case ("101 Switching Protocols "). The connection has been successfully switched to WebSocket. The response message body is absent. - headers: - Upgrade: - schema: - $ref: '#/components/schemas/Upgrade-HeaderType' - Connection: - schema: - $ref: '#/components/schemas/Connection-HeaderType' - Sec-WebSocket-Accept-HeaderType: - schema: - $ref: '#/components/schemas/Sec-WebSocket-Accept-HeaderType' - default: - description: Error case. - content: - application/json: - schema: - $ref: '#/components/schemas/error-ResponseType' -components: - schemas: - uri-Type: - type: string - streamInfoIn-Type: - type: object - properties: - streamId: - type: integer - iOCInstance: - $ref: '#/components/schemas/uri-Type' - measTypes: - type: array - items: - type: string - streamInfoOut-Type: - type: object - properties: - streamId: - $ref: '#/components/schemas/uri-Type' - iOCInstance: - $ref: '#/components/schemas/uri-Type' - measTypes: - type: array - items: - type: string - error-ResponseType: - type: object - properties: - error: - type: object - properties: - errorInfo: - type: string - streamInfoListPost-RequestType: - type: object - properties: - streamInfoList: - type: array - items: - $ref: '#/components/schemas/streamInfoIn-Type' - streamInfoListPost-ResponseType: - type: object - properties: - streamInfoListPosted: - type: array - items: - $ref: '#/components/schemas/streamInfoOut-Type' - streamInfoRetrieval-ResponseType: - type: object - properties: - streamInfoOut: - $ref: '#/components/schemas/streamInfoOut-Type' - listOfStreamInfoRetrieval-ResponseType: - type: object - properties: - listOfStreamInfoOut: - type: array - items: - $ref: '#/components/schemas/streamInfoOut-Type' - streamInfoToUpdatePropertyType: - type: object - properties: - iOCInstance: - description: 'The updated measured object instance, empty value means no update.' - allOf: - - $ref: '#/components/schemas/uri-Type' - measTypes: - description: 'The updated list of measurement type, empty value means no update.' - type: array - items: - type: string - streamInfoToUpdate-RequestType: - type: object - properties: - streamInfoToUpdate: - $ref: '#/components/schemas/streamInfoToUpdatePropertyType' - listOfStreamInfoToUpdate-RequestType: - type: object - properties: - listOfStreamInfoToUpdate: - type: array - items: - $ref: '#/components/schemas/streamInfoToUpdatePropertyType' - streamInfoUpdate-ResponseType: - type: object - properties: - streamInfoUpdated: - $ref: '#/components/schemas/streamInfoOut-Type' - listOfStreamInfoUpdate-ResponseType: - type: object - properties: - listOfStreamInfoUpdated: - type: array - items: - $ref: '#/components/schemas/streamInfoOut-Type' - Upgrade-HeaderType: - type: string - enum: - - websocket - Connection-HeaderType: - type: string - enum: - - Upgrade - Sec-WebSocket-Key-HeaderType: - type: string - Sec-WebSocket-Version-HeaderType: - type: string - Sec-WebSocket-Accept-HeaderType: - type: string diff --git a/OpenAPI/comDefs.yaml b/OpenAPI/comDefs.yaml index 04ab6516149335f8742cb617e1acec43bbeac2a4..d16f02ac3b011d8fa4136873724f455bd33d39c4 100755 --- a/OpenAPI/comDefs.yaml +++ b/OpenAPI/comDefs.yaml @@ -1,76 +1,174 @@ openapi: 3.0.1 info: title: Common Type Definitions - version: 16.3.0 + version: 17.0.0 description: >- OAS 3.0.1 specification of common type definitions in the Generic NRM - © 2020, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). + © 2021, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved. externalDocs: - description: 3GPP TS 28.623 V16.3.0; Generic NRM, Common Type Definitions + description: 3GPP TS 28.623; Generic NRM; Common type definitions url: http://www.3gpp.org/ftp/Specs/archive/28_series/28.623/ paths: {} components: schemas: - Long: - type: string - format: long + Float: - type: string + type: number format: float DateTime: type: string - format: date-Time + format: date-time + Latitude: + type: number + format: float + minimum: -90 + maximum: 90 + Longitude: + type: number + format: float + minimum: -180 + maximum: 180 + Dn: type: string + DnList: + type: array + items: + $ref: '#/components/schemas/Dn' + + Mcc: + type: string + pattern: '^[0-9]{3}$' + Mnc: + type: string + pattern: '^[0-9]{2,3}$' + Nid: + type: string + pattern: '^[A-Fa-f0-9]{11}$' + PlmnId: + type: object + properties: + mcc: + $ref: '#/components/schemas/Mcc' + mnc: + $ref: '#/components/schemas/Mnc' + Tac: + type: string + pattern: '(^[A-Fa-f0-9]{4}$)|(^[A-Fa-f0-9]{6}$)' + EutraCellId: + type: string + pattern: '^[A-Fa-f0-9]{7}$' + NrCellId: + type: string + pattern: '^[A-Fa-f0-9]{9}$' + + Fqdn: + type: string + Ipv4Addr: + 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' + Ipv6Addr: + 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' + Ipv6Prefix: + 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' + IpAddr: + oneOf: + - $ref: '#/components/schemas/Ipv4Addr' + - $ref: '#/components/schemas/Ipv6Addr' + HostAddr: + # This definition will be deprecated, when all occurances of HostAddr + # are replaced by Host. + oneOf: + - $ref: '#/components/schemas/Ipv4Addr' + - $ref: '#/components/schemas/Ipv6Addr' + - $ref: '#/components/schemas/Fqdn' + Host: + oneOf: + - $ref: '#/components/schemas/IpAddr' + - $ref: '#/components/schemas/Fqdn' Uri: type: string + + AdministrativeState: + type: string + enum: + - LOCKED + - UNLOCKED + OperationalState: + type: string + enum: + - ENABLED + - DISABLED + UsageState: + type: string + enum: + - IDEL + - ACTIVE + - BUSY + AttributeNameValuePairSet: + description: >- + The key of this map is the attribute name, and the value the attribute value. type: object minProperties: 1 + additionalProperties: + nullable: true AttributeValueChangeSet: description: >- - The key in this map is the attribute name. The value of each key is an array. - When only one item is present in the array, it carries the new attribute - value. If two items are present, then the first item carries the old value - and the second item the new value. The items can be of any type including null. - type: object - additionalProperties: - type: array + The first array item contains the attribute name value pairs with the new values, + and the second array item the attribute name value pairs with the optional old values. + type: array + items: + $ref: '#/components/schemas/AttributeNameValuePairSet' minItems: 1 maxItems: 2 - items: - nullable: true + Filter: + description: >- + The filter format shall be compliant to XPath 1.0. type: string SystemDN: type: string + NotificationId: type: integer + NotificationType: + oneOf: + - $ref: 'faultMnS.yaml#/components/schemas/AlarmNotificationTypes' + - $ref: 'provMnS.yaml#/components/schemas/CmNotificationTypes' + - $ref: 'perfMnS.yaml#/components/schemas/PerfNotificationTypes' + - $ref: 'heartbeatNtf.yaml#/components/schemas/HeartbeatNotificationTypes' + - $ref: 'fileDataReportingMnS.yaml#/components/schemas/FileNotificationTypes' NotificationHeader: - description: >- - Header used for all notifications types type: object - required: - - uri - - notificationId - - notificationType - - eventTime - - systemDn properties: - uri: + href: $ref: '#/components/schemas/Uri' notificationId: $ref: '#/components/schemas/NotificationId' notificationType: - oneOf: - - $ref: 'faultMnS.yaml#/components/schemas/AlarmNotificationTypes' - #- $ref: 'provMnS.yaml#/components/schemas/CmNotificationTypes' - # more to be added + $ref: '#/components/schemas/NotificationType' eventTime: $ref: '#/components/schemas/DateTime' systemDN: $ref: '#/components/schemas/SystemDN' + required: + - href + - notificationId + - notificationType + - eventTime + - systemDN + ErrorResponse: description: >- Default schema for the response message body in case the request diff --git a/OpenAPI/coslaNrm.yaml b/OpenAPI/coslaNrm.yaml index e6a0ef13af2190af819c4b75ec31fa458af04558..908756fa540e1a47d45dd0de9b012d03a48d1699 100755 --- a/OpenAPI/coslaNrm.yaml +++ b/OpenAPI/coslaNrm.yaml @@ -112,9 +112,9 @@ components: type: object properties: operationalState: - $ref: 'genericNrm.yaml#/components/schemas/OperationalState' + $ref: 'comDefs.yaml#/components/schemas/OperationalState' administrativeState: - $ref: 'genericNrm.yaml#/components/schemas/AdministrativeState' + $ref: 'comDefs.yaml#/components/schemas/AdministrativeState' controlLoopLifeCyclePhase: $ref: '#/components/schemas/ControlLoopLifeCyclePhase' AssuranceGoal: @@ -165,4 +165,4 @@ components: - $ref: '#/components/schemas/AssuranceClosedControlLoop-Single' - $ref: '#/components/schemas/AssuranceGoal-Single' - $ref: '#/components/schemas/SubNetwork-Single' - - $ref: '#/components/schemas/ManagedElement-Single' \ No newline at end of file + - $ref: '#/components/schemas/ManagedElement-Single' diff --git a/OpenAPI/faultMnS.yaml b/OpenAPI/faultMnS.yaml index 499123b903bd593face53928a3eb61b2f431afd4..203b424b99e1a4d846f18fb32245353e4ca5451d 100755 --- a/OpenAPI/faultMnS.yaml +++ b/OpenAPI/faultMnS.yaml @@ -1,22 +1,22 @@ openapi: 3.0.1 info: title: Fault Supervision MnS - version: 16.4.0 + version: 16.10.0 description: >- OAS 3.0.1 definition of the Fault Supervision MnS - © 2020, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). + © 2021, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved. externalDocs: - description: 3GPP TS 28.532 V16.4.0; Generic management services + description: 3GPP TS 28.532; Generic management services url: http://www.3gpp.org/ftp/Specs/archive/28_series/28.532/ servers: - - url: '{MnSRoot}/FaultSupervisionMnS/{version}' + - url: '{MnSRoot}/FaultSupervisionMnS/{MnSversion}' variables: MnSRoot: description: See subclause 4.4.3 of TS 32.158 default: http://example.com/3GPPManagement - version: - description: Versi on number of the OpenAPI definition + MnSversion: + description: Version number of the OpenAPI definition default: XXX paths: /alarms: @@ -35,12 +35,12 @@ paths: in: query required: false schema: - $ref: '#/components/schemas/Dn' + $ref: 'comDefs.yaml#/components/schemas/Dn' - name: filter in: query required: false schema: - $ref: '#/components/schemas/Filter' + $ref: 'comDefs.yaml#/components/schemas/Filter' responses: '200': description: >- @@ -57,7 +57,7 @@ paths: - type: object properties: lastNotificationHeader: - $ref: '#/components/schemas/NotificationHeader' + $ref: 'comDefs.yaml#/components/schemas/NotificationHeader' - $ref: '#/components/schemas/AlarmRecord' - type: object properties: @@ -68,7 +68,7 @@ paths: content: application/json: schema: - $ref: '#/components/schemas/ErrorResponse' + $ref: 'comDefs.yaml#/components/schemas/ErrorResponse' patch: summary: 'Clear, acknowledge or unacknowledge multiple alarms' description: >- @@ -130,7 +130,7 @@ paths: content: application/json: schema: - $ref: '#/components/schemas/ErrorResponse' + $ref: 'comDefs.yaml#/components/schemas/ErrorResponse' /alarms/{alarmId}: patch: summary: 'Clear, acknowledge or unacknowledge a single alarm' @@ -163,7 +163,7 @@ paths: content: application/json: schema: - $ref: '#/components/schemas/ErrorResponse' + $ref: 'comDefs.yaml#/components/schemas/ErrorResponse' /alarms/{alarmId}/comments: post: summary: Add a comment to a single alarm @@ -203,7 +203,7 @@ paths: content: application/json: schema: - $ref: '#/components/schemas/ErrorResponse' + $ref: 'comDefs.yaml#/components/schemas/ErrorResponse' /subscriptions: post: @@ -238,7 +238,7 @@ paths: content: application/json: schema: - $ref: '#/components/schemas/ErrorResponse' + $ref: 'comDefs.yaml#/components/schemas/ErrorResponse' callbacks: notifyNewAlarm: '{request.body#/consumerReference}': @@ -262,7 +262,7 @@ paths: content: application/json: schema: - $ref: '#/components/schemas/ErrorResponse' + $ref: 'comDefs.yaml#/components/schemas/ErrorResponse' notifyClearedAlarm: '{request.body#/consumerReference}': post: @@ -283,7 +283,7 @@ paths: content: application/json: schema: - $ref: '#/components/schemas/ErrorResponse' + $ref: 'comDefs.yaml#/components/schemas/ErrorResponse' notifyChangedAlarm: '{request.body#/consumerReference}': post: @@ -304,7 +304,7 @@ paths: content: application/json: schema: - $ref: '#/components/schemas/ErrorResponse' + $ref: 'comDefs.yaml#/components/schemas/ErrorResponse' notifyChangedAlarmGeneral: '{request.body#/consumerReference}': post: @@ -327,7 +327,7 @@ paths: content: application/json: schema: - $ref: '#/components/schemas/ErrorResponse' + $ref: 'comDefs.yaml#/components/schemas/ErrorResponse' notifyCorrelatedNotificationChanged: '{request.body#/consumerReference}': post: @@ -348,7 +348,7 @@ paths: content: application/json: schema: - $ref: '#/components/schemas/ErrorResponse' + $ref: 'comDefs.yaml#/components/schemas/ErrorResponse' notifyAckStateChanged: '{request.body#/consumerReference}': post: @@ -369,7 +369,7 @@ paths: content: application/json: schema: - $ref: '#/components/schemas/ErrorResponse' + $ref: 'comDefs.yaml#/components/schemas/ErrorResponse' notifyComments: '{request.body#/consumerReference}': post: @@ -390,7 +390,7 @@ paths: content: application/json: schema: - $ref: '#/components/schemas/ErrorResponse' + $ref: 'comDefs.yaml#/components/schemas/ErrorResponse' notifyPotentialFaultyAlarmList: '{request.body#/consumerReference}': post: @@ -411,7 +411,7 @@ paths: content: application/json: schema: - $ref: '#/components/schemas/ErrorResponse' + $ref: 'comDefs.yaml#/components/schemas/ErrorResponse' notifyAlarmListRebuilt: '{request.body#/consumerReference}': post: @@ -432,7 +432,7 @@ paths: content: application/json: schema: - $ref: '#/components/schemas/ErrorResponse' + $ref: 'comDefs.yaml#/components/schemas/ErrorResponse' /subscriptions/{subscriptionId}: delete: summary: Delete a subscription @@ -458,91 +458,10 @@ paths: content: application/json: schema: - $ref: '#/components/schemas/ErrorResponse' + $ref: 'comDefs.yaml#/components/schemas/ErrorResponse' components: schemas: - - #---- Definitions to be moved to comDefs.yaml --------------------------------------# - - Long: - type: string - format: long - Float: - type: string - format: float - DateTime: - type: string - format: date-Time - - Dn: - type: string - Uri: - type: string - - AttributeNameValuePairSet: - type: object - minProperties: 1 - AttributeValueChangeSet: - description: >- - The key in this map is the attribute name. The value of each key is an array. - When only one item is present in the array, it carries the new attribute - value. If two items are present, then the first item carries the old value - and the second item the new value. The items can be of any type including null. - type: object - additionalProperties: - type: array - minItems: 1 - maxItems: 2 - items: - nullable: true - - Filter: - type: string - SystemDN: - type: string - - NotificationId: - type: integer - NotificationHeader: - description: >- - Header used for all notification types - type: object - required: - - href - - notificationId - - notificationType - - eventTime - - systemDN - properties: - uri: - $ref: '#/components/schemas/Uri' - notificationId: - $ref: '#/components/schemas/NotificationId' - notificationType: - oneOf: - - $ref: '#/components/schemas/AlarmNotificationTypes' - #- $ref: 'faultMnS.yaml#/components/schemas/AlarmNotificationTypes' - #- $ref: 'provMnS.yaml#/components/schemas/CmNotificationTypes' - # more to be added - eventTime: - $ref: '#/components/schemas/DateTime' - systemDN: - $ref: '#/components/schemas/SystemDN' - - ErrorResponse: - description: >- - Default schema for the response message body in case the request is not - successful. - type: object - properties: - error: - type: object - properties: - errorInfo: - type: string - - #---- End of definitions to be moved to comDefs.yaml -------------------------------# #---- Definition of AlarmRecord ----------------------------------------------------# @@ -608,46 +527,47 @@ components: high: oneOf: - type: integer - - $ref: '#/components/schemas/Float' + - $ref: 'comDefs.yaml#/components/schemas/Float' low: - $ref: '#/components/schemas/Float' + $ref: 'comDefs.yaml#/components/schemas/Float' ThresholdLevelInd: - type: object - required: - - up - properties: - up: - $ref: '#/components/schemas/ThresholdHysteresis' - low: - $ref: '#/components/schemas/ThresholdHysteresis' + oneOf: + - type: object + properties: + up: + $ref: '#/components/schemas/ThresholdHysteresis' + - type: object + properties: + down: + $ref: '#/components/schemas/ThresholdHysteresis' ThresholdInfo: type: object - required: - - observedMeasurement - - observedValue properties: observedMeasurement: type: string observedValue: oneOf: - type: integer - - $ref: '#/components/schemas/Float' - thresholdLevelInd: + - $ref: 'comDefs.yaml#/components/schemas/Float' + thresholdLevel: $ref: '#/components/schemas/ThresholdLevelInd' armTime: - $ref: '#/components/schemas/DateTime' + $ref: 'comDefs.yaml#/components/schemas/DateTime' + required: + - observedMeasurement + - observedValue CorrelatedNotification: type: object - required: - - source - - notificationId properties: sourceObjectInstance: - $ref: '#/components/schemas/Dn' + $ref: 'comDefs.yaml#/components/schemas/Dn' notificationIds: type: array items: - $ref: '#/components/schemas/NotificationId' + $ref: 'comDefs.yaml#/components/schemas/NotificationId' + required: + - sourceObjectInstance + - notificationIds CorrelatedNotifications: type: array items: @@ -667,15 +587,15 @@ components: # alarmId: # $ref: '#/components/schemas/AlarmId' objectInstance: - $ref: '#/components/schemas/Dn' + $ref: 'comDefs.yaml#/components/schemas/Dn' notificationId: - $ref: '#/components/schemas/NotificationId' + $ref: 'comDefs.yaml#/components/schemas/NotificationId' alarmRaisedTime: - $ref: '#/components/schemas/DateTime' + $ref: 'comDefs.yaml#/components/schemas/DateTime' alarmChangedTime: - $ref: '#/components/schemas/DateTime' + $ref: 'comDefs.yaml#/components/schemas/DateTime' alarmClearedTime: - $ref: '#/components/schemas/DateTime' + $ref: 'comDefs.yaml#/components/schemas/DateTime' alarmType: $ref: '#/components/schemas/AlarmType' probableCause: @@ -687,7 +607,7 @@ components: backedUpStatus: type: boolean backUpObject: - $ref: '#/components/schemas/Dn' + $ref: 'comDefs.yaml#/components/schemas/Dn' trendIndication: $ref: '#/components/schemas/TrendIndication' thresholdinfo: @@ -695,21 +615,21 @@ components: correlatedNotifications: $ref: '#/components/schemas/CorrelatedNotifications' stateChangeDefinition: - $ref: '#/components/schemas/AttributeValueChangeSet' + $ref: 'comDefs.yaml#/components/schemas/AttributeValueChangeSet' monitoredAttributes: - $ref: '#/components/schemas/AttributeNameValuePairSet' + $ref: 'comDefs.yaml#/components/schemas/AttributeNameValuePairSet' proposedRepairActions: type: string additionalText: type: string additionalInformation: - $ref: '#/components/schemas/AttributeNameValuePairSet' + $ref: 'comDefs.yaml#/components/schemas/AttributeNameValuePairSet' rootCauseIndicator: type: boolean ackTime: - $ref: '#/components/schemas/DateTime' + $ref: 'comDefs.yaml#/components/schemas/DateTime' ackUserId: type: string ackSystemId: @@ -740,7 +660,7 @@ components: - notifyCorrelatedNotificationChanged - notifyComments - notifyClearedAlarm - - notifyAlarmListRebuiltAlarm + - notifyAlarmListRebuilt - notifyPotentialFaultyAlarmList AlarmListAlignmentRequirement: type: string @@ -750,7 +670,7 @@ components: NotifyNewAlarm: allOf: - - $ref: '#/components/schemas/NotificationHeader' + - $ref: 'comDefs.yaml#/components/schemas/NotificationHeader' - type: object required: - alarmId @@ -771,7 +691,7 @@ components: backedUpStatus: type: boolean backUpObject: - $ref: '#/components/schemas/Dn' + $ref: 'comDefs.yaml#/components/schemas/Dn' trendIndication: $ref: '#/components/schemas/TrendIndication' thresholdInfo: @@ -779,20 +699,20 @@ components: correlatedNotifications: $ref: '#/components/schemas/CorrelatedNotifications' stateChangeDefinition: - $ref: '#/components/schemas/AttributeValueChangeSet' + $ref: 'comDefs.yaml#/components/schemas/AttributeValueChangeSet' monitoredAttributes: - $ref: '#/components/schemas/AttributeNameValuePairSet' + $ref: 'comDefs.yaml#/components/schemas/AttributeNameValuePairSet' proposedRepairActions: type: string additionalText: type: string additionalInformation: - $ref: '#/components/schemas/AttributeNameValuePairSet' + $ref: 'comDefs.yaml#/components/schemas/AttributeNameValuePairSet' rootCauseIndicator: type: boolean NotifyNewSecAlarm: allOf: - - $ref: '#/components/schemas/NotificationHeader' + - $ref: 'comDefs.yaml#/components/schemas/NotificationHeader' - type: object required: - alarmId @@ -816,7 +736,7 @@ components: additionalText: type: string additionalInformation: - $ref: '#/components/schemas/AttributeNameValuePairSet' + $ref: 'comDefs.yaml#/components/schemas/AttributeNameValuePairSet' rootCauseIndicator: type: boolean serviceUser: @@ -827,7 +747,7 @@ components: type: string NotifyClearedAlarm: allOf: - - $ref: '#/components/schemas/NotificationHeader' + - $ref: 'comDefs.yaml#/components/schemas/NotificationHeader' - type: object required: - alarmId @@ -851,7 +771,7 @@ components: type: string NotifyChangedAlarm: allOf: - - $ref: '#/components/schemas/NotificationHeader' + - $ref: 'comDefs.yaml#/components/schemas/NotificationHeader' - type: object required: - alarmId @@ -869,14 +789,11 @@ components: $ref: '#/components/schemas/PerceivedSeverity' NotifyChangedAlarmGeneral: allOf: - - $ref: '#/components/schemas/NotificationHeader' + - $ref: 'comDefs.yaml#/components/schemas/NotificationHeader' - type: object required: - alarmId - alarmType - - probableCause - - perceivedSeverity - - changedAlarmAttributes properties: alarmId: $ref: '#/components/schemas/AlarmId' @@ -893,38 +810,35 @@ components: backedUpStatus: type: boolean backUpObject: - $ref: '#/components/schemas/Dn' + $ref: 'comDefs.yaml#/components/schemas/Dn' trendIndication: $ref: '#/components/schemas/TrendIndication' thresholdInfo: $ref: '#/components/schemas/ThresholdInfo' stateChangeDefinition: - $ref: '#/components/schemas/AttributeValueChangeSet' + $ref: 'comDefs.yaml#/components/schemas/AttributeValueChangeSet' monitoredAttributes: - $ref: '#/components/schemas/AttributeNameValuePairSet' + $ref: 'comDefs.yaml#/components/schemas/AttributeNameValuePairSet' proposedRepairActions: type: string additionalText: type: string additionalInformation: - $ref: '#/components/schemas/AttributeNameValuePairSet' + $ref: 'comDefs.yaml#/components/schemas/AttributeNameValuePairSet' rootCauseIndicator: type: boolean changedAlarmAttributes: - $ref: '#/components/schemas/AttributeNameValuePairSet' + $ref: 'comDefs.yaml#/components/schemas/AttributeNameValuePairSet' NotifyChangedSecAlarmGeneral: allOf: - - $ref: '#/components/schemas/NotificationHeader' + - $ref: 'comDefs.yaml#/components/schemas/NotificationHeader' - type: object required: - alarmId - alarmType - - probableCause - - perceivedSeverity - serviceUser - serviceProvider - securityAlarmDetector - - changedAlarmAttributes properties: alarmId: $ref: '#/components/schemas/AlarmId' @@ -939,7 +853,7 @@ components: additionalText: type: string additionalInformation: - $ref: '#/components/schemas/AttributeNameValuePairSet' + $ref: 'comDefs.yaml#/components/schemas/AttributeNameValuePairSet' rootCauseIndicator: type: boolean serviceUser: @@ -949,10 +863,10 @@ components: securityAlarmDetector: type: string changedAlarmAttributes: - $ref: '#/components/schemas/AttributeNameValuePairSet' + $ref: 'comDefs.yaml#/components/schemas/AttributeNameValuePairSet' NotifyCorrelatedNotificationChanged: allOf: - - $ref: '#/components/schemas/NotificationHeader' + - $ref: 'comDefs.yaml#/components/schemas/NotificationHeader' - type: object required: - alarmId @@ -966,7 +880,7 @@ components: type: boolean NotifyAckStateChanged: allOf: - - $ref: '#/components/schemas/NotificationHeader' + - $ref: 'comDefs.yaml#/components/schemas/NotificationHeader' - type: object required: - alarmId @@ -992,7 +906,7 @@ components: type: string NotifyComments: allOf: - - $ref: '#/components/schemas/NotificationHeader' + - $ref: 'comDefs.yaml#/components/schemas/NotificationHeader' - type: object required: - alarmId @@ -1013,7 +927,7 @@ components: $ref: '#/components/schemas/Comments' NotifyPotentialFaultyAlarmList: allOf: - - $ref: '#/components/schemas/NotificationHeader' + - $ref: 'comDefs.yaml#/components/schemas/NotificationHeader' - type: object required: - reason @@ -1022,7 +936,7 @@ components: type: string NotifyAlarmListRebuilt: allOf: - - $ref: '#/components/schemas/NotificationHeader' + - $ref: 'comDefs.yaml#/components/schemas/NotificationHeader' - type: object required: - reason @@ -1119,7 +1033,7 @@ components: type: object properties: commentTime: - $ref: '#/components/schemas/DateTime' + $ref: 'comDefs.yaml#/components/schemas/DateTime' commentUserId: type: string commentSystemId: @@ -1137,8 +1051,8 @@ components: type: object properties: consumerReference: - $ref: '#/components/schemas/Uri' + $ref: 'comDefs.yaml#/components/schemas/Uri' timeTick: - $ref: '#/components/schemas/Long' + type: integer filter: - $ref: '#/components/schemas/Filter' + $ref: 'comDefs.yaml#/components/schemas/Filter' diff --git a/OpenAPI/fileDataReportingMnS.yaml b/OpenAPI/fileDataReportingMnS.yaml new file mode 100644 index 0000000000000000000000000000000000000000..e9f6c71b8194c643c3c4aebddd81414d9d2f9dab --- /dev/null +++ b/OpenAPI/fileDataReportingMnS.yaml @@ -0,0 +1,229 @@ +openapi: 3.0.1 +info: + title: File Data Reporting MnS + version: 16.10.0 + description: >- + OAS 3.0.1 definition of the File Data Reporting MnS + © 2021, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). + All rights reserved. +externalDocs: + description: 3GPP TS 28.532; Generic management services + url: http://www.3gpp.org/ftp/Specs/archive/28_series/28.532/ +servers: + - url: '{MnSRoot}/fileDataReportingMnS/{MnSVersion}' + variables: + MnSRoot: + description: See clause 4.4.3 of TS 32.158 + default: http://example.com/3GPPManagement + MnSVersion: + description: Version number of the OpenAPI definition + default: XXX +paths: + /files: + get: + summary: Read information about available files + description: >- + Information about available files is read with HTTP GET. The files for + which information shall be returned are identified with the path + component (base resource) and the query component (fileDataType, beginTime, + endTime) of the URI. + parameters: + - name: fileDataType + in: query + description: >- + This parameter selects files based on the file data type. + required: true + schema: + $ref: '#/components/schemas/FileDataType' + - name: beginTime + in: query + description: >- + This parameter selects files based on the earliest time they + became available + required: false + schema: + $ref: 'comDefs.yaml#/components/schemas/DateTime' + - name: endTime + in: query + description: >- + This parameter selects files based on the latest time they + became available + required: false + schema: + $ref: 'comDefs.yaml#/components/schemas/DateTime' + responses: + '200': + description: >- + 'Success case ("200 OK"). + The resources identified in the request for retrieval are returned + in the response message body.' + content: + application/json: + schema: + type: array + items: + $ref: '#/components/schemas/FileInfo' + default: + description: Error case. + content: + application/json: + schema: + $ref: 'comDefs.yaml#/components/schemas/ErrorResponse' + /subscriptions: + post: + summary: Create a subscription + description: >- + To create a subscription the representation of the subscription is + POSTed on the /subscriptions collection resource. + requestBody: + required: true + content: + application/json: + schema: + $ref: 'faultMnS.yaml#/components/schemas/Subscription' + responses: + '201': + description: >- + Success case ("201 Created"). + The representation of the newly created subscription resource shall + be returned. + content: + application/json: + schema: + $ref: 'faultMnS.yaml#/components/schemas/Subscription' + headers: + Location: + description: URI of the newly created subscription resource + required: true + schema: + type: string + default: + description: Error case. + content: + application/json: + schema: + $ref: 'comDefs.yaml#/components/schemas/ErrorResponse' + callbacks: + notifyFileReady: + '{request.body#/consumerReference}': + post: + requestBody: + required: true + content: + application/json: + schema: + $ref: '#/components/schemas/NotifyFileReady' + responses: + '204': + description: >- + Success case ("204 No Content"). + The notification is successfully delivered. The response message + body is absent. + default: + description: Error case. + content: + application/json: + schema: + $ref: 'comDefs.yaml#/components/schemas/ErrorResponse' + notifyFilePreparationError: + '{request.body#/consumerReference}': + post: + requestBody: + required: true + content: + application/json: + schema: + $ref: '#/components/schemas/NotifyFilePreparationError' + responses: + '204': + description: >- + Success case ("204 No Content"). + The notification is successfully delivered. The response message + body is absent. + default: + description: Error case. + content: + application/json: + schema: + $ref: 'comDefs.yaml#/components/schemas/ErrorResponse' + /subscriptions/{subscriptionId}: + delete: + summary: Delete a subscription + description: >- + The subscription is deleted by deleting the corresponding subscription + resource. The resource to be deleted is identified with the path + component of the URI. + parameters: + - name: subscriptionId + in: path + description: Identifies the subscription to be deleted. + required: true + schema: + type: string + responses: + '204': + description: >- + Success case ("204 No Content"). + The subscription resource has been deleted. The response message body + is absent. + default: + description: Error case. + content: + application/json: + schema: + $ref: 'comDefs.yaml#/components/schemas/ErrorResponse' +components: + schemas: + FileDataType: + type: string + enum: + - Performance + - Trace + - Anatytics + - Proprietary + FileNotificationTypes: + type: string + enum: + - notifyFileReady + - notifyFilePreparationError + FileInfo: + type: object + properties: + fileLocation: + $ref: 'comDefs.yaml#/components/schemas/Uri' + fileSize: + type: integer + fileReadyTime: + $ref: 'comDefs.yaml#/components/schemas/DateTime' + fileExpirationTime: + $ref: 'comDefs.yaml#/components/schemas/DateTime' + fileCompression: + type: string + fileFormat: + type: string + fileDataType: + $ref: '#/components/schemas/FileDataType' + NotifyFileReady: + allOf: + - $ref: 'comDefs.yaml#/components/schemas/NotificationHeader' + - type: object + properties: + fileInfoList: + type: array + items: + $ref: '#/components/schemas/FileInfo' + additionalText: + type: string + NotifyFilePreparationError: + allOf: + - $ref: 'comDefs.yaml#/components/schemas/NotificationHeader' + - type: object + properties: + fileInfoList: + type: array + items: + $ref: '#/components/schemas/FileInfo' + reason: + type: string + additionalText: + type: string \ No newline at end of file diff --git a/OpenAPI/genericNrm.yaml b/OpenAPI/genericNrm.yaml index 0911920a2dbaa9c106d44bc144ac9dd8d09b6f25..7d4778a6fe4f5b0a2561de45e3b01a08c5b5262f 100755 --- a/OpenAPI/genericNrm.yaml +++ b/OpenAPI/genericNrm.yaml @@ -1,13 +1,13 @@ openapi: 3.0.1 info: title: Generic NRM - version: 16.4.0 + version: 17.0.0 description: >- - OAS 3.0.1 specification of the Generic NRM - © 2020, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). + OAS 3.0.1 definition of the Generic NRM + © 2021, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved. externalDocs: - description: 3GPP TS 28.623 V16.4.0; Generic NRM + description: 3GPP TS 28.623; Generic NRM url: http://www.3gpp.org/ftp/Specs/archive/28_series/28.623/ paths: {} components: @@ -15,53 +15,11 @@ components: #-------- Definition of types----------------------------------------------------- - DateTime: - type: string - format: date-time - Dn: - type: string - maxLength: 400 - DnList: - type: array - items: - $ref: '#/components/schemas/Dn' - Mcc: - type: string - pattern: '^[0-9]{3}$' - Mnc: - type: string - pattern: '^[0-9]{2,3}$' - AdministrativeState: - type: string - enum: - - LOCKED - - UNLOCKED - OperationalState: - type: string - enum: - - ENABLED - - DISABLED - UsageState: - type: string - enum: - - IDEL - - ACTIVE - - BUSY RegistrationState: type: string enum: - REGISTERED - DEREGISTERED - SetOfMcc: - type: array - items: - $ref: '#/components/schemas/Mcc' - ManagedElementType: - type: string - ManagedElementTypeList: - type: array - items: - $ref: '#/components/schemas/ManagedElementType' VnfParameter: type: object properties: @@ -73,20 +31,6 @@ components: type: string autoScalable: type: boolean - VnfParametersList: - type: array - items: - $ref: '#/components/schemas/VnfParameter' - SiteLatitude: - type: number - format: float - minimum: -90 - maximum: 90 - SiteLongitude: - type: number - format: float - minimum: -180 - maximum: 180 PeeParameter: type: object properties: @@ -95,53 +39,35 @@ components: siteDescription: type: string siteLatitude: - $ref: '#/components/schemas/SiteLatitude' + $ref: 'comDefs.yaml#/components/schemas/Latitude' siteLongitude: - $ref: '#/components/schemas/SiteLongitude' + $ref: 'comDefs.yaml#/components/schemas/Longitude' equipmentType: type: string environmentType: type: string powerInterface: type: string - PeeParametersList: - type: array - items: - $ref: '#/components/schemas/PeeParameter' - MonitoringGPList: - type: array - items: - type: integer - ThresholdInfoList: - type: array - items: - $ref: '#/components/schemas/ThresholdInfo' ThresholdInfo: type: object properties: - measurementType: + thresholdDirection: type: string - direction: - $ref: '#/components/schemas/Direction' - thresholdPack: - $ref: '#/components/schemas/ThresholdPack' - Direction: - enum: - - Increasing - - Decreasing - ThresholdPack: - type: array - items: - $ref: '#/components/schemas/ThresholdPackElement' - ThresholdPackElement: - type: object - properties: - thresholdLevel: - type: integer + enum: + - UP + - DOWN + - UP_AND_DOWN thresholdValue: - type: number + oneOf: + - type: integer + - $ref: 'comDefs.yaml#/components/schemas/Float' hysteresis: - type: number + oneOf: + - type: integer + minimum: 0 + - type: number + format: float + minimum: 0 Operation: type: object properties: @@ -151,10 +77,6 @@ components: $ref: '#/components/schemas/NFType' operationSemantics: $ref: '#/components/schemas/OperationSemantics' - OperationList: - type: array - items: - $ref: '#/components/schemas/Operation' NFType: type: string description: ' NF name defined in TS 23.501' @@ -178,8 +100,6 @@ components: - AF - UDSF - DN - Fqdn: - type: string OperationSemantics: type: string enum: @@ -189,7 +109,7 @@ components: type: object properties: host: - $ref: '#/components/schemas/HostAddr' + $ref: 'comDefs.yaml#/components/schemas/HostAddr' port: type: integer NFServiceType: @@ -202,41 +122,6 @@ components: - Nsmf_PDUSession - Nsmf_EventExposure - Others - HostAddr: - oneOf: - - $ref: '#/components/schemas/Ipv4Addr' - - $ref: '#/components/schemas/Ipv6Addr' - - $ref: '#/components/schemas/Fqdn' - Ipv4Addr: - 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' - Ipv4AddrRm: - 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' - nullable: true - Ipv6Addr: - 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' - Ipv6AddrRm: - 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' - nullable: true - Ipv6Prefix: - 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' - Uri: - type: string TransportProtocol: anyOf: - type: string @@ -260,9 +145,14 @@ components: items: type: string enum: - - FILE_BASED_LOC_SET_BY_PRODUCER - - FILE_BASED_LOC_SET_BY_CONSUMER - - STREAM_BASED + - FILE_BASED_LOC_SET_BY_PRODUCER + - FILE_BASED_LOC_SET_BY_CONSUMER + - STREAM_BASED + monitorGranularityPeriods: + type: array + items: + type: integer + minimum: 1 ReportingCtrl: oneOf: - type: object @@ -274,11 +164,11 @@ components: fileReportingPeriod: type: integer fileLocation: - $ref: '#/components/schemas/Uri' + $ref: 'comDefs.yaml#/components/schemas/Uri' - type: object properties: streamTarget: - $ref: '#/components/schemas/Uri' + $ref: 'comDefs.yaml#/components/schemas/Uri' Scope: type: object properties: @@ -291,28 +181,71 @@ components: - BASE_SUBTREE scopeLevel: type: integer - NotificationType: + 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' + Tai: + type: object + properties: + mcc: + $ref: 'comDefs.yaml#/components/schemas/Mcc' + mnc: + $ref: 'comDefs.yaml#/components/schemas/Mnc' + tac: + $ref: '#/components/schemas/Tac' + AreaConfig: + type: object + properties: + freqInfo: + $ref: '#/components/schemas/FreqInfo' + pciList: + type: array + items: + type: integer + FreqInfo: + description: specifies the carrier frequency and bands used in a cell. + type: object + properties: + arfcn: + type: integer + freqBands: + type: array + items: + type: integer + MbsfnArea: + type: object + properties: + mbsfnAreaId: + type: integer + minimum: 1 + earfcn: + type: integer + minimum: 1 + Tac: type: string - enum: - - notifyMOICreation - - notifyMOIDeletion - - notifyMOIAttributeValueChanges - - notifyEvent - - notifyNewAlarm - - notifyChangedAlarm - - notifyAckStateChanged - - notifyComments - - notifyCorrelatedNotificationChanged - - notifyChangedAlarmGeneral - - notifyAlarmListRebuilt - - notifyPotentialFaultyAlarmList - - notifyFileReady - - notifyFilePreparationError - - notifyThresholdCrossing - NotificationTypes: - type: array - items: - $ref: '#/components/schemas/NotificationType' + pattern: '(^[A-Fa-f0-9]{4}$)|(^[A-Fa-f0-9]{6}$)' + EutraCellId: + type: string + pattern: '^[A-Fa-f0-9]{7}$' + NrCellId: + type: string + pattern: '^[A-Fa-f0-9]{9}$' + IpAddr: + oneOf: + - $ref: 'comDefs.yaml#/components/schemas/Ipv4Addr' + - $ref: 'comDefs.yaml#/components/schemas/Ipv6Addr' + #-------- Definition of types used in Trace control NRM fragment------------------ @@ -476,6 +409,9 @@ components: - S6d - S6a - Sh + - N70 + - N71 + - NU1 EIRInterfaces: type: array items: @@ -618,6 +554,7 @@ components: - N10 - N13 - N21 + - NU1 UPFInterfaces: type: array items: @@ -676,30 +613,27 @@ components: - GNB_CU_CP - GNB_CU_UP - GNB_DU + - AMF + - PCF + - SMF + - UPF + - AUSF + - SMSF + - HSS + - UDM - tjPLMNTaget-Type: + tjPLMNTarget-Type: type: object description: The PLMN for which sessions shall be selected in the Trace Session in case of management based activation when several PLMNs are supported in the RAN (this means that shared cells and not shared cells are allowed for the specified PLMN. Note that the PLMN Target might differ from the PLMN specified in the Trace Reference, as that specifies the PLMN that is containing the management system requesting the Trace Session from the NE. See 3GPP TS 32.422 clause 5.9b for additional details. properties: mcc: - $ref: '#/components/schemas/Mcc' + $ref: 'comDefs.yaml#/components/schemas/Mcc' mnc: - $ref: '#/components/schemas/Mnc' + $ref: 'comDefs.yaml#/components/schemas/Mnc' required: - mcc - mnc - tjStreamingTraceConsumerURI-Type: - type: string - description: The URI of the Trace Reporting MnS consumer (see 3GPP TS 28.532) to which the Trace records shall be sent. See 3GPP TS 32.422 clause 5.9 for additional details. - format: uri - - tjTraceCollectionEntityAddress-Type: - description: The IP address to which the Trace records shall be transferred. See 3GPP TS 32.422 clause 5.9 for additional details. - oneOf: - - $ref: '#/components/schemas/Ipv4Addr' - - $ref: '#/components/schemas/Ipv6Addr' - tjTraceDepth-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. type: string @@ -716,11 +650,11 @@ components: description: The Trace Reference parameter shall be globally unique, therefore the Trace Reference shall compose as follows - MCC+MNC+Trace ID, where the MCC and MNC are coming with the Trace activation request from the management system to identify one PLMN containing the management system, and Trace ID is a 3 byte Octet String. See 3GPP TS 32.422 clause 5.6 for additional details. properties: mcc: - $ref: '#/components/schemas/Mcc' + $ref: 'comDefs.yaml#/components/schemas/Mcc' mnc: - $ref: '#/components/schemas/Mnc' + $ref: 'comDefs.yaml#/components/schemas/Mnc' traceId: - type: integer + type: string required: - mcc - mnc @@ -734,19 +668,28 @@ components: - STREAMING tjTraceTarget-Type: - type: string - description: Type of trace target. For additional details see 3GPP TS 32.422. - enum: - - IMSI - - IMEI - - IMEISV - - PUBLIC_ID - - UTRAN_CELL - - E-UTRAN_CELL - - NG-RAN_CELL - - eNB - - RNC - - gNB + type: object + description: Trace target conveying both the type and value of the target ID. For additional details see 3GPP TS 32.422 + properties: + TargetIdType: + type: string + enum: + - IMSI + - IMEI + - IMEISV + - PUBLIC_ID + - UTRAN_CELL + - E-UTRAN_CELL + - NG-RAN_CELL + - eNB + - RNC + - gNB + - SUPI + TargetIdValue: + type: string + required: + - TargetIdType + - TargetIdValue tjTriggeringEvent-Type: type: object @@ -767,6 +710,12 @@ components: - SMF - PCF - UPF + - AUSF + - NEF + - NRF + - NSSF + - SMSF + - UDM EventBitmap: type: integer required: @@ -780,26 +729,41 @@ components: - NO_IDENTITY - TAC_OF_IMEI - tjMDTAreaConfigurationForNeighCell-Type: - description: Used for logged NR MDT and defines the area for which UE is requested to perform measurement logging for neighbour cells which have list of frequencies. For additional details see 3GPP TS 32.422 clause 5.10.26. - type: array - items: - type: object - properties: - frequency: - type: string - cell: - type: string - - tjMDTAreaScope-Type: - description: defines the area in terms or Cells or Tracking Area/Routing Area/Location Area where the MDT data collection shall take place. For additional details see 3GPP TS 32.422 clause 5.10.2. - allOf: - - $ref: '#/components/schemas/DnList' - tjMDTCollectionPeriodRrmLte-Type: description: See details in 3GPP TS 32.422 clause 5.10.20. type: string enum: + - 100ms + - 1000ms + - 1024ms + - 1280ms + - 2048ms + - 2560ms + - 5120ms + - 10000ms + - 10240ms + - 60000ms + + tjMDTCollectionPeriodM6Lte-Type: + description: See details in 3GPP TS 32.422 clause 5.10.32. + type: string + enum: + - 1024ms + - 2048ms + - 5120ms + - 10240ms + + tjMDTCollectionPeriodM7Lte-Type: + description: See details in 3GPP TS 32.422 clause 5.10.33. + type: integer + minimum: 1 + maximum: 60 + + tjMDTCollectionPeriodRrmUmts-Type: + description: See details in 3GPP TS 32.422 clause 5.10.21. + type: string + enum: + - 100ms - 250ms - 500ms - 1000ms @@ -807,27 +771,42 @@ components: - 3000ms - 4000ms - 6000ms - - 8000ms - - 12000ms - - 16000ms - - 20000ms - - 24000ms - - 28000ms - - 32000ms - - 64000ms + + tjMDTCollectionPeriodRrmNR-Type: + description: See details in 3GPP TS 32.422 clause 5.10.30. + type: string + enum: + - 1024ms + - 2048ms + - 5120ms + - 10240ms + - 60000ms - tjMDTCollectionPeriodRrmUmts-Type: - description: See details in 3GPP TS 32.422 clause 5.10.21. + tjMDTCollectionPeriodM6NR-Type: + description: See details in 3GPP TS 32.422 clause 5.10.34. type: string enum: + - 120ms + - 240ms + - 480ms + - 640ms - 1024ms - - 1280ms - 2048ms - - 2560ms - 5120ms - 10240ms + - 20480ms + - 40960ms - 1min - + - 6min + - 12min + - 30min + + tjMDTCollectionPeriodM7NR-Type: + description: See details in 3GPP TS 32.422 clause 5.10.35. + type: integer + minimum: 1 + maximum: 60 + tjMDTEventListForTriggeredMeasurement-Type: description: See details in 3GPP TS 32.422 clause 5.10.28. type: string @@ -840,13 +819,21 @@ components: type: object properties: EventThresholdRSRP: - type: integer - minimum: 0 - maximum: 97 + oneOf: + - type: integer + minimum: 0 + maximum: 97 + - type: integer + minimum: 0 + maximum: 127 EventThresholdRSRQ: - type: integer - minimum: 0 - maximum: 34 + oneOf: + - type: integer + minimum: 0 + maximum: 34 + - type: integer + minimum: 0 + maximum: 127 EventThreshold1F: type: object properties: @@ -912,6 +899,7 @@ components: - M5 - M6 - M7 + - M1_EVENT_TRIGGERED - M8 - M9 @@ -928,41 +916,97 @@ components: tjMDTLoggingInterval-Type: description: See details in 3GPP TS 32.422 clause 5.10.8. + type: object + properties: + UMTS: + type: array + items: + type: string + enum: + - 1.28s + - 2.56s + - 5.12s + - 10.24s + - 20.48s + - 30.72s + - 40.96s + - 61.44s + LTE: + type: array + items: + type: string + enum: + - 1.28s + - 2.56s + - 5.12s + - 10.24s + - 20.48s + - 30.72s + - 40.96s + - 61.44s + NR: + type: array + items: + type: string + enum: + - 0.32s + - 0.64s + - 1.28s + - 2.56s + - 5.12s + - 10.24s + - 20.48s + - 30.72s + - 40.96s + - 61.44s + - INFINITY + + tjMDTLoggingEventThreshold-Type: + description: See details in 3GPP TS 32.422 clause 5.10.X. + type: object + properties: + RSRP: + type: integer + minimum: 0 + maximum: 127 + RSRQ: + type: integer + minimum: 0 + maximum: 127 + + tjMDTLoggingHysteresis-Type: + description: See details in 3GPP TS 32.422 clause 5.10.Y. + type: integer + minimum: 0 + maximum: 30 + + tjMDTLoggingTimeToTrigger-Type: + description: See details in 3GPP TS 32.422 clause 5.10.Z. type: string enum: - - 1.28s - - 2.56s - - 5.12s - - 10.24s - - 20.48s - - 30.72s - - 40.96s - - 61.44s - - tjMDTMBSFNAreaList-Type: - description: See details in 3GPP TS 32.422 clause 5.10.25. - type: array - items: - type: object - properties: - mbsfnAreaId: - type: integer - minimum: 1 - earfcn: - type: integer - minimum: 1 - required: - - mbsfnAreaId - - earfcn + - 0ms + - 40ms + - 64ms + - 80ms + - 100ms + - 128ms + - 160ms + - 256ms + - 320ms + - 480ms + - 512ms + - 640ms + - 1024ms + - 1280ms + - 2560ms + - 5120ms tjMDTMeasurementPeriodLTE-Type: description: See details in 3GPP TS 32.422 clause 5.10.23. type: string enum: - 1024ms - - 1280ms - 2048ms - - 2560ms - 5120ms - 10240ms - 1min @@ -971,8 +1015,6 @@ components: description: See details in 3GPP TS 32.422 clause 5.10.22. type: string enum: - - 250ms - - 500ms - 1000ms - 2000ms - 3000ms @@ -995,16 +1037,22 @@ components: - CPICH_RSCP - PathLoss - tjMDTPLMList-Type: + tjMDTM4ThresholdUmts-Type: + description: See details in 3GPP TS 32.422 clause 5.10.A. + type: integer + minimum: 0 + maximum: 31 + + tjMDTPLMNList-Type: description: See details in 3GPP TS 32.422 clause 5.10.24. type: array items: type: object properties: mcc: - $ref: '#/components/schemas/Mcc' + $ref: 'comDefs.yaml#/components/schemas/Mcc' mnc: - $ref: '#/components/schemas/Mnc' + $ref: 'comDefs.yaml#/components/schemas/Mnc' required: - mcc - mnc @@ -1037,45 +1085,72 @@ components: type: string enum: - PERIODICAL - - A2_FOR_LTE + - A2_FOR_LTE_NR - 1F_FOR_UMTS - 1I_FOR_UMTS_MCPS_TDD - - A2_TRIGGERED_PERIODIC_FOR_LTE - - ALL_CONFIGURED_RRM_FOR_LTE + - A2_TRIGGERED_PERIODIC_FOR_LTE_NR + - ALL_CONFIGURED_RRM_FOR_LTE_NR - ALL_CONFIGURED_RRM_FOR_UMTS tjMDTReportInterval-Type: description: See details in 3GPP TS 32.422 clause 5.10.5. - type: string - enum: - - 250ms - - 500ms - - 1000ms - - 2000ms - - 3000ms - - 4000ms - - 6000ms - - 8000ms - - 12000ms - - 16000ms - - 20000ms - - 24000ms - - 28000ms - - 32000ms - - 64000ms - - 120ms - - 240ms - - 480ms - - 640ms - - 1024ms - - 2048ms - - 5120ms - - 10240ms - - 60000ms - - 360000ms - - 720000ms - - 1800000ms - - 3600000ms + type: object + properties: + UMTS: + type: array + items: + type: string + enum: + - 250ms + - 500ms + - 1000ms + - 2000ms + - 3000ms + - 4000ms + - 6000ms + - 8000ms + - 12000ms + - 16000ms + - 20000ms + - 24000ms + - 28000ms + - 32000ms + - 64000ms + LTE: + type: array + items: + type: string + enum: + - 120ms + - 240ms + - 480ms + - 640ms + - 1024ms + - 2048ms + - 5120ms + - 10240ms + - 60000ms + - 360000ms + - 720000ms + - 1800000ms + - 3600000ms + NR: + type: array + items: + type: string + enum: + - 120ms + - 240ms + - 480ms + - 640ms + - 1024ms + - 2048ms + - 5120ms + - 10240ms + - 60000ms + - 360000ms + - 720000ms + - 1800000ms tjMDTReportType-Type: description: Report type for logged NR MDT. See details in 3GPP TS 32.422 clause 5.10.27. @@ -1095,29 +1170,8 @@ components: - UE_ORIENTATION tjMDTTraceCollectionEntityID-Type: - description: See details in 3GPP TS 32.422 clause 5.10.11. Only tceID value may be sent over the air to the UE being configured for Logged MDT. - type: object - properties: - tceID: - type: integer - tcePLMN: - type: object - properties: - mcc: - $ref: '#/components/schemas/Mcc' - mnc: - $ref: '#/components/schemas/Mnc' - required: - - mcc - - mnc - tceAddress: - oneOf: - - $ref: '#/components/schemas/tjTraceCollectionEntityAddress-Type' - - $ref: '#/components/schemas/tjStreamingTraceConsumerURI-Type' - required: - - tceID - - tcePLMN - - tceAddress + description: See details in 3GPP TS 32.422 clause 5.10.11. Only TCE Id value may be sent over the air to the UE being configured for Logged MDT. + type: integer #-------- end of Definition of types used in Trace control NRM fragment ---------- @@ -1132,15 +1186,29 @@ components: properties: id: type: string + nullable: true + objectClass: + type: string + objectInstance: + $ref: 'comDefs.yaml#/components/schemas/Dn' VsDataContainer: $ref: '#/components/schemas/VsDataContainer-Multiple' + required: + - id Top: type: object properties: id: type: string + nullable: true + objectClass: + type: string + objectInstance: + $ref: 'comDefs.yaml#/components/schemas/Dn' VsDataContainer: $ref: '#/components/schemas/VsDataContainer-Multiple' + required: + - id #-------- Definition of IOCs with new name-containments defined in other TS ------ @@ -1154,7 +1222,9 @@ components: userDefinedNetworkType: type: string setOfMcc: - $ref: '#/components/schemas/SetOfMcc' + type: array + items: + $ref: 'comDefs.yaml#/components/schemas/Mcc' priorityLabel: type: integer supportedPerfMetricGroups: @@ -1167,13 +1237,15 @@ components: dnPrefix: type: string managedElementTypeList: - $ref: '#/components/schemas/ManagedElementTypeList' + type: array + items: + type: string userLabel: type: string locationName: type: string managedBy: - $ref: '#/components/schemas/DnList' + $ref: 'comDefs.yaml#/components/schemas/DnList' vendorName: type: string userDefinedState: @@ -1192,14 +1264,14 @@ components: properties: ManagementNode: $ref: '#/components/schemas/ManagementNode-Multiple' + MnsAgent: + $ref: '#/components/schemas/MnsAgent-Multiple' MeContext: $ref: '#/components/schemas/MeContext-Multiple' PerfMetricJob: $ref: '#/components/schemas/PerfMetricJob-Multiple' ThresholdMonitor: $ref: '#/components/schemas/ThresholdMonitor-Multiple' - ThresholdMonitoringCapability: - $ref: '#/components/schemas/ThresholdMonitoringCapability-Single' NtfSubscriptionControl: $ref: '#/components/schemas/NtfSubscriptionControl-Multiple' TraceJob: @@ -1207,18 +1279,16 @@ components: AlarmList: $ref: '#/components/schemas/AlarmList-Single' MnsRegistry: - type: array - items: - $ref: '#/components/schemas/MnsRegistry' + $ref: '#/components/schemas/MnsRegistry-Single' ManagedElement-ncO: type: object properties: + MnsAgent: + $ref: '#/components/schemas/MnsAgent-Multiple' PerfMetricJob: $ref: '#/components/schemas/PerfMetricJob-Multiple' ThresholdMonitor: $ref: '#/components/schemas/ThresholdMonitor-Multiple' - ThresholdMonitoringCapability: - $ref: '#/components/schemas/ThresholdMonitoringCapability-Single' NtfSubscriptionControl: $ref: '#/components/schemas/NtfSubscriptionControl-Multiple' TraceJob: @@ -1234,9 +1304,13 @@ components: userLabel: type: string vnfParametersList: - $ref: '#/components/schemas/VnfParametersList' + type: array + items: + $ref: '#/components/schemas/VnfParameter' peeParametersList: - $ref: '#/components/schemas/PeeParametersList' + type: array + items: + $ref: '#/components/schemas/PeeParameter' priorityLabel: type: integer supportedPerfMetricGroups: @@ -1266,15 +1340,17 @@ components: tjListOfNeTypes: $ref: '#/components/schemas/tjListOfNeTypes-Type' tjPLMNTarget: - $ref: '#/components/schemas/tjPLMNTaget-Type' - tjTraceConsumer: - oneOf: - - $ref: '#/components/schemas/tjStreamingTraceConsumerURI-Type' - - $ref: '#/components/schemas/tjTraceCollectionEntityAddress-Type' + $ref: '#/components/schemas/tjPLMNTarget-Type' + tjStreamingTraceConsumerURI: + $ref: 'comDefs.yaml#/components/schemas/Uri' + tjTraceCollectionEntityAddress: + $ref: '#/components/schemas/IpAddr' tjTraceDepth: $ref: '#/components/schemas/tjTraceDepth-Type' tjTraceReference: $ref: '#/components/schemas/tjTraceReference-Type' + tjTraceRecordSessionReference: + type: string tjTraceReportingFormat: $ref: '#/components/schemas/tjTraceReportingFormat-Type' tjTraceTarget: @@ -1284,13 +1360,25 @@ components: tjMDTAnonymizationOfData: $ref: '#/components/schemas/tjMDTAnonymizationOfData-Type' tjMDTAreaConfigurationForNeighCell: - $ref: '#/components/schemas/tjMDTAreaConfigurationForNeighCell-Type' + $ref: '#/components/schemas/AreaConfig' tjMDTAreaScope: - $ref: '#/components/schemas/tjMDTAreaScope-Type' + type: array + items: + $ref: '#/components/schemas/AreaScope' tjMDTCollectionPeriodRrmLte: $ref: '#/components/schemas/tjMDTCollectionPeriodRrmLte-Type' + tjMDTCollectionPeriodM6Lte: + $ref: '#/components/schemas/tjMDTCollectionPeriodM6Lte-Type' + tjMDTCollectionPeriodM7Lte: + $ref: '#/components/schemas/tjMDTCollectionPeriodM7Lte-Type' tjMDTCollectionPeriodRrmUmts: $ref: '#/components/schemas/tjMDTCollectionPeriodRrmUmts-Type' + tjMDTCollectionPeriodRrmNR: + $ref: '#/components/schemas/tjMDTCollectionPeriodRrmNR-Type' + tjMDTCollectionPeriodM6NR: + $ref: '#/components/schemas/tjMDTCollectionPeriodM6NR-Type' + tjMDTCollectionPeriodM7NR: + $ref: '#/components/schemas/tjMDTCollectionPeriodM7NR-Type' tjMDTEventListForTriggeredMeasurement: $ref: '#/components/schemas/tjMDTEventListForTriggeredMeasurement-Type' tjMDTEventThreshold: @@ -1301,16 +1389,26 @@ components: $ref: '#/components/schemas/tjMDTLoggingDuration-Type' tjMDTLoggingInterval: $ref: '#/components/schemas/tjMDTLoggingInterval-Type' + tjMDTLoggingEventThreshold: + $ref: '#/components/schemas/tjMDTLoggingEventThreshold-Type' + tjMDTLoggingHysteresis: + $ref: '#/components/schemas/tjMDTLoggingHysteresis-Type' + tjMDTLoggingTimeToTrigger: + $ref: '#/components/schemas/tjMDTLoggingTimeToTrigger-Type' tjMDTMBSFNAreaList: - $ref: '#/components/schemas/tjMDTMBSFNAreaList-Type' + type: array + items: + $ref: '#/components/schemas/MbsfnArea' tjMDTMeasurementPeriodLTE: $ref: '#/components/schemas/tjMDTMeasurementPeriodLTE-Type' tjMDTMeasurementPeriodUMTS: $ref: '#/components/schemas/tjMDTMeasurementPeriodUMTS-Type' tjMDTMeasurementQuantity: $ref: '#/components/schemas/tjMDTMeasurementQuantity-Type' - tjMDTPLMList: - $ref: '#/components/schemas/tjMDTPLMList-Type' + tjMDTM4ThresholdUmts: + $ref: '#/components/schemas/tjMDTM4ThresholdUmts-Type' + tjMDTPLMNList: + $ref: '#/components/schemas/tjMDTPLMNList-Type' tjMDTPositioningMethod: $ref: '#/components/schemas/tjMDTPositioningMethod-Type' tjMDTReportAmount: @@ -1325,12 +1423,6 @@ components: $ref: '#/components/schemas/tjMDTSensorInformation-Type' tjMDTTraceCollectionEntityID: $ref: '#/components/schemas/tjMDTTraceCollectionEntityID-Type' - required: - - tjJobType - - tjTraceReference - - tjTraceConsumer - - tjTraceReportingFormat - - tjTraceTarget ManagedFunction-ncO: type: object @@ -1339,24 +1431,17 @@ components: $ref: '#/components/schemas/PerfMetricJob-Multiple' ThresholdMonitor: $ref: '#/components/schemas/ThresholdMonitor-Multiple' - ThresholdMonitoringCapability: - $ref: '#/components/schemas/ThresholdMonitoringCapability-Single' ManagedNFService: $ref: '#/components/schemas/ManagedNFService-Multiple' TraceJob: $ref: '#/components/schemas/TraceJob-Multiple' - MnsRegistry: + MnsRegistry-Single: type: object properties: - mnsLabel: - type: string - mnsType: - type: string - mnsVersion: - type: string - mnsAddress: - type: string + MnsInfo: + $ref: '#/components/schemas/MnsInfo-Multiple' + #-------- Definition of concrete IOCs -------------------------------------------- @@ -1378,7 +1463,7 @@ components: $ref: '#/components/schemas/VsDataContainer-Multiple' ManagedNFService-Single: allOf: - - $ref: '#/components/schemas/Top-Attr' + - $ref: '#/components/schemas/Top' - type: object properties: attributes: @@ -1391,18 +1476,20 @@ components: sAP: $ref: '#/components/schemas/SAP' operations: - $ref: '#/components/schemas/OperationList' + type: array + items: + $ref: '#/components/schemas/Operation' administrativeState: - $ref: '#/components/schemas/AdministrativeState' + $ref: 'comDefs.yaml#/components/schemas/AdministrativeState' operationalState: - $ref: '#/components/schemas/OperationalState' + $ref: 'comDefs.yaml#/components/schemas/OperationalState' usageState: - $ref: '#/components/schemas/UsageState' + $ref: 'comDefs.yaml#/components/schemas/UsageState' registrationState: $ref: '#/components/schemas/RegistrationState' ManagementNode-Single: allOf: - - $ref: '#/components/schemas/Top-Attr' + - $ref: '#/components/schemas/Top' - type: object properties: attributes: @@ -1411,7 +1498,7 @@ components: userLabel: type: string managedElements: - $ref: '#/components/schemas/DnList' + $ref: 'comDefs.yaml#/components/schemas/DnList' vendorName: type: string userDefinedState: @@ -1420,9 +1507,21 @@ components: type: string swVersion: type: string + MnsAgent: + $ref: '#/components/schemas/MnsAgent-Multiple' + MnsAgent-Single: + allOf: + - $ref: '#/components/schemas/Top' + - type: object + properties: + attributes: + type: object + properties: + systemDN: + $ref: 'comDefs.yaml#/components/schemas/Dn' MeContext-Single: allOf: - - $ref: '#/components/schemas/Top-Attr' + - $ref: '#/components/schemas/Top' - type: object properties: attributes: @@ -1432,17 +1531,17 @@ components: type: string PerfMetricJob-Single: allOf: - - $ref: '#/components/schemas/Top-Attr' + - $ref: '#/components/schemas/Top' - type: object properties: attributes: type: object properties: administrativeState: - $ref: '#/components/schemas/AdministrativeState' + $ref: 'comDefs.yaml#/components/schemas/AdministrativeState' operationalState: - $ref: '#/components/schemas/OperationalState' - perfMetricJobGroupId: + $ref: 'comDefs.yaml#/components/schemas/OperationalState' + jobId: type: string performanceMetrics: type: array @@ -1452,60 +1551,61 @@ components: type: integer minimum: 1 objectInstances: - $ref: '#/components/schemas/DnList' + $ref: 'comDefs.yaml#/components/schemas/DnList' rootObjectInstances: - $ref: '#/components/schemas/DnList' + $ref: 'comDefs.yaml#/components/schemas/DnList' reportingCtrl: $ref: '#/components/schemas/ReportingCtrl' - ThresholdMonitoringCapability-Single: - allOf: - - $ref: '#/components/schemas/Top-Attr' - - type: object - properties: - attributes: - type: object - properties: - supportedMonitoringGPs: - $ref: '#/components/schemas/MonitoringGPList' ThresholdMonitor-Single: allOf: - - $ref: '#/components/schemas/Top-Attr' + - $ref: '#/components/schemas/Top' - type: object properties: attributes: type: object properties: + administrativeState: + $ref: 'comDefs.yaml#/components/schemas/AdministrativeState' + operationalState: + $ref: 'comDefs.yaml#/components/schemas/OperationalState' + performanceMetrics: + type: array + items: + type: string thresholdInfoList: - $ref: '#/components/schemas/ThresholdInfoList' - monitoringGP: + type: array + items: + $ref: '#/components/schemas/ThresholdInfo' + monitorGranularityPeriod: type: integer - monitoringNotifTarget: - type: string - monitoredIOCName: - type: string - monitoredObjectDNs: - $ref: '#/components/schemas/DnList' + minimum: 1 + objectInstances: + $ref: 'comDefs.yaml#/components/schemas/DnList' + rootObjectInstances: + $ref: 'comDefs.yaml#/components/schemas/DnList' NtfSubscriptionControl-Single: allOf: - - $ref: '#/components/schemas/Top-Attr' + - $ref: '#/components/schemas/Top' - type: object properties: attributes: type: object properties: notificationRecipientAddress: - $ref: '#/components/schemas/Uri' + $ref: 'comDefs.yaml#/components/schemas/Uri' notificationTypes: - $ref: '#/components/schemas/NotificationTypes' + type: array + items: + $ref: 'comDefs.yaml#/components/schemas/NotificationType' scope: $ref: '#/components/schemas/Scope' notificationFilter: - type: string + $ref: 'comDefs.yaml#/components/schemas/Filter' HeartbeatControl: $ref: '#/components/schemas/HeartbeatControl-Single' HeartbeatControl-Single: allOf: - - $ref: '#/components/schemas/Top-Attr' + - $ref: '#/components/schemas/Top' - type: object properties: attributes: @@ -1513,11 +1613,12 @@ components: properties: heartbeatNtfPeriod: type: integer + minimum: 0 triggerHeartbeatNtf: type: boolean TraceJob-Single: allOf: - - $ref: '#/components/schemas/Top-Attr' + - $ref: '#/components/schemas/Top' - type: object properties: attributes: @@ -1525,29 +1626,47 @@ components: AlarmList-Single: allOf: - - $ref: '#/components/schemas/Top-Attr' + - $ref: '#/components/schemas/Top' - type: object properties: attributes: type: object properties: administrativeState: - $ref: '#/components/schemas/AdministrativeState' + $ref: 'comDefs.yaml#/components/schemas/AdministrativeState' operationalState: - $ref: '#/components/schemas/OperationalState' + $ref: 'comDefs.yaml#/components/schemas/OperationalState' numOfAlarmRecords: type: integer lastModification: - $ref: '#/components/schemas/DateTime' + $ref: 'comDefs.yaml#/components/schemas/DateTime' alarmRecords: description: >- - This resource represents a map of alarm records. - The alarmIds are used as keys in the map. + This resource represents a map of alarm records. + The alarmIds are used as keys in the map. type: object additionalProperties: $ref: 'faultMnS.yaml#/components/schemas/AlarmRecord' -#-------- Definition of JSON arrays for name-contained IOCs ---------------------- + MnsInfo-Single: + type: object + properties: + mnsLabel: + type: string + mnsType: + type: string + enum: + - ProvMnS + - FaultSupervisionMnS + - StreamingDataReportingMnS + - FileDataReportingMnS + mnsVersion: + type: string + mnsAddress: + description: Resource URI as defined in the relevant Technical Specification + $ref: 'comDefs.yaml#/components/schemas/Uri' + +#-------- Definition of YAML arrays for name-contained IOCs ---------------------- VsDataContainer-Multiple: type: array @@ -1561,6 +1680,10 @@ components: type: array items: $ref: '#/components/schemas/ManagementNode-Single' + MnsAgent-Multiple: + type: array + items: + $ref: '#/components/schemas/MnsAgent-Single' MeContext-Multiple: type: array items: @@ -1573,34 +1696,39 @@ components: type: array items: $ref: '#/components/schemas/ThresholdMonitor-Single' + TraceJob-Multiple: + type: array + items: + $ref: '#/components/schemas/TraceJob-Single' NtfSubscriptionControl-Multiple: type: array items: $ref: '#/components/schemas/NtfSubscriptionControl-Single' - TraceJob-Multiple: + MnsInfo-Multiple: type: array items: - $ref: '#/components/schemas/TraceJob-Single' + $ref: '#/components/schemas/MnsInfo-Single' #-------- Definitions in TS 28.623 for TS 28.532 --------------------------------- resources-genericNrm: oneOf: - - $ref: '#/components/schemas/VsDataContainer-Single' - - - $ref: '#/components/schemas/ManagementNode-Single' - - $ref: '#/components/schemas/MeContext-Single' + - $ref: '#/components/schemas/VsDataContainer-Single' - - $ref: '#/components/schemas/ManagedNFService-Single' + - $ref: '#/components/schemas/ManagementNode-Single' + - $ref: '#/components/schemas/MnsAgent-Single' + - $ref: '#/components/schemas/MeContext-Single' - - $ref: '#/components/schemas/PerfMetricJob-Single' + - $ref: '#/components/schemas/ManagedNFService-Single' - - $ref: '#/components/schemas/ThresholdMonitoringCapability-Single' - - $ref: '#/components/schemas/ThresholdMonitor-Single' + - $ref: '#/components/schemas/PerfMetricJob-Single' + - $ref: '#/components/schemas/ThresholdMonitor-Single' + - $ref: '#/components/schemas/TraceJob-Single' - - $ref: '#/components/schemas/NtfSubscriptionControl-Single' - - $ref: '#/components/schemas/HeartbeatControl-Single' - - $ref: '#/components/schemas/TraceJob-Single' + - $ref: '#/components/schemas/NtfSubscriptionControl-Single' + - $ref: '#/components/schemas/HeartbeatControl-Single' - - $ref: '#/components/schemas/AlarmList-Single' + - $ref: '#/components/schemas/AlarmList-Single' + - $ref: '#/components/schemas/MnsRegistry-Single' + - $ref: '#/components/schemas/MnsInfo-Single' diff --git a/OpenAPI/heartbeatNtf.yaml b/OpenAPI/heartbeatNtf.yaml index afde5066ddfea6ce040ebee2c28d490e53c6247a..efa3185bdbc9a3d836d67f1520dfe8010f6a8e44 100755 --- a/OpenAPI/heartbeatNtf.yaml +++ b/OpenAPI/heartbeatNtf.yaml @@ -1,23 +1,25 @@ openapi: 3.0.1 info: title: Heartbeat notification - version: 16.3.0 + version: 16.6.0 description: >- - OAS 3.0.1 specification of the heartbeat notification + OAS 3.0.1 definition of the heartbeat notification © 2020, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved. externalDocs: - description: 3GPP TS 28.532 V16.3.0; Heartbeat notification + description: 3GPP TS 28.532 V16.6.0; Generic management services url: http://www.3gpp.org/ftp/Specs/archive/28_series/28.6532/ paths: {} components: schemas: - hearbeatNtfPeriod-Type: - type: integer - notifyHeartbeat-NotifType: + HeartbeatNotificationTypes: + type: string + enum: + - notifyHeartbeat + NotifyHeartbeat: allOf: - - $ref: 'provMnS.yaml#/components/schemas/header-Type' + - $ref: 'comDefs.yaml#/components/schemas/NotificationHeader' - type: object properties: heartbeatNtfPeriod: - $ref: '#/components/schemas/hearbeatNtfPeriod-Type' + type: integer diff --git a/OpenAPI/nrNrm.yaml b/OpenAPI/nrNrm.yaml index 8501066311d4d9aa004d6b1b36a5eded219cfd2c..5ef76d4309711d80180bf75fd09e5d38e3e67931 100755 --- a/OpenAPI/nrNrm.yaml +++ b/OpenAPI/nrNrm.yaml @@ -1,7 +1,7 @@ openapi: 3.0.1 info: title: NR NRM - version: 17.4.0 + version: 17.5.0 description: >- OAS 3.0.1 specification of the NR NRM © 2020, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). @@ -55,7 +55,7 @@ components: type: object properties: mcc: - $ref: 'genericNrm.yaml#/components/schemas/Mcc' + $ref: 'comDefs.yaml#/components/schemas/Mcc' mnc: $ref: '#/components/schemas/Mnc' PlmnIdList: @@ -65,7 +65,7 @@ components: PlmnInfo: type: object properties: - plmnId": + plmnId: $ref: '#/components/schemas/PlmnId' snssai: $ref: '#/components/schemas/Snssai' @@ -73,6 +73,22 @@ components: type: array items: $ref: '#/components/schemas/PlmnInfo' + SnpnId: + type: object + properties: + mcc: + $ref: 'comDefs.yaml#/components/schemas/Mcc' + mnc: + $ref: '#/components/schemas/Mnc' + nid: + type: string + SnpnInfo: + type: object + properties: + snpnId: + $ref: '#/components/schemas/SnpnId' + snssai: + $ref: '#/components/schemas/Snssai' cagId: type: string nid: @@ -80,7 +96,7 @@ components: NpnIdentity: type: object properties: - plmnId": + plmnId: $ref: '#/components/schemas/PlmnId' cagidList: $ref: '#/components/schemas/cagId' @@ -120,6 +136,28 @@ components: $ref: '#/components/schemas/PlmnId' nrTac: $ref: '#/components/schemas/NrTac' + TaiList: + type: array + items: + $ref: '#/components/schemas/Tai' + NrtacRange: + type: object + properties: + nRTACstart: + type: string + nRTACend: + type: string + nRTACpattern: + type: string + TaiRange: + type: object + properties: + plmnId: + $ref: '#/components/schemas/PlmnId' + nRTACRangeList: + type: array + items: + $ref: '#/components/schemas/NrtacRange' BackhaulAddress: type: object @@ -289,9 +327,9 @@ components: type: object properties: ipv4Address: - $ref: 'genericNrm.yaml#/components/schemas/Ipv4Addr' + $ref: 'comDefs.yaml#/components/schemas/Ipv4Addr' ipv6Address: - $ref: 'genericNrm.yaml#/components/schemas/Ipv6Addr' + $ref: 'comDefs.yaml#/components/schemas/Ipv6Addr' vlanId: type: integer minimum: 0 @@ -309,9 +347,9 @@ components: type: object properties: ipv4Address: - $ref: 'genericNrm.yaml#/components/schemas/Ipv4Addr' + $ref: 'comDefs.yaml#/components/schemas/Ipv4Addr' ipv6Address: - $ref: 'genericNrm.yaml#/components/schemas/Ipv6Addr' + $ref: 'comDefs.yaml#/components/schemas/Ipv6Addr' CellIndividualOffset: type: object @@ -573,8 +611,8 @@ components: properties: TceIPAddress: oneOf: - - $ref: 'genericNrm.yaml#/components/schemas/Ipv4Addr' - - $ref: 'genericNrm.yaml#/components/schemas/Ipv6Addr' + - $ref: 'comDefs.yaml#/components/schemas/Ipv4Addr' + - $ref: 'comDefs.yaml#/components/schemas/Ipv6Addr' TceID: type: integer PlmnTarget: @@ -583,7 +621,14 @@ components: type: array items: $ref: '#/components/schemas/TceMappingInfo' - + ResourceType: + type: string + enum: + - PRB + - PRB_UL + - PRB_DL + - RRC + - DRB #-------- Definition of abstract IOCs -------------------------------------------- @@ -591,7 +636,7 @@ components: type: object properties: resourceType: - type: string + $ref: '#/components/schemas/ResourceType' rRMPolicyMemberList: $ref: '#/components/schemas/RrmPolicyMemberList' @@ -626,6 +671,8 @@ components: $ref: '#/components/schemas/DRACHOptimizationFunction-Single' DMROFunction: $ref: '#/components/schemas/DMROFunction-Single' + DLBOFunction: + $ref: '#/components/schemas/DLBOFunction-Single' DPCIConfigurationFunction: $ref: '#/components/schemas/DPCIConfigurationFunction-Single' CPCIConfigurationFunction: @@ -661,6 +708,8 @@ components: $ref: '#/components/schemas/DRACHOptimizationFunction-Single' DMROFunction: $ref: '#/components/schemas/DMROFunction-Single' + DLBOFunction: + $ref: '#/components/schemas/DLBOFunction-Single' DPCIConfigurationFunction: $ref: '#/components/schemas/DPCIConfigurationFunction-Single' CPCIConfigurationFunction: @@ -709,6 +758,23 @@ components: $ref: '#/components/schemas/EP_F1U-Multiple' DRACHOptimizationFunction: $ref: '#/components/schemas/DRACHOptimizationFunction-Single' + + OperatorDu-Single: + allOf: + - $ref: 'genericNrm.yaml#/components/schemas/Top' + - type: object + properties: + gnbId: + $ref: '#/components/schemas/GnbId' + gnbIdLength: + $ref: '#/components/schemas/GnbIdLength' + - type: object + properties: + EP_F1C: + $ref: '#/components/schemas/EP_F1C-Single' + EP_F1U: + $ref: '#/components/schemas/EP_F1U-Multiple' + GnbCuUpFunction-Single: allOf: - $ref: 'genericNrm.yaml#/components/schemas/Top' @@ -728,9 +794,9 @@ components: plmnInfoList: $ref: '#/components/schemas/PlmnInfoList' configurable5QISetRef: - $ref: 'genericNrm.yaml#/components/schemas/Dn' + $ref: 'comDefs.yaml#/components/schemas/Dn' dynamic5QISetRef: - $ref: 'genericNrm.yaml#/components/schemas/Dn' + $ref: 'comDefs.yaml#/components/schemas/Dn' - $ref: 'genericNrm.yaml#/components/schemas/ManagedFunction-ncO' - type: object properties: @@ -781,9 +847,13 @@ components: tceMappingInfoList: $ref: '#/components/schemas/TceMappingInfoList' configurable5QISetRef: - $ref: 'genericNrm.yaml#/components/schemas/Dn' + $ref: 'comDefs.yaml#/components/schemas/Dn' dynamic5QISetRef: - $ref: 'genericNrm.yaml#/components/schemas/Dn' + $ref: 'comDefs.yaml#/components/schemas/Dn' + dCHOControl: + type: boolean + dDAPSHOControl: + type: boolean - $ref: 'genericNrm.yaml#/components/schemas/ManagedFunction-ncO' - type: object properties: @@ -807,6 +877,8 @@ components: $ref: '#/components/schemas/DESManagementFunction-Single' DMROFunction: $ref: '#/components/schemas/DMROFunction-Single' + DLBOFunction: + $ref: '#/components/schemas/DLBOFunction-Single' NrCellCu-Single: allOf: @@ -823,7 +895,7 @@ components: plmnInfoList: $ref: '#/components/schemas/PlmnInfoList' nRFrequencyRef: - $ref: 'genericNrm.yaml#/components/schemas/Dn' + $ref: 'comDefs.yaml#/components/schemas/Dn' - $ref: 'genericNrm.yaml#/components/schemas/ManagedFunction-ncO' - type: object properties: @@ -841,6 +913,8 @@ components: $ref: '#/components/schemas/DESManagementFunction-Single' DMROFunction: $ref: '#/components/schemas/DMROFunction-Single' + DLBOFunction: + $ref: '#/components/schemas/DLBOFunction-Single' CESManagementFunction: $ref: '#/components/schemas/CESManagementFunction-Single' DPCIConfigurationFunction: @@ -857,9 +931,9 @@ components: - type: object properties: administrativeState: - $ref: 'genericNrm.yaml#/components/schemas/AdministrativeState' + $ref: 'comDefs.yaml#/components/schemas/AdministrativeState' operationalState: - $ref: 'genericNrm.yaml#/components/schemas/OperationalState' + $ref: 'comDefs.yaml#/components/schemas/OperationalState' cellLocalId: type: integer cellState: @@ -901,11 +975,11 @@ components: nrSectorCarrierRef: type: array items: - $ref: 'genericNrm.yaml#/components/schemas/Dn' + $ref: 'comDefs.yaml#/components/schemas/Dn' bwpRef: type: array items: - $ref: 'genericNrm.yaml#/components/schemas/Dn' + $ref: 'comDefs.yaml#/components/schemas/Dn' rimRSMonitoringStartTime: type: string rimRSMonitoringStopTime: @@ -921,11 +995,11 @@ components: rimRSMonitoringOccasionStartingOffset: type: integer nRFrequencyRef: - $ref: 'genericNrm.yaml#/components/schemas/Dn' + $ref: 'comDefs.yaml#/components/schemas/Dn' victimSetRef: - $ref: 'genericNrm.yaml#/components/schemas/Dn' + $ref: 'comDefs.yaml#/components/schemas/Dn' aggressorSetRef: - $ref: 'genericNrm.yaml#/components/schemas/Dn' + $ref: 'comDefs.yaml#/components/schemas/Dn' - $ref: 'genericNrm.yaml#/components/schemas/ManagedFunction-ncO' - type: object properties: @@ -936,6 +1010,18 @@ components: DRACHOptimizationFunction: $ref: '#/components/schemas/DRACHOptimizationFunction-Single' + NrOperatorCellDu-Single: + allOf: + - $ref: 'genericNrm.yaml#/components/schemas/Top' + - type: object + properties: + cellLocalId: + type: integer + plmnInfoList: + $ref: '#/components/schemas/PlmnInfoList' + nrTac: + $ref: '#/components/schemas/NrTac' + NRFrequency-Single: allOf: - $ref: 'genericNrm.yaml#/components/schemas/Top' @@ -994,7 +1080,7 @@ components: bSChannelBwUL: type: integer sectorEquipmentFunctionRef: - $ref: 'genericNrm.yaml#/components/schemas/Dn' + $ref: 'comDefs.yaml#/components/schemas/Dn' - $ref: 'genericNrm.yaml#/components/schemas/ManagedFunction-ncO' - type: object properties: @@ -1103,9 +1189,9 @@ components: cellIndividualOffset: $ref: '#/components/schemas/CellIndividualOffset' adjacentNRCellRef: - $ref: 'genericNrm.yaml#/components/schemas/Dn' - nRFrequencyRef: - $ref: 'genericNrm.yaml#/components/schemas/Dn' + $ref: 'comDefs.yaml#/components/schemas/Dn' + nRFreqRelationRef: + $ref: 'comDefs.yaml#/components/schemas/Dn' isRemoveAllowed: type: boolean isHOAllowed: @@ -1127,7 +1213,7 @@ components: - type: object properties: adjacentEUtranCellRef: - $ref: 'genericNrm.yaml#/components/schemas/Dn' + $ref: 'comDefs.yaml#/components/schemas/Dn' - $ref: 'genericNrm.yaml#/components/schemas/ManagedFunction-ncO' NRFreqRelation-Single: allOf: @@ -1139,13 +1225,13 @@ components: properties: offsetMO: $ref: '#/components/schemas/QOffsetRangeList' - blackListEntry: + blockListEntry: type: array items: type: integer minimum: 0 maximum: 1007 - blackListEntryIdleMode: + blockListEntryIdleMode: type: integer cellReselectionPriority: type: integer @@ -1191,7 +1277,7 @@ components: tReselectionNRSfMedium: $ref: '#/components/schemas/TReselectionNRSf' nRFrequencyRef: - $ref: 'genericNrm.yaml#/components/schemas/Dn' + $ref: 'comDefs.yaml#/components/schemas/Dn' EUtranFreqRelation-Single: allOf: - $ref: 'genericNrm.yaml#/components/schemas/Top' @@ -1254,7 +1340,7 @@ components: tReselectionNRSfMedium: $ref: '#/components/schemas/TReselectionNRSf' eUTranFrequencyRef: - $ref: 'genericNrm.yaml#/components/schemas/Dn' + $ref: 'comDefs.yaml#/components/schemas/Dn' DANRManagementFunction-Single: allOf: - $ref: 'genericNrm.yaml#/components/schemas/Top' @@ -1335,6 +1421,20 @@ components: $ref: '#/components/schemas/MinimumTimeBetweenHoTriggerChange' tstoreUEcntxt: $ref: '#/components/schemas/TstoreUEcntxt' + DLBOFunction-Single: + allOf: + - $ref: 'genericNrm.yaml#/components/schemas/Top' + - type: object + properties: + attributes: + type: object + properties: + dlboControl: + type: boolean + maximumDeviationHoTrigger: + $ref: '#/components/schemas/MaximumDeviationHoTrigger' + minimumTimeBetweenHoTriggerChange: + $ref: '#/components/schemas/MinimumTimeBetweenHoTriggerChange' DPCIConfigurationFunction-Single: allOf: @@ -1427,7 +1527,7 @@ components: setType: $ref: '#/components/schemas/RSSetType' nRCellDURefs: - $ref: 'genericNrm.yaml#/components/schemas/DnList' + $ref: 'comDefs.yaml#/components/schemas/DnList' ExternalGnbDuFunction-Single: allOf: @@ -1518,7 +1618,7 @@ components: plmnIdList: $ref: '#/components/schemas/PlmnIdList' nRFrequencyRef: - $ref: 'genericNrm.yaml#/components/schemas/Dn' + $ref: 'comDefs.yaml#/components/schemas/Dn' - $ref: 'genericNrm.yaml#/components/schemas/ManagedFunction-ncO' ExternalENBFunction-Single: allOf: @@ -1548,7 +1648,7 @@ components: - type: object properties: EUtranFrequencyRef: - $ref: 'genericNrm.yaml#/components/schemas/Dn' + $ref: 'comDefs.yaml#/components/schemas/Dn' - $ref: 'genericNrm.yaml#/components/schemas/ManagedFunction-ncO' EP_XnC-Single: @@ -1650,7 +1750,7 @@ components: remoteAddress: $ref: '#/components/schemas/RemoteAddress' epTransportRefs: - $ref: 'genericNrm.yaml#/components/schemas/DnList' + $ref: 'comDefs.yaml#/components/schemas/DnList' EP_NgU-Single: allOf: @@ -1667,7 +1767,7 @@ components: remoteAddress: $ref: '#/components/schemas/RemoteAddress' epTransportRefs: - $ref: 'genericNrm.yaml#/components/schemas/DnList' + $ref: 'comDefs.yaml#/components/schemas/DnList' EP_X2U-Single: allOf: @@ -1712,6 +1812,10 @@ components: type: array items: $ref: '#/components/schemas/GnbDuFunction-Single' + OperatorDu-Multiple: + type: array + items: + $ref: '#/components/schemas/OperatorDu-Single' GnbCuUpFunction-Multiple: type: array items: @@ -1725,6 +1829,12 @@ components: type: array items: $ref: '#/components/schemas/NrCellDu-Single' + + NrOperatorCellDu-Multiple: + type: array + items: + $ref: '#/components/schemas/NrOperatorCellDu-Single' + NrCellCu-Multiple: type: array items: @@ -1857,9 +1967,11 @@ components: - $ref: '#/components/schemas/GnbDuFunction-Single' - $ref: '#/components/schemas/GnbCuUpFunction-Single' - $ref: '#/components/schemas/GnbCuCpFunction-Single' + - $ref: '#/components/schemas/OperatorDu-Single' - $ref: '#/components/schemas/NrCellCu-Single' - $ref: '#/components/schemas/NrCellDu-Single' + - $ref: '#/components/schemas/NrOperatorCellDu-Single' - $ref: '#/components/schemas/NRFrequency-Single' - $ref: '#/components/schemas/EUtranFrequency-Single' @@ -1879,6 +1991,7 @@ components: - $ref: '#/components/schemas/DESManagementFunction-Single' - $ref: '#/components/schemas/DRACHOptimizationFunction-Single' - $ref: '#/components/schemas/DMROFunction-Single' + - $ref: '#/components/schemas/DLBOFunction-Single' - $ref: '#/components/schemas/DPCIConfigurationFunction-Single' - $ref: '#/components/schemas/CPCIConfigurationFunction-Single' - $ref: '#/components/schemas/CESManagementFunction-Single' diff --git a/OpenAPI/perfMnS.yaml b/OpenAPI/perfMnS.yaml new file mode 100644 index 0000000000000000000000000000000000000000..1fd64a7d22e31b1a49688748a3564eb585774174 --- /dev/null +++ b/OpenAPI/perfMnS.yaml @@ -0,0 +1,76 @@ +openapi: 3.0.1 +info: + title: TS 28.532 Performance Threshold Monitoring MnS + version: 16.6.0 + description: >- + OAS 3.0.1 definition of the Performance Threshold Monitoring MnS + © 2020, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). + All rights reserved. +externalDocs: + description: 3GPP TS 28.532 V16.6.0; Generic management services + url: http://www.3gpp.org/ftp/Specs/archive/28_series/28.532/ +servers: + - url: '{root}' + variables: + root: + description: >- + The open API server of the performance threshold monitoring service is + located in the consumer side, see monitoringNotifTarget attribute of + the IOC ThresholdMonitor defined in 3GPP TS 28.622 [11]. + default: http://example.com/3GPPManagement +paths: + /notificationSink: + post: + summary: Send notifications about performance threshold crossing + description: To send a notifyThresholdCrossing notification + requestBody: + required: true + content: + application/json: + schema: + $ref: '#/components/schemas/NotifyThresholdCrossing' + responses: + '204': + description: >- + Success case ("204 No Content"). The notification is successfully + delivered. The response message body is absent. + default: + description: Error case. + content: + application/json: + schema: + $ref: 'comDefs.yaml#/components/schemas/ErrorResponse' +components: + schemas: + PerfNotificationTypes: + type: string + enum: + - notifyThresholdCrossing + PerfMetricValue: + oneOf: + - type: integer + - $ref: 'comDefs.yaml#/components/schemas/Float' + PerfMetricDirection: + type: string + enum: + - UP + - DOWN + NotifyThresholdCrossing: + allOf: + - $ref: 'comDefs.yaml#/components/schemas/NotificationHeader' + - type: object + properties: + observedPerfMetricName: + type: string + observedPerfMetricValue: + $ref: '#/components/schemas/PerfMetricValue' + observedPerfMetricDirection: + $ref: '#/components/schemas/PerfMetricDirection' + thresholdValue: + $ref: '#/components/schemas/PerfMetricValue' + hysteresis: + $ref: '#/components/schemas/PerfMetricValue' + monitorGranularityPeriod: + type: integer + additionalText: + type: string diff --git a/OpenAPI/provMnS.yaml b/OpenAPI/provMnS.yaml index b2f84a4d2a55e09c0eff04207d290384fb9f59ed..1dd467e16a8bf2d06bd2b635644252e20504d5fc 100755 --- a/OpenAPI/provMnS.yaml +++ b/OpenAPI/provMnS.yaml @@ -1,25 +1,25 @@ openapi: 3.0.1 info: title: Provisioning MnS - version: 16.4.0 + version: 16.5.0 description: >- OAS 3.0.1 definition of the Provisioning MnS © 2020, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved. externalDocs: - description: 3GPP TS 28.532 V16.4.0; Generic management services + description: 3GPP TS 28.532; Generic management services url: http://www.3gpp.org/ftp/Specs/archive/28_series/28.532/ servers: - - url: 'http://{URI-DN-prefix}/{root}/ProvMnS/v1640/{LDN-first-part}' + - url: '{MnSRoot}/ProvMnS/{MnSVersion}/{URI-LDN-first-part}' variables: - URI-DN-prefix: - description: See subclause 4.4 of TS 32.158 - default: example.com - root: - description: See subclause 4.4 of TS 32.158 - default: 3GPPManagement - LDN-first-part: - description: See subclause 4.4 of TS 32.158 + MnSRoot: + description: See clause 4.4.2 of TS 32.158 + default: http://example.com/3GPPManagement + MnSVersion: + description: Version number of the OpenAPI definition + default: XXX + URI-LDN-first-part: + description: See clause 4.4.2 of TS 32.158 default: '' paths: '/{className}={id}': @@ -28,12 +28,12 @@ paths: in: path required: true schema: - $ref: '#/components/schemas/className-PathType' + type: string - name: id in: path required: true schema: - $ref: '#/components/schemas/id-PathType' + type: string put: summary: Replaces a complete single resource or creates it if it does not exist description: >- @@ -44,7 +44,7 @@ paths: content: application/json: schema: - $ref: '#/components/schemas/resourcePut-RequestType' + $ref: '#/components/schemas/Resource' responses: '200': description: >- @@ -60,7 +60,7 @@ paths: content: application/json: schema: - $ref: '#/components/schemas/resourceUpdate-ResponseType' + $ref: '#/components/schemas/Resource' '201': description: >- Success case ("201 Created"). @@ -70,7 +70,7 @@ paths: content: application/json: schema: - $ref: '#/components/schemas/resourceCreation-ResponseType' + $ref: '#/components/schemas/Resource' '204': description: >- Success case ("204 No Content"). @@ -82,7 +82,7 @@ paths: content: application/json: schema: - $ref: '#/components/schemas/error-ResponseType' + $ref: 'comDefs.yaml#/components/schemas/ErrorResponse' callbacks: notifyMOICreation: '{request.body#/notificationRecipientAddress}': @@ -92,7 +92,7 @@ paths: content: application/json: schema: - $ref: '#/components/schemas/notifyMOICreation-NotifType' + $ref: '#/components/schemas/NotifyMoiCreation' responses: '204': description: >- @@ -104,7 +104,7 @@ paths: content: application/json: schema: - $ref: '#/components/schemas/error-ResponseType' + $ref: 'comDefs.yaml#/components/schemas/ErrorResponse' notifyMOIDeletion: '{request.body#/notificationRecipientAddress}': post: @@ -113,7 +113,7 @@ paths: content: application/json: schema: - $ref: '#/components/schemas/notifyMOIDeletion-NotifType' + $ref: '#/components/schemas/NotifyMoiDeletion' responses: '204': description: >- @@ -125,8 +125,8 @@ paths: content: application/json: schema: - $ref: '#/components/schemas/error-ResponseType' - notifyMOIAttributeValueChange: + $ref: 'comDefs.yaml#/components/schemas/ErrorResponse' + notifyMOIAttributeValueChanges: '{request.body#/notificationRecipientAddress}': post: requestBody: @@ -134,7 +134,7 @@ paths: content: application/json: schema: - $ref: '#/components/schemas/notifyMOIAttributeValueChange-NotifType' + $ref: '#/components/schemas/NotifyMoiAttributeValueChanges' responses: '204': description: >- @@ -146,7 +146,7 @@ paths: content: application/json: schema: - $ref: '#/components/schemas/error-ResponseType' + $ref: 'comDefs.yaml#/components/schemas/ErrorResponse' notifyMOIChanges: '{request.body#/notificationRecipientAddress}': post: @@ -155,7 +155,7 @@ paths: content: application/json: schema: - $ref: '#/components/schemas/notifyMOIChanges-NotifType' + $ref: '#/components/schemas/NotifyMoiChanges' responses: '204': description: >- @@ -167,7 +167,7 @@ paths: content: application/json: schema: - $ref: '#/components/schemas/error-ResponseType' + $ref: 'comDefs.yaml#/components/schemas/ErrorResponse' get: summary: Reads one or multiple resources description: >- @@ -183,7 +183,7 @@ paths: mechanism is specified in the present document. required: false schema: - $ref: '#/components/schemas/scope-QueryType' + $ref: '#/components/schemas/Scope' style: form explode: true - name: filter @@ -196,7 +196,7 @@ paths: document. required: false schema: - $ref: '#/components/schemas/filter-QueryType' + $ref: 'comDefs.yaml#/components/schemas/Filter' - name: attributes in: query description: >- @@ -204,7 +204,9 @@ paths: are returned. required: true schema: - $ref: '#/components/schemas/attributes-QueryType' + type: array + items: + type: string style: form explode: false - name: fields @@ -214,7 +216,9 @@ paths: that are returned. required: false schema: - $ref: '#/components/schemas/fields-QueryType' + type: array + items: + type: string style: form explode: false responses: @@ -229,13 +233,13 @@ paths: content: application/json: schema: - $ref: '#/components/schemas/resourceRetrieval-ResponseType' + $ref: '#/components/schemas/Resource' default: description: Error case. content: application/json: schema: - $ref: '#/components/schemas/error-ResponseType' + $ref: 'comDefs.yaml#/components/schemas/ErrorResponse' patch: summary: Patches one or multiple resources description: >- @@ -254,16 +258,20 @@ paths: content: application/merge-patch+json: schema: - $ref: '#/components/schemas/jsonMergePatch-RequestType' + $ref: '#/components/schemas/Resource' application/3gpp-merge-patch+json: schema: - $ref: '#/components/schemas/3gppJsonMergePatch-RequestType' + $ref: '#/components/schemas/Resource' application/json-patch+json: schema: - $ref: '#/components/schemas/jsonPatch-RequestType' + type: array + items: + type: object application/3gpp-json-patch+json: schema: - $ref: '#/components/schemas/3gppJsonPatch-RequestType' + type: array + items: + type: object responses: '200': description: >- @@ -276,7 +284,7 @@ paths: content: application/json: schema: - $ref: '#/components/schemas/resourceUpdate-ResponseType' + $ref: '#/components/schemas/Resource' '204': description: >- Success case ("204 No Content"). @@ -288,7 +296,7 @@ paths: content: application/json: schema: - $ref: '#/components/schemas/error-ResponseType' + $ref: 'comDefs.yaml#/components/schemas/ErrorResponse' delete: summary: Deletes one or multiple resources description: >- @@ -303,7 +311,9 @@ paths: mechanism is specified in the present document. required: false schema: - $ref: '#/components/schemas/scope-QueryType' + $ref: '#/components/schemas/Scope' + style: form + explode: true - name: filter in: query description: >- @@ -314,7 +324,7 @@ paths: document. required: false schema: - $ref: '#/components/schemas/filter-QueryType' + $ref: 'comDefs.yaml#/components/schemas/Filter' responses: '200': description: >- @@ -331,136 +341,66 @@ paths: content: application/json: schema: - $ref: '#/components/schemas/resourceDeletion-ResponseType' + type: array + items: + $ref: 'comDefs.yaml#/components/schemas/Uri' default: description: Error case. content: application/json: schema: - $ref: '#/components/schemas/error-ResponseType' + $ref: 'comDefs.yaml#/components/schemas/ErrorResponse' components: schemas: - dateTime-Type: - type: string - format: date-time - long-Type: - type: integer - format: int64 - uri-Type: - type: string - correlatedNotification-Type: + CorrelatedNotification: type: object properties: source: - $ref: '#/components/schemas/uri-Type' + $ref: 'comDefs.yaml#/components/schemas/Dn' notificationIds: type: array items: - $ref: '#/components/schemas/notificationId-Type' - notificationId-Type: - $ref: '#/components/schemas/long-Type' - notificationType-Type: + $ref: 'comDefs.yaml#/components/schemas/NotificationId' + required: + - source + - notificationIds + CmNotificationTypes: type: string enum: - notifyMOICreation - notifyMOIDeletion - - notifyMOIAttributeValueChange - systemDN-Type: + - notifyMOIAttributeValueChanges + - notifyMOIChanges + SourceIndicator: type: string - additionalText-Type: - type: string - sourceIndicator-Type: + enum: + - RESOURCE_OPERATION + - MANAGEMENT_OPERATION + - SON_OPERATION + - UNKNOWN + Operation: type: string enum: - - resourceOperation - - mangementOperation - - sONOperation - - unknown - header-Type: - type: object - properties: - href: - $ref: '#/components/schemas/uri-Type' - notificationId: - $ref: '#/components/schemas/notificationId-Type' - notificationType: - $ref: '#/components/schemas/notificationType-Type' - eventTime: - $ref: '#/components/schemas/dateTime-Type' - systemDN: - $ref: '#/components/schemas/systemDN-Type' - required: - - href - - notificationId - - notificationType - - eventTime - - systemDN - scopeType-Type: + - CREATE + - DELETE + - REPLACE + ScopeType: type: string enum: - BASE_ONLY - BASE_NTH_LEVEL - BASE_SUBTREE - BASE_ALL - scopeLevel-Type: - type: integer - className-PathType: - type: string - id-PathType: - type: string - attributes-QueryType: - type: array - items: - type: string - fields-QueryType: - type: array - items: - type: string - filter-QueryType: - type: string - scope-QueryType: + Scope: type: object properties: scopeType: - $ref: '#/components/schemas/scopeType-Type' + $ref: '#/components/schemas/ScopeType' scopeLevel: - $ref: '#/components/schemas/scopeLevel-Type' + type: integer - resourcePut-RequestType: - $ref: '#/components/schemas/resourceRepresentation-Type' - jsonMergePatch-RequestType: - $ref: '#/components/schemas/resourceRepresentation-Type' - 3gppJsonMergePatch-RequestType: - $ref: '#/components/schemas/resourceRepresentation-Type' - jsonPatch-RequestType: - type: array - items: - type: object - 3gppJsonPatch-RequestType: - type: array - items: - type: object - error-ResponseType: - type: object - properties: - error: - type: object - properties: - errorInfo: - type: string - resourceRetrieval-ResponseType: - $ref: '#/components/schemas/resourceRepresentation-Type' - resourceCreation-ResponseType: - $ref: '#/components/schemas/resourceRepresentation-Type' - resourceUpdate-ResponseType: - $ref: '#/components/schemas/resourceRepresentation-Type' - resourceDeletion-ResponseType: - type: array - items: - $ref: '#/components/schemas/uri-Type' - - resourceRepresentation-Type: + Resource: oneOf: - type: object properties: @@ -478,102 +418,83 @@ components: - $ref: '5gcNrm.yaml#/components/schemas/resources-5gcNrm' - $ref: 'sliceNrm.yaml#/components/schemas/resources-sliceNrm' - mOIChange-Type: + MoiChange: type: object properties: notificationId: - $ref: '#/components/schemas/notificationId-Type' + $ref: 'comDefs.yaml#/components/schemas/NotificationId' correlatedNotifications: type: array items: - $ref: '#/components/schemas/correlatedNotification-Type' + $ref: '#/components/schemas/CorrelatedNotification' additionalText: - $ref: '#/components/schemas/additionalText-Type' + type: string sourceIndicator: - $ref: '#/components/schemas/sourceIndicator-Type' + $ref: '#/components/schemas/SourceIndicator' path: - $ref: '#/components/schemas/uri-Type' + $ref: 'comDefs.yaml#/components/schemas/Uri' operation: - type: string - enum: - - CREATE - - DELETE - - REPLACE + $ref: '#/components/schemas/Operation' value: oneOf: - - type: object - additionalProperties: - nullable: true - - type: array - items: - type: object - minItems: 1 - maxItems: 2 + - $ref: 'comDefs.yaml#/components/schemas/AttributeNameValuePairSet' + - $ref: 'comDefs.yaml#/components/schemas/AttributeValueChangeSet' - notifyMOICreation-NotifType: + NotifyMoiCreation: allOf: - - $ref: '#/components/schemas/header-Type' + - $ref: 'comDefs.yaml#/components/schemas/NotificationHeader' - type: object properties: correlatedNotifications: type: array items: - $ref: '#/components/schemas/correlatedNotification-Type' + $ref: '#/components/schemas/CorrelatedNotification' additionalText: - $ref: '#/components/schemas/additionalText-Type' + type: string sourceIndicator: - $ref: '#/components/schemas/sourceIndicator-Type' + $ref: '#/components/schemas/SourceIndicator' attributeList: - type: object - additionalProperties: - nullable: true - notifyMOIDeletion-NotifType: + $ref: 'comDefs.yaml#/components/schemas/AttributeNameValuePairSet' + NotifyMoiDeletion: allOf: - - $ref: '#/components/schemas/header-Type' + - $ref: 'comDefs.yaml#/components/schemas/NotificationHeader' - type: object properties: correlatedNotifications: type: array items: - $ref: '#/components/schemas/correlatedNotification-Type' + $ref: '#/components/schemas/CorrelatedNotification' additionalText: - $ref: '#/components/schemas/additionalText-Type' + type: string sourceIndicator: - $ref: '#/components/schemas/sourceIndicator-Type' + $ref: '#/components/schemas/SourceIndicator' attributeList: - type: object - additionalProperties: true - notifyMOIAttributeValueChange-NotifType: + $ref: 'comDefs.yaml#/components/schemas/AttributeNameValuePairSet' + NotifyMoiAttributeValueChanges: allOf: - - $ref: '#/components/schemas/header-Type' + - $ref: 'comDefs.yaml#/components/schemas/NotificationHeader' - type: object properties: correlatedNotifications: type: array items: - $ref: '#/components/schemas/correlatedNotification-Type' + $ref: '#/components/schemas/CorrelatedNotification' additionalText: - $ref: '#/components/schemas/additionalText-Type' + type: string sourceIndicator: - $ref: '#/components/schemas/sourceIndicator-Type' - attributeValueChange: - type: object - additionalProperties: - type: array - minItems: 1 - maxItems: 2 - items: - nullable: true + $ref: '#/components/schemas/SourceIndicator' + attributeListValueChanges: + $ref: 'comDefs.yaml#/components/schemas/AttributeValueChangeSet' required: - - attributeValueChange - notifyMOIChanges-NotifType: + - attributeListValueChanges + NotifyMoiChanges: allOf: - - $ref: '#/components/schemas/header-Type' + - $ref: 'comDefs.yaml#/components/schemas/NotificationHeader' - type: object properties: - mOIChanges: + moiChanges: type: array items: - $ref: '#/components/schemas/mOIChange-Type' + $ref: '#/components/schemas/MoiChange' required: - - mOIChanges + - moiChanges diff --git a/OpenAPI/sliceNrm.yaml b/OpenAPI/sliceNrm.yaml index bf6b4d71c1a2d3f38ac3ed465f4c096b5d946b1a..0fc9a4f805736efd07e35be5cca2350c08b62198 100755 --- a/OpenAPI/sliceNrm.yaml +++ b/OpenAPI/sliceNrm.yaml @@ -1,7 +1,7 @@ openapi: 3.0.1 info: title: Slice NRM - version: 17.4.0 + version: 17.5.0 description: >- OAS 3.0.1 specification of the Slice NRM @ 2020, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). @@ -257,12 +257,42 @@ components: $ref: '#/components/schemas/ServAttrCom' performance: $ref: '#/components/schemas/EEPerfReq' + NSSAASupport: + type: object + properties: + servAttrCom: + $ref: '#/components/schemas/ServAttrCom' + support: + $ref: '#/components/schemas/Support' + SecFunc: + type: object + properties: + secFunId: + type: string + secFunType: + type: string + secRules: + type: array + items: + type: string + N6Protection: + type: object + properties: + servAttrCom: + $ref: '#/components/schemas/ServAttrCom' + secFuncList: + type: array + items: + $ref: '#/components/schemas/SecFunc' + CNSliceSubnetProfile: type: object properties: maxNumberofUEs: type: integer - latency: + dLLatency: + type: integer + uLLatency: type: integer dLThptPerSliceSubnet: $ref: '#/components/schemas/XLThpt' @@ -298,11 +328,19 @@ components: $ref: '#/components/schemas/DeterministicComm' survivalTime: type: string + nssaaSupport: + $ref: '#/components/schemas/NSSAASupport' + n6Protection: + $ref: '#/components/schemas/N6Protection' RANSliceSubnetProfile: type: object properties: coverageAreaTAList: type: integer + dLLatency: + type: integer + uLLatency: + type: integer uEMobilityLevel: $ref: '#/components/schemas/MobilityLevel' resourceSharingLevel: @@ -348,7 +386,9 @@ components: TopSliceSubnetProfile: type: object properties: - latency: + dLLatency: + type: integer + uLLatency: type: integer maxNumberofUEs: type: integer @@ -410,7 +450,9 @@ components: $ref: 'nrNrm.yaml#/components/schemas/PlmnInfoList' maxNumberofUEs: type: number - latency: + dLLatency: + type: number + uLLatency: type: number uEMobilityLevel: $ref: '#/components/schemas/MobilityLevel' @@ -476,6 +518,10 @@ components: $ref: '#/components/schemas/SliceSimultaneousUse' energyEfficiency: $ref: '#/components/schemas/EnergyEfficiency' + nssaaSupport: + $ref: '#/components/schemas/NSSAASupport' + n6Protection: + $ref: '#/components/schemas/N6Protection' SliceProfile: type: object properties: @@ -492,8 +538,8 @@ components: IpAddress: oneOf: - - $ref: 'genericNrm.yaml#/components/schemas/Ipv4Addr' - - $ref: 'genericNrm.yaml#/components/schemas/Ipv6Addr' + - $ref: 'comDefs.yaml#/components/schemas/Ipv4Addr' + - $ref: 'comDefs.yaml#/components/schemas/Ipv6Addr' LogicInterfaceInfo: type: object @@ -548,11 +594,11 @@ components: - type: object properties: networkSliceSubnetRef: - $ref: 'genericNrm.yaml#/components/schemas/Dn' + $ref: 'comDefs.yaml#/components/schemas/Dn' operationalState: - $ref: 'genericNrm.yaml#/components/schemas/OperationalState' + $ref: 'comDefs.yaml#/components/schemas/OperationalState' administrativeState: - $ref: 'genericNrm.yaml#/components/schemas/AdministrativeState' + $ref: 'comDefs.yaml#/components/schemas/AdministrativeState' serviceProfileList: $ref: '#/components/schemas/ServiceProfileList' @@ -566,21 +612,27 @@ components: - type: object properties: managedFunctionRefList: - $ref: 'genericNrm.yaml#/components/schemas/DnList' + $ref: 'comDefs.yaml#/components/schemas/DnList' networkSliceSubnetRefList: - $ref: 'genericNrm.yaml#/components/schemas/DnList' + $ref: 'comDefs.yaml#/components/schemas/DnList' operationalState: - $ref: 'genericNrm.yaml#/components/schemas/OperationalState' + $ref: 'comDefs.yaml#/components/schemas/OperationalState' administrativeState: - $ref: 'genericNrm.yaml#/components/schemas/AdministrativeState' + $ref: 'comDefs.yaml#/components/schemas/AdministrativeState' nsInfo: $ref: '#/components/schemas/NsInfo' sliceProfileList: $ref: '#/components/schemas/SliceProfileList' epTransportRefList: - $ref: 'genericNrm.yaml#/components/schemas/DnList' + $ref: 'comDefs.yaml#/components/schemas/DnList' priorityLabel: type: integer + networkSliceSubnetType: + type: string + enum: + - TOP_SLICESUBNET + - RAN_SLICESUBNET + - CN_SLICESUBNET EP_Transport-Single: allOf: @@ -599,7 +651,7 @@ components: qosProfile: type: string epApplicationRefs: - $ref: 'genericNrm.yaml#/components/schemas/DnList' + $ref: 'comDefs.yaml#/components/schemas/DnList' #-------- Definition of JSON arrays for name-contained IOCs ---------------------- SubNetwork-Multiple: diff --git a/OpenAPI/streamingDataMnS.yaml b/OpenAPI/streamingDataMnS.yaml index ab7f71d4a8f816fd13c14397c5e31270903613dd..abbf1271f3365b41e0780eae0f86c88dfce3545f 100755 --- a/OpenAPI/streamingDataMnS.yaml +++ b/OpenAPI/streamingDataMnS.yaml @@ -1,24 +1,17 @@ openapi: 3.0.1 info: title: TS 28.532 Streaming data reporting service - version: 16.4.0 + version: 16.10.0 description: OAS 3.0.1 specification for the Streaming data reporting service (Streaming MnS) servers: - - url: '{protocol}://{root}/StreamingDataReportingMnS/{version}' + - url: '{MnSRoot}/StreamingDataReportingMnS/{MnSVersion}' variables: - protocol: - description: Protocol used - enum: - - http - - https - - wss - default: https - root: - description: Indicates the host name and optional port, and an optional sequence of path segments that together represent a prefix path. - default: example.com - version: - description: Indicates the current version of the specification - default: 16.4.0 + MnSRoot: + description: See clause 4.4.3 of TS 32.158. + default: https://example.com/3GPPManagement + MnSVersion: + description: See clause 4.4.3 of TS 32.158. + default: '' paths: '/connections': post: @@ -329,8 +322,8 @@ components: description: DN of the measured object instance (see 3GPP TS 28.550) allOf: - $ref: '#/components/schemas/systemDN-Type' - measTypes-Type: - description: an ordered list of measurement type or KPI whose measurement values or KPI result values are to be reported by the Performance Data Stream Units (see Annex C of TS 28.550) via this stream + performanceMetrics-Type: + description: an ordered list of performance metric names (see clause 4.4.1 of 3GPP TS 28.622[11]) whose values are to be reported by the Performance Data Stream Units (see Annex C of TS 28.550 [42]) via this stream. Performance metrics include measurement and KPI type: array items: type: string @@ -340,15 +333,13 @@ components: properties: measObjDn: $ref: '#/components/schemas/measObjDn-Type' - measTypes: - $ref: '#/components/schemas/measTypes-Type' - measurementReaderId: - $ref: '#/components/schemas/systemDN-Type' + performanceMetrics: + $ref: '#/components/schemas/performanceMetrics-Type' jobId: type: string required: - measObjDn - - measTypes + - performanceMetrics producerId-Type: description: DN of the streaming data reporting MnS producer. allOf: diff --git a/yang-models/_3gpp-common-mnsregistry.yang b/yang-models/_3gpp-common-mnsregistry.yang index 52163902b4c15a9b7c80f20680daecc0c6cdaaca..2783fd385e9f65a1596552eb59cc4b0b55b3a7c6 100755 --- a/yang-models/_3gpp-common-mnsregistry.yang +++ b/yang-models/_3gpp-common-mnsregistry.yang @@ -12,12 +12,13 @@ module _3gpp-common-mnsregistry { Class (IOC) that is part of the Generic Network Resource Model (NRM)."; reference "3GPP TS 28.623 Generic Network Resource Model (NRM)"; - revision 2021-10-18 { reference "S5-215263"; } revision 2021-08-29 { reference "Initial revision, S5-214388"; } - - grouping MNSInfoGrp { - description "Represents the MNSInfo IOC."; - reference "3GPP TS 28.622"; + + grouping MNSRegistryGrp { + description "Represents the MNSRegistry IOC."; + reference "3GPP TS 28.541"; + uses top3gpp:Top_Grp; + leaf mnsLabel { description "Human-readable name of management service."; mandatory true; @@ -27,10 +28,9 @@ module _3gpp-common-mnsregistry { leaf mnsType { description "Type of management service."; type enumeration { - enum ProvMnS; - enum FaultSupervisionMnS; - enum StreamingDataReportingMnS; - enum FileDataReportingMnS; + enum PROVISIONING; + enum FAULT_SUPERVISION; + enum PERFORMANCE_ASSURANCE; } } @@ -44,37 +44,16 @@ module _3gpp-common-mnsregistry { mandatory true; type string; } - } - - grouping MNSInfo { - description "Represents the MNSInfo IOC."; - reference "3GPP TS 28.622"; - uses top3gpp:Top_Grp; - container attributes { - uses MNSInfoGrp; } - } - - grouping MNSRegistryGrp { - description "Represents the MNSRegistry IOC."; - reference "3GPP TS 28.622"; - uses top3gpp:Top_Grp; - } - - grouping MNSRegistry { - list mnsRegistry { - description "Represents the MNSRegistry IOC."; - reference "3GPP TS 28.622"; - uses top3gpp:Top_Grp; - key "mnsType mnsVersion mnsAddress"; - container attributes { - uses MNSInfoGrp; + + augment "/subnet3gpp:SubNetwork" { + list MNSRegistry { + description "Represents the MNSRegistry IOC."; + key id; + uses top3gpp:Top_Grp; + container attributes { + uses MNSRegistryGrp; + } } - } - } - - augment "/subnet3gpp:SubNetwork" { - uses MNSRegistryGrp; - } - + } } \ No newline at end of file diff --git a/yang-models/_3gpp-nr-nrm-gnbcucpfunction.yang b/yang-models/_3gpp-nr-nrm-gnbcucpfunction.yang index 4c4cee4d639b0c079c1c5540374c16ebdd481f8a..39ff1b5f3283cd5f6a40f05e775994cfbf75ec28 100755 --- a/yang-models/_3gpp-nr-nrm-gnbcucpfunction.yang +++ b/yang-models/_3gpp-nr-nrm-gnbcucpfunction.yang @@ -15,8 +15,8 @@ module _3gpp-nr-nrm-gnbcucpfunction { Object Class (IOC) that is part of the NR Network Resource Model (NRM)."; reference "3GPP TS 28.541 5G Network Resource Model (NRM)"; - revision 2021-11-06 { reference "CR-0611" ; } revision 2021-11-05 { reference "CR-0609"; } + revision 2020-11-05 { reference "CR-0611" ; } revision 2020-10-02 { reference CR-0384 ; } revision 2020-08-06 { reference "CR-0333"; } revision 2020-08-03 { reference "CR-0321"; } @@ -102,7 +102,8 @@ module _3gpp-nr-nrm-gnbcucpfunction { leaf-list xnHOBlackList { type string; description "List of nodes to which handovers over Xn are prohibited."; - } + } + leaf configurable5QISetRef { type types3gpp:DistinguishedName; description "DN of the Configurable5QISet that the GNBCUCPFunction supports (is associated to)."; @@ -112,6 +113,7 @@ module _3gpp-nr-nrm-gnbcucpfunction { type string; description "List of nodes to which handovers over X2 are prohibited."; } + leaf dynamic5QISetRef { type types3gpp:DistinguishedName; description "DN of the Dynamic5QISet that the GNBCUCPFunction supports (is associated to)."; @@ -142,4 +144,4 @@ module _3gpp-nr-nrm-gnbcucpfunction { uses mf3gpp:ManagedFunctionContainedClasses; } } -} \ No newline at end of file +}