Commit 30dd8eaf authored by ruiyue's avatar ruiyue
Browse files

Merge branch 'revert-f29523ad' into 'Integration_Rel19_SA5_162_YAML' 

Revert "Code Moderator manually merge MR1810"

See merge request !1890
parents f29523ad 8ce3d072

OpenAPI/TS28541_5GcNrm.yaml

+6 −121
Original line number Diff line number Diff line
@@ -583,63 +583,6 @@ components: 
            items:

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

            minItems: 1

    2G3GLocationArea:

      description: 2G/3G Location Area.

      type: object

      properties:

        lai:

          $ref: 'TS29571_CommonData.yaml#/components/schemas/LocationAreaId'

        rai:

          $ref: 'TS29571_CommonData.yaml#/components/schemas/RoutingAreaId'

    2G3GLocationAreaRange:

      description: 2G/3G Location Area Range.

      type: object

      properties:

        laiRange:

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

        raiRange:

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

    LocationAreaIdRange:

      description: Location Area ID Range.

      type: object

      required:

        - plmnId

        - startLac

        - endLac

      properties:

        plmnId:

          $ref: 'TS29571_CommonData.yaml#/components/schemas/PlmnId'

        startLac:

          type: string

          pattern: '^[A-Fa-f0-9]{4}$'

        endLac:

          type: string

          pattern: '^[A-Fa-f0-9]{4}$'

    RoutingAreaIdRange:

      description: Routing Area ID Range.

      type: object

      required:

        - plmnId

        - startLac

        - endLac

        - startRac

        - endRac

      properties:

        plmnId:

          $ref: 'TS29571_CommonData.yaml#/components/schemas/PlmnId'

        startLac:

          type: string

          pattern: '^[A-Fa-f0-9]{4}$'

        endLac:

          type: string

          pattern: '^[A-Fa-f0-9]{4}$'

        startRac:

          type: string

          pattern: '^[A-Fa-f0-9]{2}$'

        endRac:

          type: string

          pattern: '^[A-Fa-f0-9]{2}$'



    SelectionConditions:

      description: >

        It contains the set of conditions that shall be evaluated to determine whether a consumer
@@ -2536,43 +2479,12 @@ components: 
        supportedPfcpFeatures:

          type: string

          readOnly: true

        # upfEvents:

          # type: array

          uniqueItems: true

        upfEvents:

          type: array

          uniqueItems: true

          items:

            type: string

          minItems: 1

        2g3gLocationAreaList:

          type: array

          items:

            $ref: '#/components/schemas/2G3GLocationArea'

          minItems: 1

        2g3gLocationAreaRangeList:

          type: array

          items:

            $ref: '#/components/schemas/2G3GLocationAreaRange'

          minItems: 1

        preferredEpdgInfoList:

          type: array

          items:

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

          minItems: 1

        preferredWAgfInfoList:

          type: array

          items:

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

          minItems: 1

        preferredTngfInfoList:

          type: array

          items:

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

          minItems: 1

        preferredTwifInfoList:

          type: array

          items:

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

          minItems: 1

          # items:

            # $ref: 'TS29564_Nupf_EventExposure.yaml#/components/schemas/EventType'

          # minItems: 1



    PcfInfo:

      description: Information of a PCF NF Instance
@@ -3646,10 +3558,7 @@ components: 
      type: object

      required:

        - sNssai

      anyOf:

        - required: [ dnnUpfInfoList ]

        - required: [ dnnUpfInfoListId ]



        - dnnUpfInfoList

      properties:

        sNssai:

          $ref: 'TS29571_CommonData.yaml#/components/schemas/ExtSnssai'
@@ -3662,13 +3571,6 @@ components: 
        redundantTransport:

          type: boolean

          default: false

        interfaceUpfInfoList:

          type: array

          items:

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

          minItems: 1

        dnnUpfInfoListId:

          type: integer

    IpIndex:

      description: Represents the IP Index to be sent from UDM to the SMF (its value can be either an integer or a string)

      anyOf:
@@ -3735,23 +3637,6 @@ components: 
          additionalProperties:

            type: string

          minProperties: 1

        interfaceUpfInfoList:

          type: array

          items:

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

          minItems: 1

        privateIpv4AddressRangesPerIpDomain:

          description: >

            Map of private IPv4 Address Ranges Per Ip Domain, where the key of the map is the IP.

            Domain. When present, the value of each entry of the map shall contain a IPv4 private

            address ranges configured for that IP domain.

          type: object

          additionalProperties:

            type: array

            items:

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

            minItems: 1

          minProperties: 1

      not:

        required: [ networkInstance, dnaiNwInstanceList ]

    MnpfInfo: