From 0d41787de9a0d4b24dd37fee2c021b0dfbc2524a Mon Sep 17 00:00:00 2001 From: ruiyue Date: Tue, 16 Jan 2024 03:22:36 +0000 Subject: [PATCH 001/115] 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 002/115] 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 003/115] 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 004/115] 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 005/115] 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 006/115] 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 007/115] 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 008/115] 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 009/115] 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 010/115] 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 011/115] 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 012/115] 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 013/115] 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 014/115] 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 015/115] 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 016/115] 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 017/115] 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 018/115] 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 019/115] 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 020/115] 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 021/115] 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 022/115] 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 023/115] 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 024/115] 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 025/115] 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 026/115] 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 4c91e6b614c86eac5f9a9cde04440ba5d35004c4 Mon Sep 17 00:00:00 2001 From: sunse Date: Tue, 16 Jan 2024 06:48:55 +0000 Subject: [PATCH 027/115] 28.541_CR1141_Rel18_NRM_enhancements_for_NfInfo_and_PcscfInfo, Update TS28541_5GcNrm.yaml --- OpenAPI/TS28541_5GcNrm.yaml | 90 +++++++++++++++++++++++++++++-------- 1 file changed, 72 insertions(+), 18 deletions(-) diff --git a/OpenAPI/TS28541_5GcNrm.yaml b/OpenAPI/TS28541_5GcNrm.yaml index 5a7ba3511..9ac41f5b9 100755 --- a/OpenAPI/TS28541_5GcNrm.yaml +++ b/OpenAPI/TS28541_5GcNrm.yaml @@ -2049,18 +2049,18 @@ components: $ref: '#/components/schemas/NwdafInfo' minProperties: 1 minProperties: 1 - # servedPcscfInfoList: - # description: A map (list of key-value pairs) where nfInstanceId serves as key - # type: object - # additionalProperties: - # description: A map (list of key-value pairs) where a valid JSON string serves as key - # type: object - # additionalProperties: - # anyOf: - # - $ref: '#/components/schemas/PcscfInfo' - # - $ref: 'TS29571_CommonData.yaml#/components/schemas/EmptyObject' - # minProperties: 1 - # minProperties: 1 + servedPcscfInfoList: + description: A map (list of key-value pairs) where nfInstanceId serves as key + type: object + additionalProperties: + description: A map (list of key-value pairs) where a valid JSON string serves as key + type: object + additionalProperties: + anyOf: + - $ref: '#/components/schemas/PcscfInfo' + - $ref: 'TS29571_CommonData.yaml#/components/schemas/EmptyObject' + minProperties: 1 + minProperties: 1 servedGmlcInfo: description: A map (list of key-value pairs) where nfInstanceId serves as key type: object @@ -2077,12 +2077,12 @@ components: - $ref: '#/components/schemas/LmfInfo' - $ref: 'TS29571_CommonData.yaml#/components/schemas/EmptyObject' minProperties: 1 - # servedNfInfo: - # description: A map (list of key-value pairs) where nfInstanceId serves as key - # type: object - # additionalProperties: - # $ref: '#/components/schemas/NfInfo' - # minProperties: 1 + servedNfInfo: + description: A map (list of key-value pairs) where nfInstanceId serves as key + type: object + additionalProperties: + $ref: '#/components/schemas/NfInfo' + minProperties: 1 servedHssInfoList: description: A map (list of key-value pairs) where nfInstanceId serves as key type: object @@ -2761,6 +2761,60 @@ components: minItems: 1 required: - msisdnRanges + PcscfInfo: + description: Information of a P-CSCF NF Instance + type: object + properties: + accessType: + type: array + items: + $ref: 'TS29571_CommonData.yaml#/components/schemas/AccessType' + minItems: 1 + dnnList: + type: array + items: + $ref: 'TS29571_CommonData.yaml#/components/schemas/Dnn' + minItems: 1 + gmFqdn: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/Fqdn' + gmIpv4Addresses: + type: array + items: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/Ipv4Addr' + minItems: 1 + gmIpv6Addresses: + type: array + items: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/Ipv6Addr' + minItems: 1 + mwFqdn: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/Fqdn' + mwIpv4Addresses: + type: array + items: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/Ipv4Addr' + minItems: 1 + mwIpv6Addresses: + type: array + items: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/Ipv6Addr' + minItems: 1 + servedIpv4AddressRanges: + type: array + items: + $ref: '#/components/schemas/Ipv4AddressRange' + minItems: 1 + servedIpv6PrefixRanges: + type: array + items: + $ref: '#/components/schemas/Ipv6PrefixRange' + minItems: 1 + NfInfo: + description: Information of a generic NF Instance + type: object + properties: + nfType: + $ref: 'TS28623_GenericNrm.yaml#/components/schemas/NFType' #-------- Definition of concrete IOCs -------------------------------------------- ProvMnS: -- GitLab From 107884ec9fddd5db2faa5d68114de7ec6f34bbca Mon Sep 17 00:00:00 2001 From: ruiyue Date: Fri, 19 Jan 2024 01:26:47 +0000 Subject: [PATCH 028/115] 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 029/115] 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 030/115] 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 031/115] 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 032/115] 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 033/115] 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 034/115] 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 035/115] 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 d65f3615e79451ea4e2edfc683337fe0bffad3ac Mon Sep 17 00:00:00 2001 From: shumim Date: Fri, 19 Jan 2024 02:51:31 +0000 Subject: [PATCH 036/115] =?UTF-8?q?=E2=80=9DInitial=20the=20baseline=20for?= =?UTF-8?q?=20TS28.105=20NRM=20based=20on=20=20S5-238360=E2=80=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- OpenAPI/TS28105_AiMlNrm.yaml | 476 +++++++++++++++++++++++++++++++++-- 1 file changed, 459 insertions(+), 17 deletions(-) diff --git a/OpenAPI/TS28105_AiMlNrm.yaml b/OpenAPI/TS28105_AiMlNrm.yaml index 71e2d3853..94144d83b 100644 --- a/OpenAPI/TS28105_AiMlNrm.yaml +++ b/OpenAPI/TS28105_AiMlNrm.yaml @@ -27,10 +27,11 @@ components: type: string enum: - NOT_STARTED - - TRAINING_IN_PROGRESS + - IN_PROGRESS - SUSPENDED - FINISHED - CANCELLED + - CANCELLING PerformanceRequirements: type: array @@ -45,11 +46,9 @@ components: performanceMetric: type: string performanceScore: - type: number - format: float + $ref: 'TS28623_ComDefs.yaml#/components/schemas/Float' decisionConfidenceScore: - type: number - format: float + $ref: 'TS28623_ComDefs.yaml#/components/schemas/Float' TrainingProcessMonitor: description: >- @@ -79,6 +78,67 @@ components: resultStateInfo: type: string + MlManagementPolicy: + description: >- + This data type is the "ProcessMonitor" data type defined in “genericNrm.yaml” + with specialisations for usage in the "MLTrainingProcess". + type: object + properties: + thresholdList: + type: array + items: + $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ThresholdInfo' + + SupportedPerfIndicator: + type: object + properties: + performanceIndicatorName: + type: string + isSupportedForTraining: + type: boolean + isSupportedForTesting: + type: boolean + + ManagedActivationScope: + oneOf: + - type: array + items: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' + - type: object + properties: + dNList: + type: array + items: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' + - type: object + properties: + timeWindow: + type: array + items: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/TimeWindow' + - type: object + properties: + geoPolygon: + type: array + items: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/GeoArea' + + AvailMLCapabilityReport: + type: object + properties: + availMLCapabilityReportID: + type: string # Fixme no specified in DraftCR + mLCapabilityVersionId: + type: array + items: + type: string + expectedPerformanceGains: + type: array + items: + $ref: '#/components/schemas/ModelPerformance' + mLEntityRef: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList' + #-------- Definition of abstract IOCs -------------------------------------------- @@ -101,8 +161,14 @@ components: $ref: '#/components/schemas/ManagedElement-Multiple' MLTrainingFunction: $ref: '#/components/schemas/MLTrainingFunction-Multiple' + MLTestingFunction: + $ref: '#/components/schemas/MLTestingFunction-Multiple' MLEntityRepository: $ref: '#/components/schemas/MLEntityRepository-Multiple' + MLUpdateFunction: + $ref: '#/components/schemas/MLUpdateFunction-Multiple' + AiMlInferenceCapability: + $ref: '#/components/schemas/AiMlInferenceCapability-Multiple' ManagedElement-Single: allOf: @@ -116,8 +182,14 @@ components: properties: MLTrainingFunction: $ref: '#/components/schemas/MLTrainingFunction-Multiple' + MLTestingFunction: + $ref: '#/components/schemas/MLTestingFunction-Multiple' MLEntityRepository: $ref: '#/components/schemas/MLEntityRepository-Multiple' + MLUpdateFunction: + $ref: '#/components/schemas/MLUpdateFunction-Multiple' + AiMlInferenceCapability: + $ref: '#/components/schemas/AiMlInferenceCapability-Multiple' MLTrainingFunction-Single: allOf: @@ -150,8 +222,6 @@ components: allOf: - type: object properties: - mLEntityId: - type: string inferenceType: type: string candidateTrainingDataSource: @@ -159,8 +229,7 @@ components: items: type: string trainingDataQualityScore: - type: number - format: float + $ref: 'TS28623_ComDefs.yaml#/components/schemas/Float' trainingRequestSource: $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' requestStatus: @@ -172,9 +241,11 @@ components: cancelRequest: type: boolean suspendRequest: - type: boolean + type: boolean mLEntityToTrainRef: $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' + mLEntityCoordinationGroupToTrainRef: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' MLTrainingProcess-Single: allOf: @@ -201,9 +272,6 @@ components: $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList' trainingReportRef: $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' - mLEnityGeneratedRef: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' - MLTrainingReport-Single: allOf: @@ -222,24 +290,174 @@ components: type: array items: type: string - modelConfidenceIndication: + confidenceIndication: type: integer modelPerformanceTraining: type: array items: $ref: '#/components/schemas/ModelPerformance' + modelPerformanceValidation: + type: array + items: + $ref: '#/components/schemas/ModelPerformance' + dataRatioTrainingAndValidation: + type: integer areNewTrainingDataUsed: type: boolean trainingRequestRef: $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList' trainingProcessRef: $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' - trainingReportRef: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' lastTrainingRef: $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' mLEnityGeneratedRef: $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' + mLEntityCoordinationGroupToTrainRef: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' + + MLTestingFunction-Single: + allOf: + - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' + - type: object + properties: + attributes: + allOf: + - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-Attr' + - type: object + properties: + mLEntityIdList: + type: array + items: + type: string + - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' + - type: object + properties: + MLTestingRequest: + $ref: '#/components/schemas/MLTestingRequest-Multiple' + MLTestingReport: + $ref: '#/components/schemas/MLTestingReport-Multiple' + + MLTestingRequest-Single: + allOf: + - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' + - type: object + properties: + attributes: + allOf: + - type: object + properties: + requestStatus: + $ref: '#/components/schemas/RequestStatus' + cancelRequest: + type: boolean + suspendRequest: + type: boolean + mLEntityToTestRef: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' + mLEntityCoordinationGroupToTestRef: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' + + MLTestingReport-Single: + allOf: + - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' + - type: object + properties: + attributes: + allOf: + - type: object + properties: + modelPerformanceTesting: + type: array + items: + $ref: '#/components/schemas/ModelPerformance' + mLTestingResult: + type: string + testingRequestRef: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' + + MLInferenceFunction-Single: + allOf: + - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' + - type: object + properties: + attributes: + allOf: + - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-Attr' + - type: object + properties: + mLEntityIdList: + type: array + items: + type: string + - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' + - type: object + properties: + MLEntityLoadingRequest: + $ref: '#/components/schemas/MLEntityLoadingRequest-Multiple' + MLEntityLoadingProcess: + $ref: '#/components/schemas/MLEntityLoadingProcess-Multiple' + MLEntityLoadingPolicy: + $ref: '#/components/schemas/MLEntityLoadingPolicy-Multiple' + MLEntity: + $ref: '#/components/schemas/MLEntity-Multiple' + + MLEntityLoadingRequest-Single: + allOf: + - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' + - type: object + properties: + attributes: + allOf: + - type: object + properties: + requestStatus: + $ref: '#/components/schemas/RequestStatus' + cancelRequest: + type: boolean + suspendRequest: + type: boolean + mLEntityToLoadRef: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' + + MLEntityLoadingPolicy-Single: + allOf: + - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' + - type: object + properties: + attributes: + allOf: + - type: object + properties: + inferenceType: + type: string + mLEntityId: + type: string + policyForLoading: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' + + MLEntityLoadingProcess-Single: + allOf: + - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' + - type: object + properties: + attributes: + allOf: + - type: object + properties: + progressStatus: + $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ProcessMonitor' + cancelProcess: + type: boolean + suspendProcess: + type: boolean + resumeProcess: + type: boolean + MLEntityLoadingRequestRef: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' + MLEntityLoadingPolicyRef: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' + LoadedMLEntityRef: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' MLEntity-Single: allOf: @@ -260,7 +478,13 @@ components: trainingContext: $ref: '#/components/schemas/MLContext' runTimeContext: - $ref: '#/components/schemas/MLContext' + $ref: '#/components/schemas/MLContext' + supportedPerformanceIndicators: + $ref: '#/components/schemas/SupportedPerfIndicator' + retrainingEventsMonitorRef: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' + sourceTrainedMLEntityRef: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' MLEntityRepository-Single: allOf: @@ -272,8 +496,150 @@ components: properties: mLRepositoryId: type: string + MLEntityList: + $ref: '#/components/schemas/MLEntity-Multiple' + MLEntityCoordinationGroups: + $ref: '#/components/schemas/MLEntityCoordinationGroup-Multiple' + + MLEntityCoordinationGroup-Single: + allOf: + - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' + - type: object + properties: + attributes: + type: object + properties: + memberMLEntityRefList: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList' + + ## 7.3a.4.1 IOC + MLUpdateFunction-Single: + allOf: + - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' + - type: object + properties: + attributes: + allOf: + - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-Attr' + - type: object + properties: + availMLCapabilityReport: + $ref: '#/components/schemas/AvailMLCapabilityReport' + mLEntityRef: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList' + - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' + - type: object + properties: + MLUpdateRequest: + $ref: '#/components/schemas/MLUpdateRequest-Multiple' + MLUpdateProcess: + $ref: '#/components/schemas/MLUpdateProcess-Multiple' + MLUpdateReport: + $ref: '#/components/schemas/MLUpdateReport-Multiple' + + MLUpdateRequest-Single: + allOf: + - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' + - type: object + properties: + attributes: + type: object + properties: + performanceGainThreshold: + type: array + items: + $ref: '#/components/schemas/ModelPerformance' + newCapabilityVersionId: + type: array + items: + type: string + updateTimeDeadline: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/TimeWindow' + requestStatus: + $ref: '#/components/schemas/RequestStatus' + mLUpdateReportingPeriod: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/TimeWindow' + mLUpdateProcessRef: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' + mLEntityRef: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList' + + MLUpdateProcess-Single: + allOf: + - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' + - type: object + properties: + attributes: + type: object + properties: + progressStatus: + $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ProcessMonitor' + mLEntityRef: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList' + mLUpdateRequestRef: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList' + mLUpdateReportRef: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' + + MLUpdateReport-Single: + allOf: + - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' + - type: object + properties: + attributes: + type: object + properties: + updatedMLCapability: + $ref: '#/components/schemas/AvailMLCapabilityReport' + mLEntityRef: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList' + mLUpdateProcessRef: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' + + AiMlInferenceCapability-Single: + allOf: + - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' + - type: object + properties: + attributes: + allOf: + - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-Attr' + - type: object + properties: + activationStatus: + type: string + enum: + - ACTIVATED + - DEACTIVATED + managedActivationScope: + $ref: '#/components/schemas/ManagedActivationScope' + - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' + - type: object + properties: MLEntity: $ref: '#/components/schemas/MLEntity-Multiple' + AiMlESCapability-Single: + allOf: + - $ref: '#/components/schemas/AiMlInferenceCapability-Single' + #- $ref: '#/components/schemas/MlInferenceFunction-Single' + - type: object + properties: + attributes: + type: object + properties: + DMROFunctionRef: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList' + # Todo for other attribute related to role + + AiMlLBCapability-Single: + allOf: + - $ref: '#/components/schemas/AiMlInferenceCapability-Single' + # Todo for attribute related to role + + AiMlMOCapability-Single: + allOf: + - $ref: '#/components/schemas/AiMlInferenceCapability-Single' + # Todo for attribute related to role #-------- Definition of JSON arrays for name-contained IOCs ---------------------- @@ -309,6 +675,66 @@ components: type: array items: $ref: '#/components/schemas/MLEntityRepository-Single' + MLEntityCoordinationGroup-Multiple: + type: array + items: + $ref: '#/components/schemas/MLEntityCoordinationGroup-Single' + MLTestingFunction-Multiple: + type: array + items: + $ref: '#/components/schemas/MLTestingFunction-Single' + MLTestingRequest-Multiple: + type: array + items: + $ref: '#/components/schemas/MLTestingRequest-Single' + MLTestingReport-Multiple: + type: array + items: + $ref: '#/components/schemas/MLTestingRequest-Single' + MLInferenceFunction-Multiple: + type: array + items: + $ref: '#/components/schemas/MLInferenceFunction-Single' + MLEntityLoadingRequest-Multiple: + type: array + items: + $ref: '#/components/schemas/MLEntityLoadingRequest-Single' + MLEntityLoadingProcess-Multiple: + type: array + items: + $ref: '#/components/schemas/MLEntityLoadingProcess-Single' + MLEntityLoadingPolicy-Multiple: + type: array + items: + $ref: '#/components/schemas/MLEntityLoadingPolicy-Single' + MLUpdateFunction-Multiple: + type: array + items: + $ref: '#/components/schemas/MLUpdateFunction-Single' + MLUpdateRequest-Multiple: + type: array + items: + $ref: '#/components/schemas/MLUpdateRequest-Single' + MLUpdateProcess-Multiple: + type: array + items: + $ref: '#/components/schemas/MLUpdateProcess-Single' + MLUpdateReport-Multiple: + type: array + items: + $ref: '#/components/schemas/MLUpdateReport-Single' + AiMlInferenceCapability-Multiple: + type: array + items: + $ref: '#/components/schemas/AiMlInferenceCapability-Single' + AiMlESCapability-Multiple: + type: array + items: + $ref: '#/components/schemas/AiMlESCapability-Single' + AiMlLBCapability-Multiple: + type: array + items: + $ref: '#/components/schemas/AiMlLBCapability-Single' #-------- Definitions in TS 28.104 for TS 28.532 --------------------------------- @@ -323,3 +749,19 @@ components: - $ref: '#/components/schemas/MLTrainingReport-Single' - $ref: '#/components/schemas/MLEntity-Single' - $ref: '#/components/schemas/MLEntityRepository-Single' + - $ref: '#/components/schemas/MLEntityCoordinationGroup-Single' + - $ref: '#/components/schemas/MLTestingFunction-Single' + - $ref: '#/components/schemas/MLTestingRequest-Single' + - $ref: '#/components/schemas/MLTestingReport-Single' + - $ref: '#/components/schemas/MLInferenceFunction-Single' + - $ref: '#/components/schemas/MLEntityLoadingRequest-Single' + - $ref: '#/components/schemas/MLEntityLoadingProcess-Single' + - $ref: '#/components/schemas/MLEntityLoadingPolicy-Single' + + - $ref: '#/components/schemas/MLUpdateFunction-Single' + - $ref: '#/components/schemas/MLUpdateRequest-Single' + - $ref: '#/components/schemas/MLUpdateProcess-Single' + - $ref: '#/components/schemas/MLUpdateReport-Single' + - $ref: '#/components/schemas/AiMlInferenceCapability-Single' + - $ref: '#/components/schemas/AiMlESCapability-Single' + - $ref: '#/components/schemas/AiMlLBCapability-Single' -- GitLab From cd07cdec124754acef3aab29e0b0e72022339bb9 Mon Sep 17 00:00:00 2001 From: ruiyue Date: Fri, 19 Jan 2024 02:51:40 +0000 Subject: [PATCH 037/115] 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 038/115] 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 039/115] 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 040/115] 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 6ff8be296a80c93acb6aef6c4f016676eb53569f Mon Sep 17 00:00:00 2001 From: shumim Date: Fri, 2 Feb 2024 12:33:54 +0000 Subject: [PATCH 041/115] delete --- 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 94144d83b..c28f50854 100644 --- a/OpenAPI/TS28105_AiMlNrm.yaml +++ b/OpenAPI/TS28105_AiMlNrm.yaml @@ -31,7 +31,7 @@ components: - SUSPENDED - FINISHED - CANCELLED - - CANCELLING + PerformanceRequirements: type: array -- GitLab From 3e779e7a87ba286957e5f375e99a52953eb83116 Mon Sep 17 00:00:00 2001 From: sunse Date: Thu, 18 Jan 2024 03:12:03 +0000 Subject: [PATCH 042/115] Rel18 TS28.623, CR0311 --- OpenAPI/TS28623_GenericNrm.yaml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/OpenAPI/TS28623_GenericNrm.yaml b/OpenAPI/TS28623_GenericNrm.yaml index 64b9c018e..d8339315e 100755 --- a/OpenAPI/TS28623_GenericNrm.yaml +++ b/OpenAPI/TS28623_GenericNrm.yaml @@ -209,6 +209,12 @@ components: properties: fileReportingPeriod: type: integer + - type: object + properties: + fileReportingPeriod: + type: integer + notificationRecipientAddress: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/Uri' - type: object properties: fileReportingPeriod: -- GitLab From 908db540d4cdaf363eb83cd60e7a6118a99bb8c8 Mon Sep 17 00:00:00 2001 From: sunse Date: Thu, 18 Jan 2024 04:12:15 +0000 Subject: [PATCH 043/115] Rel18 TS28.541 CR1154 --- OpenAPI/TS28541_5GcNrm.yaml | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/OpenAPI/TS28541_5GcNrm.yaml b/OpenAPI/TS28541_5GcNrm.yaml index 9ac41f5b9..b6abdbec9 100755 --- a/OpenAPI/TS28541_5GcNrm.yaml +++ b/OpenAPI/TS28541_5GcNrm.yaml @@ -3031,6 +3031,7 @@ components: $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' aMFSetMemberList: $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList' + - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' AmfRegion-Single: allOf: - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' @@ -3051,6 +3052,7 @@ components: $ref: '#/components/schemas/SnssaiList' aMFSetListRef: $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList' + - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' SmfFunction-Single: allOf: - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' @@ -3299,7 +3301,7 @@ components: $ref: '#/components/schemas/ManagedNFProfile' udrInfo: $ref: '#/components/schemas/UdrInfo' - + - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' UdsfFunction-Single: allOf: - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' @@ -3318,7 +3320,7 @@ components: $ref: '#/components/schemas/ManagedNFProfile' udsfInfo: $ref: '#/components/schemas/UdsfInfo' - + - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' NrfFunction-Single: allOf: - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' @@ -3707,6 +3709,7 @@ components: $ref: 'TS28541_NrNrm.yaml#/components/schemas/PlmnIdList' amfIdentifier: $ref: '#/components/schemas/AmfIdentifier' + - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' ExternalNrfFunction-Single: allOf: - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' @@ -3719,6 +3722,7 @@ components: properties: plmnIdList: $ref: 'TS28541_NrNrm.yaml#/components/schemas/PlmnIdList' + - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' ExternalNssfFunction-Single: allOf: - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' @@ -3731,6 +3735,7 @@ components: properties: plmnIdList: $ref: 'TS28541_NrNrm.yaml#/components/schemas/PlmnIdList' + - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' ExternalSeppFunction-Single: allOf: - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' @@ -3747,7 +3752,7 @@ components: type: integer fqdn: $ref: 'TS28623_ComDefs.yaml#/components/schemas/Fqdn' - + - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' EP_N2-Single: allOf: -- GitLab From 1213cd8c7aed055c01de96bc7271029f1977c7d9 Mon Sep 17 00:00:00 2001 From: sunse Date: Fri, 19 Jan 2024 02:54:22 +0000 Subject: [PATCH 044/115] 28.532_Rel18_CR0311_Add_dataNodeSelector_to_getMOIAttributes Update TS28532_ProvMnS.yaml --- OpenAPI/TS28532_ProvMnS.yaml | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/OpenAPI/TS28532_ProvMnS.yaml b/OpenAPI/TS28532_ProvMnS.yaml index a80762036..39f10c4e5 100755 --- a/OpenAPI/TS28532_ProvMnS.yaml +++ b/OpenAPI/TS28532_ProvMnS.yaml @@ -195,8 +195,7 @@ paths: This parameter reduces the targeted set of resources by applying a filter to the scoped set of resource representations. Only resource representations for which the filter construct evaluates to "true" - are targeted. No filter language is specified in the present - document. + are targeted. required: false schema: $ref: 'TS28623_ComDefs.yaml#/components/schemas/Filter' @@ -224,6 +223,14 @@ paths: type: string style: form explode: false + - name: dataNodeSelector + in: query + description: >- + This parameter contains an expression allowing to conditionally + select data nodes. + required: false + schema: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/Filter' responses: '200': description: >- -- GitLab From 5477e2275eb0fc4e410ed04e3cb89c2a72c52914 Mon Sep 17 00:00:00 2001 From: sunse Date: Wed, 17 Jan 2024 02:46:44 +0000 Subject: [PATCH 045/115] IOC name correction, Update TS28538_EdgeNrm.yaml --- OpenAPI/TS28538_EdgeNrm.yaml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/OpenAPI/TS28538_EdgeNrm.yaml b/OpenAPI/TS28538_EdgeNrm.yaml index cb10b910b..2b3fe3447 100644 --- a/OpenAPI/TS28538_EdgeNrm.yaml +++ b/OpenAPI/TS28538_EdgeNrm.yaml @@ -335,7 +335,7 @@ components: reservationID: type: string - ResourceReservationJob: + EASResourceReservationJob-Single: allOf: - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' - type: object @@ -347,7 +347,7 @@ components: items: $ref: '#/components/schemas/ResourceReservationRequirement' requestedReservationExpiration: - type: string + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTime' resourceReservationStatus: type: array items: @@ -444,3 +444,4 @@ components: - $ref: '#/components/schemas/EdgeFederation-Single' - $ref: '#/components/schemas/OperatorEdgeFederation-Single' - $ref: '#/components/schemas/OperatorEdgeDataNetwork-Single' + - $ref: '#/components/schemas/EASResourceReservationJob-Single' -- GitLab From ed0e0c16bfa91ea7830486c5136a5290741076eb Mon Sep 17 00:00:00 2001 From: sunse Date: Mon, 29 Jan 2024 17:48:33 +0000 Subject: [PATCH 046/115] Rel18 TS28.623 CR0329 Update TS28623_GenericNrm.yaml --- OpenAPI/TS28623_GenericNrm.yaml | 27 ++++++++++++++++----------- 1 file changed, 16 insertions(+), 11 deletions(-) diff --git a/OpenAPI/TS28623_GenericNrm.yaml b/OpenAPI/TS28623_GenericNrm.yaml index d8339315e..1978c3f8a 100755 --- a/OpenAPI/TS28623_GenericNrm.yaml +++ b/OpenAPI/TS28623_GenericNrm.yaml @@ -226,17 +226,22 @@ components: 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 + oneOf: + - type: object + properties: + scopeType: + type: string + enum: + - BASE_ONLY + - BASE_ALL + - BASE_NTH_LEVEL + - BASE_SUBTREE + scopeLevel: + type: integer + - type: object + properties: + dataNodeSelector: + type: string ProcessMonitor: description: >- This data type is the "ProcessMonitor" data type without specialisations. -- GitLab From 59eaa0cb38407447fcecbbd134b5bad18114bfee Mon Sep 17 00:00:00 2001 From: sunse Date: Fri, 19 Jan 2024 02:51:37 +0000 Subject: [PATCH 047/115] 28.532_Rel18_CR0310_Add_new_HTTP_error_response_format Update TS28532_ProvMnS.yaml --- OpenAPI/TS28532_ProvMnS.yaml | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/OpenAPI/TS28532_ProvMnS.yaml b/OpenAPI/TS28532_ProvMnS.yaml index 39f10c4e5..30aa8cc2b 100755 --- a/OpenAPI/TS28532_ProvMnS.yaml +++ b/OpenAPI/TS28532_ProvMnS.yaml @@ -82,7 +82,7 @@ paths: content: application/json: schema: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/ErrorResponse' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/ErrorResponseDefault' callbacks: notifyMOICreation: '{request.body#/notificationRecipientAddress}': @@ -257,7 +257,7 @@ paths: content: application/json: schema: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/ErrorResponse' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/ErrorResponseGet' patch: summary: Patches one or multiple resources description: >- @@ -314,7 +314,9 @@ paths: content: application/json: schema: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/ErrorResponse' + oneOf: + - $ref: 'TS28623_ComDefs.yaml#/components/schemas/ErrorResponseDefault' + - $ref: 'TS28623_ComDefs.yaml#/components/schemas/ErrorResponsePatch' delete: summary: Deletes one resource description: >- @@ -331,7 +333,7 @@ paths: content: application/json: schema: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/ErrorResponse' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/ErrorResponseDefault' components: schemas: CmNotificationTypes: -- GitLab From 51665754844efcd22d67f4f8b204420de37c4346 Mon Sep 17 00:00:00 2001 From: sunse Date: Fri, 19 Jan 2024 03:47:13 +0000 Subject: [PATCH 048/115] Add new HTTP error response format, Update TS28623_ComDefs.yaml --- OpenAPI/TS28623_ComDefs.yaml | 123 +++++++++++++++++++++++++++++++++++ 1 file changed, 123 insertions(+) diff --git a/OpenAPI/TS28623_ComDefs.yaml b/OpenAPI/TS28623_ComDefs.yaml index 88dbbd989..a2f741b6c 100755 --- a/OpenAPI/TS28623_ComDefs.yaml +++ b/OpenAPI/TS28623_ComDefs.yaml @@ -277,3 +277,126 @@ components: properties: errorInfo: type: string + + ErrorResponseGet: + description: >- + Default schema for the response message body in case the Get + is not successful. + type: object + properties: + status: + type: string + type: + type: string + reason: + type: string + title: + type: string + badQueryParams: + type: array + items: + type: string + otherProblems: + type: array + items: + type: object + properties: + status: + type: string + type: + type: string + reason: + type: string + title: + type: string + badQueryParams: + type: array + items: + type: string + required: + - type + required: + - type + + ErrorResponseDefault: + type: object + properties: + status: + type: string + type: + type: string + reason: + type: string + title: + type: string + badAttributes: + type: array + items: + type: string + badObjects: + type: array + items: + type: string + otherProblems: + type: array + items: + type: object + properties: + status: + type: string + type: + type: string + reason: + type: string + title: + type: string + badAttributes: + type: array + items: + type: string + badObjects: + type: array + items: + type: string + required: + - type + required: + - type + + ErrorResponsePatch: + description: >- + Default schema for the response message body in case the patch + is not successful. + type: object + properties: + status: + type: string + type: + type: string + reason: + type: string + title: + type: string + badOP: + type: string + otherProblems: + type: array + items: + type: object + properties: + status: + type: string + type: + type: string + reason: + type: string + title: + type: string + badOp: + type: string + required: + - type + - badOp + required: + - type + - badOp -- GitLab From 6d7d89c9742f4eb9ac7ae1008299d3e12158a9a7 Mon Sep 17 00:00:00 2001 From: sunse Date: Fri, 19 Jan 2024 04:03:25 +0000 Subject: [PATCH 049/115] validation correction Update TS28623_ComDefs.yaml --- OpenAPI/TS28623_ComDefs.yaml | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/OpenAPI/TS28623_ComDefs.yaml b/OpenAPI/TS28623_ComDefs.yaml index a2f741b6c..7c09a0435 100755 --- a/OpenAPI/TS28623_ComDefs.yaml +++ b/OpenAPI/TS28623_ComDefs.yaml @@ -313,10 +313,10 @@ components: type: array items: type: string - required: - - type + required: + - type required: - - type + - type ErrorResponseDefault: type: object @@ -358,10 +358,10 @@ components: type: array items: type: string - required: - - type + required: + - type required: - - type + - type ErrorResponsePatch: description: >- @@ -394,9 +394,9 @@ components: type: string badOp: type: string - required: + required: + - type + - badOp + required: - type - badOp - required: - - type - - badOp -- GitLab From ccd328ab6da638ce52b2adece9d1395ee4c0e582 Mon Sep 17 00:00:00 2001 From: sunse Date: Fri, 19 Jan 2024 04:20:50 +0000 Subject: [PATCH 050/115] update XPath to Jex, Update TS28623_ComDefs.yaml --- OpenAPI/TS28623_ComDefs.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OpenAPI/TS28623_ComDefs.yaml b/OpenAPI/TS28623_ComDefs.yaml index 7c09a0435..e5da4cc47 100755 --- a/OpenAPI/TS28623_ComDefs.yaml +++ b/OpenAPI/TS28623_ComDefs.yaml @@ -232,7 +232,7 @@ components: Filter: description: >- - The filter format shall be compliant to XPath 1.0. + The filter format shall be compliant to Jex (TS 32.161). type: string SystemDN: type: string -- GitLab From 49a2d726127c6e4fb90bd97202415a4333265001 Mon Sep 17 00:00:00 2001 From: shumin Date: Sun, 4 Feb 2024 21:56:57 +0800 Subject: [PATCH 051/115] clean up --- OpenAPI/28105_training.diff | 136 +++++++++++++++++++++++++++++++++++ OpenAPI/MLTestingNRM.diff | 125 ++++++++++++++++++++++++++++++++ OpenAPI/TS28105_AiMlNrm.yaml | 4 +- 3 files changed, 264 insertions(+), 1 deletion(-) create mode 100644 OpenAPI/28105_training.diff create mode 100644 OpenAPI/MLTestingNRM.diff diff --git a/OpenAPI/28105_training.diff b/OpenAPI/28105_training.diff new file mode 100644 index 000000000..336f7ad33 --- /dev/null +++ b/OpenAPI/28105_training.diff @@ -0,0 +1,136 @@ +diff --git a/OpenAPI/TS28105_AiMlNrm_draftCR.yaml b/OpenAPI/TS28105_AiMlNrm_draftCR.yaml +index e13d7fe..b451847 100644 +--- a/OpenAPI/TS28105_AiMlNrm_draftCR.yaml ++++ b/OpenAPI/TS28105_AiMlNrm_draftCR.yaml +@@ -27,7 +27,7 @@ components: + type: string + enum: + - NOT_STARTED +- - TRAINING_IN_PROGRESS ++ - IN_PROGRESS + - SUSPENDED + - FINISHED + - CANCELLED +@@ -45,11 +45,9 @@ components: + performanceMetric: + type: string + performanceScore: +- type: number +- format: float ++ $ref: 'TS28623_ComDefs.yaml#/components/schemas/Float' + decisionConfidenceScore: +- type: number +- format: float ++ $ref: 'TS28623_ComDefs.yaml#/components/schemas/Float' + + TrainingProcessMonitor: + description: >- +@@ -150,8 +148,6 @@ components: + allOf: + - type: object + properties: +- mLEntityId: +- type: string + inferenceType: + type: string + candidateTrainingDataSource: +@@ -159,8 +155,7 @@ components: + items: + type: string + trainingDataQualityScore: +- type: number +- format: float ++ $ref: 'TS28623_ComDefs.yaml#/components/schemas/Float' + trainingRequestSource: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' + requestStatus: +@@ -172,9 +167,11 @@ components: + cancelRequest: + type: boolean + suspendRequest: +- type: boolean ++ type: boolean + mLEntityToTrainRef: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' ++ mLEntityCoordinationGroupToTrainRef: ++ $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' + + MLTrainingProcess-Single: + allOf: +@@ -226,18 +223,24 @@ components: + type: array + items: + $ref: '#/components/schemas/ModelPerformance' ++ modelPerformanceValidation: ++ type: array ++ items: ++ $ref: '#/components/schemas/ModelPerformance' ++ dataRatioTrainingAndValidation: ++ type: integer + areNewTrainingDataUsed: + type: boolean + trainingRequestRef: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList' + trainingProcessRef: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' +- trainingReportRef: +- $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' + lastTrainingRef: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' + mLEnityGeneratedRef: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' ++ mLEntityCoordinationGroupToTrainRef: ++ $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' + + MLEntity-Single: + allOf: +@@ -260,7 +263,9 @@ components: + runTimeContext: + $ref: '#/components/schemas/MLContext' + retrainingEventsMonitorRef: +- $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ThresholdMonitor-Single' ++ $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' ++ sourceTrainedMLEntityRef: ++ $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' + + + MLEntityRepository-Single: +@@ -275,6 +280,21 @@ components: + type: string + MLEntity: + $ref: '#/components/schemas/MLEntity-Multiple' ++ MLEntityCoordinationGroup-Single: ++ $ref: '#/components/schemas/MLEntityCoordinationGroup-Multiple' ++ ++ MLEntityCoordinationGroup-Single: ++ allOf: ++ - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' ++ - type: object ++ properties: ++ attributes: ++ type: object ++ properties: ++ memberMLEntityRefList: ++ $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList' ++ MLEntity: ++ $ref: '#/components/schemas/MLEntity-Multiple' + + #-------- Definition of JSON arrays for name-contained IOCs ---------------------- + +@@ -310,7 +330,10 @@ components: + type: array + items: + $ref: '#/components/schemas/MLEntityRepository-Single' +- ++ MLEntityCoordinationGroup-Multiple: ++ type: array ++ items: ++ $ref: '#/components/schemas/MLEntityCoordinationGroup-Single' + #-------- Definitions in TS 28.104 for TS 28.532 --------------------------------- + + resources-AiMlNrm: +@@ -324,3 +347,4 @@ components: + - $ref: '#/components/schemas/MLTrainingReport-Single' + - $ref: '#/components/schemas/MLEntity-Single' + - $ref: '#/components/schemas/MLEntityRepository-Single' ++ - $ref: '#/components/schemas/MLEntityCoordinationGroup-Single' diff --git a/OpenAPI/MLTestingNRM.diff b/OpenAPI/MLTestingNRM.diff new file mode 100644 index 000000000..35d3e3d58 --- /dev/null +++ b/OpenAPI/MLTestingNRM.diff @@ -0,0 +1,125 @@ +diff --git a/OpenAPI/TS28105_AiMlNrm_draftCR.yaml b/OpenAPI/TS28105_AiMlNrm_draftCR.yaml +index fc41e79..b451847 100644 +--- a/OpenAPI/TS28105_AiMlNrm_draftCR.yaml ++++ b/OpenAPI/TS28105_AiMlNrm_draftCR.yaml +@@ -99,8 +99,6 @@ components: + $ref: '#/components/schemas/ManagedElement-Multiple' + MLTrainingFunction: + $ref: '#/components/schemas/MLTrainingFunction-Multiple' +- MLTestingFunction: +- $ref: '#/components/schemas/MLTestingFunction-Multiple' + MLEntityRepository: + $ref: '#/components/schemas/MLEntityRepository-Multiple' + +@@ -116,8 +114,6 @@ components: + properties: + MLTrainingFunction: + $ref: '#/components/schemas/MLTrainingFunction-Multiple' +- MLTestingFunction: +- $ref: '#/components/schemas/MLTestingFunction-Multiple' + MLEntityRepository: + $ref: '#/components/schemas/MLEntityRepository-Multiple' + +@@ -142,7 +138,7 @@ components: + $ref: '#/components/schemas/MLTrainingProcess-Multiple' + MLTrainingReport: + $ref: '#/components/schemas/MLTrainingReport-Multiple' +- ++ + MLTrainingRequest-Single: + allOf: + - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' +@@ -245,66 +241,6 @@ components: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' + mLEntityCoordinationGroupToTrainRef: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' +- +- MLTestingFunction-Single: +- allOf: +- - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' +- - type: object +- properties: +- attributes: +- allOf: +- - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-Attr' +- - type: object +- properties: +- mLEntityIdList: +- type: array +- items: +- type: string +- - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' +- - type: object +- properties: +- MLTestingRequest: +- $ref: '#/components/schemas/MLTestingRequest-Multiple' +- MLTestingReport: +- $ref: '#/components/schemas/MLTestingReport-Multiple' +- +- MLTestingRequest-Single: +- allOf: +- - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' +- - type: object +- properties: +- attributes: +- allOf: +- - type: object +- properties: +- requestStatus: +- $ref: '#/components/schemas/RequestStatus' +- cancelRequest: +- type: boolean +- suspendRequest: +- type: boolean +- mLEntityToTestRef: +- $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' +- mLEntityCoordinationGroupToTestRef: +- $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' +- +- MLTestingReport-Single: +- allOf: +- - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' +- - type: object +- properties: +- attributes: +- allOf: +- - type: object +- properties: +- modelPerformanceTesting: +- type: array +- items: +- $ref: '#/components/schemas/ModelPerformance' +- mLTestingResult: +- type: string +- testingRequestRef: +- $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' + + MLEntity-Single: + allOf: +@@ -398,18 +334,6 @@ components: + type: array + items: + $ref: '#/components/schemas/MLEntityCoordinationGroup-Single' +- MLTestingFunction-Multiple: +- type: array +- items: +- $ref: '#/components/schemas/MLTestingFunction-Single' +- MLTestingRequest-Multiple: +- type: array +- items: +- $ref: '#/components/schemas/MLTestingRequest-Single' +- MLTestingReport-Multiple: +- type: array +- items: +- $ref: '#/components/schemas/MLTestingReport-Single' + #-------- Definitions in TS 28.104 for TS 28.532 --------------------------------- + + resources-AiMlNrm: +@@ -424,6 +348,3 @@ components: + - $ref: '#/components/schemas/MLEntity-Single' + - $ref: '#/components/schemas/MLEntityRepository-Single' + - $ref: '#/components/schemas/MLEntityCoordinationGroup-Single' +- - $ref: '#/components/schemas/MLTestingFunction-Single' +- - $ref: '#/components/schemas/MLTestingRequest-Single' +- - $ref: '#/components/schemas/MLTestingReport-Single' +\ No newline at end of file diff --git a/OpenAPI/TS28105_AiMlNrm.yaml b/OpenAPI/TS28105_AiMlNrm.yaml index c28f50854..c573e7ece 100644 --- a/OpenAPI/TS28105_AiMlNrm.yaml +++ b/OpenAPI/TS28105_AiMlNrm.yaml @@ -212,6 +212,8 @@ components: $ref: '#/components/schemas/MLTrainingProcess-Multiple' MLTrainingReport: $ref: '#/components/schemas/MLTrainingReport-Multiple' + ThresholdMonitors: + $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ThresholdMonitor-Multiple' MLTrainingRequest-Single: allOf: @@ -415,7 +417,7 @@ components: cancelRequest: type: boolean suspendRequest: - type: boolean + type: boolean mLEntityToLoadRef: $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' -- GitLab From d979cdce9c606d6db0bfc7024bd2b7c13809938f Mon Sep 17 00:00:00 2001 From: shumin Date: Sun, 4 Feb 2024 22:03:37 +0800 Subject: [PATCH 052/115] delete uncessary files --- OpenAPI/28105_training.diff | 136 ------------------------------------ OpenAPI/MLTestingNRM.diff | 125 --------------------------------- 2 files changed, 261 deletions(-) delete mode 100644 OpenAPI/28105_training.diff delete mode 100644 OpenAPI/MLTestingNRM.diff diff --git a/OpenAPI/28105_training.diff b/OpenAPI/28105_training.diff deleted file mode 100644 index 336f7ad33..000000000 --- a/OpenAPI/28105_training.diff +++ /dev/null @@ -1,136 +0,0 @@ -diff --git a/OpenAPI/TS28105_AiMlNrm_draftCR.yaml b/OpenAPI/TS28105_AiMlNrm_draftCR.yaml -index e13d7fe..b451847 100644 ---- a/OpenAPI/TS28105_AiMlNrm_draftCR.yaml -+++ b/OpenAPI/TS28105_AiMlNrm_draftCR.yaml -@@ -27,7 +27,7 @@ components: - type: string - enum: - - NOT_STARTED -- - TRAINING_IN_PROGRESS -+ - IN_PROGRESS - - SUSPENDED - - FINISHED - - CANCELLED -@@ -45,11 +45,9 @@ components: - performanceMetric: - type: string - performanceScore: -- type: number -- format: float -+ $ref: 'TS28623_ComDefs.yaml#/components/schemas/Float' - decisionConfidenceScore: -- type: number -- format: float -+ $ref: 'TS28623_ComDefs.yaml#/components/schemas/Float' - - TrainingProcessMonitor: - description: >- -@@ -150,8 +148,6 @@ components: - allOf: - - type: object - properties: -- mLEntityId: -- type: string - inferenceType: - type: string - candidateTrainingDataSource: -@@ -159,8 +155,7 @@ components: - items: - type: string - trainingDataQualityScore: -- type: number -- format: float -+ $ref: 'TS28623_ComDefs.yaml#/components/schemas/Float' - trainingRequestSource: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' - requestStatus: -@@ -172,9 +167,11 @@ components: - cancelRequest: - type: boolean - suspendRequest: -- type: boolean -+ type: boolean - mLEntityToTrainRef: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' -+ mLEntityCoordinationGroupToTrainRef: -+ $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' - - MLTrainingProcess-Single: - allOf: -@@ -226,18 +223,24 @@ components: - type: array - items: - $ref: '#/components/schemas/ModelPerformance' -+ modelPerformanceValidation: -+ type: array -+ items: -+ $ref: '#/components/schemas/ModelPerformance' -+ dataRatioTrainingAndValidation: -+ type: integer - areNewTrainingDataUsed: - type: boolean - trainingRequestRef: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList' - trainingProcessRef: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' -- trainingReportRef: -- $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' - lastTrainingRef: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' - mLEnityGeneratedRef: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' -+ mLEntityCoordinationGroupToTrainRef: -+ $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' - - MLEntity-Single: - allOf: -@@ -260,7 +263,9 @@ components: - runTimeContext: - $ref: '#/components/schemas/MLContext' - retrainingEventsMonitorRef: -- $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ThresholdMonitor-Single' -+ $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' -+ sourceTrainedMLEntityRef: -+ $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' - - - MLEntityRepository-Single: -@@ -275,6 +280,21 @@ components: - type: string - MLEntity: - $ref: '#/components/schemas/MLEntity-Multiple' -+ MLEntityCoordinationGroup-Single: -+ $ref: '#/components/schemas/MLEntityCoordinationGroup-Multiple' -+ -+ MLEntityCoordinationGroup-Single: -+ allOf: -+ - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' -+ - type: object -+ properties: -+ attributes: -+ type: object -+ properties: -+ memberMLEntityRefList: -+ $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList' -+ MLEntity: -+ $ref: '#/components/schemas/MLEntity-Multiple' - - #-------- Definition of JSON arrays for name-contained IOCs ---------------------- - -@@ -310,7 +330,10 @@ components: - type: array - items: - $ref: '#/components/schemas/MLEntityRepository-Single' -- -+ MLEntityCoordinationGroup-Multiple: -+ type: array -+ items: -+ $ref: '#/components/schemas/MLEntityCoordinationGroup-Single' - #-------- Definitions in TS 28.104 for TS 28.532 --------------------------------- - - resources-AiMlNrm: -@@ -324,3 +347,4 @@ components: - - $ref: '#/components/schemas/MLTrainingReport-Single' - - $ref: '#/components/schemas/MLEntity-Single' - - $ref: '#/components/schemas/MLEntityRepository-Single' -+ - $ref: '#/components/schemas/MLEntityCoordinationGroup-Single' diff --git a/OpenAPI/MLTestingNRM.diff b/OpenAPI/MLTestingNRM.diff deleted file mode 100644 index 35d3e3d58..000000000 --- a/OpenAPI/MLTestingNRM.diff +++ /dev/null @@ -1,125 +0,0 @@ -diff --git a/OpenAPI/TS28105_AiMlNrm_draftCR.yaml b/OpenAPI/TS28105_AiMlNrm_draftCR.yaml -index fc41e79..b451847 100644 ---- a/OpenAPI/TS28105_AiMlNrm_draftCR.yaml -+++ b/OpenAPI/TS28105_AiMlNrm_draftCR.yaml -@@ -99,8 +99,6 @@ components: - $ref: '#/components/schemas/ManagedElement-Multiple' - MLTrainingFunction: - $ref: '#/components/schemas/MLTrainingFunction-Multiple' -- MLTestingFunction: -- $ref: '#/components/schemas/MLTestingFunction-Multiple' - MLEntityRepository: - $ref: '#/components/schemas/MLEntityRepository-Multiple' - -@@ -116,8 +114,6 @@ components: - properties: - MLTrainingFunction: - $ref: '#/components/schemas/MLTrainingFunction-Multiple' -- MLTestingFunction: -- $ref: '#/components/schemas/MLTestingFunction-Multiple' - MLEntityRepository: - $ref: '#/components/schemas/MLEntityRepository-Multiple' - -@@ -142,7 +138,7 @@ components: - $ref: '#/components/schemas/MLTrainingProcess-Multiple' - MLTrainingReport: - $ref: '#/components/schemas/MLTrainingReport-Multiple' -- -+ - MLTrainingRequest-Single: - allOf: - - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' -@@ -245,66 +241,6 @@ components: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' - mLEntityCoordinationGroupToTrainRef: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' -- -- MLTestingFunction-Single: -- allOf: -- - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' -- - type: object -- properties: -- attributes: -- allOf: -- - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-Attr' -- - type: object -- properties: -- mLEntityIdList: -- type: array -- items: -- type: string -- - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' -- - type: object -- properties: -- MLTestingRequest: -- $ref: '#/components/schemas/MLTestingRequest-Multiple' -- MLTestingReport: -- $ref: '#/components/schemas/MLTestingReport-Multiple' -- -- MLTestingRequest-Single: -- allOf: -- - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' -- - type: object -- properties: -- attributes: -- allOf: -- - type: object -- properties: -- requestStatus: -- $ref: '#/components/schemas/RequestStatus' -- cancelRequest: -- type: boolean -- suspendRequest: -- type: boolean -- mLEntityToTestRef: -- $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' -- mLEntityCoordinationGroupToTestRef: -- $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' -- -- MLTestingReport-Single: -- allOf: -- - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' -- - type: object -- properties: -- attributes: -- allOf: -- - type: object -- properties: -- modelPerformanceTesting: -- type: array -- items: -- $ref: '#/components/schemas/ModelPerformance' -- mLTestingResult: -- type: string -- testingRequestRef: -- $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' - - MLEntity-Single: - allOf: -@@ -398,18 +334,6 @@ components: - type: array - items: - $ref: '#/components/schemas/MLEntityCoordinationGroup-Single' -- MLTestingFunction-Multiple: -- type: array -- items: -- $ref: '#/components/schemas/MLTestingFunction-Single' -- MLTestingRequest-Multiple: -- type: array -- items: -- $ref: '#/components/schemas/MLTestingRequest-Single' -- MLTestingReport-Multiple: -- type: array -- items: -- $ref: '#/components/schemas/MLTestingReport-Single' - #-------- Definitions in TS 28.104 for TS 28.532 --------------------------------- - - resources-AiMlNrm: -@@ -424,6 +348,3 @@ components: - - $ref: '#/components/schemas/MLEntity-Single' - - $ref: '#/components/schemas/MLEntityRepository-Single' - - $ref: '#/components/schemas/MLEntityCoordinationGroup-Single' -- - $ref: '#/components/schemas/MLTestingFunction-Single' -- - $ref: '#/components/schemas/MLTestingRequest-Single' -- - $ref: '#/components/schemas/MLTestingReport-Single' -\ No newline at end of file -- GitLab From 06f83bacebfddd08965d0bedd6fc65ae91e46fea Mon Sep 17 00:00:00 2001 From: shumin Date: Sun, 4 Feb 2024 23:48:49 +0800 Subject: [PATCH 053/115] 240817-Rel-18 Input to DraftCR 28.105 Corrections of Issues for Request IOCs --- OpenAPI/TS28105_AiMlNrm.yaml | 41 ++++++++++++++++++++++++++++++++---- 1 file changed, 37 insertions(+), 4 deletions(-) diff --git a/OpenAPI/TS28105_AiMlNrm.yaml b/OpenAPI/TS28105_AiMlNrm.yaml index c573e7ece..8b9576c8e 100644 --- a/OpenAPI/TS28105_AiMlNrm.yaml +++ b/OpenAPI/TS28105_AiMlNrm.yaml @@ -31,7 +31,7 @@ components: - SUSPENDED - FINISHED - CANCELLED - + - CANCELLING PerformanceRequirements: type: array @@ -62,9 +62,9 @@ components: enum: - RUNNING - CANCELLING - - CANCELLED + - NOT_STARTED - SUSPENDED - - FINSHED + - FINISHED progressPercentage: type: integer minimum: 0 @@ -78,6 +78,30 @@ components: resultStateInfo: type: string + MlEntityLoadingProcessMonitor: + description: >- + This data type is the "ProcessMonitor" data type defined in “genericNrm.yaml” with specialisations for usage in the "MLEntityLoadingProcess". + type: object + properties: + MLEntityLoadingProcessId: + type: string + status: + type: string + enum: + - RUNNING + - CANCELLING + - SUSPENDED + - FINISHED + - CANCELLED + progressPercentage: + type: integer + minimum: 0 + maximum: 100 + progressStateInfo: + type: string + resultStateInfo: + type: string + MlManagementPolicy: description: >- This data type is the "ProcessMonitor" data type defined in “genericNrm.yaml” @@ -264,6 +288,11 @@ components: type: integer terminationConditions: type: string + enum: + - UPDATED_IN_INFERENCE_FUNCTION + - INFERENCE FUNCTION_TERMINATED + - INFERENCE FUNCTION_UPGRADED + - INFERENCE_CONTEXT_CHANGED progressStatus: $ref: '#/components/schemas/TrainingProcessMonitor' cancelProcess: @@ -561,6 +590,10 @@ components: $ref: '#/components/schemas/RequestStatus' mLUpdateReportingPeriod: $ref: 'TS28623_ComDefs.yaml#/components/schemas/TimeWindow' + cancelRequest: + type: boolean + suspendRequest: + type: boolean mLUpdateProcessRef: $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' mLEntityRef: @@ -575,7 +608,7 @@ components: type: object properties: progressStatus: - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ProcessMonitor' + $ref: '#/components/schemas/MlEntityLoadingProcessMonitor' mLEntityRef: $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList' mLUpdateRequestRef: -- GitLab From c5945c5c2ba271681df8b20dc88406b252b4abb7 Mon Sep 17 00:00:00 2001 From: shumin Date: Sun, 4 Feb 2024 23:57:01 +0800 Subject: [PATCH 054/115] 2nd : 240817-Rel-18 Input to DraftCR 28.105 Corrections of Issues for Request IOCs --- OpenAPI/TS28105_AiMlNrm.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/OpenAPI/TS28105_AiMlNrm.yaml b/OpenAPI/TS28105_AiMlNrm.yaml index 8b9576c8e..8eb2cd751 100644 --- a/OpenAPI/TS28105_AiMlNrm.yaml +++ b/OpenAPI/TS28105_AiMlNrm.yaml @@ -476,7 +476,7 @@ components: - type: object properties: progressStatus: - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ProcessMonitor' + $ref: '#/components/schemas/MlEntityLoadingProcessMonitor' cancelProcess: type: boolean suspendProcess: @@ -608,7 +608,7 @@ components: type: object properties: progressStatus: - $ref: '#/components/schemas/MlEntityLoadingProcessMonitor' + $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ProcessMonitor' mLEntityRef: $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList' mLUpdateRequestRef: -- GitLab From 8edaa39443f458e6967a9191219e49e601933cc4 Mon Sep 17 00:00:00 2001 From: shumin Date: Mon, 5 Feb 2024 01:08:15 +0800 Subject: [PATCH 055/115] S5-240812 : Rel-18 Input to draft CR TS 28.105 Available capabilities for MLUpdate --- OpenAPI/TS28105_AiMlNrm.yaml | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/OpenAPI/TS28105_AiMlNrm.yaml b/OpenAPI/TS28105_AiMlNrm.yaml index 8eb2cd751..7824c61f8 100644 --- a/OpenAPI/TS28105_AiMlNrm.yaml +++ b/OpenAPI/TS28105_AiMlNrm.yaml @@ -146,6 +146,17 @@ components: type: array items: $ref: 'TS28623_ComDefs.yaml#/components/schemas/GeoArea' + + MLCapabilityInfo: + type: object + properties: + inferenceType: + type: string + capabilityName: + type: string + mLCapabilityParameters: + description: A map (list of key-value pairs) for an inferenceType and capabilityName + $ref: 'TS28623_ComDefs.yaml#/components/schemas/AttributeNameValuePairSet' AvailMLCapabilityReport: type: object @@ -512,6 +523,10 @@ components: $ref: '#/components/schemas/MLContext' supportedPerformanceIndicators: $ref: '#/components/schemas/SupportedPerfIndicator' + mLCapabilitiesInfoList: + type: array + items: + $ref: '#/components/schemas/MLCapabilityInfo' retrainingEventsMonitorRef: $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' sourceTrainedMLEntityRef: -- GitLab From 38715213f8b4f1d8d39047e60ba0d9f4dcac8ad6 Mon Sep 17 00:00:00 2001 From: shumin Date: Mon, 5 Feb 2024 02:36:26 +0800 Subject: [PATCH 056/115] =?UTF-8?q?S5=E2=80=91240815=20:=20Input=20to=20Dr?= =?UTF-8?q?aftCR=2028.105=20Correct=20IOCs=20related=20references?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- OpenAPI/TS28105_AiMlNrm.yaml | 22 ++++++++++------------ 1 file changed, 10 insertions(+), 12 deletions(-) diff --git a/OpenAPI/TS28105_AiMlNrm.yaml b/OpenAPI/TS28105_AiMlNrm.yaml index 7824c61f8..00de91665 100644 --- a/OpenAPI/TS28105_AiMlNrm.yaml +++ b/OpenAPI/TS28105_AiMlNrm.yaml @@ -293,8 +293,6 @@ components: allOf: - type: object properties: - mLTrainingProcessId: - type: string priority: type: integer terminationConditions: @@ -314,6 +312,8 @@ components: $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList' trainingReportRef: $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' + mLEntityRef: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' MLTrainingReport-Single: allOf: @@ -324,8 +324,6 @@ components: allOf: - type: object properties: - mLEntityId: - type: string areConsumerTrainingDataUsed: type: boolean usedConsumerTrainingData: @@ -356,6 +354,8 @@ components: $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' mLEntityCoordinationGroupToTrainRef: $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' + mLEntityRef: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' MLTestingFunction-Single: allOf: @@ -367,10 +367,8 @@ components: - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-Attr' - type: object properties: - mLEntityIdList: - type: array - items: - type: string + mLEntityRef: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' - type: object properties: @@ -471,11 +469,11 @@ components: - type: object properties: inferenceType: - type: string - mLEntityId: type: string policyForLoading: $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' + mLEntityRef: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' MLEntityLoadingProcess-Single: allOf: @@ -540,8 +538,8 @@ components: attributes: type: object properties: - mLRepositoryId: - type: string + mLEntityRef: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' MLEntityList: $ref: '#/components/schemas/MLEntity-Multiple' MLEntityCoordinationGroups: -- GitLab From 5a946b7a52c06e3ee3f93317775d746a0d961d00 Mon Sep 17 00:00:00 2001 From: shumin Date: Mon, 5 Feb 2024 12:22:15 +0800 Subject: [PATCH 057/115] =?UTF-8?q?S5-240917=EF=BC=9AInput=20to=20DraftCR?= =?UTF-8?q?=2028.105=20Add=20relations=20for=20NRMs=20related=20to=20AI-ML?= =?UTF-8?q?=20inference=20functions?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- OpenAPI/TS28105_AiMlNrm.yaml | 57 ++++++++---------------------------- 1 file changed, 13 insertions(+), 44 deletions(-) diff --git a/OpenAPI/TS28105_AiMlNrm.yaml b/OpenAPI/TS28105_AiMlNrm.yaml index 00de91665..c1fd49a3f 100644 --- a/OpenAPI/TS28105_AiMlNrm.yaml +++ b/OpenAPI/TS28105_AiMlNrm.yaml @@ -102,10 +102,9 @@ components: resultStateInfo: type: string - MlManagementPolicy: + AIMLManagementPolicy: description: >- - This data type is the "ProcessMonitor" data type defined in “genericNrm.yaml” - with specialisations for usage in the "MLTrainingProcess". + This data type represents the properties of a policy for AI/ML management. type: object properties: thresholdList: @@ -202,8 +201,8 @@ components: $ref: '#/components/schemas/MLEntityRepository-Multiple' MLUpdateFunction: $ref: '#/components/schemas/MLUpdateFunction-Multiple' - AiMlInferenceCapability: - $ref: '#/components/schemas/AiMlInferenceCapability-Multiple' + AIMLInferenceFunction: + $ref: '#/components/schemas/AIMLInferenceFunction-Multiple' ManagedElement-Single: allOf: @@ -223,8 +222,8 @@ components: $ref: '#/components/schemas/MLEntityRepository-Multiple' MLUpdateFunction: $ref: '#/components/schemas/MLUpdateFunction-Multiple' - AiMlInferenceCapability: - $ref: '#/components/schemas/AiMlInferenceCapability-Multiple' + AIMLInferenceFunction: + $ref: '#/components/schemas/AIMLInferenceFunction-Multiple' MLTrainingFunction-Single: allOf: @@ -471,7 +470,7 @@ components: inferenceType: type: string policyForLoading: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' + $ref: '#/components/schemas/AIMLManagementPolicy' mLEntityRef: $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' @@ -644,7 +643,7 @@ components: mLUpdateProcessRef: $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' - AiMlInferenceCapability-Single: + AIMLInferenceFunction-Single: allOf: - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' - type: object @@ -661,33 +660,13 @@ components: - DEACTIVATED managedActivationScope: $ref: '#/components/schemas/ManagedActivationScope' + usedByFunctionRefList: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' - type: object properties: MLEntity: $ref: '#/components/schemas/MLEntity-Multiple' - AiMlESCapability-Single: - allOf: - - $ref: '#/components/schemas/AiMlInferenceCapability-Single' - #- $ref: '#/components/schemas/MlInferenceFunction-Single' - - type: object - properties: - attributes: - type: object - properties: - DMROFunctionRef: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList' - # Todo for other attribute related to role - - AiMlLBCapability-Single: - allOf: - - $ref: '#/components/schemas/AiMlInferenceCapability-Single' - # Todo for attribute related to role - - AiMlMOCapability-Single: - allOf: - - $ref: '#/components/schemas/AiMlInferenceCapability-Single' - # Todo for attribute related to role #-------- Definition of JSON arrays for name-contained IOCs ---------------------- @@ -771,18 +750,10 @@ components: type: array items: $ref: '#/components/schemas/MLUpdateReport-Single' - AiMlInferenceCapability-Multiple: - type: array - items: - $ref: '#/components/schemas/AiMlInferenceCapability-Single' - AiMlESCapability-Multiple: - type: array - items: - $ref: '#/components/schemas/AiMlESCapability-Single' - AiMlLBCapability-Multiple: + AIMLInferenceFunction-Multiple: type: array items: - $ref: '#/components/schemas/AiMlLBCapability-Single' + $ref: '#/components/schemas/AIMLInferenceFunction-Single' #-------- Definitions in TS 28.104 for TS 28.532 --------------------------------- @@ -810,6 +781,4 @@ components: - $ref: '#/components/schemas/MLUpdateRequest-Single' - $ref: '#/components/schemas/MLUpdateProcess-Single' - $ref: '#/components/schemas/MLUpdateReport-Single' - - $ref: '#/components/schemas/AiMlInferenceCapability-Single' - - $ref: '#/components/schemas/AiMlESCapability-Single' - - $ref: '#/components/schemas/AiMlLBCapability-Single' + - $ref: '#/components/schemas/AIMLInferenceFunction-Single' -- GitLab From 0df809befb5b44f0c6399245a5b30b9a0e731594 Mon Sep 17 00:00:00 2001 From: shumin Date: Mon, 5 Feb 2024 14:02:27 +0800 Subject: [PATCH 058/115] S5-240805/0806/0811 inference function related --- OpenAPI/TS28105_AiMlNrm.yaml | 74 ++++++++++++++++++++++++++++++++---- 1 file changed, 67 insertions(+), 7 deletions(-) diff --git a/OpenAPI/TS28105_AiMlNrm.yaml b/OpenAPI/TS28105_AiMlNrm.yaml index c1fd49a3f..b682049cd 100644 --- a/OpenAPI/TS28105_AiMlNrm.yaml +++ b/OpenAPI/TS28105_AiMlNrm.yaml @@ -172,6 +172,26 @@ components: $ref: '#/components/schemas/ModelPerformance' mLEntityRef: $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList' + + InferenceOutput: + type: object + properties: + inferenceOutputId: + type: array + items: + type: string + inferenceType: + type: string + inferenceOutputTime: + type: array + items: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTime' + # FIXME, isOrder/isUnique both as True + inferencePerformance: + $ref: '#/components/schemas/ModelPerformance' + outputResult: + description: A map (list of key-value pairs) for Inference result name and it's value + $ref: 'TS28623_ComDefs.yaml#/components/schemas/AttributeNameValuePairSet' #-------- Definition of abstract IOCs -------------------------------------------- @@ -662,11 +682,46 @@ components: $ref: '#/components/schemas/ManagedActivationScope' usedByFunctionRefList: $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList' + mLEntityRef: # FIXME S5-240805,S5-240917 both define here + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' - type: object properties: - MLEntity: - $ref: '#/components/schemas/MLEntity-Multiple' + AIMLInferenceReport: + $ref: '#/components/schemas/AIMLInferenceReport-Multiple' + + AIMLInferenceReport-Single: + allOf: + - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' + - type: object + properties: + attributes: + allOf: + - type: object + properties: + inferenceOutputs: #stage 2: attribute table name as: aimlInferenceOutputs FIXME + type: array + items: + $ref: '#/components/schemas/InferenceOutput' + minItems: 1 + mLEntityRef: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList' + + AIMLInferenceEmulationFunction-Single: + allOf: + - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' + - type: object + properties: + attributes: + allOf: + - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-Attr' + - type: object + properties: + mLInferenceEmulationFunctionId: #stage 2 definition missing FIXME + type: string + mLInferenceEmulationReportRefs: # FIXME stage 2 of IOC AIMLInferenceEmulationReport missing + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList' + - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' #-------- Definition of JSON arrays for name-contained IOCs ---------------------- @@ -718,10 +773,6 @@ components: type: array items: $ref: '#/components/schemas/MLTestingRequest-Single' - MLInferenceFunction-Multiple: - type: array - items: - $ref: '#/components/schemas/MLInferenceFunction-Single' MLEntityLoadingRequest-Multiple: type: array items: @@ -754,7 +805,14 @@ components: type: array items: $ref: '#/components/schemas/AIMLInferenceFunction-Single' - + AIMLInferenceReport-Multiple: + type: array + items: + $ref: '#/components/schemas/AIMLInferenceReport-Single' + AIMLInferenceEmulationFunction-Multiple: + type: array + items: + $ref: '#/components/schemas/AIMLInferenceEmulationFunction-Single' #-------- Definitions in TS 28.104 for TS 28.532 --------------------------------- resources-AiMlNrm: @@ -782,3 +840,5 @@ components: - $ref: '#/components/schemas/MLUpdateProcess-Single' - $ref: '#/components/schemas/MLUpdateReport-Single' - $ref: '#/components/schemas/AIMLInferenceFunction-Single' + - $ref: '#/components/schemas/AIMLInferenceReport-Single' + - $ref: '#/components/schemas/AIMLInferenceEmulationFunction-Single' -- GitLab From d2079f29ff9eb858805af3b745472888ef1cee79 Mon Sep 17 00:00:00 2001 From: yaoyiz Date: Mon, 5 Feb 2024 17:34:18 +0000 Subject: [PATCH 059/115] MDA Open API --- OpenAPI/TS28104_MdaNrm.yaml | 28 +++++++++++++++------------- 1 file changed, 15 insertions(+), 13 deletions(-) diff --git a/OpenAPI/TS28104_MdaNrm.yaml b/OpenAPI/TS28104_MdaNrm.yaml index 758a190c8..dd4c9204a 100644 --- a/OpenAPI/TS28104_MdaNrm.yaml +++ b/OpenAPI/TS28104_MdaNrm.yaml @@ -25,6 +25,18 @@ components: items: $ref: '#/components/schemas/MDAOutputPerMDAType' + AnalyticsScopeType: + oneOf: + - type: object + properties: + managedEntitiesScope: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList' + - type: object + properties: + areaScope: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/GeoArea' + + MDAOutputPerMDAType: type: object properties: @@ -58,18 +70,7 @@ components: ReportingTarget: $ref: 'TS28623_ComDefs.yaml#/components/schemas/Uri' - - AnalyticsScopeType: - oneOf: - - type: object - properties: - managedEntitiesScope: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList' - - type: object - properties: - areaScope: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/GeoArea' - + AnalyticsSchedule: oneOf: - type: object @@ -184,6 +185,8 @@ components: $ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTime' stopTime: $ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTime' + recommendationFilter: + $ref: '#/components/schemas/AnalyticsScopeType' MDAReport-Single: $ref: 'TS28104_MdaReport.yaml#/components/schemas/MDAReport' @@ -219,7 +222,6 @@ components: oneOf: - $ref: '#/components/schemas/SubNetwork-Single' - $ref: '#/components/schemas/ManagedElement-Single' - - $ref: '#/components/schemas/MDAFunction-Single' - $ref: '#/components/schemas/MDARequest-Single' - $ref: '#/components/schemas/MDAReport-Single' -- GitLab From 9553878b287f7c51733ec9838ed7272d9ca21dab Mon Sep 17 00:00:00 2001 From: Hassan Al-Kanani Date: Mon, 5 Feb 2024 20:47:55 +0000 Subject: [PATCH 060/115] Update TS28104_MdaNrm.yaml --- OpenAPI/TS28104_MdaNrm.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OpenAPI/TS28104_MdaNrm.yaml b/OpenAPI/TS28104_MdaNrm.yaml index dd4c9204a..dc708105f 100644 --- a/OpenAPI/TS28104_MdaNrm.yaml +++ b/OpenAPI/TS28104_MdaNrm.yaml @@ -1,7 +1,7 @@ openapi: 3.0.1 info: title: MDA NRM - version: 18.0.0 + version: 18.2.0 description: >- OAS 3.0.1 specification of the MDA NRM © 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). -- GitLab From b9209c31eec382803472102e2a04767d967bfeeb Mon Sep 17 00:00:00 2001 From: shumin Date: Tue, 6 Feb 2024 11:22:30 +0800 Subject: [PATCH 061/115] Fix the issued based on offline comments from E/// --- OpenAPI/TS28105_AiMlNrm.yaml | 40 +++++++++++++++--------------------- 1 file changed, 17 insertions(+), 23 deletions(-) diff --git a/OpenAPI/TS28105_AiMlNrm.yaml b/OpenAPI/TS28105_AiMlNrm.yaml index b682049cd..5e9d8e22e 100644 --- a/OpenAPI/TS28105_AiMlNrm.yaml +++ b/OpenAPI/TS28105_AiMlNrm.yaml @@ -33,11 +33,6 @@ components: - CANCELLED - CANCELLING - PerformanceRequirements: - type: array - items: - $ref: '#/components/schemas/ModelPerformance' - ModelPerformance: type: object properties: @@ -124,9 +119,6 @@ components: ManagedActivationScope: oneOf: - - type: array - items: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' - type: object properties: dNList: @@ -160,8 +152,6 @@ components: AvailMLCapabilityReport: type: object properties: - availMLCapabilityReportID: - type: string # Fixme no specified in DraftCR mLCapabilityVersionId: type: array items: @@ -256,7 +246,7 @@ components: - type: object properties: mLEntityRepositoryRef: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' - type: object properties: @@ -293,7 +283,9 @@ components: expectedRuntimeContext: $ref: '#/components/schemas/MLContext' performanceRequirements: - $ref: '#/components/schemas/PerformanceRequirements' + type: array + items: + $ref: '#/components/schemas/ModelPerformance' cancelRequest: type: boolean suspendRequest: @@ -332,7 +324,7 @@ components: trainingReportRef: $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' mLEntityRef: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList' MLTrainingReport-Single: allOf: @@ -344,12 +336,16 @@ components: - type: object properties: areConsumerTrainingDataUsed: - type: boolean + type: string + enum: + - ALL + - PARTIALLY + - NONE usedConsumerTrainingData: type: array items: type: string - confidenceIndication: + modelconfidenceIndication: type: integer modelPerformanceTraining: type: array @@ -371,10 +367,10 @@ components: $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' mLEnityGeneratedRef: $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' - mLEntityCoordinationGroupToTrainRef: + mLEntityCoordinationGroupGeneratedRef: $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' mLEntityRef: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList' MLTestingFunction-Single: allOf: @@ -387,7 +383,7 @@ components: - type: object properties: mLEntityRef: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' - type: object properties: @@ -492,7 +488,7 @@ components: policyForLoading: $ref: '#/components/schemas/AIMLManagementPolicy' mLEntityRef: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList' MLEntityLoadingProcess-Single: allOf: @@ -558,7 +554,7 @@ components: type: object properties: mLEntityRef: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList' MLEntityList: $ref: '#/components/schemas/MLEntity-Multiple' MLEntityCoordinationGroups: @@ -717,9 +713,7 @@ components: - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-Attr' - type: object properties: - mLInferenceEmulationFunctionId: #stage 2 definition missing FIXME - type: string - mLInferenceEmulationReportRefs: # FIXME stage 2 of IOC AIMLInferenceEmulationReport missing + AIMLInferenceEmulationReportRefs: # FIXME stage 2 of IOC AIMLInferenceEmulationReport missing $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' -- GitLab From 03dbc8761161bb6e4ee00945bb98406ea116c869 Mon Sep 17 00:00:00 2001 From: shumin Date: Tue, 6 Feb 2024 17:51:06 +0800 Subject: [PATCH 062/115] Fix the issued based on offline comments from E/// round2 --- OpenAPI/TS28105_AiMlNrm.yaml | 74 +++--------------------------------- 1 file changed, 6 insertions(+), 68 deletions(-) diff --git a/OpenAPI/TS28105_AiMlNrm.yaml b/OpenAPI/TS28105_AiMlNrm.yaml index 5e9d8e22e..05b43260f 100644 --- a/OpenAPI/TS28105_AiMlNrm.yaml +++ b/OpenAPI/TS28105_AiMlNrm.yaml @@ -45,58 +45,23 @@ components: decisionConfidenceScore: $ref: 'TS28623_ComDefs.yaml#/components/schemas/Float' - TrainingProcessMonitor: + ProcessMonitor: description: >- - This data type is the "ProcessMonitor" data type defined in “genericNrm.yaml” with specialisations for usage in the "MLTrainingProcess". + This data type is the "ProcessMonitor" data type defined in “genericNrm.yaml” + with specialisations for usage in TS 28.105. type: object properties: - mLTrainingProcessId: - type: string status: type: string - enum: - - RUNNING - - CANCELLING - - NOT_STARTED - - SUSPENDED - - FINISHED progressPercentage: type: integer minimum: 0 maximum: 100 progressStateInfo: type: string - enum: - - COLLECTING_DATA - - PREPARING_TRAINING_DATA - - TRAINING resultStateInfo: type: string - MlEntityLoadingProcessMonitor: - description: >- - This data type is the "ProcessMonitor" data type defined in “genericNrm.yaml” with specialisations for usage in the "MLEntityLoadingProcess". - type: object - properties: - MLEntityLoadingProcessId: - type: string - status: - type: string - enum: - - RUNNING - - CANCELLING - - SUSPENDED - - FINISHED - - CANCELLED - progressPercentage: - type: integer - minimum: 0 - maximum: 100 - progressStateInfo: - type: string - resultStateInfo: - type: string - AIMLManagementPolicy: description: >- This data type represents the properties of a policy for AI/ML management. @@ -314,7 +279,7 @@ components: - INFERENCE FUNCTION_UPGRADED - INFERENCE_CONTEXT_CHANGED progressStatus: - $ref: '#/components/schemas/TrainingProcessMonitor' + $ref: '#/components/schemas/ProcessMonitor' cancelProcess: type: boolean suspendProcess: @@ -430,32 +395,6 @@ components: testingRequestRef: $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' - MLInferenceFunction-Single: - allOf: - - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' - - type: object - properties: - attributes: - allOf: - - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-Attr' - - type: object - properties: - mLEntityIdList: - type: array - items: - type: string - - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' - - type: object - properties: - MLEntityLoadingRequest: - $ref: '#/components/schemas/MLEntityLoadingRequest-Multiple' - MLEntityLoadingProcess: - $ref: '#/components/schemas/MLEntityLoadingProcess-Multiple' - MLEntityLoadingPolicy: - $ref: '#/components/schemas/MLEntityLoadingPolicy-Multiple' - MLEntity: - $ref: '#/components/schemas/MLEntity-Multiple' - MLEntityLoadingRequest-Single: allOf: - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' @@ -500,7 +439,7 @@ components: - type: object properties: progressStatus: - $ref: '#/components/schemas/MlEntityLoadingProcessMonitor' + $ref: '#/components/schemas/ProcessMonitor' cancelProcess: type: boolean suspendProcess: @@ -636,7 +575,7 @@ components: type: object properties: progressStatus: - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ProcessMonitor' + $ref: '#/components/schemas/ProcessMonitor' mLEntityRef: $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList' mLUpdateRequestRef: @@ -824,7 +763,6 @@ components: - $ref: '#/components/schemas/MLTestingFunction-Single' - $ref: '#/components/schemas/MLTestingRequest-Single' - $ref: '#/components/schemas/MLTestingReport-Single' - - $ref: '#/components/schemas/MLInferenceFunction-Single' - $ref: '#/components/schemas/MLEntityLoadingRequest-Single' - $ref: '#/components/schemas/MLEntityLoadingProcess-Single' - $ref: '#/components/schemas/MLEntityLoadingPolicy-Single' -- GitLab From 2700b952d1b45648eb13a7d4dc505ebcc460ed49 Mon Sep 17 00:00:00 2001 From: shumin Date: Tue, 6 Feb 2024 22:52:01 +0800 Subject: [PATCH 063/115] change attribute name --- OpenAPI/TS28105_AiMlNrm.yaml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/OpenAPI/TS28105_AiMlNrm.yaml b/OpenAPI/TS28105_AiMlNrm.yaml index 05b43260f..8c944a0c9 100644 --- a/OpenAPI/TS28105_AiMlNrm.yaml +++ b/OpenAPI/TS28105_AiMlNrm.yaml @@ -494,9 +494,11 @@ components: properties: mLEntityRef: $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList' - MLEntityList: + - type: object + properties: + MLEntity: $ref: '#/components/schemas/MLEntity-Multiple' - MLEntityCoordinationGroups: + MLEntityCoordinationGroup: $ref: '#/components/schemas/MLEntityCoordinationGroup-Multiple' MLEntityCoordinationGroup-Single: -- GitLab From faca166ea3ef280322a4e21c02f3bea0ec486945 Mon Sep 17 00:00:00 2001 From: sunse Date: Wed, 7 Feb 2024 06:49:47 +0000 Subject: [PATCH 064/115] Rel18 correction to schema definition issues for sub network and managed element of open api ss (TS28.104 CR0078, TS28.105 CR0073, TS28.312 CR0202, TS28.536 CR0066, TS28.538 CR0056, TS28.541 CR1140, TS28.623 CR0307) --- OpenAPI/TS28104_MdaNrm.yaml | 60 ++------- OpenAPI/TS28105_AiMlNrm.yaml | 62 +++------ OpenAPI/TS28312_IntentNrm.yaml | 28 +--- OpenAPI/TS28317_RanScNrm.yaml | 32 ++--- OpenAPI/TS28536_CoslaNrm.yaml | 62 +++------ OpenAPI/TS28538_EdgeNrm.yaml | 50 +++---- OpenAPI/TS28541_5GcNrm.yaml | 227 ++++++++++++++------------------ OpenAPI/TS28541_NrNrm.yaml | 162 ++++++++++------------- OpenAPI/TS28541_SliceNrm.yaml | 60 ++++----- OpenAPI/TS28623_GenericNrm.yaml | 39 ++++++ 10 files changed, 320 insertions(+), 462 deletions(-) diff --git a/OpenAPI/TS28104_MdaNrm.yaml b/OpenAPI/TS28104_MdaNrm.yaml index 758a190c8..2ab656cc6 100644 --- a/OpenAPI/TS28104_MdaNrm.yaml +++ b/OpenAPI/TS28104_MdaNrm.yaml @@ -106,45 +106,25 @@ components: format: float minimum: 0 +#-------- Definition of types for name-containments ------ + SubNetwork-ncO-MdaNrm: + type: object + properties: + MDAFunction: + $ref: '#/components/schemas/MDAFunction-Multiple' + MDAReport: + $ref: '#/components/schemas/MDAReport-Multiple' + + ManagedElement-ncO-MdaNrm: + type: object + properties: + MDAFunction: + $ref: '#/components/schemas/MDAFunction-Multiple' #-------- Definition of abstract IOCs -------------------------------------------- #-------- Definition of concrete IOCs -------------------------------------------- - - SubNetwork-Single: - allOf: - - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' - - type: object - properties: - attributes: - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/SubNetwork-Attr' - - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/SubNetwork-ncO' - - type: object - properties: - SubNetwork: - $ref: '#/components/schemas/SubNetwork-Multiple' - ManagedElement: - $ref: '#/components/schemas/ManagedElement-Multiple' - MDAFunction: - $ref: '#/components/schemas/MDAFunction-Multiple' - MDAReport: - $ref: '#/components/schemas/MDAReport-Multiple' - - - ManagedElement-Single: - allOf: - - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' - - type: object - properties: - attributes: - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedElement-Attr' - - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedElement-ncO' - - type: object - properties: - MDAFunction: - $ref: '#/components/schemas/MDAFunction-Multiple' - MDAFunction-Single: allOf: - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' @@ -190,15 +170,6 @@ components: #-------- Definition of JSON arrays for name-contained IOCs ---------------------- - - SubNetwork-Multiple: - type: array - items: - $ref: '#/components/schemas/SubNetwork-Single' - ManagedElement-Multiple: - type: array - items: - $ref: '#/components/schemas/ManagedElement-Single' MDAFunction-Multiple: type: array items: @@ -217,9 +188,6 @@ components: resources-mdaNrm: oneOf: - - $ref: '#/components/schemas/SubNetwork-Single' - - $ref: '#/components/schemas/ManagedElement-Single' - - $ref: '#/components/schemas/MDAFunction-Single' - $ref: '#/components/schemas/MDARequest-Single' - $ref: '#/components/schemas/MDAReport-Single' diff --git a/OpenAPI/TS28105_AiMlNrm.yaml b/OpenAPI/TS28105_AiMlNrm.yaml index 71e2d3853..041506529 100644 --- a/OpenAPI/TS28105_AiMlNrm.yaml +++ b/OpenAPI/TS28105_AiMlNrm.yaml @@ -79,45 +79,28 @@ components: resultStateInfo: type: string -#-------- Definition of abstract IOCs -------------------------------------------- +#-------- Definition of types for name-containments ------ + SubNetwork-ncO-AiMlNrm: + type: object + properties: + MLTrainingFunction: + $ref: '#/components/schemas/MLTrainingFunction-Multiple' + MLEntityRepository: + $ref: '#/components/schemas/MLEntityRepository-Multiple' + ManagedElement-ncO-AiMlNrm: + type: object + properties: + MLTrainingFunction: + $ref: '#/components/schemas/MLTrainingFunction-Multiple' + MLEntityRepository: + $ref: '#/components/schemas/MLEntityRepository-Multiple' +#-------- Definition of abstract IOCs -------------------------------------------- -#-------- Definition of concrete IOCs -------------------------------------------- - SubNetwork-Single: - allOf: - - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' - - type: object - properties: - attributes: - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/SubNetwork-Attr' - - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/SubNetwork-ncO' - - type: object - properties: - SubNetwork: - $ref: '#/components/schemas/SubNetwork-Multiple' - ManagedElement: - $ref: '#/components/schemas/ManagedElement-Multiple' - MLTrainingFunction: - $ref: '#/components/schemas/MLTrainingFunction-Multiple' - MLEntityRepository: - $ref: '#/components/schemas/MLEntityRepository-Multiple' - ManagedElement-Single: - allOf: - - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' - - type: object - properties: - attributes: - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedElement-Attr' - - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedElement-ncO' - - type: object - properties: - MLTrainingFunction: - $ref: '#/components/schemas/MLTrainingFunction-Multiple' - MLEntityRepository: - $ref: '#/components/schemas/MLEntityRepository-Multiple' +#-------- Definition of concrete IOCs -------------------------------------------- MLTrainingFunction-Single: allOf: @@ -277,14 +260,6 @@ components: #-------- Definition of JSON arrays for name-contained IOCs ---------------------- - SubNetwork-Multiple: - type: array - items: - $ref: '#/components/schemas/SubNetwork-Single' - ManagedElement-Multiple: - type: array - items: - $ref: '#/components/schemas/ManagedElement-Single' MLTrainingFunction-Multiple: type: array items: @@ -314,9 +289,6 @@ components: resources-AiMlNrm: oneOf: - - $ref: '#/components/schemas/SubNetwork-Single' - - $ref: '#/components/schemas/ManagedElement-Single' - - $ref: '#/components/schemas/MLTrainingFunction-Single' - $ref: '#/components/schemas/MLTrainingRequest-Single' - $ref: '#/components/schemas/MLTrainingProcess-Single' diff --git a/OpenAPI/TS28312_IntentNrm.yaml b/OpenAPI/TS28312_IntentNrm.yaml index 915541a59..de7291d9f 100644 --- a/OpenAPI/TS28312_IntentNrm.yaml +++ b/OpenAPI/TS28312_IntentNrm.yaml @@ -12,24 +12,16 @@ externalDocs: paths: {} components: schemas: + + #-------- Definition of types for name-containments ------ + SubNetwork-ncO-IntentNrm: + type: object + properties: + IntentHandlingFunction: + $ref: '#/components/schemas/IntentHandlingFunction-Multiple' #-------Definition of generic IOCs ----------# - SubNetwork-Single: - allOf: - - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' - - type: object - properties: - attributes: - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/SubNetwork-Attr' - - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/SubNetwork-ncO' - - type: object - properties: - SubNetwork: - $ref: '#/components/schemas/SubNetwork-Multiple' - IntentHandlingFunction: - $ref: '#/components/schemas/IntentHandlingFunction-Multiple' - Intent-Single: description: >- This IOC represents the properties of an Intent driven management information between MnS consumer and MnS producer. @@ -441,11 +433,6 @@ components: #------Definition of JSON arrays for name-contained IOCs ---------------# - SubNetwork-Multiple: - type: array - items: - $ref: '#/components/schemas/SubNetwork-Single' - Intent-Multiple: type: array items: @@ -467,7 +454,6 @@ components: #----- Definitions in TS 28.312 for TS 28.532 --------------------------# resources-intentNrm: oneOf: - - $ref: '#/components/schemas/SubNetwork-Single' - $ref: '#/components/schemas/IntentHandlingFunction-Single' - $ref: '#/components/schemas/Intent-Single' - $ref: '#/components/schemas/IntentReport-Single' diff --git a/OpenAPI/TS28317_RanScNrm.yaml b/OpenAPI/TS28317_RanScNrm.yaml index ed6566f23..afaffc6cb 100644 --- a/OpenAPI/TS28317_RanScNrm.yaml +++ b/OpenAPI/TS28317_RanScNrm.yaml @@ -13,24 +13,17 @@ paths: {} components: schemas: +#-------- Definition of types for name-containments ------ + SubNetwork-ncO-RanScNrm: + type: object + properties: + ScMgmtProfile: + $ref: '#/components/schemas/ScMgmtProfile-Multiple' + Sc_Process: + $ref: '#/components/schemas/Sc_Process-Multiple' + #-------Definition of IOCs ----------# - SubNetwork-Single: - allOf: - - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' - - type: object - properties: - attributes: - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/SubNetwork-Attr' - - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/SubNetwork-ncO' - - type: object - properties: - SubNetwork: - $ref: '#/components/schemas/SubNetwork-Multiple' - ScMgmtProfile: - $ref: '#/components/schemas/ScMgmtProfile-Multiple' - Sc_Process: - $ref: '#/components/schemas/Sc_Process-Multiple' - + ScMgmtProfile-Single: description: >- The ScMgmtProfile represents MnS Consumer's requirements for self-configuration management @@ -150,10 +143,6 @@ components: #-------Definition of Data types ----------# #------Definition of JSON arrays for name-contained IOCs ---------------# - SubNetwork-Multiple: - type: array - items: - $ref: '#/components/schemas/SubNetwork-Single' ScMgmtProfile-Multiple: type: array items: @@ -168,7 +157,6 @@ components: #----- Definitions in TS 28.317 for TS 28.532 --------------------------# resources-RanScNrm: oneOf: - - $ref: '#/components/schemas/SubNetwork-Single' - $ref: '#/components/schemas/ScMgmtProfile-Single' - $ref: '#/components/schemas/Sc_Process-Single' diff --git a/OpenAPI/TS28536_CoslaNrm.yaml b/OpenAPI/TS28536_CoslaNrm.yaml index 3ae269c54..c94eca4c4 100755 --- a/OpenAPI/TS28536_CoslaNrm.yaml +++ b/OpenAPI/TS28536_CoslaNrm.yaml @@ -126,45 +126,34 @@ components: taiList: $ref: 'TS28541_NrNrm.yaml#/components/schemas/TaiList' +#-------- Definition of types for name-containments ------ + SubNetwork-ncO-CoslaNrm: + type: object + properties: + AssuranceClosedControlLoop: + $ref: '#/components/schemas/AssuranceClosedControlLoop-Multiple' + + ManagedElement-ncO-CoslaNrm: + type: object + properties: + AssuranceClosedControlLoop: + $ref: '#/components/schemas/AssuranceClosedControlLoop-Multiple' + #-------- Definition of concrete IOCs -------------------------------------------- MnS: oneOf: - type: object properties: SubNetwork: - $ref: '#/components/schemas/SubNetwork-Multiple' + type: array + items: + $ref: '#/components/schemas/SubNetwork-ncO-CoslaNrm' - type: object properties: ManagedElement: - $ref: '#/components/schemas/ManagedElement-Multiple' - - SubNetwork-Single: - allOf: - - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' - - type: object - properties: - attributes: - allOf: - - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/SubNetwork-Attr' - - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/SubNetwork-ncO' - - type: object - properties: - AssuranceClosedControlLoop: - $ref: '#/components/schemas/AssuranceClosedControlLoop-Multiple' - - ManagedElement-Single: - allOf: - - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' - - type: object - properties: - attributes: - allOf: - - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedElement-Attr' - - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedElement-ncO' - - type: object - properties: - AssuranceClosedControlLoop: - $ref: '#/components/schemas/AssuranceClosedControlLoop-Multiple' + type: array + items: + $ref: '#/components/schemas/ManagedElement-ncO-CoslaNrm' AssuranceClosedControlLoop-Single: allOf: @@ -222,16 +211,7 @@ components: $ref: '#/components/schemas/AssuranceGoalStatusList' #-------- Definition of JSON arrays for name-contained IOCs ---------------------- - SubNetwork-Multiple: - type: array - items: - $ref: '#/components/schemas/SubNetwork-Single' - - ManagedElement-Multiple: - type: array - items: - $ref: '#/components/schemas/ManagedElement-Single' - + AssuranceClosedControlLoop-Multiple: type: array items: @@ -250,5 +230,3 @@ components: - $ref: '#/components/schemas/AssuranceClosedControlLoop-Single' - $ref: '#/components/schemas/AssuranceGoal-Single' - $ref: '#/components/schemas/AssuranceReport-Single' - - $ref: '#/components/schemas/SubNetwork-Single' - - $ref: '#/components/schemas/ManagedElement-Single' diff --git a/OpenAPI/TS28538_EdgeNrm.yaml b/OpenAPI/TS28538_EdgeNrm.yaml index 2b3fe3447..4088b3c0a 100644 --- a/OpenAPI/TS28538_EdgeNrm.yaml +++ b/OpenAPI/TS28538_EdgeNrm.yaml @@ -42,7 +42,7 @@ components: GeographicalCoordinates: type: object properties: - lattitude: + latitude: type: integer longitude: type: integer @@ -71,7 +71,7 @@ components: type: integer virtualDisk: type: integer - virutalCPU: + virtualCPU: type: string vnfdId: type: string @@ -97,20 +97,20 @@ components: $ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTime' EASServicePermission: type: string - description: any of enumrated value + description: any of enumerated value enum: - TRIAL - SILVER - GOLD EASFeature: type: string - description: any of enumrated value + description: any of enumerated value enum: - SINGLE - MULTIPLE EASStatus: type: string - description: any of enumrated value + description: any of enumerated value enum: - ENABLED - DISABLED @@ -159,31 +159,24 @@ components: resourceQuota: $ref: '#/components/schemas/VirtualResource' +#-------- Definition of types for name-containments ------ + SubNetwork-ncO-EdgeNrm: + type: object + properties: + ECSFunction: + $ref: '#/components/schemas/ECSFunction-Multiple' + EdgeDataNetwork: + $ref: '#/components/schemas/EdgeDataNetwork-Multiple' + #-------- Definition of concrete IOCs -------------------------------------------- MnS: oneOf: - type: object properties: SubNetwork: - $ref: '#/components/schemas/SubNetwork-Multiple' - - SubNetwork-Single: - allOf: - - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' - - type: object - properties: - attributes: - allOf: - - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/SubNetwork-Attr' - - type: object - properties: - Subnetwork: - $ref: '#/components/schemas/SubNetwork-Multiple' - ECSFunction: - $ref: '#/components/schemas/ECSFunction-Multiple' - EdgeDataNetwork: - $ref: '#/components/schemas/EdgeDataNetwork-Multiple' - - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/SubNetwork-ncO' + type: array + items: + $ref: '#/components/schemas/SubNetwork-ncO-EdgeNrm' EdgeDataNetwork-Single: allOf: @@ -283,7 +276,7 @@ components: $ref: '#/components/schemas/SoftwareImageInfo' serviceContinuitySupport: type: boolean - eASFunctonRef: + eASFunctionRef: $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' @@ -390,11 +383,7 @@ components: #-------- Definition of JSON arrays for name-contained IOCs ---------------------- - - SubNetwork-Multiple: - type: array - items: - $ref: '#/components/schemas/SubNetwork-Single' + EASFunction-Multiple: type: array items: @@ -434,7 +423,6 @@ components: resources-edgeNrm: oneOf: - $ref: '#/components/schemas/MnS' - - $ref: '#/components/schemas/SubNetwork-Single' - $ref: '#/components/schemas/EASFunction-Single' - $ref: '#/components/schemas/ECSFunction-Single' - $ref: '#/components/schemas/EESFunction-Single' diff --git a/OpenAPI/TS28541_5GcNrm.yaml b/OpenAPI/TS28541_5GcNrm.yaml index b6abdbec9..ade01d2d2 100755 --- a/OpenAPI/TS28541_5GcNrm.yaml +++ b/OpenAPI/TS28541_5GcNrm.yaml @@ -2816,129 +2816,114 @@ components: nfType: $ref: 'TS28623_GenericNrm.yaml#/components/schemas/NFType' +#-------- Definition of types for name-containments ------ + SubNetwork-ncO-5GcNrm: + type: object + properties: + ExternalAmfFunction: + $ref: '#/components/schemas/ExternalAmfFunction-Multiple' + ExternalNrfFunction: + $ref: '#/components/schemas/ExternalNrfFunction-Multiple' + ExternalNssfFunction: + $ref: '#/components/schemas/ExternalNssfFunction-Multiple' + AmfSet: + $ref: '#/components/schemas/AmfSet-Multiple' + AmfRegion: + $ref: '#/components/schemas/AmfRegion-Multiple' + Configurable5QISet: + $ref: '#/components/schemas/Configurable5QISet-Multiple' + Dynamic5QISet: + $ref: '#/components/schemas/Dynamic5QISet-Multiple' + EcmConnectionInfo: + $ref: '#/components/schemas/EcmConnectionInfo-Multiple' + + ManagedElement-ncO-5GcNrm: + type: object + properties: + AmfFunction: + $ref: '#/components/schemas/AmfFunction-Multiple' + SmfFunction: + $ref: '#/components/schemas/SmfFunction-Multiple' + UpfFunction: + $ref: '#/components/schemas/UpfFunction-Multiple' + N3iwfFunction: + $ref: '#/components/schemas/N3iwfFunction-Multiple' + PcfFunction: + $ref: '#/components/schemas/PcfFunction-Multiple' + AusfFunction: + $ref: '#/components/schemas/AusfFunction-Multiple' + UdmFunction: + $ref: '#/components/schemas/UdmFunction-Multiple' + UdrFunction: + $ref: '#/components/schemas/UdrFunction-Multiple' + UdsfFunction: + $ref: '#/components/schemas/UdsfFunction-Multiple' + NrfFunction: + $ref: '#/components/schemas/NrfFunction-Multiple' + NssfFunction: + $ref: '#/components/schemas/NssfFunction-Multiple' + SmsfFunction: + $ref: '#/components/schemas/SmsfFunction-Multiple' + LmfFunction: + $ref: '#/components/schemas/LmfFunction-Multiple' + NgeirFunction: + $ref: '#/components/schemas/NgeirFunction-Multiple' + SeppFunction: + $ref: '#/components/schemas/SeppFunction-Multiple' + NwdafFunction: + $ref: '#/components/schemas/NwdafFunction-Multiple' + ScpFunction: + $ref: '#/components/schemas/ScpFunction-Multiple' + NefFunction: + $ref: '#/components/schemas/NefFunction-Multiple' + Configurable5QISet: + $ref: '#/components/schemas/Configurable5QISet-Multiple' + Dynamic5QISet: + $ref: '#/components/schemas/Dynamic5QISet-Multiple' + EcmConnectionInfo: + $ref: '#/components/schemas/EcmConnectionInfo-Multiple' + EASDFFunction: + $ref: '#/components/schemas/EASDFFunction-Multiple' + NSSAAFFunction: + $ref: '#/components/schemas/NssaafFunction-Multiple' + AFFunction: + $ref: '#/components/schemas/AfFunction-Multiple' + DCCFFunction: + $ref: '#/components/schemas/DccfFunction-Multiple' + ChfFunction: + $ref: '#/components/schemas/ChfFunction-Multiple' + MFAFFunction: + $ref: '#/components/schemas/MfafFunction-Multiple' + GMLCFunction: + $ref: '#/components/schemas/GmlcFunction-Multiple' + TSCTSFFunction: + $ref: '#/components/schemas/TsctsfFunction-Multiple' + AANFFunction: + $ref: '#/components/schemas/AanfFunction-Multiple' + BSFFunction: + $ref: '#/components/schemas/BsfFunction-Multiple' + MBSMFFunction: + $ref: '#/components/schemas/MbSmfFunction-Multiple' + MBUPFFunction: + $ref: '#/components/schemas/MbUpfFunction-Multiple' + MNPFFunction: + $ref: '#/components/schemas/MnpfFunction-Multiple' + #-------- Definition of concrete IOCs -------------------------------------------- - ProvMnS: + MnS: oneOf: - type: object properties: SubNetwork: - $ref: '#/components/schemas/SubNetwork-Multiple' - - type: object - properties: - ManagedElement: - $ref: '#/components/schemas/ManagedElement-Multiple' - - SubNetwork-Single: - allOf: - - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' - - type: object - properties: - attributes: - allOf: - - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/SubNetwork-Attr' - - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/SubNetwork-ncO' + type: array + items: + $ref: '#/components/schemas/SubNetwork-ncO-5GcNrm' - type: object properties: - SubNetwork: - $ref: '#/components/schemas/SubNetwork-Multiple' ManagedElement: - $ref: '#/components/schemas/ManagedElement-Multiple' - ExternalAmfFunction: - $ref: '#/components/schemas/ExternalAmfFunction-Multiple' - ExternalNrfFunction: - $ref: '#/components/schemas/ExternalNrfFunction-Multiple' - ExternalNssfFunction: - $ref: '#/components/schemas/ExternalNssfFunction-Multiple' - AmfSet: - $ref: '#/components/schemas/AmfSet-Multiple' - AmfRegion: - $ref: '#/components/schemas/AmfRegion-Multiple' - Configurable5QISet: - $ref: '#/components/schemas/Configurable5QISet-Multiple' - Dynamic5QISet: - $ref: '#/components/schemas/Dynamic5QISet-Multiple' - EcmConnectionInfo: - $ref: '#/components/schemas/EcmConnectionInfo-Multiple' - - ManagedElement-Single: - allOf: - - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' - - type: object - properties: - attributes: - allOf: - - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedElement-Attr' - - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedElement-ncO' - - type: object - properties: - AmfFunction: - $ref: '#/components/schemas/AmfFunction-Multiple' - SmfFunction: - $ref: '#/components/schemas/SmfFunction-Multiple' - UpfFunction: - $ref: '#/components/schemas/UpfFunction-Multiple' - N3iwfFunction: - $ref: '#/components/schemas/N3iwfFunction-Multiple' - PcfFunction: - $ref: '#/components/schemas/PcfFunction-Multiple' - AusfFunction: - $ref: '#/components/schemas/AusfFunction-Multiple' - UdmFunction: - $ref: '#/components/schemas/UdmFunction-Multiple' - UdrFunction: - $ref: '#/components/schemas/UdrFunction-Multiple' - UdsfFunction: - $ref: '#/components/schemas/UdsfFunction-Multiple' - NrfFunction: - $ref: '#/components/schemas/NrfFunction-Multiple' - NssfFunction: - $ref: '#/components/schemas/NssfFunction-Multiple' - SmsfFunction: - $ref: '#/components/schemas/SmsfFunction-Multiple' - LmfFunction: - $ref: '#/components/schemas/LmfFunction-Multiple' - NgeirFunction: - $ref: '#/components/schemas/NgeirFunction-Multiple' - SeppFunction: - $ref: '#/components/schemas/SeppFunction-Multiple' - NwdafFunction: - $ref: '#/components/schemas/NwdafFunction-Multiple' - ScpFunction: - $ref: '#/components/schemas/ScpFunction-Multiple' - NefFunction: - $ref: '#/components/schemas/NefFunction-Multiple' - Configurable5QISet: - $ref: '#/components/schemas/Configurable5QISet-Multiple' - Dynamic5QISet: - $ref: '#/components/schemas/Dynamic5QISet-Multiple' - EcmConnectionInfo: - $ref: '#/components/schemas/EcmConnectionInfo-Multiple' - EASDFFunction: - $ref: '#/components/schemas/EASDFFunction-Multiple' - NSSAAFFunction: - $ref: '#/components/schemas/NssaafFunction-Multiple' - AFFunction: - $ref: '#/components/schemas/AfFunction-Multiple' - DCCFFunction: - $ref: '#/components/schemas/DccfFunction-Multiple' - ChfFunction: - $ref: '#/components/schemas/ChfFunction-Multiple' - MFAFFunction: - $ref: '#/components/schemas/MfafFunction-Multiple' - GMLCFunction: - $ref: '#/components/schemas/GmlcFunction-Multiple' - TSCTSFFunction: - $ref: '#/components/schemas/TsctsfFunction-Multiple' - AANFFunction: - $ref: '#/components/schemas/AanfFunction-Multiple' - BSFFunction: - $ref: '#/components/schemas/BsfFunction-Multiple' - MBSMFFunction: - $ref: '#/components/schemas/MbSmfFunction-Multiple' - MBUPFFunction: - $ref: '#/components/schemas/MbUpfFunction-Multiple' - MNPFFunction: - $ref: '#/components/schemas/MnpfFunction-Multiple' + type: array + items: + $ref: '#/components/schemas/ManagedElement-ncO-5GcNrm' AmfFunction-Single: allOf: @@ -5213,14 +5198,6 @@ components: #-------- Definition of JSON arrays for name-contained IOCs ---------------------- - SubNetwork-Multiple: - type: array - items: - $ref: '#/components/schemas/SubNetwork-Single' - ManagedElement-Multiple: - type: array - items: - $ref: '#/components/schemas/ManagedElement-Single' AmfFunction-Multiple: type: array items: @@ -5663,9 +5640,7 @@ components: resources-5gcNrm: oneOf: - - $ref: '#/components/schemas/ProvMnS' - - $ref: '#/components/schemas/SubNetwork-Single' - - $ref: '#/components/schemas/ManagedElement-Single' + - $ref: '#/components/schemas/MnS' - $ref: '#/components/schemas/AmfFunction-Single' - $ref: '#/components/schemas/SmfFunction-Single' - $ref: '#/components/schemas/UpfFunction-Single' diff --git a/OpenAPI/TS28541_NrNrm.yaml b/OpenAPI/TS28541_NrNrm.yaml index dd2a8ec6d..b68eb5cf2 100755 --- a/OpenAPI/TS28541_NrNrm.yaml +++ b/OpenAPI/TS28541_NrNrm.yaml @@ -692,6 +692,69 @@ components: minimum: 0 maximum: 16777215 +#-------- Definition of types for name-containments ------ + SubNetwork-ncO-NrNrm: + type: object + properties: + NRFrequency: + $ref: '#/components/schemas/NRFrequency-Multiple' + ExternalGnbCuCpFunction: + $ref: '#/components/schemas/ExternalGnbCuCpFunction-Multiple' + ExternalENBFunction: + $ref: '#/components/schemas/ExternalENBFunction-Multiple' + EUtranFrequency: + $ref: '#/components/schemas/EUtranFrequency-Multiple' + DESManagementFunction: + $ref: '#/components/schemas/DESManagementFunction-Single' + DRACHOptimizationFunction: + $ref: '#/components/schemas/DRACHOptimizationFunction-Single' + DMROFunction: + $ref: '#/components/schemas/DMROFunction-Single' + DLBOFunction: + $ref: '#/components/schemas/DLBOFunction-Single' + DPCIConfigurationFunction: + $ref: '#/components/schemas/DPCIConfigurationFunction-Single' + CPCIConfigurationFunction: + $ref: '#/components/schemas/CPCIConfigurationFunction-Single' + CESManagementFunction: + $ref: '#/components/schemas/CESManagementFunction-Single' + Configurable5QISet: + $ref: 'TS28541_5GcNrm.yaml#/components/schemas/Configurable5QISet-Multiple' + RimRSGlobal: + $ref: '#/components/schemas/RimRSGlobal-Single' + Dynamic5QISet: + $ref: 'TS28541_5GcNrm.yaml#/components/schemas/Dynamic5QISet-Multiple' + CCOFunction: + $ref: '#/components/schemas/CCOFunction-Single' + + ManagedElement-ncO-NrNrm: + type: object + properties: + GnbDuFunction: + $ref: '#/components/schemas/GnbDuFunction-Multiple' + GnbCuUpFunction: + $ref: '#/components/schemas/GnbCuUpFunction-Multiple' + GnbCuCpFunction: + $ref: '#/components/schemas/GnbCuCpFunction-Multiple' + DESManagementFunction: + $ref: '#/components/schemas/DESManagementFunction-Single' + DRACHOptimizationFunction: + $ref: '#/components/schemas/DRACHOptimizationFunction-Single' + DMROFunction: + $ref: '#/components/schemas/DMROFunction-Single' + DLBOFunction: + $ref: '#/components/schemas/DLBOFunction-Single' + DPCIConfigurationFunction: + $ref: '#/components/schemas/DPCIConfigurationFunction-Single' + CPCIConfigurationFunction: + $ref: '#/components/schemas/CPCIConfigurationFunction-Single' + CESManagementFunction: + $ref: '#/components/schemas/CESManagementFunction-Single' + Configurable5QISet: + $ref: 'TS28541_5GcNrm.yaml#/components/schemas/Configurable5QISet-Multiple' + Dynamic5QISet: + $ref: 'TS28541_5GcNrm.yaml#/components/schemas/Dynamic5QISet-Multiple' + #-------- Definition of abstract IOCs -------------------------------------------- RrmPolicy_-Attr: @@ -702,7 +765,6 @@ components: rRMPolicyMemberList: $ref: '#/components/schemas/RrmPolicyMemberList' - #-------- Definition of concrete IOCs -------------------------------------------- MnS: @@ -710,90 +772,15 @@ components: - type: object properties: SubNetwork: - $ref: '#/components/schemas/SubNetwork-Multiple' - - type: object - properties: - ManagedElement: - $ref: '#/components/schemas/ManagedElement-Multiple' - - SubNetwork-Single: - allOf: - - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' - - type: object - properties: - attributes: - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/SubNetwork-Attr' - - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/SubNetwork-ncO' + type: array + items: + $ref: '#/components/schemas/SubNetwork-ncO-NrNrm' - type: object properties: - SubNetwork: - $ref: '#/components/schemas/SubNetwork-Multiple' ManagedElement: - $ref: '#/components/schemas/ManagedElement-Multiple' - NRFrequency: - $ref: '#/components/schemas/NRFrequency-Multiple' - ExternalGnbCuCpFunction: - $ref: '#/components/schemas/ExternalGnbCuCpFunction-Multiple' - ExternalENBFunction: - $ref: '#/components/schemas/ExternalENBFunction-Multiple' - EUtranFrequency: - $ref: '#/components/schemas/EUtranFrequency-Multiple' - DESManagementFunction: - $ref: '#/components/schemas/DESManagementFunction-Single' - DRACHOptimizationFunction: - $ref: '#/components/schemas/DRACHOptimizationFunction-Single' - DMROFunction: - $ref: '#/components/schemas/DMROFunction-Single' - DLBOFunction: - $ref: '#/components/schemas/DLBOFunction-Single' - DPCIConfigurationFunction: - $ref: '#/components/schemas/DPCIConfigurationFunction-Single' - CPCIConfigurationFunction: - $ref: '#/components/schemas/CPCIConfigurationFunction-Single' - CESManagementFunction: - $ref: '#/components/schemas/CESManagementFunction-Single' - Configurable5QISet: - $ref: 'TS28541_5GcNrm.yaml#/components/schemas/Configurable5QISet-Multiple' - RimRSGlobal: - $ref: '#/components/schemas/RimRSGlobal-Single' - Dynamic5QISet: - $ref: 'TS28541_5GcNrm.yaml#/components/schemas/Dynamic5QISet-Multiple' - CCOFunction: - $ref: '#/components/schemas/CCOFunction-Single' - ManagedElement-Single: - allOf: - - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' - - type: object - properties: - attributes: - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedElement-Attr' - - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedElement-ncO' - - type: object - properties: - GnbDuFunction: - $ref: '#/components/schemas/GnbDuFunction-Multiple' - GnbCuUpFunction: - $ref: '#/components/schemas/GnbCuUpFunction-Multiple' - GnbCuCpFunction: - $ref: '#/components/schemas/GnbCuCpFunction-Multiple' - DESManagementFunction: - $ref: '#/components/schemas/DESManagementFunction-Single' - DRACHOptimizationFunction: - $ref: '#/components/schemas/DRACHOptimizationFunction-Single' - DMROFunction: - $ref: '#/components/schemas/DMROFunction-Single' - DLBOFunction: - $ref: '#/components/schemas/DLBOFunction-Single' - DPCIConfigurationFunction: - $ref: '#/components/schemas/DPCIConfigurationFunction-Single' - CPCIConfigurationFunction: - $ref: '#/components/schemas/CPCIConfigurationFunction-Single' - CESManagementFunction: - $ref: '#/components/schemas/CESManagementFunction-Single' - Configurable5QISet: - $ref: 'TS28541_5GcNrm.yaml#/components/schemas/Configurable5QISet-Multiple' - Dynamic5QISet: - $ref: 'TS28541_5GcNrm.yaml#/components/schemas/Dynamic5QISet-Multiple' + type: array + items: + $ref: '#/components/schemas/ManagedElement-ncO-NrNrm' GnbDuFunction-Single: allOf: @@ -2012,14 +1999,6 @@ components: #-------- Definition of JSON arrays for name-contained IOCs ---------------------- - SubNetwork-Multiple: - type: array - items: - $ref: '#/components/schemas/SubNetwork-Single' - ManagedElement-Multiple: - type: array - items: - $ref: '#/components/schemas/ManagedElement-Single' GnbDuFunction-Multiple: type: array items: @@ -2182,9 +2161,6 @@ components: resources-nrNrm: oneOf: - $ref: '#/components/schemas/MnS' - - - $ref: '#/components/schemas/SubNetwork-Single' - - $ref: '#/components/schemas/ManagedElement-Single' - $ref: '#/components/schemas/GnbDuFunction-Single' - $ref: '#/components/schemas/GnbCuUpFunction-Single' diff --git a/OpenAPI/TS28541_SliceNrm.yaml b/OpenAPI/TS28541_SliceNrm.yaml index 52620a6bf..335ae9978 100755 --- a/OpenAPI/TS28541_SliceNrm.yaml +++ b/OpenAPI/TS28541_SliceNrm.yaml @@ -783,6 +783,27 @@ components: - NETWORKSLICE - NETWORKSLICESUBNET +#-------- Definition of types for name-containments ------ + SubNetwork-ncO-SliceNrm: + type: object + properties: + NetworkSlice: + $ref: '#/components/schemas/NetworkSlice-Multiple' + NetworkSliceSubnet: + $ref: '#/components/schemas/NetworkSliceSubnet-Multiple' + EP_Transport: + $ref: '#/components/schemas/EP_Transport-Multiple' + NetworkSliceSubnetProviderCapabilities: + $ref: '#/components/schemas/NetworkSliceSubnetProviderCapabilities-Multiple' + FeasibilityCheckAndReservationJob: + $ref: '#/components/schemas/FeasibilityCheckAndReservationJob-Multiple' + NetworkSliceController: + $ref: '#/components/schemas/NetworkSliceController-Multiple' + NetworkSliceSubnetController: + $ref: '#/components/schemas/NetworkSliceSubnetController-Multiple' + IsolationProfile: + $ref: '#/components/schemas/IsolationProfile-Multiple' + #------------ Definition of concrete IOCs ---------------------------------------- MnS: @@ -790,42 +811,14 @@ components: - type: object properties: SubNetwork: - $ref: '#/components/schemas/SubNetwork-Multiple' + type: array + items: + $ref: '#/components/schemas/SubNetwork-ncO-SliceNrm' # - type: object # properties: # ManagedElement: # $ref: '#/components/schemas/ManagedElement-Multiple' - SubNetwork-Single: - allOf: - - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' - - type: object - properties: - attributes: - allOf: - - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/SubNetwork-Attr' - - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/SubNetwork-ncO' - - type: object - properties: - SubNetwork: - $ref: '#/components/schemas/SubNetwork-Multiple' - NetworkSlice: - $ref: '#/components/schemas/NetworkSlice-Multiple' - NetworkSliceSubnet: - $ref: '#/components/schemas/NetworkSliceSubnet-Multiple' - EP_Transport: - $ref: '#/components/schemas/EP_Transport-Multiple' - NetworkSliceSubnetProviderCapabilities: - $ref: '#/components/schemas/NetworkSliceSubnetProviderCapabilities-Multiple' - FeasibilityCheckAndReservationJob: - $ref: '#/components/schemas/FeasibilityCheckAndReservationJob-Multiple' - NetworkSliceController: - $ref: '#/components/schemas/NetworkSliceController-Multiple' - NetworkSliceSubnetController: - $ref: '#/components/schemas/NetworkSliceSubnetController-Multiple' - IsolationProfile: - $ref: '#/components/schemas/IsolationProfile-Multiple' - NetworkSlice-Single: allOf: - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' @@ -1026,10 +1019,6 @@ components: $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList' #-------- Definition of JSON arrays for name-contained IOCs ---------------------- - SubNetwork-Multiple: - type: array - items: - $ref: '#/components/schemas/SubNetwork-Single' NetworkSlice-Multiple: type: array @@ -1076,7 +1065,6 @@ components: oneOf: - $ref: '#/components/schemas/MnS' - - $ref: '#/components/schemas/SubNetwork-Single' - $ref: '#/components/schemas/NetworkSlice-Single' - $ref: '#/components/schemas/NetworkSliceSubnet-Single' - $ref: '#/components/schemas/EP_Transport-Single' diff --git a/OpenAPI/TS28623_GenericNrm.yaml b/OpenAPI/TS28623_GenericNrm.yaml index 1978c3f8a..4567b9f1f 100755 --- a/OpenAPI/TS28623_GenericNrm.yaml +++ b/OpenAPI/TS28623_GenericNrm.yaml @@ -1068,6 +1068,34 @@ components: minItems: 0 maxItems: 2 + SubNetwork-Single: + allOf: + - $ref: '#/components/schemas/Top' + - $ref: '#/components/schemas/SubNetwork-Attr' + - $ref: '#/components/schemas/SubNetwork-ncO' + - $ref: '#/components/schemas/SubNetwork-Multiple' + - $ref: '#/components/schemas/ManagedElement-Multiple' + - $ref: 'TS28104_MdaNrm.yaml#/components/schemas/SubNetwork-ncO-MdaNrm' + - $ref: 'TS28105_AiMlNrm.yaml#/components/schemas/SubNetwork-ncO-AiMlNrm' + - $ref: 'TS28312_IntentNrm.yaml#/components/schemas/SubNetwork-ncO-IntentNrm' + - $ref: 'TS28317_RanScNrm.yaml#/components/schemas/SubNetwork-ncO-RanScNrm' + - $ref: 'TS28536_CoslaNrm.yaml#/components/schemas/SubNetwork-ncO-CoslaNrm' + - $ref: 'TS28538_EdgeNrm.yaml#/components/schemas/SubNetwork-ncO-EdgeNrm' + - $ref: 'TS28541_SliceNrm.yaml#/components/schemas/SubNetwork-ncO-SliceNrm' + - $ref: 'TS28541_NrNrm.yaml#/components/schemas/SubNetwork-ncO-NrNrm' + - $ref: 'TS28541_5GcNrm.yaml#/components/schemas/SubNetwork-ncO-5GcNrm' + + ManagedElement-Single: + allOf: + - $ref: '#/components/schemas/Top' + - $ref: '#/components/schemas/ManagedElement-Attr' + - $ref: '#/components/schemas/ManagedElement-ncO' + - $ref: 'TS28104_MdaNrm.yaml#/components/schemas/ManagedElement-ncO-MdaNrm' + - $ref: 'TS28105_AiMlNrm.yaml#/components/schemas/ManagedElement-ncO-AiMlNrm' + - $ref: 'TS28536_CoslaNrm.yaml#/components/schemas/ManagedElement-ncO-CoslaNrm' + - $ref: 'TS28541_NrNrm.yaml#/components/schemas/ManagedElement-ncO-NrNrm' + - $ref: 'TS28541_5GcNrm.yaml#/components/schemas/ManagedElement-ncO-5GcNrm' + #-------- Definition of YAML arrays for name-contained IOCs ---------------------- VsDataContainer-Multiple: @@ -1134,6 +1162,14 @@ components: type: array items: $ref: '#/components/schemas/QMCJob-Single' + SubNetwork-Multiple: + type: array + items: + $ref: '#/components/schemas/SubNetwork-Single' + ManagedElement-Multiple: + type: array + items: + $ref: '#/components/schemas/ManagedElement-Single' #-------- Definitions in TS 28.623 for TS 28.532 --------------------------------- @@ -1167,3 +1203,6 @@ components: - $ref: '#/components/schemas/ConditionMonitor-Single' - $ref: '#/components/schemas/SupportedNotifications-Single' - $ref: '#/components/schemas/QMCJob-Single' + + - $ref: '#/components/schemas/SubNetwork-Single' + - $ref: '#/components/schemas/ManagedElement-Single' -- GitLab From 978dc906f1fee4ef7557375124a223a3aa947379 Mon Sep 17 00:00:00 2001 From: sunse Date: Thu, 8 Feb 2024 03:25:28 +0000 Subject: [PATCH 065/115] Rel18_28.111_FM_schema_definitions new spec first merge --- OpenAPI/TS28111_FaultNotifications.yaml | 57 +++ OpenAPI/TS28111_FaultNrm.yaml | 551 ++++++++++++++++++++++ OpenAPI/TS28532_FileDataReportingMnS.yaml | 4 +- OpenAPI/TS28623_ComDefs.yaml | 11 +- OpenAPI/TS28623_GenericNrm.yaml | 29 +- 5 files changed, 623 insertions(+), 29 deletions(-) create mode 100644 OpenAPI/TS28111_FaultNotifications.yaml create mode 100644 OpenAPI/TS28111_FaultNrm.yaml diff --git a/OpenAPI/TS28111_FaultNotifications.yaml b/OpenAPI/TS28111_FaultNotifications.yaml new file mode 100644 index 000000000..ffac86e1f --- /dev/null +++ b/OpenAPI/TS28111_FaultNotifications.yaml @@ -0,0 +1,57 @@ +openapi: 3.0.1 +info: + title: Fault Management Notifications + version: 18.1.0 + description: >- + OAS 3.0.1 definition of the Fault Supervision MnS + © 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). + All rights reserved. +externalDocs: + description: 3GPP TS 28.111; Fault Management + url: http://www.3gpp.org/ftp/Specs/archive/28_series/28.111/ +servers: + - url: '{notificationRecipientAddress}' + variables: + notificationRecipientAddress: + description: Address on the MnS consumer side defined by NtfSubscriptionControl.notificationRecipientAddress. See 3GPP TS 28.622 clause 4.3.22 + default: http://exampleConsumer.com/notificationReceiver + MnSversion: + description: Version number of the OpenAPI definition + default: XXX +paths: + /: + post: + summary: Receive one of a set of alarm related notifications + description: >- + The MnS producer sends an alarm to the consumer. + This interface shall be implemented by the notification-receiver and + used by the notification-sender. + requestBody: + required: true + content: + application/json: + schema: + oneOf: + - $ref: 'TS28111_FaultNrm.yaml#/components/schemas/NotifyNewAlarm' + - $ref: 'TS28111_FaultNrm.yaml#/components/schemas/NotifyNewSecAlarm' + - $ref: 'TS28111_FaultNrm.yaml#/components/schemas/NotifyClearedAlarm' + - $ref: 'TS28111_FaultNrm.yaml#/components/schemas/NotifyChangedAlarm' + - $ref: 'TS28111_FaultNrm.yaml#/components/schemas/NotifyChangedAlarmGeneral' + - $ref: 'TS28111_FaultNrm.yaml#/components/schemas/NotifyChangedSecAlarmGeneral' + - $ref: 'TS28111_FaultNrm.yaml#/components/schemas/NotifyCorrelatedNotificationChanged' + - $ref: 'TS28111_FaultNrm.yaml#/components/schemas/NotifyAckStateChanged' + - $ref: 'TS28111_FaultNrm.yaml#/components/schemas/NotifyComments' + - $ref: 'TS28111_FaultNrm.yaml#/components/schemas/NotifyPotentialFaultyAlarmList' + - $ref: 'TS28111_FaultNrm.yaml#/components/schemas/NotifyAlarmListRebuilt' + responses: + '204': + description: >- + Success case ("204 No Content"). + The notification is successfully delivered. The response message + body is absent. + default: + description: Error case. + content: + application/json: + schema: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/ErrorResponse' diff --git a/OpenAPI/TS28111_FaultNrm.yaml b/OpenAPI/TS28111_FaultNrm.yaml new file mode 100644 index 000000000..f4ed7ce77 --- /dev/null +++ b/OpenAPI/TS28111_FaultNrm.yaml @@ -0,0 +1,551 @@ +openapi: 3.0.1 +info: + title: Fault Management NRM + version: 18.1.0 + description: >- + OAS 3.0.1 definition of the Fault Supervision MnS + © 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). + All rights reserved. +externalDocs: + description: 3GPP TS 28.111; Fault Management + url: http://www.3gpp.org/ftp/Specs/archive/28_series/28.111/ +servers: + - url: '{MnSRoot}/FaultSupervisionMnS/{MnSversion}' + variables: + MnSRoot: + description: See subclause 4.4.3 of TS 32.158 + default: http://example.com/3GPPManagement + MnSversion: + description: Version number of the OpenAPI definition + default: XXX +paths: {} + +components: + schemas: + + #---- Definition of AlarmRecord ----------------------------------------------------# + + AlarmId: + type: string + AlarmType: + type: string + enum: + - COMMUNICATIONS_ALARM + - QUALITY_OF_SERVICE_ALARM + - PROCESSING_ERROR_ALARM + - EQUIPMENT_ALARM + - ENVIRONMENTAL_ALARM + - INTEGRITY_VIOLATION + - OPERATIONAL_VIOLATION + - PHYSICAL_VIOLATION + - SECURITY_SERVICE_OR_MECHANISM_VIOLATION + - TIME_DOMAIN_VIOLATION + ProbableCause: + description: >- + The value of the probable cause may be a specific standardized string, or any + vendor provided string. Probable cause strings are not standardized in the + present document. They may be added in a future version. Up to then the + mapping of the generic probable cause strings "PROBABLE_CAUSE_001" to + "PROBABLE_CAUSE_005" is vendor specific. + The value of the probable cause may also be an integer. The mapping of integer + values to probable causes is vendor specific. + oneOf: + - anyOf: + - type: string + enum: + - PROBABLE_CAUSE_001 + - PROBABLE_CAUSE_002 + - PROBABLE_CAUSE_003 + - PROBABLE_CAUSE_004 + - PROBABLE_CAUSE_005 + - type: string + - type: integer + SpecificProblem: + oneOf: + - type: string + - type: integer + PerceivedSeverity: + type: string + enum: + - INDETERMINATE + - CRITICAL + - MAJOR + - MINOR + - WARNING + - CLEARED + TrendIndication: + type: string + enum: + - MORE_SEVERE + - NO_CHANGE + - LESS_SEVERE + ThresholdHysteresis: + type: object + required: + - high + properties: + high: + oneOf: + - type: integer + - $ref: 'TS28623_ComDefs.yaml#/components/schemas/Float' + low: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/Float' + ThresholdLevelInd: + oneOf: + - type: object + properties: + up: + $ref: '#/components/schemas/ThresholdHysteresis' + - type: object + properties: + down: + $ref: '#/components/schemas/ThresholdHysteresis' + ThresholdInfo: + type: object + properties: + observedMeasurement: + type: string + observedValue: + type: number + thresholdLevel: + $ref: '#/components/schemas/ThresholdLevelInd' + armTime: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTime' + required: + - observedMeasurement + - observedValue + CorrelatedNotification: + type: object + properties: + sourceObjectInstance: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' + notificationIds: + type: array + items: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/NotificationId' + required: + - sourceObjectInstance + - notificationIds + CorrelatedNotifications: + type: array + items: + $ref: '#/components/schemas/CorrelatedNotification' + AckState: + type: string + enum: + - ACKNOWLEDGED + - UNACKNOWLEDGED + + AlarmRecord: + description: >- + The alarmId is not a property of an alarm record. It is used as key + in the map of alarm records instead. + type: object + properties: + # alarmId: + # $ref: '#/components/schemas/AlarmId' + objectInstance: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' + notificationId: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/NotificationId' + alarmRaisedTime: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTime' + alarmChangedTime: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTime' + alarmClearedTime: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTime' + alarmType: + $ref: '#/components/schemas/AlarmType' + probableCause: + $ref: '#/components/schemas/ProbableCause' + specificProblem: + $ref: '#/components/schemas/SpecificProblem' + perceivedSeverity: + $ref: '#/components/schemas/PerceivedSeverity' + backedUpStatus: + type: boolean + backUpObject: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' + trendIndication: + $ref: '#/components/schemas/TrendIndication' + thresholdinfo: + $ref: '#/components/schemas/ThresholdInfo' + correlatedNotifications: + $ref: '#/components/schemas/CorrelatedNotifications' + stateChangeDefinition: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/AttributeValueChangeSet' + monitoredAttributes: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/AttributeNameValuePairSet' + proposedRepairActions: + type: string + additionalText: + type: string + additionalInformation: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/AttributeNameValuePairSet' + + rootCauseIndicator: + type: boolean + + ackTime: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTime' + ackUserId: + type: string + ackSystemId: + type: string + ackState: + $ref: '#/components/schemas/AckState' + + clearUserId: + type: string + clearSystemId: + type: string + serviceUser: + type: string + serviceProvider: + type: string + securityAlarmDetector: + type: string + + 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: '#/components/schemas/AlarmRecord' + + + #---- Definition of alarm notifications --------------------------------------------# + + AlarmNotificationTypes: + type: string + enum: + - notifyNewAlarm + - notifyChangedAlarm + - notifyChangedAlarmGeneral + - notifyAckStateChanged + - notifyCorrelatedNotificationChanged + - notifyComments + - notifyClearedAlarm + - notifyAlarmListRebuilt + - notifyPotentialFaultyAlarmList + AlarmListAlignmentRequirement: + type: string + enum: + - ALIGNMENT_REQUIRED + - ALIGNMENT_NOT_REQUIRED + + NotifyNewAlarm: + allOf: + - $ref: 'TS28623_ComDefs.yaml#/components/schemas/NotificationHeader' + - type: object + required: + - alarmId + - alarmType + - probableCause + - perceivedSeverity + properties: + alarmId: + $ref: '#/components/schemas/AlarmId' + alarmType: + $ref: '#/components/schemas/AlarmType' + probableCause: + $ref: '#/components/schemas/ProbableCause' + specificProblem: + $ref: '#/components/schemas/SpecificProblem' + perceivedSeverity: + $ref: '#/components/schemas/PerceivedSeverity' + backedUpStatus: + type: boolean + backUpObject: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' + trendIndication: + $ref: '#/components/schemas/TrendIndication' + thresholdInfo: + $ref: '#/components/schemas/ThresholdInfo' + correlatedNotifications: + $ref: '#/components/schemas/CorrelatedNotifications' + stateChangeDefinition: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/AttributeValueChangeSet' + monitoredAttributes: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/AttributeNameValuePairSet' + proposedRepairActions: + type: string + additionalText: + type: string + additionalInformation: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/AttributeNameValuePairSet' + rootCauseIndicator: + type: boolean + NotifyNewSecAlarm: + allOf: + - $ref: 'TS28623_ComDefs.yaml#/components/schemas/NotificationHeader' + - type: object + required: + - alarmId + - alarmType + - probableCause + - perceivedSeverity + - serviceUser + - serviceProvider + - securityAlarmDetector + properties: + alarmId: + $ref: '#/components/schemas/AlarmId' + alarmType: + $ref: '#/components/schemas/AlarmType' + probableCause: + $ref: '#/components/schemas/ProbableCause' + perceivedSeverity: + $ref: '#/components/schemas/PerceivedSeverity' + correlatedNotifications: + $ref: '#/components/schemas/CorrelatedNotifications' + additionalText: + type: string + additionalInformation: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/AttributeNameValuePairSet' + rootCauseIndicator: + type: boolean + serviceUser: + type: string + serviceProvider: + type: string + securityAlarmDetector: + type: string + NotifyClearedAlarm: + allOf: + - $ref: 'TS28623_ComDefs.yaml#/components/schemas/NotificationHeader' + - type: object + required: + - alarmId + - alarmType + - probableCause + - perceivedSeverity + properties: + alarmId: + $ref: '#/components/schemas/AlarmId' + alarmType: + $ref: '#/components/schemas/AlarmType' + probableCause: + $ref: '#/components/schemas/ProbableCause' + perceivedSeverity: + $ref: '#/components/schemas/PerceivedSeverity' + correlatedNotifications: + $ref: '#/components/schemas/CorrelatedNotifications' + clearUserId: + type: string + clearSystemId: + type: string + NotifyChangedAlarm: + allOf: + - $ref: 'TS28623_ComDefs.yaml#/components/schemas/NotificationHeader' + - type: object + required: + - alarmId + - alarmType + - probableCause + - perceivedSeverity + properties: + alarmId: + $ref: '#/components/schemas/AlarmId' + alarmType: + $ref: '#/components/schemas/AlarmType' + probableCause: + $ref: '#/components/schemas/ProbableCause' + perceivedSeverity: + $ref: '#/components/schemas/PerceivedSeverity' + NotifyChangedAlarmGeneral: + allOf: + - $ref: 'TS28623_ComDefs.yaml#/components/schemas/NotificationHeader' + - type: object + required: + - alarmId + - alarmType + properties: + alarmId: + $ref: '#/components/schemas/AlarmId' + alarmType: + $ref: '#/components/schemas/AlarmType' + probableCause: + $ref: '#/components/schemas/ProbableCause' + specificProblem: + $ref: '#/components/schemas/SpecificProblem' + perceivedSeverity: + $ref: '#/components/schemas/PerceivedSeverity' + correlatedNotifications: + $ref: '#/components/schemas/CorrelatedNotifications' + backedUpStatus: + type: boolean + backUpObject: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' + trendIndication: + $ref: '#/components/schemas/TrendIndication' + thresholdInfo: + $ref: '#/components/schemas/ThresholdInfo' + stateChangeDefinition: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/AttributeValueChangeSet' + monitoredAttributes: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/AttributeNameValuePairSet' + proposedRepairActions: + type: string + additionalText: + type: string + additionalInformation: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/AttributeNameValuePairSet' + rootCauseIndicator: + type: boolean + changedAlarmAttributes: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/AttributeNameValuePairSet' + NotifyChangedSecAlarmGeneral: + allOf: + - $ref: 'TS28623_ComDefs.yaml#/components/schemas/NotificationHeader' + - type: object + required: + - alarmId + - alarmType + - serviceUser + - serviceProvider + - securityAlarmDetector + properties: + alarmId: + $ref: '#/components/schemas/AlarmId' + alarmType: + $ref: '#/components/schemas/AlarmType' + probableCause: + $ref: '#/components/schemas/ProbableCause' + perceivedSeverity: + $ref: '#/components/schemas/PerceivedSeverity' + correlatedNotifications: + $ref: '#/components/schemas/CorrelatedNotifications' + additionalText: + type: string + additionalInformation: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/AttributeNameValuePairSet' + rootCauseIndicator: + type: boolean + serviceUser: + type: string + serviceProvider: + type: string + securityAlarmDetector: + type: string + changedAlarmAttributes: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/AttributeNameValuePairSet' + NotifyCorrelatedNotificationChanged: + allOf: + - $ref: 'TS28623_ComDefs.yaml#/components/schemas/NotificationHeader' + - type: object + required: + - alarmId + - correlatedNotifications + properties: + alarmId: + $ref: '#/components/schemas/AlarmId' + correlatedNotifications: + $ref: '#/components/schemas/CorrelatedNotifications' + rootCauseIndicator: + type: boolean + NotifyAckStateChanged: + allOf: + - $ref: 'TS28623_ComDefs.yaml#/components/schemas/NotificationHeader' + - type: object + required: + - alarmId + - alarmType + - probableCause + - perceivedSeverity + - ackState + - ackUserId + properties: + alarmId: + $ref: '#/components/schemas/AlarmId' + alarmType: + $ref: '#/components/schemas/AlarmType' + probableCause: + $ref: '#/components/schemas/ProbableCause' + perceivedSeverity: + $ref: '#/components/schemas/PerceivedSeverity' + ackState: + $ref: '#/components/schemas/AckState' + ackUserId: + type: string + ackSystemId: + type: string + NotifyComments: + allOf: + - $ref: 'TS28623_ComDefs.yaml#/components/schemas/NotificationHeader' + - type: object + required: + - alarmId + - alarmType + - probableCause + - perceivedSeverity + - comments + properties: + alarmId: + $ref: '#/components/schemas/AlarmId' + alarmType: + $ref: '#/components/schemas/AlarmType' + probableCause: + $ref: '#/components/schemas/ProbableCause' + perceivedSeverity: + $ref: '#/components/schemas/PerceivedSeverity' + comments: + $ref: '#/components/schemas/Comments' + NotifyPotentialFaultyAlarmList: + allOf: + - $ref: 'TS28623_ComDefs.yaml#/components/schemas/NotificationHeader' + - type: object + required: + - reason + properties: + reason: + type: string + NotifyAlarmListRebuilt: + allOf: + - $ref: 'TS28623_ComDefs.yaml#/components/schemas/NotificationHeader' + - type: object + required: + - reason + properties: + reason: + type: string + alarmListAlignmentRequirement: + $ref: '#/components/schemas/AlarmListAlignmentRequirement' + + #---- Definition of resources ------------------------------------------------------# + + Comment: + type: object + properties: + commentTime: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTime' + commentUserId: + type: string + commentSystemId: + type: string + commentText: + type: string + Comments: + description: >- + Collection of comments. The comment identifiers are allocated by the + MnS producer and used as key in the map. + type: object + additionalProperties: + $ref: '#/components/schemas/Comment' diff --git a/OpenAPI/TS28532_FileDataReportingMnS.yaml b/OpenAPI/TS28532_FileDataReportingMnS.yaml index 176070caf..1a96b5d81 100644 --- a/OpenAPI/TS28532_FileDataReportingMnS.yaml +++ b/OpenAPI/TS28532_FileDataReportingMnS.yaml @@ -80,7 +80,7 @@ paths: content: application/json: schema: - $ref: 'TS28532_FaultMnS.yaml#/components/schemas/Subscription' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/Subscription' responses: '201': description: >- @@ -90,7 +90,7 @@ paths: content: application/json: schema: - $ref: 'TS28532_FaultMnS.yaml#/components/schemas/Subscription' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/Subscription' headers: Location: description: URI of the newly created subscription resource diff --git a/OpenAPI/TS28623_ComDefs.yaml b/OpenAPI/TS28623_ComDefs.yaml index e5da4cc47..ee3e1de12 100755 --- a/OpenAPI/TS28623_ComDefs.yaml +++ b/OpenAPI/TS28623_ComDefs.yaml @@ -241,7 +241,7 @@ components: type: integer NotificationType: oneOf: - - $ref: 'TS28532_FaultMnS.yaml#/components/schemas/AlarmNotificationTypes' + - $ref: 'TS28111_FaultNrm.yaml#/components/schemas/AlarmNotificationTypes' - $ref: 'TS28532_ProvMnS.yaml#/components/schemas/CmNotificationTypes' - $ref: 'TS28532_PerfMnS.yaml#/components/schemas/PerfNotificationTypes' - $ref: 'TS28532_HeartbeatNtf.yaml#/components/schemas/HeartbeatNotificationTypes' @@ -277,6 +277,15 @@ components: properties: errorInfo: type: string + Subscription: + type: object + properties: + consumerReference: + $ref: '#/components/schemas/Uri' + timeTick: + type: integer + filter: + $ref: '#/components/schemas/Filter' ErrorResponseGet: description: >- diff --git a/OpenAPI/TS28623_GenericNrm.yaml b/OpenAPI/TS28623_GenericNrm.yaml index 4567b9f1f..6b6b09f21 100755 --- a/OpenAPI/TS28623_GenericNrm.yaml +++ b/OpenAPI/TS28623_GenericNrm.yaml @@ -552,7 +552,7 @@ components: NtfSubscriptionControl: $ref: '#/components/schemas/NtfSubscriptionControl-Multiple' AlarmList: - $ref: '#/components/schemas/AlarmList-Single' + $ref: 'TS28111_FaultNrm.yaml#/components/schemas/AlarmList-Single' FileDownloadJob: $ref: '#/components/schemas/FileDownloadJob-Multiple' Files: @@ -582,7 +582,7 @@ components: NtfSubscriptionControl: $ref: '#/components/schemas/NtfSubscriptionControl-Multiple' AlarmList: - $ref: '#/components/schemas/AlarmList-Single' + $ref: 'TS28111_FaultNrm.yaml#/components/schemas/AlarmList-Single' FileDownloadJob: $ref: '#/components/schemas/FileDownloadJob-Multiple' Files: @@ -846,29 +846,6 @@ components: - 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' @@ -1191,7 +1168,7 @@ components: - $ref: '#/components/schemas/NtfSubscriptionControl-Single' - $ref: '#/components/schemas/HeartbeatControl-Single' - - $ref: '#/components/schemas/AlarmList-Single' + - $ref: 'TS28111_FaultNrm.yaml#/components/schemas/AlarmList-Single' - $ref: '#/components/schemas/FileDownloadJob-Single' - $ref: '#/components/schemas/Files-Single' -- GitLab From 431f870501164a61777315e77d3b3b1c8cea3e91 Mon Sep 17 00:00:00 2001 From: srinivasaraj Date: Thu, 8 Feb 2024 06:12:13 +0000 Subject: [PATCH 066/115] TS28.541_Rel-18_CR1142_Enhancement_to_clarify_Network_slice_SLA_requirement_for_inter_packet_delay_variation --- OpenAPI/TS28541_SliceNrm.yaml | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/OpenAPI/TS28541_SliceNrm.yaml b/OpenAPI/TS28541_SliceNrm.yaml index 335ae9978..940a68599 100755 --- a/OpenAPI/TS28541_SliceNrm.yaml +++ b/OpenAPI/TS28541_SliceNrm.yaml @@ -410,6 +410,10 @@ components: $ref: '#/components/schemas/DataNetwork' dataNetworkAccess: $ref: '#/components/schemas/DataNetworkAccess' + dLPktDelayVariation: + $ref: '#/components/schemas/Float' + uLPktDelayVariation: + $ref: '#/components/schemas/Float' RANSliceSubnetProfile: type: object @@ -478,6 +482,10 @@ components: type: number kPIMonitoring: $ref: '#/components/schemas/KPIMonitoring' + dLPktDelayVariation: + $ref: '#/components/schemas/Float' + uLPktDelayVariation: + $ref: '#/components/schemas/Float' TopSliceSubnetProfile: type: object @@ -556,6 +564,10 @@ components: $ref: '#/components/schemas/DataNetwork' dataNetworkAccess: $ref: '#/components/schemas/DataNetworkAccess' + dLPktDelayVariation: + $ref: '#/components/schemas/Float' + uLPktDelayVariation: + $ref: '#/components/schemas/Float' ServiceProfile: type: object @@ -622,8 +634,6 @@ components: $ref: '#/components/schemas/Float' uESpeed: type: integer - jitter: - type: integer survivalTime: type: number dLReliability: @@ -648,6 +658,10 @@ components: $ref: '#/components/schemas/DataNetwork' dataNetworkAccess: $ref: '#/components/schemas/DataNetworkAccess' + dLPktDelayVariation: + $ref: '#/components/schemas/Float' + uLPktDelayVariation: + $ref: '#/components/schemas/Float' SliceProfile: type: object -- GitLab From 8583c34ae10b37136aa97dcb270ab40c17c044b5 Mon Sep 17 00:00:00 2001 From: yaoyiz Date: Wed, 17 Jan 2024 22:07:44 +0000 Subject: [PATCH 067/115] Update TS28623_TraceControlNrm.yaml --- OpenAPI/TS28623_TraceControlNrm.yaml | 22 +++++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-) diff --git a/OpenAPI/TS28623_TraceControlNrm.yaml b/OpenAPI/TS28623_TraceControlNrm.yaml index 340072563..c25cf175d 100644 --- a/OpenAPI/TS28623_TraceControlNrm.yaml +++ b/OpenAPI/TS28623_TraceControlNrm.yaml @@ -21,10 +21,14 @@ components: - IMMEDIATE_MDT_ONLY - LOGGED_MDT_ONLY - TRACE_ONLY - - IMMEDIATE_MDT AND TRACE + - IMMEDIATE_MDT_AND_TRACE - RLF_REPORT_ONLY - RCEF_REPORT_ONLY - LOGGED_MBSFN_MDT + - UE_LEVEL_MEASUREMENTS_ONLY + - TRACE_AND_UE_LEVEL_MEASUREMENTS + - IMMEDIATE_MDT_AND_UE_LEVEL_MEASUREMENTS + - TRACE_AND_IMMEDIATE_MDT_AND_UE_LEVEL_MEASUREMENTS listOfInterfaces-Type: description: The interfaces to be recorded in the Network Element. See 3GPP TS 32.422 clause 5.5 for additional details. @@ -1363,6 +1367,20 @@ components: $ref: '#/components/schemas/immediateMDTConfig-Type' loggedMDTConfig: $ref: '#/components/schemas/loggedMDTConfig-Type' + + UEMeasConfig-Type: + description: UE level measurements configuration parameters for 5G system. See details in 3GPP TS 28.622 clause 4.3.x. + type: object + properties: + ueMeasurements: + type: string + ueMeasGranularityPeriod: + type: integer + objectInstances: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList' + rootObjectInstances: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList' + AreaScope: oneOf: - type: array @@ -1444,6 +1462,8 @@ components: $ref: '#/components/schemas/traceConfig-Type' mdtConfig: $ref: '#/components/schemas/mdtConfig-Type' + ueMeasConfig: + $ref: '#/components/schemas/UEMeasConfig-Type' #-------- end of Definition of types used in Trace control NRM fragment ---------- -- GitLab From 075805512b250d8715b4d735dc3a373ac2ce9272 Mon Sep 17 00:00:00 2001 From: yaoyiz Date: Thu, 1 Feb 2024 16:17:18 +0000 Subject: [PATCH 068/115] Update file TS28623_TraceControlNrm.yaml --- OpenAPI/TS28623_TraceControlNrm.yaml | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/OpenAPI/TS28623_TraceControlNrm.yaml b/OpenAPI/TS28623_TraceControlNrm.yaml index c25cf175d..20451d95f 100644 --- a/OpenAPI/TS28623_TraceControlNrm.yaml +++ b/OpenAPI/TS28623_TraceControlNrm.yaml @@ -25,10 +25,10 @@ components: - RLF_REPORT_ONLY - RCEF_REPORT_ONLY - LOGGED_MBSFN_MDT - - UE_LEVEL_MEASUREMENTS_ONLY - - TRACE_AND_UE_LEVEL_MEASUREMENTS - - IMMEDIATE_MDT_AND_UE_LEVEL_MEASUREMENTS - - TRACE_AND_IMMEDIATE_MDT_AND_UE_LEVEL_MEASUREMENTS + - 5GC_UE_LEVEL_MEASUREMENTS_ONLY + - TRACE_AND_5GC_UE_LEVEL_MEASUREMENTS + - IMMEDIATE_MDT_AND_5GC_UE_LEVEL_MEASUREMENTS + - TRACE_AND_IMMEDIATE_MDT_AND_5GC_UE_LEVEL_MEASUREMENTS listOfInterfaces-Type: description: The interfaces to be recorded in the Network Element. See 3GPP TS 32.422 clause 5.5 for additional details. @@ -1376,6 +1376,8 @@ components: type: string ueMeasGranularityPeriod: type: integer + nfTypeToMeasure: + type: string objectInstances: $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList' rootObjectInstances: -- GitLab From 3d467d48eb264ec9f27c4d20c193fb1f08688c89 Mon Sep 17 00:00:00 2001 From: ruiyue Date: Thu, 18 Jan 2024 02:05:33 +0000 Subject: [PATCH 069/115] Update 2 files - /OpenAPI/TS28312_IntentNrm.yaml - /OpenAPI/TS28312_IntentExpectations.yaml --- OpenAPI/TS28312_IntentExpectations.yaml | 12 +++++------- OpenAPI/TS28312_IntentNrm.yaml | 8 +++++++- 2 files changed, 12 insertions(+), 8 deletions(-) diff --git a/OpenAPI/TS28312_IntentExpectations.yaml b/OpenAPI/TS28312_IntentExpectations.yaml index b0c35072e..7817c9c01 100644 --- a/OpenAPI/TS28312_IntentExpectations.yaml +++ b/OpenAPI/TS28312_IntentExpectations.yaml @@ -89,7 +89,7 @@ components: expectationVerb: $ref: 'TS28312_IntentNrm.yaml#/components/schemas/ExpectationVerb' expectationObject: - $ref: '#/components/schemas/ServiceSupportExpectationObject' + $ref: '#/components/schemas/EdgeServiceSupportExpectationObject' expectationTargets: type: array items: @@ -146,8 +146,6 @@ components: - $ref: '#/components/schemas/StartTimeContext' - $ref: '#/components/schemas/ResourceSharingLevelContext' - $ref: "TS28312_IntentNrm.yaml#/components/schemas/Context" - expectationfulfilmentInfo: - $ref: "TS28312_IntentNrm.yaml#/components/schemas/FulfilmentInfo" required: - expectationId #-------Definition of the IntentExpectation dataType ----------# @@ -196,7 +194,7 @@ components: - $ref: '#/components/schemas/CoverageAreaPolygonContext' - $ref: '#/components/schemas/ServiceTypeContext' - $ref: 'TS28312_IntentNrm.yaml#/components/schemas/Context' - ServiceSupportExpectationObject: + EdgeServiceSupportExpectationObject: description: >- This data type is the "ExpectationObject" data type with specialisations for EdgeServiceSupportExpectation type: object @@ -212,7 +210,7 @@ components: items: type: object oneOf: - - $ref: '#/components/schemas/EdgeIdenfiticationIdContext' + - $ref: '#/components/schemas/EdgeIdentificationIdContext' - $ref: '#/components/schemas/EdgeIdentificationLocContext' - $ref: '#/components/schemas/CoverageAreaTAContext' - $ref: 'TS28312_IntentNrm.yaml#/components/schemas/Context' @@ -801,7 +799,7 @@ components: $ref: 'TS28312_IntentNrm.yaml#/components/schemas/Frequency' UlFrequencyContext: description: >- - This data type is the "Context" data type with specialisations for Object context "DLFrequencyContext". + This data type is the "Context" data type with specialisations for Object context "ULFrequencyContext". It describes the uplink frequency information (RF reference frequencies and/ or the frequency operating band) supported by the RAN SubNetwork that the intent expectation is applied. type: object @@ -856,7 +854,7 @@ components: type: array items: $ref: "TS28312_IntentNrm.yaml#/components/schemas/UEGroup" - EdgeIdenfiticationIdContext: + EdgeIdentificationIdContext: description: >- This data type is the "ObjectContext" data type with specialisations for EdgeIdentificationIdContext type: object diff --git a/OpenAPI/TS28312_IntentNrm.yaml b/OpenAPI/TS28312_IntentNrm.yaml index de7291d9f..08ca9e896 100644 --- a/OpenAPI/TS28312_IntentNrm.yaml +++ b/OpenAPI/TS28312_IntentNrm.yaml @@ -335,7 +335,7 @@ components: #-------Definition of the generic ExpectationFulfilmentResult dataType----------------# ExpectationFulfilmentResult: description: >- - It includes the expectationFulfilmentInfo and targetFulfilmetResults for each IntentExpectation. + It includes the expectationFulfilmentInfo and targetFulfilmentResults for each IntentExpectation. type: object properties: expectaitonId: @@ -389,6 +389,12 @@ components: description: >- This will be present if the value of conflictType is TARGET_CONFLICT. It describes the targetName of the conflicting ExpectationTarget with an IntentExpectation type: string + recommendedSolutions: + type: string + enum: + - MODIFY + - DELETE + #-------Definition of the concrete IntentConflictReport dataType----------------# #-------Definition of the generic IntentFeasibilityCheckReport dataType----------------# -- GitLab From 5fb98b218a98af4792e61195ffd77afabd9aed36 Mon Sep 17 00:00:00 2001 From: ruiyue Date: Thu, 22 Feb 2024 08:46:00 +0000 Subject: [PATCH 070/115] Replace TS28541_NrNrm.yaml --- OpenAPI/TS28541_NrNrm.yaml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/OpenAPI/TS28541_NrNrm.yaml b/OpenAPI/TS28541_NrNrm.yaml index b68eb5cf2..92214ae99 100755 --- a/OpenAPI/TS28541_NrNrm.yaml +++ b/OpenAPI/TS28541_NrNrm.yaml @@ -700,6 +700,10 @@ components: $ref: '#/components/schemas/NRFrequency-Multiple' ExternalGnbCuCpFunction: $ref: '#/components/schemas/ExternalGnbCuCpFunction-Multiple' + ExternalGnbCuUpFunction: + $ref: '#/components/schemas/ExternalGnbCuUpFunction-Multiple' + ExternalGnbDuFunction: + $ref: '#/components/schemas/ExternalGnbDuFunction-Multiple' ExternalENBFunction: $ref: '#/components/schemas/ExternalENBFunction-Multiple' EUtranFrequency: -- GitLab From dc42ac22417f096d3dccc18cc18cd62084fc2b28 Mon Sep 17 00:00:00 2001 From: ruiyue Date: Tue, 30 Jan 2024 12:35:11 +0000 Subject: [PATCH 071/115] Update file TS28317_RanScNrm.yaml --- OpenAPI/TS28317_RanScNrm.yaml | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/OpenAPI/TS28317_RanScNrm.yaml b/OpenAPI/TS28317_RanScNrm.yaml index afaffc6cb..23354960f 100644 --- a/OpenAPI/TS28317_RanScNrm.yaml +++ b/OpenAPI/TS28317_RanScNrm.yaml @@ -70,7 +70,7 @@ components: #-------Definition of Data types ----------# NEType: - type: integer + type: string description: It defines the type of RAN NE GnbId: type: integer @@ -86,13 +86,14 @@ components: oneOf: - $ref: '#/components/schemas/EnbId' - $ref: '#/components/schemas/GnbId' + - $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' NEInfomration: description: >- It defines the NE Type or the NE instance for which this ScMgmtProfile instance is valid. - oneOf: + anyOf: - $ref: '#/components/schemas/NEType' - - $ref: '#/components/schemas/NEIdentification' + - $ref: '#/components/schemas/NEIdentification' ScProcessMonitor: description: >- This data type is the "ProcessMonitor" data type with specialisations @@ -124,7 +125,7 @@ components: - PREPARE_BASIC_CONFIGURATION_AND_OAMLINK - RETRIEVE_CONFIGURATION_DATA - SETUP_PRECONFIGURED_SIGNALLING_LINKS - - TSET_FINAL_STATE_OF_NE + - SET_FINAL_STATE_OF_NE resultStateInfo: oneOf: - type: string -- GitLab From 52c36a2e4f15df13ed87764e0523751bfd8d3b3c Mon Sep 17 00:00:00 2001 From: Shitao Li Date: Fri, 19 Jan 2024 07:19:26 +0000 Subject: [PATCH 072/115] Update TS28538_EdgeNrm.yaml --- OpenAPI/TS28538_EdgeNrm.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/OpenAPI/TS28538_EdgeNrm.yaml b/OpenAPI/TS28538_EdgeNrm.yaml index 4088b3c0a..2c687c795 100644 --- a/OpenAPI/TS28538_EdgeNrm.yaml +++ b/OpenAPI/TS28538_EdgeNrm.yaml @@ -374,8 +374,8 @@ components: - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' - type: object properties: - availableVirtualResource: - $ref: '#/components/schemas/VirtualResource' + availableEdgeVirtualResources: + type: string availableEASResource: $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList' edgeDataNetworkRef: -- GitLab From 00a18f83077d8735d5ec6c16556e27c572865738 Mon Sep 17 00:00:00 2001 From: Shitao Li Date: Thu, 1 Feb 2024 16:24:21 +0000 Subject: [PATCH 073/115] Update TS28538_EdgeNrm.yaml --- OpenAPI/TS28538_EdgeNrm.yaml | 2 -- 1 file changed, 2 deletions(-) diff --git a/OpenAPI/TS28538_EdgeNrm.yaml b/OpenAPI/TS28538_EdgeNrm.yaml index 2c687c795..8b9259789 100644 --- a/OpenAPI/TS28538_EdgeNrm.yaml +++ b/OpenAPI/TS28538_EdgeNrm.yaml @@ -374,8 +374,6 @@ components: - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' - type: object properties: - availableEdgeVirtualResources: - type: string availableEASResource: $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList' edgeDataNetworkRef: -- GitLab From 50b3bd02474681a4e5275299ca3c4324eb8c5f6e Mon Sep 17 00:00:00 2001 From: Shitao Li Date: Fri, 19 Jan 2024 07:26:24 +0000 Subject: [PATCH 074/115] Update TS28538_EdgeNrm.yaml --- OpenAPI/TS28538_EdgeNrm.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/OpenAPI/TS28538_EdgeNrm.yaml b/OpenAPI/TS28538_EdgeNrm.yaml index 8b9259789..196ae8d05 100644 --- a/OpenAPI/TS28538_EdgeNrm.yaml +++ b/OpenAPI/TS28538_EdgeNrm.yaml @@ -325,8 +325,8 @@ components: $ref: '#/components/schemas/EASFeature' federationID: type: string - reservationID: - type: string + reservationJobRef: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' EASResourceReservationJob-Single: allOf: -- GitLab From 56d343a6f89645bfd235eb83fb29818cee082122 Mon Sep 17 00:00:00 2001 From: Shitao Li Date: Fri, 19 Jan 2024 07:08:14 +0000 Subject: [PATCH 075/115] Update TS28104_MdaReport.yaml --- OpenAPI/TS28104_MdaReport.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/OpenAPI/TS28104_MdaReport.yaml b/OpenAPI/TS28104_MdaReport.yaml index a81b09f63..05db9ecf8 100644 --- a/OpenAPI/TS28104_MdaReport.yaml +++ b/OpenAPI/TS28104_MdaReport.yaml @@ -64,3 +64,5 @@ components: type: string mDAOutputs: $ref: '#/components/schemas/MDAOutputs' + MDARequestRef: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' -- GitLab From 2a03fd28961d79b631e5c260526bdef768084dfc Mon Sep 17 00:00:00 2001 From: Shitao Li Date: Thu, 1 Feb 2024 16:50:21 +0000 Subject: [PATCH 076/115] Update TS28104_MdaReport.yaml --- OpenAPI/TS28104_MdaReport.yaml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/OpenAPI/TS28104_MdaReport.yaml b/OpenAPI/TS28104_MdaReport.yaml index 05db9ecf8..344251e02 100644 --- a/OpenAPI/TS28104_MdaReport.yaml +++ b/OpenAPI/TS28104_MdaReport.yaml @@ -24,8 +24,6 @@ components: type: array items: $ref: '#/components/schemas/MDAOutputEntry' - mDARequestRef: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' analyticsWindow: $ref: '#/components/schemas/TimeWindow' confidenceDegree: @@ -64,5 +62,5 @@ components: type: string mDAOutputs: $ref: '#/components/schemas/MDAOutputs' - MDARequestRef: + mDARequestRef: $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' -- GitLab From 43d3f983306135bec6e021aab38b5225384926a8 Mon Sep 17 00:00:00 2001 From: rosabolzek Date: Fri, 19 Jan 2024 13:26:01 +0000 Subject: [PATCH 077/115] Update TS28541_NrNrm.yaml --- OpenAPI/TS28541_NrNrm.yaml | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/OpenAPI/TS28541_NrNrm.yaml b/OpenAPI/TS28541_NrNrm.yaml index 92214ae99..989f89c81 100755 --- a/OpenAPI/TS28541_NrNrm.yaml +++ b/OpenAPI/TS28541_NrNrm.yaml @@ -1512,7 +1512,8 @@ components: enum: - IS_NOT_ENERGY_SAVING - IS_ENERGY_SAVING - + mLEntityRef: + $ref: "#'TS28623_ComDefs.yaml#/components/schemas/Dn'" DRACHOptimizationFunction-Single: allOf: - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' @@ -1546,6 +1547,8 @@ components: $ref: '#/components/schemas/MinimumTimeBetweenHoTriggerChange' tstoreUEcntxt: $ref: '#/components/schemas/TstoreUEcntxt' + mLEntityRef: + $ref: "#'TS28623_ComDefs.yaml#/components/schemas/Dn'" DLBOFunction-Single: allOf: - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' @@ -1560,7 +1563,8 @@ components: $ref: '#/components/schemas/MaximumDeviationHoTrigger' minimumTimeBetweenHoTriggerChange: $ref: '#/components/schemas/MinimumTimeBetweenHoTriggerChange' - + mLEntityRef: + $ref: "#'TS28623_ComDefs.yaml#/components/schemas/Dn'" DPCIConfigurationFunction-Single: allOf: - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' -- GitLab From c3be33c27228ebbb45f3c1586ca07c79c5511b5f Mon Sep 17 00:00:00 2001 From: rosabolzek Date: Tue, 30 Jan 2024 09:38:04 +0000 Subject: [PATCH 078/115] Update TS28541_NrNrm.yaml --- OpenAPI/TS28541_NrNrm.yaml | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/OpenAPI/TS28541_NrNrm.yaml b/OpenAPI/TS28541_NrNrm.yaml index 989f89c81..80dc5e1b3 100755 --- a/OpenAPI/TS28541_NrNrm.yaml +++ b/OpenAPI/TS28541_NrNrm.yaml @@ -1514,6 +1514,8 @@ components: - IS_ENERGY_SAVING mLEntityRef: $ref: "#'TS28623_ComDefs.yaml#/components/schemas/Dn'" + aIMLInferenceFuntionRef: + $ref: "#'TS28623_ComDefs.yaml#/components/schemas/Dn'" DRACHOptimizationFunction-Single: allOf: - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' @@ -1548,7 +1550,9 @@ components: tstoreUEcntxt: $ref: '#/components/schemas/TstoreUEcntxt' mLEntityRef: - $ref: "#'TS28623_ComDefs.yaml#/components/schemas/Dn'" + $ref: "#'TS28623_ComDefs.yaml#/components/schemas/Dn'" \ + aIMLInferenceFuntionRef: + $ref: "#'TS28623_ComDefs.yaml#/components/schemas/Dn'" DLBOFunction-Single: allOf: - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' @@ -1565,6 +1569,8 @@ components: $ref: '#/components/schemas/MinimumTimeBetweenHoTriggerChange' mLEntityRef: $ref: "#'TS28623_ComDefs.yaml#/components/schemas/Dn'" + aIMLInferenceFuntionRef: + $ref: "#'TS28623_ComDefs.yaml#/components/schemas/Dn'" DPCIConfigurationFunction-Single: allOf: - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' -- GitLab From 216f6e4aa13111eba49ca95626e44537f3f27df9 Mon Sep 17 00:00:00 2001 From: rosabolzek Date: Tue, 30 Jan 2024 10:20:39 +0000 Subject: [PATCH 079/115] Update TS28541_NrNrm.yaml --- OpenAPI/TS28541_NrNrm.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OpenAPI/TS28541_NrNrm.yaml b/OpenAPI/TS28541_NrNrm.yaml index 80dc5e1b3..3077994d6 100755 --- a/OpenAPI/TS28541_NrNrm.yaml +++ b/OpenAPI/TS28541_NrNrm.yaml @@ -1550,7 +1550,7 @@ components: tstoreUEcntxt: $ref: '#/components/schemas/TstoreUEcntxt' mLEntityRef: - $ref: "#'TS28623_ComDefs.yaml#/components/schemas/Dn'" \ + $ref: "#'TS28623_ComDefs.yaml#/components/schemas/Dn'" aIMLInferenceFuntionRef: $ref: "#'TS28623_ComDefs.yaml#/components/schemas/Dn'" DLBOFunction-Single: -- GitLab From 8e480f24d498a6c4a1856e078602bfee8b435be8 Mon Sep 17 00:00:00 2001 From: rosabolzek Date: Thu, 1 Feb 2024 18:15:57 +0000 Subject: [PATCH 080/115] Update TS28541_NrNrm.yaml Corrected a small typo. --- OpenAPI/TS28541_NrNrm.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/OpenAPI/TS28541_NrNrm.yaml b/OpenAPI/TS28541_NrNrm.yaml index 3077994d6..fac93a1e5 100755 --- a/OpenAPI/TS28541_NrNrm.yaml +++ b/OpenAPI/TS28541_NrNrm.yaml @@ -1514,7 +1514,7 @@ components: - IS_ENERGY_SAVING mLEntityRef: $ref: "#'TS28623_ComDefs.yaml#/components/schemas/Dn'" - aIMLInferenceFuntionRef: + aIMLInferenceFunctionRef: $ref: "#'TS28623_ComDefs.yaml#/components/schemas/Dn'" DRACHOptimizationFunction-Single: allOf: @@ -1551,7 +1551,7 @@ components: $ref: '#/components/schemas/TstoreUEcntxt' mLEntityRef: $ref: "#'TS28623_ComDefs.yaml#/components/schemas/Dn'" - aIMLInferenceFuntionRef: + aIMLInferenceFunctionRef: $ref: "#'TS28623_ComDefs.yaml#/components/schemas/Dn'" DLBOFunction-Single: allOf: @@ -1569,7 +1569,7 @@ components: $ref: '#/components/schemas/MinimumTimeBetweenHoTriggerChange' mLEntityRef: $ref: "#'TS28623_ComDefs.yaml#/components/schemas/Dn'" - aIMLInferenceFuntionRef: + aIMLInferenceFunctionRef: $ref: "#'TS28623_ComDefs.yaml#/components/schemas/Dn'" DPCIConfigurationFunction-Single: allOf: -- GitLab From ecae2d8bb1939ecee50c9109a21dfb710c7c298b Mon Sep 17 00:00:00 2001 From: fernandesc Date: Thu, 22 Feb 2024 11:15:37 +0000 Subject: [PATCH 081/115] TS28319_MsacNrm --- OpenAPI/TS28319_MsacNrm.yaml | 87 ++++++++++++++++++++++++++++++++++++ OpenAPI/TS28532_ProvMnS.yaml | 3 +- 2 files changed, 89 insertions(+), 1 deletion(-) create mode 100644 OpenAPI/TS28319_MsacNrm.yaml diff --git a/OpenAPI/TS28319_MsacNrm.yaml b/OpenAPI/TS28319_MsacNrm.yaml new file mode 100644 index 000000000..ac65e3ebf --- /dev/null +++ b/OpenAPI/TS28319_MsacNrm.yaml @@ -0,0 +1,87 @@ + +openapi: 3.0.1 +info: + title: MSAC NRM + version: 18.0.0 + description: >- + OAS 3.0.1 definition of the MSAC NRM + © 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). + All rights reserved. +externalDocs: + description: 3GPP TS 28.319; MSAC NRM + url: http://www.3gpp.org/ftp/Specs/archive/28_series/28.319/ +paths: {} +components: + schemas: + +#-------- Definition of types----------------------------------------------------- + +#-------- Definition of concrete IOCs -------------------------------------------- + + Identity-Single: + allOf: + - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' + - type: object + properties: + attributes: + type: object + properties: + identityType: + type: string + enum: + - USERNAME + - EMAIL_ADDRESS + - PHONE_NUMBER + - IP_ADDRESS + - MACHINEUSER + identityName: + type: string + credential: + type: string + roleRefList: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList' + + Role-Single: + allOf: + - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' + - type: object + properties: + attributes: + type: object + properties: + roleName: + type: string + accessRulesList: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList' + + AccessRule-Single: + allOf: + - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' + - type: object + properties: + attributes: + type: object + properties: + ruleName: + type: string + resources: + type: string + operations: + type: array + items: + type: string + actions: + type: string + enum: + - ALLOW + - DENY + componentCData: + type: array + items: + type: string + + resources-msacNrm: + oneOf: + - $ref: '#/components/schemas/Identity-Single' + - $ref: '#/components/schemas/Role-Single' + - $ref: '#/components/schemas/AccessRule-Single' diff --git a/OpenAPI/TS28532_ProvMnS.yaml b/OpenAPI/TS28532_ProvMnS.yaml index 30aa8cc2b..025ededed 100755 --- a/OpenAPI/TS28532_ProvMnS.yaml +++ b/OpenAPI/TS28532_ProvMnS.yaml @@ -406,7 +406,8 @@ 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: 'TS28319_MsacNrm.yaml#/components/schemas/resources-msacNrm' Scope: type: object properties: -- GitLab From 4af3ea303a48e3d347ad1f998b148dd813a40119 Mon Sep 17 00:00:00 2001 From: gautamd Date: Thu, 18 Jan 2024 09:23:55 +0000 Subject: [PATCH 082/115] Upload New File --- TS28318__DSORecovery.yaml | 136 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 136 insertions(+) create mode 100644 TS28318__DSORecovery.yaml diff --git a/TS28318__DSORecovery.yaml b/TS28318__DSORecovery.yaml new file mode 100644 index 000000000..dae8732c3 --- /dev/null +++ b/TS28318__DSORecovery.yaml @@ -0,0 +1,136 @@ +openapi: 3.0.1 +info: + title: 3GPP NRM + version: 18.5.0 + description: >- + OAS 3.0.1 specification of the DSORecovery NRM + © 2023, 3GPP Organizational DSORecovery Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). + All rights reserved. +externalDocs: + description: 3GPP TS 28.318; DSORecovery NRM + url: http://www.3gpp.org/ftp/Specs/archive/28_series/28.318/ +paths: {} +components: + schemas: + +#-------- Definition of types----------------------------------------------------- + DsoInterventionInfo: + type: object + properties: + dsoFeederRestoreTime: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTime' + dsoRequiredInterventionDuration: + type: integer + isDsoPriorityRecoveryLocation: + type: boolean + ServiceRestoreInfo: + type: object + properties: + dsoRestoreTimeActual: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTime' + isDsoRestoreComplete: + type: boolean + ServiceLocationIdentifier: + type: object + properties: + geoCoordinate: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/GeoCoordinate' + energySupplyId: + type: string + UpsInfo: + type: object + properties: + isUpsAvailable: + type: boolean + totalUpsBackupDuration: + type: integer + remainingUpsBackupDuration: + type: integer + baseStationId: + type: string + + + + +#-------- Definition of concrete IOCs -------------------------------------------- + MnS: + oneOf: + - type: object + properties: + SubNetwork: + $ref: '#/components/schemas/SubNetwork-Multiple' + + SubNetwork-Single: + allOf: + - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' + - type: object + properties: + attributes: + allOf: + - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/SubNetwork-Attr' + - type: object + properties: + Subnetwork: + $ref: '#/components/schemas/SubNetwork-Multiple' + DsoRapidRecovery: + $ref: '#/components/schemas/DsoRapidRecovery-Multiple' + - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/SubNetwork-ncO' + + DsoRapidRecovery-Single: + allOf: + - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' + - type: object + properties: + dsoOutStartTime: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTime' + dsoRestoreTimeExpected: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTime' + dsoRapidInterventionInfo: + $ref: '#/components/schemas/DsoInterventionInfo' + dsoServiceRestoreInfo: + $ref: '#/components/schemas/ServiceRestoreInfo' + dsoRapidRecoveryLocation: + $ref: '#/components/schemas/ServiceLocationIdentifier' + upsInfo: + $ref: '#/components/schemas/UpsInfo' + - type: object + properties: + MnoRapidInterventionInfo: + $ref: '#/components/schemas/MnoRapidInterventionInfo-Multiple' + MnoRapidInterventionInfo-Single: + allOf: + - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' + - type: object + properties: + mnoInterventionTime: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTime' + mnoInterventionDuration: + type: integer + isMnoInterventionPossible: + type: boolean + + + +#-------- Definition of JSON arrays for name-contained IOCs ---------------------- + + SubNetwork-Multiple: + type: array + items: + $ref: '#/components/schemas/SubNetwork-Single' + DsoRapidRecovery-Multiple: + type: array + items: + $ref: '#/components/schemas/DsoRapidRecovery-Single' + MnoRapidInterventionInfo-Multiple: + type: array + items: + $ref: '#/components/schemas/MnoRapidInterventionInfo-Single' + +#--------------------------------- Definition ------------------------------------ + + resources-DSORecovery: + oneOf: + - $ref: '#/components/schemas/MnS' + - $ref: '#/components/schemas/SubNetwork-Single' + - $ref: '#/components/schemas/DsoRapidRecovery-Single' + - $ref: '#/components/schemas/MnoRapidInterventionInfo-Single' -- GitLab From 76236664e1e19252ed613904a7aa6d37e82bb82b Mon Sep 17 00:00:00 2001 From: gautamd Date: Thu, 1 Feb 2024 18:59:05 +0000 Subject: [PATCH 083/115] Update TS28318__DSORecovery.yaml --- TS28318__DSORecovery.yaml | 84 ++++++++++----------------------------- 1 file changed, 20 insertions(+), 64 deletions(-) diff --git a/TS28318__DSORecovery.yaml b/TS28318__DSORecovery.yaml index dae8732c3..be30d1952 100644 --- a/TS28318__DSORecovery.yaml +++ b/TS28318__DSORecovery.yaml @@ -14,44 +14,16 @@ components: schemas: #-------- Definition of types----------------------------------------------------- - DsoInterventionInfo: + EnergyServiceLocation: type: object properties: - dsoFeederRestoreTime: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTime' - dsoRequiredInterventionDuration: - type: integer - isDsoPriorityRecoveryLocation: - type: boolean - ServiceRestoreInfo: - type: object - properties: - dsoRestoreTimeActual: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTime' - isDsoRestoreComplete: - type: boolean - ServiceLocationIdentifier: - type: object - properties: - geoCoordinate: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/GeoCoordinate' - energySupplyId: + CGI: type: string - UpsInfo: - type: object - properties: - isUpsAvailable: - type: boolean - totalUpsBackupDuration: - type: integer - remainingUpsBackupDuration: - type: integer - baseStationId: + energySupplyId: type: string - #-------- Definition of concrete IOCs -------------------------------------------- MnS: oneOf: @@ -72,42 +44,31 @@ components: properties: Subnetwork: $ref: '#/components/schemas/SubNetwork-Multiple' - DsoRapidRecovery: - $ref: '#/components/schemas/DsoRapidRecovery-Multiple' + OutageAndRecoveryInfo: + $ref: '#/components/schemas/OutageAndRecoveryInfo-Multiple' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/SubNetwork-ncO' - DsoRapidRecovery-Single: + OutageAndRecoveryInfo-Single: allOf: - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' - type: object properties: - dsoOutStartTime: + outageStartTime: $ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTime' - dsoRestoreTimeExpected: + expectedOutageEndTime: $ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTime' - dsoRapidInterventionInfo: - $ref: '#/components/schemas/DsoInterventionInfo' - dsoServiceRestoreInfo: - $ref: '#/components/schemas/ServiceRestoreInfo' - dsoRapidRecoveryLocation: - $ref: '#/components/schemas/ServiceLocationIdentifier' - upsInfo: - $ref: '#/components/schemas/UpsInfo' - - type: object - properties: - MnoRapidInterventionInfo: - $ref: '#/components/schemas/MnoRapidInterventionInfo-Multiple' - MnoRapidInterventionInfo-Single: - allOf: - - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' - - type: object - properties: + dsoRapidInterventionTime: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTime' + dsoRapidInterventionDuration: + type: integer mnoInterventionTime: $ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTime' - mnoInterventionDuration: + dsoRapidInterventionDuration: + type: integer + mnoMaxServiceDuration: type: integer - isMnoInterventionPossible: - type: boolean + affectedArea: + $ref: '#/components/schemas/EnergyServiceLocation' @@ -117,14 +78,10 @@ components: type: array items: $ref: '#/components/schemas/SubNetwork-Single' - DsoRapidRecovery-Multiple: - type: array - items: - $ref: '#/components/schemas/DsoRapidRecovery-Single' - MnoRapidInterventionInfo-Multiple: + OutageAndRecoveryInfo-Multiple: type: array items: - $ref: '#/components/schemas/MnoRapidInterventionInfo-Single' + $ref: '#/components/schemas/OutageAndRecoveryInfo-Single' #--------------------------------- Definition ------------------------------------ @@ -132,5 +89,4 @@ components: oneOf: - $ref: '#/components/schemas/MnS' - $ref: '#/components/schemas/SubNetwork-Single' - - $ref: '#/components/schemas/DsoRapidRecovery-Single' - - $ref: '#/components/schemas/MnoRapidInterventionInfo-Single' + - $ref: '#/components/schemas/OutageAndRecoveryInfo-Single' -- GitLab From 23972deb1cfba10646f303a92cfa5658369b93f5 Mon Sep 17 00:00:00 2001 From: gautamd Date: Thu, 1 Feb 2024 19:09:07 +0000 Subject: [PATCH 084/115] Delete TS28318__DSORecovery.yaml --- TS28318__DSORecovery.yaml | 92 --------------------------------------- 1 file changed, 92 deletions(-) delete mode 100644 TS28318__DSORecovery.yaml diff --git a/TS28318__DSORecovery.yaml b/TS28318__DSORecovery.yaml deleted file mode 100644 index be30d1952..000000000 --- a/TS28318__DSORecovery.yaml +++ /dev/null @@ -1,92 +0,0 @@ -openapi: 3.0.1 -info: - title: 3GPP NRM - version: 18.5.0 - description: >- - OAS 3.0.1 specification of the DSORecovery NRM - © 2023, 3GPP Organizational DSORecovery Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). - All rights reserved. -externalDocs: - description: 3GPP TS 28.318; DSORecovery NRM - url: http://www.3gpp.org/ftp/Specs/archive/28_series/28.318/ -paths: {} -components: - schemas: - -#-------- Definition of types----------------------------------------------------- - EnergyServiceLocation: - type: object - properties: - CGI: - type: string - energySupplyId: - type: string - - - -#-------- Definition of concrete IOCs -------------------------------------------- - MnS: - oneOf: - - type: object - properties: - SubNetwork: - $ref: '#/components/schemas/SubNetwork-Multiple' - - SubNetwork-Single: - allOf: - - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' - - type: object - properties: - attributes: - allOf: - - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/SubNetwork-Attr' - - type: object - properties: - Subnetwork: - $ref: '#/components/schemas/SubNetwork-Multiple' - OutageAndRecoveryInfo: - $ref: '#/components/schemas/OutageAndRecoveryInfo-Multiple' - - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/SubNetwork-ncO' - - OutageAndRecoveryInfo-Single: - allOf: - - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' - - type: object - properties: - outageStartTime: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTime' - expectedOutageEndTime: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTime' - dsoRapidInterventionTime: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTime' - dsoRapidInterventionDuration: - type: integer - mnoInterventionTime: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTime' - dsoRapidInterventionDuration: - type: integer - mnoMaxServiceDuration: - type: integer - affectedArea: - $ref: '#/components/schemas/EnergyServiceLocation' - - - -#-------- Definition of JSON arrays for name-contained IOCs ---------------------- - - SubNetwork-Multiple: - type: array - items: - $ref: '#/components/schemas/SubNetwork-Single' - OutageAndRecoveryInfo-Multiple: - type: array - items: - $ref: '#/components/schemas/OutageAndRecoveryInfo-Single' - -#--------------------------------- Definition ------------------------------------ - - resources-DSORecovery: - oneOf: - - $ref: '#/components/schemas/MnS' - - $ref: '#/components/schemas/SubNetwork-Single' - - $ref: '#/components/schemas/OutageAndRecoveryInfo-Single' -- GitLab From 8344251f70f6f79aff8670fcb0f7e937ac9fcde9 Mon Sep 17 00:00:00 2001 From: gautamd Date: Thu, 1 Feb 2024 19:09:45 +0000 Subject: [PATCH 085/115] Upload New File --- OpenAPI/TS28318__DSORecovery.yaml | 92 +++++++++++++++++++++++++++++++ 1 file changed, 92 insertions(+) create mode 100644 OpenAPI/TS28318__DSORecovery.yaml diff --git a/OpenAPI/TS28318__DSORecovery.yaml b/OpenAPI/TS28318__DSORecovery.yaml new file mode 100644 index 000000000..be30d1952 --- /dev/null +++ b/OpenAPI/TS28318__DSORecovery.yaml @@ -0,0 +1,92 @@ +openapi: 3.0.1 +info: + title: 3GPP NRM + version: 18.5.0 + description: >- + OAS 3.0.1 specification of the DSORecovery NRM + © 2023, 3GPP Organizational DSORecovery Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). + All rights reserved. +externalDocs: + description: 3GPP TS 28.318; DSORecovery NRM + url: http://www.3gpp.org/ftp/Specs/archive/28_series/28.318/ +paths: {} +components: + schemas: + +#-------- Definition of types----------------------------------------------------- + EnergyServiceLocation: + type: object + properties: + CGI: + type: string + energySupplyId: + type: string + + + +#-------- Definition of concrete IOCs -------------------------------------------- + MnS: + oneOf: + - type: object + properties: + SubNetwork: + $ref: '#/components/schemas/SubNetwork-Multiple' + + SubNetwork-Single: + allOf: + - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' + - type: object + properties: + attributes: + allOf: + - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/SubNetwork-Attr' + - type: object + properties: + Subnetwork: + $ref: '#/components/schemas/SubNetwork-Multiple' + OutageAndRecoveryInfo: + $ref: '#/components/schemas/OutageAndRecoveryInfo-Multiple' + - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/SubNetwork-ncO' + + OutageAndRecoveryInfo-Single: + allOf: + - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' + - type: object + properties: + outageStartTime: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTime' + expectedOutageEndTime: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTime' + dsoRapidInterventionTime: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTime' + dsoRapidInterventionDuration: + type: integer + mnoInterventionTime: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTime' + dsoRapidInterventionDuration: + type: integer + mnoMaxServiceDuration: + type: integer + affectedArea: + $ref: '#/components/schemas/EnergyServiceLocation' + + + +#-------- Definition of JSON arrays for name-contained IOCs ---------------------- + + SubNetwork-Multiple: + type: array + items: + $ref: '#/components/schemas/SubNetwork-Single' + OutageAndRecoveryInfo-Multiple: + type: array + items: + $ref: '#/components/schemas/OutageAndRecoveryInfo-Single' + +#--------------------------------- Definition ------------------------------------ + + resources-DSORecovery: + oneOf: + - $ref: '#/components/schemas/MnS' + - $ref: '#/components/schemas/SubNetwork-Single' + - $ref: '#/components/schemas/OutageAndRecoveryInfo-Single' -- GitLab From 61a4a506e60a5e4f538d7b00cb892a0891810e08 Mon Sep 17 00:00:00 2001 From: gautamd Date: Thu, 1 Feb 2024 19:19:32 +0000 Subject: [PATCH 086/115] Update TS28318__DSORecovery.yaml --- OpenAPI/TS28318__DSORecovery.yaml | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/OpenAPI/TS28318__DSORecovery.yaml b/OpenAPI/TS28318__DSORecovery.yaml index be30d1952..17175544f 100644 --- a/OpenAPI/TS28318__DSORecovery.yaml +++ b/OpenAPI/TS28318__DSORecovery.yaml @@ -46,6 +46,8 @@ components: $ref: '#/components/schemas/SubNetwork-Multiple' OutageAndRecoveryInfo: $ref: '#/components/schemas/OutageAndRecoveryInfo-Multiple' + DsoThresholdMonitor: + $ref: '#/components/schemas/DsoThresholdMonitor-Multiple' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/SubNetwork-ncO' OutageAndRecoveryInfo-Single: @@ -68,7 +70,14 @@ components: mnoMaxServiceDuration: type: integer affectedArea: - $ref: '#/components/schemas/EnergyServiceLocation' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/AreaOfInterest' + DsoThresholdMonitor-Single: + allOf: + - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ThresholdMonitor' + - type: object + properties: + targetThresholdLocation: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTime' @@ -82,6 +91,10 @@ components: type: array items: $ref: '#/components/schemas/OutageAndRecoveryInfo-Single' + DsoThresholdMonitor-Multiple: + type: array + items: + $ref: '#/components/schemas/DsoThresholdMonitor-Single' #--------------------------------- Definition ------------------------------------ @@ -90,3 +103,4 @@ components: - $ref: '#/components/schemas/MnS' - $ref: '#/components/schemas/SubNetwork-Single' - $ref: '#/components/schemas/OutageAndRecoveryInfo-Single' + - $ref: '#/components/schemas/DsoThresholdMonitor-Single' -- GitLab From acccf6cafbca4c9ec8e6b7649b51b9c7d9f73dd8 Mon Sep 17 00:00:00 2001 From: gautamd Date: Thu, 1 Feb 2024 19:23:36 +0000 Subject: [PATCH 087/115] Update TS28318__DSORecovery.yaml --- ...DSORecovery.yaml => TS28318__OutageAndRecoveryInfo.yaml} | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) rename OpenAPI/{TS28318__DSORecovery.yaml => TS28318__OutageAndRecoveryInfo.yaml} (93%) diff --git a/OpenAPI/TS28318__DSORecovery.yaml b/OpenAPI/TS28318__OutageAndRecoveryInfo.yaml similarity index 93% rename from OpenAPI/TS28318__DSORecovery.yaml rename to OpenAPI/TS28318__OutageAndRecoveryInfo.yaml index 17175544f..d392d6f2a 100644 --- a/OpenAPI/TS28318__DSORecovery.yaml +++ b/OpenAPI/TS28318__OutageAndRecoveryInfo.yaml @@ -3,11 +3,11 @@ info: title: 3GPP NRM version: 18.5.0 description: >- - OAS 3.0.1 specification of the DSORecovery NRM - © 2023, 3GPP Organizational DSORecovery Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). + OAS 3.0.1 specification of the OutageAndRecoveryInfo NRM + © 2023, 3GPP Organizational OutageAndRecoveryInfo Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved. externalDocs: - description: 3GPP TS 28.318; DSORecovery NRM + description: 3GPP TS 28.318; OutageAndRecoveryInfo NRM url: http://www.3gpp.org/ftp/Specs/archive/28_series/28.318/ paths: {} components: -- GitLab From 47d14c4601e8907c46f7311dd3ab29266e978c2a Mon Sep 17 00:00:00 2001 From: gautamd Date: Thu, 1 Feb 2024 19:27:06 +0000 Subject: [PATCH 088/115] Update TS28318__OutageAndRecoveryInfo.yaml --- ...ageAndRecoveryInfo.yaml => TS28318_OutageAndRecoveryInfo.yaml} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename OpenAPI/{TS28318__OutageAndRecoveryInfo.yaml => TS28318_OutageAndRecoveryInfo.yaml} (100%) diff --git a/OpenAPI/TS28318__OutageAndRecoveryInfo.yaml b/OpenAPI/TS28318_OutageAndRecoveryInfo.yaml similarity index 100% rename from OpenAPI/TS28318__OutageAndRecoveryInfo.yaml rename to OpenAPI/TS28318_OutageAndRecoveryInfo.yaml -- GitLab From 4e59de88e3b4eb55e0bd3155de486057758e3137 Mon Sep 17 00:00:00 2001 From: gautamd Date: Fri, 2 Feb 2024 07:30:10 +0000 Subject: [PATCH 089/115] Update TS28318_OutageAndRecoveryInfo.yaml --- OpenAPI/TS28318_OutageAndRecoveryInfo.yaml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/OpenAPI/TS28318_OutageAndRecoveryInfo.yaml b/OpenAPI/TS28318_OutageAndRecoveryInfo.yaml index d392d6f2a..c653a66db 100644 --- a/OpenAPI/TS28318_OutageAndRecoveryInfo.yaml +++ b/OpenAPI/TS28318_OutageAndRecoveryInfo.yaml @@ -65,12 +65,16 @@ components: type: integer mnoInterventionTime: $ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTime' - dsoRapidInterventionDuration: + mnoInterventionDuration: type: integer mnoMaxServiceDuration: type: integer affectedArea: $ref: 'TS28623_ComDefs.yaml#/components/schemas/AreaOfInterest' + isAffectedAreaPriority: + type: boolean + actualOutageEndTime: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTime' DsoThresholdMonitor-Single: allOf: - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ThresholdMonitor' -- GitLab From 33c1f3015c03affedafe875a0a278bd96483f169 Mon Sep 17 00:00:00 2001 From: gautamd Date: Fri, 2 Feb 2024 07:38:40 +0000 Subject: [PATCH 090/115] Update TS28318_OutageAndRecoveryInfo.yaml --- OpenAPI/TS28318_OutageAndRecoveryInfo.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OpenAPI/TS28318_OutageAndRecoveryInfo.yaml b/OpenAPI/TS28318_OutageAndRecoveryInfo.yaml index c653a66db..bdaafca13 100644 --- a/OpenAPI/TS28318_OutageAndRecoveryInfo.yaml +++ b/OpenAPI/TS28318_OutageAndRecoveryInfo.yaml @@ -77,7 +77,7 @@ components: $ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTime' DsoThresholdMonitor-Single: allOf: - - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ThresholdMonitor' + - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ThresholdMonitor-Single' - type: object properties: targetThresholdLocation: -- GitLab From 848164edb838cc3d305dda27f28b6238b3c5aec8 Mon Sep 17 00:00:00 2001 From: gautamd Date: Wed, 7 Feb 2024 13:06:16 +0000 Subject: [PATCH 091/115] Update TS28318_OutageAndRecoveryInfo.yaml --- OpenAPI/TS28318_OutageAndRecoveryInfo.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OpenAPI/TS28318_OutageAndRecoveryInfo.yaml b/OpenAPI/TS28318_OutageAndRecoveryInfo.yaml index bdaafca13..252977ac9 100644 --- a/OpenAPI/TS28318_OutageAndRecoveryInfo.yaml +++ b/OpenAPI/TS28318_OutageAndRecoveryInfo.yaml @@ -81,7 +81,7 @@ components: - type: object properties: targetThresholdLocation: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTime' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/AreaOfInterest' -- GitLab From f674863d3423713879ad4439b89cb2887bd36140 Mon Sep 17 00:00:00 2001 From: gautamd Date: Wed, 7 Feb 2024 13:10:32 +0000 Subject: [PATCH 092/115] Update TS28318_OutageAndRecoveryInfo.yaml --- OpenAPI/TS28318_OutageAndRecoveryInfo.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OpenAPI/TS28318_OutageAndRecoveryInfo.yaml b/OpenAPI/TS28318_OutageAndRecoveryInfo.yaml index 252977ac9..3c5e2640d 100644 --- a/OpenAPI/TS28318_OutageAndRecoveryInfo.yaml +++ b/OpenAPI/TS28318_OutageAndRecoveryInfo.yaml @@ -70,7 +70,7 @@ components: mnoMaxServiceDuration: type: integer affectedArea: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/AreaOfInterest' + $ref: '#/components/schemas/EnergyServiceLocation' isAffectedAreaPriority: type: boolean actualOutageEndTime: -- GitLab From d2b51732db0886a505faabbc231ef920eba0db82 Mon Sep 17 00:00:00 2001 From: sunse Date: Wed, 7 Feb 2024 15:10:28 +0000 Subject: [PATCH 093/115] Change file name for NSO yaml file --- .../{TS28318_OutageAndRecoveryInfo.yaml => TS28.318_DsoNrm.yaml} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename OpenAPI/{TS28318_OutageAndRecoveryInfo.yaml => TS28.318_DsoNrm.yaml} (100%) diff --git a/OpenAPI/TS28318_OutageAndRecoveryInfo.yaml b/OpenAPI/TS28.318_DsoNrm.yaml similarity index 100% rename from OpenAPI/TS28318_OutageAndRecoveryInfo.yaml rename to OpenAPI/TS28.318_DsoNrm.yaml -- GitLab From 0edaedee01012837cf91f4e2155cff68817f6e13 Mon Sep 17 00:00:00 2001 From: ruiyue Date: Fri, 23 Feb 2024 07:00:07 +0000 Subject: [PATCH 094/115] Update 2 files - /OpenAPI/TS28.318_DsoNrm.yaml - /OpenAPI/TS28318_DsoNrm.yaml --- OpenAPI/{TS28.318_DsoNrm.yaml => TS28318_DsoNrm.yaml} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename OpenAPI/{TS28.318_DsoNrm.yaml => TS28318_DsoNrm.yaml} (100%) diff --git a/OpenAPI/TS28.318_DsoNrm.yaml b/OpenAPI/TS28318_DsoNrm.yaml similarity index 100% rename from OpenAPI/TS28.318_DsoNrm.yaml rename to OpenAPI/TS28318_DsoNrm.yaml -- GitLab From 02cbf7b5d7416c3770b765094de61935490ab1df Mon Sep 17 00:00:00 2001 From: ruiyue Date: Fri, 23 Feb 2024 08:06:56 +0000 Subject: [PATCH 095/115] Update file TS28541_SliceNrm.yaml --- OpenAPI/TS28541_SliceNrm.yaml | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/OpenAPI/TS28541_SliceNrm.yaml b/OpenAPI/TS28541_SliceNrm.yaml index 940a68599..a9510e3d4 100755 --- a/OpenAPI/TS28541_SliceNrm.yaml +++ b/OpenAPI/TS28541_SliceNrm.yaml @@ -414,7 +414,9 @@ components: $ref: '#/components/schemas/Float' uLPktDelayVariation: $ref: '#/components/schemas/Float' - + sliceSubnetAvailability: + $ref: 'TS28623_GenericNrm.yaml#/components/schemas/SchedulingTime' + RANSliceSubnetProfile: type: object properties: @@ -568,6 +570,8 @@ components: $ref: '#/components/schemas/Float' uLPktDelayVariation: $ref: '#/components/schemas/Float' + sliceSubnetAvailability: + $ref: 'TS28623_GenericNrm.yaml#/components/schemas/SchedulingTime' ServiceProfile: type: object @@ -662,6 +666,8 @@ components: $ref: '#/components/schemas/Float' uLPktDelayVariation: $ref: '#/components/schemas/Float' + sliceAvailability: + $ref: 'TS28623_GenericNrm.yaml#/components/schemas/SchedulingTime' SliceProfile: type: object -- GitLab From 05f60ef302ce436f04d54a0a165ca8faeebcccfd Mon Sep 17 00:00:00 2001 From: ruiyue Date: Mon, 26 Feb 2024 00:49:45 +0000 Subject: [PATCH 096/115] Replace TS28541_NrNrm.yaml --- OpenAPI/TS28541_NrNrm.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/OpenAPI/TS28541_NrNrm.yaml b/OpenAPI/TS28541_NrNrm.yaml index fac93a1e5..b140c93b9 100755 --- a/OpenAPI/TS28541_NrNrm.yaml +++ b/OpenAPI/TS28541_NrNrm.yaml @@ -59,6 +59,8 @@ components: $ref: 'TS28623_ComDefs.yaml#/components/schemas/PlmnId' snssai: $ref: '#/components/schemas/Snssai' + sliceExpiryTime: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTime' PlmnInfoList: type: array items: -- GitLab From e2febc21e80469ca2409b2c63737a02586c5a786 Mon Sep 17 00:00:00 2001 From: ruiyue Date: Mon, 26 Feb 2024 01:01:43 +0000 Subject: [PATCH 097/115] Replace TS28541_5GcNrm.yaml --- OpenAPI/TS28541_5GcNrm.yaml | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/OpenAPI/TS28541_5GcNrm.yaml b/OpenAPI/TS28541_5GcNrm.yaml index ade01d2d2..28931cd47 100755 --- a/OpenAPI/TS28541_5GcNrm.yaml +++ b/OpenAPI/TS28541_5GcNrm.yaml @@ -2761,6 +2761,14 @@ components: minItems: 1 required: - msisdnRanges + SliceExpiryInfo : + description: Slice validity + type: object + properties: + pLMNInfo: + $ref: 'TS28541_NrNrm.yaml#/components/schemas/PlmnInfo' + expiryTime: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTime' PcscfInfo: description: Information of a P-CSCF NF Instance type: object @@ -2956,7 +2964,9 @@ components: nTNPLMNInfoList: $ref: '#/components/schemas/NTNPLMNRestrictionsInfo' amfInfo: - $ref: '#/components/schemas/AmfInfo' + $ref: '#/components/schemas/AmfInfo' + sliceExpiryInfo: + $ref: '#/components/schemas/SliceExpiryInfo' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' - type: object properties: -- GitLab From e762dd12e86fca0afd0486a6c2686d6f045fe97f Mon Sep 17 00:00:00 2001 From: qiwen Date: Fri, 19 Jan 2024 02:19:57 +0000 Subject: [PATCH 098/115] Update file TS28541_5GcNrm.yaml --- OpenAPI/TS28541_5GcNrm.yaml | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) diff --git a/OpenAPI/TS28541_5GcNrm.yaml b/OpenAPI/TS28541_5GcNrm.yaml index 28931cd47..8b420039e 100755 --- a/OpenAPI/TS28541_5GcNrm.yaml +++ b/OpenAPI/TS28541_5GcNrm.yaml @@ -608,8 +608,24 @@ components: dnaiList: type: array items: - type: string - + $ref: 'TS29571_CommonData.yaml#/components/schemas/Dnai' + minItems: 1 + dnaiSatelliteMappingList: + type: array + $ref: '#/components/schemas/dnaiSatelliteMapping' + + dnaiSatelliteMapping: + type: object + properties: + dnaiList: + type: array + items: + $ref: 'TS29571_CommonData.yaml#/components/schemas/Dnai' + minItems: 1 + geoSatelliteId: + type: string + pattern: '^[0-9]{5}$' + SnssaiSmfInfoItem: type: object properties: -- GitLab From 30f58f69bd4d0b0da806eecdef0b2d4ff81e5f07 Mon Sep 17 00:00:00 2001 From: qiwen Date: Fri, 2 Feb 2024 03:55:41 +0000 Subject: [PATCH 099/115] Update file TS28541_5GcNrm.yaml --- OpenAPI/TS28541_5GcNrm.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/OpenAPI/TS28541_5GcNrm.yaml b/OpenAPI/TS28541_5GcNrm.yaml index 8b420039e..5e9e6ee2f 100755 --- a/OpenAPI/TS28541_5GcNrm.yaml +++ b/OpenAPI/TS28541_5GcNrm.yaml @@ -610,9 +610,6 @@ components: items: $ref: 'TS29571_CommonData.yaml#/components/schemas/Dnai' minItems: 1 - dnaiSatelliteMappingList: - type: array - $ref: '#/components/schemas/dnaiSatelliteMapping' dnaiSatelliteMapping: type: object @@ -3092,6 +3089,9 @@ components: $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' dynamic5QISetRef: $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' + dnaiSatelliteMappingList: + type: array + $ref: '#/components/schemas/dnaiSatelliteMapping' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' - type: object properties: -- GitLab From c0a7ddeba7e62a33ea5e0d550c6a3e2f7fb07a85 Mon Sep 17 00:00:00 2001 From: qiwen Date: Fri, 2 Feb 2024 08:10:24 +0000 Subject: [PATCH 100/115] Update file TS28541_5GcNrm.yaml --- OpenAPI/TS28541_5GcNrm.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/OpenAPI/TS28541_5GcNrm.yaml b/OpenAPI/TS28541_5GcNrm.yaml index 5e9e6ee2f..e42f9dd12 100755 --- a/OpenAPI/TS28541_5GcNrm.yaml +++ b/OpenAPI/TS28541_5GcNrm.yaml @@ -3091,7 +3091,8 @@ components: $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' dnaiSatelliteMappingList: type: array - $ref: '#/components/schemas/dnaiSatelliteMapping' + items: + $ref: '#/components/schemas/dnaiSatelliteMapping' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' - type: object properties: -- GitLab From a7ed2debff8b7a5f106db5f3383e112935156c75 Mon Sep 17 00:00:00 2001 From: ruiyue Date: Mon, 26 Feb 2024 02:25:57 +0000 Subject: [PATCH 101/115] Replace TS28541_5GcNrm.yaml --- OpenAPI/TS28541_5GcNrm.yaml | 58 ++++++++++++++++++++++++++++++++++++- 1 file changed, 57 insertions(+), 1 deletion(-) diff --git a/OpenAPI/TS28541_5GcNrm.yaml b/OpenAPI/TS28541_5GcNrm.yaml index e42f9dd12..1f8748c71 100755 --- a/OpenAPI/TS28541_5GcNrm.yaml +++ b/OpenAPI/TS28541_5GcNrm.yaml @@ -2225,6 +2225,60 @@ components: additionalProperties: $ref: '#/components/schemas/NssaafInfo' minProperties: 1 + SatelliteBackhaulInfo: + description: defines the list of satellite backhaul information + type: object + properties: + globalRanNodeID: + $ref: '#/components/schemas/GlobalRanNodeID' + SatelliteBackhaulCategory: + anyOf: + - type: string + enum: + - GEO + - MEO + - LEO + - OTHER_SAT + - DYNAMIC_GEO + - DYNAMIC_MEO + - DYNAMIC_LEO + - DYNAMIC_OTHER_SAT + - NON_SATELLITE + - type: string + geoSatelliteId: + type: string + pattern: '^[0-9]{5}$' + GlobalRanNodeID: + description: globally identification of an NG-RAN node + type: object + oneOf: + - required: [ pLmnId, n3IwfId] + - required: [ plmnId, gNbId] + - required: [ pLmnId, ngeNbId] + - required: [ plmnId, wagfId] + - required: [ pLmnId, tngfId] + - required: [ plmnId, twifId] + properties: + pLmnId: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/PlmnId' + n3IwfId: + type: string + pattern: '^[A-Fa-f0-9]+$' + gNbId: + type: integer + minimum: 0 + maximum: 4294967295 + ngeNbId: + type: string + pattern: '^(MacroNGeNB-[A-Fa-f0-9]{5}|LMacroNGeNB-[A-Fa-f0-9]{6}|SMacroNGeNB-[A-Fa-f0-9]{5})$' + wagfId: + type: string + pattern: '^[A-Fa-f0-9]+$' + tngfId: + type: string + pattern: '^[A-Fa-f0-9]+$' + twifId: + type: string NTNPLMNRestrictionsInfo: description: restrictions per PLMN that relates to non-terrestrial network access type: object @@ -2979,7 +3033,9 @@ components: amfInfo: $ref: '#/components/schemas/AmfInfo' sliceExpiryInfo: - $ref: '#/components/schemas/SliceExpiryInfo' + $ref: '#/components/schemas/SliceExpiryInfo' + SatelliteBackhaulInfoList: + $ref: '#/components/schemas/SatelliteBackhaulInfo' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' - type: object properties: -- GitLab From 3bf691a31d742153a66b3c9eac6427a0acd69063 Mon Sep 17 00:00:00 2001 From: lizhaz Date: Thu, 18 Jan 2024 03:36:18 +0000 Subject: [PATCH 102/115] Update TS28538_EdgeNrm.yaml --- OpenAPI/TS28538_EdgeNrm.yaml | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/OpenAPI/TS28538_EdgeNrm.yaml b/OpenAPI/TS28538_EdgeNrm.yaml index 196ae8d05..8931b16c7 100644 --- a/OpenAPI/TS28538_EdgeNrm.yaml +++ b/OpenAPI/TS28538_EdgeNrm.yaml @@ -146,13 +146,6 @@ components: - FUTURE futuristicTriggerTime: $ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTime' - relocationPolicy: - type: string - description: any of enumrated value - enum: - - YES - - NO - - YESwNOTIFY AvailableEDNList: type: object properties: @@ -322,7 +315,12 @@ components: eASFeature: $ref: '#/components/schemas/EASFeature' relocationPolicy: - $ref: '#/components/schemas/EASFeature' + type: string + description: any of enumrated value + enum: + - YES + - NO + - YESwNOTIFY federationID: type: string reservationJobRef: -- GitLab From c08f29eac88e80b6db5a1f8b447a52ca4b240769 Mon Sep 17 00:00:00 2001 From: gautamd Date: Mon, 26 Feb 2024 03:48:53 +0000 Subject: [PATCH 103/115] Update TS28538_EdgeNrm.yaml --- OpenAPI/TS28538_EdgeNrm.yaml | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/OpenAPI/TS28538_EdgeNrm.yaml b/OpenAPI/TS28538_EdgeNrm.yaml index cb10b910b..3b066b446 100644 --- a/OpenAPI/TS28538_EdgeNrm.yaml +++ b/OpenAPI/TS28538_EdgeNrm.yaml @@ -104,10 +104,6 @@ components: - GOLD EASFeature: type: string - description: any of enumrated value - enum: - - SINGLE - - MULTIPLE EASStatus: type: string description: any of enumrated value @@ -334,6 +330,8 @@ components: type: string reservationID: type: string + eASDeploymentMonitor: + $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ProcessMonitor' ResourceReservationJob: allOf: -- GitLab From f5b207d668d2650ed67e589aa9150556599fd7ce Mon Sep 17 00:00:00 2001 From: ruiyue Date: Mon, 26 Feb 2024 06:18:22 +0000 Subject: [PATCH 104/115] Update file TS28538_EdgeNrm.yaml --- OpenAPI/TS28538_EdgeNrm.yaml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/OpenAPI/TS28538_EdgeNrm.yaml b/OpenAPI/TS28538_EdgeNrm.yaml index e9054dcd0..e25b8ff2a 100644 --- a/OpenAPI/TS28538_EdgeNrm.yaml +++ b/OpenAPI/TS28538_EdgeNrm.yaml @@ -104,10 +104,6 @@ components: - GOLD EASFeature: type: string - description: any of enumerated value - enum: - - SINGLE - - MULTIPLE EASStatus: type: string description: any of enumerated value -- GitLab From 161e5eed739adea0cdc23a1c90a37661e5ce706a Mon Sep 17 00:00:00 2001 From: lengyelb Date: Thu, 18 Jan 2024 18:29:38 +0000 Subject: [PATCH 105/115] Update TS28532_ProvMnS.yaml Based on S5-240052 Rel-18 CR 28.532 notifyEvent stage 3 --- OpenAPI/TS28532_ProvMnS.yaml | 35 +++++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) diff --git a/OpenAPI/TS28532_ProvMnS.yaml b/OpenAPI/TS28532_ProvMnS.yaml index 025ededed..22f62acb2 100755 --- a/OpenAPI/TS28532_ProvMnS.yaml +++ b/OpenAPI/TS28532_ProvMnS.yaml @@ -147,6 +147,27 @@ paths: application/json: schema: $ref: 'TS28623_ComDefs.yaml#/components/schemas/ErrorResponse' + notifyEvent: + '{request.body#/notificationRecipientAddress}': + post: + requestBody: + required: true + content: + application/json: + schema: + $ref: '#/components/schemas/NotifyEvent' + responses: + '204': + description: >- + Success case ("204 No Content"). + The notification is successfully delivered. The response + has no message body. + default: + description: Error case. + content: + application/json: + schema: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/ErrorResponse' notifyMOIChanges: '{request.body#/notificationRecipientAddress}': post: @@ -342,6 +363,7 @@ components: - notifyMOICreation - notifyMOIDeletion - notifyMOIAttributeValueChanges + - notifyEvent - notifyMOIChanges SourceIndicator: type: string @@ -499,6 +521,19 @@ components: $ref: 'TS28623_ComDefs.yaml#/components/schemas/AttributeValueChangeSet' required: - attributeListValueChanges + NotifyEvent: + allOf: + - $ref: 'TS28623_ComDefs.yaml#/components/schemas/NotificationHeader' + - type: object + required: + - specificProblem + properties: + specificProblem: + $ref: 'TS28532_FaultMnS.yaml#/components/schemas/SpecificProblem' + additionalText: + type: string + additionalInformation: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/AttributeNameValuePairSet' NotifyMoiChanges: allOf: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/NotificationHeader' -- GitLab From 035c33338b486b440b7dc8c8e27645af4226bda1 Mon Sep 17 00:00:00 2001 From: ruiyue Date: Tue, 27 Feb 2024 03:36:00 +0000 Subject: [PATCH 106/115] 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 107/115] 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 108/115] 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 From bf311a4d248d72605a3f318234e5b0137e9725c8 Mon Sep 17 00:00:00 2001 From: ruiyue Date: Tue, 27 Feb 2024 06:25:19 +0000 Subject: [PATCH 109/115] Update file README.md --- OpenAPI/README.md | 43 ++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 40 insertions(+), 3 deletions(-) diff --git a/OpenAPI/README.md b/OpenAPI/README.md index e6bb374b1..aff22f901 100644 --- a/OpenAPI/README.md +++ b/OpenAPI/README.md @@ -15,10 +15,38 @@ The links below will open the Swagger Editor/UI and auto-load the OpenAPI YAML f ([Editor](https://forge.3gpp.org/swagger/tools/loader.html?yaml=OpenAPI/TS28623_ComDefs.yaml)) ([UI](https://forge.3gpp.org/swagger/tools/loader.html?action=ui&yaml=OpenAPI/TS28623_ComDefs.yaml)) +* Management Data Collection NRM (TS 28.623) +([Editor](https://forge.3gpp.org/swagger/tools/loader.html?yaml=OpenAPI/TS28623_ManagementDataCollectionNrm.yaml)) +([UI](https://forge.3gpp.org/swagger/tools/loader.html?action=ui&yaml=OpenAPI/TS28623_ManagementDataCollectionNrm.yaml)) + +* MnS Registry NRM (TS 28.623) +([Editor](https://forge.3gpp.org/swagger/tools/loader.html?yaml=OpenAPI/TS28623_MnSRegistryNrm.yaml)) +([UI](https://forge.3gpp.org/swagger/tools/loader.html?action=ui&yaml=OpenAPI/TS28623_MnSRegistryNrm.yaml)) + +* PM control NRM (TS 28.623) +([Editor](https://forge.3gpp.org/swagger/tools/loader.html?yaml=OpenAPI/TS28623_PmControlNrm.yaml)) +([UI](https://forge.3gpp.org/swagger/tools/loader.html?action=ui&yaml=OpenAPI/TS28623_PmControlNrm.yaml)) + +* QoE Measurement Collection NRM (TS 28.623) +([Editor](https://forge.3gpp.org/swagger/tools/loader.html?yaml=OpenAPI/TS28623_QoEMeasurementCollectionNrm.yaml)) +([UI](https://forge.3gpp.org/swagger/tools/loader.html?action=ui&yaml=OpenAPI/TS28623_QoEMeasurementCollectionNrm.yaml)) + +* Subscription Control NRM NRM (TS 28.623) +([Editor](https://forge.3gpp.org/swagger/tools/loader.html?yaml=OpenAPI/TS28623_SubscriptionControlNrm.yaml)) +([UI](https://forge.3gpp.org/swagger/tools/loader.html?action=ui&yaml=OpenAPI/TS28623_SubscriptionControlNrm.yaml)) + +* Threshold Monitor NRM(TS 28.623) +([Editor](https://forge.3gpp.org/swagger/tools/loader.html?yaml=OpenAPI/TS28623_ThresholdMonitorNrm.yaml)) +([UI](https://forge.3gpp.org/swagger/tools/loader.html?action=ui&yaml=OpenAPI/TS28623_ThresholdMonitorNrm.yaml)) + * Trace Control NRM (TS 28.623) ([Editor](https://forge.3gpp.org/swagger/tools/loader.html?yaml=OpenAPI/TS28623_TraceControlNrm.yaml)) ([UI](https://forge.3gpp.org/swagger/tools/loader.html?action=ui&yaml=OpenAPI/TS28623_TraceControlNrm.yaml)) +* Fault Management NRM(TS 28.111) +([Editor](https://forge.3gpp.org/swagger/tools/loader.html?yaml=OpenAPI/TS28111_FaultNrm.yaml)) +([UI](https://forge.3gpp.org/swagger/tools/loader.html?action=ui&yaml=OpenAPI/TS28111_FaultNrm.yaml)) + * NR NRM (TS 28.541) ([Editor](https://forge.3gpp.org/swagger/tools/loader.html?yaml=OpenAPI/TS28541_NrNrm.yaml)) ([UI](https://forge.3gpp.org/swagger/tools/loader.html?action=ui&yaml=OpenAPI/TS28541_NrNrm.yaml)) @@ -63,15 +91,24 @@ The links below will open the Swagger Editor/UI and auto-load the OpenAPI YAML f ([Editor](https://forge.3gpp.org/swagger/tools/loader.html?yaml=OpenAPI/TS28317_RanScNrm.yaml)) ([UI](https://forge.3gpp.org/swagger/tools/loader.html?action=ui&yaml=OpenAPI/TS28317_RanScNrm.yaml)) +* OutageAndRecoveryInfo NRM (TS 28.318) +([Editor](https://forge.3gpp.org/swagger/tools/loader.html?yaml=OpenAPI/TS28319_MsacNrm.yaml)) +([UI](https://forge.3gpp.org/swagger/tools/loader.html?action=ui&yaml=OpenAPI/TS28319_MsacNrm.yaml)) + +* MSAC NRM (TS 28.319) +([Editor](https://forge.3gpp.org/swagger/tools/loader.html?yaml=OpenAPI/TS28318_DsoNrm.yaml)) +([UI](https://forge.3gpp.org/swagger/tools/loader.html?action=ui&yaml=OpenAPI/TS28318_DsoNrm.yaml)) + + ## Management Services (MnS) * Provisioning MnS (TS 28.532) ([Editor](https://forge.3gpp.org/swagger/tools/loader.html?yaml=OpenAPI/TS28532_ProvMnS.yaml)) ([UI](https://forge.3gpp.org/swagger/tools/loader.html?action=ui&yaml=OpenAPI/TS28532_ProvMnS.yaml)) -* Fault Supervision MnS (TS 28.532) -([Editor](https://forge.3gpp.org/swagger/tools/loader.html?yaml=OpenAPI/TS28532_FaultMnS.yaml)) -([UI](https://forge.3gpp.org/swagger/tools/loader.html?action=ui&yaml=OpenAPI/TS28532_FaultMnS.yaml)) +* Fault Management Notifications(TS 28.532) +([Editor](https://forge.3gpp.org/swagger/tools/loader.html?yaml=OpenAPI/TS28111_FaultNotifications.yaml)) +([UI](https://forge.3gpp.org/swagger/tools/loader.html?action=ui&yaml=OpenAPI/TS28111_FaultNotifications.yaml)) * Performance Measurement Job Control MnS (28.550) ([Editor](https://forge.3gpp.org/swagger/tools/loader.html?yaml=OpenAPI/TS28550_PerfMeasJobCtrlMnS.yaml)) -- GitLab From fb4671022a0e720b21eecf160ec150da931e8c77 Mon Sep 17 00:00:00 2001 From: ruiyue Date: Tue, 27 Feb 2024 06:26:31 +0000 Subject: [PATCH 110/115] Update file README.md --- OpenAPI/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OpenAPI/README.md b/OpenAPI/README.md index aff22f901..99bdcceb6 100644 --- a/OpenAPI/README.md +++ b/OpenAPI/README.md @@ -106,7 +106,7 @@ The links below will open the Swagger Editor/UI and auto-load the OpenAPI YAML f ([Editor](https://forge.3gpp.org/swagger/tools/loader.html?yaml=OpenAPI/TS28532_ProvMnS.yaml)) ([UI](https://forge.3gpp.org/swagger/tools/loader.html?action=ui&yaml=OpenAPI/TS28532_ProvMnS.yaml)) -* Fault Management Notifications(TS 28.532) +* Fault Management Notifications(TS 28.111) ([Editor](https://forge.3gpp.org/swagger/tools/loader.html?yaml=OpenAPI/TS28111_FaultNotifications.yaml)) ([UI](https://forge.3gpp.org/swagger/tools/loader.html?action=ui&yaml=OpenAPI/TS28111_FaultNotifications.yaml)) -- GitLab From 34dd9f9958af61de08b1e5628722af4af872dce0 Mon Sep 17 00:00:00 2001 From: ruiyue Date: Tue, 27 Feb 2024 06:29:20 +0000 Subject: [PATCH 111/115] Update file TS28623_QoEMeasurementCollectionNrm.yaml --- OpenAPI/TS28623_QoEMeasurementCollectionNrm.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OpenAPI/TS28623_QoEMeasurementCollectionNrm.yaml b/OpenAPI/TS28623_QoEMeasurementCollectionNrm.yaml index ddcbe983d..27c4f7d1e 100644 --- a/OpenAPI/TS28623_QoEMeasurementCollectionNrm.yaml +++ b/OpenAPI/TS28623_QoEMeasurementCollectionNrm.yaml @@ -1,6 +1,6 @@ openapi: 3.0.1 info: - title: QoE Measurement Collection NRMt + title: QoE Measurement Collection NRM version: 18.6.0 description: >- OAS 3.0.1 definition of the QoE Measurement Collection NRM -- GitLab From c13fe5cb848d7350461183ba1227d80e9b4410d8 Mon Sep 17 00:00:00 2001 From: ruiyue Date: Tue, 27 Feb 2024 13:01:36 +0000 Subject: [PATCH 112/115] update API versions --- OpenAPI/TS28104_MdaNrm.yaml | 4 ++-- OpenAPI/TS28104_MdaReport.yaml | 4 ++-- OpenAPI/TS28312_IntentExpectations.yaml | 4 ++-- OpenAPI/TS28312_IntentNrm.yaml | 4 ++-- OpenAPI/TS28317_RanScNrm.yaml | 4 ++-- OpenAPI/TS28318_DsoNrm.yaml | 2 +- OpenAPI/TS28532_FileDataReportingMnS.yaml | 4 ++-- OpenAPI/TS28532_ProvMnS.yaml | 4 ++-- OpenAPI/TS28536_CoslaNrm.yaml | 4 ++-- OpenAPI/TS28538_EdgeNrm.yaml | 4 ++-- OpenAPI/TS28541_SliceNrm.yaml | 4 ++-- OpenAPI/TS28623_ComDefs.yaml | 4 ++-- OpenAPI/TS28623_GenericNrm.yaml | 4 ++-- 13 files changed, 25 insertions(+), 25 deletions(-) diff --git a/OpenAPI/TS28104_MdaNrm.yaml b/OpenAPI/TS28104_MdaNrm.yaml index a90312ddb..9759ac7d1 100644 --- a/OpenAPI/TS28104_MdaNrm.yaml +++ b/OpenAPI/TS28104_MdaNrm.yaml @@ -1,10 +1,10 @@ openapi: 3.0.1 info: title: MDA NRM - version: 18.2.0 + version: 18.3.0 description: >- OAS 3.0.1 specification of the MDA NRM - © 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). + © 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved. externalDocs: description: 3GPP TS 28.104; MDA diff --git a/OpenAPI/TS28104_MdaReport.yaml b/OpenAPI/TS28104_MdaReport.yaml index 344251e02..b57be4d1a 100644 --- a/OpenAPI/TS28104_MdaReport.yaml +++ b/OpenAPI/TS28104_MdaReport.yaml @@ -1,10 +1,10 @@ openapi: 3.0.1 info: title: MDA Report - version: 18.2.0 + version: 18.3.0 description: >- OAS 3.0.1 specification of the MDA Report - © 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). + © 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved. externalDocs: description: 3GPP TS 28.104; MDA Report diff --git a/OpenAPI/TS28312_IntentExpectations.yaml b/OpenAPI/TS28312_IntentExpectations.yaml index 7817c9c01..b48f7afaf 100644 --- a/OpenAPI/TS28312_IntentExpectations.yaml +++ b/OpenAPI/TS28312_IntentExpectations.yaml @@ -1,10 +1,10 @@ openapi: 3.0.1 info: title: Scenario specific Intent Expectations - version: 18.2.0 + version: 18.3.0 description: >- OAS 3.0.1 definition of scenario specific Intent Expectations - © 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). + © 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved. externalDocs: description: 3GPP TS 28.312; Intent driven management services for mobile networks diff --git a/OpenAPI/TS28312_IntentNrm.yaml b/OpenAPI/TS28312_IntentNrm.yaml index 08ca9e896..130494e02 100644 --- a/OpenAPI/TS28312_IntentNrm.yaml +++ b/OpenAPI/TS28312_IntentNrm.yaml @@ -1,10 +1,10 @@ openapi: 3.0.1 info: title: Intent NRM - version: 18.2.0 + version: 18.3.0 description: >- OAS 3.0.1 definition of the Intent NRM - © 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). + © 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved. externalDocs: description: 3GPP TS 28.312; Intent driven management services for mobile networks diff --git a/OpenAPI/TS28317_RanScNrm.yaml b/OpenAPI/TS28317_RanScNrm.yaml index 23354960f..3b1973463 100644 --- a/OpenAPI/TS28317_RanScNrm.yaml +++ b/OpenAPI/TS28317_RanScNrm.yaml @@ -1,10 +1,10 @@ openapi: 3.0.1 info: title: RANSC NRM - version: 18.0.0 + version: 18.1.0 description: >- OAS 3.0.1 definition of the RANSC NRM - © 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). + © 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved. externalDocs: description: 3GPP TS 28.317; Self-configuration of Radio Access Network Entities (RAN NEs) diff --git a/OpenAPI/TS28318_DsoNrm.yaml b/OpenAPI/TS28318_DsoNrm.yaml index b714bf307..25c311611 100644 --- a/OpenAPI/TS28318_DsoNrm.yaml +++ b/OpenAPI/TS28318_DsoNrm.yaml @@ -4,7 +4,7 @@ info: version: 18.5.0 description: >- OAS 3.0.1 specification of the OutageAndRecoveryInfo NRM - © 2023, 3GPP Organizational OutageAndRecoveryInfo Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). + © 2024, 3GPP Organizational OutageAndRecoveryInfo Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved. externalDocs: description: 3GPP TS 28.318; OutageAndRecoveryInfo NRM diff --git a/OpenAPI/TS28532_FileDataReportingMnS.yaml b/OpenAPI/TS28532_FileDataReportingMnS.yaml index 1a96b5d81..4138a3c11 100644 --- a/OpenAPI/TS28532_FileDataReportingMnS.yaml +++ b/OpenAPI/TS28532_FileDataReportingMnS.yaml @@ -1,10 +1,10 @@ openapi: 3.0.1 info: title: File Data Reporting MnS - version: 18.1.0 + version: 18.2.0 description: >- OAS 3.0.1 definition of the File Data Reporting MnS - © 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). + © 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved. externalDocs: description: 3GPP TS 28.532; Generic management services diff --git a/OpenAPI/TS28532_ProvMnS.yaml b/OpenAPI/TS28532_ProvMnS.yaml index 7ecf315f3..27e027547 100755 --- a/OpenAPI/TS28532_ProvMnS.yaml +++ b/OpenAPI/TS28532_ProvMnS.yaml @@ -1,10 +1,10 @@ openapi: 3.0.1 info: title: Provisioning MnS - version: 18.1.0 + version: 18.2.0 description: >- OAS 3.0.1 definition of the Provisioning MnS - © 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). + © 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved. externalDocs: description: 3GPP TS 28.532; Generic management services diff --git a/OpenAPI/TS28536_CoslaNrm.yaml b/OpenAPI/TS28536_CoslaNrm.yaml index c94eca4c4..99a1b50c0 100755 --- a/OpenAPI/TS28536_CoslaNrm.yaml +++ b/OpenAPI/TS28536_CoslaNrm.yaml @@ -2,10 +2,10 @@ openapi: 3.0.1 info: title: coslaNrm - version: 17.3.0 + version: 17.4.0 description: >- OAS 3.0.1 specification of the Cosla NRM - © 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). + © 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved. externalDocs: diff --git a/OpenAPI/TS28538_EdgeNrm.yaml b/OpenAPI/TS28538_EdgeNrm.yaml index e25b8ff2a..6745e3fa8 100644 --- a/OpenAPI/TS28538_EdgeNrm.yaml +++ b/OpenAPI/TS28538_EdgeNrm.yaml @@ -1,10 +1,10 @@ openapi: 3.0.1 info: title: 3GPP Edge NRM - version: 18.5.0 + version: 18.6.0 description: >- OAS 3.0.1 specification of the Edge NRM - © 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). + © 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved. externalDocs: description: 3GPP TS 28.538; Edge NRM diff --git a/OpenAPI/TS28541_SliceNrm.yaml b/OpenAPI/TS28541_SliceNrm.yaml index a9510e3d4..d64929f39 100755 --- a/OpenAPI/TS28541_SliceNrm.yaml +++ b/OpenAPI/TS28541_SliceNrm.yaml @@ -1,10 +1,10 @@ openapi: 3.0.1 info: title: Slice NRM - version: 18.6.0 + version: 18.7.0 description: >- OAS 3.0.1 specification of the Slice NRM - @ 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). + @ 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved. externalDocs: description: 3GPP TS 28.541; 5G NRM, Slice NRM diff --git a/OpenAPI/TS28623_ComDefs.yaml b/OpenAPI/TS28623_ComDefs.yaml index ee3e1de12..c4e866243 100755 --- a/OpenAPI/TS28623_ComDefs.yaml +++ b/OpenAPI/TS28623_ComDefs.yaml @@ -1,10 +1,10 @@ openapi: 3.0.1 info: title: Common Type Definitions - version: 18.5.0 + version: 18.6.0 description: >- OAS 3.0.1 specification of common type definitions in the Generic NRM - © 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). + © 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved. externalDocs: description: 3GPP TS 28.623; Generic NRM; Common type definitions diff --git a/OpenAPI/TS28623_GenericNrm.yaml b/OpenAPI/TS28623_GenericNrm.yaml index 227efce45..3d72b9232 100755 --- a/OpenAPI/TS28623_GenericNrm.yaml +++ b/OpenAPI/TS28623_GenericNrm.yaml @@ -1,10 +1,10 @@ openapi: 3.0.1 info: title: Generic NRM - version: 18.5.0 + version: 18.6.0 description: >- OAS 3.0.1 definition of the Generic NRM - © 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). + © 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved. externalDocs: description: 3GPP TS 28.623; Generic NRM -- GitLab From 5c7e469b9fbff8b5aaa86de7ca858b8e7853d009 Mon Sep 17 00:00:00 2001 From: ruiyue Date: Tue, 27 Feb 2024 13:06:10 +0000 Subject: [PATCH 113/115] update API versions --- OpenAPI/TS28105_AiMlNrm.yaml | 4 ++-- OpenAPI/TS28541_5GcNrm.yaml | 4 ++-- OpenAPI/TS28541_NrNrm.yaml | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/OpenAPI/TS28105_AiMlNrm.yaml b/OpenAPI/TS28105_AiMlNrm.yaml index 81c5de572..b96ae1f9c 100644 --- a/OpenAPI/TS28105_AiMlNrm.yaml +++ b/OpenAPI/TS28105_AiMlNrm.yaml @@ -1,10 +1,10 @@ openapi: 3.0.1 info: title: AI/ML NRM - version: 18.2.0 + version: 18.3.0 description: >- OAS 3.0.1 specification of the AI/ML NRM - © 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). + © 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved. externalDocs: description: 3GPP TS 28.105; AI/ML Management diff --git a/OpenAPI/TS28541_5GcNrm.yaml b/OpenAPI/TS28541_5GcNrm.yaml index 1f8748c71..9379ea467 100755 --- a/OpenAPI/TS28541_5GcNrm.yaml +++ b/OpenAPI/TS28541_5GcNrm.yaml @@ -1,10 +1,10 @@ openapi: 3.0.1 info: title: 3GPP 5GC NRM - version: 18.6.0 + version: 18.7.0 description: >- OAS 3.0.1 specification of the 5GC NRM - © 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). + © 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved. externalDocs: description: 3GPP TS 28.541; 5G NRM, 5GC NRM diff --git a/OpenAPI/TS28541_NrNrm.yaml b/OpenAPI/TS28541_NrNrm.yaml index b140c93b9..9cfcb39b7 100755 --- a/OpenAPI/TS28541_NrNrm.yaml +++ b/OpenAPI/TS28541_NrNrm.yaml @@ -1,10 +1,10 @@ openapi: 3.0.1 info: title: NR NRM - version: 18.6.0 + version: 18.7.0 description: >- OAS 3.0.1 specification of the NR NRM - © 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). + © 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved. externalDocs: description: 3GPP TS 28.541; 5G NRM, NR NRM -- GitLab From 23a97cbe2d79954c44a044660b1d13c68ebc3e31 Mon Sep 17 00:00:00 2001 From: ruiyue Date: Tue, 12 Mar 2024 01:15:44 +0000 Subject: [PATCH 114/115] Update version --- 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 5b78b2471..fb231f448 100644 --- a/OpenAPI/TS28623_TraceControlNrm.yaml +++ b/OpenAPI/TS28623_TraceControlNrm.yaml @@ -1,7 +1,7 @@ openapi: 3.0.1 info: title: Trace Control NRM - version: 18.5.0 + version: 18.6.0 description: >- OAS 3.0.1 definition of the Trace Control NRM fragment © 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). -- GitLab From e32a7ec13cb9d0b52dca6feffc1e11858d10bf75 Mon Sep 17 00:00:00 2001 From: ruiyue Date: Tue, 12 Mar 2024 06:30:25 +0000 Subject: [PATCH 115/115] Update README.md --- OpenAPI/README.md | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/OpenAPI/README.md b/OpenAPI/README.md index 99bdcceb6..76505cbef 100644 --- a/OpenAPI/README.md +++ b/OpenAPI/README.md @@ -63,18 +63,6 @@ The links below will open the Swagger Editor/UI and auto-load the OpenAPI YAML f ([Editor](https://forge.3gpp.org/swagger/tools/loader.html?yaml=OpenAPI/TS28536_CoslaNrm.yaml)) ([UI](https://forge.3gpp.org/swagger/tools/loader.html?action=ui&yaml=OpenAPI/TS28536_CoslaNrm.yaml)) -* Intent NRM (TS 28.312) -([Editor](https://forge.3gpp.org/swagger/tools/loader.html?yaml=OpenAPI/TS28312_IntentNrm.yaml)) -([UI](https://forge.3gpp.org/swagger/tools/loader.html?action=ui&yaml=OpenAPI/TS28312_IntentNrm.yaml)) - -* Intent Scenario specific Intent Expectations (TS 28.312) -([Editor](https://forge.3gpp.org/swagger/tools/loader.html?yaml=OpenAPI/TS28312_IntentExpectations.yamll)) -([UI](https://forge.3gpp.org/swagger/tools/loader.html?action=ui&yaml=OpenAPI/TS28312_IntentExpectations.yaml)) - -* Edge NRM (TS 28.538) -([Editor](https://forge.3gpp.org/swagger/tools/loader.html?yaml=OpenAPI/TS28538_EdgeNrm.yaml)) -([UI](https://forge.3gpp.org/swagger/tools/loader.html?action=ui&yaml=OpenAPI/TS28538_EdgeNrm.yaml)) - * MDA NRM (TS 28.104) ([Editor](https://forge.3gpp.org/swagger/tools/loader.html?yaml=OpenAPI/TS28104_MdaNrm.yaml)) ([UI](https://forge.3gpp.org/swagger/tools/loader.html?action=ui&yaml=OpenAPI/TS28104_MdaNrm.yaml)) @@ -87,6 +75,18 @@ The links below will open the Swagger Editor/UI and auto-load the OpenAPI YAML f ([Editor](https://forge.3gpp.org/swagger/tools/loader.html?yaml=OpenAPI/TS28105_AiMlNrm.yaml)) ([UI](https://forge.3gpp.org/swagger/tools/loader.html?action=ui&yaml=OpenAPI/TS28105_AiMlNrm.yaml)) +* Intent NRM (TS 28.312) +([Editor](https://forge.3gpp.org/swagger/tools/loader.html?yaml=OpenAPI/TS28312_IntentNrm.yaml)) +([UI](https://forge.3gpp.org/swagger/tools/loader.html?action=ui&yaml=OpenAPI/TS28312_IntentNrm.yaml)) + +* Intent Scenario specific Intent Expectations (TS 28.312) +([Editor](https://forge.3gpp.org/swagger/tools/loader.html?yaml=OpenAPI/TS28312_IntentExpectations.yamll)) +([UI](https://forge.3gpp.org/swagger/tools/loader.html?action=ui&yaml=OpenAPI/TS28312_IntentExpectations.yaml)) + +* Edge NRM (TS 28.538) +([Editor](https://forge.3gpp.org/swagger/tools/loader.html?yaml=OpenAPI/TS28538_EdgeNrm.yaml)) +([UI](https://forge.3gpp.org/swagger/tools/loader.html?action=ui&yaml=OpenAPI/TS28538_EdgeNrm.yaml)) + * RANSC NRM (TS 28.317) ([Editor](https://forge.3gpp.org/swagger/tools/loader.html?yaml=OpenAPI/TS28317_RanScNrm.yaml)) ([UI](https://forge.3gpp.org/swagger/tools/loader.html?action=ui&yaml=OpenAPI/TS28317_RanScNrm.yaml)) -- GitLab