Commit 16410149 authored by Mirko Cano Soveri's avatar Mirko Cano Soveri
Browse files

Merge branch 'Integration_Rel16_SA5_137_YAML' into 'Rel-16'

Integration rel16 sa5 137 yaml

See merge request !148
parents 90a82076 ee61f83e
Loading
Loading
Loading
Loading
+14 −14
Original line number Diff line number Diff line
openapi: 3.0.1
info:
  title: 3GPP 5GC NRM
  version: 16.6.0
  version: 16.9.0
  description: >-
    OAS 3.0.1 specification of the 5GC NRM
    © 2020, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC).
    All rights reserved.
externalDocs:
  description: 3GPP TS 28.541 V16.6.0; 5G NRM, 5GC NRM
  description: 3GPP TS 28.541; 5G NRM, 5GC NRM
  url: http://www.3gpp.org/ftp/Specs/archive/28_series/28.541/
paths: {}
components:
@@ -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:
@@ -183,7 +183,7 @@ components:
        authzInfo:
          type: string
        hostAddr:
          $ref: 'genericNrm.yaml#/components/schemas/HostAddr'
          $ref: 'comDefs.yaml#/components/schemas/HostAddr'
        locality:
          type: string
        nFInfo:
@@ -992,7 +992,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:
@@ -1031,7 +1031,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:
@@ -1110,7 +1110,7 @@ components:
                    sEPPId:
                      type: integer
                    fqdn:
                      $ref: 'genericNrm.yaml#/components/schemas/Fqdn'
                      $ref: 'comDefs.yaml#/components/schemas/Fqdn'


    EP_N2-Single:
@@ -1441,7 +1441,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:

OpenAPI/FileDataReportingMnS.yaml

deleted100644 → 0
+0 −283
Original line number Diff line number Diff line
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/'
servers:
  - url: '{MnSRoot}/FileDataReportingMnS/{MnSversion}'
    variables:
      MnSRoot:
        description: See subclause 4.4 of TS 32.158
        default: http://example.com/3GPPManagement 
      version:
        description: Indicates the current version of the specification
        default: 16.5.0
paths:
  /Files:
    get:
      summary: Read resources of information of available files
      description: With HTTP GET, resources of information of available files are read. The resources to be read are identified with the path component (base resource) and the query component (fileaType, beginTime and endTime) of the URI. The fields query component allows to select the resource properties to be returned.
      parameters:
        - name: fileType
          in: query
          description: This parameter identifies the type of management data that the file contains to select the resources from the collection resources identified with the path component of the URI.
          required: true
          schema:
            $ref: '#/components/schemas/fileType-Type'
        - name: beginTime
          in: query
          description: This parameter identifies the time stamp no later than which the file became available to select the resources from the collection resources identified with the path component of the URI.
          required: true
          schema:
            $ref: '#/components/schemas/dateTime-Type'
        - name: endTime
          in: query
          description: This parameter identifies the time stamp no earlier than which the file became available to select the resources from the collection resources identified with the path component of the URI.
          required: true
          schema:
            $ref: '#/components/schemas/dateTime-Type'
      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/fileInfoRetrieval-ResponseType'
        default:
          description: Error case.
          content:
            application/json:
              schema:
                $ref: '#/components/schemas/error-ResponseType'
  /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: '#/components/schemas/subscription-RequestType'
      responses:
        '201':
          description: Success case ("201 Created"). The representation of the newly created subscription resource shall be returned.
          content:
            application/json:
              schema:
                $ref: '#/components/schemas/subscription-ResponseType'
        default:
          description: Error case.
          content:
            application/json:
              schema:
                $ref: '#/components/schemas/error-ResponseType'
      callbacks:
        notifyFileReady:
          '{request.body#/consumerReference}':
            post:
              requestBody:
                required: true
                content:
                  application/json:
                    schema:
                      $ref: '#/components/schemas/notifyFileReady-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'
        notifyFilePreparationError:
          '{request.body#/consumerReference}':
            post:
              requestBody:
                required: true
                content:
                  application/json:
                    schema:
                      $ref: '#/components/schemas/notifyFilePreparationError-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'
    delete:
      summary: Delete all subscriptions made with a specific consumerReferenceId
      description: The subscriptions are deleted by deleting the corresponding subscription resources. The resources to be deleted are identified with the path component of the URI pointing to the /subscription collection resource and filtering on the consumerReferenceId provided in the query part.
      parameters:
        - name: consumerReferenceId
          in: query
          description: Identifies the subscriptions to be deleted.
          required: true
          schema:
            $ref: '#/components/schemas/consumerReferenceId-QueryType'
      responses:
        '204':
          description: Success case ("204 No Content"). The subscription resources have been deleted. The response message body is absent.
        default:
          description: Error case.
          content:
            application/json:
              schema:
                $ref: '#/components/schemas/error-ResponseType'
  '/subscriptions/{subscriptionId}':
    delete:
      summary: Delete a single 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:
            $ref: '#/components/schemas/subscriptionId-PathType'
      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: '#/components/schemas/error-ResponseType'
components:
  schemas:
    dateTime-Type:
      type: string
      format: date-Time
    uri-Type:
      type: string
    long-Type:
      type: string
      format: long
    additionalText-Type:
      type: string
    reason-Type:
      type: string
    fileInfoRetrieval-ResponseType:
      type: object
      properties:
        data:
          type: array
          items:
            $ref: '#/components/schemas/fileInfo-Type'
    fileInfo-Type:
      type: object
      properties:
        fileLocation:
          $ref: '#/components/schemas/uri-Type'
        fileSize:
          $ref: '#/components/schemas/long-Type'
        fileReadyTime:
          $ref: '#/components/schemas/dateTime-Type'
        fileExpirationTime:
          $ref: '#/components/schemas/dateTime-Type'
        fileCompression:
          type: string
        fileFormat:
          type: string
        fileType:
          $ref: '#/components/schemas/fileType-Type'
    error-ResponseType:
      type: object
      properties:
        error:
          type: object
          properties:
            errorInfo:
              type: string
    fileType-Type:
      type: string
      enum:
        - PERFORMANCE
        - TRACE
        - ANALYTICS
        - PROPRIETARY
    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'
    subscriptionId-PathType:
      type: string
    filter-Type:
      type: string
    notificationId-Type:
      $ref: '#/components/schemas/long-Type'
    notificationType-Type:
      type: string
      enum:
        - notifyFileReady
        - notifyFilePreparationError
    subscription-ResourceType:
      type: object
      properties:
        consumerReference:
          $ref: '#/components/schemas/uri-Type'
        timeTick:
          $ref: '#/components/schemas/long-Type'
        filter:
          $ref: '#/components/schemas/filter-Type'
    subscription-RequestType:
      type: object
      properties:
        data:
          $ref: '#/components/schemas/subscription-ResourceType'
    subscription-ResponseType:
      type: object
      properties:
        data:
          $ref: '#/components/schemas/subscription-ResourceType'
    consumerReferenceId-QueryType:
      $ref: '#/components/schemas/uri-Type'
    notifyFileReady-NotifType:
      type: object
      properties:
        header:
          $ref: '#/components/schemas/header-Type'
        body:
          type: object
          properties:
            fileInfoList:
              type: array
              items:
                $ref: '#/components/schemas/fileInfo-Type'
            additionalText:
              $ref: '#/components/schemas/additionalText-Type'
    notifyFilePreparationError-NotifType:
      type: object
      properties:
        header:
          $ref: '#/components/schemas/header-Type'
        body:
          type: object
          properties:
            fileInfoList:
              type: array
              items:
                $ref: '#/components/schemas/fileInfo-Type'
            reason:
              $ref: '#/components/schemas/reason-Type'
            additionalText:
              $ref: '#/components/schemas/additionalText-Type'
+2 −2
Original line number Diff line number Diff line
@@ -54,8 +54,8 @@ The links below will open the Swagger Editor/UI and auto-load the OpenAPI YAML f
([UI](https://forge.3gpp.org/swagger/tools/loader.html?action=ui&yaml=OpenAPI/streamingDataMnS.yaml))

* File Data Reporting MnS (TS 28.532)
([Editor](https://forge.3gpp.org/swagger/tools/loader.html?yaml=OpenAPI/FileDataReportMnS.yaml))
([UI](https://forge.3gpp.org/swagger/tools/loader.html?action=ui&yaml=OpenAPI/FileDataReportMnS.yaml))
([Editor](https://forge.3gpp.org/swagger/tools/loader.html?yaml=OpenAPI/fileDataReportingMnS.yaml))
([UI](https://forge.3gpp.org/swagger/tools/loader.html?action=ui&yaml=OpenAPI/fileDataReportingMnS.yaml))

## Tools

+45 −15
Original line number Diff line number Diff line
openapi: 3.0.1
info:
  title: Common Type Definitions
  version: 16.6.0
  version: 16.8.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; Generic NRM; Common type definitions
@@ -18,7 +18,17 @@ components:
      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
@@ -33,6 +43,9 @@ components:
    Mnc:
      type: string
      pattern: '^[0-9]{2,3}$'
    Nid:
      type: string
      pattern: '^[A-Fa-f0-9]{11}$'
    PlmnId:
      type: object
      properties:
@@ -40,15 +53,18 @@ components:
          $ref: '#/components/schemas/Mcc'
        mnc:
          $ref: '#/components/schemas/Mnc'
      required:
        - mcc
        - mnc

    Fqdn:
    Tac:
      type: string
    Uri:
      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])$'
@@ -65,6 +81,23 @@ components:
        - 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
@@ -101,6 +134,8 @@ components:
        maxItems: 2

    Filter:
      description: >-
        The filter format shall be compliant to XPath 1.0.
      type: string
    SystemDN:
      type: string
@@ -113,12 +148,7 @@ components:
        - $ref: 'provMnS.yaml#/components/schemas/CmNotificationTypes'
        - $ref: 'perfMnS.yaml#/components/schemas/PerfNotificationTypes'
        - $ref: 'heartbeatNtf.yaml#/components/schemas/HeartbeatNotificationTypes'
        # The enum below will be replaced by a reference once notification
        # types are defined in "FileDataReportingMnS.yaml"
        - type: string
          enum:
            - notifyFileReady
            - notifyFilePreparationError
        - $ref: 'fileDataReportingMnS.yaml#/components/schemas/FileNotificationTypes'
    NotificationHeader:
      type: object
      properties:
+229 −0

File added.

Preview size limit exceeded, changes collapsed.

Loading