From dc36f88688d63894714fd214d0c7a0b06b1ffa70 Mon Sep 17 00:00:00 2001 From: ruiyue Date: Fri, 25 Mar 2022 10:56:29 +0000 Subject: [PATCH 1/7] Update sliceNrm.yaml --- OpenAPI/sliceNrm.yaml | 58 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 58 insertions(+) diff --git a/OpenAPI/sliceNrm.yaml b/OpenAPI/sliceNrm.yaml index ed6dfb941..1c2d38050 100755 --- a/OpenAPI/sliceNrm.yaml +++ b/OpenAPI/sliceNrm.yaml @@ -582,6 +582,33 @@ components: type: array items: $ref: '#/components/schemas/SliceProfile' + FeasibilityResult: + description: -> + An attribute which specifies the feasibility check result for the feasibility check job. + type: string + enum: + - FEASIBLE + - UN_FEASIBLE + UnFeasibleReason: + description: -> + An attribute that specifies the additional reason information if the feasibility check result is unfeasible.The detailed ENUM value is FFS. + type: string + ResourceReservationIndicator: + description: -> + An attribute represents MnS consumer's requirements for resource reservation. + type: boolean + ReservationExpiration: + description: -> + An attribute which specifes the validity period of the resource reservation. + type: string + ResourceReservationStatus: + description: -> + An attribute which specifies the resource reservation result for the feasibility check job. + type: string + enum: + - RESERVED + - UNRESERVED + #------------ Definition of concrete IOCs ---------------------------------------- SubNetwork-Single: @@ -603,6 +630,8 @@ components: $ref: '#/components/schemas/NetworkSliceSubnet-Multiple' EP_Transport: $ref: '#/components/schemas/EP_Transport-Multiple' + FeasibilityCheckJob: + $ref: '#/components/schemas/FeasibilityCheckJob-Multiple' NetworkSlice-Single: allOf: @@ -672,6 +701,30 @@ components: type: string epApplicationRefs: $ref: 'comDefs.yaml#/components/schemas/DnList' + FeasibilityCheckJob-Single: + allOf: + - $ref: 'genericNrm.yaml#/components/schemas/Top' + - type: object + properties: + attributes: + type: object + properties: + profile: + oneOf: + - $ref: '#/components/schemas/SliceProfile' + - $ref: '#/components/schemas/ServiceProfile' + resourceReservationIndicator: + $ref: '#/components/schemas/ResourceReservationIndicator' + reservationExpiration: + $ref: '#/components/schemas/ReservationExpiration' + processMonitor: + $ref: 'genericNrm.yaml#/components/schemas/ProcessMonitor' + feasibilityResult: + $ref: '#/components/schemas/FeasibilityResult' + unFeasibleReason: + $ref: '#/components/schemas/UnFeasibleReason' + resourceReservationStatus: + $ref: '#/components/schemas/ResourceReservationStatus' #-------- Definition of JSON arrays for name-contained IOCs ---------------------- SubNetwork-Multiple: @@ -693,6 +746,10 @@ components: type: array items: $ref: '#/components/schemas/EP_Transport-Single' + FeasibilityCheckJob-Multiple: + type: array + items: + $ref: '#/components/schemas/FeasibilityCheckJob-Single' #------------ Definitions in TS 28.541 for TS 28.532 ----------------------------- @@ -702,3 +759,4 @@ components: - $ref: '#/components/schemas/NetworkSlice-Single' - $ref: '#/components/schemas/NetworkSliceSubnet-Single' - $ref: '#/components/schemas/EP_Transport-Single' + - $ref: '#/components/schemas/FeasibilityCheckJob-Single' -- GitLab From a5f67e1ab29200f5649cfb4b376b1489d7c6fd06 Mon Sep 17 00:00:00 2001 From: ruiyue Date: Fri, 25 Mar 2022 11:00:59 +0000 Subject: [PATCH 2/7] Update sliceNrm.yaml --- OpenAPI/sliceNrm.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/OpenAPI/sliceNrm.yaml b/OpenAPI/sliceNrm.yaml index 1c2d38050..53a8a66c9 100755 --- a/OpenAPI/sliceNrm.yaml +++ b/OpenAPI/sliceNrm.yaml @@ -751,6 +751,7 @@ components: items: $ref: '#/components/schemas/FeasibilityCheckJob-Single' + #------------ Definitions in TS 28.541 for TS 28.532 ----------------------------- resources-sliceNrm: -- GitLab From 947d5e12b538ad1fca13cc337415443df4a6ed4f Mon Sep 17 00:00:00 2001 From: ruiyue Date: Thu, 7 Apr 2022 02:51:13 +0000 Subject: [PATCH 3/7] Update sliceNrm.yaml --- OpenAPI/sliceNrm.yaml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/OpenAPI/sliceNrm.yaml b/OpenAPI/sliceNrm.yaml index 53a8a66c9..b0ee3446b 100755 --- a/OpenAPI/sliceNrm.yaml +++ b/OpenAPI/sliceNrm.yaml @@ -588,12 +588,12 @@ components: type: string enum: - FEASIBLE - - UN_FEASIBLE - UnFeasibleReason: + - INFEASIBLE + InFeasibleReason: description: -> - An attribute that specifies the additional reason information if the feasibility check result is unfeasible.The detailed ENUM value is FFS. + An attribute that specifies the additional reason information if the feasibility check result is infeasible.The detailed ENUM value is FFS. type: string - ResourceReservationIndicator: + ResourceReservation: description: -> An attribute represents MnS consumer's requirements for resource reservation. type: boolean @@ -713,16 +713,16 @@ components: oneOf: - $ref: '#/components/schemas/SliceProfile' - $ref: '#/components/schemas/ServiceProfile' - resourceReservationIndicator: - $ref: '#/components/schemas/ResourceReservationIndicator' + resourceReservation: + $ref: '#/components/schemas/ResourceReservation' reservationExpiration: $ref: '#/components/schemas/ReservationExpiration' processMonitor: $ref: 'genericNrm.yaml#/components/schemas/ProcessMonitor' feasibilityResult: $ref: '#/components/schemas/FeasibilityResult' - unFeasibleReason: - $ref: '#/components/schemas/UnFeasibleReason' + inFeasibleReason: + $ref: '#/components/schemas/InFeasibleReason' resourceReservationStatus: $ref: '#/components/schemas/ResourceReservationStatus' -- GitLab From 140ab450856be396f169ecc7e20fdba8e5959ff5 Mon Sep 17 00:00:00 2001 From: ruiyue Date: Thu, 7 Apr 2022 12:55:52 +0000 Subject: [PATCH 4/7] Update sliceNrm.yaml --- OpenAPI/sliceNrm.yaml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/OpenAPI/sliceNrm.yaml b/OpenAPI/sliceNrm.yaml index b0ee3446b..6044eb95a 100755 --- a/OpenAPI/sliceNrm.yaml +++ b/OpenAPI/sliceNrm.yaml @@ -593,6 +593,10 @@ components: description: -> An attribute that specifies the additional reason information if the feasibility check result is infeasible.The detailed ENUM value is FFS. type: string + RecommendedRequirement: + description: -> + An attribute that specifies the recommended network slicing related requirements (i.e. ServiceProfile and SliceProfile information) which can be supported by the MnS producer.. + type: string ResourceReservation: description: -> An attribute represents MnS consumer's requirements for resource reservation. @@ -725,6 +729,8 @@ components: $ref: '#/components/schemas/InFeasibleReason' resourceReservationStatus: $ref: '#/components/schemas/ResourceReservationStatus' + recommendedRequirement: + $ref: '#/components/schemas/RecommendedRequirement' #-------- Definition of JSON arrays for name-contained IOCs ---------------------- SubNetwork-Multiple: -- GitLab From 47639ee4251a2d9ad0bc0040963f60caec6a0fd2 Mon Sep 17 00:00:00 2001 From: ruiyue Date: Thu, 7 Apr 2022 14:27:44 +0000 Subject: [PATCH 5/7] Update sliceNrm.yaml --- OpenAPI/sliceNrm.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/OpenAPI/sliceNrm.yaml b/OpenAPI/sliceNrm.yaml index 6044eb95a..523bcd9c4 100755 --- a/OpenAPI/sliceNrm.yaml +++ b/OpenAPI/sliceNrm.yaml @@ -731,7 +731,6 @@ components: $ref: '#/components/schemas/ResourceReservationStatus' recommendedRequirement: $ref: '#/components/schemas/RecommendedRequirement' - #-------- Definition of JSON arrays for name-contained IOCs ---------------------- SubNetwork-Multiple: type: array -- GitLab From 90c41d0eb6752d796fb47b11ff279916082119b7 Mon Sep 17 00:00:00 2001 From: ruiyue Date: Sat, 9 Apr 2022 12:10:15 +0000 Subject: [PATCH 6/7] Update sliceNrm.yaml --- OpenAPI/sliceNrm.yaml | 29 +++++++++++++++++++---------- 1 file changed, 19 insertions(+), 10 deletions(-) diff --git a/OpenAPI/sliceNrm.yaml b/OpenAPI/sliceNrm.yaml index 523bcd9c4..346d096eb 100755 --- a/OpenAPI/sliceNrm.yaml +++ b/OpenAPI/sliceNrm.yaml @@ -593,18 +593,14 @@ components: description: -> An attribute that specifies the additional reason information if the feasibility check result is infeasible.The detailed ENUM value is FFS. type: string - RecommendedRequirement: + RecommendedRequirements: description: -> An attribute that specifies the recommended network slicing related requirements (i.e. ServiceProfile and SliceProfile information) which can be supported by the MnS producer.. type: string - ResourceReservation: + RequestedResourceReservation: description: -> An attribute represents MnS consumer's requirements for resource reservation. type: boolean - ReservationExpiration: - description: -> - An attribute which specifes the validity period of the resource reservation. - type: string ResourceReservationStatus: description: -> An attribute which specifies the resource reservation result for the feasibility check job. @@ -612,6 +608,15 @@ components: enum: - RESERVED - UNRESERVED + - USED + ReservationExpiration: + description: -> + An attribute which specifes the actual validity period of the resource reservation.. + type: string + ReservationFailureReason: + description: -> + An attribute that specifies the additional reason information if the reservation is failed. + type: string #------------ Definition of concrete IOCs ---------------------------------------- @@ -719,8 +724,8 @@ components: - $ref: '#/components/schemas/ServiceProfile' resourceReservation: $ref: '#/components/schemas/ResourceReservation' - reservationExpiration: - $ref: '#/components/schemas/ReservationExpiration' + requestedReservationExpiration: + $ref: '#/components/schemas/RequestedReservationExpiration' processMonitor: $ref: 'genericNrm.yaml#/components/schemas/ProcessMonitor' feasibilityResult: @@ -729,8 +734,12 @@ components: $ref: '#/components/schemas/InFeasibleReason' resourceReservationStatus: $ref: '#/components/schemas/ResourceReservationStatus' - recommendedRequirement: - $ref: '#/components/schemas/RecommendedRequirement' + reservationFailureReason: + $ref: '#/components/schemas/ReservationFailureReason' + reservationExpiration: + $ref: '#/components/schemas/ReservationExpiration' + recommendedRequirements: + $ref: '#/components/schemas/RecommendedRequirements' #-------- Definition of JSON arrays for name-contained IOCs ---------------------- SubNetwork-Multiple: type: array -- GitLab From ded05d42830814f2609f3a2230fb4cb553b011f0 Mon Sep 17 00:00:00 2001 From: ruiyue Date: Sat, 9 Apr 2022 12:14:45 +0000 Subject: [PATCH 7/7] Update sliceNrm.yaml --- OpenAPI/sliceNrm.yaml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/OpenAPI/sliceNrm.yaml b/OpenAPI/sliceNrm.yaml index 346d096eb..c3f92a8c2 100755 --- a/OpenAPI/sliceNrm.yaml +++ b/OpenAPI/sliceNrm.yaml @@ -597,10 +597,14 @@ components: description: -> An attribute that specifies the recommended network slicing related requirements (i.e. ServiceProfile and SliceProfile information) which can be supported by the MnS producer.. type: string - RequestedResourceReservation: + ResourceReservation: description: -> An attribute represents MnS consumer's requirements for resource reservation. type: boolean + RequestedReservationExpiration: + description: -> + An attribute which specifes MnS consuner's requirements for the validity period of the resource reservation. + type: string ResourceReservationStatus: description: -> An attribute which specifies the resource reservation result for the feasibility check job. -- GitLab