From ef9906500d3b34a206191596b0840d97c844b88d Mon Sep 17 00:00:00 2001 From: sunse Date: Thu, 24 Mar 2022 06:27:04 +0000 Subject: [PATCH 1/9] discovery issue fix Update 5gcNrm.yaml --- OpenAPI/5gcNrm.yaml | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/OpenAPI/5gcNrm.yaml b/OpenAPI/5gcNrm.yaml index 888420bd1..b8bbcca9d 100755 --- a/OpenAPI/5gcNrm.yaml +++ b/OpenAPI/5gcNrm.yaml @@ -645,6 +645,16 @@ components: $ref: 'nrNrm.yaml#/components/schemas/Tai' #-------- Definition of concrete IOCs -------------------------------------------- + ProvMnS: + oneOf: + - type: object + properties: + SubNetwork: + $ref: '#/components/schemas/SubNetwork-Multiple' + - type: object + properties: + ManagedElement: + $ref: '#/components/schemas/ManagedElement-Multiple' SubNetwork-Single: allOf: @@ -2471,6 +2481,7 @@ components: resources-5gcNrm: oneOf: + - $ref: '#/components/schemas/ProvMnS' - $ref: '#/components/schemas/SubNetwork-Single' - $ref: '#/components/schemas/ManagedElement-Single' - $ref: '#/components/schemas/AmfFunction-Single' -- GitLab From 35d04b7f30486f544ec3637678b5663c80c4fdc5 Mon Sep 17 00:00:00 2001 From: swaminathan1 Date: Thu, 24 Mar 2022 13:09:11 +0000 Subject: [PATCH 2/9] Adding ProvMns for Discovery purpose in EdgeNrm.yaml Update EdgeNRM.yaml --- OpenAPI/EdgeNRM.yaml | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/OpenAPI/EdgeNRM.yaml b/OpenAPI/EdgeNRM.yaml index eddcee345..51447336e 100644 --- a/OpenAPI/EdgeNRM.yaml +++ b/OpenAPI/EdgeNRM.yaml @@ -85,6 +85,16 @@ components: type: string #-------- 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: @@ -234,6 +244,8 @@ components: resources-edgeNrm: oneOf: + - $ref: '#/components/schemas/MnS' + - $ref: '#/components/schemas/SubNetwork-Single' - $ref: '#/components/schemas/EASFunction-Single' - $ref: '#/components/schemas/ECSFunction-Single' -- GitLab From 5701bbea5edba9d3ab9ee2065b495afcc46d0a8f Mon Sep 17 00:00:00 2001 From: swaminathan1 Date: Thu, 24 Mar 2022 13:16:57 +0000 Subject: [PATCH 3/9] Add ProvMns for root discovery Update EdgeNRM.yaml --- OpenAPI/EdgeNRM.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/OpenAPI/EdgeNRM.yaml b/OpenAPI/EdgeNRM.yaml index 51447336e..b7283cc9c 100644 --- a/OpenAPI/EdgeNRM.yaml +++ b/OpenAPI/EdgeNRM.yaml @@ -245,7 +245,6 @@ components: resources-edgeNrm: oneOf: - $ref: '#/components/schemas/MnS' - - $ref: '#/components/schemas/SubNetwork-Single' - $ref: '#/components/schemas/EASFunction-Single' - $ref: '#/components/schemas/ECSFunction-Single' -- GitLab From a1af0afe2dc4841fd9081db3c7bc9f6deb8896e5 Mon Sep 17 00:00:00 2001 From: swaminathan1 Date: Thu, 24 Mar 2022 13:20:15 +0000 Subject: [PATCH 4/9] Adding ProvMns for discovery Update EdgeNRM.yaml --- OpenAPI/EdgeNRM.yaml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/OpenAPI/EdgeNRM.yaml b/OpenAPI/EdgeNRM.yaml index b7283cc9c..81e314866 100644 --- a/OpenAPI/EdgeNRM.yaml +++ b/OpenAPI/EdgeNRM.yaml @@ -91,10 +91,6 @@ components: properties: SubNetwork: $ref: '#/components/schemas/SubNetwork-Multiple' - - type: object - properties: - ManagedElement: - $ref: '#/components/schemas/ManagedElement-Multiple' SubNetwork-Single: allOf: -- GitLab From 6a11039f153510348e4c216c3981c6880aca9315 Mon Sep 17 00:00:00 2001 From: swaminathan1 Date: Thu, 24 Mar 2022 13:29:27 +0000 Subject: [PATCH 5/9] Add ProvMns for discovery purpose Update coslaNrm.yaml --- OpenAPI/coslaNrm.yaml | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/OpenAPI/coslaNrm.yaml b/OpenAPI/coslaNrm.yaml index 8d9d8788d..b9043e5ae 100755 --- a/OpenAPI/coslaNrm.yaml +++ b/OpenAPI/coslaNrm.yaml @@ -92,6 +92,16 @@ components: $ref: 'nrNrm.yaml#/components/schemas/TaiList' #-------- 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: @@ -184,6 +194,8 @@ components: resources-coslaNrm: oneOf: + - $ref: '#/components/schemas/MnS' + - $ref: '#/components/schemas/AssuranceClosedControlLoop-Single' - $ref: '#/components/schemas/AssuranceGoal-Single' - $ref: '#/components/schemas/SubNetwork-Single' -- GitLab From 25527a0ada7d179129b4c5c5509afdb75468c751 Mon Sep 17 00:00:00 2001 From: swaminathan1 Date: Thu, 24 Mar 2022 13:32:08 +0000 Subject: [PATCH 6/9] Add ProvMns for discovery purpose Update coslaNrm.yaml --- OpenAPI/coslaNrm.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/OpenAPI/coslaNrm.yaml b/OpenAPI/coslaNrm.yaml index b9043e5ae..8e6b72d5e 100755 --- a/OpenAPI/coslaNrm.yaml +++ b/OpenAPI/coslaNrm.yaml @@ -195,7 +195,6 @@ components: resources-coslaNrm: oneOf: - $ref: '#/components/schemas/MnS' - - $ref: '#/components/schemas/AssuranceClosedControlLoop-Single' - $ref: '#/components/schemas/AssuranceGoal-Single' - $ref: '#/components/schemas/SubNetwork-Single' -- GitLab From b1053ee94ea8ca1dd543631dd2dc30da8721c01f Mon Sep 17 00:00:00 2001 From: swaminathan1 Date: Thu, 24 Mar 2022 13:45:53 +0000 Subject: [PATCH 7/9] Defining Subnetwork-Multiple and ManagedElement-Multiple Update coslaNrm.yaml --- OpenAPI/coslaNrm.yaml | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/OpenAPI/coslaNrm.yaml b/OpenAPI/coslaNrm.yaml index 8e6b72d5e..f2b4b1162 100755 --- a/OpenAPI/coslaNrm.yaml +++ b/OpenAPI/coslaNrm.yaml @@ -179,6 +179,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 e5587abffe166dec136fcebab40d10fb140c3505 Mon Sep 17 00:00:00 2001 From: sunse Date: Mon, 28 Mar 2022 14:51:37 +0000 Subject: [PATCH 8/9] Fixing OpenAPI Discoverability issue Update sliceNrm.yaml --- OpenAPI/sliceNrm.yaml | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/OpenAPI/sliceNrm.yaml b/OpenAPI/sliceNrm.yaml index 8ba16af16..e35c4bd70 100755 --- a/OpenAPI/sliceNrm.yaml +++ b/OpenAPI/sliceNrm.yaml @@ -625,6 +625,18 @@ 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' @@ -806,6 +818,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 From 600587319dd28847610698683fda578b90f971ef Mon Sep 17 00:00:00 2001 From: sunse Date: Mon, 28 Mar 2022 14:51:46 +0000 Subject: [PATCH 9/9] 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 ad78bd16e..5ca53fe51 100755 --- a/OpenAPI/nrNrm.yaml +++ b/OpenAPI/nrNrm.yaml @@ -616,6 +616,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' @@ -1994,6 +2005,8 @@ components: resources-nrNrm: oneOf: + - $ref: '#/components/schemas/MnS' + - $ref: '#/components/schemas/SubNetwork-Single' - $ref: '#/components/schemas/ManagedElement-Single' -- GitLab