Commit d24dad23 authored by Mirko Cano Soveri's avatar Mirko Cano Soveri
Browse files

Merge branch 'Integration_Rel20_SA5_165_YAML_Manually_Rebase_By_CodeModerator' into 'Rel-20'

Integration rel20 sa5 165 yaml manually rebase by codemoderator

See merge request !2055
parents ec2dbaa1 f0fb2382
Loading
Loading
Loading
Loading
Loading
+5 −10
Original line number Diff line number Diff line
openapi: 3.0.1
info:
  title: AI/ML NRM
  version: 19.4.0
  version: 19.5.0
  description: >-
    OAS 3.0.1 specification of the AI/ML NRM
    © 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC).
    © 2026, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC).
    All rights reserved.
externalDocs:
  description: 3GPP TS 28.105; AI/ML Management
@@ -538,8 +538,6 @@ components:
                      - $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn'
                    requestStatus:
                      $ref: '#/components/schemas/RequestStatus'
                    expectedRuntimeContext:
                      $ref: '#/components/schemas/MLContext'
                    performanceRequirements:
                      type: array
                      uniqueItems: true
@@ -607,10 +605,11 @@ components:
                      $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnListRo' 
                    trainingReportRef:
                      $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnRo'
                    mLModelGeneratedRef:
                      $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnRo'
                    mLModelRef:  ## Figure 7.3a.1.1.1-1 is 1-0..1 mapping, hence should be single
                      $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnRo'
                    mLModelCoordinationGroupRef: 
                      $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnRo'
  

    MLTrainingReport-Single:
      allOf:
@@ -645,8 +644,6 @@ components:
                    areNewTrainingDataUsed:
                      type: boolean
                      readOnly: true
                    trainingRequestRef:
                      $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnListRo'
                    fLReportPerClient:
                      type: array
                      uniqueItems: true
@@ -661,8 +658,6 @@ components:
                      $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnRo'
                    mLModelCoordinationGroupGeneratedRef:
                      $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnRo'
                    mLModelRef:
                      $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnListRo'

    MLTestingFunction-Single:
      allOf:
+56 −17
Original line number Diff line number Diff line
openapi: 3.0.1
info:
  title: Intent NRM
  version: 19.4.0
  version: 19.5.0
  description: >-
    OAS 3.0.1 definition of the Intent NRM
    © 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC).
    © 2026, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC).
    All rights reserved.
externalDocs:
  description: 3GPP TS 28.312; Intent driven management services for mobile networks
@@ -73,9 +73,11 @@ components:
            type: integer
            minimum: 1
            maximum: 100
            default: 1
            description: It expresses the priority of the stated intent within a MnS consumer.   
          intentPreemptionCapability:
            type: boolean
            default: false
          intentReportControl:
            type: array
            uniqueItems: true
@@ -87,7 +89,13 @@ components:
          intentReportReference:
            $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnRo'
          intentUtilityFormulaRef:
            $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnRo'
            $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn'
        required:
          - userLabel
          - intentExpectations
          - intentMgmtPurpose
          - intentReportControl
          - intentReportReference
    IntentReport-Single:
      description: It represents intent report information from MnS producer to MnS consumer.
      allOf:
@@ -116,6 +124,9 @@ components:
            $ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTimeRo'
          intentReference:
            $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnRo'
      required:
        - lastUpdatedTime
        - intentReference
    IntentHandlingFunction-Single:
      description: >- 
        It represents the intent handling capabilities can be supported by a specific intent 
@@ -161,6 +172,9 @@ components:
          utilityOffset:
            type: number
            default: 0
      required:
        - utilityFunctionId
        - utilityParameterList
   #-------Definition of generic IOCs ----------#  

   #-------Definition of the generic IntentExpectation dataType ----------#    
@@ -248,6 +262,7 @@ components:
        - ALL_OF
        - ONE_OF
        - ANY_OF
      default: ALL_OF
    IntentMgmtPurpose:
      description: >-
        It describes the MnS consumer requirements for the management purpose (required procedures)
@@ -298,6 +313,8 @@ components:
            type: string
          readOnly: true
          description: An attribute which is used when FulfilmentInfo is implemented for IntentFulfilmentInfo
      required: 
        - fulfilmentStatus  
    ExpectationVerb:
      type: string
      enum:
@@ -385,6 +402,10 @@ components:
          minimum: 0
          maximum: 10
          description: It represents the preference information of the Consumer on expectationTargets.
      required:
        - targetName
        - targetCondition
        - targetValueRange

   #-------Definition of the generic ExpectationTarget  dataType----------#  
   
@@ -406,6 +427,10 @@ components:
                items:
                  $ref: "#/components/schemas/ValueRangeType"
              - $ref: "#/components/schemas/ValueRangeType"
      required:
        - contextAttribute
        - contextCondition
        - contextValueRange
   #-------Definition of the generic Context dataType----------------#

  #-------Definition of the generic IntentReportControl dataType----------------#
@@ -416,7 +441,8 @@ components:
      properties:
        reportRecipientAddress:
          description: >-
            It indicates the address of report recipient for MnS consumer
            It indicates the address of report recipient for MnS consumer. 
            It shall be supported when the implicit intent report subscription mechanism is supported.
          type: string
        observationPeriod:
          description: >-
@@ -445,7 +471,6 @@ components:
          items: 
            type: string
      required:
        - reportRecipientAddress
        - observationPeriod
    ExpectedReportType:
      type: string
@@ -480,6 +505,10 @@ components:
              items:
                $ref: '#/components/schemas/ValueRangeType'
            - $ref: '#/components/schemas/ValueRangeType'
      required:
        - targetName
        - targetCondition
        - targetValueRange
   #-------Definition of the concrete IntentReportControl dataType----------------#


@@ -499,7 +528,15 @@ components:
          items: 
            $ref: '#/components/schemas/ExpectationFulfilmentResult'
        additionalFulfilmentInfo:
          description: >- 
            It describes the additional information of intent intent fulfilment.The content and format is vendor specific.
             Examples of additional fulfilment information could be:Types for the list of managed objects (e.g. NE, NF, Cell) 
             which are updated during intent fulfilment, or, Instance information for the list of managed objects (e.g. NE, NF,
              Cell)  and corresponding attributes which are updated during intent fulfilment.
          type: string
          readOnly: true
      required:
          - intentFulfilmentInfo
   #-------Definition of the concrete IntentFulfilmentReport dataType----------------#

   #-------Definition of the generic ExpectationFulfilmentResult dataType----------------#
@@ -561,23 +598,25 @@ components:
          readOnly: true
        conflictType:
          type: string
          readOnly: true
          enum:
              - INTENT_CONFLICT
              - EXPECTATION_CONFLICT
              - TARGET_CONFLICT
          readOnly: true    
        conflictingIntent:
          description: >-
            This will be present if the value of conflictType is INTENT_CONFLICT. It describes the DN of the conflicting intent
            This will be present if the MnS producer supports reporting on INTENT_CONFLICT or EXPECTATION_CONFLICT 
            or TARGET_CONFLICT.
          $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnRo'
        conflictingExpectation:
          description: >-
            This will be present if the value of conflictType is EXPECTATION_CONFLICT. It describes the expectationId of the conflicting IntentExpectation with an Intent       
            This will be present if the MnS producer supports reporting on conflicts of type EXPECTATION_CONFLICT or 
            TARGET_CONFLICT.
          type: string
          readOnly: true
        conflictingTarget:
          description: >-
            This will be present if the value of conflictType is TARGET_CONFLICT. It describes the targetName of the conflicting ExpectationTarget with an IntentExpectation           
            This will be present if the MnS producer supports reporting on conflicts of type TARGET_CONFLICT.
          type: string
          readOnly: true 
        recommendedSolutions:
+69 −4
Original line number Diff line number Diff line
openapi: 3.0.1
info:
  title: 3GPP 5GC NRM
  version: 20.1.0
  version: 20.2.0
  description: >-
    OAS 3.0.1 specification of the 5GC NRM
    © 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC).
    © 2026, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC).
    All rights reserved.
externalDocs:
  description: 3GPP TS 28.541; 5G NRM, 5GC NRM
@@ -979,6 +979,12 @@ components:
              - DL
              - UL_DL
          - type: string
        dataEndMarkInd:
          type: boolean
        dataBurstSizeInd:
          type: boolean
        timetoNextBurstInd:
          type: boolean


    TrafficControlDataList:
@@ -1143,6 +1149,40 @@ components:
        expTranInd:
          type: boolean
          default: false
        multiModalId:
          type: string
        traffParaData:
          $ref: '#/components/schemas/TrafficParaData'

    TrafficParaData:
      description: Contains Traffic Parameter(s) related control information.
      type: object
      properties:
        periodUl:
          type: integer
        periodDl:
          type: integer
        reqTrafficParas:
          anyOf:
          - type: string
            enum:
              - DL_N6_JITTER
              - DL_PERIOD
              - UL_PERIOD
          - type: string
          description: Indicates the traffic parameters to be measured.
        repFreqs:
          type: array
          items:
             $ref: '#/components/schemas/ReportingFrequency'
          minItems: 1
          description: Represents the notification method (periodic or on event detection).
        dlN6JitterThr:
          type: integer
        repPeriod:
          type: integer



    ProtocolDescription:
      type: object
@@ -1569,7 +1609,13 @@ components:
      properties:
        atsssLL:
          type: boolean
        mptcp:
        mptcpudp:
          type: boolean
        mpquic:
          type: boolean
        mpquicIp:
          type: boolean
        mpquicE:
          type: boolean                              
        rttWithoutPmf:
          type: boolean
@@ -2868,6 +2914,23 @@ components:
          type: boolean
          default: false          

    AdmInfo:
      description: ADM information
      type: object
      properties:
        deviceIdList:
          type: array
          items:
            $ref: 'TS29571_CommonData.yaml#/components/schemas/AiotDevPermId'
          minItems: 1
        devIdRegEx:
          type: string
        afIdList:
          type: array
          items:
            type: string
          minItems: 1

    NrfInfo:
      description: Information of an NRF NF Instance, used in hierarchical NRF deployments
      type: object
@@ -5344,6 +5407,8 @@ components:
                      type: string
                    managedNFProfile:
                      $ref: '#/components/schemas/ManagedNFProfile'
                    admInfo:
                      $ref: '#/components/schemas/AdmInfo'
        - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO'
        - $ref: '#/components/schemas/ManagedFunction5GC-nc0' 
        - type: object
+101 −0
Original line number Diff line number Diff line
openapi: 3.0.1
info:
  title: Generic RAN NRM
  version: 20.0.0
  description: >-
    OAS 3.0.1 specification of the Generic RAN NRM
    © 2026, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC).
    All rights reserved.
externalDocs:
  description: 3GPP TS 28.541; 5G NRM, Generic RAN NRM
  url: http://www.3gpp.org/ftp/Specs/archive/28_series/28.541/
paths: {}
components:
  schemas:

#-------- Definition of types for name containment-----------------------------------------------------
    ManagedElement-ncO-GenericRanNrm:
      type: object
      properties:
        AntennaFunction:
          $ref: '#/components/schemas/AntennaFunction-Multiple'
        SectorEquipmentFunction:
          $ref: '#/components/schemas/SectorEquipmentFunction-Multiple'
#-------- Definition of concrete IOCs --------------------------------------------
    AntennaFunction-Single:
      type: object
      properties:
        beamTilt: 
          type: integer
          format: int32
        elevation:
          type: number
        retTiltValue:
          type: integer
          format: int32
        bearing:
          type: integer
          format: int32
        retGroupName:
          type: string
        maxAzimuthValue:
          type: integer
          format: int32
          minimum: 0
          maximum: 360
        minAzimuthValue:
          type: integer
          format: int32
          minimum: 0
          maximum: 360
        horizBeamwidth:
          type: integer
          format: int32
          minimum: 0
          maximum: 360
        vertBeamwidth:
          type: integer
          format: int32
          minimum: 0
          maximum: 360
        latitude:
          $ref: 'TS28623_ComDefs.yaml#/components/schemas/Latitude'
        longitude:
          $ref: 'TS28623_ComDefs.yaml#/components/schemas/Longitude'
        referenceFrom:
          $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnRo' 

    SectorEquipmentFunction-Single:
      type: object
      properties:
        fqBandList:
          description: >-
            The list of frequency bands/ranges supported by the hardware associated 
            with the SectorEquipmentFunction.
          type: array
          uniqueItems: true
          items:
            type: string
        confOutputPower:
          type: integer
          format: int32
        referenceFrom:
          $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnRo'
        referenceTo:
          $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn'
#-------- Definition of JSON arrays for name-contained IOCs ----------------------
    AntennaFunction-Multiple:
      type: array
      items:
        $ref: '#/components/schemas/AntennaFunction-Single'
    SectorEquipmentFunction-Multiple:
      type: array
      items:
        $ref: '#/components/schemas/SectorEquipmentFunction-Single'

#-------- Definitions in TS 28.541 for TS 28.532 ---------------------------------
    resources-genericRanNrm:
      oneOf:
        - $ref: '#/components/schemas/AntennaFunction-Single'
        - $ref: '#/components/schemas/SectorEquipmentFunction-Single'
+7 −2
Original line number Diff line number Diff line
openapi: 3.0.1
info:
  title: NDT NRM
  version: 19.1.0
  version: 19.2.0
  description: >-
    OAS 3.0.1 definition of the NDT NRM
    © 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC).
    © 2026, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC).
    All rights reserved.
externalDocs:
  description: 3GPP TS 28.561; Management aspects of Network Digital Twins
@@ -31,6 +31,7 @@ components:
          supportedNDTCapabilities:
            type: array
            uniqueItems: true
            minItems: 1
            items:
              $ref: '#/components/schemas/NDTCapability'
            description: >-
@@ -77,6 +78,7 @@ components:
          nDTJobOutputData:
            type: array
            uniqueItems: true
            minItems: 1
            items:
              $ref: '#/components/schemas/NDTOutputDataPoint'
            description: It indicates the list of NDTOutput(s) that are provided by the NDT function as the output for any task executed in an instantiated NDT job.
@@ -199,10 +201,13 @@ components:
      properties:
        performanceDataName:
          type: string
          maxItems: 1
        performanceDataValue:
          type: integer
          maxItems: 1
        performanceDataScalingFactor:
          type: integer
          maxItems: 1

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

Loading