Commit 8733465c authored by sunse's avatar sunse
Browse files

Merge branch... 

Merge branch 'TS28.541_Rel18_CR0973_fix_small_inconsistent_issues_in_stage2,_typo_in_stage_2_and_3' into 'Integration_Rel18_SA5_150_YAML'

TS28.541_Rel18_CR0973

See merge request !698
parents 20d622fc 331d8d29

OpenAPI/TS28541_5GcNrm.yaml

+8 −8
Original line number Diff line number Diff line
@@ -112,7 +112,7 @@ components: 
            $ref: 'TS28541_NrNrm.yaml#/components/schemas/Snssai'

    NFStatus:

      type: string

      description: any of enumrated value

      description: any of enumerated value

      enum:

        - REGISTERED

        - SUSPENDED
@@ -152,7 +152,7 @@ components: 
          minItems: 1

    SupportedDataSet:

      type: string

      description: any of enumrated value

      description: any of enumerated value

      enum:

        - SUBSCRIPTION

        - POLICY
@@ -190,7 +190,7 @@ components: 
          type: string

        n1MessageClass:  

          type: boolean

        n2InfroamtionClass:

        n2InformationClass:

          type: boolean

        versions:

          type: string
@@ -273,7 +273,7 @@ components: 
          type: string

    SEPPType:

      type: string

      description: any of enumrated value

      description: any of enumerated value

      enum:

        - CSEPP

        - PSEPP
@@ -290,7 +290,7 @@ components: 
        $ref: '#/components/schemas/SupportedFunc'

    CommModelType:

      type: string

      description: any of enumrated value

      description: any of enumerated value

      enum:

        - DIRECT_COMMUNICATION_WO_NRF

        - DIRECT_COMMUNICATION_WITH_NRF
@@ -533,9 +533,9 @@ components: 
          enum:

            - INACTIVE

            - ACTIVE

        activeEacThreshhold:

        activeEacThreshold:

          type: integer

        deactiveEacThreshhold:

        deactiveEacThreshold:

          type: integer

        numberofUEs:

          type: integer
@@ -675,7 +675,7 @@ components: 
    ProseCapability:

      type: object

      properties:

        proseDirectDiscovey:

        proseDirectDiscovery:

          type: boolean

        proseDirectCommunication:

          type: boolean

OpenAPI/TS28541_NrNrm.yaml

+6 −6
Original line number Diff line number Diff line
@@ -182,7 +182,7 @@ components: 
        timeDuration:

          type: integer



    UeAccProbilityDist:

    UeAccProbabilityDist:

      type: object

      properties:

        targetProbability:
@@ -190,7 +190,7 @@ components: 
        numberofpreamblessent:

          type: integer



    UeAccDelayProbilityDist:

    UeAccDelayProbabilityDist:

      type: object

      properties:

        targetProbability:
@@ -1418,10 +1418,10 @@ components: 
                  properties:

                    drachOptimizationControl:

                      type: boolean

                    ueAccProbilityDist:

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

                    ueAccDelayProbilityDist:

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

                    ueAccProbabilityDist:

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

                    ueAccDelayProbabilityDist:

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

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



    DMROFunction-Single:

OpenAPI/TS28541_SliceNrm.yaml

+5 −3
Original line number Diff line number Diff line
@@ -522,6 +522,8 @@ components: 
          v2XCommModels:

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

          coverageArea:

            type: array

            items:

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

          termDensity:

            $ref: '#/components/schemas/TermDensity'
@@ -641,7 +643,7 @@ components: 
      type: boolean

    RequestedReservationExpiration:

      description: >-

        An attribute which specifes MnS consuner's requirements for the validity period of the resource reservation.

        An attribute which specifies MnS consuner's requirements for the validity period of the resource reservation.

      type: string

    ResourceReservationStatus:

      description: >-
@@ -653,7 +655,7 @@ components: 
        - USED

    ReservationExpiration:

      description: >-

        An attribute which specifes the actual validity period of the resource reservation..

        An attribute which specifies the actual validity period of the resource reservation..

      type: string

    ReservationFailureReason:

      description: >-