Commit f8bece93 authored by yaoyiz's avatar yaoyiz
Browse files

Merge branch... 

Merge branch 'TS28.104_Rel-17_CR0025_Correction_of_definition_for_analytics_window' into 'Integration_Rel17_SA5_146_YAML'

Ts28.104 rel 17 cr0025 correction of definition for analytics window

See merge request sa5/MnS!481
parents 0e222d15 cbbf6484

OpenAPI/TS28104_MdaNrm.yaml

+17 −6
Original line number Diff line number Diff line 
openapi: 3.0.1

info:

  title: MDA NRM

  version: 17.0.0

  version: 17.2.0

  description: >-

    OAS 3.0.1 specification of the MDA NRM

    © 2020, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC).
@@ -45,9 +45,7 @@ components: 
        threshold:

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

        analyticsPeriod:

          type: array

          items:

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

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

        timeOut:

          $ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTime'
@@ -61,7 +59,7 @@ components: 
    ReportingTarget:

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



    AnalyticsScope:

    AnalyticsScopeType:

      oneOf:

        - type: object

          properties:
@@ -96,6 +94,19 @@ components: 
        longitude:

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



    AnalyticsSchedule:

      oneOf:

        - type: object

          properties:

            timeDurations:

              type: array

              items:

                $ref: 'TS28104_MdaReport.yaml#/components/schemas/TimeWindow'

        - type: object

          properties:

            granularityPeriod:

              type: integer





#-------- Definition of abstract IOCs --------------------------------------------
@@ -170,7 +181,7 @@ components: 
                    reportingTarget:

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

                    analyticsScope:

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

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

                    startTime:

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

                    stopTime:

OpenAPI/TS28104_MdaReport.yaml

+3 −3
Original line number Diff line number Diff line 
openapi: 3.0.1

info:

  title: MDA Report

  version: 17.0.0

  version: 17.2.0

  description: >-

    OAS 3.0.1 specification of the MDA Report

    © 2020, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC).
@@ -43,9 +43,9 @@ components: 
    TimeWindow:

      type: object

      properties:

        startTime:

        mDAOutputStartTime:

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

        endTime:

        mDAOutputEndTime:

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