Commit c222db07 authored by sunse's avatar sunse
Browse files

manual fix the merge confliction for CR0670

parents f04e5025 785a37e2

OpenAPI/5gcNrm.yaml

+63 −5
Original line number Diff line number Diff line
@@ -563,6 +563,36 @@ components: 
      items:

        type: string



    DnnSmfInfoItem:

      type: object

      properties:

        dnn:

          type: string

        dnaiList:

          type: array

          items:

            type: string

    

    SNssaiSmfInfoItem:

      type: object

      properties:

        sNSSAI:

          $ref: 'nrNrm.yaml#/components/schemas/Snssai'

        dnnSmfInfoList:

          type: array

          items:

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

    

    IpAddr:

      type: object

      properties:

        ipv4Addr:

          type: string

        ipv6Addr:

          type: string

        ipv6Prefix:

          type: string



#-------- Definition of concrete IOCs --------------------------------------------



    SubNetwork-Single:
@@ -766,14 +796,42 @@ components: 
                - $ref: 'genericNrm.yaml#/components/schemas/ManagedFunction-Attr'

                - type: object

                  properties:

                    plmnIdList:

                      $ref: 'nrNrm.yaml#/components/schemas/PlmnIdList'

                    pLMNInfoList:

                      $ref: 'nrNrm.yaml#/components/schemas/PlmnInfoList'

                    nRTACList:

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

                    sBIFqdn:

                      type: string

                    snssaiList:

                      $ref: 'nrNrm.yaml#/components/schemas/SnssaiList'

                    sNssaiSmfInfoList:

                      type: array

                      items:

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

                    taiList:

                      type: array

                      items:

                        $ref: 'nrNrm.yaml#/components/schemas/Tai'

                    taiRangeList:

                      type: array

                      items:

                        $ref: 'nrNrm.yaml#/components/schemas/TaiRange'

                    pwgFqdn:

                      type: string

                    pgwAddrList:

                      type: array

                      items:

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

                    accessType:

                      $ref: 'https://forge.3gpp.org/rep/all/5G_APIs/raw/REL-16/TS29571_CommonData.yaml#/components/schemas/AccessType'

                    priority:

                      type: integer

                    cNSIIdList:

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

                    vsmfSupportInd:

                      type: boolean

                    pwgFqdnList:    

                      type: array

                      items: 

                        type: string

                    managedNFProfile:

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

                    commModelList: