Commit 5a946b7a authored by shumim's avatar shumim
Browse files

S5-240917：Input to DraftCR 28.105 Add relations for NRMs related to AI-ML inference functions

parent 38715213

OpenAPI/TS28105_AiMlNrm.yaml

+13 −44
Original line number Diff line number Diff line
@@ -102,10 +102,9 @@ components: 
        resultStateInfo:

          type: string

          

    MlManagementPolicy:

    AIMLManagementPolicy:

      description: >-

              This data type is the "ProcessMonitor" data type defined in “genericNrm.yaml” 

              with specialisations for usage in the "MLTrainingProcess".

              This data type represents the properties of a policy for AI/ML management.

      type: object

      properties:

        thresholdList:
@@ -202,8 +201,8 @@ components: 
              $ref: '#/components/schemas/MLEntityRepository-Multiple'

            MLUpdateFunction:

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

            AiMlInferenceCapability:

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

            AIMLInferenceFunction:

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



    ManagedElement-Single:

      allOf:
@@ -223,8 +222,8 @@ components: 
              $ref: '#/components/schemas/MLEntityRepository-Multiple'

            MLUpdateFunction:

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

            AiMlInferenceCapability:

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

            AIMLInferenceFunction:

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



    MLTrainingFunction-Single:

      allOf:
@@ -471,7 +470,7 @@ components: 
                    inferenceType:

                      type: string

                    policyForLoading:

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

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

                    mLEntityRef:

                      $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn'
@@ -644,7 +643,7 @@ components: 
                mLUpdateProcessRef:

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



    AiMlInferenceCapability-Single:

    AIMLInferenceFunction-Single:

      allOf:

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

        - type: object
@@ -661,33 +660,13 @@ components: 
                        - DEACTIVATED

                    managedActivationScope:

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

                    usedByFunctionRefList:

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

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

        - type: object

          properties:

            MLEntity:

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

    AiMlESCapability-Single:

      allOf:

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

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

        - type: object

          properties:

            attributes:

              type: object

              properties:

                DMROFunctionRef:

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

                # Todo for other attribute related to role 

                

    AiMlLBCapability-Single:

      allOf:

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

        # Todo for attribute related to role



    AiMlMOCapability-Single:

      allOf:

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

        # Todo for attribute related to role



#-------- Definition of JSON arrays for name-contained IOCs ----------------------
@@ -771,18 +750,10 @@ components: 
      type: array

      items:

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

    AiMlInferenceCapability-Multiple:

      type: array

      items:

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

    AiMlESCapability-Multiple:

      type: array

      items:

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

    AiMlLBCapability-Multiple:

    AIMLInferenceFunction-Multiple:

      type: array

      items:

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

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



#-------- Definitions in TS 28.104 for TS 28.532 ---------------------------------
@@ -810,6 +781,4 @@ components: 
        - $ref: '#/components/schemas/MLUpdateRequest-Single'

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

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

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

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

        - $ref: '#/components/schemas/AiMlLBCapability-Single'
 
        - $ref: '#/components/schemas/AIMLInferenceFunction-Single'