Commit 4b51a91d authored by nakimuli's avatar nakimuli
Browse files

Merge branch 'Integration_Rel17_SA5_146_YAML' into... 

Merge branch 'Integration_Rel17_SA5_146_YAML' into 'TS28.312_Rel-17_CR0006_Correction_to_Stage_3_and_Stage_2_definitions_for_Intent_Driven_Management'

# Conflicts:
#   OpenAPI/TS28312_IntentNrm.yaml
parents 1c60a423 e2cf11dd

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'

OpenAPI/TS28312_IntentNrm.yaml

+33 −33
Original line number Diff line number Diff line
@@ -214,11 +214,11 @@ components: 
    Condition:

      type: string

      enum:

        - Is_equal_to

        - Is_less_than

        - Is_greater_than

        - Is_within_the_range

        - Is_outside_the_range

        - IS_EQUAL_TO

        - IS_LESS_THAN

        - IS_GREATER_THAN

        - IS_WITHIN_RANGE

        - IS_OUTSIDE_RANGE

    FulfilStatus:

      type: string

      enum:
@@ -308,7 +308,7 @@ components: 
        targetCondition:

          type: string

          enum:

            - Is_less_than

            - IS_LESS_THAN

        targetValueRange:

          type: integer

          minimum: 0
@@ -329,7 +329,7 @@ components: 
        contextCondition:

          type: string

          enum:

            - Is_less_than

            - IS_LESS_THAN

        contextValueRange:

          type: number

    LowSINRRatioTarget:
@@ -344,7 +344,7 @@ components: 
        targetCondition:

          type: string

          enum:

            - Is_less_than

            - IS_LESS_THAN

        targetValueRange:

          type: integer

          minimum: 0
@@ -365,7 +365,7 @@ components: 
        contextCondition:

          type: string

          enum:

            - Is_less_than

            - IS_LESS_THAN

        contextValueRange:

          type: integer

    AveULRANUEThptTarget:
@@ -380,7 +380,7 @@ components: 
        targetCondition:

          type: string

          enum:

            - Is_greater_than

            - IS_GREATER_THAN

        targetValueRange:

          type: integer

        targetFulfilmentInfo:
@@ -397,7 +397,7 @@ components: 
        targetCondition:

          type: string

          enum:

            - Is_greater_than

            - IS_GREATER_THAN

        targetValueRange:

          type: integer

        targetFulfilmentInfo:
@@ -414,7 +414,7 @@ components: 
        targetCondition:

          type: string

          enum:

            - Is_less_than

            - IS_LESS_THAN

        targetValueRange:

          type: integer

          minimum: 0
@@ -450,7 +450,7 @@ components: 
        targetCondition:

          type: string

          enum:

            - Is_less_than

            - IS_LESS_THAN

        targetValueRange:

          type: integer

          minimum: 0
@@ -471,7 +471,7 @@ components: 
        contextCondition:

          type: string

          enum:

            - Is_less_than

            - IS_LESS_THAN

        contextValueRange:

          type: number

    DLThptPerUETarget:
@@ -486,7 +486,7 @@ components: 
        targetCondition:

          type: string

          enum:

            - Is_greater_than

            - IS_GREATER_THAN

        targetValueRange:

          $ref: "TS28541_SliceNrm.yaml#/components/schemas/XLThpt"

    ULThptPerUETarget:
@@ -501,7 +501,7 @@ components: 
        targetCondition:

          type: string

          enum:

            - Is_greater_than

            - IS_GREATER_THAN

        targetValueRange:

          $ref: "TS28541_SliceNrm.yaml#/components/schemas/XLThpt"

    DLLatencyTarget:
@@ -516,7 +516,7 @@ components: 
        targetCondition:

          type: string

          enum:

            - Is_less_than

            - IS_LESS_THAN

        targetValueRange:

          type: integer

    ULLatencyTarget:
@@ -531,7 +531,7 @@ components: 
        targetCondition:

          type: string

          enum:

            - Is_less_than

            - IS_LESS_THAN

        targetValueRange:

          type: integer

    MaxNumberofUEsTarget:
@@ -546,7 +546,7 @@ components: 
        targetCondition:

          type: string

          enum:

            - Is_less _than

            - IS_LESS_THAN

        targetValueRange:

          type: integer

    ActivityFactorTarget:
@@ -561,7 +561,7 @@ components: 
        targetCondition:

          type: string

          enum:

            - Is_equal _than

            - IS_EQUAL_TO

        targetValueRange:

          type: integer

    UESpeedTarget:
@@ -576,7 +576,7 @@ components: 
        targetCondition:

          type: string

          enum:

            - Is_less _than

            - IS_LESS_THAN

        targetValueRange:

          type: integer

   #-------Definition of the concrete ExpectationTarget  dataType----------#
@@ -607,7 +607,7 @@ components: 
        contextCondition:

          type: string

          enum:

            - Is_within_the_range

            - IS_WITHIN_RANGE

        contextValueRange:

          type: array

          items:
@@ -626,7 +626,7 @@ components: 
        contextCondition:

          type: string

          enum:

            - Is_within_the_range

            - IS_WITHIN_RANGE

        contextValueRange:

          type: array

          items:
@@ -643,7 +643,7 @@ components: 
        contextCondition:

          type: string

          enum:

            - Is_within_the_range

            - IS_WITHIN_RANGE

        contextValueRange:

          type: array

          items:
@@ -660,7 +660,7 @@ components: 
        contextCondition:

          type: string

          enum:

            - Is_within_the_range

            - IS_WITHIN_RANGE

        contextValueRange:

          type: array

          items:
@@ -677,7 +677,7 @@ components: 
        contextCondition:

          type: string

          enum:

            - Is_within_the_range

            - IS_WITHIN_RANGE

        contextValueRange:

          type: array

          items:
@@ -698,7 +698,7 @@ components: 
        contextCondition:

          type: string

          enum:

            - Is_equal_than

            - IS_EQUAL_TO

        contextValueRange:

          type: array

          items:
@@ -715,7 +715,7 @@ components: 
        contextCondition:

          type: string

          enum:

            - Is_equal_than

            - IS_EQUAL_TO

        contextValueRange:

          type: array

          items:
@@ -732,7 +732,7 @@ components: 
        contextCondition:

          type: string

          enum:

            - Is_within_the_range

            - IS_WITHIN_RANGE

        contextValueRange:

          type: array

          items:
@@ -767,7 +767,7 @@ components: 
        contextCondition:

          type: string

          enum:

            - Is_equal_than

            - IS_EQUAL_TO

        contextValueRange:

          type: string

    ServiceEndTimeContext:
@@ -782,7 +782,7 @@ components: 
        contextCondition:

          type: string

          enum:

            - Is_equal_than

            - IS_EQUAL_TO

        contextValueRange:

          type: string

    UEMobilityLevelContext:
@@ -797,7 +797,7 @@ components: 
        contextCondition:

          type: string

          enum:

            - Is_within_the_range

            - IS_WITHIN_RANGE

        contextValueRange:

          type: array

          items:
@@ -814,7 +814,7 @@ components: 
        contextCondition:

          type: string

          enum:

            - Is_within_the_range

            - IS_WITHIN_RANGE

        contextValueRange:

          type: array

          items:

OpenAPI/TS28532_ProvMnS.yaml

+4 −40
Original line number Diff line number Diff line
@@ -301,52 +301,16 @@ paths: 
              schema:

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

    delete:

      summary: Deletes one or multiple resources

      summary: Deletes one resource

      description: >-

        With HTTP DELETE resources are deleted. The resources to be deleted are

        With HTTP DELETE one resource is deleted. The resources to be deleted is

        identified with the target URI.

      parameters:

        - name: scope

          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.

          required: false

          schema:

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

          style: form

          explode: true

        - name: filter

          in: query

          description: >-

            This parameter reduces the targeted set of resources by applying a

            filter to the scoped set of resource representations. Only resources

            representations for which the filter construct evaluates to "true"

            are returned. No filter language is specified in the present

            document.

          required: false

          schema:

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

      responses:

        '200':

          description: >-

            Success case ("200 OK").

            This status code shall be returned, when query parameters are present in

            the request and one or multiple resources are deleted.

            The URIs of the deleted resources are returned in the response message body.

        '204':

          description: >-

            Success case ("204 No Content").

            This status code shall be returned, when no query parameters are present in

            the request and only one resource is deleted.

            The message body is empty.

          content:

            application/json:

              schema:

                type: array

                items:

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

            This status code is returned, when the resource has been successfully deleted.

            The response body is empty.

        default:

          description: Error case.

          content:

OpenAPI/TS28541_NrNrm.yaml

+7 −5
Original line number Diff line number Diff line
@@ -823,16 +823,18 @@ components: 
                      $ref: '#/components/schemas/GnbName'

                    plmnId:

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

                    x2BlackList:

                    x2BlockList:

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

                    xnBlackList:

                    xnBlockList:

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

                    x2WhiteList:

                    x2AllowList:

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

                    xnWhiteList:

                    xnAllowList:

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

                    x2XnHOBlackList:

                    x2HOBlackList:

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

                    xnHOBlackList:

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

                    mappingSetIDBackhaulAddress:

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

                    tceMappingInfoList: