Commit 9904ef5e authored by sunse's avatar sunse
Browse files

Merge branch 'TS28.541_Rel18_CR0962_NRM_enhancements_for_BSFFunction' into...

Merge branch 'TS28.541_Rel18_CR0962_NRM_enhancements_for_BSFFunction' into 'Integration_Rel18_SA5_150_YAML'

TS28.541_Rel18_CR0962

See merge request !710
parents 60ec2ed5 0bd66287
Loading
Loading
Loading
Loading
Loading
+74 −1
Original line number Diff line number Diff line
@@ -1623,6 +1623,47 @@ components:
          items:
            $ref: '#/components/schemas/InternalGroupIdRange'

    BsfInfo:
      description: Information of a BSF NF Instance
      type: object
      properties:
        dnnList:
          type: array
          items:
            $ref: 'TS29571_CommonData.yaml#/components/schemas/Dnn'
          minItems: 0
        ipDomainList:
          type: array
          items:
            type: string
          minItems: 0
        ipv4AddressRanges:
          type: array
          items:
            $ref: '#/components/schemas/Ipv4AddressRange'
          minItems: 0
        ipv6PrefixRanges:
          type: array
          items:
            $ref: '#/components/schemas/Ipv6PrefixRange'
          minItems: 0
        rxDiamHost:
          $ref: 'TS29571_CommonData.yaml#/components/schemas/DiameterIdentity'
        rxDiamRealm:
          $ref: 'TS29571_CommonData.yaml#/components/schemas/DiameterIdentity'
        groupId:
          $ref: 'TS29571_CommonData.yaml#/components/schemas/NfGroupId'
        supiRanges:
          type: array
          items:
            $ref: '#/components/schemas/SupiRange'
          minItems: 0
        gpsiRanges:
          type: array
          items:
            $ref: '#/components/schemas/IdentityRange'
          minItems: 0            
 
    AanfInfo:
      description: Represents the information relative to an AAnF NF Instance.
      type: object
@@ -1748,6 +1789,8 @@ components:
              $ref: '#/components/schemas/TsctsfFunction-Multiple'
            AANFFunction:
              $ref: '#/components/schemas/AanfFunction-Multiple'
            BSFFunction:
              $ref: '#/components/schemas/BsfFunction-Multiple'            

    AmfFunction-Single:
      allOf:
@@ -3615,6 +3658,7 @@ components:
                      $ref: 'TS28541_NrNrm.yaml#/components/schemas/LocalAddress'
                    remoteAddress:
                      $ref: 'TS28541_NrNrm.yaml#/components/schemas/RemoteAddress'

    AanfFunction-Single:
      allOf:
        - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top'
@@ -3739,7 +3783,7 @@ components:
                      $ref: '#/components/schemas/ManagedNFProfile'
                    commModelList:
                      $ref: '#/components/schemas/CommModelList'
                    TsctsfInfo:
                    tsctsfInfo:
                      $ref: '#/components/schemas/TsctsfInfo'
        - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO'
        - type: object
@@ -3842,6 +3886,30 @@ components:
                    remoteAddress:
                      $ref: 'TS28541_NrNrm.yaml#/components/schemas/RemoteAddress'

    BsfFunction-Single:
      allOf:
        - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top'
        - type: object
          properties:
            attributes:
              allOf:
                - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-Attr'
                - type: object
                  properties:
                    pLMNInfoList:
                      $ref: 'TS28541_NrNrm.yaml#/components/schemas/PlmnInfoList'
                    sBIFqdn:
                      type: string
                    cNSIIdList:
                      $ref: '#/components/schemas/CNSIIdList'
                    managedNFProfile:
                      $ref: '#/components/schemas/ManagedNFProfile'
                    commModelList:
                      $ref: '#/components/schemas/CommModelList'
                    bsfInfo:
                      $ref: '#/components/schemas/BsfInfo'
        - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO'

#-------- Definition of JSON arrays for name-contained IOCs ----------------------

    SubNetwork-Multiple:
@@ -4229,6 +4297,10 @@ components:
      type: array
      items:
        $ref: '#/components/schemas/AanfFunction-Single'
    BsfFunction-Multiple:
      type: array
      items:
        $ref: '#/components/schemas/BsfFunction-Single'

#------------ Definitions in TS 28.541 for TS 28.532 -----------------------------

@@ -4344,3 +4416,4 @@ components:
       - $ref: '#/components/schemas/GmlcFunction-Single'
       - $ref: '#/components/schemas/TsctsfFunction-Single'
       - $ref: '#/components/schemas/AanfFunction-Single'
       - $ref: '#/components/schemas/BsfFunction-Single'