Commit 0cedd337 authored by sunse's avatar sunse
Browse files

Merge branch '28.623_Rel-19_CR0542' into 'Integration_Rel19_SA5_161_YAML'

28.623_Rel-19_CR0542

See merge request !1777
parents 8522f0c0 479e526c
Loading
Loading
Loading
Loading
Loading
+65 −2
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@ info:
  version: 19.0.0
  description: >-
    OAS 3.0.1 definition of the Management Data Collection NRM fragment
    © 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC).
    © 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC).
    All rights reserved.
externalDocs:
  description: 3GPP TS 28.623; Generic NRM, Management Data Collection NRM
@@ -18,6 +18,8 @@ components:
      properties:
        ManagementDataCollection:
          $ref: '#/components/schemas/ManagementDataCollection-Multiple'
        ExternalDataType:
          $ref: '#/components/schemas/ExternalDataType-Multiple'
    
   #-------Definition of generic IOCs ----------# 

@@ -54,6 +56,31 @@ components:
            - UP
        sst:
          type: integer
        objectInstances:
          type: array
          uniqueItems: true
          items:
            $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn'

    ExternalDataScope:
      type: object
      properties:
        geoAreas:
          type: array
          uniqueItems: true
          items:
            $ref: 'TS28623_ComDefs.yaml#/components/schemas/GeoArea'
        objectInstancesIncluded:
          type: array
          uniqueItems: true
          items:
            $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn'
        objectInstancesExcluded:
          type: array
          uniqueItems: true
          items:
            $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn'

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

    ManagementDataCollection-Single:
@@ -78,6 +105,37 @@ components:
                    - SNSSAI
                    - 5QI
                    - PLMN
                condition:
                  type: string
                processMonitor:
                  $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ProcessMonitor'
                consolidateOutput:
                  type: boolean
                jobId:
                  type: string

    ExternalDataType-Single:
      allOf:
      - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top'
      - type: object
        properties:
          attributes:
            type: object
            properties:
              externalDataType:
                type: string
              mediaLocation: 
                type: array
                uniqueItems: true
                items:
                  $ref: 'TS28623_ComDefs.yaml#/components/schemas/Uri'
              externalDataTypeSchema:
                type: string
              externalDataScope:
                type: array
                uniqueItems: true
                items:
                  $ref: '#/components/schemas/ExternalDataScope'

#-------- Definition of YAML arrays for name-contained IOCs ----------------------
    ManagementDataCollection-Multiple:
@@ -85,9 +143,14 @@ components:
      items:
        $ref: '#/components/schemas/ManagementDataCollection-Single'
      
    ExternalDataType-Multiple:
      type: array
      items:
        $ref: '#/components/schemas/ExternalDataType-Single'
#-------- Definitions in TS 28.623 for TS 28.532 ---------------------------------
    resources-mgmtDataCollectionNrm:
      oneOf:
       - $ref: '#/components/schemas/ManagementDataCollection-Single'
       - $ref: '#/components/schemas/ExternalDataType-Single'
     
       
+82 −0
Original line number Diff line number Diff line
@@ -62,6 +62,8 @@ components:
          properties:
            MnsInfo:
              $ref: '#/components/schemas/MnsInfo-Multiple'
            MgmtDataInfo:
              $ref: '#/components/schemas/MgmtDataInfo-Multiple'

    MnsInfo-Single:
      allOf:
@@ -98,6 +100,16 @@ components:
               items:
                 $ref: '#/components/schemas/MnsScope'
               minItems: 1
             mgmtDataInfoRef:
               description: >-
                 List of DN of MgmtDataInfo instance(s) which are associated the MnSInfo which represent a
                 management service instance
               type: array
               items:
                 $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn'
               uniqueItems: true
               minItems: 1 

    MnsScope:
      description: ->
        It defines the information about the management scope of the Management Service.
@@ -115,6 +127,71 @@ components:
          items:
            $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Tai'

    MgmtDataInfo-Single:
      allOf:
        - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top'
        - type: object
          properties:
            supportedManagementData:             
              description: >-
                It defines the list of management data that can be supported.
              type: array
              uniqueItems: true
              items:           
                $ref: 'TS28623_ManagementDataCollectionNrm.yaml#/components/schemas/ManagementData'
            supportedGranularityPeriods:
              description: >-
                Granularity periods supported for the production of associated management data.
                The period is defined in seconds.
              type: array
              items: 
                type: integer
              uniqueItems: true
            supportedReportingPeriods:
              description: >-
                Reporting periods supported for the associated management data.
                The period is defined in seconds.
              type: array
              items: 
                type: integer
              uniqueItems: true
            historicalDataPeriod:
              description: >-
                This attribute describes the maximum period of the requested
                historical data.
                The period is defined in seconds.
                When the value of this attribute is NULL, which means the 
                capability of querying historical data is not supported.
              type: integer
            supportedReportingMethod:
              description: >-
                List of supported reporting methods for the associated 
                management data.
              type: array
              uniqueItems: true
              items:
                type: string
                enum:
                  - FILE
                  - STREAM
              minItems: 1
            supportedDataScope:
              description: >-
               List of supported sub counter capabilities for the associated management data.
              type: array
              uniqueItems: true
              items:
               type: string
               enum:
                 - SNSSAI
                 - 5QI
                 - PLMN
              minItems: 1
            supportedDataRequestMnSRef:
              $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList'
            supportedDataReportingMnSRef:
              $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList'

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

    MnsInfo-Multiple:
@@ -122,9 +199,14 @@ components:
      items:
        $ref: '#/components/schemas/MnsInfo-Single'

    MgmtDataInfo-Multiple:
      type: array
      items:
        $ref: '#/components/schemas/MgmtDataInfo-Single'

#-------- Definitions in TS 28.623 for TS 28.532 ---------------------------------
    resources-mnSRegistryNrm:
      oneOf:
       - $ref: '#/components/schemas/MnsInfo-Single'
       - $ref: '#/components/schemas/MnsRegistry-Single'
       - $ref: '#/components/schemas/MgmtDataInfo-Single'
 No newline at end of file