Commit b214a9cf authored by sunse's avatar sunse
Browse files

manual fix the confliction for CR0601

parents de43f0cd c6d471f5

OpenAPI/5gcNrm.yaml

+59 −11
Original line number Diff line number Diff line
@@ -144,11 +144,6 @@ components: 
      properties:

        smfServingAreas:

          type: string

    AmfInfo:

      type: object

      properties:

        priority:

          type: integer

    SupportedDataSetId:

      type: string

      description: any of enumrated value
@@ -171,7 +166,6 @@ components: 
        - $ref: '#/components/schemas/UdmInfo'

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

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

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

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

    ManagedNFProfile:

      type: object
@@ -184,12 +178,46 @@ components: 
          type: string

        hostAddr:

          $ref: 'genericNrm.yaml#/components/schemas/HostAddr'

        allowedPLMNs:

          type: array

          items:

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

        allowedSNPNs:

          type: array

          items:

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

        allowedNfTypes:

          type: array

          items:

            $ref: 'genericNrm.yaml#/components/schemas/NFType'

        allowedNfDomains:

          type: array

          items: string

        allowedNSSAIs:

          type: array

          items:

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

        locality:

          type: string

        nFInfo:

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

        capacity:

          type: integer

        nfSetIdList:

          type: array

          items: string

        servingScope:

          type: array

          items: string

        nfSetRecoveryTimeList:

          type: array

          items:

            $ref: 'comDefs.yaml#/components/schemas/DateTime'

        scpDomains:

          type: array

          items: string

        vendorId:

          type: string

    SEPPType:

      type: string

      description: any of enumrated value
@@ -486,6 +514,14 @@ components: 
          items:

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

   

    GUAMInfo:

      type: object

      properties:

          pLMNId: 

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

          aMFIdentifier:

            type: integer   

            

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



    SubNetwork-Single:
@@ -586,10 +622,22 @@ components: 
                      $ref: '#/components/schemas/AmfIdentifier'

                    sBIFqdn:

                      type: string

                    interPlmnFQDN:

                      type: string

                    taiList:

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

                    taiRangeList:

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

                    weightFactor:

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

                    snssaiList:

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

                    cNSIIdList:

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

                    gUAMIdList: 

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

                    backupInfoAmfFailure:

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

                    backupInfoAmfRemoval:

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

                    amfSet:

                      $ref: 'genericNrm.yaml#/components/schemas/Dn'

                    managedNFProfile: