Commit 22999a39 authored by sunse's avatar sunse
Browse files

Merge branch 'TS28.541_Rel18_CR1021_NRM_enhancements_for_MBSMFFunction' into...

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

Ts28.541 rel18 cr1021 nrm enhancements for mbsmf function

See merge request !759
parents 75477c22 62432f6f
Loading
Loading
Loading
Loading
Loading
+300 −3
Original line number Diff line number Diff line
@@ -2325,6 +2325,201 @@ components:
            $ref: '#/components/schemas/IdentityRange'
          minItems: 0            

    MbSmfInfo:
      description: Information of an MB-SMF NF Instance
      type: object
      properties:
        sNssaiInfoList:
          description: A map (list of key-value pairs) where a valid JSON string serves as key
          additionalProperties:
            $ref: '#/components/schemas/SnssaiMbSmfInfoItem'
          minProperties: 1
        tmgiRangeList:
          description: A map (list of key-value pairs) where a valid JSON string serves as key
          additionalProperties:
            $ref: '#/components/schemas/TmgiRange'
          minProperties: 1
        taiList:
          type: array
          items:
            $ref: 'TS29571_CommonData.yaml#/components/schemas/Tai'
          minItems: 1
        taiRangeList:
          type: array
          items:
            $ref: '#/components/schemas/TaiRange'
          minItems: 1
        mbsSessionList:
          description: A map (list of key-value pairs) where a valid JSON string serves as key
          additionalProperties:
            $ref: '#/components/schemas/MbsSession'
          minProperties: 1

    TmgiRange:
      description: Range of TMGIs
      type: object
      required:
        - mbsServiceIdStart
        - mbsServiceIdEnd
        - plmnId
      properties:
        mbsServiceIdStart:
          type: string
          pattern: '^[A-Fa-f0-9]{6}$'
        mbsServiceIdEnd:
          type: string
          pattern: '^[A-Fa-f0-9]{6}$'
        plmnId:
          $ref: 'TS29571_CommonData.yaml#/components/schemas/PlmnId'
        nid:
          $ref: 'TS29571_CommonData.yaml#/components/schemas/Nid'

    MbsSession:
      description: MBS Session currently served by an MB-SMF
      type: object
      required:
        - mbsSessionId
      properties:
        mbsSessionId:
          $ref: '#/components/schemas/MbsSessionId'
        mbsAreaSessions:
          description: A map (list of key-value pairs) where the key identifies an areaSessionId
          additionalProperties:
            $ref: '#/components/schemas/MbsServiceAreaInfo'
          minProperties: 1
          
    MbsServiceAreaInfo:
      description: MBS Service Area Information for location dependent MBS session
      type: object
      properties:
        areaSessionId:
          type: integer
          minimum: 0
          maximum: 65535
        mbsServiceArea:
          $ref: '#/components/schemas/MbsServiceArea'
      required:
        - areaSessionId
        - mbsServiceArea
        
    MbsSessionId:
      description: MBS Session Identifier
      type: object
      properties:
        tmgi:
          $ref: '#/components/schemas/Tmgi'
        ssm:
          $ref: '#/components/schemas/Ssm'
        nid:
          $ref: '#/components/schemas/Nid'
      anyOf:
        - required: [ tmgi ]
        - required: [ ssm ]

    Tmgi:
      description: Temporary Mobile Group Identity
      type: object
      properties:
        mbsServiceId:
          type: string
          pattern: '^[A-Fa-f0-9]{6}$'
          description: MBS Service ID
        plmnId:
          $ref: 'TS29571_CommonData.yaml#/components/schemas/PlmnId'
      required:
        - mbsServiceId
        - plmnId

    Ssm:
      description: Source specific IP multicast address
      type: object
      properties:
        sourceIpAddr:
          $ref: 'TS28623_ComDefs.yaml#/components/schemas/IpAddr'
        destIpAddr:
          $ref: 'TS28623_ComDefs.yaml#/components/schemas/IpAddr'
      required:
        - sourceIpAddr
        - destIpAddr

    MbsServiceArea:
      description: MBS Service Area
      type: object
      properties:
        ncgiList:
          type: array
          items:
            $ref: '#/components/schemas/NcgiTai'
          minItems: 1
          description: List of NR cell Ids
        taiList:
          type: array
          items:
            $ref: 'TS29571_CommonData.yaml#/components/schemas/Tai'
          minItems: 1
          description: List of tracking area Ids
      anyOf:
        - required: [ ncgiList ]
        - required: [ taiList ]

    NcgiTai:
      description: List of NR cell ids, with their pertaining TAIs
      type: object
      properties:
        tai:
          $ref: 'TS29571_CommonData.yaml#/components/schemas/Tai'
        cellList:
          type: array
          items:
            $ref: '#/components/schemas/Ncgi'
          minItems: 1
          description: List of List of NR cell ids
      required:
        - tai
        - cellList

    Ncgi:
      description: Contains the NCGI (NR Cell Global Identity), as described in 3GPP 23.003
      type: object
      properties:
        plmnId:
          $ref: 'TS29571_CommonData.yaml#/components/schemas/PlmnId'
        nrCellId:
          type: string
          pattern: '^[A-Fa-f0-9]{9}$'
          # $ref: 'TS29571_CommonData.yaml#/components/schemas/NrCellId'
        nid:
          $ref: '#/components/schemas/Nid'
      required:
        - plmnId
        - nrCellId
        
    SnssaiMbSmfInfoItem:
      description: Parameters supported by an MB-SMF for a given S-NSSAI
      type: object
      required:
        - sNssai
        - dnnInfoList
      properties:
        sNssai:
          $ref: 'TS29571_CommonData.yaml#/components/schemas/ExtSnssai'
        dnnInfoList:
          type: array
          items:
            $ref: '#/components/schemas/DnnMbSmfInfoItem'
          minItems: 1

    DnnMbSmfInfoItem:
      description: Parameters supported by an MB-SMF for a given DNN
      type: object
      required:
        - dnn
      properties:
        dnn:
          anyOf:
            - $ref: 'TS29571_CommonData.yaml#/components/schemas/Dnn'
            - $ref: 'TS29571_CommonData.yaml#/components/schemas/WildcardDnn'

    AanfInfo:
      description: Represents the information relative to an AAnF NF Instance.
      type: object
@@ -2335,6 +2530,7 @@ components:
            type: string
            pattern: '^[0-9]{1,4}$'


#-------- Definition of concrete IOCs --------------------------------------------
    ProvMnS:
      oneOf:
@@ -2452,6 +2648,8 @@ components:
              $ref: '#/components/schemas/AanfFunction-Multiple'
            BSFFunction:
              $ref: '#/components/schemas/BsfFunction-Multiple'
            MBSMFFunction:
              $ref: '#/components/schemas/MbSmfFunction-Multiple'

    AmfFunction-Single:
      allOf:
@@ -2520,6 +2718,8 @@ components:
              $ref: '#/components/schemas/EP_N42-Multiple'
            EP_N89:
              $ref: '#/components/schemas/EP_N89-Multiple'
            EP_N11mb:
              $ref: '#/components/schemas/EP_N11mb-Multiple'
    AmfSet-Single:
      allOf:
        - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top'
@@ -2609,6 +2809,8 @@ components:
              $ref: '#/components/schemas/EP_N40-Multiple'
            EP_N88:
              $ref: '#/components/schemas/EP_N88-Multiple'
            EP_N16mb:
              $ref: '#/components/schemas/EP_N16mb-Multiple'
            FiveQiDscpMappingSet:
              $ref: '#/components/schemas/FiveQiDscpMappingSet-Single'
            GtpUPathQoSMonitoringControl:
@@ -4438,6 +4640,81 @@ components:
                      $ref: '#/components/schemas/BsfInfo'
        - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO'

    MbSmfFunction-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:
                    plmnIdList:
                      $ref: 'TS28541_NrNrm.yaml#/components/schemas/PlmnIdList'
                    managedNFProfile:
                      $ref: '#/components/schemas/ManagedNFProfile'
                    commModelList:
                      $ref: '#/components/schemas/CommModelList'
                    mbSmfInfo:
                      $ref: '#/components/schemas/MbSmfInfo'
        - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO'
        - type: object
          properties:
            EP_N11mb:
              $ref: '#/components/schemas/EP_N11mb-Multiple'
            EP_N16mb:
              $ref: '#/components/schemas/EP_N16mb-Multiple'
            EP_Nmb1:
              $ref: '#/components/schemas/EP_Nmb1-Multiple'
            # EP_N4mb introduced in S5-236244 CR1020, to uncomment the following two lines
            # by code moderator when merging CR in integration branch
            # EP_N4mb:
              # $ref: '#/components/schemas/EP_N4mb-Multiple'
              
    EP_N11mb-Single:
      allOf:
        - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top'
        - type: object
          properties:
            attributes:
              allOf:
                - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/EP_RP-Attr'
                - type: object
                  properties:
                    localAddress:
                      $ref: 'TS28541_NrNrm.yaml#/components/schemas/LocalAddress'
                    remoteAddress:
                      $ref: 'TS28541_NrNrm.yaml#/components/schemas/RemoteAddress'
    EP_N16mb-Single:
      allOf:
        - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top'
        - type: object
          properties:
            attributes:
              allOf:
                - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/EP_RP-Attr'
                - type: object
                  properties:
                    localAddress:
                      $ref: 'TS28541_NrNrm.yaml#/components/schemas/LocalAddress'
                    remoteAddress:
                      $ref: 'TS28541_NrNrm.yaml#/components/schemas/RemoteAddress'
    EP_Nmb1-Single:
      allOf:
        - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top'
        - type: object
          properties:
            attributes:
              allOf:
                - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/EP_RP-Attr'
                - type: object
                  properties:
                    localAddress:
                      $ref: 'TS28541_NrNrm.yaml#/components/schemas/LocalAddress'
                    remoteAddress:
                      $ref: 'TS28541_NrNrm.yaml#/components/schemas/RemoteAddress'

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

    SubNetwork-Multiple:
@@ -4773,6 +5050,18 @@ components:
      type: array
      items:
        $ref: '#/components/schemas/EP_N96-Single'
    EP_N11mb-Multiple:
      type: array
      items:
        $ref: '#/components/schemas/EP_N11mb-Single'
    EP_N16mb-Multiple:
      type: array
      items:
        $ref: '#/components/schemas/EP_N16mb-Single'
    EP_Nmb1-Multiple:
      type: array
      items:
        $ref: '#/components/schemas/EP_Nmb1-Single'
    Configurable5QISet-Multiple:
      type: array
      items:
@@ -4829,6 +5118,10 @@ components:
      type: array
      items:
        $ref: '#/components/schemas/BsfFunction-Single'
    MbSmfFunction-Multiple:
      type: array
      items:
        $ref: '#/components/schemas/MbSmfFunction-Single'

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

@@ -4929,6 +5222,9 @@ components:
       - $ref: '#/components/schemas/EP_NL5-Single'
       - $ref: '#/components/schemas/EP_NL6-Single'
       - $ref: '#/components/schemas/EP_NL9-Single'
       - $ref: '#/components/schemas/EP_N11mb-Single'
       - $ref: '#/components/schemas/EP_N16mb-Single'
       - $ref: '#/components/schemas/EP_Nmb1-Single'       

       - $ref: '#/components/schemas/Configurable5QISet-Single'
       - $ref: '#/components/schemas/FiveQiDscpMappingSet-Single'
@@ -4945,3 +5241,4 @@ components:
       - $ref: '#/components/schemas/TsctsfFunction-Single'
       - $ref: '#/components/schemas/AanfFunction-Single'
       - $ref: '#/components/schemas/BsfFunction-Single'
       - $ref: '#/components/schemas/MbSmfFunction-Single'