Commit d4c0caf7 authored by sunse's avatar sunse
Browse files

Merge branch 'TS28.541_Rel18_CR_1058_NRM_enhancements_for_NRFFunction_phase_4'...

Merge branch 'TS28.541_Rel18_CR_1058_NRM_enhancements_for_NRFFunction_phase_4' into 'Integration_Rel18_SA5_152_YAML'

TS28.541_Rel18_CR_1058_NRM_enhancements_for_NRFFunction

See merge request !846
parents 76aa399c 11248db3
Loading
Loading
Loading
Loading
Loading
+157 −12
Original line number Diff line number Diff line
@@ -2071,18 +2071,18 @@ components:
          # additionalProperties:
            # $ref: '#/components/schemas/NfInfo'
          # minProperties: 1
        # servedHssInfoList:
          # 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/HssInfo'
                # - $ref: 'TS29571_CommonData.yaml#/components/schemas/EmptyObject'
            # minProperties: 1
          # minProperties: 1
        servedHssInfoList:
          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/HssInfo'
                - $ref: 'TS29571_CommonData.yaml#/components/schemas/EmptyObject'
            minProperties: 1
          minProperties: 1
        servedUdsfInfo:
          description: A map (list of key-value pairs) where nfInstanceId serves as key
          type: object
@@ -2119,6 +2119,75 @@ components:
              - $ref: '#/components/schemas/SeppInfo'
              - $ref: 'TS29571_CommonData.yaml#/components/schemas/EmptyObject'
          minProperties: 1
        servedAanfInfoList:
          description: A map (list of key-value pairs) where NF Instance Id 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/AanfInfo'
                - $ref: 'TS29571_CommonData.yaml#/components/schemas/EmptyObject'
            minProperties: 1
        served5gDdnmfInfo:
          type: object
          additionalProperties:
            $ref: '#/components/schemas/5GDdnmfInfo'
          minProperties: 1
        servedMfafInfoList:
          type: object
          description: A map (list of key-value pairs) where NF Instance Id serves as key
          additionalProperties:
            $ref: '#/components/schemas/MfafInfo'
          minProperties: 1
        servedEasdfInfoList:
          type: object
          description: A map (list of key-value pairs) where NF Instance Id serves as key
          additionalProperties:
            type: object
            description: A map (list of key-value pairs) where a valid JSON string serves as key
            additionalProperties:
              $ref: '#/components/schemas/EasdfInfo'
            minProperties: 1
        servedDccfInfoList:
          type: object
          description: A map (list of key-value pairs) where NF Instance Id serves as key
          additionalProperties:
            $ref: '#/components/schemas/DccfInfo'
          minProperties: 1
        servedMbSmfInfoList:
          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/MbSmfInfo'
                - $ref: 'TS29571_CommonData.yaml#/components/schemas/EmptyObject'
            minProperties: 1
          minProperties: 1
        servedTsctsfInfoList:
          type: object
          description: A map (list of key-value pairs) where NF Instance Id serves as key
          additionalProperties:
            type: object
            description: A map (list of key-value pairs) where a valid JSON string serves as key
            additionalProperties:
              $ref: '#/components/schemas/TsctsfInfo'
            minProperties: 1
          minProperties: 1
        servedMbUpfInfoList:
          type: object
          description: A map (list of key-value pairs) where NF Instance Id serves as key
          additionalProperties:
            type: object
            description: A map (list of key-value pairs) where a valid JSON string serves as key
            additionalProperties:
              $ref: '#/components/schemas/MbUpfInfo'
            minProperties: 1
          minProperties: 1
        servedTrustAfInfo:
          type: object
          description: A map (list of key-value pairs) where NF Instance Id serves as key
@@ -2161,6 +2230,82 @@ components:
        blockedDurEndTime:
          $ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTime'

    5GDdnmfInfo:
      description: Information of an 5G DDNMF NF Instance
      type: object
      required:
        - plmnId
      properties:
        plmnId:
          $ref: 'TS29571_CommonData.yaml#/components/schemas/PlmnId'
    ImsiRange:
      description: >
        A range of IMSIs (subscriber identities), either based on a numeric range,
        or based on regular-expression matching
      type: object
      oneOf:
        - required: [ start, end ]
        - required: [ pattern ]
      properties:
        start:
          type: string
          pattern: '^[0-9]+$'
        end:
          type: string
          pattern: '^[0-9]+$'
        pattern:
          type: string
    NetworkNodeDiameterAddress:
      description: >
        This data type is a part of smsfDiameterAddress and it should be present
        whenever smsf supports Diameter protocol.
      type: object
      required:
        - name
        - realm
      properties:
        name:
          $ref: 'TS29571_CommonData.yaml#/components/schemas/DiameterIdentity'
        realm:
          $ref: 'TS29571_CommonData.yaml#/components/schemas/DiameterIdentity'
    HssInfo:
      description: Information of an HSS NF Instance
      type: object
      properties:
        groupId:
          $ref: 'TS29571_CommonData.yaml#/components/schemas/NfGroupId'
        imsiRanges:
          type: array
          items:
            $ref: '#/components/schemas/ImsiRange'
          minItems: 1
        imsPrivateIdentityRanges:
          type: array
          items:
            $ref: '#/components/schemas/IdentityRange'
          minItems: 1
        imsPublicIdentityRanges:
          type: array
          items:
            $ref: '#/components/schemas/IdentityRange'
          minItems: 1
        msisdnRanges:
          type: array
          items:
            $ref: '#/components/schemas/IdentityRange'
          minItems: 1
        externalGroupIdentifiersRanges:
          type: array
          items:
            $ref: '#/components/schemas/IdentityRange'
          minItems: 1
        hssDiameterAddress:
          $ref: '#/components/schemas/NetworkNodeDiameterAddress'
        additionalDiamAddresses:
          type: array
          items:
            $ref: '#/components/schemas/NetworkNodeDiameterAddress'
          minItems: 1
    GmlcInfo:
      description: Information of a GMLC NF Instance
      type: object