Commit 0d7d3478 authored by sunse's avatar sunse
Browse files

Merge branch '28.541_CR1141_Rel18_NRM_enhancements_for_NfInfo_and_PcscfInfo'... 

Merge branch '28.541_CR1141_Rel18_NRM_enhancements_for_NfInfo_and_PcscfInfo' into 'Integration_Rel18_SA5_153_YAML'

28.541_CR1141_Rel18_NRM_enhancements_for_NfInfo_and_PcscfInfo, Update TS28541_5GcNrm.yaml

See merge request !980
parents fa1e1a06 4c91e6b6

OpenAPI/TS28541_5GcNrm.yaml

+72 −18
Original line number Diff line number Diff line
@@ -2049,18 +2049,18 @@ components: 
              $ref: '#/components/schemas/NwdafInfo'

            minProperties: 1

          minProperties: 1

        # servedPcscfInfoList:

          # 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/PcscfInfo'

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

            # minProperties: 1

          # minProperties: 1

        servedPcscfInfoList:

          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/PcscfInfo'

                - $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
@@ -2077,12 +2077,12 @@ components: 
              - $ref: '#/components/schemas/LmfInfo'

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

          minProperties: 1

        # servedNfInfo:

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

          # type: object

          # additionalProperties:

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

          # minProperties: 1

        servedNfInfo:

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

          type: object

          additionalProperties:

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

          minProperties: 1

        servedHssInfoList:

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

          type: object
@@ -2761,6 +2761,60 @@ components: 
          minItems: 1

      required:

        - msisdnRanges

    PcscfInfo:

      description: Information of a P-CSCF NF Instance

      type: object

      properties:

        accessType:

          type: array

          items:

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

          minItems: 1

        dnnList:

          type: array

          items:

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

          minItems: 1

        gmFqdn:

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

        gmIpv4Addresses:

          type: array

          items:

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

          minItems: 1

        gmIpv6Addresses:

          type: array

          items:

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

          minItems: 1

        mwFqdn:

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

        mwIpv4Addresses:

          type: array

          items:

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

          minItems: 1

        mwIpv6Addresses:

          type: array

          items:

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

          minItems: 1

        servedIpv4AddressRanges:

          type: array

          items:

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

          minItems: 1

        servedIpv6PrefixRanges:

          type: array

          items:

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

          minItems: 1

    NfInfo:

      description: Information of a generic NF Instance

      type: object

      properties:

        nfType:

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



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

    ProvMnS: