From 28dbcddd310718cabcd29609badef8243de3bef8 Mon Sep 17 00:00:00 2001
From: srinivasaraj <srilakshmi.s@nokia.com>
Date: Sun, 29 Oct 2023 08:25:26 +0000
Subject: [PATCH 1/2] 
 TS28.541_Rel-18_CR0858_Add_NRM_for_network_slice_isolation

---
 OpenAPI/TS28541_SliceNrm.yaml | 40 ++++++++++++++++++++++++++++++++++-
 1 file changed, 39 insertions(+), 1 deletion(-)

diff --git a/OpenAPI/TS28541_SliceNrm.yaml b/OpenAPI/TS28541_SliceNrm.yaml
index f88fbabda..f7b6eae90 100755
--- a/OpenAPI/TS28541_SliceNrm.yaml
+++ b/OpenAPI/TS28541_SliceNrm.yaml
@@ -706,7 +706,22 @@ components:
         An attribute that specifies the additional reason information if the reservation is failed. 
       type: string
 
-
+    IsolationRule:
+      type: string
+      enum:
+        - Dedicated
+        - Shared
+    
+    ResourceIsolationRule:
+      type: object
+      properties:
+        resourceType:
+          type: string
+          enum:
+            - Managed function
+            - Network service
+        isolationRule:
+          $ref: '#/components/schemas/IsolationRule'
 
 #------------ Definition of concrete IOCs ----------------------------------------
 
@@ -769,6 +784,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 +820,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 +944,24 @@ 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:
+                    resourceIsolationRuleList:
+                      type: array
+                      items:
+                        $ref: '#/components/schemas/ResourceIsolationRule'
+                    networkSliceListRef:
+                      $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
@@ -979,4 +1016,5 @@ components:
        - $ref: '#/components/schemas/FeasibilityCheckAndReservationJob-Single'
        - $ref: '#/components/schemas/NetworkSliceController-Single'
        - $ref: '#/components/schemas/NetworkSliceSubnetController-Single'
+       - $ref: '#/components/schemas/IsolationProfile-Single'
     
-- 
GitLab


From 6221fdaac02e5c81242bdf818e7a29017822d325 Mon Sep 17 00:00:00 2001
From: srinivasaraj <srilakshmi.s@nokia.com>
Date: Wed, 15 Nov 2023 15:37:38 +0000
Subject: [PATCH 2/2] Updates to address comments during the meeting

---
 OpenAPI/TS28541_SliceNrm.yaml | 33 ++++++++++++++++++++++-----------
 1 file changed, 22 insertions(+), 11 deletions(-)

diff --git a/OpenAPI/TS28541_SliceNrm.yaml b/OpenAPI/TS28541_SliceNrm.yaml
index f7b6eae90..2f3d555ec 100755
--- a/OpenAPI/TS28541_SliceNrm.yaml
+++ b/OpenAPI/TS28541_SliceNrm.yaml
@@ -706,22 +706,25 @@ components:
         An attribute that specifies the additional reason information if the reservation is failed. 
       type: string
 
-    IsolationRule:
-      type: string
-      enum:
-        - Dedicated
-        - Shared
-    
     ResourceIsolationRule:
       type: object
       properties:
         resourceType:
           type: string
           enum:
-            - Managed function
-            - Network service
+            - MANAGED_FUNCTION
+            - NETWORK_SERVICE
         isolationRule:
-          $ref: '#/components/schemas/IsolationRule'
+          type: string
+          enum:
+            - DEDICATED
+            - SHARED
+
+    NetworkSlicingApplicability:
+      type: string
+      enum:
+        - NETWORKSLICE
+        - NETWORKSLICESUBNET
 
 #------------ Definition of concrete IOCs ----------------------------------------
 
@@ -763,7 +766,8 @@ components:
               $ref: '#/components/schemas/NetworkSliceController-Multiple'
             NetworkSliceSubnetController:
               $ref: '#/components/schemas/NetworkSliceSubnetController-Multiple'
-
+            IsolationProfile:
+              $ref: '#/components/schemas/IsolationProfile-Multiple'
 
     NetworkSlice-Single:
       allOf:
@@ -953,11 +957,13 @@ components:
               allOf:
                 - type: object
                   properties:
+                    networkSlicingApplicability:
+                      $ref: '#/components/schemas/NetworkSlicingApplicability'
                     resourceIsolationRuleList:
                       type: array
                       items:
                         $ref: '#/components/schemas/ResourceIsolationRule'
-                    networkSliceListRef:
+                    networkSliceRefList:
                       $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList'
                     networkSliceSubnetRefList:
                       $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList'
@@ -1002,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:
-- 
GitLab