From 30e75f861223e8a5818b804efdf2d7ee9429d625 Mon Sep 17 00:00:00 2001 From: Jan Groenendijk Date: Thu, 1 Aug 2024 14:25:14 +0000 Subject: [PATCH 1/7] Fix stage 3 MDAFunction and Lists --- OpenAPI/TS28104_MdaNrm.yaml | 27 +++++++++++++++++++++------ 1 file changed, 21 insertions(+), 6 deletions(-) diff --git a/OpenAPI/TS28104_MdaNrm.yaml b/OpenAPI/TS28104_MdaNrm.yaml index c229cc7d8..2165d9cf3 100644 --- a/OpenAPI/TS28104_MdaNrm.yaml +++ b/OpenAPI/TS28104_MdaNrm.yaml @@ -107,6 +107,19 @@ components: format: float minimum: 0 + MLModelRefList: + type: array + items: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' + + AIMLInferenceFunctionRefList: + type: array + items: + $ref: 'TS28623_ComDefs.yaml #/components/schemas/Dn' + + + + #-------- Definition of types for name-containments ------ SubNetwork-ncO-MdaNrm: type: object @@ -128,7 +141,7 @@ components: #-------- Definition of concrete IOCs -------------------------------------------- MDAFunction-Single: allOf: - - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' + - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction' - type: object properties: attributes: @@ -138,15 +151,17 @@ components: properties: supportedMDACapabilities: $ref: '#/components/schemas/MDATypes' - mlModelRef: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' - aIMLInferenceFunctionRef: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' - - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' + mlModelRefList: + $ref: '#/components/schemas/MLModelRefList' + aIMLInferenceFunctionRefList: + $ref: '#/components/schemas/AIMLInferenceFunctionRefList' + - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' - type: object properties: MDARequest: $ref: '#/components/schemas/MDARequest-Multiple' + MDAReport: + $ref: '#/components/schemas/MDAReport-Multiple' MDARequest-Single: allOf: -- GitLab From 78455d16528836b617bb0f71b1b88f6ab07d3597 Mon Sep 17 00:00:00 2001 From: Jan Groenendijk Date: Thu, 1 Aug 2024 15:06:23 +0000 Subject: [PATCH 2/7] 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 2165d9cf3..9cbfab510 100644 --- a/OpenAPI/TS28104_MdaNrm.yaml +++ b/OpenAPI/TS28104_MdaNrm.yaml @@ -115,7 +115,7 @@ components: AIMLInferenceFunctionRefList: type: array items: - $ref: 'TS28623_ComDefs.yaml #/components/schemas/Dn' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' -- GitLab From 2940a11ec0b9e6c67d8019a845c536cd2245251d Mon Sep 17 00:00:00 2001 From: Jan Groenendijk Date: Wed, 7 Aug 2024 11:49:30 +0000 Subject: [PATCH 3/7] Fix capitalization mLModel --- 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 9cbfab510..70b0bc25f 100644 --- a/OpenAPI/TS28104_MdaNrm.yaml +++ b/OpenAPI/TS28104_MdaNrm.yaml @@ -151,7 +151,7 @@ components: properties: supportedMDACapabilities: $ref: '#/components/schemas/MDATypes' - mlModelRefList: + mLModelRefList: $ref: '#/components/schemas/MLModelRefList' aIMLInferenceFunctionRefList: $ref: '#/components/schemas/AIMLInferenceFunctionRefList' -- GitLab From 4e38b8049c2947954fcf3961f3b1a75a24d31e73 Mon Sep 17 00:00:00 2001 From: Jan Groenendijk Date: Wed, 7 Aug 2024 13:21:57 +0000 Subject: [PATCH 4/7] Fixed ManagedFunction-nc0 --- 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 70b0bc25f..e7a122de2 100644 --- a/OpenAPI/TS28104_MdaNrm.yaml +++ b/OpenAPI/TS28104_MdaNrm.yaml @@ -141,7 +141,7 @@ components: #-------- Definition of concrete IOCs -------------------------------------------- MDAFunction-Single: allOf: - - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction' + - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-nc0' - type: object properties: attributes: -- GitLab From 358e154929fe3c398a128898d0df07d08a810b72 Mon Sep 17 00:00:00 2001 From: Jan Groenendijk Date: Wed, 7 Aug 2024 13:30:05 +0000 Subject: [PATCH 5/7] fix ncO --- 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 e7a122de2..7b3fe58b4 100644 --- a/OpenAPI/TS28104_MdaNrm.yaml +++ b/OpenAPI/TS28104_MdaNrm.yaml @@ -141,7 +141,7 @@ components: #-------- Definition of concrete IOCs -------------------------------------------- MDAFunction-Single: allOf: - - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-nc0' + - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' - type: object properties: attributes: -- GitLab From 49fe49941b560a1999dde141f9fdfccbdfe0ed33 Mon Sep 17 00:00:00 2001 From: Jan Groenendijk Date: Fri, 9 Aug 2024 14:00:53 +0000 Subject: [PATCH 6/7] Updated to DnList --- OpenAPI/TS28104_MdaNrm.yaml | 16 ++-------------- 1 file changed, 2 insertions(+), 14 deletions(-) diff --git a/OpenAPI/TS28104_MdaNrm.yaml b/OpenAPI/TS28104_MdaNrm.yaml index 7b3fe58b4..2b290b7f9 100644 --- a/OpenAPI/TS28104_MdaNrm.yaml +++ b/OpenAPI/TS28104_MdaNrm.yaml @@ -107,18 +107,6 @@ components: format: float minimum: 0 - MLModelRefList: - type: array - items: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' - - AIMLInferenceFunctionRefList: - type: array - items: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' - - - #-------- Definition of types for name-containments ------ SubNetwork-ncO-MdaNrm: @@ -152,9 +140,9 @@ components: supportedMDACapabilities: $ref: '#/components/schemas/MDATypes' mLModelRefList: - $ref: '#/components/schemas/MLModelRefList' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList' aIMLInferenceFunctionRefList: - $ref: '#/components/schemas/AIMLInferenceFunctionRefList' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' - type: object properties: -- GitLab From fbffb86d73afc1e79cb635062b311ac6cad76d5e Mon Sep 17 00:00:00 2001 From: Jan Groenendijk Date: Thu, 22 Aug 2024 17:12:24 +0000 Subject: [PATCH 7/7] Update TS28104_MdaNrm.yaml --- OpenAPI/TS28104_MdaNrm.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/OpenAPI/TS28104_MdaNrm.yaml b/OpenAPI/TS28104_MdaNrm.yaml index 2b290b7f9..c18f5df79 100644 --- a/OpenAPI/TS28104_MdaNrm.yaml +++ b/OpenAPI/TS28104_MdaNrm.yaml @@ -129,7 +129,7 @@ components: #-------- Definition of concrete IOCs -------------------------------------------- MDAFunction-Single: allOf: - - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' + - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' - type: object properties: attributes: @@ -143,7 +143,7 @@ components: $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList' aIMLInferenceFunctionRefList: $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList' - - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' + - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' - type: object properties: MDARequest: -- GitLab