OpenAPI/README.md

@@ -31,10 +31,14 @@ The links below will open the Swagger Editor/UI and auto-load the OpenAPI YAML f
 ([Editor](https://forge.3gpp.org/swagger/tools/loader.html?yaml=OpenAPI/TS28623_QoEMeasurementCollectionNrm.yaml))
 ([UI](https://forge.3gpp.org/swagger/tools/loader.html?action=ui&yaml=OpenAPI/TS28623_QoEMeasurementCollectionNrm.yaml))
 
-* Subscription Control NRM NRM (TS 28.623)
+* Subscription Control NRM (TS 28.623)
 ([Editor](https://forge.3gpp.org/swagger/tools/loader.html?yaml=OpenAPI/TS28623_SubscriptionControlNrm.yaml))
 ([UI](https://forge.3gpp.org/swagger/tools/loader.html?action=ui&yaml=OpenAPI/TS28623_SubscriptionControlNrm.yaml))
 
+* File Management NRM (TS 28.623)
+([Editor](https://forge.3gpp.org/swagger/tools/loader.html?yaml=OpenAPI/TS28623_FileManagementNrm.yaml))
+([UI](https://forge.3gpp.org/swagger/tools/loader.html?action=ui&yaml=OpenAPI/TS28623_FileManagementNrm.yaml))
+
 * Threshold Monitor NRM(TS 28.623)
 ([Editor](https://forge.3gpp.org/swagger/tools/loader.html?yaml=OpenAPI/TS28623_ThresholdMonitorNrm.yaml))
 ([UI](https://forge.3gpp.org/swagger/tools/loader.html?action=ui&yaml=OpenAPI/TS28623_ThresholdMonitorNrm.yaml))
@@ -130,6 +134,14 @@ The links below will open the Swagger Editor/UI and auto-load the OpenAPI YAML f
 ([Editor](https://forge.3gpp.org/swagger/tools/loader.html?yaml=OpenAPI/TS28532_StreamingDataMnS.yaml))
 ([UI](https://forge.3gpp.org/swagger/tools/loader.html?action=ui&yaml=OpenAPI/TS28532_StreamingDataMnS.yaml))
 
+* Network Slice Provisioning MnS (TS 28.531)
+([Editor](https://forge.3gpp.org/swagger/tools/loader.html?yaml=OpenAPI/TS28531_NSProvMnS.yaml))
+([UI](https://forge.3gpp.org/swagger/tools/loader.html?action=ui&yaml=OpenAPI/TS28531_NSProvMnS.yaml))
+
+* Network Slice Subnet Provisioning MnS (TS 28.531)
+([Editor](https://forge.3gpp.org/swagger/tools/loader.html?yaml=OpenAPI/TS28531_NSSProvMnS.yaml))
+([UI](https://forge.3gpp.org/swagger/tools/loader.html?action=ui&yaml=OpenAPI/TS28531_NSSProvMnS.yaml))
+
 ## Tools
 
 * [Frontend](https://forge.3gpp.org/swagger/tools/GitlabOpenAPIFrontend.htm) to invoke the Swagger Editor, Swagger UI, or to parse OpenAPI files with APIDevTools Swagger Parser/Validator, or to search for APIs referencing a data structure

OpenAPI/TS28104_MdaNrm.yaml

 openapi: 3.0.1
 info:
   title: MDA NRM
-  version: 18.3.0
+  version: 18.4.0
   description: >-
     OAS 3.0.1 specification of the MDA NRM
     © 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC).
@@ -138,6 +138,10 @@ components:
                   properties:
                     supportedMDACapabilities:
                       $ref: '#/components/schemas/MDATypes'
+                    mlModelRef:
+                      $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn'
+                    aIMLInferenceFunctionRef:
+                      $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn'  
         - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO'
         - type: object
           properties:

OpenAPI/TS28111_FaultNrm.yaml

@@ -229,6 +229,8 @@ components:
                   type: object
                   additionalProperties:
                     $ref: '#/components/schemas/AlarmRecord'
+                unreliableAlarmScope:
+                  $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn'
 
 
   #---- Definition of alarm notifications --------------------------------------------#
@@ -312,6 +314,8 @@ components:
               $ref: '#/components/schemas/AlarmType'
             probableCause:
               $ref: '#/components/schemas/ProbableCause'
+            specificProblem:
+              $ref: '#/components/schemas/SpecificProblem'
             perceivedSeverity:
               $ref: '#/components/schemas/PerceivedSeverity'
             correlatedNotifications:
@@ -549,3 +553,10 @@ components:
       type: object
       additionalProperties:
         $ref: '#/components/schemas/Comment'
+
+   #----- Definitions in TS 28.111 for TS 28.532 --------------------------#
+    resources-faultNrm:
+      oneOf:
+       - $ref: '#/components/schemas/AlarmList-Single'       
+    
+   #----- Definitions in TS 28.111 for TS 28.532 --------------------------#
\ No newline at end of file

OpenAPI/TS28312_IntentNrm.yaml

 openapi: 3.0.1
 info:
   title: Intent NRM
-  version: 18.3.0
+  version: 18.4.0
   description: >-
     OAS 3.0.1 definition of the Intent NRM
     © 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC).
@@ -150,13 +150,12 @@ components:
         objectType:
           type: string
           enum:
-            - RAN_SubNetwork  #value for Radio Network Expectation--#
-            - Edge_Service_Support  #value for Edge Service Support Expectation--#
-            - 5GC_SubNetwork  #value for 5GC Network Expectation--#
+            - RAN_SUBNETWORK  #value for Radio Network Expectation--#
+            - EDGE_SERVICE_SUPPORT  #value for Edge Service Support Expectation--#
+            - 5GC_SUBNETWORK  #value for 5GC Network Expectation--#
+            - Radio_Service  #value for Radio Service Expectation--#            
         objectInstance:
           $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn'
-        contextSelectivity:
-          $ref: "#/components/schemas/Selectivity"
         objectContexts:
           type: array
           items:
@@ -192,6 +191,7 @@ components:
       enum:
           - FULFILLED
           - NOT_FULFILLED
+      default: NOT_FULFILLED        
       description: It describes the current status of the intent fulfilment result.    
     NotFulfilledState:
       type: string
@@ -203,6 +203,7 @@ components:
           - SUSPENDED
           - TERMINATED
           - FULFILMENTFAILED
+      default: ACKNOWLEDGED             
       description: It describes the current progress of or the reason for not achieving fulfilment 
                    for the intent, intentExpectation or expectationTarget.
                    An attribute which is used when FulfilmentInfo is implemented for IntentFulfilmentInfo    
@@ -227,7 +228,7 @@ components:
       enum:
           - DELIVER
           - ENSURE
-      description: It describes the characteristic of the intentExpectation and is the property that describes the types of intentExpectations.    
+      description: It describes the characteristic of the intentExpectation and is the property that describes the types of intentExpectations. Vendor extensions are allowed    
     Frequency:
       description: >-
         It desribes the RF reference frequency (i.e. Absolute Radio Frequency Channel Number) 
@@ -360,6 +361,9 @@ components:
           $ref: '#/components/schemas/FulfilmentInfo'
         targetAchievedValue:
           type: number
+          description: >-
+            It describes the value that has been achieved for the expectation target at the time at which 
+            the report is generated.
    #-------Definition of the concrete TargetFulfilmentResult dataType----------------#
 
    #-------Definition of the generic IntentConflictReport dataType----------------#
@@ -429,6 +433,7 @@ components:
             - RAN_SUBNETWORK
             - EDGE_SERVICE_SUPPORT
             - 5GC_SUBNETWORK 
+            - Radio_Service
           description: It describes the expectation object type which can be supported by a specific intent handling function of MnS producer.            
         supportedExpectationTargetNames:
           type: array

OpenAPI/TS28318_DsoNrm.yaml

 openapi: 3.0.1
 info:
   title: 3GPP NRM
-  version: 18.5.0
+  version: 18.1.0
   description: >-
     OAS 3.0.1 specification of the OutageAndRecoveryInfo NRM
     © 2024, 3GPP Organizational OutageAndRecoveryInfo Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC).
@@ -25,30 +25,13 @@ components:
 
 
 #-------- Definition of concrete IOCs --------------------------------------------
-    MnS:
-      oneOf:
-        - type: object
-          properties:
-            SubNetwork:
-              $ref: '#/components/schemas/SubNetwork-Multiple'
-
-    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
+    SubNetwork-ncO-DsoNrm:
+      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'
 
     OutageAndRecoveryInfo-Single:
       allOf:
@@ -87,10 +70,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:
@@ -104,7 +83,5 @@ components:
 
     resources-DSORecovery:
       oneOf:
-        - $ref: '#/components/schemas/MnS'
-        - $ref: '#/components/schemas/SubNetwork-Single'
         - $ref: '#/components/schemas/OutageAndRecoveryInfo-Single'
         - $ref: '#/components/schemas/DsoThresholdMonitor-Single'        

OpenAPI/TS28531_NSProvMnS.yaml

+openapi: 3.0.1
+info:
+  title: Network Slice Provisioning MnS
+  version: 18.6.0
+  description: >-
+    OAS 3.0.1 definition of the Network Slice Provisioning MnS
+    © 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC).
+    All rights reserved.
+externalDocs:
+  description: 3GPP TS 28.531; Provisioning
+  url: http://www.3gpp.org/ftp/Specs/archive/28_series/28.531/
+servers:
+  - url: '{MnSRoot}/NSProvMnS/{MnSVersion}'
+    variables:
+      MnSRoot:
+        description: See clause 4.4.2 of TS 32.158
+        default: http://example.com/3GPPManagement
+      MnSVersion:
+        description: Version number of the OpenAPI definition
+        default: XXX
+paths:
+  /ServiceProfiles:
+   post:
+    summary: Create a ServiceProfile
+    description: To create a ServiceProfile resource to represent network slice related requirements.
+    requestBody:
+      required: true
+      content:
+        application/json:
+          schema:
+              $ref: '#/components/schemas/ServiceProfile-Type'
+    responses:
+        '201':
+          description: Success case ("201 Created"). The representation of the newly created ServiceProfile resource shall be returned.
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/ServiceProfileId-Type'
+        default:
+          description: Error case.
+          content:
+            application/json:
+              schema:
+                $ref: 'TS28623_ComDefs.yaml#/components/schemas/ErrorResponseDefault'
+
+  /ServiceProfiles/{ServiceProfileId}:
+   delete:
+    summary: Delete a ServiceProfile
+    description: To delete a ServiceProfile resource to represent network slice related requirements.
+    parameters:
+      - name: ServiceProfileId
+        in: path
+        description: Identifies an individual ServiceProfille.
+        required: true
+        schema:
+          $ref: '#/components/schemas/ServiceProfileId-Type'
+      - name: networkSliceDN
+        in: query
+        description: Identifies the DN of NetworkSlice MOI uniquely identifying the network slice instance
+        required: true
+        schema:
+          $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn'  
+    responses:
+      '204':
+        description: >-
+          Success case ("204 No Content").
+          The ServiceProfile resource has been deleted. The response message body is absent.
+      default:
+        description: Error case.
+        content:
+          application/json:
+            schema:
+              $ref: 'TS28623_ComDefs.yaml#/components/schemas/ErrorResponseDefault'
+components:
+  schemas:
+    uri-Type:
+      description: Resource URI
+      type: string
+    ServiceProfileId-Type:
+       $ref: '#/components/schemas/uri-Type'
+    ServiceProfile-Type:
+       $ref: 'TS28541_SliceNrm.yaml#/components/schemas/ServiceProfile'     
\ No newline at end of file

OpenAPI/TS28531_NSSProvMnS.yaml

+openapi: 3.0.1
+info:
+  title: Network Slice Subnet Provisioning MnS
+  version: 18.6.0
+  description: >-
+    OAS 3.0.1 definition of the Network Slice Suubnet Provisioning MnS
+    © 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC).
+    All rights reserved.
+externalDocs:
+  description: 3GPP TS 28.531; Provisioning
+  url: http://www.3gpp.org/ftp/Specs/archive/28_series/28.531/
+servers:
+  - url: '{MnSRoot}/NSSProvMnS/{MnSVersion}'
+    variables:
+      MnSRoot:
+        description: See clause 4.4.2 of TS 32.158
+        default: http://example.com/3GPPManagement
+      MnSVersion:
+        description: Version number of the OpenAPI definition
+        default: XXX
+paths:
+  /SliceProfiles:
+   post:
+    summary: Create a SliceProfile
+    description: To create a SliceeProfile resource to represent network slice subnet related requirements.
+    requestBody:
+      required: true
+      content:
+        application/json:
+          schema:
+              $ref: '#/components/schemas/ServiceProfileId-Type'
+    responses:
+        '201':
+          description: Success case ("201 Created"). The representation of the newly created SliceProfile resource shall be returned.
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/SliceProfileId-Type'
+        default:
+          description: Error case.
+          content:
+            application/json:
+              schema:
+                $ref: 'TS28623_ComDefs.yaml#/components/schemas/ErrorResponseDefault'
+
+  /SliceProfiles/{SliceProfileId}:
+   delete:
+    summary: Delete a SliceProfile
+    description: To delete a SliceProfile resource to represent network slice suubnet related requirements.
+    parameters:
+      - name: SliceProfileId
+        in: path
+        description: Identifies an individual SliceProfille.
+        required: true
+        schema:
+          $ref: '#/components/schemas/SliceProfileId-Type'
+      - name: networkSliceSubnetDN
+        in: query
+        description: Identifies the DN of NetworkSliceSubnet MOI uniquely identifying the network slice subnet instance
+        required: true
+        schema:
+          $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn'            
+    responses:
+      '204':
+        description: >-
+          Success case ("204 No Content").
+          The ServiceProfile resource has been deleted. The response message body is absent.
+      default:
+        description: Error case.
+        content:
+          application/json:
+            schema:
+              $ref: 'TS28623_ComDefs.yaml#/components/schemas/ErrorResponseDefault'
+components:
+  schemas:
+    uri-Type:
+      description: Resource URI
+      type: string
+    SliceProfileId-Type:
+       $ref: '#/components/schemas/uri-Type'
+    ServiceProfileId-Type:
+       $ref: 'TS28541_SliceNrm.yaml#/components/schemas/SliceProfile'       
\ No newline at end of file

OpenAPI/TS28532_ProvMnS.yaml

 openapi: 3.0.1
 info:
   title: Provisioning MnS
-  version: 18.2.0
+  version: 18.3.0
   description: >-
     OAS 3.0.1 definition of the Provisioning MnS
     © 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC).
@@ -433,11 +433,13 @@ components:
             - $ref: 'TS28623_ManagementDataCollectionNrm.yaml#/components/schemas/resources-mgmtDataCollectionNrm'
             - $ref: 'TS28623_MnSRegistryNrm.yaml#/components/schemas/resources-mnSRegistryNrm'     
             - $ref: 'TS28623_PmControlNrm.yaml#/components/schemas/resources-pmControlNrm'
+            - $ref: 'TS28111_FaultNrm.yaml#/components/schemas/resources-faultNrm'            
             - $ref: 'TS28623_QoEMeasurementCollectionNrm.yaml#/components/schemas/resources-qoEMeasuremetCollectionNrm' 
             - $ref: 'TS28623_SubscriptionControlNrm.yaml#/components/schemas/resources-subscriptionControlNrm'  
             - $ref: 'TS28623_ThresholdMonitorNrm.yaml#/components/schemas/resources-thresholdMonitorNrm'   
             - $ref: 'TS28623_TraceControlNrm.yaml#/components/schemas/resources-traceControlNrm'                                                                                                              
             - $ref: 'TS28319_MsacNrm.yaml#/components/schemas/resources-msacNrm'
+            - $ref: 'TS28318_DsoNrm.yaml#/components/schemas/resources-DSORecovery'
     Scope:
       type: object
       properties:
@@ -537,7 +539,7 @@ components:
             - specificProblem
           properties:
             specificProblem:
-              $ref: 'TS28532_FaultMnS.yaml#/components/schemas/SpecificProblem'
+              $ref: 'TS28111_FaultNrm.yaml#/components/schemas/SpecificProblem'
             additionalText:
               type: string
             additionalInformation:

OpenAPI/TS28536_CoslaNrm.yaml

@@ -2,14 +2,14 @@ openapi: 3.0.1
 
 info:
   title: coslaNrm
-  version: 17.4.0
+  version: 18.1.0
   description: >-
     OAS 3.0.1 specification of the Cosla NRM
     © 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC).
     All rights reserved.
 
 externalDocs:
-  description: 3GPP TS 28.536 V17.3.0; Cosla NRM
+  description: 3GPP TS 28.536; Cosla NRM
   url: http://www.3gpp.org/ftp/Specs/archive/28_series/28.536/
 
 paths: {}
@@ -140,21 +140,6 @@ components:
           $ref: '#/components/schemas/AssuranceClosedControlLoop-Multiple'
 
 #-------- Definition of concrete IOCs --------------------------------------------
-    MnS:
-      oneOf:
-        - type: object
-          properties:
-            SubNetwork:
-              type: array
-              items:
-                $ref: '#/components/schemas/SubNetwork-ncO-CoslaNrm'
-        - type: object
-          properties:
-            ManagedElement:
-              type: array
-              items:
-                $ref: '#/components/schemas/ManagedElement-ncO-CoslaNrm'
-
     AssuranceClosedControlLoop-Single:
       allOf:
         - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top'
@@ -226,7 +211,6 @@ components:
 
     resources-coslaNrm:
       oneOf:
-       - $ref: '#/components/schemas/MnS'
        - $ref: '#/components/schemas/AssuranceClosedControlLoop-Single'
        - $ref: '#/components/schemas/AssuranceGoal-Single'    
        - $ref: '#/components/schemas/AssuranceReport-Single'

OpenAPI/TS28538_EdgeNrm.yaml

 openapi: 3.0.1
 info:
   title: 3GPP Edge NRM
-  version: 18.6.0
+  version: 18.7.0
   description: >-
     OAS 3.0.1 specification of the Edge NRM
     © 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC).
@@ -147,6 +147,18 @@ components:
       properties:
         resourceQuota:
           $ref: '#/components/schemas/VirtualResource'
+    FederatedECSInfo:
+      type: object
+      properties:
+        federateECSIdentifier:
+          $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn'
+        federatedECSProfile:
+          type: integer
+        servedEASList:
+          $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn'
+        servedEESList:
+          $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn'
+
 
 #-------- Definition of types for name-containments ------
     SubNetwork-ncO-EdgeNrm:
@@ -158,14 +170,6 @@ components:
           $ref: '#/components/schemas/EdgeDataNetwork-Multiple'
 
 #-------- Definition of concrete IOCs --------------------------------------------
-    MnS:
-      oneOf:
-        - type: object
-          properties:
-            SubNetwork:
-              type: array
-              items:
-                $ref: '#/components/schemas/SubNetwork-ncO-EdgeNrm'
 
     EdgeDataNetwork-Single:
       allOf:
@@ -289,6 +293,8 @@ components:
                       $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList'
                     softwareImageInfo:
                       $ref: '#/components/schemas/SoftwareImageInfo'
+                    sharedECSInfo:
+                      $ref: '#/components/schemas/FederatedECSInfo'
         - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO'
 
     EASRequirements-Single:
@@ -347,8 +353,11 @@ components:
           properties:
             participatingOPiD:
               type: string
-            originatingOPiD:
+            leadingOPiD:
               type: string
+            federatedECSInfo:
+              $ref: '#/components/schemas/FederatedECSInfo'
+
     OperatorEdgeFederation-Single:
       allOf:
         - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top'
@@ -358,7 +367,7 @@ components:
               type: string
             FederationExpiry:
               $ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTime'
-            originatedOPiD:
+            leadingOPiD:
               type: string
             avaibleEDNList:
               $ref: '#/components/schemas/AvailableEDNList'
@@ -415,7 +424,6 @@ components:
 
     resources-edgeNrm:
       oneOf:
-        - $ref: '#/components/schemas/MnS'
         - $ref: '#/components/schemas/EASFunction-Single'
         - $ref: '#/components/schemas/ECSFunction-Single'
         - $ref: '#/components/schemas/EESFunction-Single'

OpenAPI/TS28541_NrNrm.yaml

 openapi: 3.0.1
 info:
   title: NR NRM
-  version: 18.7.0
+  version: 19.0.0
   description: >-
     OAS 3.0.1 specification of the NR NRM
     © 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC).
@@ -65,34 +65,10 @@ components:
       type: array
       items:
         $ref: '#/components/schemas/PlmnInfo'            
-    cagId:
-      type: string
-    nid:
-      type: string
-    NpnIdentity:
-      type: object
-      oneOf:
-        - required: [ plmnId, cagidList ]
-        - required: [ plmnId, nidList ]       
-      properties:
-        plmnId:
-          $ref: 'TS28623_ComDefs.yaml#/components/schemas/PlmnId'
-        cagidList:
-          type: array
-          items:
-            $ref: '#/components/schemas/cagId'
-          minItems: 1
-          maxItems: 12  
-        nidList:
-          type: array
-          items:
-            $ref: '#/components/schemas/nid'
-          minItems: 1
-          maxItems: 12              
     NpnIdentityList:
       type: array
       items:
-        $ref: '#/components/schemas/NpnIdentity'
+        $ref: 'TS28623_GenericNrm.yaml#/components/schemas/NpnId-Type'
     GGnbId:
         type: string
         pattern: '^[0-9]{3}[0-9]{2,3}-(22|23|24|25|26|27|28|29|30|31|32)-[0-9]{1,10}'
@@ -137,75 +113,81 @@ components:
           type: integer
         backhaulAddress:
           $ref: '#/components/schemas/BackhaulAddress'
-    IntraRatEsActivationOriginalCellLoadParameters:
+    LoadTimeThreshold:
       type: object
       properties:
         loadThreshold:
           type: integer
         timeDuration:
           type: integer
+    IntraRatEsActivationOriginalCellLoadParameters:
+      $ref: '#/components/schemas/LoadTimeThreshold'
     IntraRatEsActivationCandidateCellsLoadParameters:
-      type: object
-      properties:
-        loadThreshold:
-          type: integer
-        timeDuration:
-          type: integer
+      $ref: '#/components/schemas/LoadTimeThreshold'
     IntraRatEsDeactivationCandidateCellsLoadParameters:
-      type: object
-      properties:
-        loadThreshold:
-          type: integer
-        timeDuration:
-          type: integer
+      $ref: '#/components/schemas/LoadTimeThreshold'
     EsNotAllowedTimePeriod:
       type: object
       properties:
-        startTimeandendTime:
-          type: string
-        periodOfDay:
+        startTime:
           type: string
-        daysOfWeekList:
+          description: >-
+            Time of day is in HH:MM or H:MM 24-hour format per UTC time zone.
+            Examples, 20:15:00, 20:15:00-08:00 (for 8 hours behind UTC).
+        endTime:
           type: string
-        listoftimeperiods:
+          description: >-
+            Time of day is in HH:MM or H:MM 24-hour format per UTC time zone.
+            Examples, 20:15:00, 20:15:00-08:00 (for 8 hours behind UTC).
+        daysOfWeek:
           type: string
+          enum:
+            - MONDAY
+            - TUESDAY
+            - WEDNESDAY
+            - THURSDAY
+            - FRIDAY
+            - SATURDAY
+            - SUNDAY
     InterRatEsActivationOriginalCellParameters:
-      type: object
-      properties:
-        loadThreshold:
-          type: integer
-        timeDuration:
-          type: integer
+      $ref: '#/components/schemas/LoadTimeThreshold'
     InterRatEsActivationCandidateCellParameters:
-      type: object
-      properties:
-        loadThreshold:
-          type: integer
-        timeDuration:
-          type: integer
+      $ref: '#/components/schemas/LoadTimeThreshold'
     InterRatEsDeactivationCandidateCellParameters:
-      type: object
-      properties:
-        loadThreshold:
-          type: integer
-        timeDuration:
-          type: integer
+      $ref: '#/components/schemas/LoadTimeThreshold'
 
     UeAccProbabilityDist:
+      type: array
+      items:
+        $ref: '#/components/schemas/UeAccProbability'
+    UeAccProbability:
       type: object
       properties:
         targetProbability:
           type: integer
-        numberofpreamblessent:
+          minimum: 0
+          maximum: 100
+        numberOfPreamblesSent:
           type: integer
+          minimum: 0
+          maximum: 200
 
     UeAccDelayProbabilityDist:
+      type: array
+      items:
+        $ref: '#/components/schemas/UeAccDelayProbability'
+
+    UeAccDelayProbability:
       type: object
       properties:
         targetProbability:
           type: integer
-        accessdelay:
+          minimum: 0
+          maximum: 100
+        accessDelay:
           type: integer
+          minimum: 10
+          maximum: 560
 
     NRPciList:
       type: array
@@ -453,6 +435,9 @@ components:
           type: integer
         rimRSCommonCarrierReferencePoint:
          type: integer
+         minimum: 0
+         maximum: 3279165
+
         rimRSStartingFrequencyOffsetIdList:
           type: array
           items:
@@ -478,9 +463,9 @@ components:
           enum:
             - ENABLE
             - DISABLE          
-        RIMRSScrambleTimerMultiplier:
+        rIMRSScrambleTimerMultiplier:
           type: integer
-        RIMRSScrambleTimerOffset:
+        rIMRSScrambleTimerOffset:
           type: integer
 
     TimeDomainPara:
@@ -643,26 +628,32 @@ components:
       properties:
         positionX:
           type: integer
+          default: 0
           minimum: 0
           maximum: 604800
         positionY:
           type: integer
+          default: 0          
           minimum: 0
           maximum: 604800
         positionZ:
           type: integer
+          default: 0          
           minimum: 0
           maximum: 604800
         velocityVX:
           type: integer
+          default: 0          
           minimum: -131072
           maximum: 131071         
         velocityVY:
           type: integer
+          default: 0          
           minimum: -131072
           maximum: 131071           
         velocityVZ:
           type: integer
+          default: 0          
           minimum: -131072
           maximum: 131071
 
@@ -671,29 +662,77 @@ components:
       properties:
           semiMajorAxis:
             type: integer
+            default: 0            
             minimum: 0
             maximum: 8589934591 
           eccentricity:
             type: integer
+            default: 0                 
             minimum: -524288
             maximum: 524287
           periapsis:
             type: integer
+            default: 0     
             minimum: 0
             maximum: 16777215
           longitude:
             type: integer
+            default: 0                 
             minimum: 0
             maximum: 2097151
           inclination:
             type: integer
+            default: 0                 
             minimum: -524288
             maximum: 524287
           meanAnomaly:
             type: integer
+            default: 0                 
             minimum: 0
             maximum: 16777215
 
+    MappedCellIdInfo:
+      type: object
+      properties:
+        ntnGeoArea:
+          $ref: 'TS28623_ComDefs.yaml#/components/schemas/GeoArea'
+        mappedCellId:
+          $ref: 'TS28541_5GcNrm.yaml#/components/schemas/Ncgi'
+    MappedCellIdInfoList:
+      type: array
+      items:
+        $ref: '#/components/schemas/MappedCellIdInfo'
+    QceIdMappingInfo:
+      type: object
+      properties:
+        qoECollectionEntityAddress:
+          oneOf:
+            - $ref: 'TS28623_ComDefs.yaml#/components/schemas/Ipv4Addr'
+            - $ref: 'TS28623_ComDefs.yaml#/components/schemas/Ipv6Addr'
+        qoECollectionEntityIdentity:
+          type: string
+        pLMNTarget:
+          $ref: 'TS28623_ComDefs.yaml#/components/schemas/PlmnId'
+    QceIdMappingInfoList:
+      type: array
+      items:
+        $ref: '#/components/schemas/QceIdMappingInfo'       
+    MdtUserConsentReqList:
+      type: array
+      items:
+        type: string
+        enum:
+          - M1
+          - M2
+          - M3
+          - M4
+          - M5
+          - M6
+          - M7
+          - M8
+          - M9
+          - MDT_UE_LOCATION
+
 #-------- Definition of types for name-containments ------
     SubNetwork-ncO-NrNrm:
       type: object
@@ -773,21 +812,6 @@ components:
 
 #-------- Definition of concrete IOCs --------------------------------------------
 
-    MnS:
-      oneOf:
-        - type: object
-          properties:
-            SubNetwork:
-              type: array
-              items:
-                $ref: '#/components/schemas/SubNetwork-ncO-NrNrm'
-        - type: object
-          properties:
-            ManagedElement:
-              type: array
-              items:
-                $ref: '#/components/schemas/ManagedElement-ncO-NrNrm'
-
     GnbDuFunction-Single:
       allOf:
         - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top'
@@ -949,6 +973,12 @@ components:
                       type: boolean
                     dDAPSHOControl:
                       type: boolean
+                    mappedCellIdInfoList:
+                      $ref: '#/components/schemas/MappedCellIdInfoList'
+                    qceIdMappingInfoList:
+                      $ref: '#/components/schemas/QceIdMappingInfoList'
+                    mdtUserConsentReqList:
+                      $ref: '#/components/schemas/MdtUserConsentReqList'
         - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO'
         - type: object
           properties:
@@ -1514,10 +1544,10 @@ components:
                       enum:
                          - IS_NOT_ENERGY_SAVING
                          - IS_ENERGY_SAVING
-                    mLEntityRef:
-                      $ref: "#'TS28623_ComDefs.yaml#/components/schemas/Dn'"
-                    aIMLInferenceFunctionRef:
-                      $ref: "#'TS28623_ComDefs.yaml#/components/schemas/Dn'"                        
+                    mLModelRefList:
+                      $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList'
+                    aIMLInferenceFunctionRefList:
+                      $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList'                        
     DRACHOptimizationFunction-Single:
       allOf:
         - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top'
@@ -1551,10 +1581,10 @@ components:
                       $ref: '#/components/schemas/MinimumTimeBetweenHoTriggerChange'
                     tstoreUEcntxt:
                       $ref: '#/components/schemas/TstoreUEcntxt'
-                    mLEntityRef:
-                      $ref: "#'TS28623_ComDefs.yaml#/components/schemas/Dn'"
-                    aIMLInferenceFunctionRef:
-                      $ref: "#'TS28623_ComDefs.yaml#/components/schemas/Dn'"                       
+                    mLModelRefList:
+                      $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList'
+                    aIMLInferenceFunctionRefList:
+                      $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList'                       
     DLBOFunction-Single:
       allOf:
         - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top'
@@ -1569,10 +1599,10 @@ components:
                           $ref: '#/components/schemas/MaximumDeviationHoTrigger'
                     minimumTimeBetweenHoTriggerChange:
                           $ref: '#/components/schemas/MinimumTimeBetweenHoTriggerChange'
-                    mLEntityRef:
-                      $ref: "#'TS28623_ComDefs.yaml#/components/schemas/Dn'"
-                    aIMLInferenceFunctionRef:
-                      $ref: "#'TS28623_ComDefs.yaml#/components/schemas/Dn'"                        
+                    mLModelRefList:
+                      $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList'
+                    aIMLInferenceFunctionRefList:
+                      $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList'                        
     DPCIConfigurationFunction-Single:
       allOf:
         - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top'
@@ -2176,8 +2206,6 @@ components:
 
     resources-nrNrm:
       oneOf:
-        - $ref: '#/components/schemas/MnS'
-
         - $ref: '#/components/schemas/GnbDuFunction-Single'
         - $ref: '#/components/schemas/GnbCuUpFunction-Single'
         - $ref: '#/components/schemas/GnbCuCpFunction-Single'

OpenAPI/TS28541_SliceNrm.yaml

 openapi: 3.0.1
 info:
   title: Slice NRM
-  version: 18.7.0
+  version: 18.8.0
   description: >-
     OAS 3.0.1 specification of the Slice NRM
     @ 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC).
@@ -765,7 +765,7 @@ components:
     RequestedReservationExpiration:
       description: >-
         An attribute which specifies MnS consuner's requirements for the validity period of the resource reservation.
-      type: string
+      $ref: 'TS28623_ComDefs.yaml#/components/schemas/TimeWindow'
     ResourceReservationStatus:
       description: >-
         An attribute which specifies the resource reservation result for the feasibility check job.
@@ -777,7 +777,7 @@ components:
     ReservationExpiration:
       description: >-
         An attribute which specifies the actual validity period of the resource reservation..
-      type: string
+      $ref: 'TS28623_ComDefs.yaml#/components/schemas/TimeWindow'
     ReservationFailureReason:
       description: >-
         An attribute that specifies the additional reason information if the reservation is failed. 
@@ -826,19 +826,6 @@ components:
 
 #------------ Definition of concrete IOCs ----------------------------------------
 
-    MnS:
-      oneOf:
-        - type: object
-          properties:
-            SubNetwork:
-              type: array
-              items:
-                $ref: '#/components/schemas/SubNetwork-ncO-SliceNrm'
-#        - type: object
-#          properties:
-#            ManagedElement:
-#              $ref: '#/components/schemas/ManagedElement-Multiple'
-
     NetworkSlice-Single:
       allOf:
         - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top'
@@ -1083,8 +1070,6 @@ components:
 
     resources-sliceNrm:
       oneOf:             
-       - $ref: '#/components/schemas/MnS'
-               
        - $ref: '#/components/schemas/NetworkSlice-Single'
        - $ref: '#/components/schemas/NetworkSliceSubnet-Single'
        - $ref: '#/components/schemas/EP_Transport-Single'

OpenAPI/TS28623_ComDefs.yaml

 openapi: 3.0.1
 info:
   title: Common Type Definitions
-  version: 18.6.0
+  version: 19.0.0
   description: >-
     OAS 3.0.1 specification of common type definitions in the Generic NRM
     © 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC).
@@ -125,7 +125,9 @@ components:
           type: integer
     AreaOfInterest:
       oneOf:
-        - $ref: '#/components/schemas/GeoAreaToCellMapping'
+        - type: array
+          items:
+            $ref: '#/components/schemas/GeoAreaToCellMapping'
         - type: array
           items:
             $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Tai'
@@ -141,6 +143,9 @@ components:
 
     Fqdn:
       type: string
+      pattern: '^([0-9A-Za-z]([-0-9A-Za-z]{0,61}[0-9A-Za-z])?\.)+[A-Za-z]{2,63}\.?$'
+      minLength: 4
+      maxLength: 253
     Ipv4Addr:
       type: string
       pattern: '^(([0-9]|[1-9][0-9]|1[0-9][0-9]|2[0-4][0-9]|25[0-5])\.){3}([0-9]|[1-9][0-9]|1[0-9][0-9]|2[0-4][0-9]|25[0-5])$'
@@ -189,15 +194,22 @@ components:
       enum:
         - LOCKED
         - UNLOCKED
+      default: LOCKED  
+    BasicAdministrativeState:
+      type: string
+      enum:
+        - LOCKED
+        - UNLOCKED
     OperationalState:
       type: string
       enum:
         - ENABLED
         - DISABLED
+      default: DISABLED  
     UsageState:
       type: string
       enum:
-        - IDEL
+        - IDLE
         - ACTIVE
         - BUSY
     AvailabilityStatus:

OpenAPI/TS28623_FileManagementNrm.yaml

 openapi: 3.0.1
 info:
   title: File Management NRM
-  version: 18.6.0
+  version: 19.0.0
   description: >-
     OAS 3.0.1 definition of the File Management NRM fragment
     © 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC).
@@ -12,6 +12,25 @@ externalDocs:
 paths: {}
 components:
   schemas:
+
+  #-------- Definition of types for name-containments ------
+    SubNetwork-ncO-FileManagementNrm:
+      type: object
+      properties:
+        FileDownloadJob:
+          $ref: '#/components/schemas/FileDownloadJob-Multiple'
+        Files:
+          $ref: '#/components/schemas/Files-Multiple'
+    ManagedElement-ncO-FileManagementNrm:
+      type: object
+      properties:
+        FileDownloadJob:
+          $ref: '#/components/schemas/FileDownloadJob-Multiple'
+        Files:
+          $ref: '#/components/schemas/Files-Multiple'      
+   #-------Definition of generic IOCs ----------#  
+
+
 #-------- Definition of types-----------------------------------------------------
     FileDownloadJobProcessMonitor:
       description: >-
@@ -77,6 +96,7 @@ components:
                   enum:
                     - TRUE
                     - FALSE
+                  default: FALSE   
                 jobMonitor:
                   $ref: '#/components/schemas/FileDownloadJobProcessMonitor'
     Files-Single:

OpenAPI/TS28623_GenericNrm.yaml

 openapi: 3.0.1
 info:
   title: Generic NRM
-  version: 18.6.0
+  version: 19.0.0
   description: >-
     OAS 3.0.1 definition of the Generic NRM
     © 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC).
@@ -15,11 +15,7 @@ components:
 
 #-------- Definition of types-----------------------------------------------------
 
-    RegistrationState:
-      type: string
-      enum:
-        - REGISTERED
-        - DEREGISTERED
+
     VnfParameter:
       type: object
       properties:
@@ -51,103 +47,7 @@ components:
           type: string
         powerInterface:
           type: string
-    Operation:
-      type: object
-      properties:
-        name:
-          type: string
-        allowedNFTypes:
-          $ref: '#/components/schemas/NFType'
-        operationSemantics:
-          $ref: '#/components/schemas/OperationSemantics'
-    NFType:
-      type: string
-      description: ' NF name defined in TS 23.501 or TS 29.510'
-      enum:
-        - NRF
-        - UDM
-        - AMF
-        - SMF
-        - AUSF
-        - NEF
-        - PCF
-        - SMSF
-        - NSSF
-        - UDR
-        - LMF
-        - GMLC
-        - 5G_EIR
-        - SEPP
-        - UPF
-        - N3IWF
-        - AF
-        - UDSF
-        - DN
-        - BSF
-        - CHF
-        - NWDAF
-        - PCSCF
-        - CBCF
-        - HSS
-        - UCMF
-        - SOR_AF
-        - SPAF
-        - MME
-        - SCSAS
-        - SCEF
-        - SCP
-        - NSSAAF
-        - ICSCF
-        - SCSCF
-        - DRA
-        - IMS_AS
-        - AANF
-        - 5G_DDNMF
-        - NSACF
-        - MFAF
-        - EASDF
-        - DCCF
-        - MB_SMF
-        - TSCTSF
-        - ADRF
-        - GBA_BSF
-        - CEF
-        - MB_UPF
-        - NSWOF
-        - PKMF
-        - MNPF
-        - SMS_GMSC
-        - SMS_IWMSC
-        - MBSF
-        - MBSTF
-        - PANF
-        - TNGF
-        - W_AGF
-        - TWIF
-        - TSN_AF
 
-    OperationSemantics:
-      type: string
-      enum:
-        - REQUEST_RESPONSE
-        - SUBSCRIBE_NOTIFY
-    SAP:
-      type: object
-      properties:
-        host:
-          $ref: 'TS28623_ComDefs.yaml#/components/schemas/HostAddr'
-        port:
-          type: integer
-    NFServiceType:
-      type: string
-      enum:
-        - Namf_Communication
-        - Namf_EventExposure
-        - Namf_MT
-        - Namf_Location
-        - Nsmf_PDUSession
-        - Nsmf_EventExposure
-        - Others
     TransportProtocol:
       anyOf:
         - type: string
@@ -331,7 +231,6 @@ components:
                 maximum: 31
     NpnId-Type:
       type: object
-      description: This describes the PLMN id, CAG ID list or the NID of the SNPN within the PLMN.
       properties:
         plmnId:
           $ref: 'TS28623_ComDefs.yaml#/components/schemas/PlmnId'
@@ -339,10 +238,17 @@ components:
           type: array
           items:
             type: string
+          minItems: 1
+          maxItems: 256  
         nIDList:
           type: array
           items:
             $ref: 'TS28623_ComDefs.yaml#/components/schemas/Nid'
+          minItems: 1
+          maxItems: 16
+      oneOf:
+        - required: [plmnId, cAGIdList]
+        - required: [plmnId, nIDList]
 
 #-------- Definition of abstract IOC Top -----------------------------------------
 
@@ -437,66 +343,40 @@ components:
     SubNetwork-ncO:
       type: object
       properties:
+        SubNetwork:
+          $ref: '#/components/schemas/SubNetwork-Multiple'
+        ManagedElement:
+          $ref: '#/components/schemas/ManagedElement-Multiple'
         ManagementNode:
           $ref: '#/components/schemas/ManagementNode-Multiple'
         MnsAgent:
           $ref: '#/components/schemas/MnsAgent-Multiple'
         MeContext:
           $ref: '#/components/schemas/MeContext-Multiple'
-        PerfMetricJob:
-          $ref: 'TS28623_PmControlNrm.yaml#/components/schemas/PerfMetricJob-Multiple'
-        ThresholdMonitor:
-          $ref: 'TS28623_ThresholdMonitorNrm.yaml#/components/schemas/ThresholdMonitor-Multiple'
-        TraceJob:
-          $ref: 'TS28623_TraceControlNrm.yaml#/components/schemas/TraceJob-Multiple'
-        ManagementDataCollection:
-          $ref: 'TS28623_ManagementDataCollectionNrm.yaml#/components/schemas/ManagementDataCollection-Multiple'
-        NtfSubscriptionControl:
-          $ref: 'TS28623_SubscriptionControlNrm.yaml#/components/schemas/NtfSubscriptionControl-Multiple'
         AlarmList:
           $ref: 'TS28111_FaultNrm.yaml#/components/schemas/AlarmList-Single'
-        FileDownloadJob:
-          $ref: 'TS28623_FileManagementNrm.yaml#/components/schemas/FileDownloadJob-Multiple'
-        Files:
-          $ref: 'TS28623_FileManagementNrm.yaml#/components/schemas/Files-Multiple'
-        MnsRegistry:
-          $ref: 'TS28623_MnSRegistryNrm.yaml#/components/schemas/MnsRegistry-Single'
         Scheduler:
           $ref: '#/components/schemas/Scheduler-Multiple'
         ConditionMonitor:
           $ref: '#/components/schemas/ConditionMonitor-Multiple'
         SupportedNotifications:
           $ref: '#/components/schemas/SupportedNotifications-Single'
-        QMCJobs:
-          $ref: 'TS28623_QoEMeasurementCollectionNrm.yaml#/components/schemas/QMCJob-Multiple'
+
 
     ManagedElement-ncO:
       type: object
       properties:
         MnsAgent:
           $ref: '#/components/schemas/MnsAgent-Multiple'
-        PerfMetricJob:
-          $ref: 'TS28623_PmControlNrm.yaml#/components/schemas/PerfMetricJob-Multiple'
-        ThresholdMonitor:
-          $ref: 'TS28623_ThresholdMonitorNrm.yaml#/components/schemas/ThresholdMonitor-Multiple'
-        TraceJob:
-          $ref: 'TS28623_TraceControlNrm.yaml#/components/schemas/TraceJob-Multiple'
-        NtfSubscriptionControl:
-          $ref: 'TS28623_SubscriptionControlNrm.yaml#/components/schemas/NtfSubscriptionControl-Multiple'
         AlarmList:
           $ref: 'TS28111_FaultNrm.yaml#/components/schemas/AlarmList-Single'
-        FileDownloadJob:
-          $ref: 'TS28623_FileManagementNrm.yaml#/components/schemas/FileDownloadJob-Multiple'
-        Files:
-          $ref: 'TS28623_FileManagementNrm.yaml#/components/schemas/Files-Multiple'
         Scheduler:
           $ref: '#/components/schemas/Scheduler-Multiple'
         ConditionMonitor:
           $ref: '#/components/schemas/ConditionMonitor-Multiple'
         SupportedNotifications:  
           $ref: '#/components/schemas/SupportedNotifications-Single'
-        QMCJobs:
-          $ref: 'TS28623_QoEMeasurementCollectionNrm.yaml#/components/schemas/QMCJob-Multiple'
+
 
 #-------- Definition of abstract IOCs --------------------------------------------
 
@@ -542,8 +422,6 @@ components:
           $ref: 'TS28623_PmControlNrm.yaml#/components/schemas/PerfMetricJob-Multiple'
         ThresholdMonitor:
           $ref: 'TS28623_ThresholdMonitorNrm.yaml#/components/schemas/ThresholdMonitor-Multiple'
-        ManagedNFService:
-          $ref: '#/components/schemas/ManagedNFService-Multiple'
         TraceJob:
           $ref: 'TS28623_TraceControlNrm.yaml#/components/schemas/TraceJob-Multiple'
 
@@ -565,32 +443,7 @@ components:
               nullable: true
         VsDataContainer:
           $ref: '#/components/schemas/VsDataContainer-Multiple'
-    ManagedNFService-Single:
-      allOf:
-        - $ref: '#/components/schemas/Top'
-        - type: object
-          properties:
-            attributes:
-              type: object
-              properties:
-                userLabel:
-                  type: string
-                nFServiceType:
-                  $ref: '#/components/schemas/NFServiceType'
-                sAP:
-                  $ref: '#/components/schemas/SAP'
-                operations:
-                  type: array
-                  items:
-                    $ref: '#/components/schemas/Operation'
-                administrativeState:
-                  $ref: 'TS28623_ComDefs.yaml#/components/schemas/AdministrativeState'
-                operationalState:
-                  $ref: 'TS28623_ComDefs.yaml#/components/schemas/OperationalState'
-                usageState:
-                  $ref: 'TS28623_ComDefs.yaml#/components/schemas/UsageState'
-                registrationState:
-                  $ref: '#/components/schemas/RegistrationState'
+
     ManagementNode-Single:
       allOf:
         - $ref: '#/components/schemas/Top'
@@ -690,6 +543,14 @@ components:
         - $ref: '#/components/schemas/SubNetwork-ncO'
         - $ref: '#/components/schemas/SubNetwork-Multiple'
         - $ref: '#/components/schemas/ManagedElement-Multiple'
+        - $ref: 'TS28623_FileManagementNrm.yaml#/components/schemas/SubNetwork-ncO-FileManagementNrm'
+        - $ref: 'TS28623_PmControlNrm.yaml#/components/schemas/SubNetwork-ncO-PmControlNrm'
+        - $ref: 'TS28623_SubscriptionControlNrm.yaml#/components/schemas/SubNetwork-ncO-SubscriptionControlNrm'
+        - $ref: 'TS28623_ThresholdMonitorNrm.yaml#/components/schemas/SubNetwork-ncO-ThresholdMonitorNrm'
+        - $ref: 'TS28623_TraceControlNrm.yaml#/components/schemas/SubNetwork-ncO-TraceControlNrm'                
+        - $ref: 'TS28623_QoEMeasurementCollectionNrm.yaml#/components/schemas/SubNetwork-ncO-QoEMeasurementCollectionNrm'                    
+        - $ref: 'TS28623_ManagementDataCollectionNrm.yaml#/components/schemas/SubNetwork-ncO-ManagementDataCollectionNrm'
+        - $ref: 'TS28623_MnSRegistryNrm.yaml#/components/schemas/SubNetwork-ncO-MnSRegistryNrm'           
         - $ref: 'TS28104_MdaNrm.yaml#/components/schemas/SubNetwork-ncO-MdaNrm'
         - $ref: 'TS28105_AiMlNrm.yaml#/components/schemas/SubNetwork-ncO-AiMlNrm'
         - $ref: 'TS28312_IntentNrm.yaml#/components/schemas/SubNetwork-ncO-IntentNrm'
@@ -699,28 +560,43 @@ 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:
         - $ref: '#/components/schemas/Top'
         - $ref: '#/components/schemas/ManagedElement-Attr'
         - $ref: '#/components/schemas/ManagedElement-ncO'
+        - $ref: 'TS28623_FileManagementNrm.yaml#/components/schemas/ManagedElement-ncO-FileManagementNrm'
+        - $ref: 'TS28623_PmControlNrm.yaml#/components/schemas/ManagedElement-PmControlNrm'
+        - $ref: 'TS28623_SubscriptionControlNrm.yaml#/components/schemas/ManagedElement-ncO-SubscriptionControlNrm'
+        - $ref: 'TS28623_ThresholdMonitorNrm.yaml#/components/schemas/ManagedElement-ncO-ThresholdMonitorNrm'
+        - $ref: 'TS28623_TraceControlNrm.yaml#/components/schemas/SubNetwork-ncO-TraceControlNrm'                            
+        - $ref: 'TS28623_QoEMeasurementCollectionNrm.yaml#/components/schemas/ManagedElement-ncO-QoEMeasurementCollectionNrm'                             
         - $ref: 'TS28104_MdaNrm.yaml#/components/schemas/ManagedElement-ncO-MdaNrm'
         - $ref: 'TS28105_AiMlNrm.yaml#/components/schemas/ManagedElement-ncO-AiMlNrm'
         - $ref: 'TS28536_CoslaNrm.yaml#/components/schemas/ManagedElement-ncO-CoslaNrm'
         - $ref: 'TS28541_NrNrm.yaml#/components/schemas/ManagedElement-ncO-NrNrm'
         - $ref: 'TS28541_5GcNrm.yaml#/components/schemas/ManagedElement-ncO-5GcNrm'
 
+    NrmRoot:
+      oneOf:
+        - type: object
+          properties:
+            SubNetwork:
+              $ref: '#/components/schemas/SubNetwork-Multiple'
+        - type: object
+          properties:
+            ManagedElement:
+              $ref: '#/components/schemas/ManagedElement-Multiple'
+
 #-------- Definition of YAML arrays for name-contained IOCs ----------------------
 
     VsDataContainer-Multiple:
       type: array
       items:
         $ref: '#/components/schemas/VsDataContainer-Single'
-    ManagedNFService-Multiple:
-      type: array
-      items:
-        $ref: '#/components/schemas/ManagedNFService-Single'
     ManagementNode-Multiple:
       type: array
       items:
@@ -755,12 +631,11 @@ components:
 
     resources-genericNrm:
       oneOf:
-
+       - $ref: '#/components/schemas/NrmRoot'
        - $ref: '#/components/schemas/VsDataContainer-Single'
        - $ref: '#/components/schemas/ManagementNode-Single'
        - $ref: '#/components/schemas/MnsAgent-Single'
        - $ref: '#/components/schemas/MeContext-Single'
-       - $ref: '#/components/schemas/ManagedNFService-Single'
        - $ref: '#/components/schemas/Scheduler-Single'
        - $ref: '#/components/schemas/ConditionMonitor-Single'
        - $ref: '#/components/schemas/SupportedNotifications-Single' 

OpenAPI/TS28623_ManagementDataCollectionNrm.yaml

 openapi: 3.0.1
 info:
   title: Management Data Collection NRM
-  version: 18.6.0
+  version: 19.0.0
   description: >-
     OAS 3.0.1 definition of the Management Data Collection NRM fragment
     © 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC).
@@ -12,6 +12,15 @@ externalDocs:
 paths: {}
 components:
   schemas:
+  #-------- Definition of types for name-containments ------
+    SubNetwork-ncO-ManagementDataCollectionNrm:
+      type: object
+      properties:
+        ManagementDataCollection:
+          $ref: '#/components/schemas/ManagementDataCollection-Multiple'
+    
+   #-------Definition of generic IOCs ----------# 
+
 #-------- Definition of types-----------------------------------------------------
 
     ManagementData: