From 0d41787de9a0d4b24dd37fee2c021b0dfbc2524a Mon Sep 17 00:00:00 2001 From: ruiyue Date: Tue, 16 Jan 2024 03:22:36 +0000 Subject: [PATCH 01/41] Upload New File --- OpenAPI/TS28623_FileManagementNrm.yaml | 157 +++++++++++++++++++++++++ 1 file changed, 157 insertions(+) create mode 100644 OpenAPI/TS28623_FileManagementNrm.yaml diff --git a/OpenAPI/TS28623_FileManagementNrm.yaml b/OpenAPI/TS28623_FileManagementNrm.yaml new file mode 100644 index 000000000..48ebf4e22 --- /dev/null +++ b/OpenAPI/TS28623_FileManagementNrm.yaml @@ -0,0 +1,157 @@ +openapi: 3.0.1 +info: + title: File Management NRM + version: 18.2.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 + 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' + -- GitLab From 1864ab41c3ff71a2d378031a82410f3f71a3317f Mon Sep 17 00:00:00 2001 From: ruiyue Date: Tue, 16 Jan 2024 03:23:09 +0000 Subject: [PATCH 02/41] Upload New File --- TS28623_FmControlNrm.yaml | 50 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 50 insertions(+) create mode 100644 TS28623_FmControlNrm.yaml diff --git a/TS28623_FmControlNrm.yaml b/TS28623_FmControlNrm.yaml new file mode 100644 index 000000000..8e814a917 --- /dev/null +++ b/TS28623_FmControlNrm.yaml @@ -0,0 +1,50 @@ +openapi: 3.0.1 +info: + title: FM Control NRM + version: 18.2.0 + description: >- + OAS 3.0.1 definition of the FM Control NRM fragment + © 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). + All rights reserved. +externalDocs: + description: 3GPP TS 28.623; Generic NRM + url: http://www.3gpp.org/ftp/Specs/archive/28_series/28.623/ +paths: {} +components: + schemas: +#-------- Definition of types----------------------------------------------------- + +#-------- Definition of concrete IOCs -------------------------------------------- + + AlarmList-Single: + allOf: + - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' + - type: object + properties: + attributes: + type: object + properties: + administrativeState: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/AdministrativeState' + operationalState: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/OperationalState' + numOfAlarmRecords: + type: integer + lastModification: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTime' + alarmRecords: + description: >- + This resource represents a map of alarm records. + The alarmIds are used as keys in the map. + type: object + additionalProperties: + $ref: 'TS28532_FaultMnS.yaml#/components/schemas/AlarmRecord' + +#-------- Definition of YAML arrays for name-contained IOCs ---------------------- + + + +#-------- Definitions in TS 28.623 for TS 28.532 --------------------------------- + resources-FmControlNrm: + oneOf: + - $ref: '#/components/schemas/AlarmList-Single' -- GitLab From 337d7e20bdff3d09cce1db4c80b44d5c50e75d66 Mon Sep 17 00:00:00 2001 From: ruiyue Date: Tue, 16 Jan 2024 03:23:34 +0000 Subject: [PATCH 03/41] Upload New File --- .../TS28623_ManagementDataCollectionNrm.yaml | 85 +++++++++++++++++++ 1 file changed, 85 insertions(+) create mode 100644 OpenAPI/TS28623_ManagementDataCollectionNrm.yaml diff --git a/OpenAPI/TS28623_ManagementDataCollectionNrm.yaml b/OpenAPI/TS28623_ManagementDataCollectionNrm.yaml new file mode 100644 index 000000000..545510a09 --- /dev/null +++ b/OpenAPI/TS28623_ManagementDataCollectionNrm.yaml @@ -0,0 +1,85 @@ +openapi: 3.0.1 +info: + title: Management Data Collection NRM + version: 18.2.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). + All rights reserved. +externalDocs: + description: 3GPP TS 28.623; Generic NRM + url: http://www.3gpp.org/ftp/Specs/archive/28_series/28.623/ +paths: {} +components: + schemas: +#-------- Definition of types----------------------------------------------------- + + ManagementData: + oneOf: + - type: array + items: + type: string + enum: + - COVERAGE + - CAPACITY + - ENERGY_EFFICIENCY + - MOBILITY + - ACCESSIBILITY + - type: array + items: + type: string + NodeFilter: + type: object + properties: + areaOfInterest: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/AreaOfInterest' + networkDomain: + type: string + enum: + - CN + - RAN + cpUpType: + type: string + enum: + - CP + - UP + sst: + type: integer + +#-------- Definition of concrete IOCs -------------------------------------------- + + ManagementDataCollection-Single: + allOf: + - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' + - type: object + properties: + attributes: + type: object + properties: + managementData: + $ref: '#/components/schemas/ManagementData' + targetNodeFilter: + $ref: '#/components/schemas/NodeFilter' + collectionTimeWindow: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/TimeWindow' + reportingCtrl: + $ref: 'S28623_GenericNrm.yaml#/components/schemas/ReportingCtrl' + dataScope: + type: string + enum: + - SNSSAI + - 5QI + - PLMN + +#-------- Definition of YAML arrays for name-contained IOCs ---------------------- + ManagementDataCollection-Multiple: + type: array + items: + $ref: '#/components/schemas/ManagementDataCollection-Single' + +#-------- Definitions in TS 28.623 for TS 28.532 --------------------------------- + resources-MgmtDataCollectionNrm: + oneOf: + - $ref: '#/components/schemas/ManagementDataCollection-Single' + + -- GitLab From 4801304db5d9c5c0c19293cb0c3333369433c7ea Mon Sep 17 00:00:00 2001 From: ruiyue Date: Tue, 16 Jan 2024 03:23:53 +0000 Subject: [PATCH 04/41] Upload New File --- TS28623_MnSRegistryNrm.yaml | 67 +++++++++++++++++++++++++++++++++++++ 1 file changed, 67 insertions(+) create mode 100644 TS28623_MnSRegistryNrm.yaml diff --git a/TS28623_MnSRegistryNrm.yaml b/TS28623_MnSRegistryNrm.yaml new file mode 100644 index 000000000..2b7b59bd9 --- /dev/null +++ b/TS28623_MnSRegistryNrm.yaml @@ -0,0 +1,67 @@ +openapi: 3.0.1 +info: + title: MnS Registry NRM + version: 18.2.0 + description: >- + OAS 3.0.1 definition of the MnS Registry NRM fragment + © 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). + All rights reserved. +externalDocs: + description: 3GPP TS 28.623; Generic NRM + url: http://www.3gpp.org/ftp/Specs/archive/28_series/28.623/ +paths: {} +components: + schemas: +#-------- Definition of types----------------------------------------------------- + +#-------- Definition of concrete IOCs -------------------------------------------- + MnsRegistry-Single: + allOf: + - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' + - type: object + properties: + MnsInfo: + $ref: '#/components/schemas/MnsInfo-Multiple' + + MnsInfo-Single: + allOf: + - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' + - type: object + properties: + mnsLabel: + type: string + mnsType: + type: string + enum: + - ProvMnS + - FaultSupervisionMnS + - StreamingDataReportingMnS + - FileDataReportingMnS + mnsVersion: + type: string + mnsAddress: + description: Resource URI as defined in the relevant Technical Specification + $ref: 'TS28623_ComDefs.yaml#/components/schemas/Uri' + mnsScope: + description: >- + List of the managed object instances that can be accessed using the MnS. + If a complete SubNetwork can be accessed using the MnS, this attribute may + contain the DN of the SubNetwork instead of the DNs of the individual managed + entities within the SubNetwork. + type: array + items: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' + +#-------- Definition of YAML arrays for name-contained IOCs ---------------------- + + MnsInfo-Multiple: + type: array + items: + $ref: '#/components/schemas/MnsInfo-Single' + + +#-------- Definitions in TS 28.623 for TS 28.532 --------------------------------- + resources-MnSRegistryNrm: + oneOf: + - $ref: '#/components/schemas/MnsInfo-Single' + - $ref: '#/components/schemas/MnsRegistry-Single' -- GitLab From a97b43c3811ca3502f812036e34814ea4c5a931f Mon Sep 17 00:00:00 2001 From: ruiyue Date: Tue, 16 Jan 2024 03:24:15 +0000 Subject: [PATCH 05/41] Upload New File --- TS28623_PmControlNrm.yaml | 64 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 64 insertions(+) create mode 100644 TS28623_PmControlNrm.yaml diff --git a/TS28623_PmControlNrm.yaml b/TS28623_PmControlNrm.yaml new file mode 100644 index 000000000..194438255 --- /dev/null +++ b/TS28623_PmControlNrm.yaml @@ -0,0 +1,64 @@ +openapi: 3.0.1 +info: + title: PM control NRM + version: 18.2.0 + description: >- + OAS 3.0.1 definition of the PM control NRM fragment + © 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). + All rights reserved. +externalDocs: + description: 3GPP TS 28.623; Generic NRM + url: http://www.3gpp.org/ftp/Specs/archive/28_series/28.623/ +paths: {} +components: + schemas: +#-------- Definition of types----------------------------------------------------- + + +#-------- Definition of concrete IOCs -------------------------------------------- + PerfMetricJob-Single: + allOf: + - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' + - type: object + properties: + attributes: + type: object + not: + required: [ conditionMonitorRef, schedulerRef ] + properties: + administrativeState: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/AdministrativeState' + operationalState: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/OperationalState' + jobId: + type: string + performanceMetrics: + type: array + items: + type: string + granularityPeriod: + type: integer + minimum: 1 + objectInstances: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList' + rootObjectInstances: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList' + conditionMonitorRef: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' + schedulerRef: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' + reportingCtrl: + $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ReportingCtrl' + Files: + $ref: 'TS28623_FileManagementNrm.yaml#/components/schemas/Files-Multiple' + +#-------- Definition of YAML arrays for name-contained IOCs ---------------------- + PerfMetricJob-Multiple: + type: array + items: + $ref: '#/components/schemas/PerfMetricJob-Single' + +#-------- Definitions in TS 28.623 for TS 28.532 --------------------------------- + resources-PmControlNrm: + oneOf: + - $ref: '#/components/schemas/PerfMetricJob-Single' -- GitLab From f138fbcaebff999f513c89c46eafc0413ad1908a Mon Sep 17 00:00:00 2001 From: ruiyue Date: Tue, 16 Jan 2024 03:24:53 +0000 Subject: [PATCH 06/41] Upload New File --- TS28623_SubscriptionControlNrm.yaml | 75 +++++++++++++++++++++++++++++ 1 file changed, 75 insertions(+) create mode 100644 TS28623_SubscriptionControlNrm.yaml diff --git a/TS28623_SubscriptionControlNrm.yaml b/TS28623_SubscriptionControlNrm.yaml new file mode 100644 index 000000000..ecc5097f8 --- /dev/null +++ b/TS28623_SubscriptionControlNrm.yaml @@ -0,0 +1,75 @@ +openapi: 3.0.1 +info: + title: Subscription Control NRM + version: 18.2.0 + description: >- + OAS 3.0.1 definition of the Subscription Control NRM fragment + © 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). + All rights reserved. +externalDocs: + description: 3GPP TS 28.623; Generic NRM + url: http://www.3gpp.org/ftp/Specs/archive/28_series/28.623/ +paths: {} +components: + schemas: +#-------- Definition of types----------------------------------------------------- + Scope: + type: object + properties: + scopeType: + type: string + enum: + - BASE_ONLY + - BASE_ALL + - BASE_NTH_LEVEL + - BASE_SUBTREE + scopeLevel: + type: integer + +#-------- Definition of concrete IOCs -------------------------------------------- + NtfSubscriptionControl-Single: + allOf: + - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' + - type: object + properties: + attributes: + type: object + properties: + notificationRecipientAddress: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/Uri' + notificationTypes: + type: array + items: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/NotificationType' + scope: + $ref: '#/components/schemas/Scope' + notificationFilter: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/Filter' + HeartbeatControl: + $ref: '#/components/schemas/HeartbeatControl-Single' + HeartbeatControl-Single: + allOf: + - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' + - type: object + properties: + attributes: + type: object + properties: + heartbeatNtfPeriod: + type: integer + minimum: 0 + triggerHeartbeatNtf: + type: boolean + +#-------- Definition of YAML arrays for name-contained IOCs ---------------------- + NtfSubscriptionControl-Multiple: + type: array + items: + $ref: '#/components/schemas/NtfSubscriptionControl-Single' + + +#-------- Definitions in TS 28.623 for TS 28.532 --------------------------------- + resources-SubscriptionControlNrm: + oneOf: + - $ref: '#/components/schemas/NtfSubscriptionControl-Single' + - $ref: '#/components/schemas/HeartbeatControl-Single' \ No newline at end of file -- GitLab From 867acb976f28044d0bddb4ea3dbc6bc61f211a00 Mon Sep 17 00:00:00 2001 From: ruiyue Date: Tue, 16 Jan 2024 03:25:20 +0000 Subject: [PATCH 07/41] Upload New File --- TS28623_ThresholdMonitorNrm.yaml | 76 ++++++++++++++++++++++++++++++++ 1 file changed, 76 insertions(+) create mode 100644 TS28623_ThresholdMonitorNrm.yaml diff --git a/TS28623_ThresholdMonitorNrm.yaml b/TS28623_ThresholdMonitorNrm.yaml new file mode 100644 index 000000000..6d2ad2853 --- /dev/null +++ b/TS28623_ThresholdMonitorNrm.yaml @@ -0,0 +1,76 @@ +openapi: 3.0.1 +info: + title: Threshold Monitor NRM + version: 18.2.0 + description: >- + OAS 3.0.1 definition of the Threshold Monitor NRM fragment + © 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). + All rights reserved. +externalDocs: + description: 3GPP TS 28.623; Generic NRM + url: http://www.3gpp.org/ftp/Specs/archive/28_series/28.623/ +paths: {} +components: + schemas: +#-------- Definition of types----------------------------------------------------- + ThresholdInfo: + type: object + properties: + performanceMetrics: + type: array + items: + type: string + thresholdDirection: + type: string + enum: + - UP + - DOWN + - UP_AND_DOWN + thresholdValue: + oneOf: + - type: integer + - $ref: 'TS28623_ComDefs.yaml#/components/schemas/Float' + hysteresis: + oneOf: + - type: integer + minimum: 0 + - type: number + format: float + + +#-------- Definition of concrete IOCs -------------------------------------------- + ThresholdMonitor-Single: + allOf: + - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' + - type: object + properties: + attributes: + type: object + properties: + administrativeState: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/AdministrativeState' + operationalState: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/OperationalState' + thresholdInfoList: + type: array + items: + $ref: '#/components/schemas/ThresholdInfo' + monitorGranularityPeriod: + type: integer + minimum: 1 + objectInstances: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList' + rootObjectInstances: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList' + + +#-------- Definition of YAML arrays for name-contained IOCs ---------------------- + ThresholdMonitor-Multiple: + type: array + items: + $ref: '#/components/schemas/ThresholdMonitor-Single' + +#-------- Definitions in TS 28.623 for TS 28.532 --------------------------------- + resources-ThresholdMonitorNrm: + oneOf: + - $ref: '#/components/schemas/ThresholdMonitor-Single' -- GitLab From 0a0690bcd27f6ed783aa7738c69fe333d7561729 Mon Sep 17 00:00:00 2001 From: ruiyue Date: Tue, 16 Jan 2024 03:32:46 +0000 Subject: [PATCH 08/41] Update file TS28623_ManagementDataCollectionNrm.yaml --- OpenAPI/TS28623_ManagementDataCollectionNrm.yaml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/OpenAPI/TS28623_ManagementDataCollectionNrm.yaml b/OpenAPI/TS28623_ManagementDataCollectionNrm.yaml index 545510a09..83a4eb8c1 100644 --- a/OpenAPI/TS28623_ManagementDataCollectionNrm.yaml +++ b/OpenAPI/TS28623_ManagementDataCollectionNrm.yaml @@ -45,7 +45,6 @@ components: - UP sst: type: integer - #-------- Definition of concrete IOCs -------------------------------------------- ManagementDataCollection-Single: @@ -63,7 +62,7 @@ components: collectionTimeWindow: $ref: 'TS28623_ComDefs.yaml#/components/schemas/TimeWindow' reportingCtrl: - $ref: 'S28623_GenericNrm.yaml#/components/schemas/ReportingCtrl' + $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ReportingCtrl' dataScope: type: string enum: -- GitLab From 92b3db13a7825e9bd61fd119b7245107d978b74e Mon Sep 17 00:00:00 2001 From: ruiyue Date: Tue, 16 Jan 2024 03:36:46 +0000 Subject: [PATCH 09/41] Delete TS28623_FmControlNrm.yaml --- TS28623_FmControlNrm.yaml | 50 --------------------------------------- 1 file changed, 50 deletions(-) delete mode 100644 TS28623_FmControlNrm.yaml diff --git a/TS28623_FmControlNrm.yaml b/TS28623_FmControlNrm.yaml deleted file mode 100644 index 8e814a917..000000000 --- a/TS28623_FmControlNrm.yaml +++ /dev/null @@ -1,50 +0,0 @@ -openapi: 3.0.1 -info: - title: FM Control NRM - version: 18.2.0 - description: >- - OAS 3.0.1 definition of the FM Control NRM fragment - © 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). - All rights reserved. -externalDocs: - description: 3GPP TS 28.623; Generic NRM - url: http://www.3gpp.org/ftp/Specs/archive/28_series/28.623/ -paths: {} -components: - schemas: -#-------- Definition of types----------------------------------------------------- - -#-------- Definition of concrete IOCs -------------------------------------------- - - AlarmList-Single: - allOf: - - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' - - type: object - properties: - attributes: - type: object - properties: - administrativeState: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/AdministrativeState' - operationalState: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/OperationalState' - numOfAlarmRecords: - type: integer - lastModification: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTime' - alarmRecords: - description: >- - This resource represents a map of alarm records. - The alarmIds are used as keys in the map. - type: object - additionalProperties: - $ref: 'TS28532_FaultMnS.yaml#/components/schemas/AlarmRecord' - -#-------- Definition of YAML arrays for name-contained IOCs ---------------------- - - - -#-------- Definitions in TS 28.623 for TS 28.532 --------------------------------- - resources-FmControlNrm: - oneOf: - - $ref: '#/components/schemas/AlarmList-Single' -- GitLab From bab78440412acb079cd4674cde9f73061db8f37d Mon Sep 17 00:00:00 2001 From: ruiyue Date: Tue, 16 Jan 2024 03:36:55 +0000 Subject: [PATCH 10/41] Delete TS28623_MnSRegistryNrm.yaml --- TS28623_MnSRegistryNrm.yaml | 67 ------------------------------------- 1 file changed, 67 deletions(-) delete mode 100644 TS28623_MnSRegistryNrm.yaml diff --git a/TS28623_MnSRegistryNrm.yaml b/TS28623_MnSRegistryNrm.yaml deleted file mode 100644 index 2b7b59bd9..000000000 --- a/TS28623_MnSRegistryNrm.yaml +++ /dev/null @@ -1,67 +0,0 @@ -openapi: 3.0.1 -info: - title: MnS Registry NRM - version: 18.2.0 - description: >- - OAS 3.0.1 definition of the MnS Registry NRM fragment - © 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). - All rights reserved. -externalDocs: - description: 3GPP TS 28.623; Generic NRM - url: http://www.3gpp.org/ftp/Specs/archive/28_series/28.623/ -paths: {} -components: - schemas: -#-------- Definition of types----------------------------------------------------- - -#-------- Definition of concrete IOCs -------------------------------------------- - MnsRegistry-Single: - allOf: - - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' - - type: object - properties: - MnsInfo: - $ref: '#/components/schemas/MnsInfo-Multiple' - - MnsInfo-Single: - allOf: - - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' - - type: object - properties: - mnsLabel: - type: string - mnsType: - type: string - enum: - - ProvMnS - - FaultSupervisionMnS - - StreamingDataReportingMnS - - FileDataReportingMnS - mnsVersion: - type: string - mnsAddress: - description: Resource URI as defined in the relevant Technical Specification - $ref: 'TS28623_ComDefs.yaml#/components/schemas/Uri' - mnsScope: - description: >- - List of the managed object instances that can be accessed using the MnS. - If a complete SubNetwork can be accessed using the MnS, this attribute may - contain the DN of the SubNetwork instead of the DNs of the individual managed - entities within the SubNetwork. - type: array - items: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' - -#-------- Definition of YAML arrays for name-contained IOCs ---------------------- - - MnsInfo-Multiple: - type: array - items: - $ref: '#/components/schemas/MnsInfo-Single' - - -#-------- Definitions in TS 28.623 for TS 28.532 --------------------------------- - resources-MnSRegistryNrm: - oneOf: - - $ref: '#/components/schemas/MnsInfo-Single' - - $ref: '#/components/schemas/MnsRegistry-Single' -- GitLab From 3c0fc1abf74c2940ff33170246a7a2e8131466aa Mon Sep 17 00:00:00 2001 From: ruiyue Date: Tue, 16 Jan 2024 03:37:03 +0000 Subject: [PATCH 11/41] Delete TS28623_PmControlNrm.yaml --- TS28623_PmControlNrm.yaml | 64 --------------------------------------- 1 file changed, 64 deletions(-) delete mode 100644 TS28623_PmControlNrm.yaml diff --git a/TS28623_PmControlNrm.yaml b/TS28623_PmControlNrm.yaml deleted file mode 100644 index 194438255..000000000 --- a/TS28623_PmControlNrm.yaml +++ /dev/null @@ -1,64 +0,0 @@ -openapi: 3.0.1 -info: - title: PM control NRM - version: 18.2.0 - description: >- - OAS 3.0.1 definition of the PM control NRM fragment - © 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). - All rights reserved. -externalDocs: - description: 3GPP TS 28.623; Generic NRM - url: http://www.3gpp.org/ftp/Specs/archive/28_series/28.623/ -paths: {} -components: - schemas: -#-------- Definition of types----------------------------------------------------- - - -#-------- Definition of concrete IOCs -------------------------------------------- - PerfMetricJob-Single: - allOf: - - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' - - type: object - properties: - attributes: - type: object - not: - required: [ conditionMonitorRef, schedulerRef ] - properties: - administrativeState: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/AdministrativeState' - operationalState: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/OperationalState' - jobId: - type: string - performanceMetrics: - type: array - items: - type: string - granularityPeriod: - type: integer - minimum: 1 - objectInstances: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList' - rootObjectInstances: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList' - conditionMonitorRef: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' - schedulerRef: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' - reportingCtrl: - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ReportingCtrl' - Files: - $ref: 'TS28623_FileManagementNrm.yaml#/components/schemas/Files-Multiple' - -#-------- Definition of YAML arrays for name-contained IOCs ---------------------- - PerfMetricJob-Multiple: - type: array - items: - $ref: '#/components/schemas/PerfMetricJob-Single' - -#-------- Definitions in TS 28.623 for TS 28.532 --------------------------------- - resources-PmControlNrm: - oneOf: - - $ref: '#/components/schemas/PerfMetricJob-Single' -- GitLab From c3ff1dc5fb26603c6adb70976af95f5dd24e3daa Mon Sep 17 00:00:00 2001 From: ruiyue Date: Tue, 16 Jan 2024 03:37:25 +0000 Subject: [PATCH 12/41] Delete TS28623_SubscriptionControlNrm.yaml --- TS28623_SubscriptionControlNrm.yaml | 75 ----------------------------- 1 file changed, 75 deletions(-) delete mode 100644 TS28623_SubscriptionControlNrm.yaml diff --git a/TS28623_SubscriptionControlNrm.yaml b/TS28623_SubscriptionControlNrm.yaml deleted file mode 100644 index ecc5097f8..000000000 --- a/TS28623_SubscriptionControlNrm.yaml +++ /dev/null @@ -1,75 +0,0 @@ -openapi: 3.0.1 -info: - title: Subscription Control NRM - version: 18.2.0 - description: >- - OAS 3.0.1 definition of the Subscription Control NRM fragment - © 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). - All rights reserved. -externalDocs: - description: 3GPP TS 28.623; Generic NRM - url: http://www.3gpp.org/ftp/Specs/archive/28_series/28.623/ -paths: {} -components: - schemas: -#-------- Definition of types----------------------------------------------------- - Scope: - type: object - properties: - scopeType: - type: string - enum: - - BASE_ONLY - - BASE_ALL - - BASE_NTH_LEVEL - - BASE_SUBTREE - scopeLevel: - type: integer - -#-------- Definition of concrete IOCs -------------------------------------------- - NtfSubscriptionControl-Single: - allOf: - - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' - - type: object - properties: - attributes: - type: object - properties: - notificationRecipientAddress: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/Uri' - notificationTypes: - type: array - items: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/NotificationType' - scope: - $ref: '#/components/schemas/Scope' - notificationFilter: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/Filter' - HeartbeatControl: - $ref: '#/components/schemas/HeartbeatControl-Single' - HeartbeatControl-Single: - allOf: - - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' - - type: object - properties: - attributes: - type: object - properties: - heartbeatNtfPeriod: - type: integer - minimum: 0 - triggerHeartbeatNtf: - type: boolean - -#-------- Definition of YAML arrays for name-contained IOCs ---------------------- - NtfSubscriptionControl-Multiple: - type: array - items: - $ref: '#/components/schemas/NtfSubscriptionControl-Single' - - -#-------- Definitions in TS 28.623 for TS 28.532 --------------------------------- - resources-SubscriptionControlNrm: - oneOf: - - $ref: '#/components/schemas/NtfSubscriptionControl-Single' - - $ref: '#/components/schemas/HeartbeatControl-Single' \ No newline at end of file -- GitLab From 7bfcfafdea2d2fdd6d0436f21247bf72a49e60c3 Mon Sep 17 00:00:00 2001 From: ruiyue Date: Tue, 16 Jan 2024 03:37:34 +0000 Subject: [PATCH 13/41] Delete TS28623_ThresholdMonitorNrm.yaml --- TS28623_ThresholdMonitorNrm.yaml | 76 -------------------------------- 1 file changed, 76 deletions(-) delete mode 100644 TS28623_ThresholdMonitorNrm.yaml diff --git a/TS28623_ThresholdMonitorNrm.yaml b/TS28623_ThresholdMonitorNrm.yaml deleted file mode 100644 index 6d2ad2853..000000000 --- a/TS28623_ThresholdMonitorNrm.yaml +++ /dev/null @@ -1,76 +0,0 @@ -openapi: 3.0.1 -info: - title: Threshold Monitor NRM - version: 18.2.0 - description: >- - OAS 3.0.1 definition of the Threshold Monitor NRM fragment - © 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). - All rights reserved. -externalDocs: - description: 3GPP TS 28.623; Generic NRM - url: http://www.3gpp.org/ftp/Specs/archive/28_series/28.623/ -paths: {} -components: - schemas: -#-------- Definition of types----------------------------------------------------- - ThresholdInfo: - type: object - properties: - performanceMetrics: - type: array - items: - type: string - thresholdDirection: - type: string - enum: - - UP - - DOWN - - UP_AND_DOWN - thresholdValue: - oneOf: - - type: integer - - $ref: 'TS28623_ComDefs.yaml#/components/schemas/Float' - hysteresis: - oneOf: - - type: integer - minimum: 0 - - type: number - format: float - - -#-------- Definition of concrete IOCs -------------------------------------------- - ThresholdMonitor-Single: - allOf: - - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' - - type: object - properties: - attributes: - type: object - properties: - administrativeState: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/AdministrativeState' - operationalState: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/OperationalState' - thresholdInfoList: - type: array - items: - $ref: '#/components/schemas/ThresholdInfo' - monitorGranularityPeriod: - type: integer - minimum: 1 - objectInstances: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList' - rootObjectInstances: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList' - - -#-------- Definition of YAML arrays for name-contained IOCs ---------------------- - ThresholdMonitor-Multiple: - type: array - items: - $ref: '#/components/schemas/ThresholdMonitor-Single' - -#-------- Definitions in TS 28.623 for TS 28.532 --------------------------------- - resources-ThresholdMonitorNrm: - oneOf: - - $ref: '#/components/schemas/ThresholdMonitor-Single' -- GitLab From 3b22111fca393f95125097d8afc6ee19596d3f8c Mon Sep 17 00:00:00 2001 From: ruiyue Date: Tue, 16 Jan 2024 03:38:05 +0000 Subject: [PATCH 14/41] Upload New File --- OpenAPI/TS28623_FmControlNrm.yaml | 50 +++++++++++++++++++++++++++++++ 1 file changed, 50 insertions(+) create mode 100644 OpenAPI/TS28623_FmControlNrm.yaml diff --git a/OpenAPI/TS28623_FmControlNrm.yaml b/OpenAPI/TS28623_FmControlNrm.yaml new file mode 100644 index 000000000..8e814a917 --- /dev/null +++ b/OpenAPI/TS28623_FmControlNrm.yaml @@ -0,0 +1,50 @@ +openapi: 3.0.1 +info: + title: FM Control NRM + version: 18.2.0 + description: >- + OAS 3.0.1 definition of the FM Control NRM fragment + © 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). + All rights reserved. +externalDocs: + description: 3GPP TS 28.623; Generic NRM + url: http://www.3gpp.org/ftp/Specs/archive/28_series/28.623/ +paths: {} +components: + schemas: +#-------- Definition of types----------------------------------------------------- + +#-------- Definition of concrete IOCs -------------------------------------------- + + AlarmList-Single: + allOf: + - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' + - type: object + properties: + attributes: + type: object + properties: + administrativeState: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/AdministrativeState' + operationalState: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/OperationalState' + numOfAlarmRecords: + type: integer + lastModification: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTime' + alarmRecords: + description: >- + This resource represents a map of alarm records. + The alarmIds are used as keys in the map. + type: object + additionalProperties: + $ref: 'TS28532_FaultMnS.yaml#/components/schemas/AlarmRecord' + +#-------- Definition of YAML arrays for name-contained IOCs ---------------------- + + + +#-------- Definitions in TS 28.623 for TS 28.532 --------------------------------- + resources-FmControlNrm: + oneOf: + - $ref: '#/components/schemas/AlarmList-Single' -- GitLab From 942661c9ab2a37bc1c1480f6576c320316e8576f Mon Sep 17 00:00:00 2001 From: ruiyue Date: Tue, 16 Jan 2024 03:38:30 +0000 Subject: [PATCH 15/41] Upload New File --- OpenAPI/TS28623_MnSRegistryNrm.yaml | 67 +++++++++++++++++++++++++++++ 1 file changed, 67 insertions(+) create mode 100644 OpenAPI/TS28623_MnSRegistryNrm.yaml diff --git a/OpenAPI/TS28623_MnSRegistryNrm.yaml b/OpenAPI/TS28623_MnSRegistryNrm.yaml new file mode 100644 index 000000000..2b7b59bd9 --- /dev/null +++ b/OpenAPI/TS28623_MnSRegistryNrm.yaml @@ -0,0 +1,67 @@ +openapi: 3.0.1 +info: + title: MnS Registry NRM + version: 18.2.0 + description: >- + OAS 3.0.1 definition of the MnS Registry NRM fragment + © 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). + All rights reserved. +externalDocs: + description: 3GPP TS 28.623; Generic NRM + url: http://www.3gpp.org/ftp/Specs/archive/28_series/28.623/ +paths: {} +components: + schemas: +#-------- Definition of types----------------------------------------------------- + +#-------- Definition of concrete IOCs -------------------------------------------- + MnsRegistry-Single: + allOf: + - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' + - type: object + properties: + MnsInfo: + $ref: '#/components/schemas/MnsInfo-Multiple' + + MnsInfo-Single: + allOf: + - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' + - type: object + properties: + mnsLabel: + type: string + mnsType: + type: string + enum: + - ProvMnS + - FaultSupervisionMnS + - StreamingDataReportingMnS + - FileDataReportingMnS + mnsVersion: + type: string + mnsAddress: + description: Resource URI as defined in the relevant Technical Specification + $ref: 'TS28623_ComDefs.yaml#/components/schemas/Uri' + mnsScope: + description: >- + List of the managed object instances that can be accessed using the MnS. + If a complete SubNetwork can be accessed using the MnS, this attribute may + contain the DN of the SubNetwork instead of the DNs of the individual managed + entities within the SubNetwork. + type: array + items: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' + +#-------- Definition of YAML arrays for name-contained IOCs ---------------------- + + MnsInfo-Multiple: + type: array + items: + $ref: '#/components/schemas/MnsInfo-Single' + + +#-------- Definitions in TS 28.623 for TS 28.532 --------------------------------- + resources-MnSRegistryNrm: + oneOf: + - $ref: '#/components/schemas/MnsInfo-Single' + - $ref: '#/components/schemas/MnsRegistry-Single' -- GitLab From 5eb53a89ca87c0b90823f8cddd6790f6259a72ef Mon Sep 17 00:00:00 2001 From: ruiyue Date: Tue, 16 Jan 2024 03:38:53 +0000 Subject: [PATCH 16/41] Upload New File --- OpenAPI/TS28623_PmControlNrm.yaml | 64 +++++++++++++++++++++++++++++++ 1 file changed, 64 insertions(+) create mode 100644 OpenAPI/TS28623_PmControlNrm.yaml diff --git a/OpenAPI/TS28623_PmControlNrm.yaml b/OpenAPI/TS28623_PmControlNrm.yaml new file mode 100644 index 000000000..194438255 --- /dev/null +++ b/OpenAPI/TS28623_PmControlNrm.yaml @@ -0,0 +1,64 @@ +openapi: 3.0.1 +info: + title: PM control NRM + version: 18.2.0 + description: >- + OAS 3.0.1 definition of the PM control NRM fragment + © 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). + All rights reserved. +externalDocs: + description: 3GPP TS 28.623; Generic NRM + url: http://www.3gpp.org/ftp/Specs/archive/28_series/28.623/ +paths: {} +components: + schemas: +#-------- Definition of types----------------------------------------------------- + + +#-------- Definition of concrete IOCs -------------------------------------------- + PerfMetricJob-Single: + allOf: + - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' + - type: object + properties: + attributes: + type: object + not: + required: [ conditionMonitorRef, schedulerRef ] + properties: + administrativeState: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/AdministrativeState' + operationalState: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/OperationalState' + jobId: + type: string + performanceMetrics: + type: array + items: + type: string + granularityPeriod: + type: integer + minimum: 1 + objectInstances: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList' + rootObjectInstances: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList' + conditionMonitorRef: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' + schedulerRef: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' + reportingCtrl: + $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ReportingCtrl' + Files: + $ref: 'TS28623_FileManagementNrm.yaml#/components/schemas/Files-Multiple' + +#-------- Definition of YAML arrays for name-contained IOCs ---------------------- + PerfMetricJob-Multiple: + type: array + items: + $ref: '#/components/schemas/PerfMetricJob-Single' + +#-------- Definitions in TS 28.623 for TS 28.532 --------------------------------- + resources-PmControlNrm: + oneOf: + - $ref: '#/components/schemas/PerfMetricJob-Single' -- GitLab From 37028b2d47b4a6d520a8d774cb4fb8bee049b867 Mon Sep 17 00:00:00 2001 From: ruiyue Date: Tue, 16 Jan 2024 03:39:23 +0000 Subject: [PATCH 17/41] Upload New File --- OpenAPI/TS28623_SubscriptionControlNrm.yaml | 75 +++++++++++++++++++++ 1 file changed, 75 insertions(+) create mode 100644 OpenAPI/TS28623_SubscriptionControlNrm.yaml diff --git a/OpenAPI/TS28623_SubscriptionControlNrm.yaml b/OpenAPI/TS28623_SubscriptionControlNrm.yaml new file mode 100644 index 000000000..ecc5097f8 --- /dev/null +++ b/OpenAPI/TS28623_SubscriptionControlNrm.yaml @@ -0,0 +1,75 @@ +openapi: 3.0.1 +info: + title: Subscription Control NRM + version: 18.2.0 + description: >- + OAS 3.0.1 definition of the Subscription Control NRM fragment + © 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). + All rights reserved. +externalDocs: + description: 3GPP TS 28.623; Generic NRM + url: http://www.3gpp.org/ftp/Specs/archive/28_series/28.623/ +paths: {} +components: + schemas: +#-------- Definition of types----------------------------------------------------- + Scope: + type: object + properties: + scopeType: + type: string + enum: + - BASE_ONLY + - BASE_ALL + - BASE_NTH_LEVEL + - BASE_SUBTREE + scopeLevel: + type: integer + +#-------- Definition of concrete IOCs -------------------------------------------- + NtfSubscriptionControl-Single: + allOf: + - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' + - type: object + properties: + attributes: + type: object + properties: + notificationRecipientAddress: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/Uri' + notificationTypes: + type: array + items: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/NotificationType' + scope: + $ref: '#/components/schemas/Scope' + notificationFilter: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/Filter' + HeartbeatControl: + $ref: '#/components/schemas/HeartbeatControl-Single' + HeartbeatControl-Single: + allOf: + - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' + - type: object + properties: + attributes: + type: object + properties: + heartbeatNtfPeriod: + type: integer + minimum: 0 + triggerHeartbeatNtf: + type: boolean + +#-------- Definition of YAML arrays for name-contained IOCs ---------------------- + NtfSubscriptionControl-Multiple: + type: array + items: + $ref: '#/components/schemas/NtfSubscriptionControl-Single' + + +#-------- Definitions in TS 28.623 for TS 28.532 --------------------------------- + resources-SubscriptionControlNrm: + oneOf: + - $ref: '#/components/schemas/NtfSubscriptionControl-Single' + - $ref: '#/components/schemas/HeartbeatControl-Single' \ No newline at end of file -- GitLab From 37006fdcc1eeeb6503084e15fabb1676b0480428 Mon Sep 17 00:00:00 2001 From: ruiyue Date: Tue, 16 Jan 2024 03:39:48 +0000 Subject: [PATCH 18/41] Upload New File --- OpenAPI/TS28623_ThresholdMonitorNrm.yaml | 76 ++++++++++++++++++++++++ 1 file changed, 76 insertions(+) create mode 100644 OpenAPI/TS28623_ThresholdMonitorNrm.yaml diff --git a/OpenAPI/TS28623_ThresholdMonitorNrm.yaml b/OpenAPI/TS28623_ThresholdMonitorNrm.yaml new file mode 100644 index 000000000..6d2ad2853 --- /dev/null +++ b/OpenAPI/TS28623_ThresholdMonitorNrm.yaml @@ -0,0 +1,76 @@ +openapi: 3.0.1 +info: + title: Threshold Monitor NRM + version: 18.2.0 + description: >- + OAS 3.0.1 definition of the Threshold Monitor NRM fragment + © 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). + All rights reserved. +externalDocs: + description: 3GPP TS 28.623; Generic NRM + url: http://www.3gpp.org/ftp/Specs/archive/28_series/28.623/ +paths: {} +components: + schemas: +#-------- Definition of types----------------------------------------------------- + ThresholdInfo: + type: object + properties: + performanceMetrics: + type: array + items: + type: string + thresholdDirection: + type: string + enum: + - UP + - DOWN + - UP_AND_DOWN + thresholdValue: + oneOf: + - type: integer + - $ref: 'TS28623_ComDefs.yaml#/components/schemas/Float' + hysteresis: + oneOf: + - type: integer + minimum: 0 + - type: number + format: float + + +#-------- Definition of concrete IOCs -------------------------------------------- + ThresholdMonitor-Single: + allOf: + - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' + - type: object + properties: + attributes: + type: object + properties: + administrativeState: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/AdministrativeState' + operationalState: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/OperationalState' + thresholdInfoList: + type: array + items: + $ref: '#/components/schemas/ThresholdInfo' + monitorGranularityPeriod: + type: integer + minimum: 1 + objectInstances: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList' + rootObjectInstances: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList' + + +#-------- Definition of YAML arrays for name-contained IOCs ---------------------- + ThresholdMonitor-Multiple: + type: array + items: + $ref: '#/components/schemas/ThresholdMonitor-Single' + +#-------- Definitions in TS 28.623 for TS 28.532 --------------------------------- + resources-ThresholdMonitorNrm: + oneOf: + - $ref: '#/components/schemas/ThresholdMonitor-Single' -- GitLab From 99ce87a3bb547dfff85c1623f05cfa9df259c553 Mon Sep 17 00:00:00 2001 From: ruiyue Date: Tue, 16 Jan 2024 03:58:27 +0000 Subject: [PATCH 19/41] Update file TS28623_GenericNrm.yaml --- OpenAPI/TS28623_GenericNrm.yaml | 433 ++------------------------------ 1 file changed, 18 insertions(+), 415 deletions(-) diff --git a/OpenAPI/TS28623_GenericNrm.yaml b/OpenAPI/TS28623_GenericNrm.yaml index 64b9c018e..0b34c95b8 100755 --- a/OpenAPI/TS28623_GenericNrm.yaml +++ b/OpenAPI/TS28623_GenericNrm.yaml @@ -51,30 +51,6 @@ components: type: string powerInterface: type: string - ThresholdInfo: - type: object - properties: - performanceMetrics: - type: array - items: - type: string - thresholdDirection: - type: string - enum: - - UP - - DOWN - - UP_AND_DOWN - thresholdValue: - oneOf: - - type: integer - - $ref: 'TS28623_ComDefs.yaml#/components/schemas/Float' - hysteresis: - oneOf: - - type: integer - minimum: 0 - - type: number - format: float - minimum: 0 Operation: type: object properties: @@ -219,18 +195,7 @@ components: properties: streamTarget: $ref: 'TS28623_ComDefs.yaml#/components/schemas/Uri' - Scope: - type: object - properties: - scopeType: - type: string - enum: - - BASE_ONLY - - BASE_ALL - - BASE_NTH_LEVEL - - BASE_SUBTREE - scopeLevel: - type: integer + ProcessMonitor: description: >- This data type is the "ProcessMonitor" data type without specialisations. @@ -262,49 +227,6 @@ components: $ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTime' timer: type: integer - 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 AreaScope: oneOf: - type: array @@ -346,37 +268,6 @@ components: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/Ipv4Addr' - $ref: 'TS28623_ComDefs.yaml#/components/schemas/Ipv6Addr' - ManagementData: - oneOf: - - type: array - items: - type: string - enum: - - COVERAGE - - CAPACITY - - ENERGY_EFFICIENCY - - MOBILITY - - ACCESSIBILITY - - type: array - items: - type: string - NodeFilter: - type: object - properties: - areaOfInterest: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/AreaOfInterest' - networkDomain: - type: string - enum: - - CN - - RAN - cpUpType: - type: string - enum: - - CP - - UP - sst: - type: integer SchedulingTime: oneOf: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/TimeWindow' @@ -531,23 +422,23 @@ components: MeContext: $ref: '#/components/schemas/MeContext-Multiple' PerfMetricJob: - $ref: '#/components/schemas/PerfMetricJob-Multiple' + $ref: 'TS28623_PmControlNrm.yaml#/components/schemas/PerfMetricJob-Multiple' ThresholdMonitor: - $ref: '#/components/schemas/ThresholdMonitor-Multiple' + $ref: 'TS28623_ThresholdMonitorNrm.yaml#/components/schemas/ThresholdMonitor-Multiple' TraceJob: $ref: 'TS28623_TraceControlNrm.yaml#/components/schemas/TraceJob-Multiple' ManagementDataCollection: - $ref: '#/components/schemas/ManagementDataCollection-Multiple' + $ref: 'TS28623_ManagementDataCollectionNrm.yaml#/components/schemas/ManagementDataCollection-Multiple' NtfSubscriptionControl: - $ref: '#/components/schemas/NtfSubscriptionControl-Multiple' + $ref: 'TS28623_SubscriptionControlNrm.yaml#/components/schemas/NtfSubscriptionControl-Multiple' AlarmList: - $ref: '#/components/schemas/AlarmList-Single' + $ref: 'TS28623_FmControlNrm.yaml#/components/schemas/AlarmList-Single' FileDownloadJob: - $ref: '#/components/schemas/FileDownloadJob-Multiple' + $ref: 'TS28623_FileManagementNrm.yaml#/components/schemas/FileDownloadJob-Multiple' Files: - $ref: '#/components/schemas/Files-Multiple' + $ref: 'TS28623_FileManagementNrm.yaml#/components/schemas/Files-Multiple' MnsRegistry: - $ref: '#/components/schemas/MnsRegistry-Single' + $ref: 'TS28623_MnSRegistryNrm.yaml#/components/schemas/MnsRegistry-Single' Scheduler: $ref: '#/components/schemas/Scheduler-Multiple' ConditionMonitor: @@ -563,19 +454,19 @@ components: MnsAgent: $ref: '#/components/schemas/MnsAgent-Multiple' PerfMetricJob: - $ref: '#/components/schemas/PerfMetricJob-Multiple' + $ref: 'TS28623_PmControlNrm.yaml#/components/schemas/PerfMetricJob-Multiple' ThresholdMonitor: - $ref: '#/components/schemas/ThresholdMonitor-Multiple' + $ref: 'TS28623_ThresholdMonitorNrm.yaml#/components/schemas/ThresholdMonitor-Multiple' TraceJob: $ref: 'TS28623_TraceControlNrm.yaml#/components/schemas/TraceJob-Multiple' NtfSubscriptionControl: - $ref: '#/components/schemas/NtfSubscriptionControl-Multiple' + $ref: 'TS28623_SubscriptionControlNrm.yaml#/components/schemas/NtfSubscriptionControl-Multiple' AlarmList: - $ref: '#/components/schemas/AlarmList-Single' + $ref: 'TS28623_FmControlNrm.yaml#/components/schemas/AlarmList-Single' FileDownloadJob: - $ref: '#/components/schemas/FileDownloadJob-Multiple' + $ref: 'TS28623_FileManagementNrm.yaml#/components/schemas/FileDownloadJob-Multiple' Files: - $ref: '#/components/schemas/Files-Multiple' + $ref: 'TS28623_FileManagementNrm.yaml#/components/schemas/Files-Multiple' Scheduler: $ref: '#/components/schemas/Scheduler-Multiple' ConditionMonitor: @@ -626,9 +517,9 @@ components: type: object properties: PerfMetricJob: - $ref: '#/components/schemas/PerfMetricJob-Multiple' + $ref: 'TS28623_PmControlNrm.yaml#/components/schemas/PerfMetricJob-Multiple' ThresholdMonitor: - $ref: '#/components/schemas/ThresholdMonitor-Multiple' + $ref: 'TS28623_ThresholdMonitorNrm.yaml#/components/schemas/ThresholdMonitor-Multiple' ManagedNFService: $ref: '#/components/schemas/ManagedNFService-Multiple' TraceJob: @@ -720,248 +611,6 @@ components: properties: dnPrefix: type: string - PerfMetricJob-Single: - allOf: - - $ref: '#/components/schemas/Top' - - type: object - properties: - attributes: - type: object - not: - required: [ conditionMonitorRef, schedulerRef ] - properties: - administrativeState: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/AdministrativeState' - operationalState: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/OperationalState' - jobId: - type: string - performanceMetrics: - type: array - items: - type: string - granularityPeriod: - type: integer - minimum: 1 - objectInstances: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList' - rootObjectInstances: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList' - conditionMonitorRef: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' - schedulerRef: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' - reportingCtrl: - $ref: '#/components/schemas/ReportingCtrl' - Files: - $ref: '#/components/schemas/Files-Multiple' - - ThresholdMonitor-Single: - allOf: - - $ref: '#/components/schemas/Top' - - type: object - properties: - attributes: - type: object - properties: - administrativeState: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/AdministrativeState' - operationalState: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/OperationalState' - thresholdInfoList: - type: array - items: - $ref: '#/components/schemas/ThresholdInfo' - monitorGranularityPeriod: - type: integer - minimum: 1 - objectInstances: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList' - rootObjectInstances: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList' - NtfSubscriptionControl-Single: - allOf: - - $ref: '#/components/schemas/Top' - - type: object - properties: - attributes: - type: object - properties: - notificationRecipientAddress: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/Uri' - notificationTypes: - type: array - items: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/NotificationType' - scope: - $ref: '#/components/schemas/Scope' - notificationFilter: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/Filter' - HeartbeatControl: - $ref: '#/components/schemas/HeartbeatControl-Single' - HeartbeatControl-Single: - allOf: - - $ref: '#/components/schemas/Top' - - type: object - properties: - attributes: - type: object - properties: - heartbeatNtfPeriod: - type: integer - minimum: 0 - triggerHeartbeatNtf: - type: boolean - - ManagementDataCollection-Single: - allOf: - - $ref: '#/components/schemas/Top' - - type: object - properties: - attributes: - type: object - properties: - managementData: - $ref: '#/components/schemas/ManagementData' - targetNodeFilter: - $ref: '#/components/schemas/NodeFilter' - collectionTimeWindow: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/TimeWindow' - reportingCtrl: - $ref: '#/components/schemas/ReportingCtrl' - dataScope: - type: string - enum: - - SNSSAI - - 5QI - - PLMN - AlarmList-Single: - allOf: - - $ref: '#/components/schemas/Top' - - type: object - properties: - attributes: - type: object - properties: - administrativeState: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/AdministrativeState' - operationalState: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/OperationalState' - numOfAlarmRecords: - type: integer - lastModification: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTime' - alarmRecords: - description: >- - This resource represents a map of alarm records. - The alarmIds are used as keys in the map. - type: object - additionalProperties: - $ref: 'TS28532_FaultMnS.yaml#/components/schemas/AlarmRecord' - FileDownloadJob-Single: - allOf: - - $ref: '#/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: '#/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: '#/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 - MnsRegistry-Single: - allOf: - - $ref: '#/components/schemas/Top' - - type: object - properties: - MnsInfo: - $ref: '#/components/schemas/MnsInfo-Multiple' - - MnsInfo-Single: - allOf: - - $ref: '#/components/schemas/Top' - - type: object - properties: - mnsLabel: - type: string - mnsType: - type: string - enum: - - ProvMnS - - FaultSupervisionMnS - - StreamingDataReportingMnS - - FileDataReportingMnS - mnsVersion: - type: string - mnsAddress: - description: Resource URI as defined in the relevant Technical Specification - $ref: 'TS28623_ComDefs.yaml#/components/schemas/Uri' - mnsScope: - description: >- - List of the managed object instances that can be accessed using the MnS. - If a complete SubNetwork can be accessed using the MnS, this attribute may - contain the DN of the SubNetwork instead of the DNs of the individual managed - entities within the SubNetwork. - type: array - items: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' Scheduler-Single: allOf: - $ref: '#/components/schemas/Top' @@ -1079,38 +728,6 @@ components: type: array items: $ref: '#/components/schemas/MeContext-Single' - PerfMetricJob-Multiple: - type: array - items: - $ref: '#/components/schemas/PerfMetricJob-Single' - ThresholdMonitor-Multiple: - type: array - items: - $ref: '#/components/schemas/ThresholdMonitor-Single' - ManagementDataCollection-Multiple: - type: array - items: - $ref: '#/components/schemas/ManagementDataCollection-Single' - NtfSubscriptionControl-Multiple: - type: array - items: - $ref: '#/components/schemas/NtfSubscriptionControl-Single' - 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' - MnsInfo-Multiple: - type: array - items: - $ref: '#/components/schemas/MnsInfo-Single' Scheduler-Multiple: type: array items: @@ -1136,22 +753,8 @@ components: - $ref: '#/components/schemas/MeContext-Single' - $ref: '#/components/schemas/ManagedNFService-Single' - - - $ref: '#/components/schemas/PerfMetricJob-Single' - - $ref: '#/components/schemas/ThresholdMonitor-Single' - - $ref: '#/components/schemas/ManagementDataCollection-Single' - - - $ref: '#/components/schemas/NtfSubscriptionControl-Single' - - $ref: '#/components/schemas/HeartbeatControl-Single' - - - $ref: '#/components/schemas/AlarmList-Single' - - - $ref: '#/components/schemas/FileDownloadJob-Single' - - $ref: '#/components/schemas/Files-Single' - $ref: '#/components/schemas/File-Single' - - - $ref: '#/components/schemas/MnsRegistry-Single' - - $ref: '#/components/schemas/MnsInfo-Single' + - $ref: '#/components/schemas/Scheduler-Single' - $ref: '#/components/schemas/ConditionMonitor-Single' - $ref: '#/components/schemas/SupportedNotifications-Single' -- GitLab From 4be9aab83ad9ca7d8e02543145401bc16fd6ba3f Mon Sep 17 00:00:00 2001 From: ruiyue Date: Tue, 16 Jan 2024 04:07:27 +0000 Subject: [PATCH 20/41] Update file TS28623_TraceControlNrm.yaml --- OpenAPI/TS28623_TraceControlNrm.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OpenAPI/TS28623_TraceControlNrm.yaml b/OpenAPI/TS28623_TraceControlNrm.yaml index 340072563..156b878e8 100644 --- a/OpenAPI/TS28623_TraceControlNrm.yaml +++ b/OpenAPI/TS28623_TraceControlNrm.yaml @@ -1456,7 +1456,7 @@ components: attributes: $ref: '#/components/schemas/TraceJob-Attr' Files: - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Files-Multiple' + $ref: 'TS28623_FileManagementNrm#/components/schemas/Files-Multiple' #-------- Definition of YAML arrays for name-contained IOCs ---------------------- -- GitLab From 5ca8032282ce4ebf42ebdb4c343de05871092912 Mon Sep 17 00:00:00 2001 From: ruiyue Date: Tue, 16 Jan 2024 05:07:40 +0000 Subject: [PATCH 21/41] Update file TS28623_TraceControlNrm.yaml --- OpenAPI/TS28623_TraceControlNrm.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OpenAPI/TS28623_TraceControlNrm.yaml b/OpenAPI/TS28623_TraceControlNrm.yaml index 156b878e8..0965c9912 100644 --- a/OpenAPI/TS28623_TraceControlNrm.yaml +++ b/OpenAPI/TS28623_TraceControlNrm.yaml @@ -1456,7 +1456,7 @@ components: attributes: $ref: '#/components/schemas/TraceJob-Attr' Files: - $ref: 'TS28623_FileManagementNrm#/components/schemas/Files-Multiple' + $ref: 'TS28623_FileManagementNrm.yaml#/components/schemas/Files-Multiple' #-------- Definition of YAML arrays for name-contained IOCs ---------------------- -- GitLab From 8769ecf2210323b67003fbe0050bdaf8ca0e4178 Mon Sep 17 00:00:00 2001 From: ruiyue Date: Tue, 16 Jan 2024 05:11:08 +0000 Subject: [PATCH 22/41] Update file TS28623_GenericNrm.yaml --- OpenAPI/TS28623_GenericNrm.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/OpenAPI/TS28623_GenericNrm.yaml b/OpenAPI/TS28623_GenericNrm.yaml index 0b34c95b8..1e5c595b5 100755 --- a/OpenAPI/TS28623_GenericNrm.yaml +++ b/OpenAPI/TS28623_GenericNrm.yaml @@ -753,7 +753,6 @@ components: - $ref: '#/components/schemas/MeContext-Single' - $ref: '#/components/schemas/ManagedNFService-Single' - - $ref: '#/components/schemas/File-Single' - $ref: '#/components/schemas/Scheduler-Single' - $ref: '#/components/schemas/ConditionMonitor-Single' -- GitLab From c846c5973d1ee3dd94d0682006246fb95489ce1c Mon Sep 17 00:00:00 2001 From: ruiyue Date: Tue, 16 Jan 2024 06:18:34 +0000 Subject: [PATCH 23/41] Upload New File --- .../TS28623_QoEMeasurementCollectionNrm.yaml | 75 +++++++++++++++++++ 1 file changed, 75 insertions(+) create mode 100644 OpenAPI/TS28623_QoEMeasurementCollectionNrm.yaml diff --git a/OpenAPI/TS28623_QoEMeasurementCollectionNrm.yaml b/OpenAPI/TS28623_QoEMeasurementCollectionNrm.yaml new file mode 100644 index 000000000..9582d2a66 --- /dev/null +++ b/OpenAPI/TS28623_QoEMeasurementCollectionNrm.yaml @@ -0,0 +1,75 @@ +openapi: 3.0.1 +info: + title: QoE Measurement Collection NRMt + version: 18.6.0 + description: >- + OAS 3.0.1 definition of the QoE Measurement Collection NRM + © 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). + All rights reserved. +externalDocs: + description: 3GPP TS 28.623; Generic NRM:QoE Measurement Collection NRM fragment + url: http://www.3gpp.org/ftp/Specs/archive/28_series/28.623/ +paths: {} +components: + schemas: +#-------- Definition of types----------------------------------------------------- + +#-------- Definition of concrete IOCs -------------------------------------------- + QMCJob-Single: + allOf: + - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' + - type: object + properties: + attributes: + type: object + properties: + serviceType: + type: string + enum: + - DASH + - MTSI + - VR + areaScope: + type: array + items: + $ref: 'TS28623_GenericNrm.yaml#/components/schemas/AreaScope' + qoECollectionEntityAddress: + $ref: 'TS28623_GenericNrm.yaml#/components/schemas/IpAddr' + pLMNTarget: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/PlmnId' + qoETarget: + type: string + qoEReference: + type: string + jobId: + type: string + sliceScope: + type: array + items: + $ref: 'TS28541_NrNrm.yaml#/components/schemas/Snssai' + qMCConfigFile: + type: string + mDTAlignmentInformation: + $ref: 'TS28623_TraceControlNrm.yaml#/components/schemas/traceReference-Type' + availableRANqoEMetrics: + type: array + items: + type: string + enum: + - APPLAYERBUFFERLEVELLIST + - PLAYOUTDELAYFORMEDIA_STARTUP + minItems: 0 + maxItems: 2 + + +#-------- Definition of YAML arrays for name-contained IOCs ---------------------- + + QMCJob-Multiple: + type: array + items: + $ref: '#/components/schemas/QMCJob-Single' + +#-------- Definitions in TS 28.623 for TS 28.532 --------------------------------- + resources-QoEMeasuremetCollectionNrm: + oneOf: + - $ref: '#/components/schemas/QMCJob-Single' -- GitLab From f5d2c66868fe25863233d687208d4c452a2b57ac Mon Sep 17 00:00:00 2001 From: ruiyue Date: Tue, 16 Jan 2024 06:24:01 +0000 Subject: [PATCH 24/41] Update file TS28623_GenericNrm.yaml --- OpenAPI/TS28623_GenericNrm.yaml | 55 ++------------------------------- 1 file changed, 3 insertions(+), 52 deletions(-) diff --git a/OpenAPI/TS28623_GenericNrm.yaml b/OpenAPI/TS28623_GenericNrm.yaml index 1e5c595b5..f92a9f397 100755 --- a/OpenAPI/TS28623_GenericNrm.yaml +++ b/OpenAPI/TS28623_GenericNrm.yaml @@ -446,7 +446,7 @@ components: SupportedNotifications: $ref: '#/components/schemas/SupportedNotifications-Single' QMCJobs: - $ref: '#/components/schemas/QMCJob-Multiple' + $ref: 'TS28623_QoEMeasurementCollectionNrm.yaml#/components/schemas/QMCJob-Multiple' ManagedElement-ncO: type: object @@ -474,7 +474,7 @@ components: SupportedNotifications: $ref: '#/components/schemas/SupportedNotifications-Single' QMCJobs: - $ref: '#/components/schemas/QMCJob-Multiple' + $ref: 'TS28623_QoEMeasurementCollectionNrm.yaml#/components/schemas/QMCJob-Multiple' #-------- Definition of abstract IOCs -------------------------------------------- @@ -660,51 +660,6 @@ components: - HTTP_VES_ENCAPS minItems: 1 - QMCJob-Single: - allOf: - - $ref: '#/components/schemas/Top' - - type: object - properties: - attributes: - type: object - properties: - serviceType: - type: string - enum: - - DASH - - MTSI - - VR - areaScope: - type: array - items: - $ref: '#/components/schemas/AreaScope' - qoECollectionEntityAddress: - $ref: '#/components/schemas/IpAddr' - pLMNTarget: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/PlmnId' - qoETarget: - type: string - qoEReference: - type: string - jobId: - type: string - sliceScope: - type: array - items: - $ref: 'TS28541_NrNrm.yaml#/components/schemas/Snssai' - qMCConfigFile: - type: string - mDTAlignmentInformation: - $ref: 'TS28623_TraceControlNrm.yaml#/components/schemas/traceReference-Type' - availableRANqoEMetrics: - type: array - items: - type: string - enum: - - APPLAYERBUFFERLEVELLIST - - PLAYOUTDELAYFORMEDIA_STARTUP - minItems: 0 - maxItems: 2 #-------- Definition of YAML arrays for name-contained IOCs ---------------------- @@ -736,10 +691,7 @@ components: type: array items: $ref: '#/components/schemas/ConditionMonitor-Single' - QMCJob-Multiple: - type: array - items: - $ref: '#/components/schemas/QMCJob-Single' + #-------- Definitions in TS 28.623 for TS 28.532 --------------------------------- @@ -757,4 +709,3 @@ components: - $ref: '#/components/schemas/Scheduler-Single' - $ref: '#/components/schemas/ConditionMonitor-Single' - $ref: '#/components/schemas/SupportedNotifications-Single' - - $ref: '#/components/schemas/QMCJob-Single' -- GitLab From 906ec2e9ec7042a69238b0000565f611b855183d Mon Sep 17 00:00:00 2001 From: ruiyue Date: Tue, 16 Jan 2024 06:33:16 +0000 Subject: [PATCH 25/41] Update 9 files - /OpenAPI/TS28623_FileManagementNrm.yaml - /OpenAPI/TS28623_FmControlNrm.yaml - /OpenAPI/TS28623_ManagementDataCollectionNrm.yaml - /OpenAPI/TS28623_MnSRegistryNrm.yaml - /OpenAPI/TS28623_PmControlNrm.yaml - /OpenAPI/TS28623_QoEMeasurementCollectionNrm.yaml - /OpenAPI/TS28623_SubscriptionControlNrm.yaml - /OpenAPI/TS28623_ThresholdMonitorNrm.yaml - /OpenAPI/TS28623_TraceControlNrm.yaml --- OpenAPI/TS28623_FileManagementNrm.yaml | 4 ++-- OpenAPI/TS28623_FmControlNrm.yaml | 4 ++-- OpenAPI/TS28623_ManagementDataCollectionNrm.yaml | 4 ++-- OpenAPI/TS28623_MnSRegistryNrm.yaml | 4 ++-- OpenAPI/TS28623_PmControlNrm.yaml | 4 ++-- OpenAPI/TS28623_QoEMeasurementCollectionNrm.yaml | 2 +- OpenAPI/TS28623_SubscriptionControlNrm.yaml | 2 +- OpenAPI/TS28623_ThresholdMonitorNrm.yaml | 2 +- OpenAPI/TS28623_TraceControlNrm.yaml | 2 +- 9 files changed, 14 insertions(+), 14 deletions(-) diff --git a/OpenAPI/TS28623_FileManagementNrm.yaml b/OpenAPI/TS28623_FileManagementNrm.yaml index 48ebf4e22..f510704a0 100644 --- a/OpenAPI/TS28623_FileManagementNrm.yaml +++ b/OpenAPI/TS28623_FileManagementNrm.yaml @@ -1,13 +1,13 @@ openapi: 3.0.1 info: title: File Management NRM - version: 18.2.0 + 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 + description: 3GPP TS 28.623; Generic NRM, File Management NRM url: http://www.3gpp.org/ftp/Specs/archive/28_series/28.623/ paths: {} components: diff --git a/OpenAPI/TS28623_FmControlNrm.yaml b/OpenAPI/TS28623_FmControlNrm.yaml index 8e814a917..44da3526c 100644 --- a/OpenAPI/TS28623_FmControlNrm.yaml +++ b/OpenAPI/TS28623_FmControlNrm.yaml @@ -1,13 +1,13 @@ openapi: 3.0.1 info: title: FM Control NRM - version: 18.2.0 + version: 18.6.0 description: >- OAS 3.0.1 definition of the FM Control NRM fragment © 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved. externalDocs: - description: 3GPP TS 28.623; Generic NRM + description: 3GPP TS 28.623; Generic NRM, FM Contro NRM url: http://www.3gpp.org/ftp/Specs/archive/28_series/28.623/ paths: {} components: diff --git a/OpenAPI/TS28623_ManagementDataCollectionNrm.yaml b/OpenAPI/TS28623_ManagementDataCollectionNrm.yaml index 83a4eb8c1..a2f033a46 100644 --- a/OpenAPI/TS28623_ManagementDataCollectionNrm.yaml +++ b/OpenAPI/TS28623_ManagementDataCollectionNrm.yaml @@ -1,13 +1,13 @@ openapi: 3.0.1 info: title: Management Data Collection NRM - version: 18.2.0 + version: 18.6.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). All rights reserved. externalDocs: - description: 3GPP TS 28.623; Generic NRM + description: 3GPP TS 28.623; Generic NRM, Management Data Collection NRM url: http://www.3gpp.org/ftp/Specs/archive/28_series/28.623/ paths: {} components: diff --git a/OpenAPI/TS28623_MnSRegistryNrm.yaml b/OpenAPI/TS28623_MnSRegistryNrm.yaml index 2b7b59bd9..e7eb3a0c0 100644 --- a/OpenAPI/TS28623_MnSRegistryNrm.yaml +++ b/OpenAPI/TS28623_MnSRegistryNrm.yaml @@ -1,13 +1,13 @@ openapi: 3.0.1 info: title: MnS Registry NRM - version: 18.2.0 + version: 18.6.0 description: >- OAS 3.0.1 definition of the MnS Registry NRM fragment © 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved. externalDocs: - description: 3GPP TS 28.623; Generic NRM + description: 3GPP TS 28.623; Generic NRM, MnS Registry NRM url: http://www.3gpp.org/ftp/Specs/archive/28_series/28.623/ paths: {} components: diff --git a/OpenAPI/TS28623_PmControlNrm.yaml b/OpenAPI/TS28623_PmControlNrm.yaml index 194438255..ae71b3b12 100644 --- a/OpenAPI/TS28623_PmControlNrm.yaml +++ b/OpenAPI/TS28623_PmControlNrm.yaml @@ -1,13 +1,13 @@ openapi: 3.0.1 info: title: PM control NRM - version: 18.2.0 + version: 18.6.0 description: >- OAS 3.0.1 definition of the PM control NRM fragment © 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved. externalDocs: - description: 3GPP TS 28.623; Generic NRM + description: 3GPP TS 28.623; Generic NRM,PM control NRM url: http://www.3gpp.org/ftp/Specs/archive/28_series/28.623/ paths: {} components: diff --git a/OpenAPI/TS28623_QoEMeasurementCollectionNrm.yaml b/OpenAPI/TS28623_QoEMeasurementCollectionNrm.yaml index 9582d2a66..9262c2228 100644 --- a/OpenAPI/TS28623_QoEMeasurementCollectionNrm.yaml +++ b/OpenAPI/TS28623_QoEMeasurementCollectionNrm.yaml @@ -7,7 +7,7 @@ info: © 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved. externalDocs: - description: 3GPP TS 28.623; Generic NRM:QoE Measurement Collection NRM fragment + description: 3GPP TS 28.623; Generic NRM,QoE Measurement Collection NRM fragment url: http://www.3gpp.org/ftp/Specs/archive/28_series/28.623/ paths: {} components: diff --git a/OpenAPI/TS28623_SubscriptionControlNrm.yaml b/OpenAPI/TS28623_SubscriptionControlNrm.yaml index ecc5097f8..0857ff190 100644 --- a/OpenAPI/TS28623_SubscriptionControlNrm.yaml +++ b/OpenAPI/TS28623_SubscriptionControlNrm.yaml @@ -7,7 +7,7 @@ info: © 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved. externalDocs: - description: 3GPP TS 28.623; Generic NRM + description: 3GPP TS 28.623; Generic NRM, Subscription Control NRM url: http://www.3gpp.org/ftp/Specs/archive/28_series/28.623/ paths: {} components: diff --git a/OpenAPI/TS28623_ThresholdMonitorNrm.yaml b/OpenAPI/TS28623_ThresholdMonitorNrm.yaml index 6d2ad2853..c2e7bbf3b 100644 --- a/OpenAPI/TS28623_ThresholdMonitorNrm.yaml +++ b/OpenAPI/TS28623_ThresholdMonitorNrm.yaml @@ -7,7 +7,7 @@ info: © 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved. externalDocs: - description: 3GPP TS 28.623; Generic NRM + description: 3GPP TS 28.623; Generic NRM,Threshold Monitor NRM url: http://www.3gpp.org/ftp/Specs/archive/28_series/28.623/ paths: {} components: diff --git a/OpenAPI/TS28623_TraceControlNrm.yaml b/OpenAPI/TS28623_TraceControlNrm.yaml index 0965c9912..ecad28669 100644 --- a/OpenAPI/TS28623_TraceControlNrm.yaml +++ b/OpenAPI/TS28623_TraceControlNrm.yaml @@ -7,7 +7,7 @@ info: © 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved. externalDocs: - description: 3GPP TS 28.623; Generic NRM:Trace Control NRM + description: 3GPP TS 28.623; Generic NRM,Trace Control NRM url: http://www.3gpp.org/ftp/Specs/archive/28_series/28.623/ paths: {} components: -- GitLab From a9864d25b33c40798e4312492d160e3f9fc37357 Mon Sep 17 00:00:00 2001 From: ruiyue Date: Tue, 16 Jan 2024 06:48:41 +0000 Subject: [PATCH 26/41] Update file TS28532_ProvMnS.yaml --- OpenAPI/TS28532_ProvMnS.yaml | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/OpenAPI/TS28532_ProvMnS.yaml b/OpenAPI/TS28532_ProvMnS.yaml index a80762036..6ad84a86b 100755 --- a/OpenAPI/TS28532_ProvMnS.yaml +++ b/OpenAPI/TS28532_ProvMnS.yaml @@ -397,7 +397,16 @@ components: - $ref: 'TS28104_MdaNrm.yaml#/components/schemas/resources-mdaNrm' - $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: 'TS28317_RanScNrm.yaml#/components/schemas/resources-RanScNrm' + - $ref: 'TS28623_FileManagementNrm.yaml#/components/schemas/resources-FileMgmtNrm' + - $ref: 'TS28623_FmControlNrm.yaml#/components/schemas/resources-FmControlNrm' + - $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' Scope: type: object properties: -- GitLab From 107884ec9fddd5db2faa5d68114de7ec6f34bbca Mon Sep 17 00:00:00 2001 From: ruiyue Date: Fri, 19 Jan 2024 01:26:47 +0000 Subject: [PATCH 27/41] Update 3 files - /OpenAPI/TS28623_FmControlNrm.yaml - /OpenAPI/TS28111_FmControlNrm.yaml - /OpenAPI/TS28532_ProvMnS.yaml --- .../{TS28623_FmControlNrm.yaml => TS28111_FmControlNrm.yaml} | 0 OpenAPI/TS28532_ProvMnS.yaml | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) rename OpenAPI/{TS28623_FmControlNrm.yaml => TS28111_FmControlNrm.yaml} (100%) diff --git a/OpenAPI/TS28623_FmControlNrm.yaml b/OpenAPI/TS28111_FmControlNrm.yaml similarity index 100% rename from OpenAPI/TS28623_FmControlNrm.yaml rename to OpenAPI/TS28111_FmControlNrm.yaml diff --git a/OpenAPI/TS28532_ProvMnS.yaml b/OpenAPI/TS28532_ProvMnS.yaml index 6ad84a86b..ec87bb732 100755 --- a/OpenAPI/TS28532_ProvMnS.yaml +++ b/OpenAPI/TS28532_ProvMnS.yaml @@ -399,7 +399,7 @@ components: - $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_FmControlNrm.yaml#/components/schemas/resources-FmControlNrm' + - $ref: 'TS28111_FmControlNrm.yaml#/components/schemas/resources-FmControlNrm' - $ref: 'TS28623_ManagementDataCollectionNrm.yaml#/components/schemas/resources-MgmtDataCollectionNrm' - $ref: 'TS28623_MnSRegistryNrm.yaml#/components/schemas/resources-MnSRegistryNrm' - $ref: 'TS28623_PmControlNrm.yaml#/components/schemas/resources-PmControlNrm' -- GitLab From a5265c6c5716de72764169d648a3d3ed31675179 Mon Sep 17 00:00:00 2001 From: ruiyue Date: Fri, 19 Jan 2024 01:38:01 +0000 Subject: [PATCH 28/41] Update file TS28623_GenericNrm.yaml --- OpenAPI/TS28623_GenericNrm.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/OpenAPI/TS28623_GenericNrm.yaml b/OpenAPI/TS28623_GenericNrm.yaml index f92a9f397..75003a74e 100755 --- a/OpenAPI/TS28623_GenericNrm.yaml +++ b/OpenAPI/TS28623_GenericNrm.yaml @@ -432,7 +432,7 @@ components: NtfSubscriptionControl: $ref: 'TS28623_SubscriptionControlNrm.yaml#/components/schemas/NtfSubscriptionControl-Multiple' AlarmList: - $ref: 'TS28623_FmControlNrm.yaml#/components/schemas/AlarmList-Single' + $ref: 'TS28111_FmControlNrm.yaml#/components/schemas/AlarmList-Single' FileDownloadJob: $ref: 'TS28623_FileManagementNrm.yaml#/components/schemas/FileDownloadJob-Multiple' Files: @@ -462,7 +462,7 @@ components: NtfSubscriptionControl: $ref: 'TS28623_SubscriptionControlNrm.yaml#/components/schemas/NtfSubscriptionControl-Multiple' AlarmList: - $ref: 'TS28623_FmControlNrm.yaml#/components/schemas/AlarmList-Single' + $ref: 'TS28111_FmControlNrm.yaml#/components/schemas/AlarmList-Single' FileDownloadJob: $ref: 'TS28623_FileManagementNrm.yaml#/components/schemas/FileDownloadJob-Multiple' Files: -- GitLab From cd8aa0b6a7db53058eb021013fc57f5ee2adf72a Mon Sep 17 00:00:00 2001 From: ruiyue Date: Fri, 19 Jan 2024 01:44:36 +0000 Subject: [PATCH 29/41] Update 8 files - /OpenAPI/TS28623_FileManagementNrm.yaml - /OpenAPI/TS28623_ManagementDataCollectionNrm.yaml - /OpenAPI/TS28623_MnSRegistryNrm.yaml - /OpenAPI/TS28623_PmControlNrm.yaml - /OpenAPI/TS28623_QoEMeasurementCollectionNrm.yaml - /OpenAPI/TS28623_SubscriptionControlNrm.yaml - /OpenAPI/TS28623_ThresholdMonitorNrm.yaml - /OpenAPI/TS28623_TraceControlNrm.yaml --- OpenAPI/TS28623_FileManagementNrm.yaml | 2 +- OpenAPI/TS28623_ManagementDataCollectionNrm.yaml | 2 +- OpenAPI/TS28623_MnSRegistryNrm.yaml | 2 +- OpenAPI/TS28623_PmControlNrm.yaml | 2 +- OpenAPI/TS28623_QoEMeasurementCollectionNrm.yaml | 2 +- OpenAPI/TS28623_SubscriptionControlNrm.yaml | 2 +- OpenAPI/TS28623_ThresholdMonitorNrm.yaml | 2 +- OpenAPI/TS28623_TraceControlNrm.yaml | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/OpenAPI/TS28623_FileManagementNrm.yaml b/OpenAPI/TS28623_FileManagementNrm.yaml index f510704a0..6cdfde23e 100644 --- a/OpenAPI/TS28623_FileManagementNrm.yaml +++ b/OpenAPI/TS28623_FileManagementNrm.yaml @@ -149,7 +149,7 @@ components: #-------- Definitions in TS 28.623 for TS 28.532 --------------------------------- - resources-FileMgmtNrm: + resources-fileMgmtNrm: oneOf: - $ref: '#/components/schemas/FileDownloadJob-Single' - $ref: '#/components/schemas/Files-Single' diff --git a/OpenAPI/TS28623_ManagementDataCollectionNrm.yaml b/OpenAPI/TS28623_ManagementDataCollectionNrm.yaml index a2f033a46..04e653d1b 100644 --- a/OpenAPI/TS28623_ManagementDataCollectionNrm.yaml +++ b/OpenAPI/TS28623_ManagementDataCollectionNrm.yaml @@ -74,7 +74,7 @@ components: ManagementDataCollection-Multiple: type: array items: - $ref: '#/components/schemas/ManagementDataCollection-Single' + $ref: '#/components/schemas/managementDataCollection-Single' #-------- Definitions in TS 28.623 for TS 28.532 --------------------------------- resources-MgmtDataCollectionNrm: diff --git a/OpenAPI/TS28623_MnSRegistryNrm.yaml b/OpenAPI/TS28623_MnSRegistryNrm.yaml index e7eb3a0c0..c9dfaf5fd 100644 --- a/OpenAPI/TS28623_MnSRegistryNrm.yaml +++ b/OpenAPI/TS28623_MnSRegistryNrm.yaml @@ -61,7 +61,7 @@ components: #-------- Definitions in TS 28.623 for TS 28.532 --------------------------------- - resources-MnSRegistryNrm: + resources-MnSregistryNrm: oneOf: - $ref: '#/components/schemas/MnsInfo-Single' - $ref: '#/components/schemas/MnsRegistry-Single' diff --git a/OpenAPI/TS28623_PmControlNrm.yaml b/OpenAPI/TS28623_PmControlNrm.yaml index ae71b3b12..9c6ed335c 100644 --- a/OpenAPI/TS28623_PmControlNrm.yaml +++ b/OpenAPI/TS28623_PmControlNrm.yaml @@ -56,7 +56,7 @@ components: PerfMetricJob-Multiple: type: array items: - $ref: '#/components/schemas/PerfMetricJob-Single' + $ref: '#/components/schemas/perfMetricJob-Single' #-------- Definitions in TS 28.623 for TS 28.532 --------------------------------- resources-PmControlNrm: diff --git a/OpenAPI/TS28623_QoEMeasurementCollectionNrm.yaml b/OpenAPI/TS28623_QoEMeasurementCollectionNrm.yaml index 9262c2228..ddcbe983d 100644 --- a/OpenAPI/TS28623_QoEMeasurementCollectionNrm.yaml +++ b/OpenAPI/TS28623_QoEMeasurementCollectionNrm.yaml @@ -70,6 +70,6 @@ components: $ref: '#/components/schemas/QMCJob-Single' #-------- Definitions in TS 28.623 for TS 28.532 --------------------------------- - resources-QoEMeasuremetCollectionNrm: + resources-qoEMeasuremetCollectionNrm: oneOf: - $ref: '#/components/schemas/QMCJob-Single' diff --git a/OpenAPI/TS28623_SubscriptionControlNrm.yaml b/OpenAPI/TS28623_SubscriptionControlNrm.yaml index 0857ff190..750d31833 100644 --- a/OpenAPI/TS28623_SubscriptionControlNrm.yaml +++ b/OpenAPI/TS28623_SubscriptionControlNrm.yaml @@ -69,7 +69,7 @@ components: #-------- Definitions in TS 28.623 for TS 28.532 --------------------------------- - resources-SubscriptionControlNrm: + resources-subscriptionControlNrm: oneOf: - $ref: '#/components/schemas/NtfSubscriptionControl-Single' - $ref: '#/components/schemas/HeartbeatControl-Single' \ No newline at end of file diff --git a/OpenAPI/TS28623_ThresholdMonitorNrm.yaml b/OpenAPI/TS28623_ThresholdMonitorNrm.yaml index c2e7bbf3b..d4fd1aac1 100644 --- a/OpenAPI/TS28623_ThresholdMonitorNrm.yaml +++ b/OpenAPI/TS28623_ThresholdMonitorNrm.yaml @@ -71,6 +71,6 @@ components: $ref: '#/components/schemas/ThresholdMonitor-Single' #-------- Definitions in TS 28.623 for TS 28.532 --------------------------------- - resources-ThresholdMonitorNrm: + resources-thresholdMonitorNrm: oneOf: - $ref: '#/components/schemas/ThresholdMonitor-Single' diff --git a/OpenAPI/TS28623_TraceControlNrm.yaml b/OpenAPI/TS28623_TraceControlNrm.yaml index ecad28669..6823ec6b9 100644 --- a/OpenAPI/TS28623_TraceControlNrm.yaml +++ b/OpenAPI/TS28623_TraceControlNrm.yaml @@ -1465,6 +1465,6 @@ components: items: $ref: '#/components/schemas/TraceJob-Single' #-------- Definitions in TS 28.623 for TS 28.532 --------------------------------- - resources-TraceControlNrm: + resources-traceControlNrm: oneOf: - $ref: '#/components/schemas/TraceJob-Single' -- GitLab From 2124f9ff5359d07f4f54c1382774f23f335a2069 Mon Sep 17 00:00:00 2001 From: ruiyue Date: Fri, 19 Jan 2024 01:46:32 +0000 Subject: [PATCH 30/41] Update file TS28532_ProvMnS.yaml --- OpenAPI/TS28532_ProvMnS.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OpenAPI/TS28532_ProvMnS.yaml b/OpenAPI/TS28532_ProvMnS.yaml index ec87bb732..6638e3299 100755 --- a/OpenAPI/TS28532_ProvMnS.yaml +++ b/OpenAPI/TS28532_ProvMnS.yaml @@ -398,7 +398,7 @@ 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_FileManagementNrm.yaml#/components/schemas/resources-fileMgmtNrm' - $ref: 'TS28111_FmControlNrm.yaml#/components/schemas/resources-FmControlNrm' - $ref: 'TS28623_ManagementDataCollectionNrm.yaml#/components/schemas/resources-MgmtDataCollectionNrm' - $ref: 'TS28623_MnSRegistryNrm.yaml#/components/schemas/resources-MnSRegistryNrm' -- GitLab From 465191a3038de8bcf701947738d8dc98c679348d Mon Sep 17 00:00:00 2001 From: ruiyue Date: Fri, 19 Jan 2024 01:48:33 +0000 Subject: [PATCH 31/41] Update file TS28532_ProvMnS.yaml --- OpenAPI/TS28532_ProvMnS.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/OpenAPI/TS28532_ProvMnS.yaml b/OpenAPI/TS28532_ProvMnS.yaml index 6638e3299..a1eb2b003 100755 --- a/OpenAPI/TS28532_ProvMnS.yaml +++ b/OpenAPI/TS28532_ProvMnS.yaml @@ -399,8 +399,8 @@ components: - $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: 'TS28111_FmControlNrm.yaml#/components/schemas/resources-FmControlNrm' - - $ref: 'TS28623_ManagementDataCollectionNrm.yaml#/components/schemas/resources-MgmtDataCollectionNrm' + - $ref: 'TS28111_FmControlNrm.yaml#/components/schemas/resources-fmControlNrm' + - $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' -- GitLab From 61ec21ce0190bc14e54e8c2e035ac7010e0a49a8 Mon Sep 17 00:00:00 2001 From: ruiyue Date: Fri, 19 Jan 2024 02:31:45 +0000 Subject: [PATCH 32/41] Update 4 files - /OpenAPI/TS28623_PmControlNrm.yaml - /OpenAPI/TS28623_MnSRegistryNrm.yaml - /OpenAPI/TS28623_ManagementDataCollectionNrm.yaml - /OpenAPI/TS28532_ProvMnS.yaml --- OpenAPI/TS28532_ProvMnS.yaml | 10 +++++----- OpenAPI/TS28623_ManagementDataCollectionNrm.yaml | 2 +- OpenAPI/TS28623_MnSRegistryNrm.yaml | 2 +- OpenAPI/TS28623_PmControlNrm.yaml | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/OpenAPI/TS28532_ProvMnS.yaml b/OpenAPI/TS28532_ProvMnS.yaml index a1eb2b003..0f21140ab 100755 --- a/OpenAPI/TS28532_ProvMnS.yaml +++ b/OpenAPI/TS28532_ProvMnS.yaml @@ -401,11 +401,11 @@ components: - $ref: 'TS28623_FileManagementNrm.yaml#/components/schemas/resources-fileMgmtNrm' - $ref: 'TS28111_FmControlNrm.yaml#/components/schemas/resources-fmControlNrm' - $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_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' Scope: type: object diff --git a/OpenAPI/TS28623_ManagementDataCollectionNrm.yaml b/OpenAPI/TS28623_ManagementDataCollectionNrm.yaml index 04e653d1b..ffeb940b1 100644 --- a/OpenAPI/TS28623_ManagementDataCollectionNrm.yaml +++ b/OpenAPI/TS28623_ManagementDataCollectionNrm.yaml @@ -77,7 +77,7 @@ components: $ref: '#/components/schemas/managementDataCollection-Single' #-------- Definitions in TS 28.623 for TS 28.532 --------------------------------- - resources-MgmtDataCollectionNrm: + resources-mgmtDataCollectionNrm: oneOf: - $ref: '#/components/schemas/ManagementDataCollection-Single' diff --git a/OpenAPI/TS28623_MnSRegistryNrm.yaml b/OpenAPI/TS28623_MnSRegistryNrm.yaml index c9dfaf5fd..2444eac6c 100644 --- a/OpenAPI/TS28623_MnSRegistryNrm.yaml +++ b/OpenAPI/TS28623_MnSRegistryNrm.yaml @@ -61,7 +61,7 @@ components: #-------- Definitions in TS 28.623 for TS 28.532 --------------------------------- - resources-MnSregistryNrm: + resources-mnSregistryNrm: oneOf: - $ref: '#/components/schemas/MnsInfo-Single' - $ref: '#/components/schemas/MnsRegistry-Single' diff --git a/OpenAPI/TS28623_PmControlNrm.yaml b/OpenAPI/TS28623_PmControlNrm.yaml index 9c6ed335c..49636fd6c 100644 --- a/OpenAPI/TS28623_PmControlNrm.yaml +++ b/OpenAPI/TS28623_PmControlNrm.yaml @@ -59,6 +59,6 @@ components: $ref: '#/components/schemas/perfMetricJob-Single' #-------- Definitions in TS 28.623 for TS 28.532 --------------------------------- - resources-PmControlNrm: + resources-pmControlNrm: oneOf: - $ref: '#/components/schemas/PerfMetricJob-Single' -- GitLab From 6e47ef5c12655fdba4cfcb280b814078713e1a13 Mon Sep 17 00:00:00 2001 From: ruiyue Date: Fri, 19 Jan 2024 02:41:58 +0000 Subject: [PATCH 33/41] Update 2 files - /OpenAPI/TS28623_PmControlNrm.yaml - /OpenAPI/TS28532_ProvMnS.yaml --- OpenAPI/TS28532_ProvMnS.yaml | 2 +- OpenAPI/TS28623_PmControlNrm.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/OpenAPI/TS28532_ProvMnS.yaml b/OpenAPI/TS28532_ProvMnS.yaml index 0f21140ab..d8edde489 100755 --- a/OpenAPI/TS28532_ProvMnS.yaml +++ b/OpenAPI/TS28532_ProvMnS.yaml @@ -406,7 +406,7 @@ components: - $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: 'TS28623_TraceControlNrm.yaml#/components/schemas/resources-traceControlNrm' Scope: type: object properties: diff --git a/OpenAPI/TS28623_PmControlNrm.yaml b/OpenAPI/TS28623_PmControlNrm.yaml index 49636fd6c..23581d777 100644 --- a/OpenAPI/TS28623_PmControlNrm.yaml +++ b/OpenAPI/TS28623_PmControlNrm.yaml @@ -56,7 +56,7 @@ components: PerfMetricJob-Multiple: type: array items: - $ref: '#/components/schemas/perfMetricJob-Single' + $ref: '#/components/schemas/PerfMetricJob-Single' #-------- Definitions in TS 28.623 for TS 28.532 --------------------------------- resources-pmControlNrm: -- GitLab From 92c688565588c76baec645068a3d640c8665cfb2 Mon Sep 17 00:00:00 2001 From: ruiyue Date: Fri, 19 Jan 2024 02:45:07 +0000 Subject: [PATCH 34/41] Update file TS28623_ManagementDataCollectionNrm.yaml --- OpenAPI/TS28623_ManagementDataCollectionNrm.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OpenAPI/TS28623_ManagementDataCollectionNrm.yaml b/OpenAPI/TS28623_ManagementDataCollectionNrm.yaml index ffeb940b1..185272364 100644 --- a/OpenAPI/TS28623_ManagementDataCollectionNrm.yaml +++ b/OpenAPI/TS28623_ManagementDataCollectionNrm.yaml @@ -74,7 +74,7 @@ components: ManagementDataCollection-Multiple: type: array items: - $ref: '#/components/schemas/managementDataCollection-Single' + $ref: '#/components/schemas/ManagementDataCollection-Single' #-------- Definitions in TS 28.623 for TS 28.532 --------------------------------- resources-mgmtDataCollectionNrm: -- GitLab From cd07cdec124754acef3aab29e0b0e72022339bb9 Mon Sep 17 00:00:00 2001 From: ruiyue Date: Fri, 19 Jan 2024 02:51:40 +0000 Subject: [PATCH 35/41] Update file TS28111_FmControlNrm.yaml --- OpenAPI/TS28111_FmControlNrm.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/OpenAPI/TS28111_FmControlNrm.yaml b/OpenAPI/TS28111_FmControlNrm.yaml index 44da3526c..51076a456 100644 --- a/OpenAPI/TS28111_FmControlNrm.yaml +++ b/OpenAPI/TS28111_FmControlNrm.yaml @@ -7,7 +7,7 @@ info: © 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved. externalDocs: - description: 3GPP TS 28.623; Generic NRM, FM Contro NRM + description: 3GPP TS 28.623; Fault management, FM Contro NRM url: http://www.3gpp.org/ftp/Specs/archive/28_series/28.623/ paths: {} components: @@ -44,7 +44,7 @@ components: -#-------- Definitions in TS 28.623 for TS 28.532 --------------------------------- - resources-FmControlNrm: +#-------- Definitions in TS 28.111 for TS 28.532 --------------------------------- + resources-fmControlNrm: oneOf: - $ref: '#/components/schemas/AlarmList-Single' -- GitLab From be3b5a20fb4c7488686b58bee79eac019e6ace96 Mon Sep 17 00:00:00 2001 From: ruiyue Date: Fri, 19 Jan 2024 02:56:51 +0000 Subject: [PATCH 36/41] Update file TS28623_MnSRegistryNrm.yaml --- OpenAPI/TS28623_MnSRegistryNrm.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OpenAPI/TS28623_MnSRegistryNrm.yaml b/OpenAPI/TS28623_MnSRegistryNrm.yaml index 2444eac6c..a5a022a43 100644 --- a/OpenAPI/TS28623_MnSRegistryNrm.yaml +++ b/OpenAPI/TS28623_MnSRegistryNrm.yaml @@ -61,7 +61,7 @@ components: #-------- Definitions in TS 28.623 for TS 28.532 --------------------------------- - resources-mnSregistryNrm: + resources-mnSRegistryNrm: oneOf: - $ref: '#/components/schemas/MnsInfo-Single' - $ref: '#/components/schemas/MnsRegistry-Single' -- GitLab From f3d7496ee7ba967ddc30b43f5f51c9d29b17a89f Mon Sep 17 00:00:00 2001 From: ruiyue Date: Fri, 19 Jan 2024 03:06:08 +0000 Subject: [PATCH 37/41] Update file TS28111_FmControlNrm.yaml --- OpenAPI/TS28111_FmControlNrm.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/OpenAPI/TS28111_FmControlNrm.yaml b/OpenAPI/TS28111_FmControlNrm.yaml index 51076a456..3e0ea1932 100644 --- a/OpenAPI/TS28111_FmControlNrm.yaml +++ b/OpenAPI/TS28111_FmControlNrm.yaml @@ -1,13 +1,13 @@ openapi: 3.0.1 info: title: FM Control NRM - version: 18.6.0 + version: 18.0.0 description: >- OAS 3.0.1 definition of the FM Control NRM fragment © 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved. externalDocs: - description: 3GPP TS 28.623; Fault management, FM Contro NRM + description: 3GPP TS 28.111; Fault management, FM Contro NRM url: http://www.3gpp.org/ftp/Specs/archive/28_series/28.623/ paths: {} components: -- GitLab From 5025ab526950a4e193a7c2f2cad35b341b52d041 Mon Sep 17 00:00:00 2001 From: ruiyue Date: Fri, 19 Jan 2024 10:51:49 +0000 Subject: [PATCH 38/41] Update file TS28111_FmControlNrm.yaml --- OpenAPI/TS28111_FmControlNrm.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OpenAPI/TS28111_FmControlNrm.yaml b/OpenAPI/TS28111_FmControlNrm.yaml index 3e0ea1932..f1a4bfa69 100644 --- a/OpenAPI/TS28111_FmControlNrm.yaml +++ b/OpenAPI/TS28111_FmControlNrm.yaml @@ -7,7 +7,7 @@ info: © 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved. externalDocs: - description: 3GPP TS 28.111; Fault management, FM Contro NRM + description: 3GPP TS 28.111; Fault management, FM Control NRM url: http://www.3gpp.org/ftp/Specs/archive/28_series/28.623/ paths: {} components: -- GitLab From 035c33338b486b440b7dc8c8e27645af4226bda1 Mon Sep 17 00:00:00 2001 From: ruiyue Date: Tue, 27 Feb 2024 03:36:00 +0000 Subject: [PATCH 39/41] Update file TS28105_AiMlNrm.yaml --- OpenAPI/TS28105_AiMlNrm.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OpenAPI/TS28105_AiMlNrm.yaml b/OpenAPI/TS28105_AiMlNrm.yaml index 12571c2bd..deb1c8a73 100644 --- a/OpenAPI/TS28105_AiMlNrm.yaml +++ b/OpenAPI/TS28105_AiMlNrm.yaml @@ -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 -- GitLab From c9e9291a924e246ecb304904e69f251652fd8537 Mon Sep 17 00:00:00 2001 From: ruiyue Date: Tue, 27 Feb 2024 03:42:03 +0000 Subject: [PATCH 40/41] Update 2 files - /OpenAPI/TS28105_AiMlNrm.yaml - /OpenAPI/TS28318_DsoNrm.yaml --- OpenAPI/TS28105_AiMlNrm.yaml | 2 +- OpenAPI/TS28318_DsoNrm.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/OpenAPI/TS28105_AiMlNrm.yaml b/OpenAPI/TS28105_AiMlNrm.yaml index deb1c8a73..81c5de572 100644 --- a/OpenAPI/TS28105_AiMlNrm.yaml +++ b/OpenAPI/TS28105_AiMlNrm.yaml @@ -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: diff --git a/OpenAPI/TS28318_DsoNrm.yaml b/OpenAPI/TS28318_DsoNrm.yaml index 3c5e2640d..b714bf307 100644 --- a/OpenAPI/TS28318_DsoNrm.yaml +++ b/OpenAPI/TS28318_DsoNrm.yaml @@ -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: -- GitLab From c3a934cd704db410423223052057c9daae4ef1bb Mon Sep 17 00:00:00 2001 From: ruiyue Date: Tue, 27 Feb 2024 03:44:08 +0000 Subject: [PATCH 41/41] Delete TS28111_FmControlNrm.yaml --- OpenAPI/TS28111_FmControlNrm.yaml | 50 ------------------------------- 1 file changed, 50 deletions(-) delete mode 100644 OpenAPI/TS28111_FmControlNrm.yaml diff --git a/OpenAPI/TS28111_FmControlNrm.yaml b/OpenAPI/TS28111_FmControlNrm.yaml deleted file mode 100644 index f1a4bfa69..000000000 --- a/OpenAPI/TS28111_FmControlNrm.yaml +++ /dev/null @@ -1,50 +0,0 @@ -openapi: 3.0.1 -info: - title: FM Control NRM - version: 18.0.0 - description: >- - OAS 3.0.1 definition of the FM Control NRM fragment - © 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). - All rights reserved. -externalDocs: - description: 3GPP TS 28.111; Fault management, FM Control NRM - url: http://www.3gpp.org/ftp/Specs/archive/28_series/28.623/ -paths: {} -components: - schemas: -#-------- Definition of types----------------------------------------------------- - -#-------- Definition of concrete IOCs -------------------------------------------- - - AlarmList-Single: - allOf: - - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' - - type: object - properties: - attributes: - type: object - properties: - administrativeState: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/AdministrativeState' - operationalState: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/OperationalState' - numOfAlarmRecords: - type: integer - lastModification: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTime' - alarmRecords: - description: >- - This resource represents a map of alarm records. - The alarmIds are used as keys in the map. - type: object - additionalProperties: - $ref: 'TS28532_FaultMnS.yaml#/components/schemas/AlarmRecord' - -#-------- Definition of YAML arrays for name-contained IOCs ---------------------- - - - -#-------- Definitions in TS 28.111 for TS 28.532 --------------------------------- - resources-fmControlNrm: - oneOf: - - $ref: '#/components/schemas/AlarmList-Single' -- GitLab