Commit 92337cfc authored by sunse's avatar sunse
Browse files

Merge branch 'TS28.541_Rel-18_CR0858_Add_NRM_for_network_slice_isolation1'... 

Merge branch 'TS28.541_Rel-18_CR0858_Add_NRM_for_network_slice_isolation1' into 'Integration_Rel18_SA5_152_YAML'

TS28.541_Rel-18_CR0858_Add_NRM_for_network_slice_isolation

See merge request !830
parents d4c0caf7 6221fdaa

OpenAPI/TS28541_SliceNrm.yaml

+50 −1
Original line number Diff line number Diff line
@@ -706,7 +706,25 @@ components: 
        An attribute that specifies the additional reason information if the reservation is failed. 

      type: string



    ResourceIsolationRule:

      type: object

      properties:

        resourceType:

          type: string

          enum:

            - MANAGED_FUNCTION

            - NETWORK_SERVICE

        isolationRule:

          type: string

          enum:

            - DEDICATED

            - SHARED



    NetworkSlicingApplicability:

      type: string

      enum:

        - NETWORKSLICE

        - NETWORKSLICESUBNET



#------------ Definition of concrete IOCs ----------------------------------------
@@ -748,7 +766,8 @@ components: 
              $ref: '#/components/schemas/NetworkSliceController-Multiple'

            NetworkSliceSubnetController:

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



            IsolationProfile:

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



    NetworkSlice-Single:

      allOf:
@@ -769,6 +788,8 @@ components: 
                      $ref: '#/components/schemas/ServiceProfileList'

                    networkSliceControllerRef:

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

                    isolationProfileRef:

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



    NetworkSliceSubnet-Single:

      allOf:
@@ -803,6 +824,8 @@ components: 
                        - CN_SLICESUBNET

                    networkSliceSubnetControllerRef:

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

                    isolationProfileRef:

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



    EP_Transport-Single:

      allOf:
@@ -925,6 +948,26 @@ components: 
                networkSliceSubnetRef:

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



    IsolationProfile-Single:

      allOf:

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

        - type: object

          properties:

            attributes:

              allOf:

                - type: object

                  properties:

                    networkSlicingApplicability:

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

                    resourceIsolationRuleList:

                      type: array

                      items:

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

                    networkSliceRefList:

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

                    networkSliceSubnetRefList:

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



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

    SubNetwork-Multiple:

      type: array
@@ -965,6 +1008,11 @@ components: 
      items:

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



    IsolationProfile-Multiple:

      type: array

      items:

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



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



    resources-sliceNrm:
@@ -979,4 +1027,5 @@ components: 
       - $ref: '#/components/schemas/FeasibilityCheckAndReservationJob-Single'

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

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

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