From 1c60a42312d2cd07f3d266ff6ffd0f8aa6347f53 Mon Sep 17 00:00:00 2001 From: nakimuli Date: Fri, 4 Nov 2022 11:01:13 +0000 Subject: [PATCH 1/2] =?UTF-8?q?TS28.312=5FRel-17=5FCR0006=5FCorrection=5Ft?= =?UTF-8?q?o=5FStage=5F3=5Fand=5FStage=5F2=5Fdefinitions=5Ffor=5FIntent=5F?= =?UTF-8?q?Driven=5FManagement=20=C2=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- OpenAPI/TS28312_IntentNrm.yaml | 30 ++++++++++++++++++++++++++++-- 1 file changed, 28 insertions(+), 2 deletions(-) diff --git a/OpenAPI/TS28312_IntentNrm.yaml b/OpenAPI/TS28312_IntentNrm.yaml index cb4d86c57..707734802 100644 --- a/OpenAPI/TS28312_IntentNrm.yaml +++ b/OpenAPI/TS28312_IntentNrm.yaml @@ -12,6 +12,24 @@ externalDocs: paths: {} components: schemas: + + #-------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' + Intent: + $ref: '#/components/schemas/Intent-Multiple' + Intent-Single: allOf: - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' @@ -33,6 +51,7 @@ components: $ref: "#/components/schemas/IntentContext" intentFulfilmentInfo: $ref: "#/components/schemas/FulfilmentInfo" + #-------Definition of concrete IOCs ----------# #-------Definition of the IntentExpectation dataType ----------# IntentExpectation: @@ -138,7 +157,7 @@ components: objectType: type: string enum: - - RAN_SubNetwrok #value for Radio Network Expectation--# + - RAN_SubNetwork #value for Radio Network Expectation--# - Service_Support #value for Service Support Expectation--# - TBD #-This will be added based on defined scenario specfic intent expectation-# objectInstance: @@ -155,7 +174,7 @@ components: objectType: type: string enum: - - RAN_SubNetwrok #value for Radio Network Expectation--# + - RAN_SubNetwork #value for Radio Network Expectation--# objectInstance: $ref: "TS28623_ComDefs.yaml#/components/schemas/Dn" objectContexts: @@ -199,6 +218,7 @@ components: - Is_less_than - Is_greater_than - Is_within_the_range + - Is_outside_the_range FulfilStatus: type: string enum: @@ -803,6 +823,11 @@ components: #------Definition of JSON arrays for name-contained IOCs ---------------# + + SubNetwork-Multiple: + type: array + items: + $ref: '#/components/schemas/SubNetwork-Single' Intent-Multiple: type: array @@ -813,5 +838,6 @@ components: #----- Definitions in TS 28.312 for TS 28.532 --------------------------# resources-intentNrm: oneOf: + - $ref: '#/components/schemas/SubNetwork-Single' - $ref: '#/components/schemas/Intent-Single' #----- Definitions in TS 28.312 for TS 28.532 --------------------------# -- GitLab From dd5c412fb56c7024763b02992671b9da3b56e5bb Mon Sep 17 00:00:00 2001 From: nakimuli Date: Fri, 4 Nov 2022 11:01:13 +0000 Subject: [PATCH 2/2] =?UTF-8?q?TS28.312=5FRel-17=5FCR0006=5FCorrection=5Ft?= =?UTF-8?q?o=5FStage=5F3=5Fand=5FStage=5F2=5Fdefinitions=5Ffor=5FIntent=5F?= =?UTF-8?q?Driven=5FManagement=20=C2=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- OpenAPI/TS28312_IntentNrm.yaml | 29 +++++++++++++++++++++++++++-- 1 file changed, 27 insertions(+), 2 deletions(-) diff --git a/OpenAPI/TS28312_IntentNrm.yaml b/OpenAPI/TS28312_IntentNrm.yaml index 0146ba170..e6726fc27 100644 --- a/OpenAPI/TS28312_IntentNrm.yaml +++ b/OpenAPI/TS28312_IntentNrm.yaml @@ -12,6 +12,24 @@ externalDocs: paths: {} components: schemas: + + #-------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' + Intent: + $ref: '#/components/schemas/Intent-Multiple' + Intent-Single: allOf: - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' @@ -33,6 +51,7 @@ components: $ref: "#/components/schemas/IntentContext" intentFulfilmentInfo: $ref: "#/components/schemas/FulfilmentInfo" + #-------Definition of concrete IOCs ----------# #-------Definition of the IntentExpectation dataType ----------# IntentExpectation: @@ -138,7 +157,7 @@ components: objectType: type: string enum: - - RAN_SubNetwrok #value for Radio Network Expectation--# + - RAN_SubNetwork #value for Radio Network Expectation--# - Service_Support #value for Service Support Expectation--# - TBD #-This will be added based on defined scenario specfic intent expectation-# objectInstance: @@ -155,7 +174,7 @@ components: objectType: type: string enum: - - RAN_SubNetwrok #value for Radio Network Expectation--# + - RAN_SubNetwork #value for Radio Network Expectation--# objectInstance: $ref: "TS28623_ComDefs.yaml#/components/schemas/Dn" objectContexts: @@ -804,6 +823,11 @@ components: #------Definition of JSON arrays for name-contained IOCs ---------------# + + SubNetwork-Multiple: + type: array + items: + $ref: '#/components/schemas/SubNetwork-Single' Intent-Multiple: type: array @@ -814,5 +838,6 @@ components: #----- Definitions in TS 28.312 for TS 28.532 --------------------------# resources-intentNrm: oneOf: + - $ref: '#/components/schemas/SubNetwork-Single' - $ref: '#/components/schemas/Intent-Single' #----- Definitions in TS 28.312 for TS 28.532 --------------------------# -- GitLab