Commit 8f5b6930 authored by sunse's avatar sunse
Browse files

Ts28.541 rel18 cr0964 nrm enhancements for tsctsf function

parent 850066ea
Loading
Loading
Loading
Loading
+270 −1
Original line number Diff line number Diff line
@@ -1572,6 +1572,108 @@ components:
            type: string
            pattern: '^[0-9]{5,15}$'

    SnssaiTsctsfInfoItem:
      description: Set of parameters supported by TSCTSF 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/DnnTsctsfInfoItem'
          minItems: 1
    DnnTsctsfInfoItem:
      description: Parameters supported by an TSCTSF 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'
    TsctsfInfo:
      description: Information of a TSCTSF 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/SnssaiTsctsfInfoItem'
          minProperties: 0
        externalGroupIdentifiersRanges:
          type: array
          items:
            $ref: '#/components/schemas/IdentityRange'
        supiRanges:
          type: array
          items:
            $ref: '#/components/schemas/SupiRange'
        gpsiRanges:
          type: array
          items:
            $ref: '#/components/schemas/IdentityRange'
        internalGroupIdentifiersRanges:
          type: array
          items:
            $ref: '#/components/schemas/InternalGroupIdRange'


    SnssaiTsctsfInfoItem:
      description: Set of parameters supported by TSCTSF 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/DnnTsctsfInfoItem'
          minItems: 1
    DnnTsctsfInfoItem:
      description: Parameters supported by an TSCTSF 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'
    TsctsfInfo:
      description: Information of a TSCTSF 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/SnssaiTsctsfInfoItem'
          minProperties: 0
        externalGroupIdentifiersRanges:
          type: array
          items:
            $ref: '#/components/schemas/IdentityRange'
        supiRanges:
          type: array
          items:
            $ref: '#/components/schemas/SupiRange'
        gpsiRanges:
          type: array
          items:
            $ref: '#/components/schemas/IdentityRange'
        internalGroupIdentifiersRanges:
          type: array
          items:
            $ref: '#/components/schemas/InternalGroupIdRange'


#-------- Definition of concrete IOCs --------------------------------------------
    ProvMnS:
      oneOf:
@@ -1683,6 +1785,8 @@ components:
              $ref: '#/components/schemas/MfafFunction-Multiple'
            GMLCFunction:
              $ref: '#/components/schemas/GmlcFunction-Multiple'
            TSCTSFFunction:
              $ref: '#/components/schemas/TsctsfFunction-Multiple'

    AmfFunction-Single:
      allOf:
@@ -1763,6 +1867,8 @@ components:
              $ref: '#/components/schemas/EP_N41-Multiple'
            EP_N42:
              $ref: '#/components/schemas/EP_N42-Multiple'
            EP_N89:
              $ref: '#/components/schemas/EP_N89-Multiple'              
    AmfSet-Single:
      allOf:
        - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top'
@@ -2043,6 +2149,8 @@ components:
              $ref: '#/components/schemas/EP_N28-Multiple'
            EP_Rx:
              $ref: '#/components/schemas/EP_Rx-Multiple'
            EP_N84:
              $ref: '#/components/schemas/EP_N84-Multiple'
            PredefinedPccRuleSet:
              $ref: '#/components/schemas/PredefinedPccRuleSet-Single'

@@ -2108,6 +2216,8 @@ components:
              $ref: '#/components/schemas/EP_N13-Multiple'
            EP_NL6:
              $ref: '#/components/schemas/EP_NL6-Multiple'
            EP_N87:
              $ref: '#/components/schemas/EP_N87-Multiple'
    UdrFunction-Single:
      allOf:
        - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top'
@@ -2171,6 +2281,8 @@ components:
          properties:
            EP_N27:
              $ref: '#/components/schemas/EP_N27-Multiple'
            EP_N96:
              $ref: '#/components/schemas/EP_N96-Multiple'
    NssfFunction-Single:
      allOf:
        - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top'
@@ -2417,7 +2529,8 @@ components:
              $ref: '#/components/schemas/EP_N33-Multiple'
            EP_NL5:
              $ref: '#/components/schemas/EP_NL5-Multiple'

            EP_N85:
              $ref: '#/components/schemas/EP_N85-Multiple'
    NsacfFunction-Single:
      allOf:
        - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top'
@@ -3342,6 +3455,8 @@ components:
          properties:
            EP_N5:
              $ref: '#/components/schemas/EP_N5-Multiple'
            EP_N86:
              $ref: '#/components/schemas/EP_N86-Multiple'

    NssaafFunction-Single:
      allOf:
@@ -3561,6 +3676,125 @@ components:
              $ref: '#/components/schemas/EP_NL6-Multiple'
            EP_NL9:
              $ref: '#/components/schemas/EP_NL9-Multiple'
    TsctsfFunction-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
                    managedNFProfile:
                      $ref: '#/components/schemas/ManagedNFProfile'
                    commModelList:
                      $ref: '#/components/schemas/CommModelList'
                    TsctsfInfo:
                      $ref: '#/components/schemas/TsctsfInfo'
        - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO'
        - type: object
          properties:
            EP_N84:
              $ref: '#/components/schemas/EP_N84-Multiple'
            EP_N85:
              $ref: '#/components/schemas/EP_N85-Multiple'
            EP_N86:
              $ref: '#/components/schemas/EP_N86-Multiple'
            EP_N87:
              $ref: '#/components/schemas/EP_N87-Multiple'
            EP_N89:
              $ref: '#/components/schemas/EP_N89-Multiple'
            EP_N96:
              $ref: '#/components/schemas/EP_N96-Multiple'
    EP_N84-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_N85-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_N86-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_N87-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_N89-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_N96-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 ----------------------

@@ -3857,10 +4091,34 @@ components:
      type: array
      items:
        $ref: '#/components/schemas/EP_Npc8-Single'
    EP_N84-Multiple:
      type: array
      items:
        $ref: '#/components/schemas/EP_N84-Single'
    EP_N85-Multiple:
      type: array
      items:
        $ref: '#/components/schemas/EP_N85-Single'
    EP_N86-Multiple:
      type: array
      items:
        $ref: '#/components/schemas/EP_N86-Single'
    EP_N87-Multiple:
      type: array
      items:
        $ref: '#/components/schemas/EP_N87-Single'
    EP_N88-Multiple:
      type: array
      items:
        $ref: '#/components/schemas/EP_N88-Single'
    EP_N89-Multiple:
      type: array
      items:
        $ref: '#/components/schemas/EP_N89-Single'
    EP_N96-Multiple:
      type: array
      items:
        $ref: '#/components/schemas/EP_N96-Single'
    Configurable5QISet-Multiple:
      type: array
      items:
@@ -3905,6 +4163,10 @@ components:
      type: array
      items:
        $ref: '#/components/schemas/GmlcFunction-Single'
    TsctsfFunction-Multiple:
      type: array
      items:
        $ref: '#/components/schemas/TsctsfFunction-Single'

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

@@ -3979,7 +4241,13 @@ components:
       - $ref: '#/components/schemas/EP_N58-Single'
       - $ref: '#/components/schemas/EP_N59-Single'              
       - $ref: '#/components/schemas/EP_N60-Single'
       - $ref: '#/components/schemas/EP_N84-Single'
       - $ref: '#/components/schemas/EP_N85-Single'
       - $ref: '#/components/schemas/EP_N86-Single'
       - $ref: '#/components/schemas/EP_N87-Single'
       - $ref: '#/components/schemas/EP_N88-Single'
       - $ref: '#/components/schemas/EP_N89-Single'
       - $ref: '#/components/schemas/EP_N96-Single'

       - $ref: '#/components/schemas/EP_Npc4-Single'
       - $ref: '#/components/schemas/EP_Npc6-Single'
@@ -4009,3 +4277,4 @@ components:
       - $ref: '#/components/schemas/ChfFunction-Single'
       - $ref: '#/components/schemas/MfafFunction-Single'
       - $ref: '#/components/schemas/GmlcFunction-Single'
       - $ref: '#/components/schemas/TsctsfFunction-Single'