From 81eb1d9a0fc7ee8013e499f06f4a61afb9ba3b8b Mon Sep 17 00:00:00 2001 From: swaminathan1 Date: Thu, 24 Mar 2022 13:53:54 +0000 Subject: [PATCH 1/6] Adding ProvMns for discovery purpose Update coslaNrm.yaml --- OpenAPI/coslaNrm.yaml | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/OpenAPI/coslaNrm.yaml b/OpenAPI/coslaNrm.yaml index ef7f1ca33..802e73f4f 100644 --- a/OpenAPI/coslaNrm.yaml +++ b/OpenAPI/coslaNrm.yaml @@ -58,6 +58,16 @@ components: #-------- Definition of concrete IOCs -------------------------------------------- +MnS: + oneOf: + - type: object + properties: + SubNetwork: + $ref: '#/components/schemas/SubNetwork-Multiple' + - type: object + properties: + ManagedElement: + $ref: '#/components/schemas/ManagedElement-Multiple' SubNetwork-Single: allOf: @@ -131,6 +141,15 @@ components: $ref: 'comDefs.yaml#/components/schemas/Dn' #-------- 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 -- GitLab From 16b602bd5992184c51ef413ef668971fbc79dafa Mon Sep 17 00:00:00 2001 From: swaminathan1 Date: Thu, 24 Mar 2022 13:56:16 +0000 Subject: [PATCH 2/6] Adding MnS for discovery Update coslaNrm.yaml --- OpenAPI/coslaNrm.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/OpenAPI/coslaNrm.yaml b/OpenAPI/coslaNrm.yaml index 802e73f4f..3569373e3 100644 --- a/OpenAPI/coslaNrm.yaml +++ b/OpenAPI/coslaNrm.yaml @@ -165,6 +165,7 @@ MnS: resources-coslaNrm: oneOf: + - $ref: '#/components/schemas/MnS' - $ref: '#/components/schemas/AssuranceClosedControlLoop-Single' - $ref: '#/components/schemas/AssuranceGoal-Single' - $ref: '#/components/schemas/SubNetwork-Single' -- GitLab From 8d65f909aed600b9e333b8f6c733fad64485e472 Mon Sep 17 00:00:00 2001 From: swaminathan1 Date: Thu, 24 Mar 2022 13:59:11 +0000 Subject: [PATCH 3/6] Adding Mns Update coslaNrm.yaml --- OpenAPI/coslaNrm.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OpenAPI/coslaNrm.yaml b/OpenAPI/coslaNrm.yaml index 3569373e3..f37793ce7 100644 --- a/OpenAPI/coslaNrm.yaml +++ b/OpenAPI/coslaNrm.yaml @@ -58,7 +58,7 @@ components: #-------- Definition of concrete IOCs -------------------------------------------- -MnS: + MnS: oneOf: - type: object properties: -- GitLab From b71d49263edc013bf8822411c209580f8aa2924d Mon Sep 17 00:00:00 2001 From: sunse Date: Mon, 28 Mar 2022 14:42:00 +0000 Subject: [PATCH 4/6] Fixing OpenAPI Discoverability issue Update 5gcNrm.yaml --- OpenAPI/5gcNrm.yaml | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/OpenAPI/5gcNrm.yaml b/OpenAPI/5gcNrm.yaml index d086a6424..748056aff 100644 --- a/OpenAPI/5gcNrm.yaml +++ b/OpenAPI/5gcNrm.yaml @@ -442,6 +442,16 @@ components: #-------- Definition of concrete IOCs -------------------------------------------- + MnS: + oneOf: + - type: object + properties: + SubNetwork: + $ref: '#/components/schemas/SubNetwork-Multiple' + - type: object + properties: + ManagedElement: + $ref: '#/components/schemas/ManagedElement-Multiple' SubNetwork-Single: allOf: @@ -1918,6 +1928,8 @@ components: resources-5gcNrm: oneOf: + - $ref: '#/components/schemas/MnS' + - $ref: '#/components/schemas/SubNetwork-Single' - $ref: '#/components/schemas/ManagedElement-Single' - $ref: '#/components/schemas/AmfFunction-Single' -- GitLab From 57fbf8872ef8a80d4553aecf288439d5d0503584 Mon Sep 17 00:00:00 2001 From: sunse Date: Mon, 28 Mar 2022 14:47:24 +0000 Subject: [PATCH 5/6] Fixing OpenAPI Discoverability issue Update nrNrm.yaml --- OpenAPI/nrNrm.yaml | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/OpenAPI/nrNrm.yaml b/OpenAPI/nrNrm.yaml index 1710001ee..6630f8c80 100644 --- a/OpenAPI/nrNrm.yaml +++ b/OpenAPI/nrNrm.yaml @@ -573,6 +573,17 @@ components: #-------- Definition of concrete IOCs -------------------------------------------- + MnS: + oneOf: + - type: object + properties: + SubNetwork: + $ref: '#/components/schemas/SubNetwork-Multiple' + - type: object + properties: + ManagedElement: + $ref: '#/components/schemas/ManagedElement-Multiple' + SubNetwork-Single: allOf: - $ref: 'genericNrm.yaml#/components/schemas/Top' @@ -1819,6 +1830,8 @@ components: resources-nrNrm: oneOf: + - $ref: '#/components/schemas/MnS' + - $ref: '#/components/schemas/SubNetwork-Single' - $ref: '#/components/schemas/ManagedElement-Single' -- GitLab From be4e3004312562aed91ffbeb86aa73e8ac1d623e Mon Sep 17 00:00:00 2001 From: sunse Date: Mon, 28 Mar 2022 14:47:39 +0000 Subject: [PATCH 6/6] Fixing OpenAPI Discoverability issue Update sliceNrm.yaml --- OpenAPI/sliceNrm.yaml | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/OpenAPI/sliceNrm.yaml b/OpenAPI/sliceNrm.yaml index 2b155183c..4356f086f 100644 --- a/OpenAPI/sliceNrm.yaml +++ b/OpenAPI/sliceNrm.yaml @@ -304,6 +304,17 @@ components: #------------ Definition of concrete IOCs ---------------------------------------- + MnS: + oneOf: + - type: object + properties: + SubNetwork: + $ref: '#/components/schemas/SubNetwork-Multiple' +# - type: object +# properties: +# ManagedElement: +# $ref: '#/components/schemas/ManagedElement-Multiple' + SubNetwork-Single: allOf: - $ref: 'genericNrm.yaml#/components/schemas/Top' @@ -410,6 +421,8 @@ components: resources-sliceNrm: oneOf: + - $ref: '#/components/schemas/MnS' + - $ref: '#/components/schemas/SubNetwork-Single' - $ref: '#/components/schemas/NetworkSlice-Single' - $ref: '#/components/schemas/NetworkSliceSubnet-Single' -- GitLab