Commit de1078b6 authored by sunse's avatar sunse
Browse files

Merge branch... 

Merge branch 'TS28.541_CR0800_TS28.623_CR0214_Rel-18_Add_NetworkSliceController_and_NetworkSliceSubnetController_IOCs' into 'Integration_Rel18_SA5_149_YAML'

TS28.541 Rel18 CR0800 Add NetworkSliceController and NetworkSliceSubnetController...

See merge request !623
parents 4eba95e6 f84662ad

OpenAPI/TS28541_SliceNrm.yaml

+69 −2
Original line number Diff line number Diff line
@@ -690,6 +690,10 @@ components: 
              $ref: '#/components/schemas/NetworkSliceSubnetProviderCapabilities-Multiple'

            FeasibilityCheckAndReservationJob:

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

            NetworkSliceController:

              $ref: '#/components/schemas/NetworkSliceController-Multiple'

            NetworkSliceSubnetController:

              $ref: '#/components/schemas/NetworkSliceSubnetController-Multiple'





    NetworkSlice-Single:
@@ -709,6 +713,8 @@ components: 
                      $ref: 'TS28623_ComDefs.yaml#/components/schemas/AdministrativeState'

                    serviceProfileList:

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

                    networkSliceControllerRef:

                      $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList'



    NetworkSliceSubnet-Single:

      allOf:
@@ -741,6 +747,8 @@ components: 
                        - TOP_SLICESUBNET

                        - RAN_SLICESUBNET

                        - CN_SLICESUBNET

                    networkSliceSubnetControllerRef:

                      $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList'



    EP_Transport-Single:

      allOf:
@@ -815,6 +823,52 @@ components: 
                recommendedRequirements:

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



    NetworkSliceController-Single:

      allOf:

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

        - type: object

          properties: 

            attributes:

              type: object

              properties:

                inputServiceProfile:

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

                serviceProfileId: 

                  type: string

                operationalState:

                  $ref: 'TS28623_ComDefs.yaml#/components/schemas/OperationalState'

                administrativeState:

                  $ref: 'TS28623_ComDefs.yaml#/components/schemas/AdministrativeState'

                availabilityStatus:

                  $ref: 'TS28623_ComDefs.yaml#/components/schemas/AvailabilityStatus'

                processMonitor:

                  $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ProcessMonitor'

                networkSliceRef:

                  $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn'



    NetworkSliceSubnetController-Single:

      allOf:

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

        - type: object

          properties: 

            attributes:

              type: object

              properties:

                inputSliceProfile:

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

                sliceProfileId: 

                  type: string

                operationalState:

                  $ref: 'TS28623_ComDefs.yaml#/components/schemas/OperationalState'

                administrativeState:

                  $ref: 'TS28623_ComDefs.yaml#/components/schemas/AdministrativeState'

                availabilityStatus:

                  $ref: 'TS28623_ComDefs.yaml#/components/schemas/AvailabilityStatus'

                processMonitor:

                  $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ProcessMonitor'

                networkSliceSubnetRef:

                  $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn'



#-------- Definition of JSON arrays for name-contained IOCs ----------------------

    SubNetwork-Multiple:

      type: array
@@ -845,6 +899,16 @@ components: 
      items:

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



    NetworkSliceController-Multiple:

      type: array

      items:

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



    NetworkSliceSubnetController-Multiple:

      type: array

      items:

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



#------------ Definitions in TS 28.541 for TS 28.532 -----------------------------



    resources-sliceNrm:
@@ -857,3 +921,6 @@ components: 
       - $ref: '#/components/schemas/EP_Transport-Single'

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

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

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

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

OpenAPI/TS28623_ComDefs.yaml

+12 −0
Original line number Diff line number Diff line
@@ -166,6 +166,18 @@ components: 
        - IDEL

        - ACTIVE

        - BUSY

    AvailabilityStatus:

      type: string

      enum:

        - IN_TEST

        - FAILED

        - POWER_OFF

        - OFF_LINE

        - OFF_DUTY

        - DEPENDENCY

        - DEGRADED

        - NOT_INSTALLED

        - LOG_FULL



    AttributeNameValuePairSet:

      description: >-