Commit be54028c authored by ruiyue's avatar ruiyue
Browse files

Merge branch... 

Merge branch 'TS28.541_Rel18_CR0758_Update_stage2_and_stage3_definition_for_FeasibilityCheckAndReservationJob' into 'Integration_Rel18_SA5_145_YAML'

Ts28.541 rel18 cr0758 update stage2 and stage3 definition for feasibility check and reservation job

See merge request sa5/MnS!394
parents f7ca9859 895894f7

OpenAPI/TS28541_SliceNrm.yaml

+21 −15
Original line number Diff line number Diff line
@@ -576,30 +576,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:
@@ -607,11 +611,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
@@ -651,8 +655,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:
@@ -744,7 +748,7 @@ components: 
                  type: array

                  items:

                    type: string

    FeasibilityCheckJob-Single:

    FeasibilityCheckAndReservationJob-Single:

      allOf:

        - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top'     

        - type: object
@@ -758,6 +762,8 @@ components: 
                    - $ref: '#/components/schemas/ServiceProfile'

                resourceReservation:

                  $ref: '#/components/schemas/ResourceReservation'

                recommendationRequest:

                  $ref: '#/components/schemas/RecommendationRequest'

                requestedReservationExpiration:

                  $ref: '#/components/schemas/RequestedReservationExpiration'

                processMonitor:
@@ -801,10 +807,10 @@ components: 
      type: array

      items:

        $ref: '#/components/schemas/NetworkSliceSubnetProviderCapabilities-Single'

    FeasibilityCheckJob-Multiple:

    FeasibilityCheckAndReservationJob-Multiple:

      type: array

      items:

        $ref: '#/components/schemas/FeasibilityCheckJob-Single'   

        $ref: '#/components/schemas/FeasibilityCheckAndReservationJob-Single'   

        

#------------ Definitions in TS 28.541 for TS 28.532 -----------------------------
@@ -817,4 +823,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'