Commit 3f802345 authored by Mirko Cano Soveri's avatar Mirko Cano Soveri
Browse files

Merge branch 'Integration_Rel18_SA5_149_YAML' into 'Rel-18' 

SA5#149 OpenAPI SS changes for Rel-18

See merge request !629
parents 33311d88 94673363

OpenAPI/README.md

+1 −1
Original line number Diff line number Diff line 
# 3GPP SA5 models and MnS OpenAPI definitions



(c) 2020, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved.

(c) 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved.



The links below will open the Swagger Editor/UI and auto-load the OpenAPI YAML file of each API:

OpenAPI/TS28104_MdaNrm.yaml

+2 −2
Original line number Diff line number Diff line 
openapi: 3.0.1

info:

  title: MDA NRM

  version: 17.2.0

  version: 18.0.0

  description: >-

    OAS 3.0.1 specification of the MDA NRM

    © 2020, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC).

    © 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC).

    All rights reserved.

externalDocs:

  description: 3GPP TS 28.104; MDA

OpenAPI/TS28104_MdaReport.yaml

+7 −7
Original line number Diff line number Diff line 
openapi: 3.0.1

info:

  title: MDA Report

  version: 17.2.0

  version: 18.0.0

  description: >-

    OAS 3.0.1 specification of the MDA Report

    © 2020, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC).

    © 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC).

    All rights reserved.

externalDocs:

  description: 3GPP TS 28.104; MDA Report
@@ -26,6 +26,11 @@ components: 
            $ref: '#/components/schemas/MDAOutputEntry'

        mDARequestRef:

          $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn'

        analyticsWindow:

          $ref: '#/components/schemas/TimeWindow'

        confidenceDegree:

          type: number

          format: float



    MDAOutputEntry:

      type: object
@@ -33,11 +38,6 @@ components: 
        mDAOutputIEName:

          type: string

        mdaOutputIEValue: {}

        analyticsWindow:

          $ref: '#/components/schemas/TimeWindow'

        confidenceDegree:

          type: number

          format: float





    TimeWindow:

OpenAPI/TS28105_AiMlNrm.yaml

+59 −26
Original line number Diff line number Diff line 
openapi: 3.0.1

info:

  title: AI/ML NRM

  version: 17.3.0

  version: 18.0.0

  description: >-

    OAS 3.0.1 specification of the AI/ML NRM

    © 2020, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC).

    © 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC).

    All rights reserved.

externalDocs:

  description: 3GPP TS 28.105; AI/ML Management
@@ -15,27 +15,6 @@ components: 


#-------- Definition of types-----------------------------------------------------



    MLEntityList:

      type: array

      items:

        $ref: '#/components/schemas/MLEntity'



    MLEntity:

      type: object

      properties:

        mLEntityId:

          type: string

        inferenceType:

          type: string

        mLEntityVersion:

          type: string

        expectedRunTimeContext:

          $ref: '#/components/schemas/MLContext'

        trainingContext:

          $ref: '#/components/schemas/MLContext'

        runTimeContext:

          $ref: '#/components/schemas/MLContext'



    MLContext:

      type: object

      properties:
@@ -122,6 +101,8 @@ components: 
              $ref: '#/components/schemas/ManagedElement-Multiple'

            MLTrainingFunction:

              $ref: '#/components/schemas/MLTrainingFunction-Multiple'

            MLEntityRepository:

              $ref: '#/components/schemas/MLEntityRepository-Multiple'



    ManagedElement-Single:

      allOf:
@@ -135,6 +116,8 @@ components: 
          properties:

            MLTrainingFunction:

              $ref: '#/components/schemas/MLTrainingFunction-Multiple'

            MLEntityRepository:

              $ref: '#/components/schemas/MLEntityRepository-Multiple'



    MLTrainingFunction-Single:

      allOf:
@@ -146,8 +129,8 @@ components: 
                - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-Attr'

                - type: object

                  properties:

                    mLEntityList:

                      $ref: '#/components/schemas/MLEntityList'

                    mLEntityRepositoryRef:

                      $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList'

        - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO'

        - type: object

          properties:
@@ -169,6 +152,8 @@ components: 
                  properties:

                    mLEntityId:

                      type: string

                    inferenceType:

                      type: string  

                    candidateTrainingDataSource:

                      type: array

                      items:
@@ -188,6 +173,8 @@ components: 
                      type: boolean

                    suspendRequest:

                      type: boolean

                    mLEntityToTrainRef:

                      $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn'



    MLTrainingProcess-Single:

      allOf:
@@ -249,6 +236,42 @@ components: 
                      $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn'

                    lastTrainingRef:

                      $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn'

                    mLEnityGeneratedRef:

                      $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn'



    MLEntity-Single:

      allOf:

        - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top'

        - type: object

          properties:

            attributes:

              type: object

              properties:

                mLEntityId:

                  type: string

                inferenceType:

                  type: string

                mLEntityVersion:

                  type: string

                expectedRunTimeContext:

                  $ref: '#/components/schemas/MLContext'

                trainingContext:

                  $ref: '#/components/schemas/MLContext'

                runTimeContext:

                  $ref: '#/components/schemas/MLContext'   



    MLEntityRepository-Single:

      allOf:

        - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top'

        - type: object

          properties:

            attributes:

              type: object

              properties:

                mLRepositoryId:

                  type: string

            MLEntity:

              $ref: '#/components/schemas/MLEntity-Multiple'



#-------- Definition of JSON arrays for name-contained IOCs ----------------------
@@ -276,7 +299,14 @@ components: 
      type: array

      items:

        $ref: '#/components/schemas/MLTrainingReport-Single'



    MLEntity-Multiple:

      type: array

      items:

        $ref: '#/components/schemas/MLEntity-Single'

    MLEntityRepository-Multiple:

      type: array

      items:

        $ref: '#/components/schemas/MLEntityRepository-Single'



#-------- Definitions in TS 28.104 for TS 28.532 ---------------------------------
@@ -289,3 +319,6 @@ components: 
        - $ref: '#/components/schemas/MLTrainingRequest-Single'

        - $ref: '#/components/schemas/MLTrainingProcess-Single'

        - $ref: '#/components/schemas/MLTrainingReport-Single'

        - $ref: '#/components/schemas/MLEntity-Single'

        - $ref: '#/components/schemas/MLEntityRepository-Single'

OpenAPI/TS28312_IntentExpectations.yaml

0 → 100644
+648 −0

File added.

Preview size limit exceeded, changes collapsed.