Commit d7cefe29 authored by sunse's avatar sunse
Browse files

Merge branch 'Rel19_28.312_Add_generic_utility_function_support_yaml' into... 

Merge branch 'Rel19_28.312_Add_generic_utility_function_support_yaml' into 'Integration_Rel19_SA5_161_YAML'

CR0356 28.312 update intent reporting to support utility function

See merge request !1725
parents 6e4bf0a7 e410375e

OpenAPI/TS28312_IntentNrm.yaml

+107 −3
Original line number Diff line number Diff line
@@ -48,6 +48,8 @@ components: 
            $ref: "#/components/schemas/IntentMgmtPurpose"

          contextSelectivity:

            $ref: "#/components/schemas/Selectivity"

          consumerSatisfactionIndexThreshold:

            type: integer

          expectationSelectivity:

            $ref: "#/components/schemas/Selectivity"

          intentContexts:
@@ -77,6 +79,8 @@ components: 
            $ref: '#/components/schemas/IntentReportControl'

          intentReportReference:

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

          intentUtilityFormulaRef:

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

    IntentReport-Single:

      description: It represents intent report information from MnS producer to MnS consumer. 

      allOf:
@@ -94,6 +98,8 @@ components: 
            $ref: '#/components/schemas/IntentFeasibilityCheckReport'

          intentExplorationReport:

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

          intentUtilityReport:

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

          intentFulfilmentNegotiationReport:

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

          lastUpdatedTime:
@@ -114,11 +120,44 @@ components: 
            minItems: 1

            items:

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

          supportedExpectationTargetInfo:

            type: array

            items:

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

            uniqueItems: true

            minItems: 1

          Intent:

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

          IntentReport:  

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



          supportedUtilityList:

            type: array

            items:

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

            uniqueItems: true   

    IntentUtilityFormula-Single:

      description: >- 

       It represents an intent utility function instance.

      allOf:

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

      - type: object

        properties:

          utilityFunctionId:

            type: string

            uniqueItems: true

            minItems: 1

          utilityParameterList:

            type: array

            items:

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

            uniqueItems: true

            minItems: 1

          utilityScale:

            type: number

            minItems: 1

          utilityOffset:

            type: number

            minItems: 1

   #-------Definition of generic IOCs ----------#  



   #-------Definition of the generic IntentExpectation dataType ----------#
@@ -388,6 +427,7 @@ components: 
            - INTENT_FULFILMENT_REPORT

            - INTENT_CONFLICT_REPORT

            - INTENT_FEASIBILITY_CHECK_REPORT

            - INTENT_UTILITY_REPORT

        reportingConditions:

          description: >-

             It indicates the specified conditions for intent reporting.
@@ -527,6 +567,20 @@ components: 


   #-------Definition of the concrete IntentConflictReport dataType----------------#





#-------Definition of the generic IntentUtilityReport dataType----------------#

    IntentUtilityReport:

      description: >-

        It represents the utility function results.         

      type: object

      properties:

        utilityResultList:

          type: array

          uniqueItems: true

          items:

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

   #-------Definition of the concrete IntentUtilityReport dataType----------------#



   #-------Definition of the generic IntentFeasibilityCheckReport dataType----------------#

    IntentFeasibilityCheckReport:

      description: >-
@@ -735,6 +789,51 @@ components: 
            - $ref: '#/components/schemas/ValueRangeType'

   #-------Definition of the concrete IntentHandlingCapability dataType----------------#





   #-------Definition of the generic UtilityParameter dataType----------------#

    UtilityParameter:   

      description: >-

        It represents the inputs for the specified Intent Utility Function.

      type: object

      properties:

        parameterName:

          type: string

        parameterWeight:

          type: number

   #-------Definition of the concrete UtilityParameter dataType----------------#



   #-------Definition of the generic UtilityResult dataType----------------#

    UtilityResult:   

      description: >-

        It represents the inputs for the specified Intent Utility Function.

      type: object

      properties:

        utilityFunctionId:

          type: string

        utilityResult:

          type: number

   #-------Definition of the concrete UtilityResult dataType----------------#



   #-------Definition of the generic UtilityDefinition dataType----------------#

    UtilityDefinition:   

      description: >-

        It represents the inputs for the specified Intent Utility Function.

      type: object

      properties:

        utilityDefinitionId:

          type: string

        utilityDescription:

          type: string

        utilityParameterList:

          oneOf:

            - type: array

              uniqueItems: true

              minItems: 1

              items:

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

            - $ref: '#/components/schemas/UtilityParameter'

   #-------Definition of the concrete UtilityDefinition dataType----------------#



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



    Intent-Multiple:
@@ -752,6 +851,10 @@ components: 
      items:

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



    IntentUtilityFormula-Multiple:

      type: array

      items:

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



   #------Definition of JSON arrays for name-contained IOCs ---------------#
@@ -761,5 +864,6 @@ components: 
       - $ref: '#/components/schemas/IntentHandlingFunction-Single'       

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

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

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

   #----- Definitions in TS 28.312 for TS 28.532 --------------------------#