Commit 7b23f566 authored by Mirko Cano Soveri's avatar Mirko Cano Soveri
Browse files

Merge branch 'Integration_Rel18_SA5_145_YAML' into 'Rel-18'

Integration rel18 145e OpenAPI changes to release branch

See merge request !435
parents 447353a1 765f59f0
Loading
Loading
Loading
Loading
+7 −16
Original line number Diff line number Diff line
@@ -86,15 +86,6 @@ components:
          type: string
        swImageRef:
          type: string
    RegistrationInfo:
      type: object
      properties:
        registrationExpiry:
          type: string
        registrationID:
          type: string
        secCredential:
          type: string

#-------- Definition of concrete IOCs --------------------------------------------
    MnS:
@@ -156,14 +147,10 @@ components:
                        type: string
                    eASRequirementsRef:
                      $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn'
                    eESFunctionRef:
                      $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList'
                    eASAddress:
                      type: array
                      items:
                        type: string
                    registrationInfo:
                      $ref: '#/components/schemas/RegistrationInfo'  
        - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO'
    EESFunction-Single:
      allOf:
@@ -189,10 +176,8 @@ components:
                      $ref: '#/components/schemas/SoftwareImageInfo'
                    serviceContinuitySupport:
                      type: boolean
                    eASFunctionRef:
                    eASFunctonRef:
                      $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList'  
                    registrationInfo:
                      $ref: '#/components/schemas/RegistrationInfo'  
        - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO'

    ECSFunction-Single:
@@ -215,6 +200,12 @@ components:
                      $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList'
                    softwareImageInfo:
                      $ref: '#/components/schemas/SoftwareImageInfo'
                    trackingAreaIdList:
                      $ref: 'TS28541_NrNrm.yaml#/components/schemas/TaiList'
                    geographicalLocation:
                      $ref: '#/components/schemas/GeoLoc'
                    mcc:
                      $ref: 'TS28623_ComDefs.yaml#/components/schemas/Mcc'
        - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO'

    EASRequirements-Single:
+272 −67
Original line number Diff line number Diff line
@@ -129,22 +129,12 @@ components:
        $ref: 'TS28541_NrNrm.yaml#/components/schemas/NrTac'
    WeightFactor:
      type: integer
    UdmInfo:
      type: object
      properties:
        nFSrvGroupId:
          type: string
    AusfInfo:
      type: object
      properties:
        nFSrvGroupId:
          type: string
    UpfInfo:
      type: object
      properties:
        smfServingAreas:
          type: string
    SupportedDataSetId:
    SupportedDataSet:
      type: string
      description: any of enumrated value
      enum:
@@ -152,21 +142,21 @@ components:
        - POLICY
        - EXPOSURE
        - APPLICATION
    Udrinfo:
      type: object
      properties:
        supportedDataSetIds:
          type: array
          items:
            $ref: '#/components/schemas/SupportedDataSetId'
        nFSrvGroupId:
          type: string
        - A_PFD
        - A_AFTI
        - A_IPTV
        - A_BDT
        - A_SPD
        - A_EASD
        - A_AMI
        - P_UE
        - P_SCD
        - P_BDT
        - P_PLMNUE
        - P_NSSCD
    NFInfo:
      oneOf:
        - $ref: '#/components/schemas/UdmInfo'
        - $ref: '#/components/schemas/AusfInfo'
        - $ref: '#/components/schemas/UpfInfo'
        - $ref: '#/components/schemas/Udrinfo'
    NotificationType:      
      type: string
      enum:
@@ -240,6 +230,10 @@ components:
          type: array
          items:
            type: string
        lcHSupportInd:
          type: boolean
        olcHSupportInd:
          type: boolean
        nfSetRecoveryTimeList:
          type: array
          items:
@@ -643,6 +637,132 @@ components:
      type: array
      items:
        $ref: 'TS28541_NrNrm.yaml#/components/schemas/Tai' 
    SupiRange:
      type: object
      properties:
        start:
          type: string
        end:
          type: string
        pattern:
          type: string
    IdentityRange:
      type: object
      properties:
        start:
          type: string
        end:
          type: string
        pattern:
          type: string
    ProseCapability:
      type: object
      properties:
        proseDirectDiscovey:
          type: boolean
        proseDirectCommunication:
          type: boolean
        proseL2UetoNetworkRelay:
          type: boolean
        proseL3UetoNetworkRelay:
          type: boolean
        proseL2RemoteUe:
          type: boolean
        proseL3RemoteUe:
          type: boolean
    V2xCapability:
      type: object
      properties:
        lteV2x:
          type: boolean
        nrV2x:
          type: boolean
    InternalGroupIdRange:
      type: object
      properties:
        start:
          type: string
        end:
          type: string
        pattern:
          type: string
    SuciInfo:
      type: object
      properties:
        routingInds: 
          type: array
          items:
            type: string
        hNwPubKeyIds:
          type: array
          items:
            type: integer
    SuciInfoList:
      type: array
      items:
        $ref: '#/components/schemas/SuciInfo' 
    SharedDataIdRange:
      type: object
      properties:
        pattern:
          type: string
    SupiRangeList:
      type: array
      items:
        $ref: '#/components/schemas/SupiRange'
    IdentityRangeList:
      type: array
      items:
        $ref: '#/components/schemas/IdentityRange'
    InternalGroupIdRangeList:
      type: array
      items:
        $ref: '#/components/schemas/InternalGroupIdRange'
    SupportedDataSetList:
      type: array
      items:
        $ref: '#/components/schemas/SupportedDataSet'
    SharedDataIdRangeList:
      type: array
      items:
        $ref: '#/components/schemas/SharedDataIdRange'
    InterfaceUpfInfoItem:
      type: object
      properties:
        interfaceType:
          type: string
          enum:
            - IPV4ENDPOINTADDRESSES
            - IPV6ENDPOINTADDRESSES
            - FQDN
        ipv4EndpointAddresses:
          $ref: 'TS28623_ComDefs.yaml#/components/schemas/Ipv4Addr'
        ipv6EndpointAddresses:
          $ref: 'TS28623_ComDefs.yaml#/components/schemas/Ipv6Addr'
        fqdn:
          $ref: 'TS28623_ComDefs.yaml#/components/schemas/Fqdn'
        networkInstance:
          type: string

    AtsssCapability:
      type: object
      properties:
        atsssLL:
          type: boolean
        mptcp:
          type: boolean
        rttWithoutPmf:
          type: boolean

    IpInterface:
      type: object
      properties:
        ipv4EndpointAddresses:
          $ref: 'TS28623_ComDefs.yaml#/components/schemas/Ipv4Addr'
        ipv6EndpointAddresses:
          $ref: 'TS28623_ComDefs.yaml#/components/schemas/Ipv6Addr'
        fqdn:
          $ref: 'TS28623_ComDefs.yaml#/components/schemas/Fqdn'

#-------- Definition of concrete IOCs --------------------------------------------
    ProvMnS:
@@ -741,6 +861,8 @@ components:
              $ref: '#/components/schemas/Dynamic5QISet-Multiple'
            EcmConnectionInfo:
              $ref: '#/components/schemas/EcmConnectionInfo-Multiple'
            EASDFFunction:
              $ref: '#/components/schemas/EASDFFunction-Multiple'

    AmfFunction-Single:
      allOf:
@@ -752,8 +874,8 @@ components:
                - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-Attr'
                - type: object
                  properties:
                    plmnIdList:
                      $ref: 'TS28541_NrNrm.yaml#/components/schemas/PlmnIdList'
                    pLMNInfoList:
                      $ref: 'TS28541_NrNrm.yaml#/components/schemas/PlmnInfoList'
                    amfIdentifier:
                      $ref: '#/components/schemas/AmfIdentifier'
                    sBIFqdn:
@@ -768,8 +890,6 @@ components:
                        $ref: '#/components/schemas/TaiRange'
                    weightFactor:
                      $ref: '#/components/schemas/WeightFactor'
                    snssaiList:
                      $ref: '#/components/schemas/SnssaiList'
                    cNSIIdList:
                      $ref: '#/components/schemas/CNSIIdList'
                    gUAMIdList:
@@ -880,9 +1000,7 @@ components:
                      items:
                        $ref: '#/components/schemas/SNssaiSmfInfoItem'
                    taiList:
                      type: array
                      items:
                        $ref: 'TS28541_NrNrm.yaml#/components/schemas/Tai'
                      $ref: '#/components/schemas/TaiList'
                    taiRangeList:
                      type: array
                      items:
@@ -948,12 +1066,54 @@ components:
                - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-Attr'
                - type: object
                  properties:
                    plmnIdList:
                      $ref: 'TS28541_NrNrm.yaml#/components/schemas/PlmnIdList'
                    pLMNInfoList:
                      $ref: 'TS28541_NrNrm.yaml#/components/schemas/PlmnInfoList'
                    nRTACList:
                      $ref: '#/components/schemas/TACList'
                    snssaiList:
                      $ref: '#/components/schemas/SnssaiList'
                    cNSIIdList:
                      $ref: '#/components/schemas/CNSIIdList'
                    smfServingArea:
                       type: string
                    interfaceUpfInfoList:
                       type: array
                       items:
                         $ref: '#/components/schemas/InterfaceUpfInfoItem'
                    iwkEpsInd:
                       type: boolean
                    pduSessionTypes:
                      type: string
                      enum:
                        - IPV4
                        - IPV6
                        - IPV4V6
                        - UNSTRUCTURED
                        - ETHERNET
                    atsssCapability:
                       $ref: '#/components/schemas/AtsssCapability'
                    ueIpAddrInd:
                       type: boolean
                    taiList:
                      $ref: '#/components/schemas/TaiList'
                    taiRangeList:
                      type: array
                      items:
                        $ref: '#/components/schemas/TaiRange'
                    wAgfInfo:
                      $ref: '#/components/schemas/IpInterface'
                    tngfInfo:
                      $ref: '#/components/schemas/IpInterface'
                    twifInfo:
                      $ref: '#/components/schemas/IpInterface'
                    priority:
                      type: integer
                    redundantGtpu:
                      type: boolean
                    ipups:
                      type: boolean
                    dataForwarding:
                      type: boolean
                    supportedPfcpFeatures:
                      type: string
                    managedNFProfile:
                      $ref: '#/components/schemas/ManagedNFProfile'
                    supportedBMOList:
@@ -1002,23 +1162,42 @@ components:
                - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-Attr'
                - type: object
                  properties:
                    plmnIdList:
                      $ref: 'TS28541_NrNrm.yaml#/components/schemas/PlmnIdList'
                    pLMNInfoList:
                      $ref: 'TS28541_NrNrm.yaml#/components/schemas/PlmnInfoList'
                    sBIFqdn:
                      type: string
                    snssaiList:
                      $ref: '#/components/schemas/SnssaiList'
                    managedNFProfile:
                      $ref: '#/components/schemas/ManagedNFProfile'
                    commModelList:
                      $ref: '#/components/schemas/CommModelList'
                    groupId:
                      type: string
                    dnnList:
                      type: array
                      items:
                        type: string
                    supiRanges:
                      $ref: '#/components/schemas/SupiRangeList'
                    gpsiRanges:
                      $ref: '#/components/schemas/IdentityRangeList'
                    rxDiamHost:
                      type: string
                    rxDiamRealm:
                      type: string
                    v2xSupportInd:
                      type: boolean
                    proseSupportInd:
                      type: boolean
                    proseCapability:
                      $ref: '#/components/schemas/ProseCapability'
                    v2xCapability:
                      $ref: '#/components/schemas/V2xCapability'
                    configurable5QISetRef:
                      $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn'
                    dynamic5QISetRef:
                      $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn'
                    supportedBMOList:
                      $ref: '#/components/schemas/SupportedBMOList'

        - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO'
        - type: object
          properties:
@@ -1072,18 +1251,32 @@ components:
                - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-Attr'
                - type: object
                  properties:
                    plmnIdList:
                      $ref: 'TS28541_NrNrm.yaml#/components/schemas/PlmnIdList'
                    pLMNInfoList:
                      $ref: 'TS28541_NrNrm.yaml#/components/schemas/PlmnInfoList'
                    sBIFqdn:
                      type: string
                    snssaiList:
                      $ref: '#/components/schemas/SnssaiList'
                    managedNFProfile:
                      $ref: '#/components/schemas/ManagedNFProfile'
                    commModelList:
                      $ref: '#/components/schemas/CommModelList'
                    eCSAddrConfigInfo:
                      $ref: '#/components/schemas/ECSAddrConfigInfo'
                    groupId:
                      type: string
                    supiRanges:
                      $ref: '#/components/schemas/SupiRangeList'
                    gpsiRanges:
                      $ref: '#/components/schemas/IdentityRangeList'
                    externalGroupIdentifiersRanges:
                      $ref: '#/components/schemas/IdentityRangeList'
                    routingIndicators:
                      type: array
                      items:
                        type: string
                    internalGroupIdentifiersRanges:
                      $ref: '#/components/schemas/InternalGroupIdRangeList'
                    suciInfos:
                      $ref: '#/components/schemas/SuciInfoList'
        - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO'
        - type: object
          properties:
@@ -1103,14 +1296,25 @@ components:
                - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-Attr'
                - type: object
                  properties:
                    plmnIdList:
                      $ref: 'TS28541_NrNrm.yaml#/components/schemas/PlmnIdList'
                    pLMNInfoList:
                      $ref: 'TS28541_NrNrm.yaml#/components/schemas/PlmnInfoList'
                    sBIFqdn:
                      type: string
                    snssaiList:
                      $ref: '#/components/schemas/SnssaiList'
                    managedNFProfile:
                      $ref: '#/components/schemas/ManagedNFProfile'
                    groupId:
                      type: string
                    supiRanges:
                      $ref: '#/components/schemas/SupiRangeList'
                    gpsiRanges:
                      $ref: '#/components/schemas/IdentityRangeList'
                    externalGroupIdentifiersRanges:
                      $ref: '#/components/schemas/IdentityRangeList'
                    supportedDataSets:
                      $ref: '#/components/schemas/SupportedDataSetList'
                    sharedDataIdRanges:
                      $ref: '#/components/schemas/SharedDataIdRangeList'

    UdsfFunction-Single:
      allOf:
        - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top'
@@ -1164,16 +1368,14 @@ components:
                - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-Attr'
                - type: object
                  properties:
                    plmnIdList:
                      $ref: 'TS28541_NrNrm.yaml#/components/schemas/PlmnIdList'
                    pLMNInfoList:
                      $ref: 'TS28541_NrNrm.yaml#/components/schemas/PlmnInfoList'
                    sBIFqdn:
                      type: string
                    cNSIIdList:
                      $ref: '#/components/schemas/CNSIIdList'
                    nFProfileList:
                      $ref: '#/components/schemas/NFProfileList'
                    snssaiList:
                      $ref: '#/components/schemas/SnssaiList'
                    commModelList:
                      $ref: '#/components/schemas/CommModelList'
        - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO'
@@ -1301,6 +1503,10 @@ components:
                      $ref: '#/components/schemas/CommModelList'
                    networkSliceInfoList:
                      $ref: '#/components/schemas/NetworkSliceInfoList'
                    nwdafEvents:
                      type: array
                      items:
                        $ref: 'TS29520_Nnwdaf_EventsSubscription.yaml#/components/schemas/NwdafEvent'
                      
    ScpFunction-Single:
      allOf:
@@ -1338,7 +1544,6 @@ components:
                    isCAPIFSup:
                      type: boolean
                    taiList:
                      items:
                      $ref: '#/components/schemas/TaiList'
                    taiRangeList:
                      type: array
@@ -1369,7 +1574,6 @@ components:
                      items:
                        $ref: '#/components/schemas/NsacfInfoSnssai'
                    taiList:
                      items:
                      $ref: '#/components/schemas/TaiList'
        - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO'
        - type: object
@@ -1428,8 +1632,8 @@ components:
        - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO'
        - type: object
          properties:
            EP_Nxx:
              $ref: '#/components/schemas/EP_Nxx-Multiple'
            EP_N88:
              $ref: '#/components/schemas/EP_N88-Multiple'

    EcmConnectionInfo-Single:
      allOf:
@@ -2029,7 +2233,7 @@ components:
                    remoteAddress:
                      $ref: 'TS28541_NrNrm.yaml#/components/schemas/RemoteAddress'
                      
    EP_Nxx-Single:
    EP_N88-Single:
      allOf:
        - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top'
        - type: object
@@ -2094,8 +2298,6 @@ components:
                - type: object
                  properties:
                    configurable5QIs:
                      type: array
                      items:
                      $ref: '#/components/schemas/FiveQICharacteristics-Multiple'  
   
    Dynamic5QISet-Single:
@@ -2108,8 +2310,6 @@ components:
                - type: object
                  properties:
                    dynamic5QIs:
                      type: array
                      items:
                      $ref: '#/components/schemas/FiveQICharacteristics-Multiple'                           
                      
    GtpUPathQoSMonitoringControl-Single:
@@ -2314,6 +2514,11 @@ components:
      items:
        $ref: '#/components/schemas/AmfRegion-Single'

    EASDFFunction-Multiple:
      type: array
      items:
        $ref: '#/components/schemas/EASDFFunction-Single'
  
    EP_N2-Multiple:
      type: array
      items:
@@ -2457,10 +2662,10 @@ components:
      type: array
      items:
        $ref: '#/components/schemas/EP_Npc8-Single'
    EP_Nxx-Multiple:
    EP_N88-Multiple:
      type: array
      items:
        $ref: '#/components/schemas/EP_Nxx-Single'
        $ref: '#/components/schemas/EP_N88-Single'
    Configurable5QISet-Multiple:
      type: array
      items:
@@ -2543,7 +2748,7 @@ components:
       - $ref: '#/components/schemas/EP_N32-Single'
       - $ref: '#/components/schemas/EP_N33-Single'       
       - $ref: '#/components/schemas/EP_N60-Single'
       - $ref: '#/components/schemas/EP_Nxx-Single'
       - $ref: '#/components/schemas/EP_N88-Single'

       - $ref: '#/components/schemas/EP_Npc4-Single'
       - $ref: '#/components/schemas/EP_Npc6-Single'
+22 −0
Original line number Diff line number Diff line
@@ -109,6 +109,10 @@ components:
    NrTac:
      type: integer
      maximum: 16777215
    NrTacList:
      type: array
      items:
        $ref: '#/components/schemas/NrTac'
    Tai:
      type: object
      properties:
@@ -745,6 +749,8 @@ components:
              $ref: '#/components/schemas/DRACHOptimizationFunction-Single'
            OperatorDU:
              $ref: '#/components/schemas/OperatorDu-Multiple'   
            BWPSet:
              $ref: '#/components/schemas/BWPSet-Multiple'   

    OperatorDu-Single:
      allOf:
@@ -964,9 +970,13 @@ components:
                      items:
                        $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn'
                    bwpRef:
                      description: "Condition is BWP sets are not supported"                      
                      type: array
                      items:
                        $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn'
                    bwpSetRef:
                      description: "Condition is BWP sets are supported"
                      $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList'                    
                    rimRSMonitoringStartTime:
                      type: string
                    rimRSMonitoringStopTime:
@@ -998,6 +1008,13 @@ components:
              $ref: '#/components/schemas/DRACHOptimizationFunction-Single'
            NrOperatorCellDu:
              $ref: '#/components/schemas/NrOperatorCellDu-Multiple'
    BWPSet-Single:
      allOf:
        - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top'
        - type: object
          properties:
            bWPlist:
              $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList'

    NrOperatorCellDu-Single:
      allOf:
@@ -1868,6 +1885,10 @@ components:
      type: array
      items:
        $ref: '#/components/schemas/GnbCuCpFunction-Single'
    BWPSet-Multiple:
      type: array
      items:
        $ref: '#/components/schemas/BWPSet-Single'

    NrCellDu-Multiple:
      type: array
@@ -2024,6 +2045,7 @@ components:

        - $ref: '#/components/schemas/NrSectorCarrier-Single'
        - $ref: '#/components/schemas/Bwp-Single'
        - $ref: '#/components/schemas/BWPSet-Single'        
        - $ref: '#/components/schemas/CommonBeamformingFunction-Single'
        - $ref: '#/components/schemas/Beam-Single'
        - $ref: '#/components/schemas/RRMPolicyRatio-Single'
+36 −35

File changed.

Preview size limit exceeded, changes collapsed.

+2508 −0

File added.

Preview size limit exceeded, changes collapsed.