Commit 2f13df09 authored by ruiyue's avatar ruiyue
Browse files

Merge branch... 

Merge branch 'Rel19_CR0260_TS_28.312_Enhance_the_intent_report_use_case_reqs_and_solution_to_support_implicit_intent_report_subscription_with_customized_requirements_SA5_159' into 'Integration_Rel19_SA5_159_YAML'

Rel19_CR0286_TS_28.312_Enhance_the_intent_report_use_case_reqs_and_solution_to_support_implicit_intent_report_subscription_with_customized_requirements

See merge request !1541
parents 165af5a7 f8055cbf

OpenAPI/TS28312_IntentNrm.yaml

+65 −5
Original line number Diff line number Diff line
@@ -70,11 +70,8 @@ components: 
            description: It expresses the priority of the stated intent within a MnS consumer.   

          intentPreemptionCapability:

            type: boolean

          observationPeriod:

            type: integer

            description: >- 

              It represents the observation period of the fulfilmentInfo for corresponding 

              ExpectationTargets, IntentExpectations and Intent.

          intentReportControl:

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

          intentReportReference:

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

    IntentReport-Single:
@@ -344,6 +341,69 @@ components: 
              - $ref: "#/components/schemas/ValueRangeType" 

   #-------Definition of the generic Context dataType----------------#



  #-------Definition of the generic IntentReportControl dataType----------------#

    IntentReportControl:

      description: >-

        It describes intent report subscription information

      type: object

      properties:

        reportRecipientAddress:

          description: >-

            It indicates the address of report recipient for MnS consumer

          type: string

        observationPeriod:

          description: >-

            It indicates the time period for which the fulfilment process is observed

            and at the end of which the fulfilmentInfo for corresponding

            ExpectationTargets, IntentExpectations and Intent is updated.

          type: integer

        expectedReportTypes:

          description: >-

            It indicates the type of IntentReports.

          type: string

          enum:

            - INTENT_FULFILMENT_REPORT

            - INTENT_CONFLICT_REPORT

            - INTENT_FEASIBILITY_CHECK_REPORT

        reportingConditions:

          description: >-

             It indicates the specified conditions for intent reporting.

          type: array

          items:

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

        reportingTargets:

          description: >-

            It indicates the specified targets needed to be reported.

          type: array

          items: 

            type: string

    ReportingCondition:

      description: >-

        It describes  the specified conditions for intent reporting.

      oneOf:

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

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

    TimeCondition:

      $ref: 'TS28623_GenericNrm.yaml#/components/schemas/SchedulingTime'

    TargetFulfilmentCondition:

      description: >-

        It indicates the specified conditions of target fulfilment for intent reporting.

      type: object

      properties:

        targetName:

          type: string

        targetCondition:

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

        targetValueRange:

          oneOf:

            - type: array

              uniqueItems: true

              items:

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

            - $ref: "#/components/schemas/ValueRangeType"      

   #-------Definition of the concrete IntentReportControl dataType----------------#





   #-------Definition of the generic IntentFulfilmentReport dataType----------------#

    IntentFulfilmentReport:

      description: >-