Commit 53f26744 authored by ruiyue's avatar ruiyue
Browse files

Code Moderator resolves the conflict information manually 

Merge branch 'Integration_Rel19_SA5_159_YAML' into 'Rel19_CR0255_TS_28.312_Enhance_the_use_case_and_solution_to_support_radio_network_traffic_assurance_for_scheduled_events_scenario'

# Conflicts:
#   OpenAPI/TS28312_IntentExpectations.yaml
parents b6526cea 481be1ac

OpenAPI/TS28104_MdaNrm.yaml

+2 −0
Original line number Diff line number Diff line
@@ -56,6 +56,7 @@ components: 
          properties:

            areaScope:

              type: array

              uniqueItems: true

              items:

                $ref: 'TS28623_ComDefs.yaml#/components/schemas/GeoArea'
@@ -80,6 +81,7 @@ components: 
          type: string

        threshold:

          type: array

          uniqueItems: true

          items:

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

        analyticsPeriod:

OpenAPI/TS28104_MdaReport.yaml

+1 −0
Original line number Diff line number Diff line
@@ -56,6 +56,7 @@ components: 
                      type: string

                    mDAOutputs:

                      type: array

                      uniqueItems: true

                      items:

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

                    mDARequestRef:

OpenAPI/TS28312_IntentExpectations.yaml

+33 −4
Original line number Diff line number Diff line
@@ -77,12 +77,16 @@ components: 
              - $ref: '#/components/schemas/ULLatencyTarget'

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

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

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

              - $ref: 'TS28312_IntentNrm.yaml#/components/schemas/ExpectationTarget'

        expectationContexts:

          type: array

          uniqueItems: true

          items:

            $ref: 'TS28312_IntentNrm.yaml#/components/schemas/Context'

            type: object

            oneOf:

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

              - $ref: 'TS28312_IntentNrm.yaml#/components/schemas/Context'

      required:

        - expectationId                   

    EdgeServiceSupportExpectation:
@@ -207,6 +211,7 @@ components: 
            oneOf:

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

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

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

              - $ref: 'TS28312_IntentNrm.yaml#/components/schemas/Context'

    EdgeServiceSupportExpectationObject: 

      description: >-
@@ -621,6 +626,17 @@ components: 
            type: integer

            minItems: 1

            maxItems: 2

    NumberofUEsTarget:

      description: >-

        This data type is the "ExpectationTarget" data type with specialisations for NumberofUEsTarget.It describes 

        the number of UEs target for the Radio Service that the intent expectation is applied.

            - NumberofUEs

        targetCondition:

          type: string

          enum:

            - IS_LESS_THAN

        targetValueRange:

          type: integer

    DLThptPerUETarget:

      description: >-

        This data type is the "ExpectationTarget" data type with specialisations for DLThptPerUETarget. It describes the DL throughput target by the per UE for the
@@ -1211,11 +1227,24 @@ components: 
            - IS_EQUAL_TO

        contextValueRange:

          $ref: "TS28541_NrNrm.yaml#/components/schemas/Sst"

    PlmnInfoContext:

      description: >-

        This data type is the "ExpectationContext" data type with specialisations for PlmnInfoContext.It describes the PLMN supported by the Radio Service that the intent expectation is applied. In case of network slicing feature is supported, this also represents the S-NSSAI in the PLMN supported by the Radio Service.

      type: object

      properties:

        contextAttribute:

          type: string

          enum:

            - PlmnInfo

        contextCondition:

          type: string

          enum:

            - IS_ALL_OF

        contextValueRange:

          $ref: "TS28541_NrNrm.yaml#/components/schemas/PlmnInfo"

    SchedulingTimeContext:

      description: >-

        This data type is the "ExpectationContext" data type with specialisations for SchedulingTimeContext.It describes

        the scheduled times (including one-time interval, daily periodicity, weekly periodicity or monthly periodicity)

        for the IntentObject that the intent expectation is applied. 

        This data type is the "ExpectationContext" data type with specialisations for SchedulingTimeContext.It describes the scheduled times (including one-time interval, daily periodicity, weekly periodicity or monthly periodicity) for the IntentObject that the intent expectation is applied.

      type: object

      properties:

        contextAttribute:

OpenAPI/TS28312_IntentNrm.yaml

+3 −1
Original line number Diff line number Diff line
@@ -267,6 +267,8 @@ components: 
        - $ref: 'TS28623_ComDefs.yaml#/components/schemas/GeoCoordinate'

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

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

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

        - $ref: 'TS28541_NrNrm.yaml#/components/schemas/PlmnInfo'

    UEGroup:

      description: >-

        It describes the UE Group, which is

OpenAPI/TS28532_ProvMnS.yaml

+5 −6
Original line number Diff line number Diff line
@@ -203,13 +203,12 @@ paths: 
          in: query

          description: >-

            This parameter extends the set of targeted resources beyond the base

            resource identified with the path component of the URI. No scoping

            mechanism is specified in the present document.

            resource identified with the path component of the URI.

          required: false

          content:

            application/json:

              schema:

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

          style: form

          explode: true

        - name: filter

          in: query

          description: >-