Commit 03f31170 authored by ruiyue's avatar ruiyue
Browse files

Merge branch 'TS28623_Separate_yaml_file_for_several_control_NRM_fragment'...

Merge branch 'TS28623_Separate_yaml_file_for_several_control_NRM_fragment' into 'Integration_Rel18_SA5_153_YAML'

TS28.623 Rel-18 CR 0312 Separate yaml file for control NRM fragment

See merge request !981
parents 5e5771ca c3a934cd
Loading
Loading
Loading
Loading
Loading
+2 −2
Original line number Diff line number Diff line
@@ -70,7 +70,7 @@ components:
        thresholdList:
          type: array
          items:
            $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ThresholdInfo'
            $ref: 'TS28623_ThresholdMonitorNrm.yaml#/components/schemas/ThresholdInfo'

    SupportedPerfIndicator:
      type: object
@@ -201,7 +201,7 @@ components:
            MLTrainingReport:
              $ref: '#/components/schemas/MLTrainingReport-Multiple'
            ThresholdMonitors:
              $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ThresholdMonitor-Multiple'
              $ref: 'TS28623_ThresholdMonitorNrm.yaml#/components/schemas/ThresholdMonitor-Multiple'

    MLTrainingRequest-Single:
      allOf:
+1 −1
Original line number Diff line number Diff line
@@ -77,7 +77,7 @@ components:
              $ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTime'
    DsoThresholdMonitor-Single:
      allOf:
        - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ThresholdMonitor-Single'
        - $ref: 'TS28623_ThresholdMonitorNrm.yaml#/components/schemas/ThresholdMonitor-Single'
        - type: object
          properties:
            targetThresholdLocation:
+9 −1
Original line number Diff line number Diff line
@@ -429,6 +429,14 @@ components:
            - $ref: 'TS28105_AiMlNrm.yaml#/components/schemas/resources-AiMlNrm'                           
            - $ref: 'TS28538_EdgeNrm.yaml#/components/schemas/resources-edgeNrm'
            - $ref: 'TS28317_RanScNrm.yaml#/components/schemas/resources-RanScNrm'   
            - $ref: 'TS28623_FileManagementNrm.yaml#/components/schemas/resources-fileMgmtNrm'
            - $ref: 'TS28623_ManagementDataCollectionNrm.yaml#/components/schemas/resources-mgmtDataCollectionNrm'
            - $ref: 'TS28623_MnSRegistryNrm.yaml#/components/schemas/resources-mnSRegistryNrm'     
            - $ref: 'TS28623_PmControlNrm.yaml#/components/schemas/resources-pmControlNrm'      
            - $ref: 'TS28623_QoEMeasurementCollectionNrm.yaml#/components/schemas/resources-qoEMeasuremetCollectionNrm' 
            - $ref: 'TS28623_SubscriptionControlNrm.yaml#/components/schemas/resources-subscriptionControlNrm'  
            - $ref: 'TS28623_ThresholdMonitorNrm.yaml#/components/schemas/resources-thresholdMonitorNrm'   
            - $ref: 'TS28623_TraceControlNrm.yaml#/components/schemas/resources-traceControlNrm'                                                                                                              
            - $ref: 'TS28319_MsacNrm.yaml#/components/schemas/resources-msacNrm'
    Scope:
      type: object
+157 −0
Original line number Diff line number Diff line
openapi: 3.0.1
info:
  title: File Management NRM
  version: 18.6.0
  description: >-
    OAS 3.0.1 definition of the File Management NRM fragment
    © 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC).
    All rights reserved.
externalDocs:
  description: 3GPP TS 28.623; Generic NRM, File Management NRM 
  url: http://www.3gpp.org/ftp/Specs/archive/28_series/28.623/
paths: {}
components:
  schemas:
#-------- Definition of types-----------------------------------------------------
    FileDownloadJobProcessMonitor:
      description: >-
        This data type is the "ProcessMonitor" data type with specialisations
        for usage in the "FileDownloadJob".
      type: object
      properties:
        jobId:
          type: string
        status:
          type: string
          enum:
            - NOT_STARTED
            - RUNNING
            - FINSHED
            - FAILED
            - CANCELLING
            - CANCELLED
        progressPercentage:
          type: integer
          minimum: 0
          maximum: 100
        progressStateInfo:
          type: string
        resultStateInfo:
          oneOf:
            - type: string
              enum:
                - NULL
                - UNKNOWN
                - NO_STORAGE
                - LOW_MEMROY
                - NO_CONNECTION_TO_REMOTE_SERVER
                - FILE_NOT_AVAILABLE
                - DNS_CANNOT_BE_RESOLVED
                - TIMER_EXPIRED
                - OTHER
            - type: string
        startTime:
          $ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTime'
        endTime:
          $ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTime'
        timer:
          type: integer

#-------- Definition of concrete IOCs --------------------------------------------


    FileDownloadJob-Single:
      allOf:
        - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top'
        - type: object
          properties:
            attributes:
              type: object
              properties:
                fileLocation:
                  type: string
                notificationRecipientAddress:
                  $ref: 'TS28623_ComDefs.yaml#/components/schemas/Uri'
                cancelJob:
                  type: string
                  enum:
                    - TRUE
                    - FALSE
                jobMonitor:
                  $ref: '#/components/schemas/FileDownloadJobProcessMonitor'
    Files-Single:
      allOf:
        - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top'
        - type: object
          properties:
            attributes:
              type: object
              properties:
                numberOfFiles:
                  type: integer
                jobRef:
                  $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn'
                jobId:
                  type: string
                File:
                  $ref: '#/components/schemas/File-Multiple'
    File-Single:
      allOf:
        - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top'
        - type: object
          properties:
            attributes:
              type: object
              properties:
                fileLocation:
                  $ref: 'TS28623_ComDefs.yaml#/components/schemas/Uri'
                fileCompression:
                  type: string
                fileSize:
                  type: integer
                fileDataType:
                  type: string
                  enum:
                    - PERFORMANCE
                    - TRACE
                    - ANALYTICS
                    - PROPRIETARY
                fileFormat:
                  type: string
                fileReadyTime:
                  $ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTime'
                fileExpirationTime:
                  $ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTime'
                fileContent:
                  type: string
                jobRef:
                  $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn'
                jobId:
                  type: string
 
            

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

    FileDownloadJob-Multiple:
      type: array
      items:
        $ref: '#/components/schemas/FileDownloadJob-Single'
    Files-Multiple:
      type: array
      items:
        $ref: '#/components/schemas/Files-Single'
    File-Multiple:
      type: array
      items:
        $ref: '#/components/schemas/File-Single'



#-------- Definitions in TS 28.623 for TS 28.532 ---------------------------------
    resources-fileMgmtNrm:
      oneOf:
       - $ref: '#/components/schemas/FileDownloadJob-Single'
       - $ref: '#/components/schemas/Files-Single'    
       - $ref: '#/components/schemas/File-Single'
       
+18 −435

File changed.

Preview size limit exceeded, changes collapsed.

Loading