Commit fda41446 authored by sunse's avatar sunse
Browse files

Ts28.541 rel18 cr1019 nrm enhancements for upf info and pcf info and net info

parent 0ab30dc8
Loading
Loading
Loading
Loading
+123 −9
Original line number Diff line number Diff line
@@ -1596,14 +1596,14 @@ components:
    UpfInfo:
      description: Information of an UPF NF Instance
      type: object
      # required:
        # - sNssaiUpfInfoList
      required:
        - sNssaiUpfInfoList
      properties:
        # sNssaiUpfInfoList:
          # type: array
          # items:
            # $ref: '#/components/schemas/SnssaiUpfInfoItem'
          # minItems: 1
        sNssaiUpfInfoList:
          type: array
          items:
            $ref: '#/components/schemas/SnssaiUpfInfoItem'
          minItems: 1
        smfServingArea:
          type: array
          items:
@@ -1617,8 +1617,8 @@ components:
        iwkEpsInd:
          type: boolean
          default: false
        # sxaInd:
          # type: boolean
        sxaInd:
          type: boolean
        pduSessionTypes:
          type: array
          items:
@@ -1669,6 +1669,95 @@ components:
            # $ref: 'TS29564_Nupf_EventExposure.yaml#/components/schemas/EventType'
          # minItems: 1

    # SnssaiUpfInfoItem/IpIndex/DnnUpfInfoItem stage2/3 introduced in SnssaiUpfInfoItem is introduced in CR1020 (via S5-236244)
    # the stage 3 for these threes are only for validation. When merged in integration branch,
    # the stage 3 for these three shall only keep one copy
    SnssaiUpfInfoItem:
      description: Set of parameters supported by UPF for a given S-NSSAI
      type: object
      required:
        - sNssai
        - dnnUpfInfoList
      properties:
        sNssai:
          $ref: 'TS29571_CommonData.yaml#/components/schemas/ExtSnssai'
        dnnUpfInfoList:
          type: array
          items:
            $ref: '#/components/schemas/DnnUpfInfoItem'
          minItems: 1
        redundantTransport:
          type: boolean
          default: false
    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:
        - type: integer
        - type: string
    DnnUpfInfoItem:
      description: Set of parameters supported by UPF for a given DNN
      type: object
      required:
        - dnn
      properties:
        dnn:
          $ref: 'TS29571_CommonData.yaml#/components/schemas/Dnn'
        dnaiList:
          type: array
          items:
            $ref: 'TS29571_CommonData.yaml#/components/schemas/Dnai'
          minItems: 1
        pduSessionTypes:
          type: array
          items:
            $ref: 'TS29571_CommonData.yaml#/components/schemas/PduSessionType'
          minItems: 1
        ipv4AddressRanges:
          type: array
          items:
            $ref: '#/components/schemas/Ipv4AddressRange'
          minItems: 1
        ipv6PrefixRanges:
          type: array
          items:
            $ref: '#/components/schemas/Ipv6PrefixRange'
          minItems: 1
        natedIpv4AddressRanges:
          type: array
          items:
            $ref: '#/components/schemas/Ipv4AddressRange'
          minItems: 1
        natedIpv6PrefixRanges:
          type: array
          items:
            $ref: '#/components/schemas/Ipv6PrefixRange'
          minItems: 1
        ipv4IndexList:
          type: array
          items:
            $ref: '#/components/schemas/IpIndex'
          minItems: 1
        ipv6IndexList:
          type: array
          items:
            $ref: '#/components/schemas/IpIndex'
          minItems: 1
        networkInstance:
          description: >
            The N6 Network Instance associated with the S-NSSAI and DNN.
          type: string
        dnaiNwInstanceList:
          description: >
            Map of network instance per DNAI for the DNN, where the key of the map is the DNAI.
            When present, the value of each entry of the map shall contain a N6 network instance
            that is configured for the DNAI indicated by the key.
          type: object
          additionalProperties:
            type: string
          minProperties: 1
      not:
        required: [ networkInstance, dnaiNwInstanceList ]

    PcfInfo:
      description: Information of a PCF NF Instance
      type: object
@@ -1704,6 +1793,25 @@ components:
          $ref: '#/components/schemas/ProseCapability'
        v2xCapability:
          $ref: '#/components/schemas/V2xCapability'
        a2xSupportInd:
          type: boolean
          default: false
        a2xCapability:
          $ref: '#/components/schemas/A2xCapability'          
        rangingSlPosSupportInd:
          type: boolean
          default: false                    

    A2xCapability:
      description: Information of the supported A2X Capability by the PCF
      type: object
      properties:
        lteA2x:
          type: boolean
          default: false
        nrA2x:
          type: boolean
          default: false

    NefInfo:
      description: Information of an NEF NF Instance
@@ -1751,6 +1859,12 @@ components:
        uasNfFunctionalityInd:
          type: boolean
          default: false
        multiMemAfSessQosInd:
          type: boolean
          default: false
        memberUESelAssistInd:
          type: boolean
          default: false          

    NrfInfo:
      description: Information of an NRF NF Instance, used in hierarchical NRF deployments