From dfa47864afbf34986b72248c987d7a0dab84c392 Mon Sep 17 00:00:00 2001 From: ruiyue Date: Thu, 4 Aug 2022 13:53:56 +0000 Subject: [PATCH 1/5] Update TS28541_SliceNrm.yaml --- OpenAPI/TS28541_SliceNrm.yaml | 28 +++++++++++++++++----------- 1 file changed, 17 insertions(+), 11 deletions(-) diff --git a/OpenAPI/TS28541_SliceNrm.yaml b/OpenAPI/TS28541_SliceNrm.yaml index 455a663d0..dd49cd407 100755 --- a/OpenAPI/TS28541_SliceNrm.yaml +++ b/OpenAPI/TS28541_SliceNrm.yaml @@ -580,30 +580,34 @@ components: items: $ref: '#/components/schemas/SliceProfile' FeasibilityResult: - description: -> - An attribute which specifies the feasibility check result for the feasibility check job. + description: >- + An attribute which specifies the feasibility check result for the feasibility check and reservation job. type: string enum: - FEASIBLE - INFEASIBLE InFeasibleReason: - description: -> + description: >- An attribute that specifies the additional reason information if the feasibility check result is infeasible.The detailed ENUM value is FFS. type: string + RecommendationRequest: + description: >- + An attribute represents MnS consumer's request for recommended network slice related requirements. + type: boolean RecommendedRequirements: - description: -> + 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: -> + description: >- An attribute represents MnS consumer's requirements for resource reservation. type: boolean RequestedReservationExpiration: - description: -> + description: >- An attribute which specifes MnS consuner's requirements for the validity period of the resource reservation. type: string ResourceReservationStatus: - description: -> + description: >- An attribute which specifies the resource reservation result for the feasibility check job. type: string enum: @@ -611,11 +615,11 @@ components: - UNRESERVED - USED ReservationExpiration: - description: -> + description: >- An attribute which specifes the actual validity period of the resource reservation.. type: string ReservationFailureReason: - description: -> + description: >- An attribute that specifies the additional reason information if the reservation is failed. type: string @@ -748,7 +752,7 @@ components: type: array items: type: string - FeasibilityCheckJob-Single: + FeasibilityCheckAndReservationJob-Single: allOf: - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' - type: object @@ -762,6 +766,8 @@ components: - $ref: '#/components/schemas/ServiceProfile' resourceReservation: $ref: '#/components/schemas/ResourceReservation' + recommendationRequest: + $ref: '#/components/schemas/RecommendationRequest requestedReservationExpiration: $ref: '#/components/schemas/RequestedReservationExpiration' processMonitor: @@ -821,4 +827,4 @@ components: - $ref: '#/components/schemas/NetworkSliceSubnet-Single' - $ref: '#/components/schemas/EP_Transport-Single' - $ref: '#/components/schemas/NetworkSliceSubnetProviderCapabilities-Single' - - $ref: '#/components/schemas/FeasibilityCheckJob-Single' + - $ref: '#/components/schemas/FeasibilityCheckAndReservationJob-Single' -- GitLab From e9d095cccbf7836597ae7afbdbfe13c83f2dda53 Mon Sep 17 00:00:00 2001 From: ruiyue Date: Thu, 4 Aug 2022 13:56:28 +0000 Subject: [PATCH 2/5] Update TS28541_SliceNrm.yaml --- OpenAPI/TS28541_SliceNrm.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OpenAPI/TS28541_SliceNrm.yaml b/OpenAPI/TS28541_SliceNrm.yaml index dd49cd407..8c3f35c20 100755 --- a/OpenAPI/TS28541_SliceNrm.yaml +++ b/OpenAPI/TS28541_SliceNrm.yaml @@ -814,7 +814,7 @@ components: FeasibilityCheckJob-Multiple: type: array items: - $ref: '#/components/schemas/FeasibilityCheckJob-Single' + $ref: '#/components/schemas/FeasibilityCheckAndReservationJob-Single' #------------ Definitions in TS 28.541 for TS 28.532 ----------------------------- -- GitLab From f2c7cffd580170caaeff375bb801c357ab85c0fd Mon Sep 17 00:00:00 2001 From: ruiyue Date: Thu, 4 Aug 2022 13:59:28 +0000 Subject: [PATCH 3/5] Update TS28541_SliceNrm.yaml --- OpenAPI/TS28541_SliceNrm.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OpenAPI/TS28541_SliceNrm.yaml b/OpenAPI/TS28541_SliceNrm.yaml index 8c3f35c20..6dc884509 100755 --- a/OpenAPI/TS28541_SliceNrm.yaml +++ b/OpenAPI/TS28541_SliceNrm.yaml @@ -767,7 +767,7 @@ components: resourceReservation: $ref: '#/components/schemas/ResourceReservation' recommendationRequest: - $ref: '#/components/schemas/RecommendationRequest + $ref: '#/components/schemas/RecommendationRequest' requestedReservationExpiration: $ref: '#/components/schemas/RequestedReservationExpiration' processMonitor: -- GitLab From d0bb217a2ded89cebd07a03d6efd988128f3383d Mon Sep 17 00:00:00 2001 From: ruiyue Date: Thu, 18 Aug 2022 16:00:54 +0000 Subject: [PATCH 4/5] Update TS28541_SliceNrm.yaml --- OpenAPI/TS28541_SliceNrm.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/OpenAPI/TS28541_SliceNrm.yaml b/OpenAPI/TS28541_SliceNrm.yaml index 6dc884509..e18997865 100755 --- a/OpenAPI/TS28541_SliceNrm.yaml +++ b/OpenAPI/TS28541_SliceNrm.yaml @@ -659,8 +659,8 @@ components: $ref: '#/components/schemas/EP_Transport-Multiple' NetworkSliceSubnetProviderCapabilities: $ref: '#/components/schemas/NetworkSliceSubnetProviderCapabilities-Multiple' - FeasibilityCheckJob: - $ref: '#/components/schemas/FeasibilityCheckJob-Multiple' + FeasibilityCheckAndReservationJob: + $ref: '#/components/schemas/FeasibilityCheckAndReservationJob-Multiple' NetworkSlice-Single: @@ -811,7 +811,7 @@ components: type: array items: $ref: '#/components/schemas/NetworkSliceSubnetProviderCapabilities-Single' - FeasibilityCheckJob-Multiple: + FeasibilityCheckAndReservationJob-Multiple: type: array items: $ref: '#/components/schemas/FeasibilityCheckAndReservationJob-Single' -- GitLab From 69e810ee2a40c3fe992c0910d2797eff238e581d Mon Sep 17 00:00:00 2001 From: ruiyue Date: Tue, 23 Aug 2022 21:36:24 +0000 Subject: [PATCH 5/5] Update TS28541_SliceNrm.yaml --- OpenAPI/TS28541_SliceNrm.yaml | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/OpenAPI/TS28541_SliceNrm.yaml b/OpenAPI/TS28541_SliceNrm.yaml index e18997865..5191c7c9b 100755 --- a/OpenAPI/TS28541_SliceNrm.yaml +++ b/OpenAPI/TS28541_SliceNrm.yaml @@ -590,10 +590,6 @@ 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 - RecommendationRequest: - description: >- - An attribute represents MnS consumer's request for recommended network slice related requirements. - type: boolean 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.. @@ -765,9 +761,7 @@ components: - $ref: '#/components/schemas/SliceProfile' - $ref: '#/components/schemas/ServiceProfile' resourceReservation: - $ref: '#/components/schemas/ResourceReservation' - recommendationRequest: - $ref: '#/components/schemas/RecommendationRequest' + $ref: '#/components/schemas/ResourceReservation' requestedReservationExpiration: $ref: '#/components/schemas/RequestedReservationExpiration' processMonitor: -- GitLab