Commit bb32b49e authored by sunse's avatar sunse
Browse files

manual fix the merge confliction for CR0736

parents cb082682 0a61284a

OpenAPI/TS28541_5GcNrm.yaml

+46 −10
Original line number Diff line number Diff line
@@ -129,11 +129,6 @@ components: 
        $ref: 'TS28541_NrNrm.yaml#/components/schemas/NrTac'

    WeightFactor:

      type: integer

    UdmInfo:

      type: object

      properties:

        nFSrvGroupId:

          type: string

    AusfInfo:

      type: object

      properties:
@@ -163,7 +158,6 @@ components: 
          type: string

    NFInfo:

      oneOf:

        - $ref: '#/components/schemas/UdmInfo'

        - $ref: '#/components/schemas/AusfInfo'

        - $ref: '#/components/schemas/UpfInfo'

        - $ref: '#/components/schemas/Udrinfo'
@@ -687,6 +681,30 @@ components: 
          type: boolean

        nrV2x:

          type: boolean

    InternalGroupIdRange:

      type: object

      properties:

        start:

          type: string

        end:

          type: string

        pattern:

          type: string

    SuciInfo:

      type: object

      properties:

        routingInds: 

          type: array

          items:

            type: string

        hNwPubKeyIds:

          type: array

          items:

            type: integer

    SuciInfoList:

      type: array

      items:

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

    SupiRangeList:

      type: array

      items:
@@ -695,6 +713,10 @@ components: 
      type: array

      items:

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

    InternalGroupIdRangeList:

      type: array

      items:

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



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

    ProvMnS:
@@ -1139,18 +1161,32 @@ components: 
                - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-Attr'

                - type: object

                  properties:

                    plmnIdList:

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

                    pLMNInfoList:

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

                    sBIFqdn:

                      type: string

                    snssaiList:

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

                    managedNFProfile:

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

                    commModelList:

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

                    eCSAddrConfigInfo:

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

                    groupId:

                      type: string

                    supiRanges:

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

                    gpsiRanges:

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

                    externalGroupIdentifiersRanges:

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

                    routingIndicators:

                      type: array

                      items:

                        type: string

                    internalGroupIdentifiersRanges:

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

                    suciInfos:

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

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

        - type: object

          properties: