Commit 901844ab authored by sunse's avatar sunse
Browse files

Rel18 TS28.105 CR0147 align the stage 2 to update the stage 3

parent 86bdad61
Loading
Loading
Loading
Loading
+94 −87
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ components:
    MLContext:
      type: object
      properties:
        inferenceEntityRef:
        inferenceModelRef:
          $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList'
        dataProviderRef:
          $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList'
@@ -71,6 +71,9 @@ components:
          type: array
          items:
            $ref: 'TS28623_ThresholdMonitorNrm.yaml#/components/schemas/ThresholdInfo'
        managedActivationScope:
          $ref: '#/components/schemas/ManagedActivationScope'
          

    SupportedPerfIndicator:
      type: object
@@ -106,7 +109,7 @@ components:
    MLCapabilityInfo:
      type: object
      properties:
        inferenceType:
        aIMLInferenceName:
          type: string
        capabilityName:
          type: string
@@ -117,6 +120,8 @@ components:
    AvailMLCapabilityReport:
      type: object
      properties:
        availMLCapabilityReportID:
          type: string
        mLCapabilityVersionId:
          type: array
          items:
@@ -125,7 +130,7 @@ components:
          type: array
          items:
            $ref: '#/components/schemas/ModelPerformance'
        mLEntityRef:
        mLModelRef:
          $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList'

    InferenceOutput:
@@ -135,7 +140,7 @@ components:
          type: array
          items:
            type: string
        inferenceType:
        aIMLInferenceName:
          type: string
        inferenceOutputTime:
          type: array
@@ -156,8 +161,8 @@ components:
          $ref: '#/components/schemas/MLTrainingFunction-Multiple'
        MLTestingFunction:
          $ref: '#/components/schemas/MLTestingFunction-Multiple'
        MLEntityRepository:
          $ref: '#/components/schemas/MLEntityRepository-Multiple'
        MLModelRepository:
          $ref: '#/components/schemas/MLModelRepository-Multiple'
        MLUpdateFunction:
          $ref: '#/components/schemas/MLUpdateFunction-Multiple'
        AIMLInferenceFunction:
@@ -172,8 +177,8 @@ components:
          $ref: '#/components/schemas/MLTrainingFunction-Multiple'
        MLTestingFunction:
          $ref: '#/components/schemas/MLTestingFunction-Multiple'
        MLEntityRepository:
          $ref: '#/components/schemas/MLEntityRepository-Multiple'
        MLModelRepository:
          $ref: '#/components/schemas/MLModelRepository-Multiple'
        MLUpdateFunction:
          $ref: '#/components/schemas/MLUpdateFunction-Multiple'
        AIMLInferenceFunction:
@@ -193,7 +198,7 @@ components:
                - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-Attr'
                - type: object
                  properties:
                    mLEntityRepositoryRef:
                    mLModelRepositoryRef:
                      $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn'
        - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO'
        - type: object
@@ -206,6 +211,10 @@ components:
              $ref: '#/components/schemas/MLTrainingReport-Multiple'
            ThresholdMonitors:
              $ref: 'TS28623_ThresholdMonitorNrm.yaml#/components/schemas/ThresholdMonitor-Multiple'
            MLTestingRequest:
              $ref: '#/components/schemas/MLTestingRequest-Multiple'
            MLTestingReport:
              $ref: '#/components/schemas/MLTestingReport-Multiple'

    MLTrainingRequest-Single:
      allOf:
@@ -216,7 +225,7 @@ components:
              allOf:
                - type: object
                  properties:
                    inferenceType:
                    aIMLInferenceName:
                      type: string  
                    candidateTrainingDataSource:
                      type: array
@@ -238,9 +247,9 @@ components:
                      type: boolean
                    suspendRequest:
                      type: boolean                  
                    mLEntityToTrainRef:
                    mLModelRef:
                      $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn'
                    mLEntityCoordinationGroupToTrainRef:
                    mLModelCoordinationGroupRef:
                      $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn'

    MLTrainingProcess-Single:
@@ -267,12 +276,14 @@ components:
                      type: boolean
                    suspendProcess:
                      type: boolean
                    trainingRequestRef:
                    trainingRequestRef: ## Figure 7.3a.1.1.1-1 has no such pointer
                      $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList'
                    trainingReportRef:
                      $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn'
                    mLEntityRef:
                      $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList'
                    mLModelGeneratedRef:
                      $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn'
                    mLModelRef:  ## Figure 7.3a.1.1.1-1 is 1-0..1 mapping, hence should be single
                      $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn'

    MLTrainingReport-Single:
      allOf:
@@ -283,17 +294,11 @@ components:
              allOf:
                - type: object
                  properties:
                    areConsumerTrainingDataUsed:
                      type: string
                      enum:
                        - ALL
                        - PARTIALLY
                        - NONE
                    usedConsumerTrainingData:
                      type: array
                      items:
                        type: string
                    modelconfidenceIndication:
                    modelConfidenceIndication:
                      type: integer
                    modelPerformanceTraining:
                      type: array
@@ -313,11 +318,11 @@ components:
                      $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn'
                    lastTrainingRef:
                      $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn'
                    mLEnityGeneratedRef:
                    mLModelGeneratedRef:
                      $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn'
                    mLEntityCoordinationGroupGeneratedRef:
                    mLModelCoordinationGroupGeneratedRef:
                      $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn'
                    mLEntityRef:
                    mLModelRef:
                      $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList'

    MLTestingFunction-Single:
@@ -329,8 +334,8 @@ components:
              allOf:
                - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-Attr'
                - type: object
                  properties:
                    mLEntityRef:
                  properties:  ##FIXME pointer to MLModelCoordinationGroup missing
                    mLModelRef:
                      $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList'
        - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO'
        - type: object
@@ -348,6 +353,9 @@ components:
            attributes:
              allOf:
                - type: object
                  oneOf:
                    - required: [ requestStatus, mLModelToTestRef ]
                    - required: [ requestStatus, mLModelCoordinationGroupToTestRef ]
                  properties:
                    requestStatus:
                      $ref: '#/components/schemas/RequestStatus'
@@ -355,9 +363,9 @@ components:
                      type: boolean
                    suspendRequest:
                      type: boolean                  
                    mLEntityToTestRef:
                    mLModelRef:
                      $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn'
                    mLEntityCoordinationGroupToTestRef:
                    mLModelCoordinationGroupRef:
                      $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn'

    MLTestingReport-Single:
@@ -378,7 +386,7 @@ components:
                    testingRequestRef:
                      $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn'

    MLEntityLoadingRequest-Single:
    MLModelLoadingRequest-Single:
      allOf:
        - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top'
        - type: object
@@ -393,10 +401,10 @@ components:
                      type: boolean
                    suspendRequest:
                      type: boolean        
                    mLEntityToLoadRef:
                    mLModelToLoadRef:
                      $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn'

    MLEntityLoadingPolicy-Single:
    MLModelLoadingPolicy-Single:
      allOf:
        - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top'
        - type: object
@@ -405,14 +413,14 @@ components:
              allOf:
                - type: object
                  properties:
                    inferenceType:
                    aIMLInferenceName:
                      type: string
                    policyForLoading:
                      $ref: '#/components/schemas/AIMLManagementPolicy'
                    mLEntityRef:
                    mLModelRef:
                      $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList'

    MLEntityLoadingProcess-Single:
    MLModelLoadingProcess-Single:
      allOf:
        - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top'
        - type: object
@@ -427,16 +435,14 @@ components:
                      type: boolean
                    suspendProcess:
                      type: boolean
                    resumeProcess:
                      type: boolean
                    MLEntityLoadingRequestRef:
                    mLModelLoadingRequestRef:
                      $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn'
                    MLEntityLoadingPolicyRef:
                    mLModelLoadingPolicyRef:
                      $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn'
                    LoadedMLEntityRef:
                    loadedMLModelRef:
                      $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn'

    MLEntity-Single:
    MLModel-Single:
      allOf:
        - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top'
        - type: object
@@ -444,11 +450,11 @@ components:
            attributes:
              type: object
              properties:
                mLEntityId:
                mLModelId:
                  type: string
                inferenceType:
                aIMLInferenceName:
                  type: string
                mLEntityVersion:
                mLModelVersion:
                  type: string
                expectedRunTimeContext:
                  $ref: '#/components/schemas/MLContext'
@@ -464,27 +470,20 @@ components:
                    $ref: '#/components/schemas/MLCapabilityInfo'
                retrainingEventsMonitorRef:
                  $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn'
                sourceTrainedMLEntityRef:
                sourceTrainedMLModelRef:
                  $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn'

    MLEntityRepository-Single:
    MLModelRepository-Single:
      allOf:
        - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top'
        - type: object
          properties:
            attributes:
              type: object
              properties:
                mLEntityRef:
                  $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList'
        - type: object
          properties:
            MLEntity:
              $ref: '#/components/schemas/MLEntity-Multiple'
            MLEntityCoordinationGroup:
              $ref: '#/components/schemas/MLEntityCoordinationGroup-Multiple'
            MLModel:
              $ref: '#/components/schemas/MLModel-Multiple'
            MLModelCoordinationGroup:
              $ref: '#/components/schemas/MLModelCoordinationGroup-Multiple'
    
    MLEntityCoordinationGroup-Single:
    MLModelCoordinationGroup-Single:
      allOf:
        - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top'
        - type: object
@@ -492,7 +491,7 @@ components:
            attributes:
              type: object
              properties:
                memberMLEntityRefList:
                memberMLModelRefList:
                  $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList'

    ## 7.3a.4.1 IOC
@@ -508,7 +507,7 @@ components:
                   properties:
                     availMLCapabilityReport:
                       $ref: '#/components/schemas/AvailMLCapabilityReport'
                     mLEntityRef:
                     mLModelRef:
                       $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList'
        - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO'
        - type: object
@@ -548,7 +547,7 @@ components:
                  type: boolean 
                mLUpdateProcessRef:
                  $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn'
                mLEntityRef:
                mLModelRef:
                  $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList'

    MLUpdateProcess-Single:
@@ -561,7 +560,7 @@ components:
              properties:
                progressStatus:
                  $ref: '#/components/schemas/ProcessMonitor'
                mLEntityRef:
                mLModelRef:
                  $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList'
                mLUpdateRequestRef:
                  $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList'
@@ -578,7 +577,7 @@ components:
              properties:
                updatedMLCapability:
                  $ref: '#/components/schemas/AvailMLCapabilityReport'
                mLEntityRef:
                mLModelRef:
                  $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList'
                mLUpdateProcessRef:
                  $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn'
@@ -599,16 +598,24 @@ components:
                        - ACTIVATED
                        - DEACTIVATED
                    managedActivationScope:
                      $ref: '#/components/schemas/ManagedActivationScope'
                      $ref: '#/components/schemas/AIMLManagementPolicy'
                    usedByFunctionRefList:
                      $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList'
                    mLEntityRef:   # FIXME S5-240805,S5-240917 both define here
                    mLModelRef:
                      $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList'
        - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO'
        - type: object
          properties:
            AIMLInferenceReport:
              $ref: '#/components/schemas/AIMLInferenceReport-Multiple'
            MLModelLoadingRequest:
              $ref: '#/components/schemas/MLModelLoadingRequest-Multiple'
            MLModelLoadingProcess:
              $ref: '#/components/schemas/MLModelLoadingProcess-Multiple'
            MLModelLoadingPolicy:
              $ref: '#/components/schemas/MLModelLoadingPolicy-Multiple'
            MLModel:
              $ref: '#/components/schemas/MLModel-Multiple'

    AIMLInferenceReport-Single:
      allOf:
@@ -619,12 +626,12 @@ components:
              allOf:
                - type: object
                  properties:
                    inferenceOutputs:  #stage 2: attribute table name as: aimlInferenceOutputs  FIXME
                    inferenceOutputs:
                      type: array
                      items:
                        $ref: '#/components/schemas/InferenceOutput'
                      minItems: 1
                    mLEntityRef:
                    mLModelRef:
                      $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList'

    AIMLInferenceEmulationFunction-Single:
@@ -637,8 +644,8 @@ components:
                - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-Attr'
                - type: object
                  properties:
                    AIMLInferenceEmulationReportRefs: # FIXME stage 2 of IOC AIMLInferenceEmulationReport missing
                      $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList'
                    AIMLInferenceEmulationReport:
                      $ref: '#/components/schemas/AIMLInferenceReport-Multiple'
        - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO'

#-------- Definition of JSON arrays for name-contained IOCs ----------------------
@@ -659,18 +666,18 @@ components:
      type: array
      items:
        $ref: '#/components/schemas/MLTrainingReport-Single'
    MLEntity-Multiple:
    MLModel-Multiple:
      type: array
      items:
        $ref: '#/components/schemas/MLEntity-Single'
    MLEntityRepository-Multiple:
        $ref: '#/components/schemas/MLModel-Single'
    MLModelRepository-Multiple:
      type: array
      items:
        $ref: '#/components/schemas/MLEntityRepository-Single'
    MLEntityCoordinationGroup-Multiple:
        $ref: '#/components/schemas/MLModelRepository-Single'
    MLModelCoordinationGroup-Multiple:
      type: array
      items:
        $ref: '#/components/schemas/MLEntityCoordinationGroup-Single'
        $ref: '#/components/schemas/MLModelCoordinationGroup-Single'
    MLTestingFunction-Multiple:
      type: array
      items:
@@ -683,18 +690,18 @@ components:
      type: array
      items:
        $ref: '#/components/schemas/MLTestingRequest-Single'
    MLEntityLoadingRequest-Multiple:
    MLModelLoadingRequest-Multiple:
      type: array
      items:
        $ref: '#/components/schemas/MLEntityLoadingRequest-Single'
    MLEntityLoadingProcess-Multiple:
        $ref: '#/components/schemas/MLModelLoadingRequest-Single'
    MLModelLoadingProcess-Multiple:
      type: array
      items:
        $ref: '#/components/schemas/MLEntityLoadingProcess-Single'
    MLEntityLoadingPolicy-Multiple:
        $ref: '#/components/schemas/MLModelLoadingProcess-Single'
    MLModelLoadingPolicy-Multiple:
      type: array
      items:
        $ref: '#/components/schemas/MLEntityLoadingPolicy-Single'
        $ref: '#/components/schemas/MLModelLoadingPolicy-Single'
    MLUpdateFunction-Multiple:
      type: array
      items:
@@ -731,15 +738,15 @@ 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'
        - $ref: '#/components/schemas/MLEntityCoordinationGroup-Single'
        - $ref: '#/components/schemas/MLModel-Single'
        - $ref: '#/components/schemas/MLModelRepository-Single'
        - $ref: '#/components/schemas/MLModelCoordinationGroup-Single'
        - $ref: '#/components/schemas/MLTestingFunction-Single'
        - $ref: '#/components/schemas/MLTestingRequest-Single'
        - $ref: '#/components/schemas/MLTestingReport-Single'
        - $ref: '#/components/schemas/MLEntityLoadingRequest-Single'
        - $ref: '#/components/schemas/MLEntityLoadingProcess-Single'
        - $ref: '#/components/schemas/MLEntityLoadingPolicy-Single'
        - $ref: '#/components/schemas/MLModelLoadingRequest-Single'
        - $ref: '#/components/schemas/MLModelLoadingProcess-Single'
        - $ref: '#/components/schemas/MLModelLoadingPolicy-Single'

        - $ref: '#/components/schemas/MLUpdateFunction-Single'
        - $ref: '#/components/schemas/MLUpdateRequest-Single'