diff --git a/OpenAPI/5gcNrm.yaml b/OpenAPI/5gcNrm.yaml index 888420bd1c6ac7fe4669ad15e1a5475d405df3d8..b8bbcca9d747258e4c25fe0a12b8a0f79b8b275b 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' diff --git a/OpenAPI/EdgeNRM.yaml b/OpenAPI/EdgeNRM.yaml index eddcee3450767bfa88eda2de3a0b09313028ec73..81e314866f6754bcceb5a0d70228024d4033ab4d 100644 --- a/OpenAPI/EdgeNRM.yaml +++ b/OpenAPI/EdgeNRM.yaml @@ -85,6 +85,12 @@ components: type: string #-------- Definition of concrete IOCs -------------------------------------------- + MnS: + oneOf: + - type: object + properties: + SubNetwork: + $ref: '#/components/schemas/SubNetwork-Multiple' SubNetwork-Single: allOf: @@ -234,6 +240,7 @@ components: resources-edgeNrm: oneOf: + - $ref: '#/components/schemas/MnS' - $ref: '#/components/schemas/SubNetwork-Single' - $ref: '#/components/schemas/EASFunction-Single' - $ref: '#/components/schemas/ECSFunction-Single' diff --git a/OpenAPI/coslaNrm.yaml b/OpenAPI/coslaNrm.yaml index 8d9d8788dbace179c3d87a076dcca688f6d06360..f2b4b11624a18dc149d5b4f0994d4c9e6a3452c8 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: @@ -169,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 @@ -184,6 +203,7 @@ components: resources-coslaNrm: oneOf: + - $ref: '#/components/schemas/MnS' - $ref: '#/components/schemas/AssuranceClosedControlLoop-Single' - $ref: '#/components/schemas/AssuranceGoal-Single' - $ref: '#/components/schemas/SubNetwork-Single' diff --git a/OpenAPI/nrNrm.yaml b/OpenAPI/nrNrm.yaml index ad78bd16e9c9b5338d63467c533942cba5f9fb6d..5ca53fe5105912faced93c983d0319a1ebdd2318 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' diff --git a/OpenAPI/sliceNrm.yaml b/OpenAPI/sliceNrm.yaml index 8ba16af162148fadb144a9db6b73777109a36b0a..e35c4bd7067e5a421655cc3edfa3263939e5206b 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'