Commit 602e4678 authored by ruiyue's avatar ruiyue
Browse files

Merge branch... 

Merge branch 'TS28.623_TS28.541_TS28.312_TS28.104_Rel19_CR_openAPI_solution_set_for_readOnly_attributes_for_different_scenarios' into 'Integration_Rel19_SA5_156_YAML'

TS28.623_Rel19_CR0380_TS28.541_Rel19_CR1307_openAPI_solution_set_for_readOnly_attributes_for_different_scenarios

See merge request !1237
parents c2798554 a9f4be72

OpenAPI/TS28541_5GcNrm.yaml

+67 −20
Original line number Diff line number Diff line
@@ -130,7 +130,7 @@ components: 
        $ref: '#/components/schemas/CNSIId'     

    CNSIId:

      type: string

      description: CNSI Id is defined in TS 29.531, only for Core Network

      description: CNSI Id is defined in TS 29.531, only for Core Network.    

    EnergySavingControl:

      type: string

      description: any of enumerated value
@@ -139,6 +139,7 @@ components: 
        - TO_BE_NOT_ENERGYSAVING

    EnergySavingState:

      type: string

      readOnly: true

      description: any of enumerated value

      enum:

        - IS_NOT_ENERGYSAVING
@@ -158,6 +159,7 @@ components: 
      properties:

        nFSrvGroupId:

          type: string

          readOnly: true

        supiRanges:

          type: array

          items:
@@ -196,6 +198,7 @@ components: 
        - P_NSSCD

    NotificationType:      

      type: string

      readOnly: true

      enum:

        -  N1_MESSAGES 

        -  N2_INFORMATION
@@ -212,14 +215,19 @@ components: 
          $ref: '#/components/schemas/NotificationType'

        callbackURI:

          type: string

          readOnly: true

        n1MessageClass:  

          type: boolean

          readOnly: true

        n2InformationClass:

          type: boolean

          readOnly: true

        versions:

          type: string

          readOnly: true

        binding:

          type: string

          readOnly: true

    ManagedNFProfile:

      type: object

      properties:
@@ -229,6 +237,7 @@ components: 
            $ref: 'TS28623_ComDefs.yaml#/components/schemas/Fqdn'

        nfInstanceID:

          type: string

          readOnly: true

        nfType:

          $ref: '#/components/schemas/NFType'

        heartbeatTimer:
@@ -275,20 +284,23 @@ components: 
            type: string

        lcHSupportInd:

          type: boolean

          readOnly: true

        olcHSupportInd:

          type: boolean

          readOnly: true

        nfSetRecoveryTimeList:

          type: array

          items:

            $ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTime'

            $ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTimeRo'

        scpDomains:

          type: array

          items:

            type: string

        recoveryTime:

           $ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTime'

           $ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTimeRo'

        nfServicePersistence:

           type: boolean

           readOnly: true

        nfProfileChangesSupportInd:

           type: boolean

        defaultNotificationSubscriptions:
@@ -299,12 +311,13 @@ components: 
        serviceSetRecoveryTimeList:

          type: array

          items:

            $ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTime'

            $ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTimeRo'

          minItems: 1

        vendorId:

          $ref: '#/components/schemas/VendorId'

    SEPPType:

      type: string

      readOnly: true

      description: any of enumerated value

      enum:

        - CSEPP
@@ -562,6 +575,7 @@ components: 
          type: integer

        eACMode:

          type: string

          readOnly: true

          enum:

            - INACTIVE

            - ACTIVE
@@ -571,10 +585,12 @@ components: 
          type: integer

        numberofUEs:

          type: integer

          readOnly: true

        uEIdList:

          type: array

          items:

            type: string

          readOnly: true  

        maxNumberofPDUSessions:

          type: integer
@@ -659,22 +675,25 @@ components: 
      properties:

        5GCNFType:

          type: string

          readOnly: true

          enum:

            - PCF

            - NEF

            - SCEF

        5GCNFIpAddress:

          type: string

          readOnly: true

        5GCNFRef:

          $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn'

          $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnRo'



    UPFConnectionInfo:

      type: object

      properties:

        uPFIpAddress:

          type: string

          readOnly: true

        uPFRef:

          $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn'

          $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnRo'

    SnssaiList:

      type: array

      items:
@@ -1144,11 +1163,13 @@ components: 
          items:

            type: string

          minItems: 1

          readOnly: true

        afIds:

          type: array

          items:

            type: string

          minItems: 1

          readOnly: true

    AfEvent:

      description: Represents Application Events.

      anyOf:
@@ -1187,11 +1208,13 @@ components: 
          items:

            type: string

          minItems: 1

          readOnly: true

        appIds:

          type: array

          items:

            type: string

          minItems: 1

          readOnly: true

    UnTrustAfInfo:

      description: Information of a untrusted AF Instance

      type: object
@@ -1735,8 +1758,10 @@ components: 
        iwkEpsInd:

          type: boolean

          default: false

          readOnly: true

        sxaInd:

          type: boolean

          readOnly: true

        pduSessionTypes:

          type: array

          items:
@@ -1747,6 +1772,7 @@ components: 
        ueIpAddrInd:

          type: boolean

          default: false

          readOnly: true

        taiList:

          type: array

          items:
@@ -1773,6 +1799,7 @@ components: 
        redundantGtpu:

          type: boolean

          default: false

          readOnly: true

        ipups:

          type: boolean

          default: false
@@ -1781,6 +1808,7 @@ components: 
          default: false

        supportedPfcpFeatures:

          type: string

          readOnly: true

        # upfEvents:

          # type: array

          # items:
@@ -1815,9 +1843,11 @@ components: 
        v2xSupportInd:

          type: boolean

          default: false

          readOnly: true

        proseSupportInd:

          type: boolean

          default: false

          readOnly: true

        proseCapability:

          $ref: '#/components/schemas/ProseCapability'

        v2xCapability:
@@ -1825,11 +1855,13 @@ components: 
        a2xSupportInd:

          type: boolean

          default: false

          readOnly: true

        a2xCapability:

          $ref: '#/components/schemas/A2xCapability'          

        rangingSlPosSupportInd:

          type: boolean

          default: false

          readOnly: true                    



    A2xCapability:

      description: Information of the supported A2X Capability by the PCF
@@ -2878,7 +2910,7 @@ components: 
        pLMNInfo:

          $ref: 'TS28541_NrNrm.yaml#/components/schemas/PlmnInfo'

        expiryTime:

          $ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTime'        

          $ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTimeRo'        

    PcscfInfo:

      description: Information of a P-CSCF NF Instance

      type: object
@@ -2950,18 +2982,20 @@ components: 
        - NSMF_PDUSESSION

        - NSMF_EVENTEXPOSURE

        - OTHERS

      readOnly: true      

    Operation:

      type: object

      properties:

        name:

          type: string

          readOnly: true

        allowedNFTypes:

          $ref: '#/components/schemas/NFType'

        operationSemantics:

          $ref: '#/components/schemas/OperationSemantics'

    NFType:

      description: NF name defined in TS 23.501 or TS 29.510'.This datatype is used for writable attribute

      type: string

      description: ' NF name defined in TS 23.501 or TS 29.510'

      enum:

        - NRF

        - UDM
@@ -3027,11 +3061,13 @@ components: 


    OperationSemantics:

      type: string

      readOnly: true

      enum:

        - REQUEST_RESPONSE

        - SUBSCRIBE_NOTIFY

    RegistrationState:

      type: string

      readOnly: true

      enum:

        - REGISTERED

        - DEREGISTERED
@@ -3282,7 +3318,7 @@ components: 
                    configurable5QISetRef:

                      $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn'

                    dynamic5QISetRef:

                      $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn'

                      $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnRo'

                    dnaiSatelliteMappingList:

                      type: array

                      items:
@@ -3409,7 +3445,7 @@ components: 
                    configurable5QISetRef:

                      $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn'

                    dynamic5QISetRef:

                      $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn'

                      $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnRo'

                    predefinedPccRuleSetRefs:

                      $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList'  

        - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO'
@@ -3696,11 +3732,12 @@ components: 
                - type: object

                  properties:

                    plmnId:

                      $ref: 'TS28623_ComDefs.yaml#/components/schemas/PlmnId'

                      $ref: 'TS28623_ComDefs.yaml#/components/schemas/PlmnIdRo'

                    sEPPType:

                      $ref: '#/components/schemas/SEPPType'

                    sEPPId:

                      type: integer

                      readOnly: true

                    fqdn:

                      $ref: 'TS28623_ComDefs.yaml#/components/schemas/Fqdn'

                    seppInfo:
@@ -3739,6 +3776,7 @@ components: 
                      $ref: '#/components/schemas/NwdafInfo'

                    nwdafLogicalFuncSupported:

                      type: string

                      readOnly: true

                      enum:

                        - NWDAF_WITH_ANLF

                        - NWDAF_WITH_MTLF
@@ -3795,6 +3833,7 @@ components: 
                      $ref: '#/components/schemas/CapabilityList'

                    isCAPIFSup:

                      type: boolean

                      readOnly: true

                    nefInfo:

                       $ref: '#/components/schemas/NefInfo' 

        - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO'
@@ -3985,11 +4024,12 @@ components: 
                - type: object

                  properties:

                    plmnId:

                      $ref: 'TS28623_ComDefs.yaml#/components/schemas/PlmnId'

                      $ref: 'TS28623_ComDefs.yaml#/components/schemas/PlmnIdRo'

                    sEPPId:

                      type: integer

                      readOnly: true

                    fqdn:

                      $ref: 'TS28623_ComDefs.yaml#/components/schemas/Fqdn'

                      $ref: 'TS28623_ComDefs.yaml#/components/schemas/FqdnRo'

        - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO'

        - $ref: '#/components/schemas/ManagedFunction5GC-nc0'   

    EP_N2-Single:
@@ -4021,7 +4061,7 @@ components: 
                    remoteAddress:

                      $ref: 'TS28541_NrNrm.yaml#/components/schemas/RemoteAddress'

                    epTransportRefs:

                      $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList'

                      $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnListRo'

    EP_N4-Single:

      allOf:

        - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top'
@@ -4675,10 +4715,13 @@ components: 
                        maximum: 255

                    isEventTriggeredGtpUPathMonitoringSupported:

                      type: boolean

                      readOnly: true

                    isPeriodicGtpUMonitoringSupported:

                      type: boolean

                      readOnly: true

                    isImmediateGtpUMonitoringSupported:

                      type: boolean

                      readOnly: true

                    gtpUPathDelayThresholds:

                      $ref: '#/components/schemas/GtpUPathDelayThresholdsType'

                    gtpUPathMinimumWaitTime:
@@ -4712,10 +4755,13 @@ components: 
                        maximum: 255

                    isEventTriggeredQFMonitoringSupported:

                      type: boolean

                      readOnly: true

                    isPeriodicQFMonitoringSupported:

                      type: boolean

                      readOnly: true

                    isSessionReleasedQFMonitoringSupported:

                      type: boolean

                      readOnly: true

                    qFPacketDelayThresholds:

                      $ref: '#/components/schemas/QFPacketDelayThresholdsType'

                    qFMinimumWaitTime:
@@ -5418,6 +5464,7 @@ components: 
                      enum:

                        - ACTIVATED

                        - DEACTIVATED

                      readOnly: true  

    EP_SM12-Single:

      allOf:

        - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top'

OpenAPI/TS28541_NrNrm.yaml

+28 −17
Original line number Diff line number Diff line
@@ -34,6 +34,7 @@ components: 
      type: integer

      minimum: 0

      maximum: 68719476735

      readOnly: true



    Sst:

      type: integer
@@ -234,6 +235,7 @@ components: 
        - IDLE

        - INACTIVE

        - ACTIVE

      readOnly: true  

    CyclicPrefix:

      type: string

      enum:
@@ -835,7 +837,7 @@ components: 
                    configurable5QISetRef:

                      $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn'

                    dynamic5QISetRef:

                      $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn'

                      $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnRo'

        - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO'

        - type: object

          properties:
@@ -882,7 +884,7 @@ components: 
              $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn'

            dynamic5QISetRef:

              description: This attribute is condition optional. The condition is NG-RAN Multi-Operator Core Network (NG-RAN MOCN) network sharing with operator specific 5QI is supported.            

              $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn'

              $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnRo'

            NrOperatorCellDu:

              $ref: '#/components/schemas/NrOperatorCellDu-Multiple'              

    GnbCuUpFunction-Single:
@@ -906,7 +908,7 @@ components: 
                    configurable5QISetRef:

                      $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn'

                    dynamic5QISetRef:

                      $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn'

                      $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnRo'

        - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO'

        - type: object

          properties:
@@ -966,9 +968,9 @@ components: 
                    configurable5QISetRef:

                      $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn'

                    dynamic5QISetRef:

                      $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn'

                      $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnRo'

                    ephemerisInfoSetRef:

                      $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn'

                      $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnRo'

                    dCHOControl:

                      type: boolean

                    dDAPSHOControl:
@@ -1028,7 +1030,7 @@ components: 
                    plmnInfoList:

                      $ref: '#/components/schemas/PlmnInfoList'

                    nRFrequencyRef:

                      $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn'

                      $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnRo'

        - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO'

        - type: object

          properties:
@@ -1191,6 +1193,7 @@ components: 
                    type: integer

                    minimum: 1

                    maximum: 256

                    readOnly: true

    EUtranFrequency-Single:

      allOf:

        - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top'
@@ -1290,24 +1293,30 @@ components: 
                  properties:

                    beamIndex:

                      type: integer

                      readOnly: true  

                    beamType:

                      type: string

                      readOnly: true

                      enum:

                        - SSB_BEAM  

                    beamAzimuth:

                      type: integer

                      readOnly: true

                      minimum: -1800

                      maximum: 1800

                    beamTilt:

                      type: integer

                      readOnly: true

                      minimum: -900

                      maximum: 900

                    beamHorizWidth:

                      type: integer

                      readOnly: true

                      minimum: 0

                      maximum: 3599

                    beamVertWidth:

                      type: integer

                      readOnly: true

                      minimum: 0

                      maximum: 1800

    RRMPolicyRatio-Single:
@@ -1540,18 +1549,20 @@ components: 
                      $ref: "#/components/schemas/InterRatEsDeactivationCandidateCellParameters"

                    isProbingCapable:

                      type: string

                      readOnly: true

                      enum:

                         - YES

                         - NO

                    energySavingState:

                      type: string

                      readOnly: true

                      enum:

                         - IS_NOT_ENERGY_SAVING

                         - IS_ENERGY_SAVING

                    mLModelRefList:

                      $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList'

                      $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnListRo'

                    aIMLInferenceFunctionRefList:

                      $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList'                        

                      $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnListRo'                        

    DRACHOptimizationFunction-Single:

      allOf:

        - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top'
@@ -1586,9 +1597,9 @@ components: 
                    tstoreUEcntxt:

                      $ref: '#/components/schemas/TstoreUEcntxt'

                    mLModelRefList:

                      $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList'

                      $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnListRo'

                    aIMLInferenceFunctionRefList:

                      $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList'                       

                      $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnListRo'                       

    DLBOFunction-Single:

      allOf:

        - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top'
@@ -1604,9 +1615,9 @@ components: 
                    minimumTimeBetweenHoTriggerChange:

                          $ref: '#/components/schemas/MinimumTimeBetweenHoTriggerChange'

                    mLModelRefList:

                      $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList'

                      $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnListRo'

                    aIMLInferenceFunctionRefList:

                      $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList'                        

                      $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnListRo'                        

    DPCIConfigurationFunction-Single:

      allOf:

        - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top'
@@ -1698,7 +1709,7 @@ components: 
                setType:

                  $ref: '#/components/schemas/RSSetType'

                nRCellDURefs:

                  $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList'

                  $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnListRo'



    ExternalGnbDuFunction-Single:

      allOf:
@@ -1941,7 +1952,7 @@ components: 
                    remoteAddress:

                      $ref: '#/components/schemas/RemoteAddress'

                    epTransportRefs:

                      $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList'

                      $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnListRo'



    EP_NgU-Single:

      allOf:
@@ -1958,7 +1969,7 @@ components: 
                    remoteAddress:

                      $ref: '#/components/schemas/RemoteAddress'

                    epTransportRefs:

                      $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList'

                      $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnListRo'



    EP_X2U-Single:

      allOf:

OpenAPI/TS28541_SliceNrm.yaml

+36 −19

File changed.

Preview size limit exceeded, changes collapsed.

OpenAPI/TS28623_ComDefs.yaml

+114 −3

File changed.

Preview size limit exceeded, changes collapsed.

OpenAPI/TS28623_FileManagementNrm.yaml

+21 −7
Original line number Diff line number Diff line
@@ -40,8 +40,10 @@ components: 
      properties:

        jobId:

          type: string

          readOnly: true

        status:

          type: string

          readOnly: true

          enum:

            - NOT_STARTED

            - RUNNING
@@ -51,13 +53,16 @@ components: 
            - CANCELLED

        progressPercentage:

          type: integer

          readOnly: true

          minimum: 0

          maximum: 100

        progressStateInfo:

          readOnly: true

          type: string

        resultStateInfo:

          oneOf:

            - type: string

              readOnly: true

              enum:

                - NULL

                - UNKNOWN
@@ -69,10 +74,11 @@ components: 
                - TIMER_EXPIRED

                - OTHER

            - type: string

              readOnly: true

        startTime:

          $ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTime'

          $ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTimeRo'

        endTime:

          $ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTime'

          $ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTimeRo'

        timer:

          type: integer
@@ -109,10 +115,12 @@ components: 
              properties:

                numberOfFiles:

                  type: integer

                  readOnly: true

                jobRef:

                  $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn'

                  $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnRo'

                jobId:

                  type: string

                  readOnly: true

                File:

                  $ref: '#/components/schemas/File-Multiple'

    File-Single:
@@ -124,13 +132,16 @@ components: 
              type: object

              properties:

                fileLocation:

                  $ref: 'TS28623_ComDefs.yaml#/components/schemas/Uri'

                  $ref: 'TS28623_ComDefs.yaml#/components/schemas/UriRo'

                fileCompression:

                  type: string

                  readOnly: true

                fileSize:

                  type: integer

                  readOnly: true

                fileDataType:

                  type: string

                  readOnly: true

                  enum:

                    - PERFORMANCE

                    - TRACE
@@ -138,16 +149,19 @@ components: 
                    - PROPRIETARY

                fileFormat:

                  type: string

                  readOnly: true

                fileReadyTime:

                  $ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTime'

                  $ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTimeRo'

                fileExpirationTime:

                  $ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTime'

                  $ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTimeRo'

                fileContent:

                  type: string

                  readOnly: true

                jobRef:

                  $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn'

                  $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnRo'

                jobId:

                  type: string

                  readOnly: true