Commit 33311d88 authored by Mirko Cano Soveri's avatar Mirko Cano Soveri
Browse files

Merge branch 'Integration_Rel18_SA5_147_YAML' into 'Rel-18'

SA5#147 OpenAPI SS changes for Rel-18

See merge request !579
parents 2f32e9c3 29fa1f81
Loading
Loading
Loading
Loading
Loading
+38 −29
Original line number Diff line number Diff line
openapi: 3.0.1
info:
  title: MDA NRM
  version: 17.0.0
  version: 17.2.0
  description: >-
    OAS 3.0.1 specification of the MDA NRM
    © 2020, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC).
@@ -43,11 +43,9 @@ components:
        filterValue:
          type: string
        threshold:
          $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ThresholdInfo'
          $ref: '#/components/schemas/ThresholdInfo'
        analyticsPeriod:
          type: array
          items:
            $ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTime'
          $ref: '#/components/schemas/AnalyticsSchedule'
        timeOut:
          $ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTime'

@@ -61,7 +59,7 @@ components:
    ReportingTarget:
      $ref: 'TS28623_ComDefs.yaml#/components/schemas/Uri'

    AnalyticsScope:
    AnalyticsScopeType:
      oneOf:
        - type: object
          properties:
@@ -70,32 +68,43 @@ components:
        - type: object
          properties:
            areaScope:
              $ref: '#/components/schemas/GeoAreaList'

    GeoAreaList:
      type: array
      items:
        $ref: '#/components/schemas/GeoArea'
              $ref: 'TS28623_ComDefs.yaml#/components/schemas/GeoArea'

    GeoArea:
      type: object
    AnalyticsSchedule:
      oneOf:
        - type: object
          properties:
        coordinates:
            timeDurations:
              type: array
              items:
            $ref: '#/components/schemas/Coordinate'
        altitude:
          type: number
          format: float
                $ref: 'TS28104_MdaReport.yaml#/components/schemas/TimeWindow'
        - type: object
          properties:
            granularityPeriod:
              type: integer

    Coordinate:
    ThresholdInfo:
      type: object
      properties:
        latitude:
          $ref: 'TS28623_ComDefs.yaml#/components/schemas/Latitude'
        longitude:
          $ref: 'TS28623_ComDefs.yaml#/components/schemas/Longitude'

        monitoredMDAOutputIE:          
          type: string
        thresholdDirection:
          type: string
          enum:
            - UP
            - DOWN
            - UP_AND_DOWN
        thresholdValue:
          oneOf:
            - type: integer
            - $ref: 'TS28623_ComDefs.yaml#/components/schemas/Float'
        hysteresis:
          oneOf:
            - type: integer
              minimum: 0
            - type: number
              format: float
              minimum: 0

#-------- Definition of abstract IOCs --------------------------------------------

@@ -170,7 +179,7 @@ components:
                    reportingTarget:
                      $ref: '#/components/schemas/ReportingTarget'
                    analyticsScope:
                      $ref: '#/components/schemas/AnalyticsScope'
                      $ref: '#/components/schemas/AnalyticsScopeType'
                    startTime:
                      $ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTime'
                    stopTime:
+3 −3
Original line number Diff line number Diff line
openapi: 3.0.1
info:
  title: MDA Report
  version: 17.0.0
  version: 17.2.0
  description: >-
    OAS 3.0.1 specification of the MDA Report
    © 2020, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC).
@@ -43,9 +43,9 @@ components:
    TimeWindow:
      type: object
      properties:
        startTime:
        mDAOutputStartTime:
          $ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTime'
        endTime:
        mDAOutputEndTime:
          $ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTime'


+62 −47
Original line number Diff line number Diff line
openapi: 3.0.1
info:
  title: AI/ML NRM
  version: 17.0.0
  version: 17.3.0
  description: >-
    OAS 3.0.1 specification of the AI/ML NRM
    © 2020, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC).
@@ -15,26 +15,34 @@ components:

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

    AIMLEntityList:
    MLEntityList:
      type: array
      items:
        $ref: '#/components/schemas/AIMLEntity'
        $ref: '#/components/schemas/MLEntity'

    AIMLEntity:
    MLEntity:
      type: object
      properties:
        aIMLEntityId:
        mLEntityId:
          type: string
        inferenceType:
          type: string
        aIMLEntityVersion:
        mLEntityVersion:
          type: string
        expectedRunTimeContext:
          type: string
          $ref: '#/components/schemas/MLContext'
        trainingContext:
          type: string
          $ref: '#/components/schemas/MLContext'
        runTimeContext:
          type: string
          $ref: '#/components/schemas/MLContext'

    MLContext:
      type: object
      properties:
        inferenceEntityRef:
          $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList'
        dataProviderRef:
          $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList'

    RequestStatus:
      type: string
@@ -66,10 +74,10 @@ components:

    TrainingProcessMonitor:
      description: >-
        This data type is the "ProcessMonitor" data type defined in “genericNrm.yaml” with specialisations for usage in the "AIMLTrainingProcess".
        This data type is the "ProcessMonitor" data type defined in “genericNrm.yaml” with specialisations for usage in the "MLTrainingProcess".
      type: object
      properties:
        aIMLTrainingProcessId:
        mLTrainingProcessId:
          type: string
        status:
          type: string
@@ -112,8 +120,8 @@ components:
              $ref: '#/components/schemas/SubNetwork-Multiple'
            ManagedElement:
              $ref: '#/components/schemas/ManagedElement-Multiple'
            AIMLTrainingFunction:
              $ref: '#/components/schemas/AIMLTrainingFunction-Multiple'
            MLTrainingFunction:
              $ref: '#/components/schemas/MLTrainingFunction-Multiple'

    ManagedElement-Single:
      allOf:
@@ -125,10 +133,10 @@ components:
        - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedElement-ncO'
        - type: object
          properties:
            AIMLTrainingFunction:
              $ref: '#/components/schemas/AIMLTrainingFunction-Multiple'
            MLTrainingFunction:
              $ref: '#/components/schemas/MLTrainingFunction-Multiple'

    AIMLTrainingFunction-Single:
    MLTrainingFunction-Single:
      allOf:
        - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top'
        - type: object
@@ -138,19 +146,19 @@ components:
                - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-Attr'
                - type: object
                  properties:
                    aIMLEntityList:
                      $ref: '#/components/schemas/AIMLEntityList'
                    mLEntityList:
                      $ref: '#/components/schemas/MLEntityList'
        - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO'
        - type: object
          properties:
            AIMLTrainingRequest:
              $ref: '#/components/schemas/AIMLTrainingRequest-Multiple'
            AIMLTrainingProcess:
              $ref: '#/components/schemas/AIMLTrainingProcess-Multiple'
            AIMLTrainingReport:
              $ref: '#/components/schemas/AIMLTrainingReport-Multiple'
            MLTrainingRequest:
              $ref: '#/components/schemas/MLTrainingRequest-Multiple'
            MLTrainingProcess:
              $ref: '#/components/schemas/MLTrainingProcess-Multiple'
            MLTrainingReport:
              $ref: '#/components/schemas/MLTrainingReport-Multiple'

    AIMLTrainingRequest-Single:
    MLTrainingRequest-Single:
      allOf:
        - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top'
        - type: object
@@ -159,21 +167,21 @@ components:
              allOf:
                - type: object
                  properties:
                    aIMLEntityId:
                    mLEntityId:
                      type: string
                    candidateTraingDataSource:
                    candidateTrainingDataSource:
                      type: array
                      items:
                        type: string
                    traingDataQualityScore:
                    trainingDataQualityScore:
                      type: number
                      format: float
                    trainingRequestSource:
                      type: string
                      $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn'
                    requestStatus:
                      $ref: '#/components/schemas/RequestStatus'
                    expectedRuntimeContext:
                      $ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTime'
                      $ref: '#/components/schemas/MLContext'
                    performanceRequirements:
                      $ref: '#/components/schemas/PerformanceRequirements'
                    cancelRequest:
@@ -181,7 +189,7 @@ components:
                    suspendRequest:
                      type: boolean

    AIMLTrainingProcess-Single:
    MLTrainingProcess-Single:
      allOf:
        - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top'
        - type: object
@@ -190,7 +198,7 @@ components:
              allOf:
                - type: object
                  properties:
                    aIMLTrainingProcessId:
                    mLTrainingProcessId:
                      type: string
                    priority:
                      type: integer
@@ -208,7 +216,7 @@ components:
                      $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn'


    AIMLTrainingReport-Single:
    MLTrainingReport-Single:
      allOf:
        - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top'
        - type: object
@@ -217,7 +225,7 @@ components:
              allOf:
                - type: object
                  properties:
                    aIMLEntityId:
                    mLEntityId:
                      type: string
                    areConsumerTrainingDataUsed:
                      type: boolean
@@ -233,7 +241,14 @@ components:
                        $ref: '#/components/schemas/ModelPerformance'
                    areNewTrainingDataUsed:
                      type: boolean

                    trainingRequestRef:
                      $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList'
                    trainingProcessRef:
                      $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn'
                    trainingReportRef:
                      $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn'
                    lastTrainingRef:
                      $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn'

#-------- Definition of JSON arrays for name-contained IOCs ----------------------

@@ -245,22 +260,22 @@ components:
      type: array
      items:
        $ref: '#/components/schemas/ManagedElement-Single'
    AIMLTrainingFunction-Multiple:
    MLTrainingFunction-Multiple:
      type: array
      items:
        $ref: '#/components/schemas/AIMLTrainingFunction-Single'
    AIMLTrainingRequest-Multiple:
        $ref: '#/components/schemas/MLTrainingFunction-Single'
    MLTrainingRequest-Multiple:
      type: array
      items:
        $ref: '#/components/schemas/AIMLTrainingRequest-Single'
    AIMLTrainingProcess-Multiple:
        $ref: '#/components/schemas/MLTrainingRequest-Single'
    MLTrainingProcess-Multiple:
      type: array
      items:
        $ref: '#/components/schemas/AIMLTrainingProcess-Single'
    AIMLTrainingReport-Multiple:
        $ref: '#/components/schemas/MLTrainingProcess-Single'
    MLTrainingReport-Multiple:
      type: array
      items:
        $ref: '#/components/schemas/AIMLTrainingReport-Single'
        $ref: '#/components/schemas/MLTrainingReport-Single'


#-------- Definitions in TS 28.104 for TS 28.532 ---------------------------------
@@ -270,7 +285,7 @@ components:
        - $ref: '#/components/schemas/SubNetwork-Single'
        - $ref: '#/components/schemas/ManagedElement-Single'

        - $ref: '#/components/schemas/AIMLTrainingFunction-Single'
        - $ref: '#/components/schemas/AIMLTrainingRequest-Single'
        - $ref: '#/components/schemas/AIMLTrainingProcess-Single'
        - $ref: '#/components/schemas/AIMLTrainingReport-Single'
        - $ref: '#/components/schemas/MLTrainingFunction-Single'
        - $ref: '#/components/schemas/MLTrainingRequest-Single'
        - $ref: '#/components/schemas/MLTrainingProcess-Single'
        - $ref: '#/components/schemas/MLTrainingReport-Single'
+322 −120

File changed.

Preview size limit exceeded, changes collapsed.

+3 −5
Original line number Diff line number Diff line
openapi: 3.0.1
info:
  title: Fault Supervision MnS
  version: 17.1.0
  version: 17.2.0
  description: >-
    OAS 3.0.1 definition of the Fault Supervision MnS
    © 2021, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC).
    © 2022, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC).
    All rights reserved.
externalDocs:
  description: 3GPP TS 28.532; Generic management services
@@ -546,9 +546,7 @@ components:
        observedMeasurement:
          type: string
        observedValue:
          oneOf:
            - type: integer
            - $ref: 'TS28623_ComDefs.yaml#/components/schemas/Float'
          type: number
        thresholdLevel:
          $ref: '#/components/schemas/ThresholdLevelInd'
        armTime:
Loading