diff --git a/OpenAPI/5gcNrm.yaml b/OpenAPI/5gcNrm.yaml index d086a6424f72a6b898bf5b6a940923322748f703..748056aff01eb37aa15bee1fbd4665eb52d5ede2 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' diff --git a/OpenAPI/coslaNrm.yaml b/OpenAPI/coslaNrm.yaml index ef7f1ca33bdf31a5a37551e609d7a04029690c30..f37793ce7aa415ac5b2cb1126efdc73e783f029f 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 @@ -146,6 +165,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 1710001eec270c6d29cdbed90b6aea06b07088b9..6630f8c80ca5c5ade96ee96732a030a4dd7b6b3f 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' diff --git a/OpenAPI/sliceNrm.yaml b/OpenAPI/sliceNrm.yaml index 2b155183cb45ef228dd19f523fabb63ca28241ee..4356f086fe637b5338a60b44ba0209a371ca4da1 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'