Commit 75477c22 authored by sunse's avatar sunse
Browse files

Merge branch... 

Merge branch 'TS28.541_Rel18_CR1018_NRM_enhancements_for_NRFFunction_and_AmfInfo_and_SmfInfo' into 'Integration_Rel18_SA5_151_YAML'

Ts28.541 rel18 cr1018 nrm enhancements for nrf function and amf info and smf info

See merge request !754
parents 6267e508 16d498a1

OpenAPI/TS28541_5GcNrm.yaml

+72 −52
Original line number Diff line number Diff line
@@ -1494,18 +1494,38 @@ components: 
        secondaryChfInstance:

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



    N2InterfaceAmfInfo:

      description: AMF N2 interface information

      type: object

      anyOf:

        - required: [ ipv4EndpointAddress ]

        - required: [ ipv6EndpointAddress ]

      properties:

        ipv4EndpointAddress:

          type: array

          items:

            $ref: 'TS28623_ComDefs.yaml#/components/schemas/Ipv4Addr'

          minItems: 1

        ipv6EndpointAddress:

          type: array

          items:

            $ref: 'TS28623_ComDefs.yaml#/components/schemas/Ipv6Addr'

          minItems: 1

        amfName:

            $ref: 'TS28623_ComDefs.yaml#/components/schemas/Fqdn'



    AmfInfo:

      description: Information of an AMF NF Instance

      type: object

      # required:

        # - amfSetId

        # - amfRegionId

        # - guamiList

      required:

        - amfSetId

        - amfRegionId

        - guamiList

      properties:

        # amfSetId:

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

        # amfRegionId:

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

        amfSetId:

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

        amfRegionId:

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

        guamiList:

          type: array

          items:
@@ -1531,13 +1551,13 @@ components: 
          items:

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

          minItems: 1

        # n2InterfaceAmfInfo:

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

        # amfOnboardingCapability:

          # type: boolean

          # default: false

        # highLatencyCom:

          # type: boolean

        n2InterfaceAmfInfo:

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

        amfOnboardingCapability:

          type: boolean

          default: false

        highLatencyCom:

          type: boolean



    SmfInfo:

      description: Information of an SMF NF Instance
@@ -1583,15 +1603,15 @@ components: 
          items:

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

          minItems: 1

        # smfOnboardingCapability:

          # type: boolean

          # default: false

          # deprecated: true

        # ismfSupportInd:

          # type: boolean

        # smfUPRPCapability:

          # type: boolean

          # default: false

        smfOnboardingCapability:

          type: boolean

          default: false

          deprecated: true

        ismfSupportInd:

          type: boolean

        smfUPRPCapability:

          type: boolean

          default: false



    UpfInfo:

      description: Information of an UPF NF Instance
@@ -2010,26 +2030,26 @@ components: 
                - $ref: 'TS29571_CommonData.yaml#/components/schemas/EmptyObject'

            minProperties: 1

          minProperties: 1

        # servedBsfInfo:

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

          # type: object

          # additionalProperties:

            # anyOf:

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

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

          # minProperties: 1

        # servedBsfInfoList:

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

          # type: object

          # additionalProperties:

            # description: A map (list of key-value pairs) where a valid JSON string serves as key

            # type: object

            # additionalProperties:

              # anyOf:

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

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

            # minProperties: 1

          # minProperties: 1

        servedBsfInfo:

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

          type: object

          additionalProperties:

            anyOf:

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

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

          minProperties: 1

        servedBsfInfoList:

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

          type: object

          additionalProperties:

            description: A map (list of key-value pairs) where a valid JSON string serves as key

            type: object

            additionalProperties:

              anyOf:

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

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

            minProperties: 1

          minProperties: 1

        servedChfInfo:

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

          type: object
@@ -2088,14 +2108,14 @@ components: 
                # - $ref: 'TS29571_CommonData.yaml#/components/schemas/EmptyObject'

            # minProperties: 1

          # minProperties: 1

        # servedGmlcInfo:

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

          # type: object

          # additionalProperties:

            # anyOf:

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

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

          # minProperties: 1

        servedGmlcInfo:

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

          type: object

          additionalProperties:

            anyOf:

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

              - $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