From 0787b1732a20726ba79f25a210e07c6f89a28c91 Mon Sep 17 00:00:00 2001 From: sunse Date: Sun, 24 Sep 2023 11:55:28 +0000 Subject: [PATCH 1/3] TS28.623_Rel18_CR0268 --- OpenAPI/TS28623_GenericNrm.yaml | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/OpenAPI/TS28623_GenericNrm.yaml b/OpenAPI/TS28623_GenericNrm.yaml index e04340444..4547c1aaf 100755 --- a/OpenAPI/TS28623_GenericNrm.yaml +++ b/OpenAPI/TS28623_GenericNrm.yaml @@ -1784,6 +1784,8 @@ components: $ref: '#/components/schemas/Files-Multiple' MnsRegistry: $ref: '#/components/schemas/MnsRegistry-Single' + SupportedNotifications: + $ref: '#/components/schemas/SupportedNotifications-Single' ManagedElement-ncO: type: object properties: @@ -1803,6 +1805,8 @@ components: $ref: '#/components/schemas/FileDownloadJob-Multiple' Files: $ref: '#/components/schemas/Files-Multiple' + SupportedNotifications: + $ref: '#/components/schemas/SupportedNotifications-Single' #-------- Definition of abstract IOCs -------------------------------------------- @@ -2211,6 +2215,27 @@ components: items: $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' + SupportedNotifications-Single: + allOf: + - $ref: '#/components/schemas/Top' + - type: object + properties: + attributes: + type: object + properties: + notificationTypes: + type: array + items: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/NotificationType' + notificationProtocols: + type: array + items: + type: string + enum: + - HTTP + - HTTP_VES_ENCAPS + minItems: 1 + #-------- Definition of YAML arrays for name-contained IOCs ---------------------- VsDataContainer-Multiple: @@ -2299,3 +2324,4 @@ components: - $ref: '#/components/schemas/MnsRegistry-Single' - $ref: '#/components/schemas/MnsInfo-Single' + - $ref: '#/components/schemas/SupportedNotifications-Single' -- GitLab From 2a438942792ab61ff8089868ddbe6f13e611e6d8 Mon Sep 17 00:00:00 2001 From: sunse Date: Sun, 24 Sep 2023 11:55:28 +0000 Subject: [PATCH 2/3] TS28.623_Rel18_CR0268 --- OpenAPI/TS28623_GenericNrm.yaml | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/OpenAPI/TS28623_GenericNrm.yaml b/OpenAPI/TS28623_GenericNrm.yaml index 0c0ad5de6..ee209bc40 100755 --- a/OpenAPI/TS28623_GenericNrm.yaml +++ b/OpenAPI/TS28623_GenericNrm.yaml @@ -1827,6 +1827,8 @@ components: $ref: '#/components/schemas/Scheduler-Multiple' ConditionMonitor: $ref: '#/components/schemas/ConditionMonitor-Multiple' + SupportedNotifications: + $ref: '#/components/schemas/SupportedNotifications-Single' ManagedElement-ncO: type: object properties: @@ -1850,6 +1852,8 @@ components: $ref: '#/components/schemas/Scheduler-Multiple' ConditionMonitor: $ref: '#/components/schemas/ConditionMonitor-Multiple' + SupportedNotifications: + $ref: '#/components/schemas/SupportedNotifications-Single' #-------- Definition of abstract IOCs -------------------------------------------- @@ -2292,6 +2296,27 @@ components: conditionStatus: type: boolean + SupportedNotifications-Single: + allOf: + - $ref: '#/components/schemas/Top' + - type: object + properties: + attributes: + type: object + properties: + notificationTypes: + type: array + items: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/NotificationType' + notificationProtocols: + type: array + items: + type: string + enum: + - HTTP + - HTTP_VES_ENCAPS + minItems: 1 + #-------- Definition of YAML arrays for name-contained IOCs ---------------------- VsDataContainer-Multiple: @@ -2390,3 +2415,4 @@ components: - $ref: '#/components/schemas/MnsInfo-Single' - $ref: '#/components/schemas/Scheduler-Single' - $ref: '#/components/schemas/ConditionMonitor-Single' + - $ref: '#/components/schemas/SupportedNotifications-Single' -- GitLab From 1c713fcf5e5a605cb8a36b34245aa242a38b4e16 Mon Sep 17 00:00:00 2001 From: sunse Date: Wed, 18 Oct 2023 02:52:47 +0000 Subject: [PATCH 3/3] corrections to issue from auto-merge, Update TS28623_GenericNrm.yaml --- OpenAPI/TS28623_GenericNrm.yaml | 21 --------------------- 1 file changed, 21 deletions(-) diff --git a/OpenAPI/TS28623_GenericNrm.yaml b/OpenAPI/TS28623_GenericNrm.yaml index 88a6900a9..ee209bc40 100755 --- a/OpenAPI/TS28623_GenericNrm.yaml +++ b/OpenAPI/TS28623_GenericNrm.yaml @@ -2317,27 +2317,6 @@ components: - HTTP_VES_ENCAPS minItems: 1 - SupportedNotifications-Single: - allOf: - - $ref: '#/components/schemas/Top' - - type: object - properties: - attributes: - type: object - properties: - notificationTypes: - type: array - items: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/NotificationType' - notificationProtocols: - type: array - items: - type: string - enum: - - HTTP - - HTTP_VES_ENCAPS - minItems: 1 - #-------- Definition of YAML arrays for name-contained IOCs ---------------------- VsDataContainer-Multiple: -- GitLab