Commit 5a6082c0 authored by Mirko Cano Soveri's avatar Mirko Cano Soveri
Browse files

Merge branch 'Integration_Rel19_SA5_164_YAML_Rebased_By_Coderator' into 'Rel-19'

Merged Request for Integration rel19 sa5 164 yaml rebased by coderator

See merge request !2009
parents e3dfe8a4 f16af608
Loading
Loading
Loading
Loading
Loading
+5 −5
Original line number Diff line number Diff line
openapi: 3.0.1
info:
  title: AI/ML NRM
  version: 19.3.0
  version: 19.4.0
  description: >-
    OAS 3.0.1 specification of the AI/ML NRM
    © 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC).
@@ -376,7 +376,7 @@ components:
          description: >
            List of MLTrainingFunction DNs capable of acting as FL clients.
            Applicable when fLRole = FL_SERVER.
          $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList' 
          $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnListRo' 
    
    FLRequirement:
      type: object
@@ -425,7 +425,7 @@ components:
      additionalProperties: false
      properties:
        clientRef:
          $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn'
          $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnRo'
        numberOfDataSamplesUsed:
          type: integer
        trainingTimeDuration:
@@ -604,7 +604,7 @@ components:
                    trainingRequestRef: ## Figure 7.3a.1.1.1-1 has no such pointer
                      $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnListRo'
                    participatingFLClientRefList:
                      $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList' 
                      $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnListRo' 
                    trainingReportRef:
                      $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnRo'
                    mLModelGeneratedRef:
@@ -981,7 +981,7 @@ components:
                        - ACTIVATED
                        - DEACTIVATED
                    managedActivationScope:
                      $ref: '#/components/schemas/AIMLManagementPolicy'
                      $ref: '#/components/schemas/ManagedActivationScope'
                    usedByFunctionRefList:
                      $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnListRo'
                    mLModelRefList:
+2 −2
Original line number Diff line number Diff line
openapi: 3.0.1
info:
  title: Fault Management NRM
  version: 19.2.0
  version: 19.3.0
  description: >-
    OAS 3.0.1 definition of the Fault Supervision MnS
    © 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC).
@@ -229,7 +229,7 @@ components:
                - EXTERNAL_TRANSMISSION_DEVICE_FAILURE
                - REDUCED_ALARM_REPORTING
                - REDUCED_EVENT_REPORTING
                - RECUCED_LOGGING_CAPABILITY
                - REDUCED_LOGGING_CAPABILITY
                - SYSTEM_RESOURCES_OVERLOAD
                - BROADCAST_CHANNEL_FAILURE
                - CONNECTION_ESTABLISHMENT_ERROR
+58 −44
Original line number Diff line number Diff line
openapi: 3.0.1
info:
  title: Intent NRM
  version: 19.3.0
  version: 19.4.0
  description: >-
    OAS 3.0.1 definition of the Intent NRM
    © 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC).
@@ -38,20 +38,20 @@ components:
            items:
              type: object
              oneOf:
                - $ref: "#/components/schemas/IntentExpectation"
                - $ref: "TS28312_IntentExpectations.yaml#/components/schemas/RadioNetworkExpectation"
                - $ref: "TS28312_IntentExpectations.yaml#/components/schemas/EdgeServiceSupportExpectation"
                - $ref: "TS28312_IntentExpectations.yaml#/components/schemas/5GCNetworkExpectation"
                - $ref: "TS28312_IntentExpectations.yaml#/components/schemas/RadioServiceExpectation"
                - $ref: "TS28312_IntentExpectations.yaml#/components/schemas/NetworkMaintenanceExpectation"
                - $ref: '#/components/schemas/IntentExpectation'
                - $ref: 'TS28312_IntentExpectations.yaml#/components/schemas/RadioNetworkExpectation'
                - $ref: 'TS28312_IntentExpectations.yaml#/components/schemas/EdgeServiceSupportExpectation'
                - $ref: 'TS28312_IntentExpectations.yaml#/components/schemas/5GCNetworkExpectation'
                - $ref: 'TS28312_IntentExpectations.yaml#/components/schemas/RadioServiceExpectation'
                - $ref: 'TS28312_IntentExpectations.yaml#/components/schemas/NetworkMaintenanceExpectation'
          intentMgmtPurpose:
            $ref: "#/components/schemas/IntentMgmtPurpose"
            $ref: '#/components/schemas/IntentMgmtPurpose'
          contextSelectivity:
            $ref: "#/components/schemas/Selectivity"
            $ref: '#/components/schemas/Selectivity'
          consumerSatisfactionIndexThreshold:
            type: integer
          expectationSelectivity:
            $ref: "#/components/schemas/Selectivity"
            $ref: '#/components/schemas/Selectivity'
          intentContexts:
            type: array
            uniqueItems: true
@@ -65,6 +65,7 @@ components:
            enum:
              - ACTIVATED
              - DEACTIVATED
            default: ACTIVATED
            description: >-
              It describes the intent administrative state. 
              This attribute is used when MnS consumer-suspension mechanism is supported
@@ -76,6 +77,9 @@ components:
          intentPreemptionCapability:
            type: boolean
          intentReportControl:
            type: array
            uniqueItems: true
            items:
              $ref: '#/components/schemas/IntentReportControl'
          implicitIntentIndex:
            type: boolean
@@ -101,7 +105,10 @@ components:
            $ref: '#/components/schemas/IntentFeasibilityCheckReport'
          intentExplorationReport:
            $ref: '#/components/schemas/IntentExplorationReport'
          intentUtilityReport:
          intentUtilityReports:
            type: array
            uniqueItems: true
            items:
              $ref: '#/components/schemas/IntentUtilityReport'
          intentFulfilmentNegotiationReport:
            $ref: '#/components/schemas/IntentFulfilmentNegotiationReport'
@@ -132,6 +139,8 @@ components:
            $ref: '#/components/schemas/Intent-Multiple'
          IntentReport:
            $ref: '#/components/schemas/IntentReport-Multiple'
          IntentUtilityFormula:
             $ref: '#/components/schemas/IntentUtilityFormula-Multiple'
    IntentUtilityFormula-Single:
      description: >- 
       It represents an intent utility function instance.
@@ -146,14 +155,11 @@ components:
            items:
              $ref: '#/components/schemas/UtilityParameter'
            uniqueItems: true
            minItems: 1
          utilityScale:
            type: number
            minItems: 1
            default: 0
            default: 1
          utilityOffset:
            type: number
            minItems: 1
            default: 0
   #-------Definition of generic IOCs ----------#  

@@ -421,18 +427,15 @@ components:
        expectedReportTypes:
          description: >-
            It indicates the type of IntentReports.
          type: string
          enum:
            - INTENT_FULFILMENT_REPORT
            - INTENT_CONFLICT_REPORT
            - INTENT_FEASIBILITY_CHECK_REPORT
            - INTENT_EXPLORATION_REPORT
            - INTENT_FULFILMENT_NEGOTIATION_REPORT
            - INTENT_UTILITY_REPORT
          type: array
          uniqueItems: true
          items:
            $ref: '#/components/schemas/ExpectedReportType'
        reportingConditions:
          description: >-
             It indicates the specified conditions for intent reporting.
          type: array
          uniqueItems: true
          items:
            $ref: '#/components/schemas/ReportingCondition'
        reportingTargets:
@@ -444,6 +447,15 @@ components:
      required:
        - reportRecipientAddress
        - observationPeriod
    ExpectedReportType:
      type: string
      enum:
        - INTENT_FULFILMENT_REPORT
        - INTENT_CONFLICT_REPORT
        - INTENT_FEASIBILITY_CHECK_REPORT
        - INTENT_EXPLORATION_REPORT
        - INTENT_FULFILMENT_NEGOTIATION_REPORT
        - INTENT_UTILITY_REPORT
    ReportingCondition:
      description: >-
        It describes  the specified conditions for intent reporting.
@@ -466,8 +478,8 @@ components:
            - type: array
              uniqueItems: true
              items:
                $ref: "#/components/schemas/ValueRangeType"
            - $ref: "#/components/schemas/ValueRangeType"
                $ref: '#/components/schemas/ValueRangeType'
            - $ref: '#/components/schemas/ValueRangeType'
   #-------Definition of the concrete IntentReportControl dataType----------------#


@@ -609,6 +621,7 @@ components:
        infeasibilityReasons:
          description: An attribute which is used when feasibilityCheckResult is INFEASIBLE
          type: array
          uniqueItems: true
          items:
            type: string
            readOnly: true
@@ -633,6 +646,7 @@ components:
          readOnly: true
        inFeasibleTargets:
          type: array
          uniqueItems: true
          items:
            type: string
            readOnly: true
@@ -835,7 +849,7 @@ components:
   #-------Definition of the generic UtilityResult dataType----------------#
    UtilityResult:   
      description: >-
        It represents the inputs for the specified Intent Utility Function.
        It provides the result for the specified Intent Utility Function.
      type: object
      properties:
        utilityFunctionId:
+3 −3
Original line number Diff line number Diff line
openapi: 3.0.1
info:
  title: Provisioning MnS
  version: 19.1.0
  version: 19.2.0
  description: >-
    OAS 3.0.1 definition of the Provisioning MnS
    © 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC).
@@ -388,9 +388,9 @@ paths:
        With HTTP DELETE one resource is deleted. The resources to be deleted is
        identified with the target URI.
      responses:
        '200':
        '204':
          description: >-
            Success case ("200 OK").
            Success case ("204 No Content").
            This status code is returned, when the resource has been successfully deleted.
            The response body is empty.
        default:
+29 −4
Original line number Diff line number Diff line
openapi: 3.0.1
info:
  title: 3GPP 5GC NRM
  version: 19.5.0
  version: 19.6.0
  description: >-
    OAS 3.0.1 specification of the 5GC NRM
    © 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC).
@@ -1943,6 +1943,7 @@ components:
          type: integer
          minimum: 0
          maximum: 4294967295
          format: int64
        trpMappingInfoList:
          type: array
          uniqueItems: true
@@ -2936,6 +2937,7 @@ components:
          type: integer
          minimum: 0
          maximum: 4294967295
          format: int64
        ngeNbId:
          type: string
          pattern: '^(MacroNGeNB-[A-Fa-f0-9]{5}|LMacroNGeNB-[A-Fa-f0-9]{6}|SMacroNGeNB-[A-Fa-f0-9]{5})$'
@@ -3846,7 +3848,26 @@ components:
            $ref: 'TS28541_NrNrm.yaml#/components/schemas/ServedAIOTAreaID'
        readerLocation:
          type: string

    AIoTNEFMapping:
      type: object
      required:
        - targetAreaAF
        - internalTargetArea
      properties:
        targetAreaAF:
          $ref: 'TS28623_ComDefs.yaml#/components/schemas/GeoArea'
        internalTargetArea:
          $ref: 'TS28623_GenericNrm.yaml#/components/schemas/AreaScope'
    AIoTNRFMapping:
      type: object
      required:
        - aIOTFdN
        - internalTargetArea
      properties:
        aIOTFdN:
          $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn'
        internalTargetArea:
          $ref: 'TS28541_NrNrm.yaml#/components/schemas/ServedAIOTAreaID'

#-------- Definition of types for name-containments ------
    SubNetwork-ncO-5GcNrm:
@@ -4396,6 +4417,8 @@ components:
                      $ref: '#/components/schemas/NrfInfo'
                    managedNFProfile:
                      $ref: '#/components/schemas/ManagedNFProfile'
                    aIoTNRFMapping:
                      $ref: '#/components/schemas/AIoTNRFMapping'
        - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO'
        - $ref: '#/components/schemas/ManagedFunction5GC-nc0'           
        - type: object
@@ -4654,6 +4677,8 @@ components:
                      readOnly: true
                    nefInfo:
                       $ref: '#/components/schemas/NefInfo'
                    AIoTNEFMapping:
                       $ref: '#/components/schemas/AIoTNEFMapping' 
        - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO'
        - $ref: '#/components/schemas/ManagedFunction5GC-nc0'           
        - type: object
Loading