Commit 810705f9 authored by sunse's avatar sunse
Browse files

manual fix the merge confliction for CR0737

parents bb32b49e 427d926d

OpenAPI/TS28541_5GcNrm.yaml

+41 −15
Original line number Diff line number Diff line
@@ -139,7 +139,7 @@ components: 
      properties:

        smfServingAreas:

          type: string

    SupportedDataSetId:

    SupportedDataSet:

      type: string

      description: any of enumrated value

      enum:
@@ -147,20 +147,22 @@ components: 
        - POLICY

        - EXPOSURE

        - APPLICATION

    Udrinfo:

      type: object

      properties:

        supportedDataSetIds:

          type: array

          items:

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

        nFSrvGroupId:

          type: string

        - A_PFD

        - A_AFTI

        - A_IPTV

        - A_BDT

        - A_SPD

        - A_EASD

        - A_AMI

        - P_UE

        - P_SCD

        - P_BDT

        - P_PLMNUE

        - P_NSSCD

    NFInfo:

      oneOf:

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

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

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

    NotificationType:      

      type: string

      enum:
@@ -705,6 +707,11 @@ components: 
      type: array

      items:

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

    SharedDataIdRange:

      type: object

      properties:

        pattern:

          type: string

    SupiRangeList:

      type: array

      items:
@@ -717,6 +724,14 @@ components: 
      type: array

      items:

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

    SupportedDataSetList:

      type: array

      items:

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

    SharedDataIdRangeList:

      type: array

      items:

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



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

    ProvMnS:
@@ -1206,14 +1221,25 @@ 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'

                    groupId:

                      type: string

                    supiRanges:

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

                    gpsiRanges:

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

                    externalGroupIdentifiersRanges:

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

                    supportedDataSets:

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

                    sharedDataIdRanges:

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



    UdsfFunction-Single:

      allOf:

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