From b454e6d0613527c7e7527a26665d61a26f6b6d4c Mon Sep 17 00:00:00 2001 From: gautamd Date: Fri, 13 May 2022 08:21:22 +0000 Subject: [PATCH 1/3] Update sliceNrm.yaml --- OpenAPI/sliceNrm.yaml | 37 ++++++++++++++++++++++++++++++++++++- 1 file changed, 36 insertions(+), 1 deletion(-) diff --git a/OpenAPI/sliceNrm.yaml b/OpenAPI/sliceNrm.yaml index 6fe3a6d8d..dc1925df4 100755 --- a/OpenAPI/sliceNrm.yaml +++ b/OpenAPI/sliceNrm.yaml @@ -582,6 +582,20 @@ components: type: array items: $ref: '#/components/schemas/SliceProfile' + NetworkSliceSubnetCapabilities: + type: object + properties: + dLlatency: + type: integer + uLlatency: + $ref: integer + dLThptPerSliceSubnet: + $ref: '#/components/schemas/XLThpt' + uLThptPerSliceSubnet: + $ref: '#/components/schemas/XLThpt' + coverageAreaTAIList: + type: integer + #------------ Definition of concrete IOCs ---------------------------------------- SubNetwork-Single: @@ -603,6 +617,9 @@ components: $ref: '#/components/schemas/NetworkSliceSubnet-Multiple' EP_Transport: $ref: '#/components/schemas/EP_Transport-Multiple' + NetworkSliceSubnetProviderCapabilities: + $ref: '#/components/schemas/NetworkSliceSubnetProviderCapabilities-Multiple' + NetworkSlice-Single: allOf: @@ -672,6 +689,18 @@ components: type: string epApplicationRefs: $ref: 'comDefs.yaml#/components/schemas/DnList' + + NetworkSliceSubnetProviderCapabilities-Single: + allOf: + - $ref: 'genericNrm.yaml#/components/schemas/Top' + - type: object + properties: + attributes: + type: object + properties: + avaliableCapabilities: + $ref: '#/components/schemas/NetworkSliceSubnetCapabilities' + #-------- Definition of JSON arrays for name-contained IOCs ---------------------- SubNetwork-Multiple: @@ -693,7 +722,12 @@ components: type: array items: $ref: '#/components/schemas/EP_Transport-Single' - + + NetworkSliceSubnetProviderCapabilities-Multiple: + type: array + items: + $ref: '#/components/schemas/NetworkSliceSubnetProviderCapabilities-Single' + #------------ Definitions in TS 28.541 for TS 28.532 ----------------------------- resources-sliceNrm: @@ -702,3 +736,4 @@ components: - $ref: '#/components/schemas/NetworkSlice-Single' - $ref: '#/components/schemas/NetworkSliceSubnet-Single' - $ref: '#/components/schemas/EP_Transport-Single' + - $ref: '#/components/schemas/NetworkSliceSubnetProviderCapabilities-Single' -- GitLab From ac9e5bc6222828098814c6ca0e0418cd0a19faa3 Mon Sep 17 00:00:00 2001 From: gautamd Date: Mon, 16 May 2022 04:01:03 +0000 Subject: [PATCH 2/3] Update sliceNrm.yaml --- OpenAPI/sliceNrm.yaml | 26 +++++++++++--------------- 1 file changed, 11 insertions(+), 15 deletions(-) diff --git a/OpenAPI/sliceNrm.yaml b/OpenAPI/sliceNrm.yaml index dc1925df4..22ae563b1 100755 --- a/OpenAPI/sliceNrm.yaml +++ b/OpenAPI/sliceNrm.yaml @@ -582,19 +582,7 @@ components: type: array items: $ref: '#/components/schemas/SliceProfile' - NetworkSliceSubnetCapabilities: - type: object - properties: - dLlatency: - type: integer - uLlatency: - $ref: integer - dLThptPerSliceSubnet: - $ref: '#/components/schemas/XLThpt' - uLThptPerSliceSubnet: - $ref: '#/components/schemas/XLThpt' - coverageAreaTAIList: - type: integer + #------------ Definition of concrete IOCs ---------------------------------------- @@ -698,8 +686,16 @@ components: attributes: type: object properties: - avaliableCapabilities: - $ref: '#/components/schemas/NetworkSliceSubnetCapabilities' + dLlatency: + type: integer + uLlatency: + $ref: integer + dLThptPerSliceSubnet: + $ref: '#/components/schemas/XLThpt' + uLThptPerSliceSubnet: + $ref: '#/components/schemas/XLThpt' + coverageAreaTAIList: + type: integer #-------- Definition of JSON arrays for name-contained IOCs ---------------------- -- GitLab From 5f9cef5fae2f45fc37a9296be5485beaf1dd819e Mon Sep 17 00:00:00 2001 From: gautamd Date: Mon, 16 May 2022 05:10:26 +0000 Subject: [PATCH 3/3] Update sliceNrm.yaml --- OpenAPI/sliceNrm.yaml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/OpenAPI/sliceNrm.yaml b/OpenAPI/sliceNrm.yaml index 22ae563b1..446809d38 100755 --- a/OpenAPI/sliceNrm.yaml +++ b/OpenAPI/sliceNrm.yaml @@ -689,13 +689,15 @@ components: dLlatency: type: integer uLlatency: - $ref: integer + type: integer dLThptPerSliceSubnet: $ref: '#/components/schemas/XLThpt' uLThptPerSliceSubnet: $ref: '#/components/schemas/XLThpt' coverageAreaTAIList: - type: integer + type: array + items: + type: string #-------- Definition of JSON arrays for name-contained IOCs ---------------------- -- GitLab