From db7aa96735bcf89c51017738538c6aaf3a8788a6 Mon Sep 17 00:00:00 2001
From: sunse <sean.sun@nokia-sbell.com>
Date: Mon, 1 Apr 2024 14:24:03 +0000
Subject: [PATCH] 
 Schema_definition_Issues_for_SubNetwork_of_OpenAPI_SS_TS28318_Rel18

---
 OpenAPI/TS28318_DsoNrm.yaml     | 33 ++++++++++-----------------------
 OpenAPI/TS28623_GenericNrm.yaml |  1 +
 2 files changed, 11 insertions(+), 23 deletions(-)

diff --git a/OpenAPI/TS28318_DsoNrm.yaml b/OpenAPI/TS28318_DsoNrm.yaml
index 25c311611..5fab07886 100644
--- a/OpenAPI/TS28318_DsoNrm.yaml
+++ b/OpenAPI/TS28318_DsoNrm.yaml
@@ -30,25 +30,17 @@ components:
         - type: object
           properties:
             SubNetwork:
-              $ref: '#/components/schemas/SubNetwork-Multiple'
+              type: array
+              items: 
+                $ref: '#/components/schemas/SubNetwork-ncO-DsoNrm'
 
-    SubNetwork-Single:
-      allOf:
-        - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top'
-        - type: object
-          properties:
-            attributes:
-              allOf:
-                - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/SubNetwork-Attr'
-        - type: object
-          properties:
-            Subnetwork:
-              $ref: '#/components/schemas/SubNetwork-Multiple'
-            OutageAndRecoveryInfo:
-              $ref: '#/components/schemas/OutageAndRecoveryInfo-Multiple'
-            DsoThresholdMonitor:
-              $ref: '#/components/schemas/DsoThresholdMonitor-Multiple'
-        - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/SubNetwork-ncO'
+    SubNetwork-ncO-DsoNrm:
+      type: object
+      properties:
+        OutageAndRecoveryInfo:
+          $ref: '#/components/schemas/OutageAndRecoveryInfo-Multiple'
+        DsoThresholdMonitor:
+          $ref: '#/components/schemas/DsoThresholdMonitor-Multiple'
 
     OutageAndRecoveryInfo-Single:
       allOf:
@@ -87,10 +79,6 @@ components:
 
 #-------- Definition of JSON arrays for name-contained IOCs ----------------------                               
           
-    SubNetwork-Multiple:
-      type: array
-      items:
-        $ref: '#/components/schemas/SubNetwork-Single'
     OutageAndRecoveryInfo-Multiple:
       type: array
       items:
@@ -105,6 +93,5 @@ components:
     resources-DSORecovery:
       oneOf:
         - $ref: '#/components/schemas/MnS'
-        - $ref: '#/components/schemas/SubNetwork-Single'
         - $ref: '#/components/schemas/OutageAndRecoveryInfo-Single'
         - $ref: '#/components/schemas/DsoThresholdMonitor-Single'        
diff --git a/OpenAPI/TS28623_GenericNrm.yaml b/OpenAPI/TS28623_GenericNrm.yaml
index 3d72b9232..843a9cbcf 100755
--- a/OpenAPI/TS28623_GenericNrm.yaml
+++ b/OpenAPI/TS28623_GenericNrm.yaml
@@ -699,6 +699,7 @@ components:
         - $ref: 'TS28541_SliceNrm.yaml#/components/schemas/SubNetwork-ncO-SliceNrm'
         - $ref: 'TS28541_NrNrm.yaml#/components/schemas/SubNetwork-ncO-NrNrm'
         - $ref: 'TS28541_5GcNrm.yaml#/components/schemas/SubNetwork-ncO-5GcNrm'
+        - $ref: 'TS28318_DsoNrm.yaml#/components/schemas/SubNetwork-ncO-DsoNrm'
 
     ManagedElement-Single:
       allOf:
-- 
GitLab