Commit 6be8ed6a 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 Rel-18 roll back changes to TS28.105

See merge request !632
parents 3f802345 45929c93

OpenAPI/TS28105_AiMlNrm.yaml

+25 −58
Original line number Diff line number Diff line 
openapi: 3.0.1

info:

  title: AI/ML NRM

  version: 18.0.0

  version: 17.4.0

  description: >-

    OAS 3.0.1 specification of the AI/ML NRM

    © 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC).
@@ -15,6 +15,27 @@ 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:
@@ -101,8 +122,6 @@ components: 
              $ref: '#/components/schemas/ManagedElement-Multiple'

            MLTrainingFunction:

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

            MLEntityRepository:

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



    ManagedElement-Single:

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

            MLTrainingFunction:

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

            MLEntityRepository:

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



    MLTrainingFunction-Single:

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

                - type: object

                  properties:

                    mLEntityRepositoryRef:

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

                    mLEntityList:

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

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

        - type: object

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

                    mLEntityId:

                      type: string

                    inferenceType:

                      type: string  

                    candidateTrainingDataSource:

                      type: array

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

                    suspendRequest:

                      type: boolean

                    mLEntityToTrainRef:

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



    MLTrainingProcess-Single:

      allOf:
@@ -236,42 +249,6 @@ 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 ----------------------
@@ -299,14 +276,7 @@ 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 ---------------------------------
@@ -319,6 +289,3 @@ 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'