Commit 4e20ae12 authored by sunse's avatar sunse
Browse files

Merge branch 'TS28.541_Rel18_CR0894_NRM_enhancements_for_NRFFunction' into... 

Merge branch 'TS28.541_Rel18_CR0894_NRM_enhancements_for_NRFFunction' into 'Integration_Rel18_SA5_149_YAML'

Ts28.541 rel18 cr0894 nrm enhancements for nrf function

See merge request !619
parents ea29b57e 857fc6c2

OpenAPI/TS28541_5GcNrm.yaml

+69 −4
Original line number Diff line number Diff line
@@ -1480,6 +1480,71 @@ components: 
        secondaryChfInstance:

          $ref: 'TS29571_CommonData.yaml#/components/schemas/NfInstanceId'



    NrfInfo:

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

      type: object

      properties:

        servedUdrInfo:

          description: A map (list of key-value pairs) where nfInstanceId serves as key

          type: object

          additionalProperties:

            anyOf:

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

              - $ref: 'TS29571_CommonData.yaml#/components/schemas/EmptyObject'

          minProperties: 1

        servedUdmInfo:

          description: A map (list of key-value pairs) where nfInstanceId serves as key

          type: object

          additionalProperties:

            anyOf:

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

              - $ref: 'TS29571_CommonData.yaml#/components/schemas/EmptyObject'

          minProperties: 1

        servedAusfInfo:

          description: A map (list of key-value pairs) where nfInstanceId serves as key

          type: object

          additionalProperties:

            anyOf:

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

              - $ref: 'TS29571_CommonData.yaml#/components/schemas/EmptyObject'

          minProperties: 1

        servedNwdafInfo:

          description: A map (list of key-value pairs) where nfInstanceId serves as key

          type: object

          additionalProperties:

            anyOf:

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

              - $ref: 'TS29571_CommonData.yaml#/components/schemas/EmptyObject'

          minProperties: 1

        servedLmfInfo:

          description: A map (list of key-value pairs) where nfInstanceId serves as key

          type: object

          additionalProperties:

            anyOf:

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

              - $ref: 'TS29571_CommonData.yaml#/components/schemas/EmptyObject'

          minProperties: 1

        servedUdsfInfo:

          description: A map (list of key-value pairs) where nfInstanceId serves as key

          type: object

          additionalProperties:

            anyOf:

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

              - $ref: 'TS29571_CommonData.yaml#/components/schemas/EmptyObject'

          minProperties: 1

        servedTrustAfInfo:

          type: object

          description: A map (list of key-value pairs) where NF Instance Id serves as key

          additionalProperties:

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

          minProperties: 1

        servedNssaafInfo:

          type: object

          description: A map (list of key-value pairs) where NF Instance Id serves as key

          additionalProperties:

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

          minProperties: 1



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

    ProvMnS:

      oneOf:
@@ -2058,16 +2123,16 @@ 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

                    cNSIIdList:

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

                    nFProfileList:

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

                    snssaiList:

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

                    nrfInfo:

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

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

        - type: object

          properties: