Add files using upload-large-folder tool

original/Rel-20/28_series/TS28532_FileDataReportingMnS.yaml

@@ -0,0 +1,137 @@
+openapi: 3.0.1
+info:
+  title: File Data Reporting MnS
+  version: 20.0.0
+  description: >-
+    OAS 3.0.1 definition of the File Data Reporting MnS
+    © 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC).
+    All rights reserved.
+externalDocs:
+  description: 3GPP TS 28.532; Generic management services
+  url: http://www.3gpp.org/ftp/Specs/archive/28_series/28.532/
+servers:
+  - url: '{MnSRoot}/fileDataReportingMnS/{MnSVersion}'
+    variables:
+      MnSRoot:
+        description: See clause 4.4.3 of TS 32.158
+        default: http://example.com/3GPPManagement
+      MnSVersion:
+        description: Version number of the OpenAPI definition
+        default: XXX
+paths:
+  /files:
+    get:
+      summary: Read information about available files
+      description: >-
+        Information about available files is read with HTTP GET. The files for
+        which information shall be returned are identified with the path
+        component (base resource) and the query component (fileDataType, beginTime,
+        endTime) of the URI.
+      parameters:
+        - name: fileDataType
+          in: query
+          description: >-
+            This parameter selects files based on the file data type.
+          required: true
+          schema:
+            $ref: '#/components/schemas/FileDataType'
+        - name: beginTime
+          in: query
+          description: >-
+            This parameter selects files based on the earliest time they
+            became available
+          required: false
+          schema:
+            $ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTime'
+        - name: endTime
+          in: query
+          description: >-
+            This parameter selects files based on the latest time they
+            became available
+          required: false
+          schema:
+            $ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTime'
+      responses:
+        '200':
+          description: >-
+            'Success case ("200 OK").
+            The resources identified in the request for retrieval are returned
+            in the response message body.'
+          content:
+            application/json:
+              schema:
+                type: array
+                items:
+                  $ref: '#/components/schemas/FileInfo'
+        default:
+          description: Error case.
+          content:
+            application/json:
+              schema:
+                $ref: 'TS28623_ComDefs.yaml#/components/schemas/ErrorResponse'
+components:
+  schemas:
+    FileDataType:
+      type: string
+      enum:
+        - Performance
+        - Trace
+        - Analytics
+        - Proprietary
+    FileNotificationTypes:
+      type: string
+      enum:
+        - notifyFileReady
+        - notifyFilePreparationError
+    FileInfo:
+      type: object
+      properties:
+        fileLocation:
+          $ref: 'TS28623_ComDefs.yaml#/components/schemas/Uri'
+        fileSize:
+          type: integer
+        fileReadyTime:
+          $ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTime'
+        fileExpirationTime:
+          $ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTime'
+        fileCompression:
+          type: string
+        fileFormat:
+          type: string
+        fileDataType:
+           $ref: '#/components/schemas/FileDataType'
+        jobId:
+          type: string
+    FileCreationErrorInfoList:
+      type: object
+      properties:
+        fileLocation:
+          $ref: 'TS28623_ComDefs.yaml#/components/schemas/Uri'
+        fileDataType:
+           $ref: '#/components/schemas/FileDataType'
+        jobId:
+          type: string   
+    NotifyFileReady:
+      allOf:
+        - $ref: 'TS28623_ComDefs.yaml#/components/schemas/NotificationHeader'
+        - type: object
+          properties:
+            fileInfoList:
+              type: array
+              items:
+                $ref: '#/components/schemas/FileInfo'
+            additionalText:
+              type: string
+    NotifyFilePreparationError:
+      allOf:
+        - $ref: 'TS28623_ComDefs.yaml#/components/schemas/NotificationHeader'
+        - type: object
+          properties:
+            fileInfoList:
+              type: array
+              items:
+                $ref: '#/components/schemas/FileCreationErrorInfoList'
+            reason:
+              type: string
+            additionalText:
+              type: string

original/Rel-20/28_series/TS28532_HeartbeatNtf.yaml

@@ -0,0 +1,25 @@
+openapi: 3.0.1
+info:
+  title: Heartbeat notification
+  version: 18.1.0
+  description: >-
+    OAS 3.0.1 definition of the heartbeat notification
+    © 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC).
+    All rights reserved.
+externalDocs:
+  description: 3GPP TS 28.532; Generic management services
+  url: http://www.3gpp.org/ftp/Specs/archive/28_series/28.6532/
+paths: {}
+components:
+  schemas:
+    HeartbeatNotificationTypes:
+      type: string
+      enum:
+        - notifyHeartbeat
+    NotifyHeartbeat:
+      allOf:
+        - $ref: 'TS28623_ComDefs.yaml#/components/schemas/NotificationHeader'
+        - type: object
+          properties:
+            heartbeatNtfPeriod:
+              type: integer

original/Rel-20/28_series/TS28532_PerfMnS.yaml

@@ -0,0 +1,76 @@
+openapi: 3.0.1
+info:
+  title: TS 28.532 Performance Threshold Monitoring MnS
+  version: 18.1.0
+  description: >-
+    OAS 3.0.1 definition of the Performance Threshold Monitoring MnS
+    © 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC).
+    All rights reserved.
+externalDocs:
+  description: 3GPP TS 28.532; Generic management services
+  url: http://www.3gpp.org/ftp/Specs/archive/28_series/28.532/
+servers:
+  - url: '{root}'
+    variables:
+      root:
+        description: >-
+          The open API server of the performance threshold monitoring service is
+          located in the consumer side, see monitoringNotifTarget attribute of
+          the IOC ThresholdMonitor defined in 3GPP TS 28.622 [11]. 
+        default: http://example.com/3GPPManagement
+paths:
+  /notificationSink:
+    post:
+      summary: Send notifications about performance threshold crossing
+      description: To send a notifyThresholdCrossing notification
+      requestBody:
+        required: true
+        content:
+          application/json:
+            schema:
+              $ref: '#/components/schemas/NotifyThresholdCrossing'
+      responses:
+        '204':
+          description: >-
+            Success case ("204 No Content"). The notification is successfully
+            delivered. The response message body is absent.
+        default:
+          description: Error case.
+          content:
+            application/json:
+              schema:
+                $ref: 'TS28623_ComDefs.yaml#/components/schemas/ErrorResponse'
+components:
+  schemas:
+    PerfNotificationTypes:
+      type: string
+      enum:
+        - notifyThresholdCrossing
+    PerfMetricValue:
+      oneOf:
+        - type: integer
+        - $ref: 'TS28623_ComDefs.yaml#/components/schemas/Float'
+    PerfMetricDirection:
+      type: string
+      enum:
+        - UP
+        - DOWN
+    NotifyThresholdCrossing:
+      allOf:
+        - $ref: 'TS28623_ComDefs.yaml#/components/schemas/NotificationHeader'
+        - type: object
+          properties:
+            observedPerfMetricName:
+              type: string
+            observedPerfMetricValue:
+              $ref: '#/components/schemas/PerfMetricValue'
+            observedPerfMetricDirection:
+              $ref: '#/components/schemas/PerfMetricDirection'
+            thresholdValue:
+              $ref: '#/components/schemas/PerfMetricValue'
+            hysteresis:
+              $ref: '#/components/schemas/PerfMetricValue'
+            monitorGranularityPeriod:
+              type: integer
+            additionalText:
+              type: string

original/Rel-20/28_series/TS28532_StreamingDataMnS.yaml

@@ -0,0 +1,453 @@
+openapi: 3.0.1
+info:
+  title: TS 28.532 Streaming data reporting service
+  version: 19.0.0
+  description: >-
+    OAS 3.0.1 specification for the Streaming data reporting service (Streaming MnS)
+    © 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC).
+    All rights reserved.
+servers:
+  - url: '{MnSRoot}/StreamingDataReportingMnS/{MnSVersion}'
+    variables:
+      MnSRoot:
+        description: See clause 4.4.3 of TS 32.158.
+        default: https://example.com/3GPPManagement
+      MnSVersion:
+        description: See clause 4.4.3 of TS 32.158.
+        default: ''
+paths:
+  '/connections':
+    post:
+      summary: Inform consumer about reporting streams to be carried by the new connection and receive a new connection id.
+      description: Exchange of meta-data (producer informs consumer about its own identity and the nature of the data to be reported via streaming) phase of the connection establishement by streaming data reporting producer to the streaming data reporting consumer (i.e. streaming target).
+      requestBody:
+        required: true
+        content:
+          application/json:
+            schema:
+              $ref: '#/components/schemas/connectionRequest-Type'
+      responses:
+        '201':
+          description: Success case (201 Created).
+          headers:
+            Location:
+              description: Location of the created connection resource.
+              schema:
+                $ref: '#/components/schemas/connectionId-Type'
+        default:
+          description: Error case.
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/failedConnectionResponse-Type'
+    get:
+      summary: Obtain information about connections.
+      description: Enables the streaming data reporting service producer to obtain information about one or more streaming connections.
+      parameters: 
+        - name: connectionIdList
+          in: query
+          description: The list of connectionId for which the connection information is to be returned.
+          required: false
+          style: form
+          explode: false
+          schema:
+            type: array
+            items:
+              $ref: '#/components/schemas/connectionId-Type'
+      responses:
+        '200':
+          description: Success case (200 OK). The resources identified in the request for retrieval are returned in the response message body. In case the fields query parameter is used, the selected resources are returned.
+          content:
+            application/json:
+              schema:
+                type: array
+                items:
+                  $ref: '#/components/schemas/connectionInfo-Type'
+        '202':
+          description: Partial success case (202 Partially retrieved). Subset of the resources identified in the request for retrieval are returned in the response message body.
+          content:
+            application/json:
+              schema:
+                type: array
+                items:
+                  $ref: '#/components/schemas/connectionInfo-Type'
+        default:
+          description: Error case.
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/errorResponse-Type'
+  '/connections/{connectionId}':
+    get:
+      summary: Obtain information about a connection.
+      description: Enables the streaming data reporting service producer to obtain information about one streaming connection.
+      parameters:
+        - name: connectionId
+          in: path
+          description: Indicate the ID (URI) of the connection for which the information is being retrieved
+          required: true
+          schema:
+            $ref: '#/components/schemas/connectionId-Type'
+        - name: Connection
+          in: header
+          schema:
+            $ref: '#/components/schemas/websocketHeaderConnection-Type'
+        - name: Sec-WebSocket-Extensions
+          in: header
+          schema:
+            $ref: '#/components/schemas/websocketHeader-Sec-WebSocket-Extensions-Type'
+        - name: Sec-WebSocket-Key
+          in: header
+          schema:
+            $ref: '#/components/schemas/websocketHeader-Sec-WebSocket-Key-Type'
+        - name: Sec-WebSocket-Protocol
+          in: header
+          schema:
+            $ref: '#/components/schemas/websocketHeader-Sec-WebSocket-Protocol-Type'
+        - name: Sec-WebSocket-Version
+          in: header
+          schema:
+            $ref: '#/components/schemas/websocketHeader-Sec-WebSocket-Version-Type'
+      responses:
+        '101':
+          description: Success case (101 Switching Protocols). The connection has been successfully switched to WebSocket. The response message body is absent.
+          headers:
+            Upgrade:
+              schema:
+                $ref: '#/components/schemas/websocketHeaderUpgrade-Type'
+            Connection:
+              schema:
+                $ref: '#/components/schemas/websocketHeaderConnection-Type'
+            Sec-WebSocket-Accept:
+              schema:
+                $ref: '#/components/schemas/websocketHeader-Sec-WebSocket-Accept-Type'
+        '200':
+          description: Success case (200 OK). The resource identified in the request for retrieval returned in the response message body.
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/connectionInfo-Type'
+        default:
+          description: Error case.
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/errorResponse-Type'
+  '/connections/{connectionId}/streams':
+    post:
+      summary: Inform consumer about new reporting streams on an existing connection.
+      description: Allows the producer to add one or more reporting streams to an already established streaming connection.
+      parameters:
+        - name: connectionId
+          in: path
+          description: Indicate the ID (URI) of the connection for which the reporting stream information is being added.
+          required: true
+          schema:
+            $ref: '#/components/schemas/connectionId-Type'
+      requestBody:
+        required: true
+        content:
+          application/json:
+            schema:
+              type: array
+              items:
+                $ref: '#/components/schemas/streamInfo-Type'
+      responses:
+        '201':
+          description: Success case (201 Posted).
+          content:
+            application/json:
+              schema:
+                type: array
+                items:
+                  $ref: '#/components/schemas/streamInfo-Type'
+        '202':
+          description: Partial success case (202 Posted).
+          content:
+            application/json:
+              schema:
+                type: array
+                items:
+                  $ref: '#/components/schemas/streamInfo-Type'
+        default:
+          description: Error case.
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/errorResponse-Type'
+    delete:
+      summary: Remove reporting streams from an existing connection
+      description: Allows the producer to remove one or more reporting streams from an already established streaming connection.
+      parameters:
+        - name: connectionId
+          in: path
+          description: Indicate the ID (URI) of the connection for which the reporting stream information is being removed.
+          required: true
+          schema:
+            $ref: '#/components/schemas/connectionId-Type'
+        - name: streamIds
+          in: query
+          description: The list of streamId for the stream(s) to be deleted.
+          required: true
+          style: form
+          explode: false
+          schema:
+            type: array
+            items:
+              $ref: '#/components/schemas/streamId-Type'
+      responses:
+        '204':
+          description: Success case (204 No Content). The stream information resource has been deleted. The response message body is absent.
+        default:
+          description: Error case.
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/errorResponse-Type'
+    get:
+      summary: Obtain information about streams.
+      description: Enables the streaming data reporting service producer to obtain information about one or more reporting streams.
+      parameters:
+        - name: connectionId
+          in: path
+          description: Indicate the ID (URI) of the connection for which the information is being retrieved
+          required: true
+          schema:
+            $ref: '#/components/schemas/connectionId-Type'
+        - name: streamIds
+          in: query
+          description: The list of streamId for which the stream information is to be retrieved.
+          required: true
+          style: form
+          explode: false
+          schema:
+            type: array
+            items:
+              $ref: '#/components/schemas/streamId-Type'
+      responses:
+        '200':
+          description: Success case (200 OK).
+          content:
+            application/json:
+              schema:
+                type: array
+                items:
+                  $ref: '#/components/schemas/streamInfoWithReporters-Type'
+        '202':
+          description: Partial success case (202 Partially retrieved).
+          content:
+            application/json:
+              schema:
+                type: array
+                items:
+                  $ref: '#/components/schemas/streamInfoWithReporters-Type'
+        default:
+          description: Error case.
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/errorResponse-Type'
+  '/connections/{connectionId}/streams/{streamId}':
+    get:
+      summary: Obtain information about stream
+      description: Enables the streaming data reporting service producer to obtain information about a reporting stream.
+      parameters:
+        - name: connectionId
+          in: path
+          description: Indicate the ID (URI) of the connection for which the information is being retrieved
+          required: true
+          schema:
+            $ref: '#/components/schemas/connectionId-Type'
+        - name: streamId
+          in: path
+          description: Indicate the ID of the reporting stream for which the information is being retrieved
+          required: true
+          schema:
+            $ref: '#/components/schemas/streamId-Type'
+      responses:
+        '200':
+          description: Success case (200 OK).
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/streamInfoWithReporters-Type'
+        default:
+          description: Error case.
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/errorResponse-Type'
+components:
+  schemas:
+    analyticsInfo-Type:
+      description: Information specific to analytics reporting.
+      type: object
+      properties:
+        activityDetails:
+          type: string
+    connectionId-Type:
+      $ref: '#/components/schemas/uri-Type'
+    connectionInfo-Type:
+      type: object
+      properties:
+        connection:
+          $ref: '#/components/schemas/connectionId-Type'
+        producer:
+          $ref: '#/components/schemas/producerId-Type'
+        streams:
+          type: array
+          items:
+            $ref: '#/components/schemas/streamId-Type'
+    connectionRequest-Type:
+      type: object
+      properties:
+        producer:
+          $ref: '#/components/schemas/producerId-Type'
+        streams:
+          type: array
+          items:
+            $ref: '#/components/schemas/streamInfo-Type'
+    errorResponse-Type:
+      type: object
+      properties:
+        error:
+          type: object
+          properties:
+            errorInfo:
+              type: string
+    failedConnectionResponse-Type:
+      type: object
+      properties:
+        error:
+          type: array
+          items:
+            type: object
+            properties:
+              streamId:
+                $ref: '#/components/schemas/streamId-Type'
+              errorReason:
+                type: string
+    measObjDn-Type:
+      description: DN of the measured object instance (see 3GPP TS 28.550)
+      allOf:
+        - $ref: '#/components/schemas/systemDN-Type'
+    performanceMetrics-Type:
+      description: an ordered list of performance metric names (see clause 4.4.1 of 3GPP TS 28.622[11]) whose values are to be reported by the Performance Data Stream Units (see Annex C of TS 28.550 [42]) via this stream. Performance metrics include measurement and KPI
+      type: array
+      items:
+        type: string
+    performanceInfo-Type:
+      description: Information specific to performance data reporting
+      type: object
+      properties:
+        measObjDn:
+          $ref: '#/components/schemas/measObjDn-Type'
+        performanceMetrics:
+          $ref: '#/components/schemas/performanceMetrics-Type'
+        jobId:
+          type: string
+      required:
+        - measObjDn
+        - performanceMetrics
+    producerId-Type:
+      description: DN of the streaming data reporting MnS producer.
+      allOf:
+        - $ref: '#/components/schemas/systemDN-Type'
+    serializationFormat-Type:
+      type: string
+      enum:
+        - GPB
+        - ASN1
+    streamId-Type:
+      description: globally unique stream identifier
+      type: string
+      example: '26F452550021'
+    streamInfo-Type:
+      description: Reporting stream meta-data.
+      type: object
+      properties:
+        streamType:
+          $ref: '#/components/schemas/streamType-Type'
+        serializationFormat:
+          $ref: '#/components/schemas/serializationFormat-Type'
+        streamId:
+          oneOf:
+            - $ref: '#/components/schemas/streamId-Type'
+            - $ref: '#/components/schemas/traceReference-Type'
+        additionalInfo:
+          oneOf:
+            - $ref: '#/components/schemas/traceInfo-Type'
+            - $ref: '#/components/schemas/performanceInfo-Type'
+            - $ref: '#/components/schemas/analyticsInfo-Type'
+            - $ref: '#/components/schemas/vsDataContainer-Type'
+      required:
+        - streamType
+        - serializationFormat
+        - streamId
+    streamInfoWithReporters-Type:
+      description: Reporting stream meta-data with added information about reporters.
+      type: object
+      properties:
+        streamInfo:
+          $ref: '#/components/schemas/streamInfo-Type'
+        reporters:
+          type: array
+          items:
+            $ref: '#/components/schemas/producerId-Type'
+    systemDN-Type:
+      description: See 3GPP TS 32.300 for details
+      type: string
+      example: 'SubNetwork=ABCNetwork,SubNetwork=MUC01,GNBDUFunction=XYZ0100'
+    streamType-Type:
+      type: string
+      enum:
+        - TRACE
+        - PERFORMANCE
+        - ANALYTICS
+        - PROPRIETARY
+    traceInfo-Type:
+      description: Information specific to trace data reporting
+      allOf:
+        - $ref: 'TS28623_TraceControlNrm.yaml#/components/schemas/TraceJob-Attr'
+    traceReference-Type:
+      description: Trace Reference (see clause 5.6 of 3GPP TS 32.422) as stream identifier for streaming trace data reporting
+      type: string
+      example: '4358070034D7'
+    uri-Type:
+      description: Resource URI
+      type: string
+    vsDataContainer-Type:
+      description: container for vendor specific data (see 3GPP TS 28.622)
+      type: object
+      properties:
+        vsDataType:
+          type: string
+        vsData:
+          type: string
+        vsDataFormatVersion:
+          type: string
+    websocketHeaderConnection-Type:
+      description: Header value for the upgrade request and response.
+      type: string
+      enum:
+        - Upgrade
+    websocketHeaderUpgrade-Type:
+      description: Header value for the upgrade to WebSocket request and response.
+      type: string
+      enum:
+        - websocket
+    websocketHeader-Sec-WebSocket-Accept-Type:
+      description: Header value for secure WebSocket response. Carries hash.
+      type: string
+    websocketHeader-Sec-WebSocket-Extensions-Type:
+      description: Header value for secure WebSocket request. Carries protocol extensions.
+      type: string
+    websocketHeader-Sec-WebSocket-Key-Type:
+      description: Header value for secure WebSocket request. Provides information to the server which is needed in order to confirm that the client is entitled to request an upgrade to WebSocket.
+      type: string
+    websocketHeader-Sec-WebSocket-Protocol-Type:
+      description: Header value for secure WebSocket request. Carries a comma-separated list of subprotocol names, in the order of preference.
+      type: string
+    websocketHeader-Sec-WebSocket-Version-Type:
+      description: Header value for secure WebSocket request and response. Carries the WebSocket protocol version to be used.
+      type: string

original/Rel-20/28_series/TS28623_ComDefs.yaml

@@ -0,0 +1,605 @@
+openapi: 3.0.1
+info:
+  title: Common Type Definitions
+  version: 19.6.0
+  description: >-
+    OAS 3.0.1 specification of common type definitions in the Generic NRM
+    © 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC).
+    All rights reserved.
+externalDocs:
+  description: 3GPP TS 28.623; Generic NRM; Common type definitions
+  url: http://www.3gpp.org/ftp/Specs/archive/28_series/28.623/
+paths: {}
+components:
+  schemas:
+  
+    Float:
+      description: This datatype is used for writable attribute
+      type: number
+      format: float
+    FloatRo:
+      description: This datatype is used for readOnly attribute
+      type: number
+      format: float
+      readOnly: true      
+    DateTime:
+      description: This datatype is used for writable attribute
+      type: string
+      format: date-time
+    DateTimeRo: 
+      description: This datatype is used for readOnly attribute
+      type: string
+      format: date-time
+      readOnly: true      
+    FullTime:
+      type: string
+      description: format (e.g., full-time) is from RFC 3339
+      format: full-time
+    DateMonth:
+      type: string
+      format: date-month
+    DateMonthDay:
+      type: string
+      format: date-mday
+    DayInYear:
+      type: object
+      properties:
+        month:
+          $ref: '#/components/schemas/DateMonth'
+        monthDay:
+          $ref: '#/components/schemas/DateMonthDay'
+    Latitude:
+      type: number
+      format: float
+      minimum: -90
+      maximum: 90
+    Longitude:
+      type: number
+      format: float
+      minimum: -180
+      maximum: 180
+    GeoCircle:
+      description: This datatype is specifies the geographical area for NTN
+      type: object
+      properties:
+        referenceLocation:
+          $ref: '#/components/schemas/GeoCoordinate'
+        distanceRadius:
+          type: integer
+          minimum: 1
+          maximum: 65535
+    Dn:
+      description: This datatype is used for writable attribute
+      type: string
+    DnRo:
+      description: This datatype is used for readOnly attribute
+      type: string
+      readOnly: true      
+    DnList:
+      description: This datatype is used for writable attribute    
+      type: array
+      uniqueItems: true
+      items:
+        $ref: '#/components/schemas/Dn'
+    DnListRo:
+      description: This datatype is used for readOnly attribute    
+      type: array
+      uniqueItems: true
+      items:
+        $ref: '#/components/schemas/DnRo'
+
+    Mcc:
+      description: This datatype is used for writable attribut
+      type: string
+      pattern: '^[0-9]{3}$'
+    MccRo:
+      description: This datatype is used for readOnly attribute
+      type: string
+      pattern: '^[0-9]{3}$'
+      readOnly: true     
+    Mnc:
+      description: This datatype is used for writable attribut
+      type: string
+      pattern: '^[0-9]{2,3}$'
+    MncRo:
+      description: This datatype is used for readOnly attribute
+      type: string
+      pattern: '^[0-9]{2,3}$'
+      readOnly: true      
+    Nid:
+      type: string
+      pattern: '^[A-Fa-f0-9]{11}$'
+
+    CagId:
+      type: string
+      pattern: '^[A-Fa-f0-9]{8}$'
+
+    PlmnId:
+      description: This datatype is used for writable attribute
+      type: object
+      properties:
+        mcc:
+          $ref: '#/components/schemas/Mcc'
+        mnc:
+          $ref: '#/components/schemas/Mnc'
+    PlmnIdRo:
+      description: This datatype is used for readOnly attribute
+      type: object
+      properties:
+        mcc:
+          $ref: '#/components/schemas/MccRo'
+        mnc:
+          $ref: '#/components/schemas/MncRo'          
+    Tac:
+      type: string
+      pattern: '(^[A-Fa-f0-9]{4}$)|(^[A-Fa-f0-9]{6}$)'
+    UtraCellId:
+      type: integer
+    EutraCellId:
+      type: string
+      pattern: '^[A-Fa-f0-9]{7}$'
+    NrCellId:
+      type: string
+      pattern: '^[A-Fa-f0-9]{9}$'   
+    TimeWindow:
+      description: This datatype is used for writable attribute 
+      type: object
+      properties:
+        startTime:
+          $ref: '#/components/schemas/DateTime'
+        endTime:
+          $ref: '#/components/schemas/DateTime'
+    TimeWindowRo:
+      description: This datatype is used for readOnly attribute
+      type: object
+      properties:
+        startTime:
+          $ref: '#/components/schemas/DateTimeRo'
+        endTime:
+          $ref: '#/components/schemas/DateTimeRo'
+    EventTriggerConfig:
+      description: This defines the configuration parameters of trigger event used for M10 measurement in NR. For details, please refer to TS 32.422 subclause 5.10.X.
+      type: object
+      properties:
+        eventType:
+          type: string
+          enum:
+            - eventA1
+            - eventA2
+        thresholdRAN:
+          type: integer
+          minimum: 0
+          maximum: 127
+        measurementQuantityRAN:
+          type: string
+          enum:
+            - RSRP
+        hysteresisRAN:
+          type: integer
+          minimum: 0
+          maximum: 30
+        timeToTriggerRAN:
+          type: string
+          enum:
+            - 0ms
+            - 40ms
+            - 64ms
+            - 80ms
+            - 100ms
+            - 128ms
+            - 160ms
+            - 256ms
+            - 320ms
+            - 480ms
+            - 512ms
+            - 640ms
+            - 1024ms
+            - 1280ms
+            - 2560ms
+            - 5120ms
+    GeoCoordinate:
+      type: object
+      properties:
+        latitude:
+          $ref: '#/components/schemas/Latitude'
+        longitude:
+          $ref: '#/components/schemas/Longitude'
+        altitude:
+          $ref: '#/components/schemas/Float'
+    GeoArea:
+      oneOf:
+        - type: object
+          properties:
+            geoPolygon:
+              type: array
+              items:
+                $ref: '#/components/schemas/GeoCoordinate'
+              minItems: 1
+        - type: object
+          properties:
+            geoCircle:
+              $ref: '#/components/schemas/GeoCircle'
+    GeoAreaToCellMapping:
+      type: object
+      properties:
+        geoArea:
+          $ref: '#/components/schemas/GeoArea'
+        associationThreshold:
+          type: integer
+    AreaOfInterest:
+      oneOf:
+        - type: array
+          items:
+            $ref: '#/components/schemas/GeoAreaToCellMapping'
+        - type: array
+          items:
+            $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Tai'
+          minItems: 1
+          maxItems: 8
+        - type: array
+          items:
+            $ref: '#/components/schemas/NrCellId'
+          minItems: 1
+          maxItems: 32
+        - type: array
+          items:
+            $ref: '#/components/schemas/EutraCellId'
+          minItems: 1
+          maxItems: 32
+        - type: array
+          items:
+            $ref: '#/components/schemas/UtraCellId'
+          minItems: 1
+          maxItems: 32
+    Fqdn:
+      type: string
+      description: This datatype is used for writable attribute
+      pattern: '^([0-9A-Za-z]([-0-9A-Za-z]{0,61}[0-9A-Za-z])?\.)+[A-Za-z]{2,63}\.?$'
+      minLength: 4
+      maxLength: 253
+    FqdnRo:
+      type: string
+      description: This datatype is used for readOnly attribute
+      pattern: '^([0-9A-Za-z]([-0-9A-Za-z]{0,61}[0-9A-Za-z])?\.)+[A-Za-z]{2,63}\.?$'
+      minLength: 4
+      maxLength: 253
+      readOnly: true
+
+    Ipv4Addr:
+      description: This datatype is used for writable attribute
+      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])$'
+      example: '198.51.100.1'
+    Ipv4AddrRo:
+      description: This datatype is used for readOnly attribute
+      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])$'
+      example: '198.51.100.1' 
+      readOnly: true     
+    Ipv6Addr:
+      description: This datatype is used for writable attribute
+      type: string
+      allOf:
+        - pattern: '^((:|(0?|([1-9a-f][0-9a-f]{0,3}))):)((0?|([1-9a-f][0-9a-f]{0,3})):){0,6}(:|(0?|([1-9a-f][0-9a-f]{0,3})))$'
+        - pattern: '^((([^:]+:){7}([^:]+))|((([^:]+:)*[^:]+)?::(([^:]+:)*[^:]+)?))$'
+      example: '2001:db8:85a3::8a2e:370:7334'
+    Ipv6AddrRo:
+      description: This datatype is used for readOnly attribute
+      type: string
+      allOf:
+        - pattern: '^((:|(0?|([1-9a-f][0-9a-f]{0,3}))):)((0?|([1-9a-f][0-9a-f]{0,3})):){0,6}(:|(0?|([1-9a-f][0-9a-f]{0,3})))$'
+        - pattern: '^((([^:]+:){7}([^:]+))|((([^:]+:)*[^:]+)?::(([^:]+:)*[^:]+)?))$'
+      example: '2001:db8:85a3::8a2e:370:7334'
+      readOnly: true      
+    Ipv6Prefix:
+      description: This datatype is used for writable attribute
+      type: string
+      allOf:
+        - pattern: '^((:|(0?|([1-9a-f][0-9a-f]{0,3}))):)((0?|([1-9a-f][0-9a-f]{0,3})):){0,6}(:|(0?|([1-9a-f][0-9a-f]{0,3})))(\/(([0-9])|([0-9]{2})|(1[0-1][0-9])|(12[0-8])))$'
+        - pattern: '^((([^:]+:){7}([^:]+))|((([^:]+:)*[^:]+)?::(([^:]+:)*[^:]+)?))(\/.+)$'
+      example: '2001:db8:abcd:12::0/64'
+    Ipv6PrefixRo:
+      description: This datatype is used for readOnly attribute
+      type: string
+      allOf:
+        - pattern: '^((:|(0?|([1-9a-f][0-9a-f]{0,3}))):)((0?|([1-9a-f][0-9a-f]{0,3})):){0,6}(:|(0?|([1-9a-f][0-9a-f]{0,3})))(\/(([0-9])|([0-9]{2})|(1[0-1][0-9])|(12[0-8])))$'
+        - pattern: '^((([^:]+:){7}([^:]+))|((([^:]+:)*[^:]+)?::(([^:]+:)*[^:]+)?))(\/.+)$'
+      example: '2001:db8:abcd:12::0/64'
+      readOnly: true      
+    IpAddr:
+      description: This datatype is used for writable attribute
+      oneOf:
+        - $ref: '#/components/schemas/Ipv4Addr'
+        - $ref: '#/components/schemas/Ipv6Addr'
+        - $ref: '#/components/schemas/Ipv6Prefix'
+    IpAddrRo:
+      description: This datatype is used for readOnly attribute
+      oneOf:
+        - $ref: '#/components/schemas/Ipv4AddrRo'
+        - $ref: '#/components/schemas/Ipv6AddrRo'
+        - $ref: '#/components/schemas/Ipv6PrefixRo'        
+    HostAddr:
+      #  This definition will be deprecated, when all occurances of HostAddr
+      #  are replaced by Host.
+      oneOf:
+        - $ref: '#/components/schemas/Ipv4Addr'
+        - $ref: '#/components/schemas/Ipv6Addr'
+        - $ref: '#/components/schemas/Fqdn'
+    Host:
+      oneOf:
+        - $ref: '#/components/schemas/IpAddr'
+        - $ref: '#/components/schemas/Fqdn'
+    HostRo:
+      oneOf:
+        - $ref: '#/components/schemas/IpAddrRo'
+        - $ref: '#/components/schemas/FqdnRo'
+    Uri:
+      description: This datatype is used for writable attribute
+      type: string
+    UriRo:
+      type: string
+      description: This datatype is used for readOnly attribute
+      readOnly: true      
+
+    TimeInterval:
+      type: object
+      properties:
+        intervalStart:
+          $ref: '#/components/schemas/FullTime'
+        intervalEnd:
+          $ref: '#/components/schemas/FullTime'
+
+    AdministrativeState:
+      type: string
+      enum:
+        - LOCKED
+        - UNLOCKED
+      default: LOCKED  
+    BasicAdministrativeState:
+      type: string
+      enum:
+        - LOCKED
+        - UNLOCKED
+    OperationalState:
+      type: string
+      enum:
+        - ENABLED
+        - DISABLED
+      default: DISABLED
+      readOnly: true  
+    UsageState:
+      type: string
+      readOnly: true
+      enum:
+        - IDLE
+        - ACTIVE
+        - BUSY
+    AvailabilityStatus:
+      type: string
+      enum:
+        - IN_TEST
+        - FAILED
+        - POWER_OFF
+        - OFF_LINE
+        - OFF_DUTY
+        - DEPENDENCY
+        - DEGRADED
+        - NOT_INSTALLED
+        - LOG_FULL
+      readOnly: true  
+
+    AttributeNameValuePairSet:
+      description: >-
+        The key of this map is the attribute name, and the value the attribute value.
+      type: object
+      minProperties: 1
+      additionalProperties:
+        nullable: true
+    AttributeValueChangeSet:
+      description: >-
+        The first array item contains the attribute name value pairs with the new values,
+        and the second array item the attribute name value pairs with the optional old values.
+      type: array
+      items:
+        $ref: '#/components/schemas/AttributeNameValuePairSet'
+      minItems: 1
+      maxItems: 2
+
+    Filter:
+      description: >-
+        The filter format shall be compliant to Jex (TS 32.161).
+      type: string
+    JexConditions:
+      type: string
+      description: >-
+        The value of the string shall be a Jex expression that is compliant to the 
+        Jex conditions profile specified in clause 7.6 of TS 32.161.
+    JexNodeSelectionBasic:
+      type: string
+      description: >-
+        The value of the string shall be a Jex expression that is compliant to the 
+        Jex basic profile specified in clause 7.4 of TS 32.161.
+    JexNodeSelectionAdvanced:
+      type: string
+      description: >-
+        The value of the string shall be a Jex expression that is compliant to the 
+        Jex advanced profile specified in clause 7.5 of TS 32.161.
+    SystemDN:
+      type: string
+    NotificationId:
+      type: integer
+      readOnly: true    
+    NotificationType:
+      oneOf:
+        - $ref: 'TS28111_FaultNrm.yaml#/components/schemas/AlarmNotificationTypes'
+        - $ref: 'TS28532_ProvMnS.yaml#/components/schemas/CmNotificationTypes'
+        - $ref: 'TS28532_PerfMnS.yaml#/components/schemas/PerfNotificationTypes'
+        - $ref: 'TS28532_HeartbeatNtf.yaml#/components/schemas/HeartbeatNotificationTypes'
+        - $ref: 'TS28532_FileDataReportingMnS.yaml#/components/schemas/FileNotificationTypes'
+    NotificationHeader:
+      type: object
+      properties:
+        href:
+          $ref: '#/components/schemas/Uri'
+        notificationId:
+          $ref: '#/components/schemas/NotificationId'
+        notificationType:
+          $ref: '#/components/schemas/NotificationType'
+        eventTime:
+          $ref: '#/components/schemas/DateTime'
+        systemDN:
+          $ref: '#/components/schemas/SystemDN'
+        sequenceNo:
+          type: integer
+        subscriptionId:
+          type: string
+      required:
+        - href
+        - notificationId
+        - notificationType
+        - eventTime
+        - systemDN
+
+    ErrorResponse:
+      description: >-
+        Default schema for the response message body in case the request
+        is not successful.
+      type: object
+      properties:
+        error:
+          type: object
+          properties:
+            errorInfo:
+              type: string
+    Subscription:
+      type: object
+      properties:
+        consumerReference:
+          $ref: '#/components/schemas/Uri'
+        timeTick:
+          type: integer
+        filter:
+          $ref: '#/components/schemas/JexConditions'
+
+    ErrorResponseGet:
+      description: >-
+        Default schema for the response message body in case the Get
+        is not successful.
+      type: object
+      properties:
+        status:
+          type: string
+        type:
+          type: string
+        reason:
+          type: string
+        title:
+          type: string
+        badQueryParams:
+          type: array
+          items:
+            type: string
+        otherProblems:
+          type: array
+          items:
+            type: object
+            properties:
+              status:
+                type: string
+              type:
+                type: string
+              reason:
+                type: string
+              title:
+                type: string
+              badQueryParams:
+                type: array
+                items:
+                  type: string
+            required:
+              - type
+      required:
+        - type
+
+    ErrorResponseDefault:
+      type: object
+      properties:
+        status:
+          type: string
+        type:
+          type: string
+        reason:
+          type: string
+        title:
+          type: string
+        badAttributes:
+          type: array
+          items:
+            type: string
+        badObjects:
+          type: array
+          items:
+            type: string
+        otherProblems:
+          type: array
+          items:
+            type: object
+            properties:
+              status:
+                type: string
+              type:
+                type: string
+              reason:
+                type: string
+              title:
+                type: string
+              badAttributes:
+                type: array
+                items:
+                  type: string
+              badObjects:
+                type: array
+                items:
+                  type: string
+            required:
+              - type
+      required:
+        - type
+
+    ErrorResponsePatch:
+      description: >-
+        Default schema for the response message body in case the patch
+        is not successful.
+      type: object
+      properties:
+        status:
+          type: string
+        type:
+          type: string
+        reason:
+          type: string
+        title:
+          type: string
+        badOp:
+          type: string
+        otherProblems:
+          type: array
+          items:
+            type: object
+            properties:
+              status:
+                type: string
+              type:
+                type: string
+              reason:
+                type: string
+              title:
+                type: string
+              badOp:
+                type: string
+            required:
+              - type
+              - badOp
+      required:
+        - type
+        - badOp

original/Rel-20/28_series/TS28623_ExternalDataMgmtNrm.yaml

@@ -0,0 +1,81 @@
+openapi: 3.0.1
+info:
+  title: External data management NRM
+  version: 19.5.0
+  description: >-
+    OAS 3.0.1 definition of the External data type NRM fragment
+    © 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC).
+    All rights reserved.
+externalDocs:
+  description: 3GPP TS 28.623; Generic NRM, External data type NRM fragment
+  url: http://www.3gpp.org/ftp/Specs/archive/28_series/28.623/
+paths: {}
+components:
+  schemas:
+  #-------- Definition of types for name-containments ------
+    SubNetwork-ncO-ExternalDataMgmtNrm:
+      type: object
+      properties:
+        ExternalDataType:
+          $ref: '#/components/schemas/ExternalDataType-Multiple'
+    
+
+#-------- Definition of types-----------------------------------------------------
+
+    ExternalDataScope:
+      type: object
+      properties:
+        geoAreas:
+          type: array
+          uniqueItems: true
+          items:
+            $ref: 'TS28623_ComDefs.yaml#/components/schemas/GeoArea'
+        objectInstancesIncluded:
+          type: array
+          uniqueItems: true
+          items:
+            $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn'
+        objectInstancesExcluded:
+          type: array
+          uniqueItems: true
+          items:
+            $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn'
+
+#-------- Definition of concrete IOCs --------------------------------------------
+
+    ExternalDataType-Single:
+      allOf:
+      - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top'
+      - type: object
+        properties:
+          attributes:
+            type: object
+            properties:
+              externalDataType:
+                type: string
+              mediaLocation: 
+                type: array
+                uniqueItems: true
+                items:
+                  $ref: 'TS28623_ComDefs.yaml#/components/schemas/Uri'
+              externalDataTypeSchema:
+                type: string
+              externalDataScope:
+                type: array
+                uniqueItems: true
+                items:
+                  $ref: '#/components/schemas/ExternalDataScope'
+
+#-------- Definition of YAML arrays for name-contained IOCs ----------------------
+
+    ExternalDataType-Multiple:
+      type: array
+      items:
+        $ref: '#/components/schemas/ExternalDataType-Single'
+
+#-------- Definitions in TS 28.623 for TS 28.532 ---------------------------------
+    resources-externalDataMgmtNrm:
+      oneOf:
+       - $ref: '#/components/schemas/ExternalDataType-Single'
+     
+       

original/Rel-20/28_series/TS28623_GenericNrm.yaml

@@ -0,0 +1,724 @@
+openapi: 3.0.1
+info:
+  title: Generic NRM
+  version: 19.6.0
+  description: >-
+    OAS 3.0.1 definition of the Generic NRM
+    © 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC).
+    All rights reserved.
+externalDocs:
+  description: 3GPP TS 28.623; Generic NRM
+  url: http://www.3gpp.org/ftp/Specs/archive/28_series/28.623/
+paths: {}
+components:
+  schemas:
+
+#-------- Definition of types-----------------------------------------------------
+
+
+    VnfParameters:
+      description: ->
+        This <<dataType>> represents the parameter set of the VNF instance(s) corresponding to an NE.
+      type: object
+      properties:
+        vnfInstanceId:
+          type: string
+        vnfdId:
+          type: string
+        flavourId:
+          type: string
+        autoScalable:
+          type: boolean
+          default: FALSE
+    PeeParameters:
+      description: ->
+        This <<dataType>> represents the parameter list for the control and monitoring of power, energy and environmental parameters.
+      type: object
+      properties:
+        siteIdentification:
+          type: string
+        siteLatitude:
+          $ref: 'TS28623_ComDefs.yaml#/components/schemas/Latitude'
+        siteLongitude:
+          $ref: 'TS28623_ComDefs.yaml#/components/schemas/Longitude'
+        siteAltitude:
+          type: number
+          format: float
+        siteDescription:
+          type: string  
+        equipmentType:
+          type: string
+        environmentType:
+          type: string
+        powerInterface:
+          type: string
+    TransportProtocol:
+      anyOf:
+        - type: string
+          enum:
+            - TCP
+        - type: string
+    SupportedPerfMetricGroup:
+      type: object
+      properties:
+        performanceMetrics:
+          type: array
+          uniqueItems: true
+          items:
+            type: string
+          readOnly: true 
+          minItems: 1 
+        granularityPeriods:
+          type: array
+          uniqueItems: true
+          items:
+            type: integer
+            minimum: 1
+          readOnly: true  
+        reportingMethods:
+          type: array
+          uniqueItems: true
+          items:
+            type: string
+            enum:
+             - FILE_BASED_LOC_SET_BY_PRODUCER
+             - FILE_BASED_LOC_SET_BY_CONSUMER
+             - STREAM_BASED
+            readOnly: true               
+        reportingPeriods:
+          type: array
+          uniqueItems: true
+          items:
+            type: integer
+            minimum: 1
+          readOnly: true  
+    ReportingCtrl:
+      oneOf:
+        - type: object
+          properties:
+            fileReportingPeriod:
+              type: integer
+        - type: object
+          properties:
+            fileReportingPeriod:
+              type: integer
+            notificationRecipientAddress:
+              $ref: 'TS28623_ComDefs.yaml#/components/schemas/Uri'            
+        - type: object
+          properties:
+            fileReportingPeriod:
+              type: integer
+            fileLocation:
+              $ref: 'TS28623_ComDefs.yaml#/components/schemas/Uri'
+        - type: object
+          properties:
+            streamTarget:
+              $ref: 'TS28623_ComDefs.yaml#/components/schemas/Uri'
+    ProcessMonitor:
+      description: >-
+        This data type is the "ProcessMonitor" data type without specialisations.
+      type: object
+      properties:
+        id:
+          type: string
+          readOnly: true
+        status:
+          type: string
+          enum:
+            - NOT_STARTED
+            - RUNNING
+            - FINSHED
+            - FAILED
+            - PARTIALLY_FAILED
+            - CANCELLING
+            - CANCELLED
+          readOnly: true            
+        progressPercentage:
+          type: integer
+          minimum: 0
+          maximum: 100
+          readOnly: true          
+        progressStateInfo:
+          type: string
+          readOnly: true
+        resultStateInfo:
+          type: string
+          readOnly: true
+        startTime:
+          $ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTimeRo'
+        endTime:
+          $ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTimeRo'
+        timer:
+          type: integer
+    AreaScope:
+      allOf:
+      - type: array
+        items:
+          $ref: 'TS28541_NrNrm.yaml#/components/schemas/PlmnInfoList'
+        maxItems: 16384
+      - oneOf:
+        - type: array
+          items:
+            $ref: '#/components/schemas/EutraCellId'
+          minItems: 1
+          maxItems: 32
+        - type: object
+          properties: 
+            nrCellId:
+              type: array
+              items:
+                $ref: '#/components/schemas/NrCellId'
+              minItems: 1
+              maxItems: 32
+            nPNIdentityList:
+              type: array
+              items:
+                $ref: '#/components/schemas/NpnId-Type'
+        - type: object
+          properties: 
+            tacList:
+              type: array
+              items:
+                $ref: '#/components/schemas/Tac'
+              minItems: 1
+              maxItems: 8
+            cAGIdList:
+              type: array
+              items:
+                $ref: 'TS28623_ComDefs.yaml#/components/schemas/CagId'
+              maxItems: 256
+        - type: object
+          properties: 
+            taList:
+              type: array
+              items:
+                $ref: '#/components/schemas/Tai'
+              minItems: 1
+              maxItems: 8
+            nPNIdentityList:
+              type: array
+              items:
+                $ref: '#/components/schemas/NpnId-Type'
+        - type: object
+          properties: 
+            nTNGeoAreaList:
+              type: array
+              items:
+                $ref: 'TS28623_ComDefs.yaml#/components/schemas/GeoArea'
+              minItems: 1
+              maxItems: 8
+        - type: array
+          items:
+            $ref: '#/components/schemas/NpnId-Type'
+          minItems: 1
+    Tai:
+      type: object
+      properties:
+        mcc:
+          $ref: 'TS28623_ComDefs.yaml#/components/schemas/Mcc'
+        mnc:
+          $ref: 'TS28623_ComDefs.yaml#/components/schemas/Mnc'
+        tac:
+          $ref: '#/components/schemas/Tac'
+    Tac:
+      type: string 
+      pattern: '(^[A-Fa-f0-9]{4}$)|(^[A-Fa-f0-9]{6}$)'   
+    EutraCellId:
+      type: string
+      pattern: '^[A-Fa-f0-9]{7}$'
+    NrCellId:
+      type: string
+      pattern: '^[A-Fa-f0-9]{9}$'
+    IpAddr:
+      oneOf:
+        - $ref: 'TS28623_ComDefs.yaml#/components/schemas/Ipv4Addr'
+        - $ref: 'TS28623_ComDefs.yaml#/components/schemas/Ipv6Addr'
+
+    SchedulingTime:
+      oneOf:
+        - $ref: 'TS28623_ComDefs.yaml#/components/schemas/TimeWindow'
+        - type: object
+          properties:
+            timeIntervals:
+              type: array
+              uniqueItems: true
+              items:
+                $ref: 'TS28623_ComDefs.yaml#/components/schemas/TimeInterval'
+        - type: object
+          properties:
+            timeIntervals:
+              type: array
+              uniqueItems: true
+              items:
+                $ref: 'TS28623_ComDefs.yaml#/components/schemas/TimeInterval'
+            daysOfWeek:
+              type: array
+              uniqueItems: true
+              items:
+                type: string
+                enum:
+                  - MONDAY
+                  - TUESDAY
+                  - WEDNESDAY
+                  - THURSDAY
+                  - FRIDAY
+                  - SATURDAY
+                  - SUNDAY
+                minItems: 1
+                maxItems: 7
+        - type: object
+          properties:
+            timeIntervals:
+              type: array
+              uniqueItems: true
+              items:
+                $ref: 'TS28623_ComDefs.yaml#/components/schemas/TimeInterval'
+            daysOfMonth:
+              type: array
+              uniqueItems: true
+              items:
+                type: integer
+                minimum: 0
+                maximum: 31
+    NpnId-Type:
+      type: object
+      properties:
+        plmnId:
+          $ref: 'TS28623_ComDefs.yaml#/components/schemas/PlmnId'
+        cAGIdList:
+          type: array
+          uniqueItems: true
+          items:
+            $ref: 'TS28623_ComDefs.yaml#/components/schemas/CagId'
+          maxItems: 256  
+        nIDList:
+          type: array
+          uniqueItems: true
+          items:
+            $ref: 'TS28623_ComDefs.yaml#/components/schemas/Nid'
+          maxItems: 16
+      oneOf:
+        - required: [plmnId, cAGIdList]
+        - required: [plmnId, nIDList]
+
+#-------- Definition of abstract IOC Top -----------------------------------------
+
+    Top-Attr:
+      #  This definition will be deprecated, when all occurances of Top-Attr
+      #  are replaced by Top.
+      type: object
+      properties:
+        id:
+          type: string
+          nullable: true
+        objectClass:
+          type: string
+        objectInstance:
+          $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn'
+        VsDataContainer:
+          $ref: '#/components/schemas/VsDataContainer-Multiple'
+      required:
+        - id
+    Top:
+      type: object
+      properties:
+        id:
+          type: string
+          nullable: true
+        objectClass:
+          type: string
+        objectInstance:
+          $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn'
+        VsDataContainer:
+          $ref: '#/components/schemas/VsDataContainer-Multiple'
+      required:
+        - id
+
+#-------- Definition of IOCs with new name-containments defined in other TS ------
+
+    SubNetwork-Attr:
+      type: object
+      properties:
+        dnPrefix:
+          type: string
+        userLabel:
+          type: string
+        userDefinedNetworkType:
+          type: string
+        setOfMcc:
+          type: array
+          uniqueItems: true
+          items:
+            $ref: 'TS28623_ComDefs.yaml#/components/schemas/Mcc'
+          readOnly: true
+          minItems: 1
+        priorityLabel:
+          type: integer
+          readOnly: true
+        supportedPerfMetricGroups:
+          type: array
+          uniqueItems: true
+          items:
+            $ref: '#/components/schemas/SupportedPerfMetricGroup'
+        supportedTraceMetrics:
+          type: array
+          uniqueItems: true
+          items:
+            type: string
+    ManagedElement-Attr:
+      type: object
+      properties:
+        dnPrefix:
+          type: string
+        managedElementTypeList:
+          type: array
+          uniqueItems: true
+          items:
+            type: string
+        userLabel:
+          type: string
+        locationName:
+          type: string
+        managedBy:
+          $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList'
+        vendorName:
+          type: string
+          readOnly: true
+        userDefinedState:
+          type: string
+        swVersion:
+          type: string
+          readOnly: true
+        priorityLabel:
+          type: integer
+        supportedPerfMetricGroups:
+          type: array
+          uniqueItems: true
+          items:
+            $ref: '#/components/schemas/SupportedPerfMetricGroup'
+        supportedTraceMetrics:
+          type: array
+          uniqueItems: true
+          items:
+            type: string
+          readOnly: true  
+
+    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'
+        AlarmList:
+          $ref: 'TS28111_FaultNrm.yaml#/components/schemas/AlarmList-Single'
+        Scheduler:
+          $ref: '#/components/schemas/Scheduler-Multiple'
+        ConditionMonitor:
+          $ref: '#/components/schemas/ConditionMonitor-Multiple'
+        SupportedNotifications:
+          $ref: '#/components/schemas/SupportedNotifications-Single'
+
+
+    ManagedElement-ncO:
+      type: object
+      properties:
+        MnsAgent:
+          $ref: '#/components/schemas/MnsAgent-Multiple'
+        AlarmList:
+          $ref: 'TS28111_FaultNrm.yaml#/components/schemas/AlarmList-Single'
+        Scheduler:
+          $ref: '#/components/schemas/Scheduler-Multiple'
+        ConditionMonitor:
+          $ref: '#/components/schemas/ConditionMonitor-Multiple'
+        SupportedNotifications:  
+          $ref: '#/components/schemas/SupportedNotifications-Single'
+
+
+#-------- Definition of abstract IOCs --------------------------------------------
+
+    ManagedFunction-Attr:
+      type: object
+      properties:
+        userLabel:
+          type: string
+        vnfParametersList:
+          type: array
+          uniqueItems: true
+          items:
+            $ref: '#/components/schemas/VnfParameters'
+        peeParametersList:
+          type: array
+          uniqueItems: true
+          items:
+            $ref: '#/components/schemas/PeeParameters'
+        priorityLabel:
+          type: integer
+        supportedPerfMetricGroups:
+          type: array
+          uniqueItems: true
+          items:
+            $ref: '#/components/schemas/SupportedPerfMetricGroup'
+        supportedTraceMetrics:
+          type: array
+          uniqueItems: true
+          items:
+            type: string
+    EP_RP-Attr:
+      type: object
+      properties:
+        userLabel:
+          type: string
+        farEndEntity:
+          type: string
+          readOnly: true
+        supportedPerfMetricGroups:
+          type: array
+          uniqueItems: true
+          items:
+            $ref: '#/components/schemas/SupportedPerfMetricGroup'
+
+    ManagedFunction-ncO:
+      type: object
+      properties:
+        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'
+
+#-------- Definition of concrete IOCs --------------------------------------------
+
+    VsDataContainer-Single:
+      type: object
+      properties:
+        id:
+          type: string
+        attributes:
+          type: object
+          properties:
+            vsDataType:
+              type: string
+              readOnly: true
+            vsDataFormatVersion:
+              type: string
+              readOnly: true
+            vsData:
+              nullable: true
+        VsDataContainer:
+          $ref: '#/components/schemas/VsDataContainer-Multiple'
+
+    ManagementNode-Single:
+      allOf:
+        - $ref: '#/components/schemas/Top'
+        - type: object
+          properties:
+            attributes:
+              type: object
+              properties:
+                userLabel:
+                  type: string
+                managedElements:
+                  $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList'
+                vendorName:
+                  type: string
+                  readOnly: true
+                userDefinedState:
+                  type: string
+                locationName:
+                  type: string
+                  readOnly: true
+                swVersion:
+                  type: string
+                  readOnly: true
+            MnsAgent:
+              $ref: '#/components/schemas/MnsAgent-Multiple'
+    MnsAgent-Single:
+      allOf:
+        - $ref: '#/components/schemas/Top'
+        - type: object
+          properties:
+            attributes:
+              type: object
+              properties:
+                systemDN:
+                  $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnRo'
+    MeContext-Single:
+      allOf:
+        - $ref: '#/components/schemas/Top'
+        - type: object
+          properties:
+            attributes:
+              type: object
+              properties:
+                dnPrefix:
+                  type: string
+                  readOnly: true
+    Scheduler-Single:
+      allOf:
+        - $ref: '#/components/schemas/Top'
+        - type: object
+          properties:
+            attributes:
+              type: object
+              properties:
+                schedulingTimes:
+                  type: array
+                  uniqueItems: true
+                  items:
+                    $ref: '#/components/schemas/SchedulingTime'
+                  minItems: 1
+                schedulerStatus:
+                  type: boolean
+                  readOnly: true
+    ConditionMonitor-Single:
+      allOf:
+        - $ref: '#/components/schemas/Top'
+        - type: object
+          properties:
+            attributes:
+              type: object
+              properties:
+                condition:
+                  type: string
+                conditionStatus:
+                  type: boolean
+                  readOnly: true
+
+    SupportedNotifications-Single:
+      allOf:
+        - $ref: '#/components/schemas/Top'
+        - type: object
+          properties:
+            attributes:
+              type: object
+              properties:
+                notificationTypes:
+                  type: array
+                  uniqueItems: true
+                  items:
+                    $ref: 'TS28623_ComDefs.yaml#/components/schemas/NotificationType'
+                notificationProtocols:
+                  type: array
+                  uniqueItems: true
+                  items:
+                    type: string
+                    enum:
+                      - HTTP
+                      - HTTP_VES_ENCAPS
+                    minItems: 1
+                  readOnly: true  
+
+
+    SubNetwork-Single:
+      allOf:
+        - $ref: '#/components/schemas/Top' 
+        - $ref: '#/components/schemas/SubNetwork-Attr'
+        - $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'
+        - $ref: 'TS28317_RanScNrm.yaml#/components/schemas/SubNetwork-ncO-RanScNrm'
+        - $ref: 'TS28536_CoslaNrm.yaml#/components/schemas/SubNetwork-ncO-CoslaNrm'
+        - $ref: 'TS28538_EdgeNrm.yaml#/components/schemas/SubNetwork-ncO-EdgeNrm'
+        - $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'
+        - $ref: 'TS28310_EnergyInformationNrm.yaml#/components/schemas/SubNetwork-ncO-EnergyInformationNrm'    
+
+    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'
+    ManagementNode-Multiple:
+      type: array
+      items:
+        $ref: '#/components/schemas/ManagementNode-Single'
+    MnsAgent-Multiple:
+      type: array
+      items:
+        $ref: '#/components/schemas/MnsAgent-Single'
+    MeContext-Multiple:
+      type: array
+      items:
+        $ref: '#/components/schemas/MeContext-Single'
+    Scheduler-Multiple:
+      type: array
+      items:
+        $ref: '#/components/schemas/Scheduler-Single'
+    ConditionMonitor-Multiple:
+      type: array
+      items:
+        $ref: '#/components/schemas/ConditionMonitor-Single'
+    SubNetwork-Multiple:
+      type: array
+      items:
+        $ref: '#/components/schemas/SubNetwork-Single'
+    ManagedElement-Multiple:
+      type: array
+      items:
+        $ref: '#/components/schemas/ManagedElement-Single'
+
+
+#-------- Definitions in TS 28.623 for TS 28.532 ---------------------------------
+
+    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/Scheduler-Single'
+       - $ref: '#/components/schemas/ConditionMonitor-Single'
+       - $ref: '#/components/schemas/SupportedNotifications-Single' 
+       - $ref: '#/components/schemas/SubNetwork-Single'
+       - $ref: '#/components/schemas/ManagedElement-Single'

original/Rel-20/28_series/_3gpp-5g-common-yang-types.yang

@@ -0,0 +1,621 @@
+module _3gpp-5g-common-yang-types {
+  yang-version 1.1;
+  namespace "urn:3gpp:sa5:_3gpp-5g-common-yang-types";
+  prefix "types5g3gpp";
+
+  import ietf-yang-types { prefix yang; }
+  import ietf-inet-types { prefix inet; }
+  import _3gpp-common-yang-types { prefix types3gpp; }
+
+  organization "3GPP SA5";
+  contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464";
+  description "The model defines common types for 5G networks and
+    network slicing.
+    Copyright 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI,
+    TTA, TTC). All rights reserved.";
+  reference "3GPP TS 28.541";
+
+  revision 2025-11-07 { reference CR-1640 ; }
+  revision 2025-11-02 { reference CR-1658 ; }
+  revision 2025-07-25 { reference CR-1558 ; }
+  revision 2025-03-25 { reference CR-1489 ; }
+  revision 2024-11-01 { reference CR-1405; }
+  revision 2024-10-06 { reference CR-1389; }
+  revision 2024-05-24 { reference CR-1273 ; }
+  revision 2023-09-18 { reference CR-1043 ; }
+  revision 2023-05-10 { reference CR-0916; }
+  revision 2021-08-05 { reference S5-214053/CR-0518; }
+  revision 2020-11-05 { reference CR-0412 ; }
+  revision 2019-10-20 { reference "Initial version."; }
+
+  grouping AreaScopeGrp {
+    description "This <<dataType>> defines an area scope.";
+
+    choice AreaScopeChoice {
+
+      case eutran-only { // choice 1
+        leaf-list eutraCellIdList {
+          type types3gpp:EutraCellId;
+          min-elements 1;
+          max-elements 32;
+          description "List of E-UTRAN cells identified by E-UTRAN-CGI";
+        }
+      }
+      case tac { // choice 3
+        leaf-list tacList { 
+          type types3gpp:Tac;
+          min-elements 1;
+          max-elements 8;
+          description "Tracking Area Code list";
+        }
+        leaf-list cAGIdList { 
+          type types3gpp:CagId;
+          max-elements 256;
+          description "It identifies a CAG list containing up to 
+            256 CAG-identifiers per UE or up to 12 CAG-identifiers 
+            per cell, see TS 38.331 [38]. CAG ID is used to combine 
+            with PLMN ID to identify a PNI-NPN.AG ID is a hexadecimal 
+            range with size 32 bit.";
+        }
+      }
+
+      case ntnGeoAreaList{ // choice 6
+        list ntnGeoAreaList {
+          must 'not(../nrCellIdList)';
+          description "geographical areas for NTN MDT";
+          key idx;
+          max-elements 8;
+          leaf idx { type string; }
+          uses types3gpp:GeoAreaGrp;
+        }
+      }
+
+      case else {
+        list nPNIdentityList { // choice 2, 4 , 5
+          description "list of NPN IDs of in NR. It is either 
+            a list of PNI-NPNs identified by CAG ID with 
+            associated plmn-Identity or a list of SNPN 
+            identified by Network ID with associated plmn-Identity";
+          key idx;
+          min-elements 1;
+            uses types3gpp:NpnIdGrp;
+          leaf idx { type string; }
+        }
+        leaf-list nrCellIdList {
+          must 'not(../taiList)';
+          type types3gpp:NrCellId;
+          max-elements 32;
+          description "List of NR cells identified by NG-RAN CGI";        
+        }
+        list taiList {
+          must 'not(../nrCellIdList)';
+          description "Tracking Area Identity list";
+          key idx;
+          max-elements 8;
+          leaf idx { type string; }
+          uses types3gpp:TaiGrp;
+        }
+
+      }
+    }
+        
+
+    list sliceIdList {
+      description "Network Slice Id list";
+      key idx;
+      uses PLMNInfo;
+      min-elements 1;
+      max-elements 16384;
+      leaf idx { type string; }
+    }
+  }
+
+  grouping IpInterfaceGrp {
+    leaf-list ipv4EndpointAddresses {
+      description "Available endpoint IPv4 address(es) of
+        the User Plane interface.";
+      type inet:ipv4-address;
+      must '../ipv4EndpointAddresses or ../ipv6EndpointAddresses or ../fqdn';
+    }
+
+    leaf-list ipv6EndpointAddresses {
+      description "Available endpoint IPv6 address(es) of
+        the User Plane interface.";
+      type inet:ipv6-address;
+      must '../ipv4EndpointAddresses or ../ipv6EndpointAddresses or ../fqdn';
+      }
+
+    leaf fqdn {
+      description "This parameter defines FQDN of the Network Function
+        (See TS 23.003).";
+      type inet:domain-name;
+      must '../ipv4EndpointAddresses or ../ipv6EndpointAddresses or ../fqdn';
+      }
+  }
+
+  grouping SdRangeGrp {
+    leaf start {
+      type string {
+         pattern "[A-Fa-f0-9]{6}";
+       }
+      mandatory true;
+      description "First value identifying the start of an SD range.
+        This string shall be formatted as specified for the sd attribute of the
+        Snssai data type in clause 5.4.4.2 of TS 29.571.";
+    }
+
+    leaf end {
+      type string {
+         pattern "[A-Fa-f0-9]{6}";
+       }
+      mandatory true;
+      description "Last value identifying the end of an SD range.
+      This string shall be formatted as specified for the sd attribute of the
+        Snssai data type in clause 5.4.4.2 in TS 29.571";
+    }
+  }
+
+  grouping SnssaiExtensionGrp {
+    list sdRanges {
+      min-elements 1;
+      key "start end";
+      description "It shall contain the range(s) of Slice Differentiator values
+        supported for the Slice/Service Type value indicated in the sst
+        attribute of the Snssai data type (see clause 5.4.4.2 in TS 29.571).";
+      uses SdRangeGrp;
+    }
+
+    leaf wildcardSd {
+      type boolean;
+      default false;
+      description "It indicates that all SD values are supported for the
+        Slice/Service Type value indicated in the sst attribute of the Snssai
+        data type (see clause 5.4.4.2 in TS 29.571).";
+    }
+  }
+
+  grouping ExtSnssaiGrp {
+    list snssai {
+      description "It represents the S-NSSAI the NetworkSlice managed object
+        is supporting. The S-NSSAI is defined in TS 23.003 ";
+      min-elements 1;
+      max-elements 1;
+      key "sd sst";
+      uses SNssai;
+    }
+
+    list snssaiExtension {
+      description "It represents extensions to the Snssai.";
+      min-elements 1;
+      key idx;
+      leaf idx { type uint32; }
+      uses SnssaiExtensionGrp;
+    }
+  }
+    grouping sNssaiSmfInfoItem {
+    list sNssai {
+      description "Supported S-NSSAI.";
+      min-elements 1;
+      max-elements 1;
+      key "sst sd";
+      uses SNssai;
+    }
+
+    list dnnSmfInfoList {
+      description "List of parameters supported by the SMF per DNN.
+      The absence indicates the DNN can be selected for any DNAI.";
+      min-elements 1;
+      key dnn;
+      uses DnnSmfInfoItem;
+    }
+  }
+
+  grouping MappedCellIdInfoGrp {
+    description "This data type represents the mapping relationship between
+      Mapped Cell IDs and geographical areas (see clause 16.14.5 of TS 38.300";
+
+    list ntnGeoArea {
+      description "This attribute indicates a specific geographical location
+        mapped to Mapped Cell ID(s).";
+      min-elements 1;
+      max-elements 1;
+      key idx;
+      leaf idx { type uint32; }
+      uses types3gpp:GeoAreaGrp;
+    }
+
+    list mappedCellId  {
+      description "This attribute is in format of NCGI to indicate a fixed
+        geographical area (See subclause 16.14.5 in TS 38.300)";
+      min-elements 1;
+      max-elements 1;
+      key idx;
+      leaf idx { type uint32; }
+      uses NcgiGrp;
+    }
+  }
+
+  grouping NcgiGrp {
+    description "Represents the Ncgi datatype";
+
+    list plmnId {
+      description "This attribute represents a PLMN Identity.";
+      min-elements 1;
+      max-elements 1;
+      key "idx";
+      leaf idx { type uint32 ; }
+      uses types3gpp:PLMNId ;
+    }
+
+    leaf nrCellId {
+      type string;
+      mandatory true;
+      description "This attribute represents NR Cell Identity.
+        It's a 36-bit string identifying an NR Cell Id as specified in
+        clause 9.3.1.7 of TS 38.413, in hexadecimal representation. Each
+        character in the string shall take a value of
+        '0' to '9', 'a' to 'f' or 'A' to 'F' and shall represent 4 bits.
+        The most significant character representing the 4 most significant
+        bits of the Cell Id shall appear first in the string, and the
+        character representing the 4 least significant bit of the
+        Cell Id shall appear last in the string.
+
+        Pattern: '^[A-Fa-f0-9]{9}$'
+
+        Example:
+        An NR Cell Id 0x225BD6007 shall be encoded as '225BD6007'.";
+    }
+
+    leaf nId {
+      type string;
+      mandatory true;
+      description "Network Identity; Shall be present if PlmnIdNid identifies
+        an SNPN (see clauses 5.30.2.3, 5.30.2.9, 6.3.4, and 6.3.8 in
+        3GPP TS 23.501.";
+    }
+  }
+
+  typedef NRTAC {
+    type string;
+    description "This holds the identity of the common Tracking Area Code
+      for the PLMNs.
+
+      allowedValues:
+      a) It is the TAC or Extended-TAC.
+      b) A cell can only broadcast one TAC or Extended-TAC. See TS 36.300,
+        subclause 10.1.7 (PLMNID and TAC relation).
+      c) TAC is defined in subclause 19.4.2.3 of 3GPP TS 23.003
+       and Extended-TAC is defined in subclause 9.3.1.29 of 3GPP TS 38.473.
+      d) For a 5G SA (Stand Alone), it has a non-null value.";
+  }
+
+  grouping SNssai {
+    description
+      "Single Network Slice Selection Assistance Information(S-NSSAI)";
+    reference "3GPP TS 23.003";
+
+    leaf sd {
+      description "Slice Differentiator
+        If not needed, the value can be set to ff:ff:ff.";
+      type yang:hex-string {
+        length 8;
+      }
+      reference "3GPP TS 23.003";
+    }
+
+    leaf sst {
+      type uint8;
+      description "Slice/Service Type.
+         Values 0 to 127 belong to standardized SST range and are defined in
+         3GPP TS 23.501. Values 128 to 255 belong to operator-specific range.";
+    }
+  }
+
+  grouping PlmnIdNid {
+    description "Represents the SCP domain specific information as defined
+      in TS 29.510 ";
+    uses types3gpp:PLMNId;
+
+    leaf nid {
+      type string;
+      description "This attribute represents network Identity;
+        Shall be present if PlmnIdNid identifies an SNPN.
+        (see clauses 5.30.2.3, 5.30.2.9, 6.3.4, and 6.3.8 in TS 23.501";
+    }
+  }
+
+  grouping PLMNInfo {
+    description "The PLMNInfo data type define a S-NSSAI member in a specific
+      PLMNId, and it have two attributes PLMNId and S-NSSAI (PLMNId, S-NSSAI).
+      The PLMNId represents a data type that is comprised of mcc
+      (mobile country code) and mnc (mobile network code), (See TS 23.003
+      subclause 2.2 and 12.1) and S-NSSAI represents an data type, that is
+      comprised of an SST (Slice/Service type) and an optional
+      SD (Slice Differentiator) field";
+    uses types3gpp:PLMNId;
+    uses SNssai;
+  }
+
+  typedef CommModelType {
+    reference "3GPP TS 23501";
+    type enumeration {
+      enum DIRECT_COMMUNICATION_WO_NRF {
+        value 0;
+        description "Directly communicate to other pre-configured NF service.";
+      }
+
+      enum DIRECT_COMMUNICATION_WITH_NRF {
+        value 1;
+        description "Directly communicate to other NF service discovered
+          by NRF.";
+      }
+
+      enum INDIRECT_COMMUNICATION_WO_DEDICATED_DISCOVERY {
+        value 2;
+        description "Communicate to pre-configured other NF service through
+          SCP as a proxy.";
+      }
+
+      enum INDIRECT_COMMUNICATION_WITH_DEDICATED_DISCOVERY {
+        value 3;
+        description "Communication to NF service discovered by NRF through SCP
+          as a proxy.";
+      }
+
+    }
+  }
+
+  grouping CommModel {
+    leaf groupId {
+      type uint16;
+    }
+    leaf commModelType {
+      type CommModelType;
+    }
+    leaf-list targetNFServiceList {
+      type types3gpp:DistinguishedName;
+    }
+    leaf commModelConfiguration {
+      type string;
+    }
+  }
+  grouping TaiRangeGrp {
+    list plmnId {
+      description "PLMN ID related to the TacRange.";
+      min-elements 1;
+      max-elements 1;
+      key "mcc mnc";
+      uses types3gpp:PLMNId;
+    }
+
+    list tacRangeList {
+      description "The range of the TACs.";
+      min-elements 1;
+      key "start end";
+      uses TacRange;
+    }
+  }
+
+  grouping TacRange {
+    leaf start {
+      description "First value identifying the start of a TAC range,
+      to be used when the range of TAC's can be represented
+       as a hexadecimal range (e.g., TAC ranges).";
+      type string {
+        pattern '^([A-Fa-f0-9]{4}|[A-Fa-f0-9]{6}$)';
+      }
+    }
+
+    leaf end {
+      description "Last value identifying the end of a TAC range,
+      to be used when the range of TAC's can be represented as
+       a hexadecimal range (e.g. TAC ranges).";
+      type string {
+        pattern '^([A-Fa-f0-9]{4}|[A-Fa-f0-9]{6})$';
+      }
+    }
+
+    leaf nRTACpattern {
+      description "Pattern (regular expression according to the ECMA-262)
+        representing the set of TAC's belonging to this range.
+        A TAC value is considered part of the range if and only if the
+        TAC string fully matches the regular expression.";
+      type string;
+    }
+  }
+    grouping DnnSmfInfoItem {
+    leaf dnn {
+      description "Supported DNN.";
+      mandatory true;
+      type string;
+    }
+
+    leaf-list dnaiList {
+      description "List of Data network access identifiers supported by
+      the SMF for this DNN. The absence of this attribute indicates that
+       the SMF can be selected for this DNN for any DNAI.";
+      min-elements 1;
+      type string;
+    }
+  }
+
+  grouping SupportedFunc {
+    leaf function {
+      type string;
+    }
+    leaf policy {
+      type string;
+    }
+  }
+
+  typedef EnergySavingLoadThresholdT {
+    type uint32 {
+      range 0..10000;
+    }
+    units 1/10000;
+  }
+
+  typedef EnergySavingTimeDurationT {
+    type uint32 {
+      range 0..900;
+    }
+    units seconds;
+  }
+
+  typedef PhysCellID {
+    type uint32 {
+      range "0..1007";
+    }
+    reference "clause 7.4.2 of TS 38.211";
+  }
+
+  typedef UTC24TimeOfDayT {
+    description "Time of day in HH:MM or H:MM 24-hour format per UTC
+      time zone.";
+    type string {
+      pattern "(([01]?[0-9])|(2[0-3])):([0-5][0-9])";
+    }
+  }
+
+  typedef DayOfWeekT {
+    type enumeration {
+      enum Monday;
+      enum Tuesday;
+      enum Wednesday;
+      enum Thursday;
+      enum Friday;
+      enum Saturday;
+      enum Sunday;
+    }
+  }
+
+    grouping CaraConfigurationGrp {
+    description "This data type represents the configuration used for mobile 
+    NR node (e.g., IAB-node, MWAB-node) to perform certificate enrolment procedure with
+    Certification Authority server (CA/RA) as specified in TS 28.315 clause 5.3";
+    
+    leaf caraAddress {
+      type inet:host;
+      description "IP address or FQDN of the CMP (Certificate Management Protocol) server";
+    }
+
+    leaf portNumber {
+        type inet:port-number;     
+        description "This parameter specifies the port number used by 
+        CMP (Certificate Management Protocol) server. The port for HTTP/HTTPSs 
+        transfer of CMP messages is not explicitly given in RFC 9811, therefore
+        this parameter is required. The port number is usually 
+        represented as 2 octets.";
+    }
+    
+    leaf path {
+        type inet:uri;
+        mandatory true;        
+        description "This parameter specifies the path (in ASCII string) to 
+          the CMP server directory. A CMP server may be located in an 
+          arbitrary path other than root.";
+    }
+
+    leaf subjectName {
+        type string;
+        mandatory true;        
+        description "This parameter specifies the subject name (in ASCII 
+          string) of the CA/RA. The use is described in 3GPP TS 33.310
+          clause 9.5.3.";
+    }
+
+    leaf protocol {
+        type enumeration {
+          enum HTTP;
+          enum HTTPS;
+        }
+        description "This parameter specifies the protocol (HTTP or HTTPS) 
+          to be used for certificate enrolment. The use is described in 
+          3GPP TS 33.310 clause 9.6.";
+    }
+  }
+  
+  grouping MnrOamIPConfigGrp { 
+    description "This data type includes the configutation for OAM connectivity  
+      used for mobile NR node (e.g., IAB-node, MWAB-node) to establish connection with
+      management system. The configuration attributes include: 
+      Configuration of certification authority (CA/RA) server, 
+      Configuration of security gateway (SeGW), and 
+      Configuration of software configuration server (SCS)";
+    
+    list caraConfiguration {
+      description "configuration used for mobile NR node (e.g., IAB-node, MWAB-node)
+        to perform certificate enrolment procedure as specified in TS 28.315.";
+      uses CaraConfigurationGrp;
+      max-elements 1;
+      key caraAddress; 
+    }
+
+    leaf seGwConfiguration {
+      description "this parameter specifies IP address or
+        FQDN of security gateway (SeGW) used for mobile NR 
+        node (e.g., IAB-node, MWAB-node) to establish secure connection 
+        as specified in TS 28.315.";
+      type inet:host;
+
+    }
+
+    leaf scsConfiguration {
+      description "this parameter specifies IP address or FQDN of 
+        configuration server (SCS) used for mobile NR node 
+        (e.g., IAB-node, MWAB-node) to establish connection as
+        specified in TS 28.315.";        
+      type inet:host; 
+    }
+  }
+
+  grouping LocationInfoGrp {
+    description "This data type contains location information 
+      of mobile NR node (e.g., IAB-node, MWAB-node).";
+    
+    leaf gNBId {
+      type int64 { range "0..4294967295"; }
+      description "It is either the gNB ID of the IAB-donor-CU that target IAB-DU
+      connects to or the gNB Id of the IAB-nonor-CU that serves IAB-MT, or
+      the gNBId of the gNB that serves MWAB-UE.";
+    }
+
+    list pLMNId {
+      uses types3gpp:PLMNId;
+      max-elements 1;
+      description "The PLMN ID where IAB-MT or MWAB-UE is connected to";
+      key "mcc mnc";
+    }
+
+    leaf cellLocalId {
+      type int32 { range "0..16383"; }
+      description "Identifies an NR cell where IAB-MT or MWAB-UE 
+      is connected to.";
+    }
+
+    leaf nRTAC {
+      type types5g3gpp:NRTAC;
+      description "It is TAC pertaining to the cells where IAB-MT or MWAB-UE is 
+        connected.";
+    }
+
+    list tAI {
+      uses types3gpp:TaiGrp;
+      key idx;
+      leaf idx { type string; }
+      max-elements 1; 
+      description "It is the TAI (see subclause 9.3.3.11 in TS 38.413) pertaining
+        to the cells where IAB-MT or MWAB-UE is connected";
+    }
+    list geoArea {
+      uses types3gpp:GeoAreaGrp;
+      key idx;
+      leaf idx {type string;}
+      max-elements 1;       
+      description "It specifies geographical area of mobile NR node
+      (e.g., IAB-node or MWAB-node).";
+    }
+  }
+
+
+}

original/Rel-20/28_series/_3gpp-5gc-nrm-FiveQiDscpMappingSet.yang

@@ -0,0 +1,65 @@
+module _3gpp-5gc-nrm-FiveQiDscpMappingSet {
+  yang-version 1.1;
+
+  namespace urn:3gpp:sa5:_3gpp-5gc-nrm-FiveQiDscpMappingSet;
+  prefix FiveQiDscpM3gpp;
+
+  import _3gpp-common-top { prefix top3gpp; }
+  import _3gpp-common-managed-element { prefix me3gpp; }
+  import _3gpp-5gc-nrm-smffunction { prefix smf3gpp; }
+
+  organization "3gpp SA5";
+  contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464";
+  description " This IOC represents the set of mapping between 5QIs and DSCP.
+    Copyright 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI,
+    TTA, TTC). All rights reserved.";
+  reference "3GPP TS 28.541";
+
+
+  revision 2025-07-25 { reference CR-1558 ; }
+  revision 2025-01-25 { reference CR-1442 ; }
+  revision 2023-09-18 { reference CR-1043 ; }
+  revision 2020-08-03 { reference "CR-0321"; }
+  revision 2020-05-27 { reference "CR-0287"; }
+
+  grouping FiveQiDscpMapping {
+    leaf-list fiveQIValues {
+      type uint32 {
+        range 0..255 ;
+      }
+      min-elements 1;
+      description " Identifies the 5QI values that are mapped to a same DSCP";
+     }
+
+    leaf dscp {
+      type uint32 {
+        range 0..255 ;
+      }
+      mandatory true;
+     }
+  }
+
+  grouping FiveQiDscpMappingSetGrp {
+    description "Represents the FiveQiDscpMappingSet IOC.";
+    list fiveQiDscpMappingList {
+      description "It provides the list of mapping between 5QIs and DSCP.";
+      key "dscp";
+      uses FiveQiDscpMapping;
+    }
+  }
+
+  grouping FiveQiDscpMappingSetSubtree {
+    list FiveQiDscpMappingSet {
+      description "Specifies the mapping between 5QIs and DSCPs.";
+      key id;
+      uses top3gpp:Top_Grp;
+      container attributes {
+        uses FiveQiDscpMappingSetGrp;
+      }
+    }
+  }
+
+  augment "/me3gpp:ManagedElement/smf3gpp:SMFFunction" {
+    uses FiveQiDscpMappingSetSubtree;
+  }
+}

original/Rel-20/28_series/_3gpp-5gc-nrm-amfregion.yang

@@ -0,0 +1,88 @@
+module _3gpp-5gc-nrm-amfregion {
+  yang-version 1.1;
+  namespace urn:3gpp:sa5:_3gpp-5gc-nrm-amfregion;
+  prefix amfr3gpp;
+  
+  import _3gpp-common-yang-types { prefix types3gpp; }
+  import _3gpp-common-subnetwork { prefix subnet3gpp; }
+  import _3gpp-common-top { prefix top3gpp; }
+  import _3gpp-common-managed-function { prefix mf3gpp; }
+  import _3gpp-5g-common-yang-types { prefix types5g3gpp; }
+
+  organization "3gpp SA5";
+  contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464";
+  description "This IOC represents the AMF Region which consists one or
+    multiple AMF Sets.
+    Copyright 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, 
+    TTA, TTC). All rights reserved.";
+  reference "3GPP TS 28.541 5G Network Resource Model (NRM)";
+
+  revision 2024-05-24 { reference CR-1273 ; } 
+  revision 2023-09-18 { reference CR-1043 ; } 
+  revision 2022-01-07 { reference CR-0643; }
+  revision 2020-11-06 { reference CR-0412 ; }
+  revision 2019-10-28 { reference S5-193518 ; }
+  revision 2019-06-11 { reference ""; }
+  
+  grouping AMFRegionGrp {
+    description "Represents the AMFRegion IOC";
+    uses mf3gpp:ManagedFunctionGrp;
+    
+    list pLMNIdList {
+      description "List of at most six entries of PLMN Identifiers, but at 
+        least one (the primary PLMN Id).
+        The PLMN Identifier is composed of a Mobile Country Code (MCC) 
+        and a Mobile Network Code (MNC).";
+
+      min-elements 1;
+      max-elements 6;
+      key "mcc mnc";
+      uses types3gpp:PLMNId;
+    }
+    
+    leaf-list nRTACList {
+      description "List of Tracking Area Codes (legacy TAC or extended TAC) 
+                   where the represented management function is serving.";
+                   reference "TS 38.413 clause 9.3.3.10";
+      min-elements 1;
+      config false;
+      type types5g3gpp:NRTAC;
+    }
+    
+    list sNSSAIList {
+      description "List of S-NSSAIs the managed object is capable of supporting.
+                   (Single Network Slice Selection Assistance Information)
+                   An S-NSSAI has an SST (Slice/Service type) and an optional SD 
+                  (Slice Differentiator) field.";
+      //conditional support only if the network slicing feature is supported.
+      reference "3GPP TS 23.003";
+      key "sd sst";
+      uses types5g3gpp:SNssai;
+    }
+    
+    leaf aMFRegionId {
+      description "Represents the AMF Region ID, which identifies the region.";
+      mandatory true;
+      type types3gpp:AmfRegionId;
+    }
+    
+    leaf-list aMFSet {
+      description "The AMFSet that the AFMRegion is associated with.";
+      min-elements 1;
+      type instance-identifier;
+    }
+  }
+  
+  augment "/subnet3gpp:SubNetwork" {
+    list AMFRegion {
+      description "5G Core AMFRegion IOC";
+      reference "3GPP TS 28.541";
+      key id;
+      uses top3gpp:Top_Grp;
+      container attributes {
+        uses AMFRegionGrp;
+      }
+      uses mf3gpp:ManagedFunctionContainedClasses;
+    }
+  }
+}

original/Rel-20/28_series/_3gpp-5gc-nrm-ausffunction.yang

@@ -0,0 +1,157 @@
+module _3gpp-5gc-nrm-ausffunction {
+  yang-version 1.1;
+
+  namespace urn:3gpp:sa5:_3gpp-5gc-nrm-ausffunction;
+  prefix ausf3gpp;
+
+  import _3gpp-common-managed-function { prefix mf3gpp; }
+  import _3gpp-common-managed-element { prefix me3gpp; }
+  import ietf-inet-types { prefix inet; }
+  import _3gpp-5g-common-yang-types { prefix types5g3gpp; }
+  import _3gpp-common-yang-extensions { prefix yext3gpp; }
+  import _3gpp-common-top { prefix top3gpp; }
+  import _3gpp-5gc-nrm-managed-nfprofile { prefix mnfp3gpp; }
+
+  organization "3gpp SA5";
+  contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464";
+  description "This IOC represents the AUSF function in 5GC. For more
+    information about the AUSF, see 3GPP TS 23.501.
+    Copyright 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI,
+    TTA, TTC). All rights reserved.";
+  reference "3GPP TS 28.541";
+
+  revision 2023-09-18 { reference CR-1043 ; }
+  revision 2022-01-07 { reference CR-0643; }
+  revision 2020-11-06 { reference CR-0412 ; }
+  revision 2019-10-25 { reference "S5-194457 S5-193518"; }
+
+  revision 2019-05-22 {reference "initial revision"; }
+
+  grouping AusfInfoGrp {
+    description "Represents the information of an AUSF NF Instance
+      (see TS 29.510).";
+
+    grouping SuciInfoGrp {
+      description "This data type represents SUCI information containing
+        Routing Indicator and Home Network Public Key ID. (See TS 29.510)";
+
+      leaf-list routingInds {
+        type string;
+        min-elements 1;
+        description "It indicates served Routing Indicator (see TS 23.003,
+          clause 2.2B). If not provided, the AUSF/UDM
+          can serve any Routing Indicator.";
+      }
+
+      leaf-list hNwPubKeyIds  {
+        type int64;
+        min-elements 1;
+        description "It indicating served Home Network Public Key
+          (see TS 23.003, clause 2.2B). If not provided, the AUSF/UDM
+          can serve any public key.";
+      }
+    }
+
+    leaf nFSrvGroupId {
+      type string;
+      config false;
+      yext3gpp:inVariant;
+      yext3gpp:notNotifyable;
+      description "This parameter defines identity of the group that is
+        served by the NF instance (See TS 29.510).";
+    }
+
+    list supiRanges {
+      description "It represents list of ranges of SUPIs that can be served
+        by the PCF instance.";
+      key idx;
+      leaf idx { type uint32 ; }
+      uses mnfp3gpp:SupiRangeGrp;
+    }
+
+      leaf-list routingIndicators {
+        description "This attribute represents a list of Routing Indicator
+          information that allows to route network signalling with SUCI
+          (see TS 23.003 [13]) to the AUSF instance.
+          If not provided, the AUSF can serve any Routing Indicator.";
+        type string {
+          pattern "[0-9]{1,4}";
+        }
+      }
+
+    list suciInfos {
+      description "This attribute represents a list of SuciInfo. A SUCI
+        that matches this information can be served by the AUSF.
+        A SUCI that matches all attributes of at least one entry in this
+        array shall be considered as a match of this information.";
+      key idx;
+      leaf idx { type uint32 ; }
+      uses SuciInfoGrp;
+    }
+  }
+
+  grouping AUSFFuntionGrp {
+    description "Represents the AUSFFuntion IOC";
+    uses mf3gpp:ManagedFunctionGrp;
+
+    list pLMNInfoList {
+      description "List of at most six entries of PLMN Identifiers, but at
+        least one (the primary PLMN Id).
+        The PLMN Identifier is composed of a Mobile Country Code (MCC) and
+        a Mobile Network Code (MNC).";
+
+      min-elements 1;
+      key idx;
+      leaf idx { type uint32 ; }
+      uses types5g3gpp:PLMNInfo;
+    }
+
+    leaf sBIFQDN {
+      description "The FQDN of the registered NF instance in the
+        service-based interface.";
+      type inet:domain-name;
+    }
+
+    list managedNFProfile {
+      description "This data type represents a Profile definition
+      of a Managed NF";
+      key idx;
+      leaf idx { type uint32 ; }
+      min-elements 1;
+      max-elements 1;
+      uses mnfp3gpp:ManagedNFProfileGrp;
+    }
+
+    list commModelList {
+      min-elements 1;
+      key "groupId";
+      description "Specifies a list of commModel. It can be used by NF and
+        NF services to interact with each other in 5G Core network ";
+      reference "3GPP TS 23.501";
+      uses types5g3gpp:CommModel;
+    }
+
+    list ausfInfo {
+      description "It represents the information of an AUSF NF Instance
+        (see TS 29.510)";
+      key idx;
+      min-elements 1;
+      max-elements 1;
+      leaf idx { type uint32 ; }
+      uses AusfInfoGrp;
+    }
+  }
+
+  augment "/me3gpp:ManagedElement" {
+    list AUSFFunction {
+      description "5G Core AUSF Function";
+      reference "3GPP TS 28.541";
+      key id;
+      uses top3gpp:Top_Grp;
+      container attributes {
+        uses AUSFFuntionGrp;
+      }
+      uses mf3gpp:ManagedFunctionContainedClasses;
+    }
+  }
+}

original/Rel-20/28_series/_3gpp-5gc-nrm-ep.yang

@@ -0,0 +1,650 @@
+module _3gpp-5gc-nrm-ep {
+  yang-version 1.1;
+  namespace urn:3gpp:sa5:_3gpp-5gc-nrm-ep;
+  prefix cep3gpp;
+
+  import _3gpp-common-ep-rp { prefix eprp3gpp; }
+  import _3gpp-common-managed-element { prefix me3gpp; }
+  import _3gpp-5gc-nrm-affunction { prefix af3gpp; }
+  import _3gpp-5gc-nrm-amffunction { prefix amf3gpp; }
+  import _3gpp-5gc-nrm-ausffunction { prefix ausf3gpp; }
+  import _3gpp-5gc-nrm-dnfunction { prefix dn3gpp; }
+  import _3gpp-5gc-nrm-lmffunction { prefix lmf3gpp; }
+  import _3gpp-5gc-nrm-n3iwffunction { prefix n3iwf3gpp; }
+  import _3gpp-5gc-nrm-ngeirfunction { prefix ngeir3gpp; }
+  import _3gpp-5gc-nrm-nrffunction { prefix nrf3gpp; }
+  import _3gpp-5gc-nrm-nssffunction { prefix nssf3gpp; }
+  import _3gpp-5gc-nrm-pcffunction { prefix pcf3gpp; }
+  import _3gpp-5gc-nrm-seppfunction { prefix sepp3gpp; }
+  import _3gpp-5gc-nrm-smffunction { prefix smf3gpp; }
+  import _3gpp-5gc-nrm-smsffunction { prefix smsf3gpp; }
+  import _3gpp-5gc-nrm-udmfunction { prefix udm3gpp; }
+  import _3gpp-5gc-nrm-upffunction { prefix upf3gpp; }
+  import _3gpp-common-yang-types { prefix types3gpp; }
+  import _3gpp-common-top { prefix top3gpp; }
+  import ietf-inet-types { prefix inet; }
+
+  organization "3GPP SA5";
+  contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464";
+  description "Defines the YANG mapping of the 5GC related endpoint
+               Information Object Classes (IOCs) that are part of the 5G Core
+               Network Resource Model.
+    Copyright 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI,
+    TTA, TTC). All rights reserved.";
+  reference "3GPP TS 28.541";
+
+  revision 2025-07-25 { reference CR-1558 ; }
+  revision 2024-08-19 { reference CR-1314 ; }
+  revision 2023-09-18 { reference CR-1043 ; }
+  revision 2019-11-18 { reference "Ericsson refactoring."; }
+  revision 2018-07-31 { reference "Initial revision"; }
+
+  grouping EP_N2Grp {
+    uses eprp3gpp:EP_Common;
+  }
+
+  grouping EP_N3Grp {
+    uses eprp3gpp:EP_Common;
+  }
+
+  grouping EP_N4Grp {
+    uses eprp3gpp:EP_Common;
+  }
+
+  grouping EP_N5Grp {
+    uses eprp3gpp:EP_Common;
+  }
+
+  grouping EP_N6Grp {
+    uses eprp3gpp:EP_Common;
+  }
+
+  grouping EP_N7Grp {
+    uses eprp3gpp:EP_Common;
+  }
+
+  grouping EP_N8Grp {
+    uses eprp3gpp:EP_Common;
+  }
+
+  grouping EP_N9Grp {
+    uses eprp3gpp:EP_Common;
+  }
+
+  grouping EP_N10Grp {
+    uses eprp3gpp:EP_Common;
+  }
+
+  grouping EP_N11Grp {
+    uses eprp3gpp:EP_Common;
+  }
+
+  grouping EP_N12Grp {
+    uses eprp3gpp:EP_Common;
+  }
+
+  grouping EP_N13Grp {
+    uses eprp3gpp:EP_Common;
+  }
+
+  grouping EP_N14Grp {
+    uses eprp3gpp:EP_Common;
+  }
+
+  grouping EP_N15Grp {
+    uses eprp3gpp:EP_Common;
+  }
+
+  grouping EP_N16Grp {
+    uses eprp3gpp:EP_Common;
+  }
+
+  grouping EP_N17Grp {
+    uses eprp3gpp:EP_Common;
+  }
+
+  grouping EP_N20Grp {
+    uses eprp3gpp:EP_Common;
+  }
+
+  grouping EP_N21Grp {
+    uses eprp3gpp:EP_Common;
+  }
+
+  grouping EP_N22Grp {
+    uses eprp3gpp:EP_Common;
+  }
+
+  grouping EP_N26Grp {
+    uses eprp3gpp:EP_Common;
+  }
+
+  grouping EP_N27Grp {
+    uses eprp3gpp:EP_Common;
+  }
+
+  grouping EP_N31Grp {
+    uses eprp3gpp:EP_Common;
+  }
+
+  grouping EP_N32Grp {
+    uses eprp3gpp:EP_Common;
+    list  remotePlmnId {
+      key idx;
+      leaf idx { type uint32;}
+      description "PLMN Identifiers of the remote sepp.
+      The PLMN Identifier is composed of a Mobile Country Code 
+      (MCC) and a Mobile Network Code (MNC).";
+      uses types3gpp:PLMNId;
+    }
+
+  leaf remoteSeppAddress {
+      description "The host address of the SEPP.";
+      type inet:host;
+    }
+
+  leaf remoteSeppId {
+      type uint16;
+    }
+
+    leaf n32cParas {
+      type string;
+    }
+
+    leaf n32fPolicy {
+      type string;
+    }
+
+    leaf withIPX {
+      type boolean;
+    }
+  }
+
+  grouping EP_S5CGrp {
+    uses eprp3gpp:EP_Common;
+  }
+
+  grouping EP_S5UGrp {
+    uses eprp3gpp:EP_Common;
+  }
+
+  grouping EP_RxGrp {
+    uses eprp3gpp:EP_Common;
+  }
+
+  grouping EP_MAP_SMSCGrp {
+    uses eprp3gpp:EP_Common;
+  }
+
+  grouping EP_NLSGrp {
+    uses eprp3gpp:EP_Common;
+  }
+
+  grouping EP_NL2Grp {
+    uses eprp3gpp:EP_Common;
+  }
+
+  grouping EP_SBI_IPXGrp {
+    uses eprp3gpp:EP_Common;
+    leaf-list sBIService {
+      min-elements 1;
+      config false;
+      type string;
+    }
+  }
+
+  augment "/me3gpp:ManagedElement/af3gpp:AFFunction" {
+    list EP_N6 {
+      description "Represents the EP_N6 IOC.";
+      key id;
+      uses top3gpp:Top_Grp;
+      container attributes {
+        uses EP_N6Grp;
+      }
+    }
+
+    list EP_Rx {
+      description "Represents the EP_Rx IOC.";
+      key id;
+      uses top3gpp:Top_Grp;
+      container attributes {
+        uses EP_RxGrp;
+      }
+    }
+  }
+
+  augment "/me3gpp:ManagedElement/amf3gpp:AMFFunction" {
+    list EP_N2 {
+      description "Represents the EP_N2 IOC.";
+      key id;
+      uses top3gpp:Top_Grp;
+      container attributes {
+        uses EP_N2Grp;
+      }
+    }
+
+    list EP_N8 {
+      description "Represents the EP_N8 IOC.";
+      key id;
+      uses top3gpp:Top_Grp;
+      container attributes {
+        uses EP_N8Grp;
+      }
+    }
+
+    list EP_N11 {
+      description "Represents the EP_N11 IOC.";
+      key id;
+      uses top3gpp:Top_Grp;
+      container attributes {
+        uses EP_N11Grp;
+      }
+    }
+
+    list EP_N12 {
+      description "Represents the EP_N12 IOC.";
+      key id;
+      uses top3gpp:Top_Grp;
+      container attributes {
+        uses EP_N12Grp;
+      }
+    }
+
+    list EP_N14 {
+      description "Represents the EP_N14 IOC.";
+      key id;
+      uses top3gpp:Top_Grp;
+      container attributes {
+        uses EP_N14Grp;
+      }
+    }
+
+    list EP_N15 {
+      description "Represents the EP_N15 IOC.";
+      key id;
+      uses top3gpp:Top_Grp;
+      container attributes {
+        uses EP_N15Grp;
+      }
+    }
+
+    list EP_N17 {
+      description "Represents the EP_N17 IOC.";
+      key id;
+      uses top3gpp:Top_Grp;
+      container attributes {
+        uses EP_N17Grp;
+      }
+    }
+
+    list EP_N20 {
+      description "Represents the EP_N20 IOC.";
+      key id;
+      uses top3gpp:Top_Grp;
+      container attributes {
+        uses EP_N20Grp;
+      }
+    }
+
+    list EP_N22 {
+      description "Represents the EP_N22 IOC.";
+      key id;
+      uses top3gpp:Top_Grp;
+      container attributes {
+        uses EP_N22Grp;
+      }
+    }
+
+    list EP_N26 {
+      description "Represents the EP_N26 IOC.";
+      key id;
+      uses top3gpp:Top_Grp;
+      container attributes {
+        uses EP_N26Grp;
+      }
+    }
+
+    list EP_NLS {
+      description "Represents the EP_NLS IOC.";
+      key id;
+      uses top3gpp:Top_Grp;
+      container attributes {
+        uses EP_NLSGrp;
+      }
+    }
+
+    list EP_NL2 {
+      description "Represents the EP_NL2 IOC.";
+      key id;
+      uses top3gpp:Top_Grp;
+      container attributes {
+        uses EP_NL2Grp;
+      }
+    }
+  }
+
+  augment "/me3gpp:ManagedElement/ausf3gpp:AUSFFunction" {
+    list EP_N12 {
+      description "Represents the EP_N12 IOC.";
+      key id;
+      uses top3gpp:Top_Grp;
+      container attributes {
+        uses EP_N12Grp;
+      }
+    }
+
+    list EP_N13 {
+      description "Represents the EP_N13 IOC.";
+      key id;
+      uses top3gpp:Top_Grp;
+      container attributes {
+        uses EP_N13Grp;
+      }
+    }
+  }
+
+  augment "/me3gpp:ManagedElement/dn3gpp:DNFunction" {
+    list EP_N6 {
+      description "Represents the EP_N6 IOC.";
+      key id;
+      uses top3gpp:Top_Grp;
+      container attributes {
+        uses EP_N6Grp;
+      }
+    }
+  }
+
+  augment "/me3gpp:ManagedElement/lmf3gpp:LMFFunction" {
+    list EP_NLS {
+      description "Represents the EP_NLS IOC.";
+      key id;
+      uses top3gpp:Top_Grp;
+      container attributes {
+        uses EP_NLSGrp;
+      }
+    }
+  }
+
+  augment "/me3gpp:ManagedElement/n3iwf3gpp:N3IWFFunction" {
+    list EP_N2 {
+      description "Represents the EP_N2 IOC.";
+      key id;
+      uses top3gpp:Top_Grp;
+      container attributes {
+        uses EP_N2Grp;
+      }
+    }
+
+    list EP_N3 {
+      description "Represents the EP_N3 IOC.";
+      key id;
+      uses top3gpp:Top_Grp;
+      container attributes {
+        uses EP_N3Grp;
+      }
+    }
+  }
+
+  augment "/me3gpp:ManagedElement/ngeir3gpp:NGEIRFunction" {
+    list EP_N17 {
+      description "Represents the EP_N17 IOC.";
+      key id;
+      uses top3gpp:Top_Grp;
+      container attributes {
+        uses EP_N17Grp;
+      }
+    }
+  }
+
+  augment "/me3gpp:ManagedElement/nrf3gpp:NRFFunction" {
+    list EP_N27 {
+      description "Represents the EP_N27 IOC.";
+      key id;
+      uses top3gpp:Top_Grp;
+      container attributes {
+        uses EP_N26Grp;
+      }
+    }
+
+  }
+
+  augment "/me3gpp:ManagedElement/nssf3gpp:NSSFFunction" {
+    list EP_N22 {
+      description "Represents the EP_N22 IOC.";
+      key id;
+      uses top3gpp:Top_Grp;
+      container attributes {
+        uses EP_N22Grp;
+      }
+    }
+
+    list EP_N31 {
+      description "Represents the EP_N31 IOC.";
+      key id;
+      uses top3gpp:Top_Grp;
+      container attributes {
+        uses EP_N31Grp;
+      }
+    }
+  }
+
+  augment "/me3gpp:ManagedElement/pcf3gpp:PCFFunction" {
+    list EP_N5 {
+      description "Represents the EP_N5 IOC.";
+      key id;
+      uses top3gpp:Top_Grp;
+      container attributes {
+        uses EP_N5Grp;
+      }
+    }
+
+    list EP_N7 {
+      description "Represents the EP_N7 IOC.";
+      key id;
+      uses top3gpp:Top_Grp;
+      container attributes {
+        uses EP_N7Grp;
+      }
+    }
+
+    list EP_N15 {
+      description "Represents the EP_N15 IOC.";
+      key id;
+      uses top3gpp:Top_Grp;
+      container attributes {
+        uses EP_N15Grp;
+      }
+    }
+
+    list EP_N16 {
+      description "Represents the EP_N16 IOC.";
+      key id;
+      uses top3gpp:Top_Grp;
+      container attributes {
+        uses EP_N16Grp;
+      }
+    }
+
+    list EP_Rx {
+      description "Represents the EP_Rx IOC.";
+      key id;
+      uses top3gpp:Top_Grp;
+      container attributes {
+        uses EP_RxGrp;
+      }
+    }
+  }
+
+  augment "/me3gpp:ManagedElement/sepp3gpp:SEPPFunction" {
+    list EP_N32 {
+      description "Represents the EP_N32 IOC.";
+      key id;
+      uses top3gpp:Top_Grp;
+      container attributes {
+        uses EP_N32Grp;
+      }
+    }
+
+ }
+  augment "/me3gpp:ManagedElement/smsf3gpp:SMSFFunction" {
+    list EP_N20 {
+      description "Represents the EP_20 IOC.";
+      key id;
+      uses top3gpp:Top_Grp;
+      container attributes {
+        uses EP_N20Grp;
+      }
+    }
+
+    list EP_N21 {
+      description "Represents the EP_N21 IOC.";
+      key id;
+      uses top3gpp:Top_Grp;
+      container attributes {
+        uses EP_N21Grp;
+      }
+    }
+
+    list EP_MAP_SMSC {
+      description "Represents the EP_MAP_SMSC IOC.";
+      key id;
+      uses top3gpp:Top_Grp;
+      container attributes {
+        uses EP_MAP_SMSCGrp;
+      }
+    }
+  }
+
+  augment "/me3gpp:ManagedElement/smf3gpp:SMFFunction" {
+    list EP_N4 {
+      description "Represents the EP_N4 IOC.";
+      key id;
+      uses top3gpp:Top_Grp;
+      container attributes {
+        uses EP_N4Grp;
+      }
+    }
+
+    list EP_N7 {
+      description "Represents the EP_N7 IOC.";
+      key id;
+      uses top3gpp:Top_Grp;
+      container attributes {
+        uses EP_N7Grp;
+      }
+    }
+
+    list EP_N10 {
+      description "Represents the EP_N10 IOC.";
+      key id;
+      uses top3gpp:Top_Grp;
+      container attributes {
+        uses EP_N10Grp;
+      }
+    }
+
+    list EP_N11 {
+      description "Represents the EP_N11 IOC.";
+      key id;
+      uses top3gpp:Top_Grp;
+      container attributes {
+        uses EP_N11Grp;
+      }
+    }
+
+    list EP_N16 {
+      description "Represents the EP_N16 IOC.";
+      key id;
+      uses top3gpp:Top_Grp;
+      container attributes {
+        uses EP_N16Grp;
+      }
+    }
+
+    list EP_S5C {
+    description "Represents the EP_S5C IOC.";
+      key id;
+      uses top3gpp:Top_Grp;
+      container attributes {
+        uses EP_S5CGrp;
+      }
+    }
+  }
+
+  augment "/me3gpp:ManagedElement/udm3gpp:UDMFunction" {
+    list EP_N8 {
+      description "Represents the EP_N8 IOC.";
+      key id;
+      uses top3gpp:Top_Grp;
+      container attributes {
+        uses EP_N8Grp;
+      }
+    }
+
+    list EP_N10 {
+      description "Represents the EP_N10 IOC.";
+      key id;
+      uses top3gpp:Top_Grp;
+      container attributes {
+        uses EP_N10Grp;
+      }
+    }
+
+    list EP_N13 {
+      description "Represents the EP_N13 IOC.";
+      key id;
+      uses top3gpp:Top_Grp;
+      container attributes {
+        uses EP_N13Grp;
+      }
+    }
+
+  }
+
+  augment "/me3gpp:ManagedElement/upf3gpp:UPFFunction" {
+    list EP_N4 {
+      description "Represents the EP_N4 IOC.";
+      key id;
+      uses top3gpp:Top_Grp;
+      container attributes {
+        uses EP_N4Grp;
+      }
+    }
+
+    list EP_N3 {
+      description "Represents the EP_N3 IOC.";
+      key id;
+      uses top3gpp:Top_Grp;
+      container attributes {
+        uses EP_N3Grp;
+      }
+    }
+
+    list EP_N9 {
+      description "Represents the EP_N9 IOC.";
+      key id;
+      uses top3gpp:Top_Grp;
+      container attributes {
+        uses EP_N9Grp;
+      }
+    }
+
+    list EP_S5U {
+      description "Represents the EP_S5U IOC.";
+      key id;
+      uses top3gpp:Top_Grp;
+      container attributes {
+        uses EP_S5UGrp;
+      }
+    }
+
+    list EP_EP_N6 {
+      description "Represents the EP_N6 IOC.";
+      key id;
+      uses top3gpp:Top_Grp;
+      container attributes {
+        uses EP_N6Grp;
+      }
+    }
+  }
+}

original/Rel-20/28_series/_3gpp-5gc-nrm-externalnrffunction.yang

@@ -0,0 +1,46 @@
+module _3gpp-5gc-nrm-externalnrffunction {
+  yang-version 1.1;
+  namespace urn:3gpp:sa5:_3gpp-5gc-nrm-externalnrffunction;
+  prefix extnrf3gpp;
+  
+  import _3gpp-common-yang-types { prefix types3gpp; }
+  import _3gpp-common-subnetwork { prefix subnet3gpp; }
+  import _3gpp-common-top { prefix top3gpp; }
+  import _3gpp-common-managed-function { prefix mf3gpp; }
+  
+  description "This IOC represents external NRF function controlled 
+    by another management domain.
+    Copyright 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, 
+    TTA, TTC). All rights reserved.";
+
+  revision 2023-09-18 { reference CR-1043 ; } 
+  revision 2019-10-28 { reference S5-193518 ; }
+  revision 2019-06-11 {
+    description "Ericsson refactoring.";
+  }
+  
+  grouping ExternalNRFFunctionGrp {
+    uses mf3gpp:ManagedFunctionGrp;
+    
+    list pLMNIdList {
+      description "List of at most six entries of PLMN Identifiers, but at least one (the primary PLMN Id).
+                   The PLMN Identifier is composed of a Mobile Country Code (MCC) and a Mobile Network Code (MNC).";
+      min-elements 1;
+      max-elements 6;
+      key "mcc mnc";
+      uses types3gpp:PLMNId;
+    }
+  }
+  
+  augment "/subnet3gpp:SubNetwork" {
+    list ExternalNRFFunction {
+      description "5G Core External NRF Function";
+      reference "3GPP TS 28.541";
+      key id;
+      uses top3gpp:Top_Grp;
+      container attributes {
+        uses ExternalNRFFunctionGrp;
+      }
+      uses mf3gpp:ManagedFunctionContainedClasses;    }
+  }
+}

original/Rel-20/28_series/_3gpp-5gc-nrm-gmlcfunction.yang

@@ -0,0 +1,130 @@
+module _3gpp-5gc-nrm-gmlcfunction {
+  yang-version 1.1;
+  namespace "urn:3gpp:sa5:_3gpp-5gc-nrm-gmlcfunction";
+  prefix gmlc3gpp;
+
+  import _3gpp-common-managed-function { prefix mf3gpp; }
+  import _3gpp-common-managed-element { prefix me3gpp; }
+  import _3gpp-common-yang-types { prefix types3gpp; }
+  import _3gpp-5g-common-yang-types { prefix types5g3gpp; }
+  import _3gpp-common-top { prefix top3gpp; }
+  import _3gpp-5gc-nrm-managed-nfprofile { prefix mnfp3gpp;}
+  
+  organization "3GPP SA5";
+  contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464";
+  description "This module defines the GMLC Function IOC per 3GPP TS 28.541.
+    Copyright 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI,
+    TTA, TTC). All rights reserved.";
+  reference "3GPP TS 28.541";
+
+    revision 2025-07-25 { reference CR-1558 ; }
+    revision 2025-03-25 { reference CR-1489 ; }
+    revision 2025-03-25 {
+    description "Initial revision.";
+    reference "3GPP TS 28.541";
+  }
+
+    grouping GmlcInfoGrp {
+    description "Information of a GMLC NF Instance (see TS 29.510,
+    clause 6.1.6.2.41).";
+
+        leaf servingClientTypes {
+            description "Identity of the GMLC group that is served by
+             the GMLC instance.";
+            type enumeration {
+                enum EMERGENCY_SERVICES {
+                description "External client for emergency services";
+                }
+                    enum VALUE_ADDED_SERVICES {
+                description "External client for value added services";
+                }
+                enum PLMN_OPERATOR_SERVICES {
+                description "External client for PLMN operator services";
+                }
+                enum LAWFUL_INTERCEPT_SERVICES {
+                description "External client for Lawful Intercept services";
+                }
+                enum EXTERNAL_CLIENT_FOR_LAWFUL_INTERCEPT_SERVICES {
+                description "External client for PLMN Operator Broadcast
+                services";
+                }
+                enum PLMN_OPERATOR_OM {
+                 description "External client for PLMN Operator O&M";
+                }
+                enum PLMN_OPERATOR_ANONYMOUS_STATISTICS {
+                description "External client for PLMN Operator anonymous
+                statistics";
+                }
+                enum PLMN_OPERATOR_TARGET_MS_SERVICE_SUPPORT {
+                description "External client for PLMN Operator target MS
+                service support";
+                }
+            }
+
+        }
+        leaf gmlcNumbers{
+        type string{
+        pattern "^[0-9]{5,15}$";
+        }
+        description "This attribute represents each item of the array
+        shall carry an OctetString indicating the ISDN number of the GMLC in
+        international number format as described in ITU-T Rec. E.164 [94] and
+        shall be encoded as a TBCD-string.";
+
+        }
+    }
+
+    grouping GMLCFunctionGrp {
+    description "GMLC Function IOC grouping.";
+       uses mf3gpp:ManagedFunctionGrp;
+
+        list pLMNInfoList {
+          description "It defines the PLMN(s) of a Network Function. ";
+          key "idx";
+          leaf idx { type uint32; }
+          min-elements 1;
+          uses types3gpp:PLMNId;
+        }
+        leaf sBIFqdn {
+          type string;
+          description "FQDN of the registered NF instance in the
+           service-based interface.";
+        }
+        list managedNFProfile {
+        description "This parameter defines profile for managed NF.
+         See TS 23.501";
+        key idx;
+        leaf idx { type uint32; }
+        min-elements 1;
+        uses mnfp3gpp:ManagedNFProfileGrp;
+        }
+        list commModelList {
+          description "The attribute specifies a list of commModel which is 
+          defined as a datatype (see clause 5.3.69). It can be used by NF 
+          and NF services to interact with each other in 5G Core network ";
+          reference "see TS 23.501.";
+          key "groupId";
+          min-elements 1;
+          uses types5g3gpp:CommModel;
+        }
+        list gmlcInfo {
+          description "This attribute represents information of an GMLC NF
+          Instance.";
+          key "idx";
+          leaf idx { type uint32; }
+          max-elements 1;
+          uses GmlcInfoGrp;
+        }
+    }
+  augment "/me3gpp:ManagedElement" {
+    list GMLCFunction {
+      description "5G Core LMF Function defined in TS 23.501";
+      key id;
+      uses top3gpp:Top_Grp;
+      container attributes {
+        uses GMLCFunctionGrp;
+      }
+      uses mf3gpp:ManagedFunctionContainedClasses;
+    }
+  }
+}

original/Rel-20/28_series/_3gpp-5gc-nrm-n3iwffunction.yang

@@ -0,0 +1,63 @@
+module _3gpp-5gc-nrm-n3iwffunction {
+  yang-version 1.1;
+
+  namespace urn:3gpp:sa5:_3gpp-5gc-nrm-n3iwffunction;
+  prefix n3iwf3gpp;
+
+  import _3gpp-common-managed-function { prefix mf3gpp; }
+  import _3gpp-common-managed-element { prefix me3gpp; }
+  import _3gpp-common-yang-types { prefix types3gpp; }
+  import _3gpp-5g-common-yang-types { prefix types5g3gpp; }
+  import _3gpp-common-top { prefix top3gpp; }
+
+  organization "3gpp SA5";
+  contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464";
+  description "This IOC represents the N3IWF function which is used to enable
+  non-3GPP access networks connected to the 5GC. For more information about the
+  N3IWF, see 3GPP TS 23.501. Copyright 2023, 3GPP Organizational Partners
+  (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved.";
+  reference "3GPP TS 28.541";
+
+  revision 2025-07-25 { reference CR-1558 ; }
+  revision 2023-09-18 { reference CR-1043 ; }
+  revision 2019-10-28 { reference S5-193518 ; }
+  revision 2019-05-22 { reference "initial revision"; }
+
+  grouping N3IWFFunctionGrp {
+    uses mf3gpp:ManagedFunctionGrp;
+
+    list pLMNIdList {
+      description "List of at most six entries of PLMN Identifiers, but at 
+      least one (the primary PLMN Id). The PLMN Identifier is composed of
+      a Mobile Country Code (MCC) and a Mobile Network Code (MNC).";
+
+      min-elements 1;
+      max-elements 6;
+      key "mcc mnc";
+      uses types3gpp:PLMNId;
+    }
+
+    list commModelList {
+      description "The attribute specifies a list of commModel which is 
+      defined as a datatype (see clause 5.3.69). It can be used by NF 
+      and NF services to interact with each other in 5G Core network ";
+      reference "see TS 23.501.";
+      min-elements 1;
+      key "groupId";
+      uses types5g3gpp:CommModel;
+    }
+  }
+
+  augment "/me3gpp:ManagedElement" {
+    list N3IWFFunction {
+      description "5G Core N3IWF Function";
+      reference "3GPP TS 28.541";
+      key id;
+      uses top3gpp:Top_Grp;
+      container attributes {
+        uses N3IWFFunctionGrp;
+      }
+      uses mf3gpp:ManagedFunctionContainedClasses;
+    }
+  }
+}

original/Rel-20/28_series/_3gpp-5gc-nrm-neffunction.yang

@@ -0,0 +1,385 @@
+module _3gpp-5gc-nrm-neffunction {
+  yang-version 1.1;
+
+  namespace urn:3gpp:sa5:_3gpp-5gc-nrm-neffunction;
+  prefix nef3gpp;
+
+  import _3gpp-common-managed-function { prefix mf3gpp; }
+  import _3gpp-common-managed-element { prefix me3gpp; }
+  import ietf-inet-types { prefix inet; }
+  import _3gpp-common-yang-types { prefix types3gpp; }
+  import _3gpp-common-yang-extensions { prefix yext3gpp; }
+  import _3gpp-common-top { prefix top3gpp; }
+  import _3gpp-5g-common-yang-types { prefix types5g3gpp; }
+  import _3gpp-5gc-nrm-managed-nfprofile { prefix mnfp3gpp; }
+
+  organization "3gpp SA5";
+  contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464";
+  description "This IOC represents the NEF function in 5GC. For more
+    information about the NEF, see 3GPP TS 23.501.
+    Copyright 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI,
+    TTA, TTC). All rights reserved.";
+  reference "3GPP TS 28.541";
+
+  revision 2025-11-07 { reference CR-1640 ; }
+  revision 2025-07-25 { reference CR-1558 ; }
+  revision 2025-03-25 { reference CR-1489 ; }
+  revision 2025-01-25 { reference CR-1442 ; }
+  revision 2024-05-18 { reference CR-1273 ; }
+  revision 2024-04-12 { reference CR-1218 ; }
+  revision 2023-09-18 { reference CR-1103 ; }
+  revision 2023-09-18 { reference CR-1043 ; }
+  revision 2023-04-26 { reference CR-0916 ; }
+  revision 2022-01-07 { reference CR-0643; }
+  revision 2020-11-06 { reference CR-0412 ; }
+  revision 2019-10-20 { reference "initial revision"; }
+
+  grouping DnnInfoItemGrp {
+    description "This data type represents set of parameters supported by NF
+      for a given S-NSSAI. (See clause 6.1.6.2.97 of TS 29.510)";
+
+    leaf dnn {
+      type string;
+      mandatory true;
+      description "String representing a Data Network as defined in clause 9A
+        of 3GPP TS 23.003; it shall contain either a DNN Network Identifier,
+        or a full DNN with both the Network Identifier and Operator Identifier,
+        as specified in 3GPP TS 23.003 clause 9.1.1 and 9.1.2. It shall be
+        coded as string in which the labels are separated by dots
+        (e.g. 'Label1.Label2.Label3').
+
+        Whether the dnn data type contains just the DNN Network Identifier, or
+        the Network Identifier plus the Operator Identifier, shall be
+        documented in each API where this data type is used.";
+    }
+  }
+
+  grouping SnssaiInfoItemGrp {
+    description "This data type represents set of parameters supported by NF
+      for a given S-NSSAI. (See clause 6.1.6.2.97 of TS 29.510)";
+
+    list sNssai {
+      description "It represents the S-NSSAI the NetworkSlice managed object
+        is supporting. The S-NSSAI is defined in TS 23.003.";
+      min-elements 1;
+      key idx;
+      leaf idx { type uint32 ; }
+      uses types5g3gpp:SNssai;
+    }
+
+    list dnnInfoList{
+      description "It represents list of parameters supported by the
+        NF per DNN.";
+      min-elements 1;
+      key idx;
+      leaf idx { type uint32 ; }
+      uses DnnInfoItemGrp;
+    }
+  }
+
+  grouping AfEventExposureDataGrp {
+    description "This data type represents the AF Event Exposure data managed
+      by a given NEF Instance. (See clause 6.1.6.2.50 TS 29.510";
+
+    leaf-list afEvents {  // stage 2 double defined
+      type string;
+      min-elements 1;
+      description "It represents AF Event(s) exposed by the NEF after
+        registration of the AF(s) at the NEF.";
+    }
+
+    leaf-list afIds {
+      type string;
+      min-elements 1;
+      description "It represents list of application function identifiers of
+        the managed PFDs.";
+    }
+
+    leaf-list appIds {  // stage 2 shaky
+      type string;
+      min-elements 1;
+      description "It represents list of internal application identifiers.";
+    }
+  }
+
+  grouping PfdDataGrp {
+    description "This data type represents the list of Application IDs
+      and/or AF IDs managed by a given NEF Instance.
+      (See clause 6.1.6.2.49 TS 29.510)";
+
+    leaf-list appIds {  // stage 2 shaky
+      type string;
+      min-elements 1;
+      description "It represents list of internal application identifiers.";
+    }
+
+    leaf-list afIds {
+      type string;
+      min-elements 1;
+      description "It represents list of application function identifiers of
+        the managed PFDs.";
+    }
+  }
+
+  grouping UnTrustAfInfoGrp {
+    description "This data type represents information of an untrusted AF
+      Instance. (See clause 6.1.6.2.95 TS 29.510)";
+
+    leaf afId {
+      type string;
+      mandatory true;
+      description "It represents associated AF id.";
+    }
+
+    list sNssaiInfoList {
+      description "It represents S-NSSAIs and DNNs supported by the AF.";
+      min-elements 1;
+      key idx;
+      leaf idx { type uint32 ; }
+      uses SnssaiInfoItemGrp;
+    }
+
+    leaf mappingInd {
+      type boolean;
+      yext3gpp:initial-value false;
+      description "When present, this attribute indicates whether the
+        AF supports mapping between UE IP address (IPv4 address or IPv6 prefix)
+        and UE ID (i.e. GPSI).
+        True: the AF supports mapping between UE IP address and UE ID;
+        False: the AF does not support mapping between UE IP address
+        and UE ID.";
+    }
+  }
+
+  grouping NefInfoGrp {
+    description "This data type represents information of an NEF Instance.
+      (See clause 6.1.6.2.48 TS 29.510).";
+
+    list taiList {
+      config false;
+      description "List of TAIs";
+      yext3gpp:inVariant;
+      yext3gpp:notNotifyable;
+      key idx;
+      leaf idx { type uint32 ; }
+      uses types3gpp:TaiGrp;
+    }
+
+    list taiRangeList {
+      config false;
+      description "Range of TAIs";
+      yext3gpp:inVariant;
+      yext3gpp:notNotifyable;
+      key idx;
+      leaf idx { type uint32 ; }
+      uses types5g3gpp:TaiRangeGrp;
+    }
+
+    leaf nefId {
+      type string;
+      mandatory true;
+      description "It represents the NEF ID.
+        (see clause 6.1.6.3.2 of TS 29.510)";
+    }
+
+    list pfdData {
+      config false;
+      description "It represents PFD data, containing the list of internal
+        application identifiers and/or the list of application function
+        identifiers for which the PFDs can be provided.
+
+        Absence of this attribute indicates that the PFDs for any internal
+        application identifier and for any application function identifier
+        can be provided.";
+      min-elements 1;
+      key idx;
+      leaf idx { type uint32 ; }
+      uses PfdDataGrp;
+    }
+
+    list afEeData {
+      config false;
+      description "It represents the AF provided event exposure data. The NEF
+        registers such information in the NRF on behalf of the AF.";
+      min-elements 1;
+      key idx;
+      leaf idx { type uint32 ; }
+      uses AfEventExposureDataGrp;
+    }
+
+    list gpsiRanges {
+      description "It represents list of ranges of GPSIs whose profile data
+        is available.";
+      min-elements 1;
+      key idx;
+      leaf idx { type uint32 ; }
+      uses mnfp3gpp:IdentityRange;
+    }
+
+    list externalGroupIdentifiersRanges {
+      description "It represents list of ranges of external groups whose
+        profile data is available.";  // stage 2 definition is shaky
+      min-elements 1;
+      key idx;
+      leaf idx { type uint32 ; }
+      uses mnfp3gpp:IdentityRange;
+    }
+
+    leaf-list servedFqdnList {
+      type string;
+      min-elements 1;
+      description "It represents pattern (regular expression according to
+        the ECMA-262 dialect [75]) representing the Domain names served by
+        the NEF.";
+    }
+
+    leaf-list dnaiList {
+      type string;
+      min-elements 1;
+      description "It represents list of Data network access identifiers
+        supported by the NEF. The absence of this attribute indicates that
+        the NEF can be selected for any DNAI.";
+    }
+
+    list unTrustAfInfoList {
+      description "It represents list of information corresponding to the AFs.";
+      min-elements 1;
+      key idx;
+      leaf idx { type uint32 ; }
+      uses UnTrustAfInfoGrp;
+    }
+
+    leaf uasNfFunctionalityInd {
+      type boolean;
+      yext3gpp:initial-value false;
+      description "When present, this attribute shall indicate whether the ,
+        NEF supports UAS NF functionality:
+        - True: UAS NF functionality is supported by the NEF.
+        - False (default): UAS NF functionality is not supported by the NEF";
+    }
+
+    leaf multiMemAfSessQosInd {
+      type boolean;
+      default false;
+      description "This attribute indicates whether the NEF supports
+        Multi-member AF session with required QoS functionality:
+
+        - TRUE: Multi-member AF session with required QoS functionality is
+        supported by the NEF
+        - FALSE (default): Multi-member AF session with required QoS
+        functionality is not supported by the NEF.";
+    }
+
+    leaf memberUESelAssistInd {
+      type boolean;
+      default false;
+      description "This attribute indicates whether the NEF supports member
+        UE selection assistance functionality:
+
+        - TRUE: member UE selection assistance functionality is supported by
+        the NEF
+        - FALSE (default): member UE selection assistance functionality is
+        not supported by the NEF.";
+    }
+  }
+
+  grouping AIoTNEFMappingGrp {
+    description "Represents the data type AIoTNEFMapping";
+    
+    list targetAreaAF {
+      description "It represents the external target area provided by an AF 
+        to NEF for triggering A-IoT services. It could refer to a geographical 
+        location.";
+      min-elements 1;
+      max-elements 1;
+      key idx;
+      leaf idx { type uint32 ; }
+      uses types3gpp:GeoAreaGrp;
+    }
+    
+    list internalTargetArea  {
+      description "This is the (internal) target area mapped to external 
+        target area. It is provided to NEF by NRF.
+        It could refer to any of TAC/TAI(list), PLMN or any geographical 
+        location/coordinate/area polygon";
+      min-elements 1;
+      max-elements 1;
+      key idx;
+      leaf idx { type uint32 ; }
+      uses types5g3gpp:AreaScopeGrp;
+    }
+  }
+  
+  grouping NEFFunctionGrp {
+    description "Represents the NEFFunction IOC";
+    uses mf3gpp:ManagedFunctionGrp;
+
+    leaf sBIFQDN {
+      description "The FQDN of the registered NF instance in the
+        service-based interface.";
+      type inet:domain-name;
+    }
+
+    list sNSSAIList {
+      description "List of S-NSSAIs the managed object is capable of supporting.
+        (Single Network Slice Selection Assistance Information)
+        An S-NSSAI has an SST (Slice/Service type) and an optional SD
+        (Slice Differentiator) field.";
+      key "sd sst";
+      uses types5g3gpp:SNssai;
+    }
+
+    list managedNFProfile {
+      description "This parameter defines profile for managed NF(See TS 23.501)";
+      min-elements 1;
+      max-elements 1;
+      key idx;
+      leaf idx { type uint32;}
+      uses mnfp3gpp:ManagedNFProfileGrp;
+    }
+
+    leaf-list capabilityList {
+      description "List of supported capabilities of the NEF.";
+      reference "3GPP TS 23.003";
+      type string;
+    }
+
+    leaf isCAPIFSup {
+      type boolean;
+      yext3gpp:inVariant;
+    }
+
+    list nefInfo {
+      description "This attribute represents information of an NEF NF Instance.";
+      key idx;
+      leaf idx { type uint32 ; }
+      uses NefInfoGrp;
+    }
+    
+    list AIoTNEFMapping {
+      description "It represents mapping information between external target 
+        area (provided by AF) and (5G core internal) target area that is to 
+        be provided to NRF";
+      config false;
+      min-elements 1;
+      yext3gpp:inVariant;
+      yext3gpp:notNotifyable;
+      key idx;
+      leaf idx { type uint32 ; }
+      uses AIoTNEFMappingGrp;
+    }
+  }
+
+  augment "/me3gpp:ManagedElement" {
+    list NEFFunction {
+      description "5G Core NEF Function";
+      reference "3GPP TS 28.541";
+      key id;
+      uses top3gpp:Top_Grp;
+      container attributes {
+        uses NEFFunctionGrp;
+      }
+      uses mf3gpp:ManagedFunctionContainedClasses;
+    }
+  }
+}

original/Rel-20/28_series/_3gpp-5gc-nrm-nssffunction.yang

@@ -0,0 +1,95 @@
+module _3gpp-5gc-nrm-nssffunction {
+  yang-version 1.1;
+
+  namespace urn:3gpp:sa5:_3gpp-5gc-nrm-nssffunction;
+  prefix nssf3gpp;
+
+  import _3gpp-common-managed-function { prefix mf3gpp; }
+  import _3gpp-common-managed-element { prefix me3gpp; }
+  import ietf-inet-types { prefix inet; }
+  import _3gpp-common-yang-types { prefix types3gpp; }
+  import _3gpp-common-top { prefix top3gpp; }
+  import _3gpp-5g-common-yang-types { prefix types5g3gpp; }
+  import _3gpp-5gc-nrm-managed-nfprofile { prefix mnfp3gpp;}
+
+  organization "3gpp SA5";
+  contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464";
+  description "This IOC represents the NSSF function in 5GC. For more
+    information about the NSSF, see 3GPP TS 23.501.
+    Copyright 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI,
+    TTA, TTC). All rights reserved.";
+  reference "3GPP TS 28.541";
+
+  revision 2025-07-25 { reference CR-1558 ; }
+  revision 2023-09-18 { reference CR-1043 ; }
+  revision 2023-04-26 { reference CR-0916; }
+  revision 2020-11-08 { reference CR-0412 ; }
+  revision 2020-08-03 { reference "CR-0321"; }
+  revision 2019-10-25 { reference "S5-194457 S5-195427 S5-193518"; }
+  revision 2019-05-15 { reference "initial revision"; }
+
+  grouping NSSFFunctionGrp {
+    description "Represents the NSSFFunction IOC";
+    uses mf3gpp:ManagedFunctionGrp;
+
+    list pLMNIdList {
+      description "List of at most six entries of PLMN Identifiers, but at least
+        one (the primary PLMN Id).
+        The PLMN Identifier is composed of a Mobile Country Code (MCC) and a
+        Mobile Network Code (MNC).";
+
+      min-elements 1;
+      max-elements 6;
+      key "mcc mnc";
+      uses types3gpp:PLMNId;
+    }
+
+    leaf sBIFQDN {
+      description "The FQDN of the registered NF instance in the service-based
+        interface.";
+      type inet:domain-name;
+    }
+
+    list sNSSAIList {
+      description "List of S-NSSAIs the managed object is capable of supporting.
+                   (Single Network Slice Selection Assistance Information)
+                   An S-NSSAI has an SST (Slice/Service type) and an optional SD
+                   (Slice Differentiator) field.";
+
+      reference "3GPP TS 23.003";
+      key "sd sst";
+      uses types5g3gpp:SNssai;
+    }
+
+    leaf-list cNSIIdList {
+      description "NSI ID. NSI ID is an identifier for identifying the Core
+        Network part of a Network Slice instance when multiple Network Slice
+        instances of the same Network Slice are deployed, and there is a need
+        to differentiate between them in the 5GC, see clause 3.1 of TS 23.501
+        and subclause 6.1.6.2.7 of 3GPP TS 29.531";
+      type string;
+    }
+
+    list managedNFProfile {
+      key idx;
+      leaf idx { type uint32;}
+      min-elements 1;
+      max-elements 1;
+      description "Profile definition of a Managed NF (See TS 23.501)";
+      uses mnfp3gpp:ManagedNFProfileGrp;
+    }
+  }
+
+  augment "/me3gpp:ManagedElement" {
+    list NSSFFunction {
+      description "5G Core NSSF Function";
+      reference "3GPP TS 28.541";
+      key id;
+      uses top3gpp:Top_Grp;
+      container attributes {
+        uses NSSFFunctionGrp;
+      }
+      uses mf3gpp:ManagedFunctionContainedClasses;
+    }
+  }
+}

original/Rel-20/28_series/_3gpp-5gc-nrm-pcffunction.yang

@@ -0,0 +1,231 @@
+module _3gpp-5gc-nrm-pcffunction {
+  yang-version 1.1;
+
+  namespace urn:3gpp:sa5:_3gpp-5gc-nrm-pcffunction;
+  prefix pcf3gpp;
+
+  import _3gpp-common-managed-function { prefix mf3gpp; }
+  import _3gpp-common-managed-element { prefix me3gpp; }
+  import ietf-inet-types { prefix inet; }
+  import _3gpp-common-yang-types { prefix types3gpp; }
+  import _3gpp-5g-common-yang-types { prefix types5g3gpp; }
+  import _3gpp-common-top { prefix top3gpp; }
+  import _3gpp-5gc-nrm-managed-nfprofile { prefix mnfp3gpp; }
+
+  organization "3gpp SA5";
+  contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464";
+  description "This IOC represents the PCF function in 5GC. For more
+    information about the PCF, see 3GPP TS 23.501.
+    Copyright 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI,
+    TTA, TTC). All rights reserved.";
+  reference "3GPP TS 28.541";
+
+  revision 2025-07-25 { reference CR-1558 ; }
+  revision 2024-05-24 { reference CR-1273 ; }
+  revision 2023-09-18 { reference CR-1043 ; }
+  revision 2023-04-26 { reference CR-0916; }
+  revision 2020-11-08 { reference CR-0412 ; }
+  revision 2020-08-06 { reference "CR-0333"; }
+  revision 2020-08-06 { reference "CR-0331"; }
+  revision 2019-10-25 { reference "S5-194457 S5-193518"; }
+  revision 2019-05-22 { reference "initial revision"; }
+
+   grouping ProSeCapabilityGrp {
+      leaf proseDirectDiscovery {
+        type boolean;
+        description "Indicates support for ProSe Direct Discovery.";
+        }
+      leaf proseDirectCommunication {
+          type boolean;
+          description "Indicates support for ProSe Direct Communication.";
+      }
+      leaf proseL2UetoNetworkRelay {
+          type boolean;
+          description "Indicates support for ProSe Layer-2
+          UE-to-Network Relay..";
+      }
+      leaf proseL3UetoNetworkRelay {
+          type boolean;
+          description "Indicates support for ProSe Layer-3
+           UE-to-Network Relay.";
+      }
+      leaf proseL2RemoteUe {
+          type boolean;
+          description "Indicates support for ProSe Layer-2
+           Remote UE.";
+      }
+      leaf proseL3RemoteUe {
+          type boolean;
+          description "Indicates support for ProSe Layer-3
+          Remote UE.";
+      }
+      leaf proseL2UetoUeRelay {
+          type boolean;
+          description "Indicates support for ProSe Layer-2
+          UE-to-UE Relay.";
+      }
+      leaf proseL3UetoUeRelay {
+        type boolean;
+        description "Indicates support for ProSe Layer-3
+        UE-to-UE Relay.";
+        }
+      leaf proseL2EndUe {
+          type boolean;
+          description "Indicates support for ProSe Layer-2 End UE.";
+      }
+      leaf proseL3EndUe {
+          type boolean;
+          description "Indicates support for ProSe Layer-3 End UE.";
+      }
+      leaf proseL3IntermRelay {
+          type boolean;
+          description "Indicates support for ProSe Layer-3
+          Intermediate Relay.";
+      }
+      leaf proseL3MultihopRemote {
+          type boolean;
+          description "Indicates support for ProSe Layer-3 Multihop Remote.";
+      }
+      leaf proseL3NetMultihopRelay {
+          type boolean;
+          description "Indicates support for ProSe Layer-3 Network Multihop
+          Relay.";
+      }
+      leaf proseL3UeMultihopRelay {
+          type boolean;
+          description "Indicates support for ProSe Layer-3 UE Multihop Relay.";
+      }
+      leaf proseL3EndUeMultihop {
+          type boolean;
+          description "Indicates support for ProSe Layer-3 End UE Multihop.";
+      }
+    }
+    grouping pcfInfoGrp {
+
+      leaf-list dnnList {
+        description "DNNs supported by the PCF.
+                     If not provided, the PCF can serve any DNN.";
+
+        min-elements 1;
+        type string;
+      }
+
+      list supiRanges {
+        description "List of ranges of SUPIs that can be served by
+         the PCF instance. If not provided, the PCF can serve any SUPI.";
+        key idx;
+        leaf idx { type uint32; }
+        min-elements 1;
+        uses mnfp3gpp:SupiRangeGrp;
+      }
+
+      leaf rxDiamHost {
+        description "This IE shall be present if the PCF supports Rx interface.
+                     When present, this IE shall indicate the Diameter host
+                     of the Rx interface for the PCF.
+                     Pattern: '^([A-Za-z0-9]+(-[A-Za-z0-9]+).)+[a-z]{2,}$'.";
+
+        type string;
+      }
+
+      leaf rxDiamRealm {
+        description "This IE shall be present if the PCF supports Rx interface.
+                     When present, this IE shall indicate the Diameter realm
+                     of the Rx interface for the PCF.
+                     Pattern: '^([A-Za-z0-9]+(-[A-Za-z0-9]+).)+[a-z]{2,}$'.";
+
+        type string;
+      }
+      list proseCapability {
+        description "It indicates the supported ProSe Capability by the PCF.";
+        uses ProSeCapabilityGrp;
+        config false;
+      }
+    }
+  grouping PCFFunctionGrp {
+    description "Represents the PCFFunction IOC";
+    uses mf3gpp:ManagedFunctionGrp;
+
+    list pLMNIdList {
+      description "List of at most six entries of PLMN Identifiers, but at
+        least one (the primary PLMN Id).
+        The PLMN Identifier is composed of a Mobile Country Code (MCC) and a
+       Mobile Network Code (MNC).";
+
+      min-elements 1;
+      max-elements 6;
+      key "mcc mnc";
+      uses types3gpp:PLMNId;
+    }
+
+    leaf sBIFQDN {
+      description "The FQDN of the registered NF instance in the service-based
+        interface.";
+      type inet:domain-name;
+    }
+
+    list sNSSAIList {
+      description "List of S-NSSAIs the managed object is capable of supporting.
+                   (Single Network Slice Selection Assistance Information)
+                   An S-NSSAI has an SST (Slice/Service type) and an optional SD
+                   (Slice Differentiator) field.";
+      //optional support
+      reference "3GPP TS 23.003";
+      key "sd sst";
+      uses types5g3gpp:SNssai;
+    }
+
+    list managedNFProfile {
+      key idx;
+      leaf idx { type uint32; }
+      min-elements 1;
+      max-elements 1;
+      description "Profile definition of a Managed NF (See TS 23.501)";
+      uses mnfp3gpp:ManagedNFProfileGrp;
+    }
+    list commModelList {
+      min-elements 1;
+      key "groupId";
+      description "Specifies a list of commModel. It can be used by NF and
+        NF services to interact with each other in 5G Core network ";
+      reference "3GPP TS 23.501";
+      uses types5g3gpp:CommModel;
+    }
+    leaf supportedBMOList {
+      description "It is used to indicate the list of supported BMOs
+      (Bridge Managed Objects) required for integration with TSN system.";
+      type string;
+    }
+    list pcfInfo {
+      description "This attribute represents information of a PCF NF Instance.
+      Multiple pcfInfo may be allowed to define different DNN list for each
+      supiranges.";
+      key idx;
+      leaf idx { type uint32; }
+      uses pcfInfoGrp;
+    }
+    leaf dynamic5QISetRef {
+      type types3gpp:DistinguishedName;
+      description "DN of the Dynamic5QISet that the PCFFunction supports
+        (is associated to).";
+    }
+    leaf configurable5QISetRef {
+      type types3gpp:DistinguishedName;
+      description "DN of the Configurable5QISet that the PCFFunction supports
+        (is associated to).";
+    }
+  }
+
+  augment "/me3gpp:ManagedElement" {
+    list PCFFunction {
+      description "5G Core PCF Function";
+      reference "3GPP TS 28.541";
+      key id;
+      uses top3gpp:Top_Grp;
+      container attributes {
+        uses PCFFunctionGrp;
+      }
+      uses mf3gpp:ManagedFunctionContainedClasses;
+    }
+  }
+}

original/Rel-20/28_series/_3gpp-5gc-nrm-seppfunction.yang

@@ -0,0 +1,128 @@
+module _3gpp-5gc-nrm-seppfunction {
+  yang-version 1.1;
+  
+  namespace urn:3gpp:sa5:_3gpp-5gc-nrm-seppfunction;
+  prefix sepp3gpp;
+  
+  import _3gpp-common-managed-function { prefix mf3gpp; }
+  import _3gpp-common-managed-element { prefix me3gpp; }
+  import _3gpp-5g-common-yang-types { prefix types5g3gpp; }
+  import _3gpp-common-yang-types { prefix types3gpp; }
+  import _3gpp-common-yang-extensions { prefix yext3gpp; }
+  import _3gpp-common-top { prefix top3gpp; }
+  import ietf-inet-types { prefix inet; }
+  
+  organization "3gpp SA5";
+  description "This IOC represents the SEPP function which support message filtering
+               and policing on inter-PLMN control plane interface. For more information about the SEPP, see 3GPP TS 23.501.
+    Copyright 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, 
+    TTA, TTC). All rights reserved.";
+  reference "3GPP TS 28.541";
+  
+  revision 2023-09-18 { reference CR-1043 ; } 
+  revision 2020-08-03 { reference "CR-0321"; }
+  revision 2019-10-28 { reference S5-193518 ; }
+    
+  typedef SEPPType {
+    reference "3GPP TS 23501";
+    type enumeration {
+      enum CSEPP {
+        value 0;
+        description "consumer SEPP";
+      }
+
+      enum PSEPP {
+        value 1;
+        description "producer SEPP";
+      }
+    }
+  }
+  
+  grouping SeppInfoGrp {
+    leaf seppPrefix {
+      type string ;
+      description "This attributes represents optional deployment specific 
+        string used to construct the apiRoot of the next hop SEPP, as described 
+        in clause 6.10 of TS 29.500";
+    }
+    
+    leaf-list seppPorts {
+      type uint16 ;
+      description "This attributes represents SEPP port number(s) for HTTP 
+        and/or HTTPS.
+        This attribute shall be present if the SEPP uses non-default HTTP 
+        and/or HTTPS ports. When present, it shall contain the HTTP and/or 
+        HTTPS ports.
+        The key of the map shall be 'http' or 'https'.
+        The value shall indicate the port number for HTTP or 
+        HTTPS respectively.";
+    }
+    
+    list remotePlmnList {
+      description "It represents a list of remote PLMNs reachable through the 
+        SEPP.
+        The absence of this attribute indicates that any PLMN is reachable 
+        through the SEPP.";
+      key idx;
+      leaf idx { type uint32 ; }
+      uses types3gpp:PLMNId;
+    }
+    
+    list remoteSnpnList {
+      description "This attributes represents list of remote SNPNs reachable 
+        through the SEPP.
+        The absence of this attribute indicates that no SNPN is reachable 
+        through the SEPP.";
+      key idx;
+      leaf idx { type uint32 ; }
+      uses types5g3gpp:PlmnIdNid;
+    }
+  }
+
+  grouping SEPPFunctionGrp {
+    uses mf3gpp:ManagedFunctionGrp;
+  
+    container pLMNId {
+      description "PLMN Identifiers of the sepp.
+                   The PLMN Identifier is composed of a Mobile Country Code (MCC) and a Mobile Network Code (MNC).";
+      yext3gpp:inVariant;
+      uses types3gpp:PLMNId;
+    }
+	
+    leaf sEPPType {
+        type sepp3gpp:SEPPType;
+        yext3gpp:inVariant;
+      }
+  
+    leaf sEPPId {
+        type uint16;
+        yext3gpp:inVariant;
+      }    
+  
+    leaf fqdn {
+      description "The domain name of the SEPP.";
+      type inet:domain-name;
+    }
+    
+    list seppInfo {
+      max-elements 1;
+      key idx;
+      description "This attributes represents information of a SEPP Instance, 
+        as described in clause 6.1.6.2.72 of TS 29.510 ";
+      leaf idx { type uint32 ; }
+      uses SeppInfoGrp;
+    }
+  }
+  
+  augment "/me3gpp:ManagedElement" {
+    list SEPPFunction {
+      description "5G Core SEPP Function";
+      reference "3GPP TS 28.541";
+      key id;
+      uses top3gpp:Top_Grp;
+      container attributes {
+        uses SEPPFunctionGrp;
+      }
+      uses mf3gpp:ManagedFunctionContainedClasses;    }
+  }
+}

original/Rel-20/28_series/_3gpp-5gc-nrm-smffunction.yang

@@ -0,0 +1,238 @@
+module _3gpp-5gc-nrm-smffunction {
+  yang-version 1.1;
+  namespace urn:3gpp:sa5:_3gpp-5gc-nrm-smffunction;
+  prefix smf3gpp;
+
+  import _3gpp-common-managed-function { prefix mf3gpp; }
+  import _3gpp-common-managed-element { prefix me3gpp; }
+  import _3gpp-common-yang-types { prefix types3gpp; }
+  import _3gpp-5g-common-yang-types { prefix types5g3gpp; }
+  import ietf-inet-types { prefix inet; }
+  import _3gpp-common-top { prefix top3gpp; }
+  import _3gpp-5gc-nrm-managed-nfprofile { prefix mnfp3gpp; }
+
+  organization "3gpp SA5";
+  contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464";
+  description "SMFFunction derived from basic ManagedFunction.
+    Copyright 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI,
+    TTA, TTC). All rights reserved.";
+  reference "3GPP TS 28.541";
+
+  revision 2024-05-24 { reference CR-1273 ; }
+  revision 2023-09-18 { reference CR-1043 ; }
+  revision 2023-04-26 { reference CR-0916; }
+  revision 2020-11-08 { reference CR-0412 ; }
+  revision 2020-08-06 { reference "CR-0333"; }
+  revision 2020-06-03 { reference "CR-0286"; }
+  revision 2019-10-25 { reference "S5-194457 S5-193518"; }
+  revision 2019-05-31 {reference "Ericsson refactoring."; }
+  revision 2018-08-07 { reference "Initial revision";}
+
+
+    grouping SmfInfoGrp {
+
+      list sNssaiSmfInfoList {
+        description "List of parameters supported by the SMF per S-NSSAI.";
+        min-elements 1;
+        key idx;
+        leaf idx { type uint32; }
+        uses types5g3gpp:sNssaiSmfInfoItem;
+      }
+
+      list taiList {
+        description "The list of TAIs the SMF can serve.
+        It may contain the non-3GPP access TAI.
+                     The absence of this attribute and the taiRangeList
+                     attribute indicate that
+                     the SMF can be selected for any TAI
+                     in the serving network.";
+
+        key idx;
+        leaf idx { type uint32; }
+
+        min-elements 1;
+        uses types3gpp:TaiGrp;
+      }
+
+      list taiRangeList {
+        description "The range of TAIs the SMF can serve.
+        The absence of this attribute and the taiList
+                     attribute indicate that the SMF can be selected
+                     for any TAI in the serving network.";
+        min-elements 1;
+        key idx;
+        leaf idx { type uint32; }
+        uses types5g3gpp:TaiRangeGrp;
+      }
+
+      leaf pgwFqdn {
+        description "The FQDN of the PGW if the SMF is a combined SMF/PGW-C.";
+        type inet:domain-name;
+      }
+      leaf-list accessType {
+        description "If included, this IE shall contain the access type
+        (3GPP_ACCESS and/or NON_3GPP_ACCESS) supported by the SMF.
+                     If not included, it shall be assumed the both
+                      access types are supported.";
+
+        min-elements 1;
+        max-elements 2;
+        type AccessType;
+      }
+      leaf priority {
+        description "This parameter defines Priority (relative to other
+         NFs of the same type) in the range of 0-65535, to be used for
+         NF selection; lower values indicate a higher priority. If
+         priority is also present in the nfServiceList parameters,
+         those will have precedence over this value ";
+         type uint16;
+      }
+      leaf-list vsmfSupportInd {
+        description "Used by an SMF to explicitly indicate the support of
+         V-SMF capability and its preference to be selected as V-SMF.
+         When present it indicate whether the V-SMF capability is supported
+         by the SMF:
+         - true: V-SMF capability supported by the SMF
+         - false: V-SMF capability not supported by the SMF.
+         When absent the V-SMF capability support of the SMF is not specified.";
+         type boolean;
+
+      }
+      leaf pgwFqdnList {
+        description "When present, this attribute provides additional FQDNs
+        to the FQDN indicated in the pgwFqdn attribute.
+        The pgwFqdnList attribute may be present if the pgwFqdn attribute
+        is present.";
+        type string;
+      }
+      leaf-list ismfSupportInd {
+        description "This attribute may be used by an SMF to explicitly
+        indicate the support of I-SMF capability and its preference to be
+        selected as I-SMF. When present, this attribute shall indicate
+        whether the I-SMF capability are supported by the SMF:
+        - TRUE: I-SMF capability supported by the SMF
+        - FALSE: I-SMF capability not supported by the SMF. Absence of this
+        attribute indicates the I-SMF capability support of the SMF is not
+        specified.";
+        max-elements 1;
+        type boolean;
+      }
+      leaf-list smfOnboardingCapability {
+        description "This attribute indicates the SMF supports SNPN
+        Onboarding capability and User Plane Remote Provisioning. This
+        is used for the case of Onboarding of UEs for SNPNs
+        (see TS 23.501 [2], clauses 5.30.2.10 and 6.2.6.2).
+        -  FALSE: SMF does not support SNPN Onboarding;
+        -  TRUE: SMF supports SNPN Onboarding.";
+        type boolean;
+        max-elements 1;
+      }
+      leaf-list smfUPRPCapability {
+        description "This attribute IE indicates the SMF supports User
+        Plane Remote Provisioning (UPRP) capability. This is used for
+        the case of Onboarding of UEs for SNPNs ,
+        clauses 5.30.2.10 and 6.2.6.2).
+        -  FALSE: SMF does not support UPRP;
+        -   TRUE: SMF supports UPRP.";
+        reference "see TS 23.501 [2]";
+        type boolean;
+      }
+    }
+
+  grouping SMFFunctionGrp {
+    description "Represents the SMFFuntion IOC";
+    uses mf3gpp:ManagedFunctionGrp;
+
+    list pLMNIdList {
+      min-elements 1;
+      description "A list of PLMN identifiers (Mobile Country Code and Mobile
+        Network Code).";
+      key "mcc mnc";
+      uses types3gpp:PLMNId;
+    }
+
+    leaf nRTACList {
+      description "List of Tracking Area Codes (legacy TAC or extended TAC)
+      where the represented management function is serving.";
+      reference "TS 38.413 clause 9.3.3.10";
+      config false;
+      type types5g3gpp:NRTAC;
+    }
+
+    leaf sBIFQDN {
+      description "The FQDN of the registered NF instance in the service-based
+        interface.";
+      type inet:domain-name;
+    }
+
+    list managedNFProfile {
+      key idx;
+      leaf idx { type uint32; }
+      min-elements 1;
+      max-elements 1;
+      description "Profile definition of a Managed NF (See TS 23.501)";
+      uses mnfp3gpp:ManagedNFProfileGrp;
+    }
+
+    list commModelList {
+      min-elements 1;
+      key "groupId";
+      description "Specifies a list of commModel. It can be used by NF and
+        NF services to interact with each other in 5G Core network ";
+      reference "3GPP TS 23.501";
+      uses types5g3gpp:CommModel;
+    }
+
+    leaf configurable5QISetRef {
+      type types3gpp:DistinguishedName;
+      description "DN of the Configurable5QISet that the SMFFunction supports
+        (is associated to).";
+         }
+
+    leaf dynamic5QISetRef {
+      type types3gpp:DistinguishedName;
+      description "DN of the Dynamic5QISet that the SMFFunction supports
+        (is associated to).";
+    }
+
+    list dnaiSatelliteMappingList {
+      description "List of the mapping relationship between
+       satellite ID and at least one DNAI.";
+      min-elements 1;
+      key "satelliteid";
+      uses dnaiSatelliteMapping;
+    }
+  }
+
+  grouping dnaiSatelliteMapping {
+    leaf-list dnaiList {
+      description "List of Data network access identifiers.";
+      min-elements 1;
+      type string;
+    }
+
+    leaf satelliteid {
+      description "Unique identifier of a GEO satellite.";
+      type string;
+    }
+  }
+
+    typedef AccessType {
+    type enumeration {
+      enum 3GPP_ACCESS;
+      enum NON_3GPP_ACCESS;
+    }
+  }
+  augment "/me3gpp:ManagedElement" {
+    list SMFFunction {
+      description "5G Core SMF Function";
+      reference "3GPP TS 28.541";
+      key id;
+      uses top3gpp:Top_Grp;
+      container attributes {
+        uses SMFFunctionGrp;
+      }
+      uses mf3gpp:ManagedFunctionContainedClasses;
+    }
+  }
+}

original/Rel-20/28_series/_3gpp-5gc-nrm-udmfunction.yang

@@ -0,0 +1,230 @@
+module _3gpp-5gc-nrm-udmfunction {
+  yang-version 1.1;
+
+  namespace urn:3gpp:sa5:_3gpp-5gc-nrm-udmfunction;
+  prefix udm3gpp;
+
+  import _3gpp-common-managed-function { prefix mf3gpp; }
+  import _3gpp-common-managed-element { prefix me3gpp; }
+  import ietf-inet-types { prefix inet; }
+  import _3gpp-common-yang-types { prefix types3gpp; }
+  import _3gpp-5g-common-yang-types { prefix types5g3gpp; }
+  import _3gpp-common-top { prefix top3gpp; }
+  import _3gpp-5gc-nrm-managed-nfprofile { prefix mnfp3gpp; }
+
+  organization "3gpp SA5";
+  contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464";
+  description "This IOC represents the UDM function in 5GC. For more
+    information about the UDM, see 3GPP TS 23.501.
+    Copyright 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI,
+    TTA, TTC). All rights reserved.";
+  reference "3GPP TS 28.541";
+
+  revision 2025-07-25 { reference CR-1558 ; }
+  revision 2024-04-04 { reference CR-1139; }
+  revision 2023-09-18 { reference CR-1043 ; }
+  revision 2023-04-26 { reference CR-0916; }
+  revision 2020-11-08 { reference CR-0412 ; }
+  revision 2019-10-25 { reference "S5-194457 S5-195427 S5-193518"; }
+  revision 2019-05-22 { reference "initial revision";}
+
+    grouping InternalGroupIdRangeGrp {
+
+      leaf start {
+        description "It indicates first value identifying the start of an
+        identity range, to be used when the range of identities can be
+        represented as a consecutive numeric range.";
+        type string;
+      }
+
+      leaf end{
+        description "It indicates last value identifying the end of an
+        identity range, to be used when the range of identities can be
+        represented as a consecutive numeric range.";
+        type string;
+      }
+      leaf pattern {
+        description "It indicates pattern (regular expression according
+        to the ECMA-262 dialect [75]) representing the set of identities
+        belonging to this range. An identity value is considered part of
+        the range if and only if the identity string fully matches the
+        regular expression.";
+        type string;
+      }
+    }
+    grouping SuciInfoGrp {
+      description "This data type represents SUCI information containing
+        Routing Indicator and Home Network Public Key ID. (See TS 29.510)";
+
+      leaf-list routingInds {
+        type string;
+        min-elements 1;
+        description "It indicates served Routing Indicator (see TS 23.003,
+          clause 2.2B). If not provided, the AUSF/UDM
+          can serve any Routing Indicator.";
+      }
+
+      leaf-list hNwPubKeyIds  {
+        type int64;
+        min-elements 1;
+        description "It indicating served Home Network Public Key
+          (see TS 23.003, clause 2.2B). If not provided, the AUSF/UDM
+          can serve any public key.";
+      }
+    }
+    grouping UdmInfoGrp {
+
+      leaf groupId {
+        description "Identity of the UDM group that is served by the
+        UDM instance. If not provided, the UDM instance does
+         not pertain to any UDM group.";
+        type string;
+      }
+
+      list supiRanges {
+        description "List of ranges of SUPI's whose profile data is
+        available in the UDM instance.";
+        key "start end pattern";
+        min-elements 1;
+        uses mnfp3gpp:SupiRangeGrp;
+      }
+
+      list gpsiRanges {
+        description "List of ranges of GPSIs whose profile data is
+        available in the UDM instance.";
+        key "start end pattern";
+        min-elements 1;
+        uses mnfp3gpp:IdentityRange;
+      }
+
+      list externalGroupIdentifiersRanges {
+        description "List of ranges of external groups whose profile
+         data is available in the UDM instance.";
+        key "start end pattern";
+        min-elements 1;
+        uses mnfp3gpp:IdentityRange;
+      }
+
+      leaf-list routingIndicators {
+        description "List of Routing Indicator information that allows
+         to route network signalling with SUCI
+                     to the UDM instance. If not provided,
+                     the UDM can serve any Routing Indicator.
+                     Pattern: '^[0-9]{1,4}$'.";
+        min-elements 1;
+        type string;
+      }
+
+      list internalGroupIdentifiersRanges{
+        description "It represents list of ranges of Internal Group
+        Identifiers whose profile data is available in the UDM instance.
+        If not provided, it does not imply that the UDM supports all
+        internal groups.";
+        key idx;
+        leaf idx { type uint32; }
+        uses InternalGroupIdRangeGrp;
+      }
+      list suciInfos {
+        description "It represents list of SuciInfo. A SUCI that matches
+        this information can be served by the UDM .A SUCI that matches
+        all attributes of at least one entry in this array shall be
+        considered as a match of this information";
+        key idx;
+        leaf idx { type uint32; }
+        uses SuciInfoGrp;
+      }
+    }
+
+  grouping UDMFuntionGrp {
+    description "Represents the UDMFuntion IOC";
+    uses mf3gpp:ManagedFunctionGrp;
+
+    list pLMNIdList {
+      description "List of at most six entries of PLMN Identifiers, but at
+        least one (the primary PLMN Id).
+        The PLMN Identifier is composed of a Mobile Country Code (MCC) and a
+        Mobile Network Code (MNC).";
+
+      min-elements 1;
+      max-elements 6;
+      key "mcc mnc";
+      uses types3gpp:PLMNId;
+    }
+
+    leaf sBIFQDN {
+      description "The FQDN of the registered NF instance in the service-based
+        interface.";
+      type inet:domain-name;
+    }
+
+    list sNSSAIList {
+      description "List of S-NSSAIs the managed object is capable of supporting.
+                   (Single Network Slice Selection Assistance Information)
+                   An S-NSSAI has an SST (Slice/Service type) and an optional SD
+                   (Slice Differentiator) field.";
+      //optional support
+      reference "3GPP TS 23.003";
+      key "sd sst";
+      uses types5g3gpp:SNssai;
+    }
+
+    list managedNFProfile {
+      key idx;
+      leaf idx { type uint32; }
+      min-elements 1;
+      max-elements 1;
+      description "Profile definition of a Managed NF (See TS 23.501)";
+      uses mnfp3gpp:ManagedNFProfileGrp;
+    }
+
+    list commModelList {
+      min-elements 1;
+      key "groupId";
+      description "Specifies a list of commModel. It can be used by NF and
+        NF services to interact with each other in 5G Core network ";
+      reference "3GPP TS 23.501";
+      uses types5g3gpp:CommModel;
+    }
+
+    list udmInfo {
+      description "This attribute represents the information of an UDM NF
+      Instance ";
+      key idx;
+      leaf idx { type uint32; }
+      reference "TS 29.510 ";
+      uses UdmInfoGrp;
+    }
+
+    leaf-list mdtUserConsentReqList {
+      type enumeration {
+        enum M1;
+        enum M2;
+        enum M3;
+        enum M4;
+        enum M5;
+        enum M6;
+        enum M7;
+        enum M8;
+        enum M9;
+        enum MDT_UE_LOCATION;
+      }
+      description "represents a list of MDT measurement names that are
+        subject to user consent at MDT activation.
+        Any MDT measurement, whose name is not specified in this list, is not
+        subject to user consent at MDT activation.";
+    }
+  }
+
+  augment "/me3gpp:ManagedElement" {
+    list UDMFunction {
+      description "5G Core UDM Function";
+      reference "3GPP TS 28.541";
+      key id;
+      uses top3gpp:Top_Grp;
+      container attributes {
+        uses UDMFuntionGrp;
+      }
+      uses mf3gpp:ManagedFunctionContainedClasses;
+    }
+  }
+}

original/Rel-20/28_series/_3gpp-5gc-nrm-udrfunction.yang

@@ -0,0 +1,136 @@
+module _3gpp-5gc-nrm-udrfunction {
+  yang-version 1.1;
+
+  namespace urn:3gpp:sa5:_3gpp-5gc-nrm-udrfunction;
+  prefix udr3gpp;
+
+  import _3gpp-common-managed-function { prefix mf3gpp; }
+  import _3gpp-common-managed-element { prefix me3gpp; }
+  import ietf-inet-types { prefix inet; }
+  import _3gpp-common-yang-types { prefix types3gpp; }
+  import _3gpp-common-top { prefix top3gpp; }
+  import _3gpp-5g-common-yang-types { prefix types5g3gpp; }
+  import _3gpp-5gc-nrm-managed-nfprofile { prefix mnfp3gpp; }
+
+  organization "3gpp SA5";
+  contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464";
+  description "This IOC represents the UDR function in 5GC. For more information
+    about the UDR, see 3GPP TS 23.501.
+    Copyright 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI,
+    TTA, TTC). All rights reserved.";
+  reference "3GPP TS 28.541";
+
+  revision 2025-07-25 { reference CR-1558 ; }
+  revision 2023-09-18 { reference CR-1043 ; }
+  revision 2023-04-26 { reference CR-0916; }
+  revision 2020-11-08 { reference CR-0412 ; }
+  revision 2019-10-25 { reference "S5-194457 S5-195427 S5-193518"; }
+
+  revision 2019-05-22 {reference "initial revision"; }
+
+    grouping UdrInfoGrp {
+
+      leaf groupId {
+        description "Identity of the UDR group that is served
+         by the UDR instance.
+          If not provided, the UDR instance does not pertain
+           to any UDR group.";
+        type string;
+      }
+
+      list supiRanges {
+        description "List of ranges of SUPI's whose profile data
+         is available in the UDR instance.";
+        key "start end pattern";
+        min-elements 1;
+        uses mnfp3gpp:SupiRangeGrp;
+      }
+
+      list gpsiRanges {
+        description "List of ranges of GPSIs whose profile data is
+         available in the UDR instance.";
+        key "start end pattern";
+        min-elements 1;
+        uses mnfp3gpp:IdentityRange;
+      }
+
+      list externalGroupIdentifiersRanges {
+        description "List of ranges of external groups whose profile
+         data is available in the UDR instance.";
+        key "start end pattern";
+        min-elements 1;
+        uses mnfp3gpp:IdentityRange;
+      }
+
+      leaf-list supportedDataSets {
+        description "List of supported data sets in the UDR instance.
+                     If not provided, the UDR supports all data sets.";
+        min-elements 1;
+        type DataSetId;
+      }
+    }
+  grouping UDRFuntionGrp {
+    description "Representse the UDRFuntion IOC";
+    uses mf3gpp:ManagedFunctionGrp;
+
+    list pLMNIdList {
+      description "List of at most six entries of PLMN Identifiers, but at
+        least one (the primary PLMN Id).
+        The PLMN Identifier is composed of a Mobile Country Code (MCC) and a
+        Mobile Network Code (MNC).";
+
+      min-elements 1;
+      max-elements 6;
+      key "mcc mnc";
+      uses types3gpp:PLMNId;
+    }
+
+    leaf sBIFQDN {
+      description "The FQDN of the registered NF instance in the service-based
+        interface.";
+      type inet:domain-name;
+    }
+
+    list sNSSAIList {
+      description "List of S-NSSAIs the managed object is capable of supporting.
+                   (Single Network Slice Selection Assistance Information)
+                   An S-NSSAI has an SST (Slice/Service type) and an optional SD
+                   (Slice Differentiator) field.";
+      //optional support
+      reference "3GPP TS 23.003";
+      key "sd sst";
+      uses types5g3gpp:SNssai;
+    }
+
+    list managedNFProfile {
+      key idx;
+      leaf idx { type uint32; }
+      min-elements 1;
+      max-elements 1;
+      description "Profile definition of a Managed NF (See TS 23.501)";
+      uses mnfp3gpp:ManagedNFProfileGrp;
+    }
+  }
+
+  typedef DataSetId {
+    type enumeration {
+      enum SUBSCRIPTION;
+      enum POLICY;
+      enum EXPOSURE;
+      enum APPLICATION;
+    }
+  }
+
+  augment "/me3gpp:ManagedElement" {
+    list UDRFunction {
+      description "5G Core UDR Function";
+      reference "3GPP TS 28.541";
+      key id;
+      uses top3gpp:Top_Grp;
+      container attributes {
+        uses UDRFuntionGrp;
+      }
+      uses mf3gpp:ManagedFunctionContainedClasses;
+    }
+  }
+}

original/Rel-20/28_series/_3gpp-common-ep-rp.yang

@@ -0,0 +1,73 @@
+module _3gpp-common-ep-rp {
+  yang-version 1.1;
+  namespace "urn:3gpp:sa5:_3gpp-common-ep-rp";
+  prefix "eprp3gpp";
+
+  import _3gpp-common-yang-types { prefix types3gpp ; }
+  import ietf-inet-types { prefix inet; }
+  import _3gpp-common-measurements { prefix meas3gpp; }
+
+  organization "3GPP SA5";
+  contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464";
+  description "Common/basic class/grouping to be inherited/reused.
+    This IOC represents an end point of a link used across a reference
+    point between two network entities.
+    Copyright 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI,
+    TTA, TTC). All rights reserved.";
+  reference
+    "3GPP TS 28.622
+    Generic Network Resource Model (NRM)
+    Integration Reference Point (IRP);
+    Information Service (IS)
+
+    3GPP TS 28.620
+    Umbrella Information Model (UIM)";
+
+  revision 2025-10-01 { reference CR-0578 ; } 
+  revision 2023-09-18 { reference CR-0271 ; }
+  revision 2020-06-08 { reference "CR-0092"; }
+
+  revision 2019-06-17 {
+    description "Initial revision";
+  }
+
+  grouping EP_RPGrp {
+    description "Abstract class, represents an end point of a link used
+      across a reference point between two network entities.
+
+      For naming the subclasses of EP_RP, the following rules shall apply:
+      -  The name of the subclassed IOC shall have the form 'EP_<rp>',
+      where <rp> is a string that represents the name of the reference point.
+      Thus, two valid examples of EP_RP subclassed IOC names would be:
+      EP_S1 and EP_X2.";
+
+    leaf userLabel {
+        type string;
+        description "A user-friendly (and user assignable) name of this object.";
+    }
+
+    leaf farEndEntity {
+      config false;
+      type types3gpp:DistinguishedName;
+    }
+    
+   uses meas3gpp:SupportedPerfMetricGroupGrp;
+  }
+
+  grouping EP_Common {
+    uses EP_RPGrp;
+    list localAddress {
+      description "Local IP address and VLAN ID.";
+      key "ipAddress vlanId";
+      min-elements 1;
+      max-elements 1;
+      uses types3gpp:AddressWithVlan;
+    }
+
+    leaf remoteAddress {
+      description "Remote IP address.";
+      mandatory true;
+      type inet:ip-address;
+    }
+  }
+}

original/Rel-20/28_series/_3gpp-common-externaldata.yang

@@ -0,0 +1,135 @@
+module _3gpp-common-externaldata {
+  yang-version 1.1;
+  namespace "urn:3gpp:sa5:_3gpp-common-externaldata";
+  prefix "exdata3gpp";
+
+  import _3gpp-common-subnetwork { prefix subnet3gpp; }
+  import _3gpp-common-top { prefix top3gpp; }
+  import _3gpp-common-yang-types { prefix types3gpp; }
+  import ietf-inet-types { prefix inet; }
+
+  organization "3GPP SA5";
+  contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464";
+  description "Defines the YANG mapping of the external data.
+    Copyright 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI,
+    TTA, TTC). All rights reserved.";
+  reference "3GPP TS 28.623 Generic Network Resource Model (NRM)";
+
+  revision 2025-07-19 { reference CR-0551; }
+
+    grouping ExternalDataScopeGrp {
+      list geoAreas {
+        description "It describes the concrete geographical area(s)";
+        key idx;
+        leaf idx { type uint32; }
+        uses types3gpp:GeoAreaGrp;
+      }
+
+      leaf-list objectInstancesIncluded {
+        type types3gpp:DistinguishedName;
+        description "List of managed object instances to which the described
+          data are related. Each object instance is identified by its DN.";
+      }
+
+      leaf-list objectInstancesExcluded {
+        type types3gpp:DistinguishedName;
+        description "List of managed object instances which are not considered
+          in relation to the described data. Each object instance is identified
+          by its DN.";
+      }
+    }
+
+    grouping ExternalDataTypeGrp {
+    description "Represents the IOC ExternalDataType";
+
+    leaf externalDataType {
+      type string;
+      mandatory true;
+      description "Type of external management data as defined by the
+        implementation.
+
+        Examples: 'Electronic Map', 'Camara Data', 'UE path', 'Camera Photo',
+        'Event Schedule”";
+    }
+
+    leaf-list mediaLocation {
+      type inet:uri;
+      description "URI of the media which includes the transfer protocol.
+
+      Examples:
+      sftp://companyA.com/datastore/fileName.xml
+      https://companyA.com/ManagedElement=1/Files=1/File=1";
+    }
+
+    leaf externalDataTypeSchema {
+      type inet:uri;
+      mandatory true;
+      description "URI of the schema to parse a type of external management data.
+      The detailed schema definition for the different types of external
+      management data is out of scope of this specification.";
+    }
+
+    list externalDataScope {
+      description "It describes the concrete scope which the external management
+        data is applicable.";
+      key idx;
+      leaf idx { type uint32; }
+      uses ExternalDataScopeGrp;
+    }
+  }
+
+  augment /subnet3gpp:SubNetwork {
+    list ExternalDataType {
+      description "This IOC specifies a type of external management data and
+      the associated meta data.
+
+      External management data is data which enrich 3GPP specified management
+      data and management data specified based on 3GPP defined management data
+      definition templates and frameworks. External management data can be
+      produced by data sources of different nature (e.g. sensors) with different
+      formats. Details see clause 6.4.1 in TS 28.537.
+
+      MnS producer may use this IOC to describe external management data.
+
+      For example, MnS producer publishes all external management data which
+      are available.
+
+      MnS consumer may use this IOC to configure, discover or request external
+      management data. For example, MnS consumer discovers and requests certain
+      types of external management data.
+
+      The ExternalDataType IOC can be name-contained by SubNetwork.
+
+      Attribute externalDataType defines the type of external management data.
+
+      Attribute mediaLocation indicates the address from which the described
+      external management data can be retrieved.
+
+      The value of mediaLocation, if present, can provide one or several
+      directories or the address where the described external management data
+      can be retrieved. The different directories can be used to group the
+      external management data, e.g., one directory per geographical area or
+      per time period. For example, the value of the mediaLocation attribute
+      can be given by
+
+      sftp://companyA.com/datastore/weatherforecasts/
+
+      In this case a potential file with name 'weatherforecastMunicht0.xml'
+      needs to be retrieved using 'sftp' from
+
+      sftp://companyA.com/datastore/weatherforecasts/weatherforecastMunicht0.xml.
+
+      Attribute externalDataTypeSchema indicates the URI where the MnS consumer
+      can get the schema to parse the external management data.
+
+      Attribute externalDataScope is used to describe the concrete scope (e.g.,
+      geographical areas) which the external management data is applicable.";
+
+      key id;
+      uses top3gpp:Top_Grp;
+      container attributes {
+        uses ExternalDataTypeGrp;
+      }
+    }
+  }
+}

original/Rel-20/28_series/_3gpp-common-mnsagent.yang

@@ -0,0 +1,92 @@
+module _3gpp-common-mnsagent {
+  yang-version 1.1;  
+  namespace urn:3gpp:sa5:_3gpp-common-mnsagent;
+  prefix "magent3gpp";
+  
+  import _3gpp-common-top { prefix top3gpp; }  
+  import _3gpp-common-yang-types { prefix types3gpp ; }
+  import _3gpp-common-managed-element { prefix me3gpp ; }
+  import _3gpp-common-subnetwork { prefix subnet3gpp ; }
+  import _3gpp-common-management-node { prefix mmgmtnode3gpp ; }
+
+  organization "3GPP SA5";
+  contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464";
+
+  description "Defines MnsAgent IOCs
+    Copyright 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, 
+    TTA, TTC). All rights reserved.";
+  reference "3GPP TS 28.623
+      Generic Network Resource Model (NRM)
+      Integration Reference Point (IRP);
+      Solution Set (SS) definitions
+      
+      3GPP TS 28.622
+      Generic Network Resource Model (NRM)
+      Integration Reference Point (IRP);
+      Information Service (IS)
+      
+      3GPP TS 28.620 
+      Umbrella Information Model (UIM)";
+
+  revision 2023-09-18 { reference CR-0271 ; } 
+  revision 2023-02-14 { reference "CR-0234"; }
+  
+  feature MnsAgentUnderManagedElement {
+    description "MnsAgent shall be contained under ManagedElement.";
+  }  
+
+  feature MnsAgentUnderSubNetwork {
+    description "MnsAgent shall be contained under SubNetwork.";
+  }  
+
+  feature MnsAgentUnderManagementNode {
+    description "MnsAgent shall be contained under ManagementNode.";
+  }  
+
+  grouping MnsAgentGrp {
+    description "Represents the MnsAgentGrp IOC.";
+    
+    leaf systemDN {
+      type types3gpp:DistinguishedName;
+      config false;
+      description "Distinguished Name (DN) of a IRPAgent or a MnSAgent.";
+    }
+  }
+  
+  grouping MnsAgentSubtree {
+    list MnsAgent {
+      description "The MnsAgent represents the MnS producers, incl. the 
+        supporting hardware and software, available for a certain management 
+        scope that is related to the object name-containing the MnS Agent.
+        The MnSAgent can be name-contained under an IOC as follows:
+        1) ManagementNode;
+        2) SubNetwork, if the SubNetwork does not contain a ManagementNode;
+        3) ManagedElement, if it is the root element.
+        In case the MnsAgent is name-contained under a ManagementNode, the 
+        management scope is the complete management scope of the 
+        ManagementNode or a subset thereof.
+        In case the MnsAgent is name-contained under a SubNetwork, the 
+        management scope is the complete SubNetwork or a subset thereof.
+        In case the MnsAgent is name-contained under a ManagedElement, the 
+        management scope is the complete ManagedElement or a subset thereof.";
+      key id;   
+      uses top3gpp:Top_Grp;
+      container attributes {
+        uses MnsAgentGrp;
+      }      
+    }
+  }
+
+  augment /me3gpp:ManagedElement {
+    if-feature MnsAgentUnderManagedElement;
+    uses MnsAgentSubtree;
+  }
+  augment /subnet3gpp:SubNetwork {
+    if-feature MnsAgentUnderSubNetwork;
+    uses MnsAgentSubtree;
+  }
+  augment /subnet3gpp:SubNetwork/mmgmtnode3gpp:ManagementNode {
+    if-feature MnsAgentUnderManagementNode;
+    uses MnsAgentSubtree;
+  }
+}

original/Rel-20/28_series/_3gpp-common-qmcjob.yang

@@ -0,0 +1,218 @@
+module _3gpp-common-qmcjob {
+  yang-version 1.1;
+  namespace "urn:3gpp:sa5:_3gpp-common-qmcjob";
+  prefix "qmc3gpp";
+
+  import _3gpp-common-top { prefix top3gpp; }
+  import _3gpp-common-subnetwork { prefix subnet3gpp; }
+  import _3gpp-common-yang-types { prefix types3gpp; }
+  import _3gpp-common-yang-extensions { prefix yext3gpp; }
+  import _3gpp-5g-common-yang-types { prefix types5g3gpp; }
+  import _3gpp-common-managed-element { prefix me3gpp; }
+  import _3gpp-common-trace { prefix trace3gpp; }
+  import ietf-inet-types { prefix inet; }
+
+  organization "3GPP SA5";
+  contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464";
+  description "Quality of Experience Measurement Collection Job handling
+    Copyright 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, 
+    TTA, TTC). All rights reserved.";
+  reference "3GPP TS 28.623
+      Generic Network Resource Model (NRM)
+      Integration Reference Point (IRP);
+      Solution Set (SS) definitions
+
+      3GPP TS 28.622
+      Generic Network Resource Model (NRM)
+      Integration Reference Point (IRP);
+      Information Service (IS)";
+
+  revision 2025-11-02 { reference CR-; }
+  revision 2025-02-06 { reference CR-0508; }
+  revision 2024-11-05 { reference CR-0480; }
+  revision 2024-04-04 { reference CR-0334; } 
+  revision 2023-09-18 { reference CR-0271 ; } 
+  revision 2023-02-14 { reference "CR-0234"; }
+  revision 2022-11-04 { reference "CR-0215"; }
+  revision 2022-08-17 { reference "CR-0185"; }
+  revision 2022-04-29 { reference "CR-0171"; }
+  revision 2022-03-22 { reference "draftCR"; }
+  revision 2022-01-06 { reference "CR-0142"; }
+    
+  grouping QMCJobGrp {
+    leaf serviceType {
+      description "Specifies an end user service type for QoE measurements.";
+      mandatory true;
+      type enumeration {
+      enum DASH;
+      enum MTSI;
+      enum VR;
+    }
+    }
+
+    list areaScope {
+      key "idx";
+      leaf idx { type uint32 ; }
+      description "It defines the area scope of QoE, which is specified
+       in clause 5.4 of TS 28.405.";   
+      uses types5g3gpp:AreaScopeGrp;      
+    }
+
+    leaf qoECollectionEntityAddress {
+      type inet:ip-address;
+      mandatory true;
+      description "Specifies the address to which the QMC records shall be
+        transferred.  Ipv4 or Ipv6 address(es) may be used.";
+    }
+
+    list pLMNTarget {
+      max-elements 1;
+      description "Defines the PLMN for which sessions shall be selected in 
+        the network request session in case of area based QMC when several 
+        PLMNs are supported in the RAN (this means that shared cells and not 
+        shared cells are allowed for the specified PLMN. Furthermore, several 
+        PLMNs can be used for not shared RAN cases as well as for shared RAN 
+        cases.). Only the sessions may be selected where the PLMN that the 
+        UE reports as selected PLMN is the same as the PLMN Target.";
+      uses types3gpp:PLMNId;
+      key "mcc mnc";
+    }
+
+    leaf qoETarget {
+      type string;
+      description "Specifies the target object of the QMC in case of 
+        signalling based QMC.  The qoETarget attribute shall be able 
+        to carry IMSI or SUPI.";
+      mandatory true;
+    }
+
+    leaf qoEReference {
+      type string;
+      mandatory true;
+      description "Identifies the QoE measurement collection job in the 
+        Managed Elements and in the measurement collection entity.  The QoE
+        reference shall be globally unique therefore it is composed as follows:
+        MCC+MNC+QMC ID, where the MCC and MNC are coming with the QMC 
+        activation request from the management system to identify one PLMN 
+        containing the management system, and QMC ID is a 3 byte Octet String. 
+        The QMC ID is generated by the management system or the operator.";
+    }
+
+    leaf jobId {
+      type string;
+      yext3gpp:inVariant;
+      description "The jobId attribute presents the job identifier of a 
+        QMCJob instance. The jobId can be used to associate  multiple QMCJob 
+        instances. For example, it is possible to configure the same jobId 
+        for multiple QMCJob instances required to produce the data 
+        (e.g. Streaming services and MTSI reports) for a specific network 
+        analysis.";
+    }
+    
+    list sliceScope {
+      description "Contains a list of S-NSSAIs (Single Network Slice Selection
+        Assistance Information).  A Network Slice end to end is identified by
+        S-NSSAI.";
+      key "sd sst";
+      uses types5g3gpp:SNssai;
+    }
+
+    leaf qMCConfigFile {
+      type string;
+      description "Provides a reference to a file including the parameters for 
+        configuration of application layer measurements, known as Container
+        for Application Layer Measurement Configuration.";
+      mandatory true;
+    }
+
+    list mDTAlignmentInformation {
+      key "idx";
+      min-elements 1;
+      max-elements 1;
+      description "This parameter indicates the MDT measurements with which
+        alignment of QoE measurement is required. This parameter is optional
+        and is valid for NR only.";
+
+      leaf idx { type uint32 ; }
+      uses trace3gpp:TraceReferenceGrp ;
+    }
+
+    
+    leaf-list availableRANqoEMetrics {
+      type enumeration {
+        enum APP_LAYER_BUFFER_LEVEL_LIST;
+        enum PLAYOUT_DELAY_FOR_MEDIA_STARTUP;
+      }
+      max-elements 2;
+      description "This parameter indicates available RAN visible QoE metrics
+      to the gNB. This parameter is optional and is valid for NR only.";
+    }
+
+    leaf mBSCommunicationServiceType {
+      type enumeration {
+        enum BROADCAST;
+        enum MULTICAST;
+      }
+      description "This attribute indicates which type of MBS communication 
+        service the QoE measurement configuration pertains to.";
+    }
+  }
+    
+   grouping QMCJobSubTree {
+   description "Helps with augmenting QMCJob into multple places.";
+    list QMCJob {
+      description "The QoE Measurement Collection provides capability for 
+       collecting QoE information from:
+       - UEs which are in the specified area in case of Management Based 
+       Activation or 
+       - an individual UE in case of Signalling Based Activation.
+       The QoE Measurement Collection enables collection of application layer 
+       measurements from the UE for specified end user service type. 
+       The supported service types are:
+       - Streaming services, see TS 26.247  
+       - MTSI services, see TS 26.114 
+       - VR services, see TS 26.118 
+       A QMCJob instance represents the job for collecting QoE measurements 
+       according to the job parameters. For details of the QoE measurement 
+       collection configuration parameters see clause 5 of TS 28.405. 
+       QMCJob instance can be name-contained by SubNetwork or ManagedElement. 
+       A QMC Job is activated by creating a QMCJob object instance in the 
+       producer. For details of Management Based Activation of QoE Measurement 
+       Collection see clause 4.5 and for details of Signalling Based 
+       Activation of QoE Measurement Collection see clause 4.6 of TS 28.405. 
+       The attribute  pLMNTarget is only relevant when 
+       Management Based Activation is used and the attribute qoETarget is 
+       only relevant when Signalling Based Activation is used. All other 
+       attributes are common for both Management Based Activation and 
+       Signalling Based Activation.
+
+       The areaScope attribute defines the area scope of QoE, which is 
+       specified in clause 5.4 of TS 28.405.
+
+       When a MnS consumer wishes to deactivate a QMC Job, the MnS consumer 
+       shall delete the corresponding QMCJob instance. 
+       NOTE:  If the reporting is ongoing, when a request to delete a QMCJob 
+       is received, the reporting does not end. The QMCJob instance is deleted, 
+       when the last reporting for the QMC Job expires.
+
+       The jobId attribute presents the job identifier of a QMCJob instance. 
+       jobId can be used to associate  multiple QMCJob instances. For example, 
+       it is possible to configure the same jobId value for multiple QMCJob 
+       instances required to produce the data (e.g. Streaming services and 
+       MTSI reports) for a specific network analysis.";
+      key id;
+      uses top3gpp:Top_Grp;
+      container attributes {
+        uses QMCJobGrp;
+      }
+    }
+  }
+  
+   augment "/subnet3gpp:SubNetwork" {
+        uses QMCJobSubTree;
+   }
+
+   augment "/me3gpp:ManagedElement" {
+        uses QMCJobSubTree;
+   }
+}

original/Rel-20/28_series/_3gpp-common-subnetwork.yang

@@ -0,0 +1,282 @@
+module _3gpp-common-subnetwork {
+  yang-version 1.1;
+  namespace "urn:3gpp:sa5:_3gpp-common-subnetwork";
+  prefix "subnet3gpp";
+    
+  import _3gpp-common-yang-types { prefix types3gpp; }
+  import _3gpp-common-yang-extensions { prefix yext3gpp ; }
+  import _3gpp-common-top { prefix top3gpp; }
+  import _3gpp-common-measurements { prefix meas3gpp; }
+  import _3gpp-common-subscription-control { prefix subscr3gpp; }
+  import _3gpp-common-fm { prefix fm3gpp; }
+  import _3gpp-common-trace { prefix trace3gpp; }
+  import ietf-yang-schema-mount { prefix yangmnt; }
+  import _3gpp-common-files { prefix files3gpp; }
+  import _3gpp-5gc-nrm-configurable5qiset { prefix fiveqi3gpp; }
+  import _3gpp-5gc-nrm-ecmconnectioninfo { prefix econn3gpp ; }
+  import _3gpp-nr-nrm-ecmappingrule { prefix ecmap3gpp ; }
+  import _3gpp-stm-nrm-stmfunction { prefix stm3gpp; }
+  import _3gpp-nr-nrm-mwab { prefix mwab3gpp; }
+
+  organization "3GPP SA5";
+  contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464";
+    
+  description "Defines basic SubNetwork which will be augmented by other IOCs
+    Copyright 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, 
+    TTA, TTC). All rights reserved.";
+  reference "3GPP TS 28.623
+      Generic Network Resource Model (NRM)
+      Integration Reference Point (IRP);
+      Solution Set (SS) definitions
+      
+      3GPP TS 28.622
+      Generic Network Resource Model (NRM)
+      Integration Reference Point (IRP);
+      Information Service (IS)
+      
+      3GPP TS 28.620 
+      Umbrella Information Model (UIM)";
+  
+  revision 2025-08-13 { reference CR-0561; } 
+  revision 2025-04-25 { reference "CR-0532 CR0541" ; } 
+  revision 2025-03-25 { reference "CR-0516 CR-0527"; } 
+  revision 2024-11-19 { reference "Add STM"; } 
+  revision 2024-01-30 { reference CR-1337 ; } 
+  revision 2024-01-30 { reference CR-0328 ; } 
+  revision 2023-11-14 { reference CR-0305 ; } 
+  revision 2023-09-18 { reference CR-0271 ; } 
+  revision 2023-08-10 { reference CR-0257;   }
+  revision 2023-04-26 { reference CR-0250; }
+  revision 2023-02-14 { reference CR-0234; }
+  revision 2022-09-30 { reference CR-0191 ; }
+  revision 2021-01-16 { reference "CR-0120"; }  
+  revision 2020-08-06 { reference "CR-0102"; }  
+  revision 2020-06-08 { reference "CR-0092"; }  
+  revision 2020-05-08 { reference "S5-203316"; }   
+  revision 2020-03-11 { reference "S5-201365, S5-201581, SP-200229"; }
+  revision 2020-02-24 { reference "S5-201365"; }
+  revision 2019-06-17 { reference "Initial revision"; }
+
+  feature ECMappingRuleUnderSubNetwork {
+    description "ECMappingRule shall be contained under SubNetwork.";
+  }
+
+  feature EcmConnectionInfoUnderSubNetwork {
+    description "The EcmConnectionInfo shall be contained under
+    Subnetwork";
+  }
+
+  feature Configurable5QISetUnderSubNetwork {
+    description "The Configurable5QISet shall be contained under
+    Subnetwork";
+  }
+
+  feature FilesUnderSubNetwork {
+    description "Files shall be contained under Subnetwork";
+  }
+
+  feature ExternalsUnderSubNetwork {
+    description "Classes representing external entities like EUtranFrequency, 
+      ExternalGNBCUCPFunction, ExternalENBFunction 
+      are contained under a Subnetwork list/class.";
+  }
+  
+  feature MeasurementsUnderSubNetwork {
+    description "The MeasurementSubtree shall be contained under SubNetwork";
+  }
+  
+  feature SubscriptionControlUnderSubNetwork {
+    description "The SubscriptionControlSubtree shall be contained under
+      SubNetwork";
+  }
+
+  feature SupportedNotificationsUnderSubNetwork {
+    description "The SupportedNotificationsSubtree shall be contained under
+      SubNetwork";
+  }
+
+  feature NotificationListUnderSubNetwork {
+    description "The NotificationList shall be contained under SubNetwork";
+  }
+  
+  feature FmUnderSubNetwork {
+    description "The FmSubtree shall be contained under SubNetwork";
+  }
+  
+  feature TraceUnderSubNetwork {
+    description "The TraceSubtree shall be contained under SubNetwork";
+  }
+  
+  feature DESManagementFunction {
+    description "Class representing Distributed SON or Domain-Centralized SON
+      Energy Saving feature. The DESManagementFunction shall be contained under
+      SubNetwork.";
+  }
+ 
+  feature DMROFunction {
+    description "Class representing D-SON function of MRO feature. The
+      DMROFunction shall be contained under SubNetwork.";
+  }
+  
+  feature DRACHOptimizationFunction {
+    description "Class representing D-SON function of RACH optimization feature.
+      The DRACHOptimizationFunction shall be contained under SubNetwork.";
+  }
+  
+  feature DPCIConfigurationFunction {
+    description "Class representing Distributed SON or Domain-Centralized SON
+      function of PCI configuration feature. The DPCIConfigurationFunction shall
+      be contained under SubNetwork.";
+  }
+  
+  feature CPCIConfigurationFunction {
+    description "Class representing Cross Domain-Centralized SON function of PCI
+      configuration feature. The CPCIConfigurationFunction shall be contained
+      under SubNetwork.";
+  }
+  
+  feature CESManagementFunction {
+    description "Class representing Cross Domain-Centralized SON Energy Saving
+      feature. The CESManagementFunction shall be contained under SubNetwork.";
+  }
+
+  feature StmCtrlUnderManagedSubNetwork {
+    description "The StmCtrlSubtree shall be contained under SubNetwork";
+  }  
+  
+  feature MWABUnderSubNetwork {
+    description "The MWAB shall be contained under SubNetwork";
+  }
+  
+  grouping Domain_Grp {
+    description "A domain is a partition of instances of managed entities 
+      such that : 
+      -  the group represents a topological structure which describes the 
+      potential for connectivity
+      -  Subject to common administration
+      -  With common characteristics";
+    
+    leaf dnPrefix {
+      type types3gpp:DistinguishedName;
+      yext3gpp:inVariant;      
+      reference "Annex C of 32.300 ";
+    }
+    
+    leaf userLabel {
+        type string;
+        description "A user-friendly (and user assignable) name of this object.";
+    }
+    
+    leaf userDefinedNetworkType {
+      type string;
+      description "Textual information indicating network type, e.g. 'UTRAN'.";
+    }    
+  }
+
+  grouping SubNetworkGrp {
+    uses Domain_Grp;
+      
+    leaf-list setOfMcc {
+      description "Set of Mobile Country Code (MCC). 
+        The MCC uniquely identifies the country of domicile 
+        of the mobile subscriber. MCC is part of the IMSI (3GPP TS 23.003)
+
+        This list contains all the MCC values in subordinate object 
+        instances to this SubNetwork instance.
+
+        See clause 2.3 of 3GPP TS 23.003 for MCC allocation principles.
+
+        It shall be supported if there is more than one value in setOfMcc 
+        of the SubNetwork. Otherwise the support is optional.";            
+      type types3gpp:Mcc;
+    }
+
+    leaf priorityLabel {
+      mandatory true;
+      type uint32;
+    }
+    
+    uses meas3gpp:SupportedPerfMetricGroupGrp;
+
+    leaf-list supportedTraceMetrics {
+      type string;
+      config false;
+      description "List of trace metrics. When this attribute is contained in 
+        a managed object it defines the trace metrics supported for this 
+        object and all descendant objects.
+
+        Trace metrics include trace messages, MDT measurements 
+        (Immediate MDT, Logged MDT, Logged MBSFN MDT), RLF and RCEF reports, 
+        see TS 32.422. Trace metrics are identified with their metric 
+        identifier. The metric identifier is constructed as defined 
+        in clause 10 of TS 32.422.";
+    }
+  }    
+
+  list SubNetwork {
+    key id;
+    description "Represents a set of managed entities
+      Contained ManagedElements and SubNetworks shall be connected via 
+      YANG Schema-mount.";
+
+    uses top3gpp:Top_Grp;
+    container attributes {    
+      uses SubNetworkGrp;
+    }
+        
+    uses meas3gpp:MeasurementSubtree {
+      if-feature MeasurementsUnderSubNetwork;
+    }
+
+    uses subscr3gpp:SubscriptionControlSubtree {
+      if-feature SubscriptionControlUnderSubNetwork;
+    }
+
+    uses subscr3gpp:SupportedNotificationsSubtree {
+      if-feature SupportedNotificationsUnderSubNetwork;
+    }
+
+    uses subscr3gpp:NotificationListSubtree {
+      if-feature NotificationListUnderSubNetwork;
+    }
+
+    uses fm3gpp:FmSubtree {
+      if-feature FmUnderSubNetwork;
+    }
+    
+    uses trace3gpp:TraceSubtree {
+      if-feature TraceUnderSubNetwork;
+    }
+
+    uses files3gpp:FilesSubtree {
+      if-feature FilesUnderSubNetwork;
+    }  
+
+    uses fiveqi3gpp:Configurable5QISetSubtree {
+      if-feature Configurable5QISetUnderSubNetwork;
+    }
+
+    uses econn3gpp:EcmConnectionInfoSubtree {
+      if-feature EcmConnectionInfoUnderSubNetwork;
+    }
+
+    uses ecmap3gpp:NRECMappingRuleSubtree {
+      if-feature EcmConnectionInfoUnderSubNetwork;
+    }
+
+    uses stm3gpp:StmCtrlSubTree {
+      if-feature StmCtrlUnderManagedSubNetwork ;
+    }    
+
+    
+    uses mwab3gpp:MWABSubTree {
+      if-feature MWABUnderSubNetwork ;
+    }
+
+    yangmnt:mount-point children-of-SubNetwork {
+      description "Mountpoint for contained ManagedElements and SubNetworks";
+      reference "RFC8528 YANG Schema Mount";
+    }
+    // augment external parts here
+  }
+}

original/Rel-20/28_series/_3gpp-common-top.yang

@@ -0,0 +1,39 @@
+module _3gpp-common-top {
+  yang-version 1.1;
+  
+  namespace urn:3gpp:sa5:_3gpp-common-top;
+  prefix top3gpp;
+  
+  organization "3gpp SA5";
+  description "The model defines a YANG mapping of the top level 
+    information classes used for management of 5G networks and 
+    network slicing.
+    Copyright 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, 
+    TTA, TTC). All rights reserved.";
+  reference 
+    "3GPP TS 28.622 
+    Generic Network Resource Model (NRM)
+    Integration Reference Point (IRP);
+    Information Service (IS)
+    
+    3GPP TS 28.620 
+    Umbrella Information Model (UIM)";
+
+  revision 2023-09-18 { reference CR-0271 ; } 
+  revision 2019-06-17 {
+    description "Initial revision";
+  }
+  
+  grouping Top_Grp {
+    description "Abstract class supplying a naming attribute";
+    reference "3GPP TS 28.620";
+
+    leaf id {
+      type string;
+      description "Key leaf (namingAttribute) for a class/list.
+        Should be used as a key leaf for lists representing 
+        stage 2 classes.";
+      reference "3GPP TS 32.300 Name convention for managed objects";    
+    }    
+  }  
+}

original/Rel-20/28_series/_3gpp-common-trace.yang

@@ -0,0 +1,2139 @@
+module _3gpp-common-trace {
+  yang-version 1.1;
+  namespace "urn:3gpp:sa5:_3gpp-common-trace";
+  prefix "trace3gpp";
+
+  import _3gpp-common-top { prefix top3gpp; }
+  import _3gpp-common-yang-extensions {prefix yext3gpp; }
+  import ietf-inet-types { prefix inet; }
+  import _3gpp-common-files { prefix files3gpp; }
+  import _3gpp-common-yang-types { prefix types3gpp; }
+  import _3gpp-5g-common-yang-types {prefix types5g3gpp; }
+
+  organization "3GPP SA5";
+  contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464";
+
+  description "Trace handling
+    Copyright 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI,
+    TTA, TTC). All rights reserved.";
+  reference "3GPP TS 28.623
+      Generic Network Resource Model (NRM)
+      Integration Reference Point (IRP);
+      Solution Set (SS) definitions
+      3GPP TS 28.622
+      Generic Network Resource Model (NRM)
+      Integration Reference Point (IRP);
+      Information Service (IS)" ;
+
+  revision 2025-11-07 { reference "CR-0553" ; }
+  revision 2025-10-07 { reference "CR-0573" ; }    // common for rel-19, rel-20
+  revision 2025-10-01 { reference "CR-0578" ; }
+  revision 2025-08-07 { reference "CR-0551 CR-0552 CR-0562" ; }
+  revision 2025-05-07 { reference "CR-0532 CR-0536 CR-0540" ; }
+  revision 2025-02-07 { reference "CR-0504" ; }
+  revision 2025-02-05 { reference "CR-0461" ; }
+  revision 2024-11-25 { reference "CR-0492" ; }
+  revision 2024-11-07 { reference "CR-0480"; }
+  revision 2024-10-01 { reference "CR-0457"; }
+  revision 2024-08-13 { reference "CR-0387 CR-0377"; }
+  revision 2024-08-07 { reference "CR-0405 CR-0421 CR-0379"; }
+  revision 2024-05-12 { reference "CR-0401"; }
+  revision 2024-05-06 { reference CR-0359; }
+  revision 2024-04-06 { reference "CR-0342"; }
+  revision 2024-01-29 { reference "CR-0316"; }
+  revision 2023-11-06 { reference "CR-0290 CR-0294"; }
+  revision 2023-11-03 { reference CR-0302 ; }
+  revision 2023-09-18 { reference CR-0271 ; }
+  revision 2023-08-10 { reference CR-0261; }
+  revision 2023-04-26 { reference CR-0250; }
+  revision 2023-02-18 { reference "CR-0234"; }
+  revision 2023-02-16 { reference "CR-0233"; }
+  revision 2022-09-30 { reference CR-0191 ; }
+  revision 2022-04-27 { reference "CR-0159"; }
+  revision 2021-10-18 { reference "CR-0139"; }
+  revision 2021-07-22 { reference "CR-0137"; }
+  revision 2021-01-25 { reference "CR-0122"; }
+  revision 2020-11-16 { reference "CR-0117"; }
+  revision 2020-08-06 { reference "CR-0102"; }
+
+  feature FilesUnderTraceJob {
+    description "Files shall be contained under TraceJob";
+  }
+
+  grouping FreqInfoGrp {
+    description "Represents the FreqInfo dataType.
+      This <<dataType>> defines the RF reference frequency and the frequency
+      operating bands used in a cell for a given direction (UL or DL) in FDD
+      or for both UL and DL directions in TDD";
+
+    leaf arfcn {
+      type uint32 {
+        range 0..3279165;
+      }
+      mandatory true;
+      description "RF Reference Frequency as defined in TS 38.104,
+        clause 5.4.2.1. The frequency provided identifies the absolute
+        frequency position of the reference resource block (Common RB 0)
+        of the carrier. Its lowest subcarrier is also known as Point A.";
+    }
+
+    leaf-list freqBands {
+      type uint32 {
+        range 1..1024;
+      }
+      min-elements 1;
+      description "List of NR frequency operating bands. Primary NR
+        Operating Band as defined in TS 38.104, clause 5.4.2.3.
+        The value 1 corresponds to n1, value 2 corresponds to NR operating
+        band n2, etc.";
+    }
+  }
+
+  grouping AreaConfigGrp {
+    description "Represents the AreaConfig dataType.
+      This <<dataType>> defines the area for which measurement logging should
+      be performed. It is described by a list of cells and a list of
+      frequencies.";
+
+    list freqInfo {
+      key arfcn;
+      min-elements 1;
+      max-elements 32;
+      description "It specifies the carrier frequency and bands used in
+        a cell.";
+
+      uses FreqInfoGrp ;
+    }
+
+    leaf-list pciList {
+      type uint32 {
+        range 0..1007;
+      }
+      min-elements 1;
+      max-elements 32;
+      description "List of neighbour cells subject for MDT scope.";
+    }
+  }
+
+  grouping ExcessPacketDelayThresholdsGrp {
+    description "Represents the ExcessPacketDelayThresholds dataType.
+      This <<dataType>> defines a excess packet delay threshold information
+      to enable the calculation of the PDCP Excess Packet Delay in the
+      uplink in case of M6 uplink measurements are requested. The excess
+      packet delay threshold information is specified with the 5QI value
+      and excess packet delay threshold value.";
+
+    leaf fiveQIValue {
+      type uint8;
+      mandatory true;
+      description "It indicates 5QI value.";
+    }
+
+    leaf excessPacketDelayThresholdValue {
+      type decimal64 {
+        fraction-digits 2;
+        range 0.25|0.5|1|2|4|5|10|20|30|40|50|60|70|80|90|100|150|300|500 ;
+      }
+      mandatory true;
+      units milliseconds;
+      description "Value of excess packet delay threshold
+        for M6 UL measurement in milliseconds.";
+    }
+  }
+
+  grouping TraceReferenceGrp {
+    description "Represents the TraceReference dataType.
+      This <<dataType>> defines a globally unique identifier, which uniquely
+      identifies the Trace Session that is created by the TraceJob. It is
+      composed of the MCC, MNC (resulting in PLMN identifier) and the
+      trace identifier.";
+
+      uses types3gpp:PLMNId;  // mcc+mnc
+
+      leaf traceId {
+        type string {
+          pattern "[0-9a-fA-F]{6}";
+        }
+        mandatory true;
+        description "An identifier, which identifies the Trace
+          (together with MCC and MNC). This is a 3 byte Octet String,
+          expressed in hexadecimal form e.g., '1a7b3d').";
+      }
+  }
+
+  grouping MbsfnAreaGrp {
+    description "Represents the MbsfnArea dataType.
+      This <<dataType>> defines a MBSFN area. It is composed of the MBSFN Area
+      identifier and the carrier frequency (EARFCN).";
+
+    leaf mbsfnAreaId {
+      type uint32 {
+        range 1..max;
+      }
+      mandatory true;
+      description "MBSFN Area Identifier";
+    }
+
+    leaf earfcn{
+      type uint32 {
+        range 1..max;
+      }
+      mandatory true;
+      description "Carrier Frequency";
+    }
+  }
+
+  grouping TraceConfigGrp {
+
+    description "Defines the configuration parameters of TraceJob
+      which are specific for Trace or combined Trace and Immediate MDT.
+      The attribute listOfNeTypes specifies the network elements to be
+      traced. The optional attribute listOfInterfaces allows to specify
+      the individual interfaces of the network elements to be recorded.
+      The attribute traceDepth allows to configure the level of detail
+      of the information which shall be recorded.  For trace the reporting
+      is event based, where the triggering event is configured with
+      attribute triggeringEvents. For each triggering event the first and
+      last message (start/stop triggering event) to record  are specified.";
+
+    list listOfInterfaces {
+      key idx;
+
+      description "Specifies the interfaces that need to be traced in the given
+        ManagedEntityFunction.The attribute is applicable only for Trace. In
+        case this attribute is not used, it carries a null semantic.";
+      reference "Clause 5.5 of 3GPP TS 32.422 for additional details on the
+        allowed values.";
+
+      leaf idx { type uint32 ; }
+
+      leaf-list MSCServerInterfaces {
+        type enumeration {
+          enum A ;
+          enum Iu-CS ;
+          enum Mc ;
+          enum MAP-G ;
+          enum MAP-B ;
+          enum MAP-E ;
+          enum MAP-F ;
+          enum MAP-D ;
+          enum MAP-C ;
+          enum CAP ;
+        }
+      }
+      leaf-list MGWInterfaces {
+        type enumeration {
+          enum Mc ;
+          enum Nb-UP ;
+          enum Iu-UP ;
+        }
+      }
+      leaf-list RNCInterfaces {
+        type enumeration {
+          enum Iu-CS ;
+          enum Iu-PS ;
+          enum Iur ;
+          enum Iub ;
+          enum Uu ;
+        }
+      }
+      leaf-list SGSNInterfaces {
+        type enumeration {
+          enum Gb ;
+          enum Iu-PS ;
+          enum Gn ;
+          enum MAP-Gr ;
+          enum MAP-Gd ;
+          enum MAP-Gf ;
+          enum Ge ;
+          enum Gs ;
+          enum S6d ;
+          enum S4 ;
+          enum S3 ;
+          enum S13 ;
+        }
+      }
+      leaf-list GGSNInterfaces {
+        type enumeration {
+          enum Gn ;
+          enum Gi ;
+          enum Gmb ;
+        }
+      }
+      leaf-list S-CSCFInterfaces {
+        type enumeration {
+          enum Mw ;
+          enum Mg ;
+          enum Mr ;
+          enum Mi ;
+        }
+      }
+      leaf-list P-CSCFInterfaces {
+        type enumeration {
+          enum Gm ;
+          enum Mw ;
+        }
+      }
+      leaf-list I-CSCFInterfaces {
+        type enumeration {
+          enum Cx ;
+          enum Dx ;
+          enum Mg ;
+          enum Mw ;
+        }
+      }
+      leaf-list MRFCInterfaces {
+        type enumeration {
+          enum Mp ;
+          enum Mr ;
+        }
+      }
+      leaf-list MGCFInterfaces {
+        type enumeration {
+          enum Mg ;
+          enum Mj ;
+          enum Mn ;
+        }
+      }
+      leaf-list IBCFInterfaces {
+        type enumeration {
+          enum Ix ;
+          enum Mx ;
+        }
+      }
+      leaf-list E-CSCFInterfaces {
+        type enumeration {
+          enum Mw ;
+          enum Ml ;
+          enum Mm ;
+          enum Mi-Mg ;
+        }
+      }
+      leaf-list BGCFInterfaces {
+        type enumeration {
+          enum Mi ;
+          enum Mj ;
+          enum Mk ;
+        }
+      }
+      leaf-list ASInterfaces {
+        type enumeration {
+          enum Dh ;
+          enum Sh ;
+          enum ISC ;
+          enum Ut ;
+        }
+      }
+      leaf-list HSSInterfaces {
+        type enumeration {
+          enum MAP-C ;
+          enum MAP-D ;
+          enum Gc ;
+          enum Gr ;
+          enum Cx ;
+          enum S6d ;
+          enum S6a ;
+          enum Sh ;
+        }
+      }
+      leaf-list EIRInterfaces {
+        type enumeration {
+          enum MAP-F ;
+          enum S13 ;
+          enum MAP-Gf ;
+        }
+      }
+      leaf-list BM-SCInterfaces {
+        type enumeration {
+          enum Gmb ;
+        }
+      }
+      leaf-list MMEInterfaces {
+        type enumeration {
+          enum S1-MME ;
+          enum S3 ;
+          enum S6a ;
+          enum S10 ;
+          enum S11 ;
+          enum S13 ;
+        }
+      }
+      leaf-list SGWInterfaces {
+        type enumeration {
+          enum S4 ;
+          enum S5 ;
+          enum S8 ;
+          enum S11 ;
+          enum Gxc ;
+        }
+      }
+      leaf-list PDN_GWInterfaces {
+        type enumeration {
+          enum S2a ;
+          enum S2b ;
+          enum S2c ;
+          enum S5 ;
+          enum S6b ;
+          enum Gx ;
+          enum S8 ;
+          enum SGi ;
+        }
+      }
+      leaf-list eNBInterfaces {
+        type enumeration {
+          enum S1-MME ;
+          enum X2 ;
+        }
+      }
+      leaf-list en-gNBInterfaces {
+        type enumeration {
+          enum S1-MME ;
+          enum X2 ;
+          enum Uu ;
+          enum F1-C ;
+          enum E1 ;
+        }
+      }
+      leaf-list AMFInterfaces {
+        type enumeration {
+          enum N1 ;
+          enum N2 ;
+          enum N8 ;
+          enum N11 ;
+          enum N12 ;
+          enum N14 ;
+          enum N15 ;
+          enum N20 ;
+          enum N22 ;
+          enum N26 ;
+        }
+      }
+      leaf-list AUSFInterfaces {
+        type enumeration {
+          enum N12 ;
+          enum N13 ;
+        }
+      }
+      leaf-list NEFInterfaces {
+        type enumeration {
+          enum N29 ;
+          enum N30 ;
+          enum N33 ;
+        }
+      }
+      leaf-list NRFInterfaces {
+        type enumeration {
+          enum N27 ;
+        }
+      }
+      leaf-list NSSFInterfaces {
+        type enumeration {
+          enum N22 ;
+          enum N31 ;
+        }
+      }
+      leaf-list PCFInterfaces {
+        type enumeration {
+          enum N5 ;
+          enum N7 ;
+          enum N15 ;
+        }
+      }
+      leaf-list SMFInterfaces {
+        type enumeration {
+          enum N4 ;
+          enum N7 ;
+          enum N10 ;
+          enum N11 ;
+          enum S5-C ;
+          enum N38 ;
+          enum N16 ;
+          enum N16a ;
+        }
+      }
+      leaf-list SMSFInterfaces {
+        type enumeration {
+          enum N20 ;
+          enum N21 ;
+        }
+      }
+      leaf-list UDMInterfaces {
+        type enumeration {
+          enum N8 ;
+          enum N10 ;
+          enum N13 ;
+          enum N21 ;
+        }
+      }
+      leaf-list UPFInterfaces {
+        type enumeration {
+          enum N4 ;
+        }
+      }
+      leaf-list ng-eNBInterfaces {
+        type enumeration {
+          enum NG-C ;
+          enum Xn-C ;
+          enum Uu ;
+        }
+      }
+      leaf-list gNB-CU-CPInterfaces {
+        type enumeration {
+          enum NG-C ;
+          enum Xn-C ;
+          enum Uu ;
+          enum F1-C ;
+          enum E1 ;
+          enum X2-C ;
+        }
+      }
+      leaf-list gNB-CU-UPInterfaces {
+        type enumeration {
+          enum E1 ;
+        }
+      }
+      leaf-list gNB-DUInterfaces {
+        type enumeration {
+          enum F1-C ;
+      }
+    }
+    }
+
+    leaf-list listOfNeTypes {
+      type enumeration {
+        enum MSC_SERVER;
+        enum SGSN;
+        enum MGW;
+        enum GGSN;
+        enum RNC;
+        enum BM_SC;
+        enum MME;
+        enum SGW;
+        enum PGW;
+        enum ENB;
+        enum EN_GNB;
+        enum GNB_CU_CP;
+        enum GNB_CU_UP;
+        enum GNB_DU;
+      }
+      description "Specifies the network element types where the trace should
+        be activated. The attribute is applicable only for Trace with
+        Signalling Based Trace activation.";
+      reference "Clause 5.4 of 3GPP TS 32.422. ";
+    }
+
+    leaf traceDepth {
+      when '../../jobType = "TRACE_ONLY"'
+        +  ' or ../../jobType = "IMMEDIATE_MDT_AND_TRACE"';
+      type enumeration  {
+        enum MINIMUM;
+        enum MEDIUM;
+        enum MAXIMUM;
+        enum VENDORMINIMUM;
+        enum VENDORMEDIUM;
+        enum VENDORMAXIMUM;
+      }
+      default MAXIMUM;
+      description "It specifies the trace depth. The attribute is applicable
+      only for Trace.";
+      reference "Clause 5.3 of 3GPP TS 32.422.";
+    }
+
+    list triggeringEvents {
+      key idx;
+      description "It specifies the triggering event parameter of the trace
+        session. The attribute is applicable only for Trace.";
+      reference "Clause 5.1 of 3GPP TS 32.422";
+      leaf idx { type uint32; }
+      max-elements 1;
+
+      leaf-list MSC_SERVER {
+        type enumeration {
+          enum MO_MT_CALLS;
+          enum MO_MT_SMS;
+          enum LU_IMSIattach_IMSIdetach;
+          enum SS;
+        }
+      }
+
+      leaf-list SGSN {
+        type enumeration {
+          enum PDPcontext;
+          enum MO_MT_SMS;
+          enum RAU_GPRSattach_GPRSdetach;
+          enum MBMScontext;
+        }
+      }
+
+
+      leaf-list MGW {
+        type enumeration {
+          enum CONTEXT;
+        }
+      }
+
+      leaf-list GGSN {
+        type enumeration {
+          enum PDPcontext;
+          enum MBMScontext;
+        }
+      }
+
+      leaf-list IMS {
+        type enumeration {
+          enum SIPsession_StandaloenTransaction;
+        }
+      }
+
+      leaf-list BM_SC {
+        type enumeration {
+          enum MBMSactivation;
+        }
+      }
+
+      leaf-list MME {
+        type enumeration {
+          enum UEinitiatedPDNconnectivityRequest;
+          enum ServiceRequest;
+          enum InitialAttach_TAU_Detach;
+          enum UEInitiatedPDNdisconnection;
+          enum BearerActivationModificationDeletion;
+          enum Handover;
+        }
+      }
+
+
+      leaf-list SGW {
+        type enumeration {
+          enum PDNconnectionCreation;
+          enum PDNconnectionTermination;
+          enum BearerActivationModificationDeletion;
+        }
+      }
+
+      leaf-list PGW {
+        type enumeration {
+          enum PDNconnectionCreation;
+          enum PDNconnectionTermination;
+          enum BearerActivationModificationDeletion;
+        }
+      }
+
+      leaf-list AMF {
+        type enumeration {
+          enum Registration;
+          enum ServiceRequest;
+          enum Handover;
+          enum UEderegistration;
+          enum NetworkDeregistration;
+          enum UEMobilityFromEPC;
+          enum UEMobilityToEPC;
+          enum CovergedChargingService;
+        }
+      }
+
+      leaf-list SMF {
+        type enumeration {
+          enum PDUsessionEstablishment;
+          enum PDUsessionModification;
+          enum PDUsessionRelease;
+          enum PDUsessionUPactivationDeactivation;
+          enum MobilityBtw3gppAndN3gppTo5GC;
+          enum MobilityFromEpc;
+          enum MobilityBtwISMForVSMF;
+          enum CovergedChargingService;
+          enum OfflineOnlyCharging;
+        }
+      }
+
+      leaf-list PCF {
+        type enumeration {
+          enum AMpolicy;
+          enum SMpolicy;
+          enum Authorization;
+          enum BDTpolicy;
+          enum SpendingLimitControl;
+        }
+      }
+
+      leaf-list UPF {
+        type enumeration {
+          enum N4Session;
+        }
+      }
+
+      leaf-list AUSF {
+        type enumeration {
+          enum UEauthentication;
+        }
+      }
+
+      leaf-list NEF {
+        type enumeration {
+          enum EventExposure;
+          enum PFDmanagement;
+          enum ParameterProvisiong;
+          enum Trigger;
+        }
+      }
+
+      leaf-list NRF {
+        type enumeration {
+          enum NFmanagement;
+          enum NFdiscovery;
+        }
+      }
+
+      leaf-list NSSF {
+        type enumeration {
+          enum NSSelection;
+          enum NSSAI;
+        }
+      }
+
+      leaf-list SMSF {
+        type enumeration {
+          enum SMService;
+        }
+      }
+
+      leaf-list UDM {
+        type enumeration {
+          enum UEcontext;
+          enum SubscriberData;
+          enum UEauthentication;
+          enum EventExposure;
+        }
+      }
+    }
+  }
+
+  grouping ImmediateMdtConfigGrp {
+   description "Represents the ImmediateMdtConfig dataType.
+      This <<dataType>> defines the configuration parameters of
+      IOC TraceJob which are specific for Immediate MDT or combine
+      Trace and Immediate MDT.
+
+      The optional attribute positioningMethod allows to specify
+      the positioning methods to use.
+
+      The following attributes are conditional available based on the
+      measurements configured in listOfMeasurements:
+        -reportInterval (conditional for M1 in LTE or NR and M1/M2 in UMTS),
+        -reportAmount (conditional for M1/M2 in UMTS),
+        -reportAmountM1LTE (conditional for M1 in LTE),
+        -reportAmountM4LTE (conditional for M4 in LTE),
+        -reportAmountM5LTE (conditional for M5 in LTE),
+        -reportAmountM6LTE (conditional for M6 in LTE),
+        -reportAmountM7LTE (conditional for M7 in LTE),
+        -reportAmountM1NR (conditional for M1 in NR),
+        -reportAmountM4NR (conditional for M4 in NR),
+        -reportAmountM5NR (conditional for M5 in NR),
+        -reportAmountM6NR (conditional for M6 in NR),
+        -reportAmountM7NR (conditional for M7 in NR),
+        -reportingTrigger (conditional for M1 in LTE or NR and M1/M2 in UMTS),
+        -eventThreshold (conditional for A2 event reporting or A2 event
+          triggered periodic reporting),
+        -collectionPeriodRRMNR (conditional for M4 and M5 in NR),
+        -collectionPeriodM6NR (conditional for M6 in NR),
+        -collectionPeriodM7NR (conditional for M7 in NR),
+        -collectionPeriodRRMLTE (conditional for M3 in LTE),
+        -measurementPeriodLTE (conditional for M4 and M5 in LTE),
+        -collectionPeriodM6LTE (conditional for M6 in LTE),
+        -collectionPeriodM7LTE (conditional for M7 in LTE),
+        -collectionPeriodRRMUMTS (conditional for M4 and M5 in UMTS),
+        -measurementPeriodUMTS (conditional for M6 and M7 in UMTS),
+        -measurementQuantity (conditional for 1F event reporting),
+        -beamLevelMeasurement (conditional for M1 in NR),
+        -excessPacketDelayThresholds (conditional for M6 UL measurement in NR).
+
+       For immediate MDT, the measurement reporting is dependent on the
+       configured measurements:
+
+        - For measurement M1 in LTE or NR, it is possible to select between
+        periodical, event triggered, event triggered periodic reporting or
+        reporting according to all configured RRM event triggers. For M1 and M2
+        measurement in UMTS, it is possible to select between periodical, event
+        triggered reporting or reporting according to all configured RRM event
+        triggers. Parameter reportingTrigger determines which of the reporting
+        methods is selected and in case of event triggered or event-triggered
+        periodic, which is the decisive event type. For periodical reporting,
+        parameters reportInterval and reportAmount determine the interval between
+        two successive reports and the number of reports. This means the
+        periodical reporting terminates after reportAmount reports have been
+        sent as long as reportAmount is configured with a value different from
+        infinity. For event-triggered periodic reporting, these two parameters
+        apply in addition to parameter eventThreshold which determines the
+        threshold of the event. In this case up to reportAmount reports are
+        sent with a periodicity of reportInterval after the entering condition
+        is fulfilled. The reporting is stopped, if the leaving condition is
+        fulfulled and is restarted if the configured event reoccurs. For event
+        based reporting, there is only one report sent after the event occurs.
+        The parameters to configure are reportingTrigger and eventThreshold.
+        In case of UMTS and 1f event reporting, additionally parameter
+        measurementQuantity is necessary in order to determine for which
+        measurement(s) the event threshold is applicable.  Parameter
+        beamLevelMeasurement determines whether beam level measurements shall
+        be included in case of NR.
+
+        - For measurement M2 in LTE or NR, reporting is according to RRM
+        configuration, see TS 38.321, TS 36.321 and TS 38.331, TS 36.331.
+
+        - For measurement M4 in UMTS, reporting is either according to RRM
+        configuration, see TS 25.321 and TS 25.331 or periodic or event
+        triggered periodic using parameter collectionPeriodRRMUMTS and
+        eventThresholdUphUMTS.
+
+        - For measurement M3 in UMTS, the reporting is done upon
+        availability, see TS 37.320.
+
+        - For measurements M4, M5, M6 and M7 in NR, for measurements
+        M3, M4, M5, M6 and M7 in LTE and for measurements M5, M6 and M7
+        in UMTS periodical reporting is applied. The configurable parameter
+        is the interval between two measurements (collectionPeriodRRMNR,
+        collectionPeriodM6NR, collectionPeriodM7NR, collectionPeriodRRMLTE,
+        measurementPeriodLte, collectionPeriodM6LTE, collectionPeriodM7LTE,
+        collectionPeriodRRMUMTS, measurementPeriodUMTS) and the number of
+        reports (reportAmountM4NR, reportAmountM5NR, reportAmountM6NR,
+        reportAmountM7NR, reportAmountM4LTE, reportAmountM5LTE,
+        reportAmountM6LTE,reportAmountM7LTE).  If no collection period
+        is configured for M5 in UMTS, all available measurements are
+        logged according to RRM configuration.
+
+        - Measurements M8 and M9 in NR or LTE are reported according to
+        configured M1 and/or M6 related UE measurement reporting.
+
+        ";
+
+    leaf listOfMeasurements {
+      when '../../../jobType = "IMMEDIATE_MDT_ONLY"'
+        +  ' or ../../../jobType = "IMMEDIATE_MDT_AND_TRACE"'
+        +  ' or ../../../jobType = "IMMEDIATE_MDT_AND_5GC_UE_LEVEL_MEASUREMENTS"'
+        +  ' or ../../../jobType = 
+        "TRACE_AND_IMMEDIATE_MDT_AND_5GC_UE_LEVEL_MEASUREMENTS"'
+        +  ' or ../../../jobType = "IMMEDIATE_MDT_AND_LOGGED_MDT"';
+      type enumeration {
+        enum M1;
+        enum M2;
+        enum M3;
+        enum M4;
+        enum M5;
+        enum M6_DL;
+        enum M6_UL;
+        enum M7_DL;
+        enum M7_UL;
+        enum M1_EVENT_TRIGGERED;
+        enum M6;
+        enum M7;
+        enum M8;
+        enum M9;
+      }
+      description "It specifies the UE measurements that shall be
+        collected in an Immediate MDT job. The attribute is
+        applicable only for Immediate MDT.";
+      reference "Clause 5.10.3 of 3GPP TS 32.422.";
+    }
+
+   leaf reportingTrigger {
+      when '../../../jobType = "IMMEDIATE_MDT_ONLY"'
+        +  ' or ../../../jobType = "IMMEDIATE_MDT_AND_TRACE"'
+        +  ' or ../../../jobType = "IMMEDIATE_MDT_AND_5GC_UE_LEVEL_MEASUREMENTS"'
+        +  ' or ../../../jobType = 
+        "TRACE_AND_IMMEDIATE_MDT_AND_5GC_UE_LEVEL_MEASUREMENTS"'
+        +  ' or ../../../jobType = "IMMEDIATE_MDT_AND_LOGGED_MDT"';
+      type enumeration {
+        enum PERIODICAL;
+        enum A2_FOR_LTE;
+        enum 1F_FOR_UMTS;
+        enum 1I_FOR_UMTS_MCPS_TDD;
+        enum A2_TRIGGERED_PERIODIC_FOR_LTE;
+        enum ALL_CONFIGURED_RRM_FOR_LTE;
+        enum ALL_CONFIGURED_RRM_FOR_UMTS;
+      }
+      description "It specifies whether periodic or event based measurements
+        should be collected.
+        The attribute is applicable only for Immediate MDT and when the
+        listOfMeasurements is configured for M1 (for both UMTS and LTE)
+        or M2 (only for UMTS).";
+      reference "Clause 5.10.4 of 3GPP TS 32.422.";
+    }
+
+   leaf reportInterval {
+      when '../../../jobType = "IMMEDIATE_MDT_ONLY"'
+        +  ' or ../../../jobType = "IMMEDIATE_MDT_AND_TRACE"'
+        +  ' or ../../../jobType = "IMMEDIATE_MDT_AND_5GC_UE_LEVEL_MEASUREMENTS"'
+        +  ' or ../../../jobType = 
+        "TRACE_AND_IMMEDIATE_MDT_AND_5GC_UE_LEVEL_MEASUREMENTS"'
+        +  ' or ../../../jobType = "IMMEDIATE_MDT_AND_LOGGED_MDT"'
+        +  ' and ../reportingTrigger = "PERIODICAL"';
+      type uint32 {
+        range "120|240|250|480|500|640|1000|1024|2000|2048|3000|4000|"
+          +"5120|6000|8000|10240|12000|16000|20000|"
+          +"20480|24000|28000|32000|40960|60000|64000|"
+          +"360000|720000|1800000|3600000";
+      }
+      units milliseconds;
+      description "It specifies the interval between the periodical measurements
+        that shall be taken when the UE is in connected mode.
+        The attribute is applicable only for Immediate MDT and when
+        reportingTrigger is configured for periodical measurements.";
+      reference "5.10.5 of 3GPP TS 32.422.";
+    }
+
+   leaf reportAmount {
+      when '../../../jobType = "IMMEDIATE_MDT_ONLY"'
+        +  ' or ../../../jobType = "IMMEDIATE_MDT_AND_TRACE"'
+        +  ' or ../../../jobType = "IMMEDIATE_MDT_AND_5GC_UE_LEVEL_MEASUREMENTS"'
+        +  ' or ../../../jobType = 
+        "TRACE_AND_IMMEDIATE_MDT_AND_5GC_UE_LEVEL_MEASUREMENTS"'
+        +  ' or ../../../jobType = "IMMEDIATE_MDT_AND_LOGGED_MDT"'
+        +  ' and ../reportingTrigger = "PERIODICAL"';
+      type union {
+        type uint32 {
+          range "1|4|8|16|32|64" ;
+        }
+        type enumeration {
+          enum INFINITY;
+        }
+      }
+      description "It specifies the number of measurement reports that shall be
+        taken for periodic reporting while the UE is in connected.
+        The attribute is applicable only for Immediate MDT and when
+        reportingTrigger is configured for periodical measurements.";
+      reference "Clause 5.10.6 of 3GPP TS 32.422";
+    }
+
+   leaf eventThreshold {
+      when '../../../jobType = "IMMEDIATE_MDT_ONLY"'
+        +  ' or ../../../jobType = "IMMEDIATE_MDT_AND_TRACE"'
+        +  ' or ../../../jobType = "IMMEDIATE_MDT_AND_5GC_UE_LEVEL_MEASUREMENTS"'
+        +  ' or ../../../jobType = 
+        "TRACE_AND_IMMEDIATE_MDT_AND_5GC_UE_LEVEL_MEASUREMENTS"'
+        +  ' or ../../../jobType = "IMMEDIATE_MDT_AND_LOGGED_MDT"';
+      type int64;
+      description "Specifies the threshold which should trigger the reporting
+        in case A2 event reporting in LTE or 1F/1l event in UMTS. The attribute
+        is applicable only for Immediate MDT and when reportingTrigger is
+        configured for A2 event in LTE or 1F event or 1l event in UMTS.";
+      reference "Clauses 5.10.7 and 5.10.7a of 3GPP TS 32.422";
+    }
+
+   leaf collectionPeriodRRMNR {
+      when '../../../jobType = "IMMEDIATE_MDT_ONLY"'
+        +  ' or ../../../jobType = "IMMEDIATE_MDT_AND_TRACE"'
+        +  ' or ../../../jobType = "IMMEDIATE_MDT_AND_5GC_UE_LEVEL_MEASUREMENTS"'
+        +  ' or ../../../jobType = 
+        "TRACE_AND_IMMEDIATE_MDT_AND_5GC_UE_LEVEL_MEASUREMENTS"'
+        +  ' or ../../../jobType = "IMMEDIATE_MDT_AND_LOGGED_MDT"';
+      type uint32 {
+        range "1024|2048|5120|10240|60000";
+      }
+      units milliseconds;
+      description "Specifies the collection period for collecting RRM
+        configured measurement samples for M4, M5 in NR. The attribute is
+        applicable only for Immediate MDT.";
+      reference "Clause 5.10.30 of 3GPP TS 32.422";
+    }
+
+   leaf collectionPeriodM6NR {
+      when '../../../jobType = "IMMEDIATE_MDT_ONLY"'
+        +  ' or ../../../jobType = "IMMEDIATE_MDT_AND_TRACE"'
+        +  ' or ../../../jobType = "IMMEDIATE_MDT_AND_5GC_UE_LEVEL_MEASUREMENTS"'
+        +  ' or ../../../jobType = 
+        "TRACE_AND_IMMEDIATE_MDT_AND_5GC_UE_LEVEL_MEASUREMENTS"'
+        +  ' or ../../../jobType = "IMMEDIATE_MDT_AND_LOGGED_MDT"';
+      type enumeration {
+        enum 120ms;
+        enum 240ms;
+        enum 480ms;
+        enum 640ms;
+        enum 1024ms;
+        enum 2048ms;
+        enum 5120ms;
+        enum 10240ms;
+        enum 20480ms;
+        enum 40960ms;
+        enum 1min;
+        enum 6min;
+        enum 12min;
+        enum 30min;
+      }
+      description "It specifies the collection period for the Packet Delay
+        measurement (M6) for NR MDT taken by the gNB. The attribute is
+        applicable only for Immediate MDT. ";
+      reference "clause 5.10.34 of  TS 32.422";
+    }
+
+    leaf collectionPeriodM7NR {
+      when '../../../jobType = "IMMEDIATE_MDT_ONLY"'
+        +  ' or ../../../jobType = "IMMEDIATE_MDT_AND_TRACE"'
+        +  ' or ../../../jobType = "IMMEDIATE_MDT_AND_5GC_UE_LEVEL_MEASUREMENTS"'
+        +  ' or ../../../jobType = 
+        "TRACE_AND_IMMEDIATE_MDT_AND_5GC_UE_LEVEL_MEASUREMENTS"'
+        +  ' or ../../../jobType = "IMMEDIATE_MDT_AND_LOGGED_MDT"';
+      type uint32 {
+        range "1..60";
+      }
+      description "It specifies the collection period for the Packet Loss Rate
+        measurement (M7) for NR MDT taken by the gNB. The attribute is
+        applicable only for Immediate MDT.";
+      reference "clause 5.10.35 of  TS 32.422";
+    }
+
+   leaf collectionPeriodRRMLTE {
+      when '../../../jobType = "IMMEDIATE_MDT_ONLY"'
+        +  ' or ../../../jobType = "IMMEDIATE_MDT_AND_TRACE"'
+        +  ' or ../../../jobType = "IMMEDIATE_MDT_AND_5GC_UE_LEVEL_MEASUREMENTS"'
+        +  ' or ../../../jobType = 
+        "TRACE_AND_IMMEDIATE_MDT_AND_5GC_UE_LEVEL_MEASUREMENTS"'
+        +  ' or ../../../jobType = "IMMEDIATE_MDT_AND_LOGGED_MDT"';
+       type enumeration {
+        enum 100ms;
+        enum 1000ms;
+        enum 1024ms;
+        enum 1280ms;
+        enum 2048ms;
+        enum 2560ms;
+        enum 5120ms;
+        enum 10000ms;
+        enum 10240ms;
+        enum 1min;
+      }
+      description "Specifies the collection period for collecting RRM configured
+        measurement samples for M3 in LTE. The attribute is applicable only
+        for Immediate MDT.";
+      reference "Clause 5.10.20 of 3GPP TS 32.422.";
+    }
+
+   leaf measurementPeriodLTE {
+          when '../../../jobType = "IMMEDIATE_MDT_ONLY"'
+        +  ' or ../../../jobType = "IMMEDIATE_MDT_AND_TRACE"'
+        +  ' or ../../../jobType = "IMMEDIATE_MDT_AND_5GC_UE_LEVEL_MEASUREMENTS"'
+        +  ' or ../../../jobType = 
+        "TRACE_AND_IMMEDIATE_MDT_AND_5GC_UE_LEVEL_MEASUREMENTS"'
+        +  ' or ../../../jobType = "IMMEDIATE_MDT_AND_LOGGED_MDT"';
+      type enumeration {
+        enum 1024ms;
+        enum 2048ms;
+        enum 5120ms;
+        enum 10240ms;
+        enum 1min;
+      }
+      mandatory true;
+      description "It specifies the measurement period for the
+        Data Volume (M4) and Scheduled IP throughput
+        measurements (M5) for LTE MDT taken by the eNB.
+        The attribute is applicable only for Immediate MDT.";
+      reference "Clause 5.10.23 of 3GPP TS 32.422.";
+    }
+
+    leaf collectionPeriodM6LTE {
+      when '../../../jobType = "IMMEDIATE_MDT_ONLY"'
+        +  ' or ../../../jobType = "IMMEDIATE_MDT_AND_TRACE"'
+        +  ' or ../../../jobType = "IMMEDIATE_MDT_AND_5GC_UE_LEVEL_MEASUREMENTS"'
+        +  ' or ../../../jobType = 
+        "TRACE_AND_IMMEDIATE_MDT_AND_5GC_UE_LEVEL_MEASUREMENTS"'
+        +  ' or ../../../jobType = "IMMEDIATE_MDT_AND_LOGGED_MDT"';
+      type uint32 {
+        range "1024|2048|5120|10240";
+      }
+      units milliseconds;
+      description "Specifies the collection period for the Packet Delay
+        measurement (M6) for MDT taken by the eNB. The attribute is applicable
+        only for Immediate MDT. In case this attribute is not used,
+        it carries a null semantic.";
+      reference "Clause 5.10.32 of  TS 32.422. ";
+    }
+
+    leaf collectionPeriodM7LTE {
+      when '../../../jobType = "IMMEDIATE_MDT_ONLY"'
+        +  ' or ../../../jobType = "IMMEDIATE_MDT_AND_TRACE"'
+        +  ' or ../../../jobType = "IMMEDIATE_MDT_AND_5GC_UE_LEVEL_MEASUREMENTS"'
+        +  ' or ../../../jobType = 
+        "TRACE_AND_IMMEDIATE_MDT_AND_5GC_UE_LEVEL_MEASUREMENTS"'
+        +  ' or ../../../jobType = "IMMEDIATE_MDT_AND_LOGGED_MDT"';
+      type uint16 {
+        range 1..60 ;
+      }
+      description "It specifies the collection period for the Packet Loss Rate
+        measurement (M7) for LTE MDT taken by the eNB. The attribute is
+        applicable only for Immediate MDT.";
+      reference "Clause 5.10.33 of  TS 32.422.";
+    }
+
+    leaf eventThresholdUphUMTS {
+      when '../../../jobType = "IMMEDIATE_MDT_ONLY"'
+        +  ' or ../../../jobType = "IMMEDIATE_MDT_AND_TRACE"'
+        +  ' or ../../../jobType = "IMMEDIATE_MDT_AND_5GC_UE_LEVEL_MEASUREMENTS"'
+        +  ' or ../../../jobType = 
+        "TRACE_AND_IMMEDIATE_MDT_AND_5GC_UE_LEVEL_MEASUREMENTS"'
+        +  ' or ../../../jobType = "IMMEDIATE_MDT_AND_LOGGED_MDT"';
+      type uint16 {
+        range 0..31 ;
+      }
+      description "It specifies the threshold which should trigger
+        the reporting in case of event-triggered periodic reporting for M4
+        (UE power headroom measurement) in UMTS.";
+        reference "Clause 5.10.39 of TS 32.422.";
+    }
+
+    leaf collectionPeriodRRMUMTS {
+      when '../../../jobType = "IMMEDIATE_MDT_ONLY"'
+        +  ' or ../../../jobType = "IMMEDIATE_MDT_AND_TRACE"'
+        +  ' or ../../../jobType = "IMMEDIATE_MDT_AND_5GC_UE_LEVEL_MEASUREMENTS"'
+        +  ' or ../../../jobType = 
+        "TRACE_AND_IMMEDIATE_MDT_AND_5GC_UE_LEVEL_MEASUREMENTS"'
+        +  ' or ../../../jobType = "IMMEDIATE_MDT_AND_LOGGED_MDT"';
+      type uint32 {
+        range "100|250|500|1000|2000|"
+          +"3000|4000|6000";
+      }
+      units milliseconds;
+      description "Specifies the collection period for collecting RRM configured
+        measurement samples for M3, M4, M5 in UMTS. The attribute is applicable
+        only for Immediate MDT. ";
+      reference "Clause 5.10.21 of 3GPP TS 32.422.";
+    }
+
+    leaf measurementPeriodUMTS {
+      when '../../../jobType = "IMMEDIATE_MDT_ONLY"'
+        +  ' or ../../../jobType = "IMMEDIATE_MDT_AND_TRACE"'
+        +  ' or ../../../jobType = "IMMEDIATE_MDT_AND_5GC_UE_LEVEL_MEASUREMENTS"'
+        +  ' or ../../../jobType = 
+        "TRACE_AND_IMMEDIATE_MDT_AND_5GC_UE_LEVEL_MEASUREMENTS"'
+        +  ' or ../../../jobType = "IMMEDIATE_MDT_AND_LOGGED_MDT"';
+      type uint32 {
+        range "1000|2000|3000|4000|6000|8000|12000|16000|20000|"
+          +"24000|28000|32000|64000";
+      }
+      units milliseconds;
+      description "It specifies the measurement period for the Data Volume and
+        Throughput measurements for MDT taken by RNC.
+        The attribute is applicable only for Immediate MDT. In case this
+        attribute is not used, it carries a null semantic.";
+      reference "Clause 5.10.22 of 3GPP TS 32.422";
+    }
+
+    leaf measurementQuantity {
+      when '../../../jobType = "IMMEDIATE_MDT_ONLY"'
+        +  ' or ../../../jobType = "IMMEDIATE_MDT_AND_TRACE"'
+        +  ' or ../../../jobType = "IMMEDIATE_MDT_AND_5GC_UE_LEVEL_MEASUREMENTS"'
+        +  ' or ../../../jobType = 
+        "TRACE_AND_IMMEDIATE_MDT_AND_5GC_UE_LEVEL_MEASUREMENTS"'
+        +  ' or ../../../jobType = "IMMEDIATE_MDT_AND_LOGGED_MDT"';
+      type enumeration {
+        enum CPICH_ECNO;
+        enum CPICH_RSCP;
+        enum PATHLOSS;
+      }
+      description "It specifies the measurements that are collected in an MDT
+        job for a UMTS MDT configured for event triggered reporting.";
+      reference "Clause 5.10.15 of 3GPP TS 32.422.";
+    }
+
+    leaf beamLevelMeasurement {
+      when '../../../jobType = "IMMEDIATE_MDT_ONLY"'
+        +  ' or ../../../jobType = "IMMEDIATE_MDT_AND_TRACE"'
+        +  ' or ../../../jobType = "IMMEDIATE_MDT_AND_5GC_UE_LEVEL_MEASUREMENTS"'
+        +  ' or ../../../jobType = 
+        "TRACE_AND_IMMEDIATE_MDT_AND_5GC_UE_LEVEL_MEASUREMENTS"'
+        +  ' or ../../../jobType = "IMMEDIATE_MDT_AND_LOGGED_MDT"';
+      type boolean;
+      default false;
+      description "Indicates whether the NR M1 beam level measurements shall
+        be included or not.";
+      reference "Clause 5.10.40 of 3GPP TS 32.422.";
+    }
+
+    leaf positioningMethod {
+      when '../../../jobType = "IMMEDIATE_MDT_ONLY"'
+        +  ' or ../../../jobType = "IMMEDIATE_MDT_AND_TRACE"'
+        +  ' or ../../../jobType = "IMMEDIATE_MDT_AND_5GC_UE_LEVEL_MEASUREMENTS"'
+        +  ' or ../../../jobType = 
+        "TRACE_AND_IMMEDIATE_MDT_AND_5GC_UE_LEVEL_MEASUREMENTS"'
+        +  ' or ../../../jobType = "IMMEDIATE_MDT_AND_LOGGED_MDT"';
+      type enumeration {
+        enum GNSS;
+        enum E_CELL_ID;
+      }
+      description "It specifies what positioning method should be used in the
+        MDT job.";
+      reference "Clause 5.10.19 of 3GPP TS 32.422.";
+    }
+
+    list excessPacketDelayThresholds {
+      description "Excess packet delay thresholds info for M6 UL measurement.";
+      min-elements 1;
+      key idx;
+      leaf idx { type string; }
+      uses ExcessPacketDelayThresholdsGrp;
+    }
+
+    leaf reportAmountM1LTE {
+      type enumeration {
+        enum 1;
+        enum 2;
+        enum 4;
+        enum 8;
+        enum 16;
+        enum 32;
+        enum 64;
+        enum INFINITY;
+      }
+      description "It specifies the number of measurement reports that shall be
+        taken for periodic reporting while the UE is in connected mode.
+        The attribute is applicable only for Immediate MDT and combined Trace
+        and Immediate MDT and when reportingTrigger is configured for periodical
+        measurements and applicable only for LTE.";
+      reference "Clause 5.10.19 of 3GPP TS 32.422.";
+    }
+
+    leaf reportAmountM4LTE {
+      type enumeration {
+        enum 1;
+        enum 2;
+        enum 4;
+        enum 8;
+        enum 16;
+        enum 32;
+        enum 64;
+        enum INFINITY;
+      }
+      description "It specifies the number of measurement reports that shall be
+        taken for periodic reporting while the UE is in connected mode.
+        The attribute is applicable only for Immediate MDT and combined Trace
+        and Immediate MDT and when reportingTrigger is configured for periodical
+        measurements and applicable only for LTE.";
+      reference "Clause 5.10.6 of TS 32.422.";
+    }
+
+    leaf reportAmountM5LTE {
+      type enumeration {
+        enum 1;
+        enum 2;
+        enum 4;
+        enum 8;
+        enum 16;
+        enum 32;
+        enum 64;
+        enum INFINITY;
+      }
+      description "It specifies the number of measurement reports that shall be
+        taken for periodic reporting while the UE is in connected mode.
+        The attribute is applicable only for Immediate MDT and combined Trace
+        and Immediate MDT and when reportingTrigger is configured for periodical
+        measurements and applicable only for LTE.";
+      reference "Clause 5.10.6 of TS 32.422.";
+    }
+
+    leaf reportAmountM6LTE {
+      type enumeration {
+        enum 1;
+        enum 2;
+        enum 4;
+        enum 8;
+        enum 16;
+        enum 32;
+        enum 64;
+        enum INFINITY;
+      }
+      description "It specifies the number of measurement reports that shall be
+        taken for periodic reporting while the UE is in connected mode.
+        The attribute is applicable only for Immediate MDT and combined Trace
+        and Immediate MDT and when reportingTrigger is configured for periodical
+        measurements and applicable only for LTE.";
+      reference "Clause 5.10.6 of TS 32.422.";
+    }
+
+    leaf reportAmountM7LTE {
+      type enumeration {
+        enum 1;
+        enum 2;
+        enum 4;
+        enum 8;
+        enum 16;
+        enum 32;
+        enum 64;
+        enum INFINITY;
+      }
+      description "It specifies the number of measurement reports that shall be
+        taken for periodic reporting while the UE is in connected mode.
+        The attribute is applicable only for Immediate MDT and combined Trace
+        and Immediate MDT and when reportingTrigger is configured for periodical
+        measurements and applicable only for LTE.";
+      reference "Clause 5.10.6 of TS 32.422.";
+    }
+
+    leaf reportAmountM1NR {
+      type enumeration {
+        enum 1;
+        enum 2;
+        enum 4;
+        enum 8;
+        enum 16;
+        enum 32;
+        enum 64;
+        enum INFINITY;
+      }
+      description "It specifies the number of measurement reports that shall be
+        taken for periodic reporting while the UE is in connected mode.
+        The attribute is applicable only for Immediate MDT and combined Trace
+        and Immediate MDT and when reportingTrigger is configured for periodical
+        measurements and applicable only for NR.";
+      reference "Clause 5.10.6 of TS 32.422.";
+    }
+
+    leaf reportAmountM4NR {
+      type enumeration {
+        enum 1;
+        enum 2;
+        enum 4;
+        enum 8;
+        enum 16;
+        enum 32;
+        enum 64;
+        enum INFINITY;
+      }
+      description "It specifies the number of measurement reports that shall be
+        taken for periodic reporting while the UE is in connected mode.
+        The attribute is applicable only for Immediate MDT and combined Trace
+        and Immediate MDT and when reportingTrigger is configured for periodical
+        measurements and applicable only for NR.";
+      reference "Clause 5.10.6 of TS 32.422.";
+    }
+
+    leaf reportAmountM5NR {
+      type enumeration {
+        enum 1;
+        enum 2;
+        enum 4;
+        enum 8;
+        enum 16;
+        enum 32;
+        enum 64;
+        enum INFINITY;
+      }
+      description "It specifies the number of measurement reports that shall be
+        taken for periodic reporting while the UE is in connected mode.
+        The attribute is applicable only for Immediate MDT and combined Trace
+        and Immediate MDT and when reportingTrigger is configured for periodical
+        measurements and applicable only for NR.";
+      reference "Clause 5.10.6 of TS 32.422.";
+    }
+
+    leaf reportAmountM6NR {
+      type enumeration {
+        enum 1;
+        enum 2;
+        enum 4;
+        enum 8;
+        enum 16;
+        enum 32;
+        enum 64;
+        enum INFINITY;
+      }
+      description "It specifies the number of measurement reports that shall be
+        taken for periodic reporting while the UE is in connected mode.
+        The attribute is applicable only for Immediate MDT and combined Trace
+        and Immediate MDT and when reportingTrigger is configured for periodical
+        measurements and applicable only for NR.";
+      reference "Clause 5.10.6 of TS 32.422.";
+    }
+
+    leaf reportAmountM7NR {
+      type enumeration {
+        enum 1;
+        enum 2;
+        enum 4;
+        enum 8;
+        enum 16;
+        enum 32;
+        enum 64;
+        enum INFINITY;
+      }
+      description "It specifies the number of measurement reports that shall be
+        taken for periodic reporting while the UE is in connected mode.
+        The attribute is applicable only for Immediate MDT and combined Trace
+        and Immediate MDT and when reportingTrigger is configured for periodical
+        measurements and applicable only for NR.";
+      reference "Clause 5.10.6 of TS 32.422.";
+    }
+  }
+
+  grouping LoggedMdtConfigGrp {
+    description "This <<dataType>> defines the configuration parameters of
+      IOC TraceJob which are specific for Logged MDT or Logged MBSFN MDT.
+
+      Based on the value configured for attribute jobType in IOC TraceJob,
+      different attributes are available. In case of LOGGED_MDT_ONLY, the
+      attributes reportType, eventListForEventTriggeredMeasurement,
+      eventThresholdL1, hysteresisL1, timeToTriggerL1,
+      areaConfigurationForNeighCells and npnIdentityList are applicable.
+      In case of LOGGED_MBSFN_MDT,
+      the attribute mbsfnAreaList is applicable. The optional attribute
+      plmnList allows to specify the PLMNs where
+      measurement collection, status indication and log reporting is
+      allowed, the optional attribute areaConfigurationForNeighCell
+      allows to specify the area for which UE is requested to perform
+      measurements logging for neighbour cells which have list of
+      frequencies.
+
+      For logged MDT in UMTS and LTE, the reporting is periodical. Parameter
+      loggingInterval determines the interval between the reports and parameter
+      loggingDuration determines how long the configuration is valid meaning
+      after this duration has passed no further reports are sent. In NR, the
+      reporting can be periodical or event based, determined by parameter
+      reportType. For periodical reporting the same parameters as in LTE and
+      UMTS apply. For event based reporting,
+      parameter eventListForEventTriggeredMeasurement configures the event type,
+      namely 'out of coverage' or 'L1 event'. In case 'L1 event' is selected as
+      event type, the logging is performed according to parameter loggingInterval
+      at regular intervals only when the conditions indicated by
+      eventThresholdL1, hysteresisL1, timeToTriggerL1 (defining the thresholds,
+      hysteresis and time to trigger) are met and if UE is 'camped normally'
+      state (TS 38.331,
+      TS 38.304).  In case 'out of coverage' is selected as event type, the
+      logging is performed according to parameter loggingInterval at regular
+      intervals only when the UE is in 'any cell selection' state.
+      Furthermore, logging is performed immediately upon transition from the
+      'any cell selection' state to the 'camped normally' state (TS 38.331,
+      TS 38.304).";
+
+    leaf traceCollectionEntityId {
+      type int64;
+      description "It specifies the TCE Id which is sent to the UE in
+        Logged MDT.";
+      reference "Clause 5.10.11 of 3GPP TS 32.422.";
+    }
+
+    leaf loggingDuration {
+      when '../../../jobType = "LOGGED_MDT_ONLY" or'
+        + ' ../../../jobType = "LOGGED_MBSFN_MDT" or'
+        + ' ../../../jobType = "IMMEDIATE_MDT_AND_LOGGED_MDT"';
+      type uint32 {
+        range "600|1200|2400|3600|5400|7200";
+      }
+      units seconds;
+      description "Specifies how long the MDT configuration is valid at the
+        UE in case of Logged MDT. The attribute is applicable only for
+        Logged MDT and Logged MBSFN MDT.";
+      reference "Clause 5.10.9 of 3GPP TS 32.422";
+    }
+
+    leaf loggingInterval {
+      when '../../../jobType = "LOGGED_MDT_ONLY" or'
+        + ' ../../../jobType = "LOGGED_MBSFN_MDT" or'
+        + ' ../../../jobType = "IMMEDIATE_MDT_AND_LOGGED_MDT"';
+      type enumeration {
+        enum 320ms;
+        enum 640ms;
+        enum 1280ms;
+        enum 2560ms;
+        enum 5120ms;
+        enum 10240ms;
+        enum 20480ms;
+        enum 30720ms;
+        enum 40960ms;
+        enum 61440ms;
+        enum INFINITY;
+      }
+      description "Specifies the periodicty for Logged MDT. The attribute is
+        applicable only for Logged MDT and Logged MBSFN MDT.";
+      reference "Clause 5.10.8 of 3GPP TS 32.422";
+    }
+
+    leaf reportType {
+      when '../../../jobType = "IMMEDIATE_MDT_ONLY"'
+        +  ' or ../../../jobType = "IMMEDIATE_MDT_AND_TRACE"'
+        +  ' or ../../../jobType = "IMMEDIATE_MDT_AND_5GC_UE_LEVEL_MEASUREMENTS"'
+        +  ' or ../../../jobType = 
+        "TRACE_AND_IMMEDIATE_MDT_AND_5GC_UE_LEVEL_MEASUREMENTS"'
+        +  ' or ../../../jobType = "IMMEDIATE_MDT_AND_LOGGED_MDT"';
+      type enumeration {
+        enum PERIODICAL;
+        enum EVENT_TRIGGERED;
+      }
+      description "It specifies report type for logged NR MDT";
+      reference "Clause 5.10.27 of 3GPP TS 32.422.";
+    }
+
+    leaf eventListForEventTriggeredMeasurement {
+      when '../../../jobType = "LOGGED_MDT_ONLY" or' 
+        + ' ../../../jobType = "IMMEDIATE_MDT_AND_LOGGED_MDT"';
+      type enumeration {
+        enum OUT_OF_COVERAGE ;
+        enum A2_EVENT ;
+      }
+      description "Specifies event types for event triggered measurement in the
+        case of logged NR MDT.  Each trace session may configure at most one
+        event. The UE shall perform logging of measurements only upon certain
+        condition being fulfilled:
+        - Out of coverage.
+        - A2 event.";
+      reference "Clause 5.10.28 of 3GPP TS 32.422.";
+    }
+
+    leaf eventThresholdL1 {
+      when '../../../jobType = "LOGGED_MDT_ONLY" or'
+        + ' ../../../jobType = "LOGGED_MBSFN_MDT" or'
+        + ' ../../../jobType = "IMMEDIATE_MDT_AND_LOGGED_MDT"';
+      type uint32 {
+        range "0..127";
+      }
+      description "It specifies the threshold which should trigger
+        the reporting in case of event based reporting of logged NR MDT.
+        The attribute is applicable only for Logged MDT and when reportType
+        is configured for event triggered reporting and when
+        eventListForEventTriggeredMeasurement is configured for L1 event.";
+      reference "clause 5.10.36 of TS 32.422";
+    }
+
+    leaf hysteresisL1 {
+      when '../../../jobType = "LOGGED_MDT_ONLY" or' 
+        + ' ../../../jobType = "LOGGED_MBSFN_MDT" or'
+        + ' ../../../jobType = "IMMEDIATE_MDT_AND_LOGGED_MDT"';
+      type uint32 {
+        range "0..30";
+      }
+      description "It specifies the hysteresis used within the entry and leave
+        condition of the L1 event based reporting of logged NR MDT.
+        The attribute is applicable only for Logged MDT, when reportType
+        is configured for event triggered reporting and when
+        eventListForEventTriggeredMeasurement is configured for L1 event.";
+      reference "clause 5.10.37 of TS 32.422";
+    }
+
+    leaf timeToTriggerL1 {
+      when '../../../jobType = "LOGGED_MDT_ONLY" or' 
+        + ' ../../../jobType = "LOGGED_MBSFN_MDT" or'
+        + ' ../../../jobType = "IMMEDIATE_MDT_AND_LOGGED_MDT"';
+      type int32 {
+        range 0|40|64|80|100|128|160|256|320|480|512|640|1024|1280|2560|5120;
+      }
+      units milliseconds;
+      description "It specifies the threshold which should trigger
+        the reporting in case of event based reporting of logged NR MDT.
+        The attribute is applicable only for Logged MDT, when reportType
+        is configured for event triggered reporting and when
+        eventListForEventTriggeredMeasurement is configured for L1 event.";
+      reference "clause 5.10.38 of TS 32.422";
+    }
+
+    list areaConfigurationForNeighCell {
+      when '../../../jobType = "LOGGED_MDT_ONLY" or' 
+        + ' ../../../jobType = "IMMEDIATE_MDT_AND_LOGGED_MDT"';
+      key "idx";
+      leaf idx { type uint32 ; }
+      description "It specifies the area for which UE is requested to perform
+        measurement logging for neighbour cells which have list of frequencies.
+        If it is not configured, the UE shall perform measurement logging for
+        all the neighbour cells.
+
+        Applicable only to NR Logged MDT.";
+      reference "Clause 5.10.26 of 3GPP TS 32.422.";
+
+      uses AreaConfigGrp;
+    }
+
+    list mbsfnAreaList {
+      when '../../../jobType = "LOGGED_MBSFN_MDT"';
+      key "mbsfnAreaId earfcn";
+      max-elements 8;
+      description "The MBSFN Area consists of a MBSFN Area ID and Carrier
+        Frequency (EARFCN). The target MBSFN area List can have up to 8 entries.
+        This parameter is applicable only if the job type is Logged MBSFN MDT.";
+      reference "Clause 5.10.25 of 3GPP TS 32.422.";
+
+      uses MbsfnAreaGrp;
+    }
+
+    list nPNIdentityList {
+      description "It defines which NPNs that can be served by the NR cell,
+        and which CAG IDs or NIDs can be supported by the NR cell for
+        corresponding PNI-NPN or SNPN in case of the cell is NPN-only cell.
+        (NPN-Identity referring to TS 38.331)";
+      key idx;
+      max-elements 1;
+      uses types3gpp:NpnIdGrp;
+      leaf idx { type string;}
+    }
+  }
+
+  grouping MdtConfigGrp {
+    description "Defines the configuration parameters of IOC TraceJob which are
+     specific for MDT or any combination of MDT. 
+     
+     The attribute anonymizationOfMdtData specifies the level of anonymization 
+     of MDT data.  
+     
+     The attribute areaScope defines the area scope
+     of MDT, which is specified in clause 5.10.2 of TS 32.422.
+     
+     The optional attribute sensorInformation allows to specify
+     the sensor information to include. 
+     
+     The attribute trsrPrefixCfg contains the TRSR prefix 
+     configuration parameters which shall be used by the NR-RAN nodes 
+     during TRSR assignment for a C-MDT job.
+
+     Based on the value configured for attribute jobType in IOC 
+     TraceJob, the attributes immediateMdtConfig or loggedMdtConfig 
+     or both are available: If the attribute jobType indictes immediate MDT, 
+     the attribute immediateMdtConfig is applicable. If the attribute jobType 
+     indictes logged MDT or logged MBSFN MDT, the attribute loggedMdtConfig is 
+     applicable. If the attribute jobType indictes both immediate MDT and 
+     logged MDT, both the attribute immediateMdtConfig and 
+     the attribute loggedMdtConfig are applicable.
+
+     The optional attribute plmnList allows to specify the PLMNs where 
+     measurements collection, status indication and log reporting is allowed.";
+
+   leaf anonymizationOfMdtData {
+      when ../areaScope ;
+      type enumeration {
+        enum NO_IDENTITY;
+        enum TAC_OF_IMEI;
+      }
+      default NO_IDENTITY;
+      description "Specifies level of anonymization of MDT data.
+        This attribute is only applicable for management based activation.";
+      reference "Clause 5.10.12 of 3GPP TS 32.422";
+    }
+
+   list areaScope {
+      key "idx";
+      leaf idx { type uint32 ; }
+      description "It specifies the area where data shall be collected. ";
+      max-elements 1;
+      uses types5g3gpp:AreaScopeGrp;
+    }
+
+   leaf-list sensorInformation {
+      type enumeration {
+        enum BAROMETRIC_PRESSURE;
+        enum UE_SPEED;
+        enum UE_ORIENTATION;
+      }
+      description "It specifies which sensor information shall be included in
+        logged NR MDT and immediate NR MDT measurement if they are available.";
+      reference "Clause 5.10.29 of 3GPP TS 32.422.";
+    }
+
+    list immediateMdtConfig {
+      description "The set of parameters specific for Immediate MDT
+        configuration.";
+      key idx;
+      max-elements 1;
+      leaf idx { type string; }
+      uses ImmediateMdtConfigGrp;
+    }
+
+    list loggedMdtConfig {
+      description "The set of parameters specific for Logged MDT and Logged
+        MBSFN MDT configuration.";
+      key idx;
+      max-elements 1;
+      leaf idx { type string; }
+      uses LoggedMdtConfigGrp;
+    }
+
+    leaf mNOnly {
+      type boolean;
+      default false;
+      description "Specifies whether the MDT configuration is for MN
+        only or not. The value FALSE means the MDT configuration is for
+        both MN and SN. The value TRUE means the MDT configuration is
+        for MN only.";
+    }
+
+    list plmnList {
+      key "mcc mnc";
+      uses types3gpp:PLMNId;
+      max-elements 16;
+      description "It indicates the PLMNs where measurement collection, status
+        indication and log reporting is allowed.";
+      reference "Clause 5.10.24 of 3GPP TS 32.422.";
+    }
+
+    list trsrPrefixCfg {
+      key "idx";
+      max-elements 1;
+      description "The TRSR prefix configuration parameters which are used by 
+        NR-RAN at TRSR assignment for a given C-MDT job. It defines both the 
+        base TRSR prefix and the size of the TRSR prefix. The attribute 
+        trstPrefix specifies the base TRSR prefix. The attribute 
+        trsrPrefixLength defines the size of base TRSR prefix.";
+      reference "Clause 5.10 of 3GPP TS 32.422.";
+      leaf idx { type uint32 ; }
+      uses trace3gpp:TrsrPrefixCfgGrp ; 
+    }   
+  }
+
+  grouping UECoreMeasConfigGrp {
+    description "Represents the UECoreMeasConfig dataType.
+      This <<dataType>> defines the aconfiguration parameters of IOC TraceJob
+        which are specific for UE level measurements collection.";
+
+    leaf-list ueCoreMeasurements {
+      type string;
+      min-elements 1;
+      description "List of 5GC UE level measurements identified by name.
+
+        The list may include 5GC UE level measurements defined in TS 28.558,
+        or vendor specific measurements.
+
+        For non-3GPP specified 5GC UE level measurements the name is defined
+        elsewhere.";
+    }
+
+    leaf ueCoreMeasGranularityPeriod {
+      type uint32;
+      mandatory true;
+      units milliseconds;
+      description "Granularity period used to produce 5GC UE
+        level measurements. The period is defined in milliseconds (ms).";
+    }
+
+    leaf nfTypeToMeasure {
+      type string;
+      mandatory true;
+      description "It indicates the type of NE to produce the 5GC UE level
+        measurements.
+
+        allowedValues: The NF types represented by the measured object
+        classes as defined by f) of the 5GC UE level measurements specified
+        in TS 28.558.";
+    }
+
+    leaf-list objectInstances {
+      type string;
+      description "List of object instances.
+        Each object instance is identified by its DN.";
+    }
+
+    leaf-list rootObjectInstances {
+      type string;
+      description "List of root object instances.
+        Each object instance is identified by its DN and designates
+        the root of a substree that contains the root object and all
+        descendant objects.";
+    }
+  }
+
+  grouping TrsrPrefixCfgGrp {
+    leaf trsrPrefix {
+      type string;
+      mandatory true;
+      description "A 2 byte Octet String. This is the base TRSR prefix";
+    }
+    leaf trsrPrefixLength {
+      type int32;
+      mandatory true;
+      description "An integer to indicate how many bits are used for the 
+        TRSR prefix";
+
+    }
+  }
+
+  grouping TraceJobGrp {
+
+    leaf administrativeState {
+      default LOCKED;
+      type types3gpp:BasicAdministrativeState ;
+      description "Administrative state of a managed object instance. The 
+        administrative state describes the permission to use or prohibition 
+        against using the object instance. The administrative state is set by
+        the MnS consumer.";
+    }
+
+    leaf operationalState {
+      config false;
+      mandatory true;
+      type types3gpp:OperationalState ;
+      description "Operational state of managed object instance. The 
+        operational state describes if an object instance is operable  
+        (ENABLED) or inoperable (DISABLED). This state is set by the 
+        object instance or the MnS producer and is hence READ-ONLY.";
+    }
+
+    leaf jobType {
+      type enumeration {
+        enum IMMEDIATE_MDT_ONLY;
+        enum LOGGED_MDT_ONLY;
+        enum TRACE_ONLY;
+        enum IMMEDIATE_MDT_AND_TRACE;
+        enum RLF_REPORT_ONLY;
+        enum RCEF_REPORT_ONLY;
+        enum LOGGED_MBSFN_MDT;
+        enum 5GC_UE_LEVEL_MEASUREMENTS_ONLY;
+        enum TRACE_AND_5GC_UE_LEVEL_MEASUREMENTS;
+        enum IMMEDIATE_MDT_AND_5GC_UE_LEVEL_MEASUREMENTS;
+        enum TRACE_AND_IMMEDIATE_MDT_AND_5GC_UE_LEVEL_MEASUREMENTS;
+        enum RRC_REPORT;
+        enum IMMEDIATE_MDT_AND_LOGGED_MDT;
+      }
+      default TRACE_ONLY;
+      description "It specifies whether the
+        TraceJob represents only MDT, Trace, RLF, RCEF, RRC or 5GC UE
+        level measurements job, or a combined job. It also defines the
+        MDT mode.";
+      reference "Clause 5.9a of 3GPP TS 32.422.";
+    }
+    leaf-list rrcReportType {
+      type enumeration {
+        enum RLF_REPORT;
+        enum RCEF_REPORT;
+        enum SHR;
+        enum SPR;
+        enum MHI;
+        enum RA_REPORT;
+      }
+    description "Specifies the RRC reports requested. ";
+    reference "3GPP TS 38.331";
+    }
+
+    list pLMNTarget {
+      key "mcc mnc";
+      description "It specifies which PLMN that the subscriber of the session to
+        be recorded uses as selected PLMN.";
+      reference "Clause 5.9b of 3GPP TS 32.422";
+
+      uses types3gpp:PLMNId;
+    }
+
+    leaf-list listOfTraceMetrics {
+      when '../jobType = "TRACE_ONLY"'
+        +  ' or ../jobType = "IMMEDIATE_MDT_AND_TRACE"';
+      type string;
+      description "List of trace metrics identified by name.
+        Includes trace messages, MDT measurements (Immediate MDT,
+        Logged MDT, Logged MBSFN MDT), RLF, RCEF and RRC reports,
+        see TS 32.422 Trace messages are identified with their message
+        identifier. Trace metric identifier is constructed as defined
+        in clause 10 of TS 32.422.
+        For non-3GPP specified trace metrics the name is defined elsewhere.
+";
+      reference "Clause 10 of 3GPP TS 32.422";
+    }
+
+    leaf traceCollectionEntityIPAddress {
+      type inet:ip-address;
+      description "It specifies the address of the Trace Collection Entity
+        when the attribute traceReportingFormat is configured for the
+        file-based reporting. The attribute is applicable for both Trace and
+        MDT.";
+      reference "Clause 5.9 of 3GPP TS 32.422.";
+    }
+
+
+    leaf traceReportingConsumerUri {
+      when '../traceReportingFormat  = "STREAMING"';
+      type inet:uri;
+      description "URI of the Streaming Trace data reporting MnS consumer
+        (a.k.a. streaming target).";
+      reference "Clause 5.9 of 3GPP TS 32.422.";
+    }
+
+    list traceReference {
+      key "idx";
+      min-elements 1;
+      max-elements 1;
+      description "A globally unique identifier, which uniquely identifies the
+        Trace Session that is created by the TraceJob.
+        In case of shared network, it is the MCC and MNC of the Participating
+        Operator that request the trace session that shall be provided.
+        The attribute is applicable for both Trace and MDT.";
+      reference "Clause 5.6 of 3GPP TS 32.422.";
+
+      leaf idx { type uint32 ; }
+      uses trace3gpp:TraceReferenceGrp ;
+    }
+
+    leaf jobId {
+      type string;
+      yext3gpp:inVariant;
+      description "Identifier of a TraceJob";
+    }
+
+    leaf traceReportingFormat {
+      type enumeration {
+        enum FILE_BASED;
+        enum STREAMING;
+      }
+      default FILE_BASED;
+      description "Specifies the trace reporting format - streaming trace
+        reporting or file-based trace reporting";
+      reference "3GPP TS 32.422 clause 5.11";
+    }
+
+    list traceTarget {
+      key "traceTargetType";
+      max-elements 1;
+      description "It specifies the target object of the Trace, MDT and
+        5GC UE level measurements collection. The attribute is applicable for
+        Trace, MDT, and 5GC UE level measurements collection.
+        In case of management based Immediate MDT, RLF reporting, RCEF
+        reporting or RRC reposring, the traceTarget attribute shall be null
+        value.";
+
+      leaf traceTargetType {
+        type enumeration {
+          enum IMSI;
+          enum IMEI;
+          enum IMEISV;
+          enum PUBLIC_ID;
+          enum UTRAN_CELL;
+          enum E_UTRAN_CELL;
+          enum NG_RAN_CELL;
+          enum ENB;
+          enum RNC;
+          enum GNB;
+          enum SUPI;
+          enum N4_SESSION_ID;
+        }
+        description "It specifies the target object of the Trace, MDT and
+          5GC UE level measurements collection. The attribute is applicable for
+          Trace, MDT, and 5GC UE level measurements collection.
+
+          The targetIdType shall be PUBLIC_ID in case of a Management Based
+          Activation is done to an SCSCFFunction (Serving Call Session Control
+          Function) or PCSCFFunction (Proxy Call Session Control Function)
+
+          The targetIdType shall be UTRAN_CELL only in case of
+          UTRAN cell traffic trace function.
+
+          The targetIdType shall be E-UTRAN_CELL only in case of E-UTRAN cell
+          traffic trace function.
+
+          The targetIdType shall be NG-RAN_CELL only in case of NR cell
+          traffic trace function.
+
+          The targetIdType shall be either IMSI, IMEI or
+          IMEISV if the Trace Session is activated to any of the following
+          ManagedEntity(ies):
+          - HssFunction
+          - MscServerFunction
+          - SgsnFunction
+          - GgsnFunction
+          - BmscFunction
+          - RncFunction
+          - MmeFunction
+          - ServingGWFunction
+          - PGWFunction
+
+          The targetIdType shall be either SUPI or IMEISV if the Trace Session
+          is activated to any of the following ManagedEntity(ies):
+          - AFFunction
+          - AMFFunction
+          - AUSFunction
+          - NEFFunction
+          - NRFFunction
+          - NSSFFunction
+          - PCFFunction
+          - SMFFunction
+          - UPFFunction
+          - UDMFunction
+
+          In case of signalling based MDT, the targetIdType shall be
+          able to carry PUBLIC_ID, IMSI, IMEI, IMEISV or SUPI.
+
+          In case of management based Logged MDT, the targetIdType
+          shall carry an eNB or a gNB or an RNC.
+          The Logged MDT should be initiated on the specified eNB/gNB/RNC in
+          targetIdValueList.
+
+          In case of signalling based 5GC UE level measurements collection,
+          the targetIdTypee shall be able to carry IMEISV or SUPI.
+
+          In case of management based 5GC UE level measurements collection,
+          the targetIdType shall be able to carry the corresponding
+          Measured UE Identifier as defined by the bullet g) of the 5GC UE
+          level measurements (see TS 28.558) when the TraceJob is created at
+          the subject ManagedEntity.";
+      }
+
+      leaf-list traceTargetValueList {
+        type string;
+        description "It specifies the ID value(s) of the target object defined
+          by traceTargetType";
+      }
+
+      reference "3GPP TS 32.422";
+    }
+
+    list traceConfig {
+      when '../jobType = "TRACE_ONLY"'
+      +  ' or ../jobType = "IMMEDIATE_MDT_AND_TRACE"'
+      +  ' or ../jobType = "TRACE_AND_5GC_UE_LEVEL_MEASUREMENTS"'
+      +  ' or ../jobType =
+      "TRACE_AND_IMMEDIATE_MDT_AND_5GC_UE_LEVEL_MEASUREMENTS"';
+      key idx;
+      description "Trace config";
+      max-elements 1;
+      uses TraceConfigGrp;
+      leaf idx { type string; }
+    }
+
+    list mdtConfig {
+      when '../jobType = "IMMEDIATE_MDT_ONLY"'
+        + ' or ../jobType = "LOGGED_MDT_ONLY"'
+        + ' or ../jobType = "IMMEDIATE_MDT_AND_TRACE"'
+        + ' or ../jobType = "LOGGED_MBSFN_MDT"'
+        + ' or ../jobType = "IMMEDIATE_MDT_AND_5GC_UE_LEVEL_MEASUREMENTS"'
+        + ' or ../jobType =
+        "TRACE_AND_IMMEDIATE_MDT_AND_5GC_UE_LEVEL_MEASUREMENTS"'
+        + ' or ../jobType = "IMMEDIATE_MDT_AND_LOGGED_MDT"';
+      key idx;
+      description "This <<dataType>> defines the configuration parameters of
+        IOC TraceJob which are specific for MDT or any combination of MDT. 
+        The attribute anonymizationOfMdtData specifies the level of 
+        anonymization of MDT data.
+        The optional attribute areaScopedefines the area scope of MDT, which 
+        is specified in clause 5.10.2 of TS 32.422.
+        The attribute sensorInformation allows to specify the sensor 
+        information to include.
+        The attribute trsrPrefixCfg contains the TRSR prefix 
+        configuration parameters which shall be used by the NR-RAN nodes 
+        during TRSR assignment for a C-MDT job.
+        Based on the value configured for attribute jobType in IOC TraceJob, 
+        the attributes immediateMdtConfig or loggedMdtConfig or both are 
+        available: If the attribute jobType indictes immediate MDT, the 
+        attribute immediateMdtConfig is applicable. If the attribute jobType 
+        indictes logged MDT or logged MBSFN MDT, the attribute loggedMdtConfig
+        is applicable. If the attribute jobType indictes both immediate MDT 
+        and logged MDT, both the attribute immediateMdtConfig and the 
+        attribute loggedMdtConfig are applicable.
+        The optional attribute plmnList allows to specify the PLMNs where 
+        measurements collection, status indication and log reporting is 
+        allowed.";
+      max-elements 1;
+      uses MdtConfigGrp;
+      leaf idx { type string; }
+    }
+
+    list ueCoreMeasConfig {
+      when '../jobType = "5GC_UE_LEVEL_MEASUREMENTS_ONLY"'
+         + ' or ../jobType = "TRACE_AND_5GC_UE_LEVEL_MEASUREMENTS"'
+         + ' or ../jobType = "IMMEDIATE_MDT_AND_5GC_UE_LEVEL_MEASUREMENTS"'
+         + ' or ../jobType =
+         "TRACE_AND_IMMEDIATE_MDT_AND_5GC_UE_LEVEL_MEASUREMENTS"';
+      key idx;
+      description "5GC UE level measurements config";
+      max-elements 1;
+      uses UECoreMeasConfigGrp;
+      leaf idx { type string; }
+    }
+
+    list nPNTarget {
+      description "applicable only for NR and shall be present in case of NPN
+        either a PNI-NPN or a SNPN) and for management-based activation when
+        several NPNs are supported in the RAN.";
+      key idx;
+      max-elements 1;
+      uses types3gpp:NpnIdGrp;
+      leaf idx { type string;}
+    }
+  }
+
+  grouping TraceSubtree {
+    description "Contains classes that manage Tracing.
+      Should be used in all  classes (or classes inheriting from)
+      - SubNetwork
+      - ManagedElement
+      - ManagedFunction
+
+      If a YANG module wants to augment these classes/list/groupings they must
+      augment all user classes!";
+
+    list TraceJob {
+      description "A TraceJob instance represents the Trace Control and
+        Configuration parameters of a particular Trace Job (see TS 32.421 and
+        TS 32.422 for details). It can be name-contained by SubNetwork,
+        ManagedElement, ManagedFunction.
+
+        To activate Trace Jobs, a MnS consumer has to create TraceJob object
+        instances on the MnS producer. A MnS consumer can activate a Trace Job
+        for another MnS consumer since it is not required the value of
+        traceCollectionEntityIPAddress or traceReportingConsumerUri to be
+        his own.
+
+        For the details of Trace Job activation see clauses 4.1.1.1.2 and
+        4.1.2.1.2 of TS 32.422.
+
+        When a MnS consumer wishes to deactivate a Trace Job, the MnS consumer
+        shall delete the corresponding TraceJob instance.
+
+        For details of management Trace Job activation/deactivation see clause
+        4.1.1.1.2 of TS 32.422.
+
+        The attribute traceReference specifies a globally unique ID and
+        identifies a Trace session. One Trace Session may be activated to
+        multiple Network Elements. The traceReference is populated by the
+        consumer that makes the request for a Trace Session.
+
+        The jobId attribute presents the job identifier of a TraceJob instance.
+        The jobId can be used to associate  multiple TraceJob instances.
+        For example, it is possible to configure the same jobId value for
+        multiple TraceJob instances required to produce the data (e.g. RSRP
+        values of M1 and RLF reports) for a specific network analysis.
+
+        The attribute traceReportingFormat defines the method for reporting
+        the produced measurements. The selectable options are file-based or
+        stream-based reporting. In case of file-based reporting the attribute
+        traceCollectionEntityIPAddress is used to specify the IP address to
+        which the trace records shall be transferred, while in case of
+        stream-based reporting the attribute traceReportingConsumerUri
+        specifies the streaming target.
+
+        The mandatory attribute traceTarget determines the target object of
+        the TraceJob. Dependent on the network element to which the Trace
+        Session is activated different types of the target object are possible.
+        The attribute pLMNTarget defines the PLMN for which sessions shall be
+        selected in the Trace Session in case of management based activation
+        when several PLMNs are supported in the RAN.The MDT configuration may
+        include area scope defined by network slice, in which case
+        the attribute pLMNTarget is not applicable.
+
+        The attribute listOfTraceMetrics allows configuraton of which metrics
+        shall be recorded.
+
+        The attribute jobType specifies the kind of data to collect. In case 
+        of TRACE_ONLY, the configuration parameters of attribute traceConfig 
+        shall be applied. If the attribute jobType contains IMMEDIATE_MDT, 
+        LOGGED_MDT and LOGGED_MBSFN_MDT the configuration parameters of 
+        attribute mdtConfig or a subset of these shall be applied. If the 
+        attribute jobType contains 5GC_UE_LEVEL_MEASUREMENTS, the configuration
+        parameters of attribute ueCoreMeasConfig shall be applied.  
+
+        If jobType has the value RRC_REPORT, the attribute rrcReportType shall
+        be present. The rrcReportType allows the tracing of RRC reports.
+
+        Creation and deletion of TraceJob instances by MnS consumers is
+        optional; when not supported, the TraceJob instances may be created
+        and deleted by the system or be pre-installed.
+        
+        For temporary suspension of trace production, the MnS Consumer may 
+        update the administrative state attribute, by setting it to 'LOCKED'.
+        The MnS Producer may also suspend trace production, for example in 
+        overload situations, by setting the operational state attribute to 
+        'DISABLED'. 
+        
+        When the administrative state is set to 'UNLOCKED' after creation 
+        of a TraceJob, the corresponding Trace Session shall be activated. 
+        When the administrative state is set to 'LOCKED' or the operational 
+        state is set to 'DISABLED', the ongoing Trace Session shall be 
+        suspended. The Trace Session shall be resumed when the operational 
+        state is set to 'ENABLED' and the administrative state is set back 
+        to 'UNLOCKED'.";
+
+      key id;
+      uses top3gpp:Top_Grp ;
+      container attributes {
+        uses TraceJobGrp ;
+      }
+      uses files3gpp:FilesSubtree {
+        if-feature FilesUnderTraceJob;
+      }
+    }
+  }
+}

original/Rel-20/28_series/_3gpp-common-yang-extensions.yang

@@ -0,0 +1,173 @@
+module _3gpp-common-yang-extensions {
+  yang-version 1.1;
+  namespace urn:3gpp:sa5:_3gpp-common-yang-extensions ;
+  prefix yext3gpp ;
+
+  organization "3GPP SA5";
+  contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464";
+
+  description "The module defines YANG extensions needed 
+    3GPP YANG modeling.
+
+    Extensions MUST be defined with the following structure in the
+    description statement:
+        - What is this statement.
+        - Newline,
+        - This statement can be a substatement of the xxx statements with
+        cardinality x..y.
+        - This statement can have the following substatements with
+        cardinality x..y.
+        - Newline
+        - Is changing this statement an editorial, BC(backwards compatible) 
+        or NBC(non-BC) change?
+        - Newline.
+        - The argument its meaning and type. Preferably use YANG types and
+          constraints to define the argument's type.
+
+    Any extension statement can be added with a
+    deviation/deviate add statement. In this case the restriction about
+    the parent statement of the extension SHALL be evaluated based on the
+    target of the deviation statement.
+
+    Support for this module does not mean that a YANG server implements
+    support for each of these extensions.
+    Implementers of each specific module using an extensions MUST check
+    if the server implements support for the used extension.
+    Note: modules use many extensions which individual
+    implementations MAY or MAY NOT support.
+    If support for an extension is missing the extension statement needs
+    individual handling or it SHOULD be removed from the module using
+    the extension e.g. with a deviation.
+    Copyright 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, 
+    TTA, TTC). All rights reserved.";
+  reference "3GPP TS 28.623
+      Generic Network Resource Model (NRM)
+      Integration Reference Point (IRP);
+      Solution Set (SS) definitions
+      3GPP TS 28.623";
+
+  revision 2025-10-02 { reference "CR-0577" ; } 
+  revision 2025-01-12 { reference "CR-0507, 0492" ; } 
+  revision 2024-04-05 { reference "CR-0332, 0333" ; } 
+  revision 2023-09-17 { reference "CR-0270, 0271" ; } 
+  revision 2022-10-31 { reference "CR-0195, 0196";   }
+  revision 2019-06-23 { reference "Initial version";   }
+
+  extension disturbances {
+    description
+      "Specifies that creation, deletion or modification of a data node may 
+       impact the systems capability to handle user or control plane 
+       functionality.   
+
+       The statement MUST only be a substatement of the leaf, leaf-list,
+       container, list, anydata, anyxml, rpc or action statements.
+       Zero or One disturbances statement is allowed per parent
+       statement.
+       No substatements are allowed.
+       The argument can be any text describing
+       what effects the modification/execution may have on ongoing traffic.
+
+       Adding, removing or modifying this statement is BC";
+    argument disturbance-description;
+  }
+
+  extension only-system-created {
+    description
+      "Indicates that the MOI can only be created and deleted by the 
+       MnS producer. 
+       System created MOIs can have both read-only and read-write data
+       node children. Implementers shall add the extension to standard 
+       models if they restrict creation/deletion of an IOC.
+       
+       The statement MUST only be a sub-statement of the list statement,
+       with the parent list statement representing an IOC.
+
+       Zero or one only-system-created statement per parent statement is
+       allowed. No sub-statements are allowed.
+            
+       Adding this statement is an NBC change, 
+       removing it is BC, however if the system behavior is also changed in 
+       parallel (the system stops creating the MOIs), this behavior is NBC.";
+  }
+
+  extension notNotifyable {
+    description
+      "Indicates that data change notifications shall not be sent 
+      for this attribute. If the extension is not present and other 
+      conditions are fulfilled data change notification should be sent.
+      
+      If a list or container already has the notNotifyable 
+      extension, that is also valid for all contained data nodes.
+
+      The statement MUST only be a substatement of a leaf, leaf-list, list,
+      container statement that is contained within the 'attributes' 
+      container of an IOC and that represents an attribute or sub-parts of 
+      an attribute. If the attribute is represented by a container or list, 
+      the statement shall be put on these, not on data nodes inside the 
+      list/container.
+      Zero or one notNotifyable statement is allowed per parent statement.
+      NO substatements are allowed.
+            
+      Adding this statement is an NBC change, removing it is BC.";
+  }
+
+  extension inVariant {
+    description
+      "Indicates that the value for the data node can only be set when the list 
+      data node representing the containing object(MOI) is created.
+      The above statement in YANG terms means, that the value for the data 
+      node can only be set when the list entry that is the parent of the 
+      restricted node's ancestor container named 'attributes' is being created. 
+      To change the value after that, the mentioned 
+      list data node must be deleted and recreated with the restricted data node
+      having the new value.
+
+      If a list or container already has the inVariant 
+      extension, that is also valid for all contained data nodes.
+
+      It is unnecessary to use and MUST NOT be used for key leafs.
+
+      The statement MUST only be a substatement of a leaf, leaf-list, list,
+      container statement that is contained within the 'attributes' 
+      container of an IOC and that represents an attribute or sub-parts of 
+      an attribute and is config=true. If the attribute is represented by a 
+      container or list, the statement shall be put on these, not on data 
+      nodes inside the list/container.
+      Zero or one inVariant statement is allowed per parent statement.
+      NO substatements are allowed.
+            
+      Adding this statement is an NBC change, removing it is BC.";
+  }
+
+  extension initial-value {
+    description "Specifies a value that the system will set for a leaf
+      leaf-list if a value is not specified for it when its parent list
+      or container is created. The value has no effect in any other
+      modification e.g. changing or removing the value.
+
+      The description statement of the parent statement SHOULD contain
+      the label 'Initial-value: ' followed by the text from the argument.
+
+      The statement MUST only be a substatement of a leaf or leaf-list.
+      The statement MUST NOT be present if the leaf or the leaf-list 
+      has a default statement or the type used for the data node 
+      has a default value.
+      The statement MUST NOT be used for config=false data or in an 
+      action, rpc or notification.
+      Zero or one initial-value statements are allowed for a leaf parent
+      statement. Zero or more initial-value statements are allowed for a
+      leaf-list parent statement. If the leaf-list is ordered-by user, the
+      initial values are stored in the order they appear in the YANG definition.
+      NO substatements are allowed.
+
+      Always consider using a YANG-default statement instead.
+
+      Modification of the initial-value is a non-backwards-compatible change.
+
+      The argument specifies a single initial value for a leaf or leaf-list.
+      The value MUST be part of the valuespace of the leaf/leaf-list.
+      It follows the same rules as the argument of the default statement.";
+
+    argument "initial-value";
+  }
+}

original/Rel-20/28_series/_3gpp-common-yang-types.yang

@@ -0,0 +1,1161 @@
+module _3gpp-common-yang-types {
+  yang-version 1.1;
+  namespace "urn:3gpp:sa5:_3gpp-common-yang-types";
+  prefix "types3gpp";
+
+  import ietf-inet-types { prefix inet; }
+  import ietf-yang-types { prefix yang; }
+  import _3gpp-common-yang-extensions { prefix yext3gpp; }
+
+  organization "3GPP SA5";
+  contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464";
+  description "The model defines a YANG mapping of the top level
+    information classes used for management of 5G networks and
+    network slicing.
+    Copyright 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI,
+    TTA, TTC). All rights reserved.";
+  reference "3GPP TS 28.623";
+
+  // common for rel-19, rel-20
+  revision 2025-10-07 { reference "CR-0573 CR-0582 CR-583"; }
+  revision 2025-10-01 { reference "CR-0578" ; }
+  revision 2025-08-31 { reference "CR-0551 CR-0556 CR-0562"; }
+  revision 2025-02-19 { reference CR-0512; }
+  revision 2025-02-07 { reference CR-0492; }
+  revision 2024-11-25 { reference CR-1442; }
+  revision 2024-11-25 { reference CR-1412; }
+  revision 2024-11-01 { reference CR-0463; }
+  revision 2024-08-13 { reference CR-0387; }
+  revision 2024-05-18 { reference CR-0359; }
+  revision 2024-04-12 { reference CR-0346; }
+  revision 2023-11-06 { reference CR-0305; }
+  revision 2023-09-18 { reference CR-0271 ; }
+  revision 2023-08-09 { reference CR-0266; }
+  revision 2023-05-10 { reference CR-0250; }
+  revision 2023-02-14 { reference CR-0234; }
+  revision 2022-11-04 { reference "CR-0194"; }
+  revision 2022-10-24 { reference CR-0196;  }
+  revision 2022-07-26 { reference "CR-0180" ; }
+  revision 2022-02-09 { reference "CR-0144"; }
+  revision 2021-11-01 { reference "CR-0141"; }
+
+  revision 2021-09-30 {
+    description "Added Longitude, Latitude, TenthOfDegrees, OnOff.";
+    reference "CR-0138";
+  }
+
+  revision 2020-11-06 {
+    description "Removed incorrect S-NSSAI definitions.";
+    reference "CR-0118";
+  }
+
+  revision 2020-03-10 {
+    description "Removed faulty when statements.";
+    reference "SP-200229";
+  }
+
+  revision 2019-10-25 {
+    description "Added ManagedNFProfile.";
+    reference "S5-194457";
+  }
+
+  revision 2019-10-16 {
+    description "Added SAP and usageState.";
+    reference "S5-193518";
+  }
+
+  revision 2019-06-23 {
+    reference  "Initial version.";
+  }
+
+  typedef EnabledDisabled {
+    type enumeration {
+      enum DISABLED ;
+      enum ENABLED ;
+    }
+  }
+
+  grouping nameValuePair {
+    leaf name { type string; }
+    leaf value { type string; }
+  }
+
+  typedef DayOfWeek {
+    type enumeration {
+      enum MONDAY;
+      enum TUESDAY;
+      enum WEDNESDAY;
+      enum THURSDAY;
+      enum FRIDAY;
+      enum SATURDAY;
+      enum SUNDAY;
+    }
+  }
+
+  typedef DateMonth {
+    type uint8 {
+      range 0..12;
+    }
+  }
+
+  typedef DateMonthDay {
+    type uint8 {
+      range 0..31;
+    }
+  }
+
+  typedef FullTime {
+    type yang:time;
+  }
+
+  grouping DayInYearGrp {
+    description "This <<dataType>> represents a day in a year.";
+
+    leaf month {
+      description "It indicates the month in a year.";
+      type DateMonth;
+      mandatory true;
+    }
+
+    leaf monthDay {
+      description "It indicates the day in a month.";
+      type DateMonthDay;
+      mandatory true;
+    }
+  }
+
+  grouping TimeWindowGrp {
+    leaf startTime {
+      type yang:date-and-time;
+      yext3gpp:inVariant;
+    }
+    leaf endTime {
+      type yang:date-and-time;
+      yext3gpp:inVariant;
+    }
+  }
+
+  grouping ProcessMonitorGrp {
+    description "Provides attributes to monitor the progress of processes
+      with specific purpose and limited lifetime running on MnS producers.
+      It may be used as data type for dedicated progress monitor attributes
+      when specifying the management representation of these processes.
+      The attributes in this clause are defined in a generic way.
+      For some attributes specialisations may be provided when specifying a
+      concrete process representation.
+
+      If a management operation on some IOCs triggers an associated
+      asynchronous process (whose progress shall be monitored), this should
+      also result in creating an attribute named 'processMonitor' (of type
+      'ProcessMonitor') in these IOC(s). The processMonitor attribute may be
+      accompanied by use-case specific additional data items.
+
+      The progress of the process is described by the 'status' and
+      'progressPercentage' attributes. Additional textual qualifications for
+      the 'status' attribute may be provided by the 'progressStateInfo' and
+      'resultStateInfo' attributes.
+
+      When the process is instantiated, the 'status' is set to 'NOT_STARTED'
+      and the 'progressPercentage' to '0'. The MnS producer decides when to
+      start executing the process and to transition into the 'RUNNING' state.
+      This time is captured in the 'startTime' attribute. Alternatively, the
+      process may start to execute directly upon its instantiation. One
+      alternative must be selected when using this data type.
+
+      During the 'RUNNING' state the 'progressPercentage' attribute may be
+      repeatedly updated. The exact semantic of this attribute is subject to
+      further specialisation. The 'progressInfo' attribute may be used to
+      provide additional textual information in the 'NOT_STARTED', 'CANCELLING'
+      and 'RUNNING' states. Further specialisation of
+      'progressStateInfo' may be provided where this data type is
+      used.
+
+      Upon successful completion of the process, the 'status' attribute is set
+      to 'FINISHED', the 'progressPercentage' to 100%. The time is captured in
+      the 'endTime' attribute. Additional textual information may be provided
+      in the 'resultStateInfo' attribute. The type of
+      'resultStateInfo' in this data type definition is 'String'.
+      Further specialisation of 'resultStateInfo' may be provided
+      where this data type is used.
+
+      In case the process fails to complete successfully, the 'status'
+      attribute is set to 'FAILED' or 'PARTIALLY_FAILED', the current value of
+      'progressPercentage' is frozen, and the time captured in 'endTime'. The
+      'resultStateInfo' specifies the reason for the failure.
+      Specific failure reasons may be specified where the data type defined in
+      this clause is used. The exact semantic of failure may be subject for
+      further specialisation as well.
+
+      In case the process is cancelled, the 'status' attribute is first set to
+      'CANCELLING' and when the process is really cancelled then to 'CANCELLED'.
+      The transition to 'CANCELLED' is captured in the 'endTime' attribute.
+      The value of 'progressPercentage' is frozen. Additional textual
+      information may be provided in the 'resultStateInfo' attribute.
+
+      The 'resultStateInfo' attribute is provided only for additional textual
+      qualification of the states 'FINISHED', 'FAILED', 'PARTIALLY_FAILED' or
+      'CANCELLED'. It shall not be used for making the outcome, that the
+      process may produce in case of success, available.
+
+      The process may have to be completed within a certain time after its
+      creation, for example because required data may not be available any
+      more after a certain time, or the process outcome is needed until a
+      certain time and when not provided by this time is not needed any more.
+      The time until the MnS producer automatically cancels the process is
+      indicated by the 'timer' attribute.";
+
+    leaf id {
+      type string;
+      mandatory true;
+      description "Id of the process. It is unique within a single
+        multivalue attribute of type ProcessMonitor.";
+    }
+
+    leaf status {
+      type enumeration {
+        enum NOT_STARTED ;
+        enum RUNNING ;
+        enum CANCELLING ;
+        enum FINISHED ;
+        enum FAILED ;
+        enum PARTIALLY_FAILED ;
+        enum CANCELLED ;
+      }
+      config false;
+      default  RUNNING;
+      description "Represents the status of the associated process,
+        whether it fails, succeeds etc.
+        It does not represent the returned values of a successfully finished
+        process. ";
+    }
+
+    leaf progressPercentage {
+      type uint8 {
+        range 0..100;
+      }
+      config false;
+      description "Progress of the associated process as percentage";
+    }
+
+    leaf-list progressStateInfo {
+      type string;
+      config false;
+      description "Additional textual qualification of the states
+        'NOT_STARTED', 'CANCELLING' and 'RUNNING'.
+
+        For specific processes, specific well-defined strings (e.g. string
+        patterns or enums) may be defined as a specialisation.";
+    }
+
+    leaf resultStateInfo {
+      type string;
+      config false;
+      description "Additional textual qualification of the states
+        'FINISHED', 'FAILED', 'PARTIALLY_FAILED and 'CANCELLED'.
+        For example, in the 'FAILED' or 'PARTIALLY_FAILED' state this
+        attribute may be used to provide error reasons.
+
+        This attribute shall not be used to make the outcome of the process
+        available for retrieval, if any. For this purpose, dedicated
+        attributes shall be specified when specifying the representation of
+        a specific process.
+
+        For specific processes, specific well-defined strings (e.g. string
+        patterns or enums) may be defined as a specialisation.";
+    }
+
+    leaf startTime {
+      type yang:date-and-time;
+      config false;
+      description "Start time of the associated process, i.e. the time when the
+        status changed from 'NOT_STARTED' to 'RUNNING'.";
+    }
+
+    leaf endTime {
+      type yang:date-and-time;
+      config false;
+      description "Date and time when status changed to 'SUCCESS', 'CANCELLED',
+        'FAILED' or 'PARTIALLY_FAILED'.
+
+        If the time is in the future, it is the estimated time
+        the process will end.";
+    }
+
+    leaf timer {
+      type uint32;
+      units minutes;
+      description "Time until the associated process is automatically cancelled.
+        If set, the system decreases the timer with time. When it reaches zero
+        the cancellation of the associated process is initiated by the
+        MnS_Producer.
+        If not set, there is no time limit for the process.
+
+        Once the timer is set, the consumer can not change it anymore.
+        If the consumer has not set the timer the MnS Producer may set it.";
+      yext3gpp:notNotifyable;
+    }
+  }
+
+  
+  typedef EutraCellId {
+    type string {
+      pattern '^[A-Fa-f0-9]{7}$';
+    } 
+    description "28-bit string identifying an E-UTRA Cell Id 
+      as specified in clause 9.3.1.9 of 3GPP TS 38.413
+      in hexadecimal representation. Each character in the 
+      string shall take a value of '0' to '9', 'a' to 'f' 
+      or 'A' to 'F' and shall represent 4 bits. 
+      The most significant character representing the 4 most 
+      significant bits of the Cell Id shall appear first in the 
+      string, and the character representing the 4 least 
+      significant bit of the Cell Id shall appear last in the 
+      string."; 
+  }
+
+  typedef NrCellId {
+    type string {
+      pattern '^[A-Fa-f0-9]{9}$';
+    } 
+    description "36-bit string identifying an NR Cell Id 
+      as specified in clause 9.3.1.7 of 3GPP TS 38.413
+      in hexadecimal representation. Each character in the 
+      string shall take a value of '0' to '9', 'a' to 'f' 
+      or 'A' to 'F' and shall represent 4 bits. 
+      The most significant character representing the 4 most 
+      significant bits of the Cell Id shall appear first in the 
+      string, and the character representing the 4 least 
+      significant bit of the Cell Id shall appear last in the 
+      string."; 
+  }
+      
+  grouping NpnIdGrp {
+    description "Represents the NPN supported by the <<IOC>> using this
+      <<dataType>> as one of its attributes in case of the cell is a
+      NPN-only cell.";
+
+    list plmnId {
+      key "mcc mnc";
+      min-elements 1;
+      description "It specifies the PLMN Id of the NPN network.";
+      uses types3gpp:PLMNId;
+    }
+
+    choice npnidChoice {
+      leaf-list cAGIdList {
+        type CagId;
+        max-elements 256;
+        description "It identifies a CAG list containing up to 12
+          CAG-identifiers per Ue or up to 12 CAG-identifiers per cell,
+          see TS 38.331.
+          CAG ID is used to combine with PLMN ID to identify a PNI-NPN.CAG ID is
+          a hexadecimal range with size 32 bit";
+      }
+
+      leaf-list nIDList {
+        type Nid;
+        max-elements 16;
+        description "It identifies a list of NIDs containing up to 16 NIDs, see
+        TS 38.331. NID is used to combine with PLMN ID to identify an SNPN.
+        NID is a hexadecimal range with size 44 bit.";
+      }
+    }
+  }
+
+  typedef TenthOfDegrees {
+    type uint16 {
+      range 0..3600;
+    }
+    units "0.1 degrees";
+    description "A single integral value corresponding to an angle in degrees
+      between 0 and 360 with a resolution of 0.1 degrees.";
+  }
+
+  typedef Latitude {
+    type decimal64 {
+      fraction-digits 4;
+      range "-90.0000..+90.0000";
+    }
+    description "Latitude values";
+  }
+
+  typedef Longitude {
+    type decimal64 {
+      fraction-digits 4;
+      range "-180.0000..+180.0000";
+    }
+    description "Longitude values";
+  }
+
+  typedef Altitude  {
+    type decimal64 {
+      fraction-digits 6;
+    }
+    units "meters";
+    description
+      "Height from a reference 0 value.";
+  }
+
+  grouping GeographicalCoordinates {
+    description "This datatype represents the geographical coordinates";
+    reference "3GPP TS 28.538 clause 6.3.8";
+
+    leaf latitude {
+      type Latitude;
+      mandatory true;
+    }
+
+    leaf longitude {
+      type Longitude;
+      mandatory true;
+    }
+  }
+
+  typedef OnOff {
+    type enumeration {
+      enum ON;
+      enum OFF;
+    }
+  }
+
+
+  typedef usageState {
+    type enumeration {
+      enum IDLE;
+      enum ACTIVE;
+      enum BUSY;
+    }
+    description "It describes whether or not the resource is actively in
+      use at a specific instant, and if so, whether or not it has spare
+      capacity for additional users at that instant. The value is READ-ONLY.";
+    reference "ITU T Recommendation X.731";
+  }
+
+  grouping SAPGrp {
+    leaf host {
+      type inet:host;
+      mandatory true;
+    }
+    leaf port {
+      type inet:port-number;
+      mandatory true;
+    }
+    description "Service access point.";
+    reference "TS 28.622";
+  }
+
+  typedef Mcc {
+    description "The mobile country code consists of three decimal digits,
+      The first digit of the mobile country code identifies the geographic
+      region (the digits 1 and 8 are not used):";
+    type string {
+      pattern '[02-79][0-9][0-9]';
+    }
+    reference "3GPP TS 23.003 subclause 2.2 and 12.1";
+  }
+
+  typedef Mnc {
+    description "The mobile network code consists of two or three
+      decimal digits (for example: MNC of 001 is not the same as MNC of 01)";
+    type string {
+      pattern '[0-9][0-9][0-9]|[0-9][0-9]';
+    }
+    reference "3GPP TS 23.003 subclause 2.2 and 12.1";
+  }
+
+  grouping PLMNId {
+    leaf mcc {
+      mandatory true;
+      type Mcc;
+    }
+    leaf mnc {
+      mandatory true;
+      type Mnc;
+    }
+    reference "TS 38.413 clause 9.3.3.5";
+  }
+
+  typedef Nci {
+    description "NR Cell Identity. The NCI shall be of fixed length of 36 bits
+      and shall be coded using full hexadecimal representation.
+      The exact coding of the NCI is the responsibility of each PLMN operator";
+    reference "TS 23.003";
+    type union {
+      type string {
+        length 36;
+        pattern '[01]+';
+      }
+      type string {
+        length 9;
+        pattern '[a-fA-F0-9]*';
+      }
+    }
+  }
+
+  typedef OperationalState {
+    reference "3GPP TS 28.625 and ITU-T X.731";
+    type enumeration {
+      enum DISABLED {
+        value 0;
+        description "The resource is totally inoperable.";
+      }
+
+      enum ENABLED {
+        value 1;
+        description "The resource is partially or fully operable.";
+      }
+
+    }
+  }
+
+  typedef BasicAdministrativeState {
+    reference "3GPP TS 28.625 and ITU-T X.731";
+    type enumeration {
+      enum LOCKED {
+        value 0;
+        description "The resource is administratively prohibited from performing
+                 services for its users.";
+      }
+
+      enum UNLOCKED {
+        value 1;
+        description "The resource is administratively permitted to perform
+          services for its users. This is independent of its inherent
+          operability.";
+      }
+    }
+  }
+
+  typedef AdministrativeState {
+    reference "3GPP TS 28.625 and ITU-T X.731";
+    type enumeration {
+      enum LOCKED {
+        value 0;
+        description "The resource is administratively prohibited from performing
+                 services for its users.";
+      }
+
+      enum UNLOCKED {
+        value 1;
+        description "The resource is administratively permitted to perform
+          services for its users. This is independent of its inherent
+          operability.";
+      }
+
+      enum SHUTTINGDOWN {
+        value 2;
+        description "Use of the resource is administratively permitted to
+          existing instances of use only. While the system remains in
+          the shutting down state the manager or the managed element
+          may at any time cause the resource to transition to the
+          locked state.";
+      }
+    }
+  }
+
+  typedef AvailabilityStatus {
+      type enumeration {
+          enum IN_TEST;
+          enum FAILED;
+          enum POWER_OFF;
+          enum OFF_LINE;
+          enum OFF_DUTY;
+          enum DEPENDENCY;
+          enum DEGRADED;
+          enum NOT_INSTALLED;
+          enum LOG_FULL;
+       }
+  }
+
+  typedef CellState {
+      type enumeration {
+        enum IDLE;
+        enum INACTIVE;
+        enum ACTIVE;
+     }
+  }
+
+  typedef Nrpci {
+    type uint32;
+    description "Physical Cell Identity (PCI) of the NR cell.";
+    reference "TS 36.211 subclause 6.11";
+  }
+
+  typedef Tac {
+    type string {
+      pattern "([A-Fa-f0-9]{4})|([A-Fa-f0-9]{6})" ;
+    }
+    description "Tracking Area Code
+      2 or 3-octet string identifying a tracking area code as specified in
+      clause 9.3.3.10 of 3GPP TS 38.413 [34], in hexadecimal representation.
+      Each character in the string shall take a value of
+      '0' to '9', 'a' to 'f' or 'A' to 'F' and shall represent 4 bits.
+      The most significant character representing the 4 most significant
+      bits of the TAC shall appear first in the string, and the character
+      representing the 4 least significant bit of the TAC shall appear last
+      in the string.
+
+      pattern: '(^[A-Fa-f0-9]{4}$)|(^[A-Fa-f0-9]{6}$)'
+
+      Examples:
+      A legacy TAC 0x4305 shall be encoded as '4305'.
+      An extended TAC 0x63F84B shall be encoded as '63F84B'";
+    reference "TS 23.003 clause 19.4.2.3";
+  }
+
+  grouping TaiGrp {
+    description "This <<dataType>> defines a Tracking Area Identity (TAI)
+      as specified in clause 28.6 of TS 23.003, clause 8.2 of TS 38.300
+      and clause 9.3.3.11 of TS 38.413. It is composed of the PLMN
+      identifier (PLMN-Id, which is composed of the MCC and MNC) and
+      the Tracking Area Code (TAC).";
+    list plmnId {
+      description "PLMN Identity.";
+      min-elements 1;
+      max-elements 1;
+      key "mcc mnc";
+      uses types3gpp:PLMNId;
+    }
+
+    leaf tac {
+      type Tac;
+      mandatory true;
+      description "Tracking Area Code";
+    }
+  }
+
+  grouping GeoCoordinateGrp {
+    description "Geographical location on earth";
+    leaf latitude {
+      type decimal64 {
+        fraction-digits 4;
+        range -90..90 ;
+      }
+      mandatory true;
+      description "Latitude based on World Geodetic System (1984 version)
+        global reference frame (WGS 84). Positive values correspond to the
+        northern hemisphere.";
+      }
+
+    leaf longitude {
+      type decimal64 {
+        fraction-digits 4;
+        range -180..180 ;
+      }
+      mandatory true;
+      description "Longitude based on World Geodetic System (1984 version)
+        global reference frame (WGS 84). Positive values correspond to
+        degrees east of 0 degrees longitude.";
+    }
+
+    leaf altitude {
+      type Altitude;
+    }
+  }
+
+  grouping GeoCircleGrp {
+    description "a geographical circle identified by reference location and
+      associated distance radius";
+
+    leaf referenceLocation {
+      description "Reference location of the serving cell provided via NTN 
+        (quasi)-Earth fixed cell. This field is only present in an NTN cell. 
+        It is defined as ReferenceLocation-r17 in TS 38.331";
+      type string;
+    }
+
+    leaf distanceRadius {
+      description "It specifies the radius distance from a geographical 
+        coordinates reference point, defined by referenceLocation. Each value 
+        represents 50m distance. This field is only present in an NTN cell.";
+      type uint16;
+      units "50 meters";
+    }
+  }
+  
+  grouping GeoAreaGrp {
+    description "This data type defines a geographical area.
+      The geo-area is either a 'geoPolygon' or a 'geoCircle'.";
+
+    list geoPolygon {
+      description "Specifies the geographical area with a convex polygon.
+        The convex polygon is specified by its corners.";
+        key "latitude longitude";
+      min-elements 3;
+      ordered-by user;
+      uses GeoCoordinateGrp;
+    }
+  }
+
+  typedef AmfRegionId {
+    type union {
+      type uint8 ;
+      type string {
+        length 8;
+        pattern '[01]*';
+      }
+    }
+    reference "clause 2.10.1 of 3GPP TS 23.003";
+  }
+
+    list geoCircle {
+      description "a geographical circle identified by reference location and
+        associated distance radius";
+      key idx;
+      leaf idx { type uint16; }
+      uses GeoCircleGrp;
+    }
+
+  typedef AmfSetId {
+    type union {
+      type uint16 {
+        range '0..1023';
+      }
+      type string {
+        length 8;
+        pattern '[01]*';
+      }
+    }
+    reference "clause 2.10.1 of 3GPP TS 23.003";
+  }
+
+  typedef AmfPointer {
+    type union {
+      type uint8 {
+        range '0..63';
+      }
+      type string {
+        length 6;
+        pattern '[01]*';
+      }
+    }
+    reference "clause 2.10.1 of 3GPP TS 23.003";
+  }
+
+  grouping AmfIdentifier {
+    leaf amfRegionId {
+      type AmfRegionId;
+    }
+    leaf amfSetId {
+      type AmfSetId;
+    }
+    leaf amfPointer {
+      type AmfPointer;
+    }
+    description "The AMFI is constructed from an AMF Region ID,
+      an AMF Set ID and an AMF Pointer.
+      The AMF Region ID identifies the region,
+      the AMF Set ID uniquely identifies the AMF Set within the AMF Region, and
+      the AMF Pointer uniquely identifies the AMF within the AMF Set. ";
+  }
+
+// type definitions especially for core NFs
+
+  typedef NfType {
+    type enumeration {
+      enum NRF;
+      enum UDM;
+      enum AMF;
+      enum SMF;
+      enum AUSF;
+      enum NEF;
+      enum PCF;
+      enum SMSF;
+      enum NSSF;
+      enum UDR;
+      enum LMF;
+      enum GMLC;
+      enum 5G_EIR;
+      enum SEPP;
+      enum UPF;
+      enum N3IWF;
+      enum AF;
+      enum UDSF;
+      enum BSF;
+      enum CHF;
+    }
+  }
+
+  typedef NotificationType {
+    type enumeration {
+      enum N1_MESSAGES;
+      enum N2_INFORMATION;
+      enum LOCATION_NOTIFICATION;
+    }
+  }
+
+  typedef Load {
+    description "Latest known load information of the NF, percentage ";
+    type uint8 {
+      range 0..100;
+    }
+  }
+
+  typedef N1MessageClass {
+    type enumeration {
+      enum 5GMM;
+      enum SM;
+      enum LPP;
+      enum SMS;
+    }
+  }
+
+  typedef N2InformationClass {
+    type enumeration {
+      enum SM;
+      enum NRPPA;
+      enum PWS;
+      enum PWS_BCAL;
+      enum PWS_RF;
+    }
+  }
+
+  grouping DefaultNotificationSubscription {
+
+    leaf notificationType {
+      type NotificationType;
+    }
+
+    leaf callbackUri {
+      type inet:uri;
+    }
+
+     leaf interPlmnCallbackUri {
+      description "It indicates the callback URI to be used by NF Service
+      Producers located in PLMNs that are different from the PLMN of
+      the NF consumer.";
+      type inet:uri;
+    }
+    leaf n1MessageClass {
+      type N1MessageClass;
+    }
+
+    leaf n2InformationClass {
+      type N2InformationClass;
+    }
+
+    leaf versions {
+      description "This attribute identifies the API versions
+      (e.g. v1) supported for the default notification type";
+      //optional
+      type N2InformationClass;
+    }
+    leaf binding {
+      description "This attribute shall contain the value of the Binding
+      Indication for the default subscription notification ";
+      reference " i.e. the value part of 3gpp-Sbi-Binding header, as
+      specified in
+      clause 6.12.4 of 3GPP TS 29.500 76. ";
+      //optional
+      type string;
+      config false;
+    }
+    leaf acceptedEncoding {
+      description "It indicates the content encodings that are accepted by a
+      NF Service Consumer when receiving a notification related to a default
+      notification subscription";
+      reference "IETF RFC 9110 clause 12.5.3 ";
+      //optional
+      type string;
+      config false;
+    }
+    leaf supportedFeatures {
+      description "It is a string, which indicates the features of the service
+      corresponding to the subscribed default notification, which are supported
+      by the NF (Service) instance acting as NF service consumer. The string
+      shall contain a bitmask indicating supported features in hexadecimal
+      representation:Each character in the string shall take a value
+      of 0 to 9, a to f or A to F ";
+      reference "shall represent the support of 4 features as described in
+      table 5.2.2-3 of TS 29.571 [61].";
+      //optional
+      type string;
+      config false;
+    }
+    leaf serviceInfoList {
+      description "It indicates a list of service specific information. It may
+      be present when the notification request of the notification type may be
+      generated by multiple services, i.e. notifications from different
+      services may be received by the subscription.";
+      //optional
+      type string;
+      config false;
+    }
+    leaf callbackUriPrefix {
+      description "It indicates the optional path segment(s) used to construct
+      the prefix of the Callback URIs during the reselection of an NF service
+      consumer, as described in 3GPP TS 29.501";
+      //optional
+      type inet:uri;
+    }
+  }
+
+  grouping Ipv4AddressRange {
+  leaf start {
+    type inet:ipv4-address;
+    }
+  leaf end {
+    type inet:ipv4-address;
+    }
+  }
+
+  grouping Ipv6PrefixRange {
+  leaf start {
+    type inet:ipv6-prefix;
+    }
+  leaf end {
+    type inet:ipv6-prefix;
+    }
+  }
+
+  typedef NsiId {
+    type string;
+  }
+
+  typedef UeMobilityLevel {
+    type enumeration {
+      enum STATIONARY;
+      enum NOMADIC;
+      enum RESTRICTED_MOBILITY;
+      enum FULLY_MOBILITY;
+    }
+  }
+
+  typedef ResourceSharingLevel {
+      type enumeration {
+        enum SHARED;
+        enum NOT_SHARED;
+      }
+  }
+
+  typedef TxDirection {
+      type enumeration {
+        enum DL;
+        enum UL;
+        enum DL_AND_UL;
+      }
+  }
+
+  grouping AddressWithVlan {
+    leaf ipAddress {
+      type inet:ip-address;
+    }
+    leaf vlanId {
+       type uint16;
+    }
+  }
+
+  typedef Nid {
+    description "This represents the Network Identifier, which
+      together with a PLMN ID is used to identify a SNPN.";
+    type string {
+      pattern '^[A-Fa-f0-9]{11}$';
+    }
+    reference "3GPP TS 23.003 and 3GPP TS 23.501 clause 5.3.2.1.";
+  }
+
+  typedef CagId {
+    description "This represents the identifier of a Closed Access
+      Group (CAG), which together with a PLMN ID is used to 
+      identify a PNI-NPN.";
+    type string {
+      pattern '^[A-Fa-f0-9]{8}$';
+    }
+    reference "3GPP TS 23.003 and 3GPP TS 23.501.";
+  }
+
+
+  /* DistinguishedName pattern is built up based on the
+    EBNF in 32.300 clause 7.3  EBNF of DN String Representation
+
+    leaf DN { type string {   //  Same pattern as LocalDN
+      pattern '[A-Z][^,=+<>#;\\"\r\n*.]*=([^,=+<>#;\\"\r\n* ]|(\\[a-fA-F0-9]{2}))(([^,=+<>#;\\"\r\n*]|(\\[a-fA-F0-9]{2}))*([^,=+<>#;\\"\r\n* ]|(\\[a-fA-F0-9]{2})))?(,[A-Z][^,=+<>#;\\"\r\n*.]*=([^,=+<>#;\\"\r\n* ]|(\\[a-fA-F0-9]{2}))(([^,=+<>#;\\"\r\n*]|(\\[a-fA-F0-9]{2}))*([^,=+<>#;\\"\r\n* ]|(\\[a-fA-F0-9]{2})))?)*';
+    } }
+
+    leaf fullLocalDN { type string {   // LocalRDN , { RDNSeparator , LocalRDN }    RDNSeparator is a single , no space or \R allowed   Me.mykey=1 allowed
+      //  (fullLocalRDN)(,(fullLocalRDN))*
+      pattern '(([A-Z][^,=+<>#;\\"\r\n*.]*|([A-Z][^,=+<>#;\\"\r\n*.]*\.[a-z][^,=+<>#;\\"\r\n*.]*))=(([^,=+<>#;\\"\r\n* ]|(\\[a-fA-F0-9]{2}))(([^,=+<>#;\\"\r\n*]|(\\[a-fA-F0-9]{2}))*([^,=+<>#;\\"\r\n* ]|(\\[a-fA-F0-9]{2})))?))(,(([A-Z][^,=+<>#;\\"\r\n*.]*|([A-Z][^,=+<>#;\\"\r\n*.]*\.[a-z][^,=+<>#;\\"\r\n*.]*))=(([^,=+<>#;\\"\r\n* ]|(\\[a-fA-F0-9]{2}))(([^,=+<>#;\\"\r\n*]|(\\[a-fA-F0-9]{2}))*([^,=+<>#;\\"\r\n* ]|(\\[a-fA-F0-9]{2})))?)))*';
+    } }
+
+    leaf LocalDN { type string {   // LocalRDN , { RDNSeparator , LocalRDN }    RDNSeparator is a single , no space or \R allowed
+      //  LocalRDN(,LocalRDN)*
+      pattern '[A-Z][^,=+<>#;\\"\r\n*.]*=([^,=+<>#;\\"\r\n* ]|(\\[a-fA-F0-9]{2}))(([^,=+<>#;\\"\r\n*]|(\\[a-fA-F0-9]{2}))*([^,=+<>#;\\"\r\n* ]|(\\[a-fA-F0-9]{2})))?(,[A-Z][^,=+<>#;\\"\r\n*.]*=([^,=+<>#;\\"\r\n* ]|(\\[a-fA-F0-9]{2}))(([^,=+<>#;\\"\r\n*]|(\\[a-fA-F0-9]{2}))*([^,=+<>#;\\"\r\n* ]|(\\[a-fA-F0-9]{2})))?)*';
+    } }
+
+    leaf fullLocalRDN { type string {   // same as fullLocalDNAttributeTypeAndValue
+      pattern '([A-Z][^,=+<>#;\\"\r\n*.]*|([A-Z][^,=+<>#;\\"\r\n*.]*\.[a-z][^,=+<>#;\\"\r\n*.]*))=(([^,=+<>#;\\"\r\n* ]|(\\[a-fA-F0-9]{2}))(([^,=+<>#;\\"\r\n*]|(\\[a-fA-F0-9]{2}))*([^,=+<>#;\\"\r\n* ]|(\\[a-fA-F0-9]{2})))?)';
+    } }
+
+    leaf LocalRDN { type string {   // same as LocalDNAttributeTypeAndValue
+      pattern '[A-Z][^,=+<>#;\\"\r\n*.]*=([^,=+<>#;\\"\r\n* ]|(\\[a-fA-F0-9]{2}))(([^,=+<>#;\\"\r\n*]|(\\[a-fA-F0-9]{2}))*([^,=+<>#;\\"\r\n* ]|(\\[a-fA-F0-9]{2})))?';
+    } }
+
+    leaf fullLocalDNAttributeTypeAndValue { type string { // LocalDNAttributeType , AttributeTypeAndValueSeparator , RegularAttributeValue
+      // pattern LocalDNAttributeType=RegularAttributeValue
+      pattern '([A-Z][^,=+<>#;\\"\r\n*.]*|([A-Z][^,=+<>#;\\"\r\n*.]*\.[a-z][^,=+<>#;\\"\r\n*.]*))=(([^,=+<>#;\\"\r\n* ]|(\\[a-fA-F0-9]{2}))(([^,=+<>#;\\"\r\n*]|(\\[a-fA-F0-9]{2}))*([^,=+<>#;\\"\r\n* ]|(\\[a-fA-F0-9]{2})))?)';
+    } }
+
+      // limitation: NamesOfClassAndNamingAttributenot supported Me.mykey=1
+    leaf LocalDNAttributeTypeAndValue { type string {
+      // ebnf1          LocalDNAttributeType , AttributeTypeAndValueSeparator , RegularAttributeValue
+      // ebnf2-limited  NameOfClassWithIdAttribute , AttributeTypeAndValueSeparator , RegularAttributeValue
+      // pattern        NameOfClassWithIdAttribute=RegularAttributeValue
+      pattern '[A-Z][^,=+<>#;\\"\r\n*.]*=([^,=+<>#;\\"\r\n* ]|(\\[a-fA-F0-9]{2}))(([^,=+<>#;\\"\r\n*]|(\\[a-fA-F0-9]{2}))*([^,=+<>#;\\"\r\n* ]|(\\[a-fA-F0-9]{2})))?';
+    } }
+
+    leaf LocalDNAttributeType { type string {   // NameOfClassWithIdAttribute | NamesOfClassAndNamingAttribute  RDNSeparator is a single , no space or \R allowed
+      //  NameOfClassWithIdAttribute|NamesOfClassAndNamingAttribute
+      pattern '[A-Z][^,=+<>#;\\"\r\n*.]*|([A-Z][^,=+<>#;\\"\r\n*.]*\.[a-z][^,=+<>#;\\"\r\n*.]*)';
+    } }
+
+    leaf RegularAttributeValue { type string {       // ( AttributeValueChar - SpaceChar ) , [ { AttributeValueChar } , ( AttributeValueChar - SpaceChar ) ]
+      pattern '([^,=+<>#;\\"\r\n* ]|(\\[a-fA-F0-9]{2}))(([^,=+<>#;\\"\r\n*]|(\\[a-fA-F0-9]{2}))*([^,=+<>#;\\"\r\n* ]|(\\[a-fA-F0-9]{2})))?' ;
+    } }
+
+    leaf NamesOfClassAndNamingAttribute  { type string {  // ClassName , ClassNamingAttributeSeparator , NamingAttributeName
+      // pattern: ClassName\.NamingAttributeName
+      pattern '[A-Z][^,=+<>#;\\"\r\n*.]*\.[a-z][^,=+<>#;\\"\r\n*.]*' ;
+    } }
+
+    leaf restrictiveClassName { type string {     //
+      pattern '[a-zA-Z][a-zA-Z0-9-_]*' ;
+    } }
+
+    leaf ClassName { type string {     // CapitalLetterChar , { LocalDNAttributeTypeChar }
+      pattern '[A-Z][^,=+<>#;\\"\r\n*.]*' ;
+    } }
+
+    leaf NamingAttributeName { type string {   // SmallLetterChar , { LocalDNAttributeTypeChar }
+      pattern '[a-z][^,=+<>#;\\"\r\n*.]*' ;
+    } }
+
+  */
+  typedef DistinguishedName {
+    type string {
+      pattern '[A-Z][^,=+<>#;\\"\r\n*.]*=([^,=+<>#;\\"\r\n* ]|'
+      + '(\\[a-fA-F0-9]{2}))(([^,=+<>#;\\"\r\n*]|(\\[a-fA-F0-9]{2}))*'
+      + '([^,=+<>#;\\"\r\n* ]|(\\[a-fA-F0-9]{2})))?'
+      + '(,[A-Z][^,=+<>#;\\"\r\n*.]*=([^,=+<>#;\\"\r\n* ]|(\\[a-fA-F0-9]{2}))'
+      + '(([^,=+<>#;\\"\r\n*]|(\\[a-fA-F0-9]{2}))*'
+      + '([^,=+<>#;\\"\r\n* ]|(\\[a-fA-F0-9]{2})))?)*';
+    }
+    description "Represents the 3GPP standard for DistinguishedName.
+
+      Limitations:
+      - RDNSeparator: don't allow SpaceChar or CarriageReturnChar
+      - NullDN: Disallow nullDN that is the same as not providing a DN
+      - NamesOfClassAndNamingAttribute format not allowed
+        (eg. ManagedElement.mykey=345436)";
+    reference  "3GPP TS 32.300";
+  }
+
+  typedef QOffsetRange  {
+    type int8 {
+      range "-24 | -22 | -20 | -18 | -16 | -14 | -12 | -10 | -8 | -6 | " +
+        " -5 | -4 | -3 | -2 | -1 | 0 | 1 | 2 | 3 | 4 | 5 | 6 | 8 | 10 | " +
+        " 12 | 14 | 16 | 18 | 20 | 22 | 24";
+    }
+    units dB;
+  }
+
+  grouping ReportingCtrl {
+    choice reportingCtrl {
+      mandatory true;
+      description "
+        This choice defines the method for reporting collected performance
+        metrics to MnS consumers as well as the parameters for configuring the
+        reporting function. It is a choice between the control parameter
+        required for the reporting methods, whose presence selects the
+        reporting method as follows:
+
+        - When only the fileReportingPeriod attribute is present, the MnS
+        producer shall store files on the MnS producer at a location selected
+        by the MnS producer and, on condition that an appropriate subscription
+        is in place, inform the MnS consumer about the availability of new
+        files and the file location using the notifyFileReady notification.
+        In case the preparation of a file fails, 'notifyFilePreparationError'
+        shall be sent instead.
+
+        - When the 'fileReportingPeriod' and 'notificationRecipientAddress'
+        attributes are present, then the MnS producer shall behave like
+        described for the case that only the 'fileReportingPeriod' is present.
+        In addition, the MnS producer shall create on behalf of the MnS
+        consumer a subscription, using 'NtfSubscriptionControl', for the
+        notification types 'notifyMOICreation' and 'notifyMOIDeletion' related
+        to the 'File' instances that will be produced later. In case an
+        existing subscription does already include the 'File' instances to be
+        produced, no new subscription shall be created. The
+        'notificationRecipientAddress' attribute in the created
+        'NtfSubscriptionControl' instance shall be set to the value of the
+        'notificationRecipientAddress' in the related 'PerfMetricJob'. This
+        feature is called implicit notification subscription, as opposed to the
+        case where the MnS consumer creates the subscription (explicit
+        notification subscription). When the related 'PerfMetricJob' is
+        deleted, the 'NtfSubscriptionControl' instance created due to the
+        request for implicit subscription shall be deleted as well.
+        - When only the 'fileReportingPeriod' and 'fileLocation' attributes
+        are present (CHOICE_3), the MnS producer shall store the files at the
+        location specified by 'fileLocation'. The file location may identify
+        any entity such as a file server or a MnS consumer. The identified
+        MnS consumer may or may not be identical to the MnS consumer creating
+        the 'PerfMetricJob'. The MnS producer may emit 'notifyFileReady' and
+        'notifyFilePreparationError' notifications to inform subscribers that
+        a file has been made available at the location specified by
+        'fileLocation'.
+
+        - When only the streamTarget attribute is present, the MnS producer
+        shall stream the data to the location specified by streamTarget.
+
+        For the file-based reporting methods the fileReportingPeriod attribute
+        specifies the time window during which collected measurements are
+        stored into the same file before the file is closed and a new file is
+        opened.";
+
+      case file-based-reporting {
+        leaf fileReportingPeriod {
+          type uint32 {
+            range 1..max;
+          }
+          units minutes;
+          mandatory true;
+          description "For the file-based reporting method this is the time
+            window during which collected measurements are stored into the same
+            file before the file is closed and a new file is opened.
+            The time-period must be a multiple of the granularityPeriod.
+
+            Applicable when the file-based reporting method is supported.";
+        }
+        choice reporting-target {
+          case file-target {
+            leaf fileLocation {
+            type string ;
+            description "Applicable and must be present when the file-based
+              reporting method is supported, and the files are stored on the
+              MnS consumer.";
+            }
+          }
+          case notification-target {
+            leaf notificationRecipientAddress {
+            type string;
+            description "Must be present when the notification-based reporting
+              method is supported, and the the files are available as
+              notifications for the MnS consumer to subscribe to.";
+            }
+          }
+        description "When netiher fileLocation or notificationRecipientAddress
+          are present, the files are stored and available to the MnS consumer
+          if the MnS subscribes to the notifyFileReady notification.";
+        }
+      }
+
+      case stream-based-reporting {
+        leaf streamTarget {
+          type string;
+          mandatory true;
+          description "Applicable when stream-based reporting method is
+            supported.";
+        }
+      }
+    }
+  }
+}

original/Rel-20/28_series/_3gpp-nr-nrm-cpciconfigurationfunction.yang

@@ -0,0 +1,77 @@
+module _3gpp-nr-nrm-cpciconfigurationfunction {
+  yang-version 1.1;
+  namespace "urn:3gpp:sa5:_3gpp-nr-nrm-cpciconfigurationfunction";
+  prefix "cpcicf3gpp";
+
+  import _3gpp-common-subnetwork { prefix subnet3gpp; }
+  import _3gpp-common-top { prefix top3gpp; }
+  import _3gpp-nr-nrm-nrcelldu { prefix nrcelldu3gpp; }
+  import _3gpp-nr-nrm-gnbdufunction { prefix gnbdu3gpp; }
+  import _3gpp-common-managed-element { prefix me3gpp; }
+
+  organization "3GPP SA5";
+  contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464";
+  description "Represents the CPCIConfigurationFunction Information Object 
+    Class(IOC) that is part of the NR Network Resource Model.
+    Copyright 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, 
+    TTA, TTC). All rights reserved.";
+  reference "3GPP TS 28.541 5G Network Resource Model (NRM)";
+
+  revision 2023-09-18 { reference CR-1043 ; } 
+  revision 2021-08-05 { reference S5-214053/CR-0518; }
+  revision 2020-05-08 { reference S5-203316; }
+
+  grouping CPCIConfigurationFunctionGrp {
+    description "Represents the CPCIConfigurationFunction IOC.";
+
+    leaf cPciConfigurationControl {
+        description "This attribute determines whether the Centralized SON 
+          PCI configuration function is enabled or disabled.";
+        type boolean;
+        mandatory true;
+    }
+
+    leaf-list cSonPciList {
+      type int32 { range "0..1007"; }
+      min-elements 1;
+      description "Holds a list of physical cell identities that can be 
+        assigned to the pci attribute by gNB. The assignment algorithm is not 
+        specified. 
+        See TS 38.211 clause 7.4.2.1 for legal values of pci.
+        This attribute shall be supported if and only if the C-SON PCI 
+        configuration is supported.";
+      reference "See TS 38.211 clause 7.4.2.1";
+    }
+  }
+
+  grouping CPCIConfigurationFunctionSubtree {
+    list CPCIConfigurationFunction {
+      description "This IOC contains attributes to support the Cross 
+        Domain-Centralized SON function of PCI configuration
+        
+        In the case where multiple CPCIConfiguration MOIs exist at different 
+        levels of the containment tree, the CPCIConfiguration MOI at the lower 
+        level overrides the CPCIConfiguration MOIs at higher level(s) of the 
+        same containment tree.";
+      reference "clause 7.2.1 in TS 28.313";
+      key id;   
+      uses top3gpp:Top_Grp ;      
+      container attributes {
+        uses CPCIConfigurationFunctionGrp ;
+      }      
+    }
+  }
+
+  augment /me3gpp:ManagedElement/gnbdu3gpp:GNBDUFunction/nrcelldu3gpp:NRCellDU {
+    if-feature nrcelldu3gpp:CPCIConfigurationFunction;
+    uses CPCIConfigurationFunctionSubtree;
+  }
+  augment /me3gpp:ManagedElement {
+    if-feature me3gpp:CPCIConfigurationFunction;
+    uses CPCIConfigurationFunctionSubtree;
+  }
+  augment /subnet3gpp:SubNetwork {
+    if-feature subnet3gpp:CPCIConfigurationFunction;
+    uses CPCIConfigurationFunctionSubtree;
+  }
+}

original/Rel-20/28_series/_3gpp-nr-nrm-dmrofunction.yang

@@ -0,0 +1,118 @@
+module _3gpp-nr-nrm-dmrofunction {
+  yang-version 1.1;
+  namespace "urn:3gpp:sa5:_3gpp-nr-nrm-dmrofunction";
+  prefix "dmrof3gpp";
+
+  import _3gpp-common-subnetwork { prefix subnet3gpp; }
+  import _3gpp-common-top { prefix top3gpp; }
+  import _3gpp-nr-nrm-gnbcucpfunction { prefix gnbcucp3gpp; }
+  import _3gpp-common-managed-element { prefix me3gpp; }
+  import _3gpp-nr-nrm-nrcellcu { prefix nrcellcu3gpp; }
+  import _3gpp-common-yang-types { prefix types3gpp; }
+
+  organization "3GPP SA5";
+  contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464";
+  description "Defines the YANG mapping of the DMROFunction 
+    Information Object Class (IOC) that is part of the NR Network Resource 
+    Model (NRM).
+    Copyright 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, 
+    TTA, TTC). All rights reserved.";
+  reference "3GPP TS 28.541 5G Network Resource Model (NRM)";
+
+  revision 2024-08-07 { reference CR-1331; }  
+  revision 2023-09-18 { reference CR-1043 ; } 
+  revision 2022-01-07 { reference CR-0633; }
+  revision 2021-08-05 { reference S5-214053/CR-0518; }
+  revision 2020-05-08 { reference S5-203316; }
+
+  grouping DMROFunctionGrp {
+    description "Represents the DMROFunction IOC.";
+
+
+    leaf maximumDeviationHoTriggerLow {
+      description "This parameter defines the maximum allowed lower 
+        deviation of the Handover Trigger, from the default point of 
+        operation.";
+      type int32 {range "-20..20";}
+      units "0.5 dB";
+    }
+ 
+    leaf maximumDeviationHoTriggerHigh {
+      description "This parameter defines the maximum allowed upper 
+        deviation of the Handover Trigger, from the default point of 
+        operation.";
+      type int32 {range "-20..20";}
+      units "0.5 dB";
+    }
+
+    leaf minimumTimeBetweenHoTriggerChange {
+      description "This parameter defines the minimum allowed time interval
+        between two Handover Trigger change performed by MRO. This is used to 
+        control the stability and convergence of the algorithm.";
+      type uint32 { 
+        range 0..604800; // <= 1 week
+      }
+      units seconds;
+    }
+    leaf tstoreUEcntxt {
+      description "The timer used for detection of too early HO, too late HO 
+        and HO to wrong cell.";
+      type uint32 { 
+        range 0..1023;
+      }
+      units "100 milliseconds";
+    }
+    leaf dmroControl {
+      description "This attribute determines whether the MRO function is 
+        enabled or disabled.";
+      type boolean;
+    }
+        leaf-list mLModelRefList {
+      type types3gpp:DistinguishedName;
+      description "This attribute holds a DN list of MLModel ¨
+        (See TS 28.105).";
+      config false;
+    }
+    leaf-list aIMLInferenceFunctionRefList {
+      type types3gpp:DistinguishedName;
+      description "This attribute holds a DN list of AIMLInferenceFunction
+        (See TS 28.105) .";
+      config false;
+    }
+  }
+
+  grouping DMROFunctionSubtree {
+    list DMROFunction {
+      description "This IOC contains attributes to support the D-SON function 
+        of MRO.
+
+        In the case where multiple DMRO MOIs exist at different levels of the 
+        containment tree, the DMRO MOI at the lower level overrides the DMRO 
+        MOIs at higher level(s) of the same containment tree.";
+      reference "clause 7.1.2 in TS 28.313";
+      key id;   
+      uses top3gpp:Top_Grp;
+      container attributes {
+        uses DMROFunctionGrp;
+      }      
+    }
+  }
+
+  augment "/me3gpp:ManagedElement/gnbcucp3gpp:GNBCUCPFunction/"+
+      "nrcellcu3gpp:NRCellCU" {
+    if-feature nrcellcu3gpp:DMROFunction;
+    uses DMROFunctionSubtree;
+  }
+  augment /me3gpp:ManagedElement/gnbcucp3gpp:GNBCUCPFunction {
+    if-feature gnbcucp3gpp:DMROFunction;
+    uses DMROFunctionSubtree;
+  }
+  augment /me3gpp:ManagedElement {
+    if-feature me3gpp:DMROFunction;
+    uses DMROFunctionSubtree;
+  }
+  augment /subnet3gpp:SubNetwork {
+    if-feature subnet3gpp:DMROFunction;
+    uses DMROFunctionSubtree;
+  }
+}

original/Rel-20/28_series/_3gpp-nr-nrm-eutrancellrelation.yang

@@ -0,0 +1,163 @@
+module _3gpp-nr-nrm-eutrancellrelation {
+  yang-version 1.1;
+  namespace "urn:3gpp:sa5:_3gpp-nr-nrm-eutrancellrelation";
+  prefix "eutrancellrel3gpp";
+    
+  import _3gpp-common-yang-types { prefix types3gpp; }
+  import _3gpp-common-managed-function { prefix mf3gpp; }
+  import _3gpp-common-managed-element { prefix me3gpp; }
+  import _3gpp-nr-nrm-gnbcucpfunction { prefix gnbcucp3gpp; }
+  import _3gpp-nr-nrm-nrcellcu { prefix nrcellcu3gpp; }
+  import _3gpp-common-top { prefix top3gpp; }
+
+  organization "3GPP SA5";
+  description "Defines the YANG mapping of the EUtranCellRelation Information
+    Object Class (IOC) that is part of the NR Network Resource Model (NRM).
+    Copyright 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, 
+    TTA, TTC). All rights reserved.";
+  reference "3GPP TS 28.541 5G Network Resource Model (NRM)";
+
+  revision 2023-09-18 { reference CR-1043 ; } 
+  revision 2019-10-28 { reference S5-193518 ; }
+  revision 2019-06-17 {
+    description "Initial revision";
+  }
+
+  typedef ActionAllowed {
+    type enumeration {
+      enum YES;
+      enum NO;                            
+    }
+  }
+  
+  typedef EnergySavingCoverage {
+    type enumeration {
+      enum YES;
+      enum NO; 
+      enum PARTIAL;                       
+    }
+  }
+
+  grouping EUtranCellRelationGrp {
+    description "Represents the EUtranCellRelation IOC.";
+    reference "3GPP TS 28.541, EUtranRelation in 3GPP TS 28.658";
+    uses mf3gpp:ManagedFunctionGrp;
+
+    leaf tCI {
+      description "Target Cell Identifier. Consists of E-UTRAN Cell Global
+        Identifier (ECGI) and Physical Cell Identifier (PCI) of the target
+        cell. Identifies the target cell from the perspective of the parent
+        cell instance.";
+      mandatory true;
+      type uint64;
+    }
+
+    leaf isRemoveAllowed {
+      description "Indicates if the subject EUtranCellRelation can be removed
+        (deleted) or not. If YES, the subject EUtranCellRelation instance can
+        be removed (deleted). If NO, the subject EUtranCellRelation instance
+        shall not be removed (deleted) by any entity but an IRPManager.";
+      mandatory true;
+      type ActionAllowed;
+    }
+
+    leaf isHOAllowed {
+      description "Indicates if handover is allowed or prohibited. If YES,
+        handover is allowed from source cell to target cell. Source cell is
+        represented by the parent cell instance. Target cell is the adjacent
+        cell referenced by this EUtranCellRelation instance. If NO, handover
+        shall not be allowed.";
+      mandatory true;
+      type ActionAllowed;
+    }
+    leaf isENDCAllowed {
+      description "Indicates if EN-DC is allowed or prohibited. If TRUE,
+        the target cell is allowed to be used for EN-DC. The target cell is
+        referenced by the NRCellRelation that contains this isENDCAllowed.
+        If FALSE, EN-DC shall not be allowed.";
+      mandatory true;
+      type ActionAllowed;
+    }
+
+
+    leaf isICICInformationSendAllowed {
+      description "Indicates if ICIC (Inter Cell Interference Coordination)
+        load information message sending is allowed or prohibited. If YES,
+        ICIC load information message sending is allowed from source cell to
+        target cell. Source cell is represented by the parent cell instance.
+        Target cell is the adjacent cell referenced by this EUtranCellRelation
+        instance. If NO, ICIC load information message sending shall not be
+        allowed.";
+      reference "3GPP TS 36.423"; 
+      mandatory true;
+      type ActionAllowed;
+    }
+
+    leaf isLBAllowed {
+      description "Indicates if load balancing is allowed or prohibited from
+        source cell to target cell. If YES, load balancing is allowed from
+        source cell to target cell. Source cell is represented by the parent
+        cell instance. Target cell is the adjacent cell referenced by this
+        EUtranCellRelation instance. If NO, load balancing shall be prohibited
+        from source cell to target cell.";
+      mandatory true;
+      type ActionAllowed;
+    }
+
+    leaf isESCoveredBy {
+      description "Indicates whether the adjacent cell according to this
+        planning provides no, partial or full coverage for the parent cell
+        instance. Adjacent cells with this attribute equal to YES are
+        recommended to be considered as candidate cells to take over the
+        coverage when the original cell is about to be transferred to energy
+        saving state. The entirety of adjacent cells with this property equal
+        to PARTIAL are recommended to be considered as entirety of candidate
+        cells to take over the coverage when the original cell is about to be
+        transferred to energy saving state.";
+      mandatory true;
+      type EnergySavingCoverage;
+    }
+
+    leaf qOffset {
+      description "Offset applicable to a specific neighbouring cell used for
+        evaluating the cell as a candidate for cell re-selection. Corresponds
+        to parameter q-OffsetCell broadcast in SIB4 for intra-frequency cells
+        and in SIB5 for inter-frequency cells. Used for Mobility Robustness
+        Optimization.";
+      reference "3GPP TS 36.331";
+      mandatory true;
+      type types3gpp:QOffsetRange;
+    }
+
+    leaf cellIndividualOffset {
+      description "Offset applicable to a neighbouring cell. It is used for
+        evaluating the neighbouring cell for handover in connected mode. Used
+        by the HandOver parameter Optimization (HOO) function or Load 
+        Balancing Optimization (LBO) function.";
+      reference "3GPP TS 36.331";
+      config false;
+      type types3gpp:QOffsetRange;
+    }
+
+    leaf adjacentCell {
+      description "Reference to an EUtranCellFDD/TDD or
+        ExternalEUtranCellFDD/TDD instance.";
+      mandatory true;
+      type types3gpp:DistinguishedName;
+    }
+  }
+
+  augment /me3gpp:ManagedElement/gnbcucp3gpp:GNBCUCPFunction/nrcellcu3gpp:NRCellCU {
+
+    list EUtranCellRelation {
+      description "Represents a relation between an NR cell and an E-UTRAN cell.";
+      reference "3GPP TS 28.541";	
+      key id;
+      uses top3gpp:Top_Grp;
+      container attributes {    
+        uses EUtranCellRelationGrp;
+      }
+      uses mf3gpp:ManagedFunctionContainedClasses;
+    }
+  }
+}

original/Rel-20/28_series/_3gpp-nr-nrm-eutranetwork.yang

@@ -0,0 +1,37 @@
+module _3gpp-nr-nrm-eutranetwork {
+  yang-version 1.1;
+  namespace "urn:3gpp:sa5:_3gpp-nr-nrm-eutranetwork";
+  prefix "eutranet3gpp";
+
+  import _3gpp-common-managed-element { prefix me3gpp; }
+  import _3gpp-nr-nrm-gnbcucpfunction { prefix gnbcucp3gpp; }
+  import _3gpp-common-top { prefix top3gpp; }
+
+  organization "3GPP SA5";
+  contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464";
+  description "Defines the YANG mapping of the EUtraNetwork Information Object
+    Class (IOC) that is part of the NR Network Resource Model (NRM).
+    Copyright 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, 
+    TTA, TTC). All rights reserved.";
+  reference "3GPP TS 28.541 5G Network Resource Model (NRM)";
+
+  revision 2025-04-25 { reference "CR-1526 CR-1527" ; } // common for r18, r19
+  revision 2023-09-18 { reference CR-1043 ; } 
+  revision 2019-06-17 {reference "Initial revision"; }
+
+  grouping EUtraNetworkGrp {
+    description "Represents the EUtraNetwork IOC.
+      Contains no additiona attributes.";
+  }
+
+  augment /me3gpp:ManagedElement/gnbcucp3gpp:GNBCUCPFunction {  
+    list EUtraNetwork {
+      description "A subnetwork containing gNB external E-UTRAN entities.";
+      key id;
+      uses top3gpp:Top_Grp;
+      container attributes {
+        uses EUtraNetworkGrp;
+      }  
+    }
+  }
+}

original/Rel-20/28_series/_3gpp-nr-nrm-externalamffunction.yang

@@ -0,0 +1,64 @@
+module _3gpp-nr-nrm-externalamffunction {
+  yang-version 1.1;
+  namespace "urn:3gpp:sa5:_3gpp-nr-nrm-externalamffunction";
+  prefix "extamf3gpp";
+    
+  import _3gpp-common-managed-function { prefix mf3gpp; }
+  import _3gpp-common-subnetwork { prefix subnet3gpp; }
+  import _3gpp-common-top { prefix top3gpp; }
+  import _3gpp-common-yang-types { prefix types3gpp; }
+
+  organization "3GPP SA5";
+  contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464";
+  description "Defines the YANG mapping of the ExternalAMFFunction Information
+    Object Class (IOC) that is part of the NR Network Resource Model (NRM).
+    Copyright 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, 
+    TTA, TTC). All rights reserved.";
+  reference "3GPP TS 28.541 5G Network Resource Model (NRM)";
+
+  revision 2025-04-25 { reference "CR-1526 CR-1527" ; } // common for r18, r19
+  revision 2023-09-18 { reference CR-1043 ; } 
+  revision 2019-10-28 { reference S5-193518 ; }
+  revision 2019-06-17 { reference "Initial revision"; }
+
+  grouping ExternalAMFFunctionGrp {
+    description "Represents the ExternalAMFFunction IOC.";
+    uses mf3gpp:ManagedFunctionGrp;
+
+    list pLMNIdList {
+      description "List of at most six entries of PLMN Identifiers, but at least 
+        one (the primary PLMN Id).
+        The PLMN Identifier is composed of a Mobile Country Code (MCC) and a 
+        Mobile Network Code (MNC).";
+      min-elements 1;
+      max-elements 6;
+      key "mcc mnc";
+      uses types3gpp:PLMNId;
+    }
+    
+    container aMFIdentifier {
+      presence true;
+      description "An AMF identifier, comprising an AMF Region ID, an AMF Set ID and an AMF Pointer.";
+      uses types3gpp:AmfIdentifier;
+    }
+  }
+
+  grouping ExternalAMFFunctionWrapper {
+    list ExternalAMFFunction {
+      description "Represents the properties, known by the management
+        function, of a AMFFunction managed by another management
+        function.";
+      reference "3GPP TS 28.541";
+      key id;
+      uses top3gpp:Top_Grp;
+      container attributes {
+        uses ExternalAMFFunctionGrp;
+      }
+      uses mf3gpp:ManagedFunctionContainedClasses;
+    }
+  } 
+  
+  augment "/subnet3gpp:SubNetwork" {
+    uses ExternalAMFFunctionWrapper;
+  }
+}

original/Rel-20/28_series/_3gpp-nr-nrm-externaleutrancell.yang

@@ -0,0 +1,133 @@
+module _3gpp-nr-nrm-externaleutrancell {
+  yang-version 1.1;
+  namespace "urn:3gpp:sa5:_3gpp-nr-nrm-externaleutrancell";
+  prefix "exteutrancell3gpp";
+
+  import _3gpp-common-yang-types { prefix types3gpp; }
+  import _3gpp-common-managed-function { prefix mf3gpp; }
+  import _3gpp-common-top { prefix top3gpp; }
+
+  organization "3GPP SA5";
+  contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464";
+  description "Defines the YANG mapping of the ExternalEUtranCellFDD and
+    ExternalEUtranCellTDD Information Object Classes (IOCs) that are part
+    of the NR Network Resource Model (NRM).
+    Copyright 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, 
+    TTA, TTC). All rights reserved.";
+  reference "3GPP TS 28.541 5G Network Resource Model (NRM),
+    3GPP TS 28.658 (E-UTRAN) Network Resource Model (NRM)";
+
+  revision 2025-04-25 { reference "CR-1526 CR-1527" ; } // common for r18, r19
+  revision 2023-09-18 { reference CR-1043 ; } 
+  revision 2019-10-28 { reference S5-193518 ; }
+  revision 2019-06-17 { reference "Initial revision"; }
+
+  grouping ExternalEUtranGenericCellGrp {
+    description "Represents the ExternalEUtranGenericCell IOC."; 
+    reference "3GPP TS 28.658";
+    uses mf3gpp:ManagedFunctionGrp;
+
+    leaf pci {
+      description "The Physical Cell Identity (PCI) of the cell (for
+        NM-Centralized, EM-Centralized and Distributed PCI assignment cases).
+        In the case of NM-Centralized PCI assignment, see 3GPP TS 36.300.";
+      reference "3GPP TS 36.211";
+      mandatory true;
+      type int32 { range "0..503"; }
+    }
+
+    list plmnIdList {
+      description "List of unique identities for PLMNs. A cell can broadcast
+        up to 6 PLMN IDs. This is to support the case that one cell can be
+        used by up to 6 operator's core networks. The PLMN(s) included in this
+        list will use the same single tracking area code (TAC) and the same
+        Cell Identity (cellLocalId) for sharing the radio access network
+        resources. One member of plmnIdList is the primary PLMN ID. A PLMN ID
+        included in this list cannot be included in the cellAccessInfoList.
+        The PLMN ID is composed of a Mobile Country Code (MCC) and a Mobile
+        Network Code (MNC).";
+      reference "3GPP TS 36.300, 3GPP TS 36.331, 3GPP TS 23.003";
+      key "mcc mnc";
+      min-elements 1;
+      max-elements 6;
+      uses types3gpp:PLMNId;
+    }
+
+    leaf cellLocalId {       	
+      description "Unambiguously identifies a cell within an eNodeB.";
+      reference "NCI defined in 3GPP TS 38.300";
+      type int32 {range "0..255"; }     	
+    }
+
+    leaf eNBId {
+      description "Unambiguously identifies an eNodeB within a PLMN.";
+      reference "3GPP TS 36.413, 3GPP TS 36.300";
+      mandatory true;
+      type int32 { range "0..268435455"; } // Representing 28 bit eNB ID.
+                                           // 18, 20 and 21 bit eNB IDs also
+                                           // allowed.
+    }
+  }
+  
+  grouping ExternalEUtranCellFDDGrp {
+    description "Represents the ExternalEUtranCellFDD IOC."; 
+    reference "3GPP TS 28.658";
+    uses ExternalEUtranGenericCellGrp;
+
+    leaf earfcnDL {
+      description "The channel number for the central DL frequency.";
+      reference "3GPP TS 36.101";
+      mandatory true;
+      type int32 { range "0..17999 | 46590..262143"; }
+    }
+
+    leaf earfcnUL {
+      description "The channel number for the central UL frequency. Value 0
+        means that the UL channel number is N/A for the DL-only bands.";
+      reference "3GPP TS 36.101";
+      mandatory true;
+      type int32 { range "0 | 18000..35999 | 46590..262143"; }
+    }
+  }
+
+  grouping ExternalEUtranCellTDDGrp {
+    description "Represents the ExternalEUtranCellTDD IOC."; 
+    reference "3GPP TS 28.658";
+    uses ExternalEUtranGenericCellGrp;
+
+    leaf earfcn {
+      description "The frequency number for the central frequency.";
+      reference "3GPP TS 36.104";
+      mandatory true;
+      type int32 { range "36000..262143"; }
+    }
+  }
+
+  grouping ExternalEUtranCellFDDSubtree {
+    list ExternalEUtranCellFDD {
+      description "Represents the common properties of external E-UTRAN FDD
+        cell provided by eNB or NG-RAN FDD cell provided by ng-eNB.";
+      reference "3GPP TS 28.658";
+      key id;
+      uses top3gpp:Top_Grp;
+      container attributes {
+        uses ExternalEUtranCellFDDGrp;
+      }
+      uses mf3gpp:ManagedFunctionContainedClasses;
+    }
+  }
+
+  grouping ExternalEUtranCellTDDSubtree {
+    list ExternalEUtranCellTDD {
+      description "Represents the common properties of external E-UTRAN cell
+        TDD provided by eNB or NG-RAN TDD cell provided by ng-eNB.";
+      reference "3GPP TS 28.658";
+      key id;
+      uses top3gpp:Top_Grp;
+      container attributes {
+        uses ExternalEUtranCellTDDGrp;
+      }
+      uses mf3gpp:ManagedFunctionContainedClasses;
+    }
+  }
+}

original/Rel-20/28_series/_3gpp-nr-nrm-externalgnbcucpfunction.yang

@@ -0,0 +1,95 @@
+module _3gpp-nr-nrm-externalgnbcucpfunction {
+  yang-version 1.1;
+  namespace "urn:3gpp:sa5:_3gpp-nr-nrm-externalgnbcucpfunction";
+  prefix "extgnbcucp3gpp";
+
+  import _3gpp-common-yang-types { prefix types3gpp; }
+  import _3gpp-common-managed-function { prefix mf3gpp; }
+  import _3gpp-common-managed-element { prefix me3gpp; }
+  import _3gpp-nr-nrm-gnbcucpfunction { prefix gnbcucp3gpp; }
+  import _3gpp-nr-nrm-nrnetwork { prefix nrnet3gpp; }
+  import _3gpp-common-subnetwork { prefix subnet3gpp; }
+  import _3gpp-nr-nrm-externalnrcellcu { prefix extnrcellcu3gpp; }
+  import _3gpp-common-top { prefix top3gpp; }
+
+  organization "3GPP SA5";
+  contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464";
+  description "Defines the YANG mapping of the ExternalGNBCUCPFunction
+    Information Object Class (IOC), that is part of the NR Network Resource
+    Model (NRM).
+    Copyright 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, 
+    TTA, TTC). All rights reserved.";
+  reference "3GPP TS 28.541 5G Network Resource Model (NRM)";
+
+  revision 2025-04-25 { reference "CR-1526 CR-1527" ; } // common for r18, r19
+  revision 2023-09-18 { reference CR-1043 ; } 
+  revision 2019-10-28 { reference S5-193518 ; }
+  revision 2019-06-17 { reference "Initial revision"; }
+
+  grouping ExternalGNBCUCPFunctionGrp {
+    description "Represets the ExternalGNBCUCPFunction IOC.";
+    uses mf3gpp:ManagedFunctionGrp;
+
+    leaf gNBId {
+      description "Identifies a gNB within a PLMN. 
+        The gNB ID is part of the NR Cell Identifier (NCI) of the gNB cells.
+
+        See 'gNB Identifier (gNB ID)' of subclause 8.2 of TS 38.300. 
+        See 'Global gNB ID' in subclause 9.3.1.6 of TS 38.413";
+      mandatory true;
+      type uint32 { range "0..4294967295"; }
+    }
+
+    leaf gNBIdLength {
+      description "Indicates the number of bits for encoding the gNB ID.";
+      reference "'Global gNB ID' in subclause 9.3.1.6 of TS 38.413";
+      mandatory true;
+      type int32 { range "22..32"; }
+    }
+
+    list pLMNId {
+      description "Specifies the PLMN identifier to be used as part of the
+        global RAN node identity.";
+      key "mcc mnc";
+      min-elements 1;
+      max-elements 1;
+      uses types3gpp:PLMNId;
+    }
+  }
+
+  grouping ExternalGNBCUCPFunctionWrapper {
+    list ExternalGNBCUCPFunction {
+      description "Represents the properties, known by the management function,
+        of a GNBCUCPFunction managed by another management function.";
+      key id;
+      uses top3gpp:Top_Grp;
+      container attributes {
+        uses ExternalGNBCUCPFunctionGrp;
+      }
+      uses mf3gpp:ManagedFunctionContainedClasses;
+      
+      uses extnrcellcu3gpp:ExternalNRCellCUSubtree;
+    }
+  } 
+  
+  feature ExternalGNBCUCPFunctionUnderNRNetwork {
+    description "The ExternalGNBCUCPFunction shall be contained under
+      NRNetwork";
+  }
+  
+  augment "/me3gpp:ManagedElement/gnbcucp3gpp:GNBCUCPFunction/" 
+      + "nrnet3gpp:NRNetwork" {
+    if-feature ExternalGNBCUCPFunctionUnderNRNetwork;
+    uses ExternalGNBCUCPFunctionWrapper;
+  }
+
+  feature ExternalGNBCUCPFunctionUnderSubNetwork {
+    description "The ExternalGNBCUCPFunction shall be contained under
+      SubNetwork";
+  }
+ 
+  augment "/subnet3gpp:SubNetwork" {
+    if-feature ExternalGNBCUCPFunctionUnderSubNetwork ;
+    uses ExternalGNBCUCPFunctionWrapper;
+  }
+}

original/Rel-20/28_series/_3gpp-nr-nrm-externalgnbcuupfunction.yang

@@ -0,0 +1,83 @@
+module _3gpp-nr-nrm-externalgnbcuupfunction {
+  yang-version 1.1;
+  namespace "urn:3gpp:sa5:_3gpp-nr-nrm-externalgnbcuupfunction";
+  prefix "extgnbcuup3gpp";
+
+  import _3gpp-common-managed-function { prefix mf3gpp; }
+  import _3gpp-common-managed-element { prefix me3gpp; }
+  import _3gpp-nr-nrm-gnbcucpfunction { prefix gnbcucp3gpp; }
+  import _3gpp-nr-nrm-nrnetwork { prefix nrnet3gpp; }
+  import _3gpp-common-subnetwork { prefix subnet3gpp; }
+  import _3gpp-common-top { prefix top3gpp; }
+
+  organization "3GPP SA5";
+  contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464";
+  description "Defines the YANG mapping of the ExternalGNBCUUPFunction
+    Information Object Class (IOC), that is part of the NR Network
+    Resource Model (NRM).
+    Copyright 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, 
+    TTA, TTC). All rights reserved.";
+  reference "3GPP TS 28.541 5G Network Resource Model (NRM)";
+
+  revision 2025-04-25 { reference "CR-1526 CR-1527" ; } // common for r18, r19
+  revision 2023-09-18 { reference CR-1043 ; } 
+  revision 2019-10-28 { reference S5-193518 ; }
+  revision 2019-06-17 { reference "Initial revision"; }
+
+  grouping ExternalGNBCUUPFunctionGrp {
+    description "Represets the ExternalGNBCUUPFunction IOC.";
+    reference "3GPP TS 28.541";   
+    uses mf3gpp:ManagedFunctionGrp; 
+            
+    leaf gNBId {
+      description "Identifies a gNB within a PLMN. 
+        The gNB ID is part of the NR Cell Identifier (NCI) of the gNB cells.
+
+        See 'gNB Identifier (gNB ID)' of subclause 8.2 of TS 38.300. 
+        See 'Global gNB ID' in subclause 9.3.1.6 of TS 38.413";
+      mandatory true;
+      type uint32 { range "0..4294967295"; }
+    }
+
+    leaf gNBIdLength {
+      description "Indicates the number of bits for encoding the gNB ID.";
+      reference "'Global gNB ID' in subclause 9.3.1.6 of TS 38.413";
+      mandatory true;
+      type int32 { range "22..32"; }
+    }
+  }
+
+  grouping ExternalGNBCUUPFunctionSubtree {
+    list ExternalGNBCUUPFunction {
+      description "Represents the properties, known by the management function,
+        of a GNBCUUPFunction managed by another management function.";
+      key id;
+      uses top3gpp:Top_Grp;
+      container attributes {
+        uses ExternalGNBCUUPFunctionGrp;
+      }
+      uses mf3gpp:ManagedFunctionContainedClasses;
+    }
+  } 
+  
+  feature ExternalGNBCUUPFunctionUnderNRNetwork {
+    description "The ExternalGNBCUUPFunction shall be contained under
+      NRNetwork";
+  }
+  
+  augment "/me3gpp:ManagedElement/gnbcucp3gpp:GNBCUCPFunction/" 
+      + "nrnet3gpp:NRNetwork" {
+    if-feature ExternalGNBCUUPFunctionUnderNRNetwork;
+    uses ExternalGNBCUUPFunctionSubtree;
+  }
+
+  feature ExternalGNBCUUPFunctionUnderSubNetwork {
+    description "The ExternalGNBCUUPFunction shall be contained under
+      SubNetwork";
+  }
+ 
+  augment "/subnet3gpp:SubNetwork" {
+    if-feature ExternalGNBCUUPFunctionUnderSubNetwork ;
+    uses ExternalGNBCUUPFunctionSubtree;
+  }
+}

original/Rel-20/28_series/_3gpp-nr-nrm-externalservinggwfunction.yang

@@ -0,0 +1,55 @@
+module _3gpp-nr-nrm-externalservinggwfunction {
+  yang-version 1.1;
+  namespace "urn:3gpp:sa5:_3gpp-nr-nrm-externalservinggwfunction";
+  prefix "extservgw3gpp";
+    
+  import _3gpp-common-managed-function { prefix mf3gpp; }
+  //import _3gpp-common-subnetwork { prefix subnet3gpp; }
+  import _3gpp-common-top { prefix top3gpp; }
+
+  organization "3GPP SA5";
+  description "Defines the YANG mapping of the ExternalServingGWFunction
+    Information Object Class (IOC) that is part of the NR Network Resource
+    Model (NRM).
+    Copyright 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, 
+    TTA, TTC). All rights reserved.";
+  reference "3GPP TS 28.541 5G Network Resource Model (NRM)";
+
+  revision 2025-04-25 { reference "CR-1526 CR-1527" ; } // common for r18, r19
+  revision 2023-09-18 { reference CR-1043 ; } 
+  revision 2019-10-28 { reference S5-193518 ; }
+  revision 2019-06-17 {
+    description "Initial revision";
+  }
+
+  grouping ExternalServingGWFunctionGrp {
+    description "Represents the ExternalServingGWFunction IOC.";
+    reference "3GPP TS 28.541";
+    uses mf3gpp:ManagedFunctionGrp;
+  }
+
+  grouping ExternalServingGWFunctionWrapper {
+    list ExternalServingGWFunction {
+      description "Represents the properties, known by the management
+        function, of a ServingGWFunction managed by another management
+        function.";
+      reference "3GPP TS 28.658";
+      key id;
+      uses top3gpp:Top_Grp;
+      container attributes {
+        uses ExternalServingGWFunctionGrp;
+      }
+      uses mf3gpp:ManagedFunctionContainedClasses;
+    }
+  } 
+  
+  /*augment "/subnet3gpp:SubNetwork" {
+    if-feature subnet3gpp:ExternalsUnderSubNetwork ;
+    uses ExternalServingGWFunctionWrapper;
+  }
+
+  augment "/eutranet3gpp:EUtraNetwork" {
+    if-feature eutranet3gpp:ExternalsUnderEUtraNetwork;
+    uses ExternalServingGWFunctionWrapper;
+  }*/
+}

original/Rel-20/28_series/_3gpp-nr-nrm-externalupffunction.yang

@@ -0,0 +1,56 @@
+module _3gpp-nr-nrm-externalupffunction {
+  yang-version 1.1;
+  namespace "urn:3gpp:sa5:_3gpp-nr-nrm-externalupffunction";
+  prefix "extupf3gpp";
+    
+  import _3gpp-common-managed-function { prefix mf3gpp; }
+  /*import _3gpp-common-subnetwork { prefix subnet3gpp; }
+  import _3gpp-nr-nrm-nrnetwork { prefix nrnet3gpp; }*/
+  import _3gpp-common-top { prefix top3gpp; }
+
+  organization "3GPP SA5";
+  contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464";
+  description "Defines the YANG mapping of the ExternalUPFFunction Information
+    Object Class (IOC) that is part of the NR Network Resource Model (NRM).
+    Copyright 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, 
+    TTA, TTC). All rights reserved.";
+  reference "3GPP TS 28.541 5G Network Resource Model (NRM)";
+
+  revision 2025-04-25 { reference "CR-1526 CR-1527" ; } // common for r18, r19
+  revision 2023-09-18 { reference CR-1043 ; } 
+  revision 2019-10-28 { reference S5-193518 ; }
+  revision 2019-06-17 {
+    description "Initial revision";
+  }
+
+  grouping ExternalUPFFunctionGrp {
+    description "Represents the ExternalUPFFunction IOC.";
+    reference "3GPP TS 28.541";
+    uses mf3gpp:ManagedFunctionGrp;
+  }
+
+  grouping ExternalUPFFunctionWrapper {
+    list ExternalUPFFunction {
+      description "Represents the properties, known by the management
+        function, of a UPFFunction managed by another management
+        function.";
+      reference "3GPP TS 28.541";
+      key id;
+      uses top3gpp:Top_Grp;
+      container attributes {
+        uses ExternalUPFFunctionGrp;
+      }
+      uses mf3gpp:ManagedFunctionContainedClasses;
+    }
+  } 
+  
+  /*augment "/subnet3gpp:SubNetwork" {
+    if-feature subnet3gpp:ExternalsUnderSubNetwork ;
+    uses ExternalUPFFunctionWrapper;
+  }
+
+  augment "/nrnet3gpp:NRNetwork" {
+    if-feature nrnet3gpp:ExternalsUnderNRNetwork;
+    uses ExternalUPFFunctionWrapper;
+  }*/
+}

original/Rel-20/28_series/_3gpp-nr-nrm-mwab.yang

@@ -0,0 +1,96 @@
+module _3gpp-nr-nrm-mwab {
+  yang-version 1.1;
+  namespace "urn:3gpp:sa5:_3gpp-nr-nrm-mwab";
+  prefix "mwab3gpp";
+
+  import _3gpp-common-yang-types { prefix types3gpp; }
+  import _3gpp-common-top { prefix top3gpp; }
+  import _3gpp-5g-common-yang-types { prefix types5g3gpp; }
+
+  organization "3GPP SA5";
+  contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464";
+  description "Defines the YANG mapping of the ExternalGNBCUCPFunction
+    Information Object Class (IOC), that is part of the NR Network Resource
+    Model (NRM).
+    Copyright 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI,
+    TTA, TTC). All rights reserved.";
+  reference "3GPP TS 28.541 5G Network Resource Model (NRM)";
+
+  revision 2025-11-02 { reference CR-1658 ; }
+  revision 2025-04-25 { reference CR-1527 ; }
+
+  grouping MWABGrp {
+    description "Represents the MWAB IOC.";
+    
+    list mnrOamIPConfig  {
+      description "It is IP configutation for OAM connectivity used 
+        by a mobile NR node (e.g., IAB-node, MWAB-node)
+        to establish connection with management system as specified
+       in TS 28.314[x] clause 6.1.2";
+      key idx;
+      leaf idx { type uint32; }
+      uses types5g3gpp:MnrOamIPConfigGrp ;
+    }
+
+    leaf operationalState {
+      description "It indicates the operational state of the MWAB instance.
+        It describes whether the resource is installed and partially or fully
+        operable (Enabled) or the resource is not installed or not
+        operable (Disabled).";
+      mandatory true;
+      config false;
+      type types3gpp:OperationalState;
+    }
+
+    leaf administrativeState {
+      description "It indicates the administrative state of the MWAB instance.
+        It describes the permission to use or prohibition against using the
+        MWAB functionalities, imposed through the OAM services.";
+      default LOCKED;
+      type types3gpp:AdministrativeState;
+    }
+
+    list allowedArea {
+      description "This specifies the area where the MWAB can act as MWAB-gNB.
+        If the OAM indicates that the MWAB can act as MWAB-gNB is allowed areas,
+        it acts as MWAB-gNB only on the allowed area only.
+        (See sub clause 5.49 TS 28.662).";
+      key idx;
+      leaf idx { type uint32; }
+      uses types3gpp:GeoAreaGrp;
+    }
+
+    list allowedTime {
+      description "This specifies the time window for which the MWAB can act
+      as MWAB-gNB. If the allowed time window/ validity indicates 20th June,
+      10 am to 5 pm of the day, the MWAB acts as an MWAB g-NB only during 20th
+      June, 10 am to 5 pm of the day, and does not act as MWAB-gNB for any
+      other time. (See sub clause 5.49 [11]).";
+      key idx;
+      leaf idx { type uint32 ; }
+      uses types3gpp:TimeWindowGrp;
+    }
+    list currentLocation {
+      description "This parameter specifies the current location
+        of mobile NR node (e.g., IAB-node, MWAB-node).";
+      key idx;
+      leaf idx { type uint32; }
+      uses types5g3gpp:LocationInfoGrp;
+    }
+  }
+
+  grouping MWABSubTree {
+    list MWAB {
+      description "MWAB provides an NR access link to UEs in proximity and
+        connects to the 5GC serving the UE through an IP connectivity provided
+        by a Backhaul PDU session(s). The MWAB consists of a gNB component
+        (MWAB-gNB) and a UE component (MWAB-UE). This IOC defines the
+        configuration information for the MWAB-gNB.";
+      key id;
+      uses top3gpp:Top_Grp;
+      container attributes {
+        uses MWABGrp;
+      }
+    }
+  }
+}

original/Rel-20/28_series/_3gpp-nr-nrm-nrcellrelation.yang

@@ -0,0 +1,146 @@
+module _3gpp-nr-nrm-nrcellrelation {
+  yang-version 1.1;
+  namespace "urn:3gpp:sa5:_3gpp-nr-nrm-nrcellrelation";
+  prefix "nrcellrel3gpp";
+
+  import _3gpp-common-yang-types { prefix types3gpp; }
+  import _3gpp-common-managed-element { prefix me3gpp; }
+  import _3gpp-common-top { prefix top3gpp; }
+  import _3gpp-nr-nrm-gnbcucpfunction { prefix gnbcucp3gpp; }
+  import _3gpp-nr-nrm-nrcellcu { prefix nrcellcu3gpp; }
+
+  organization "3GPP SA5";
+  description "Defines the YANG mapping of the NRCellRelation Information
+    Object Class (IOC) that is part of the NR Network Resource Model (NRM).
+    Copyright 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, 
+    TTA, TTC). All rights reserved.";
+  reference "3GPP TS 28.541 5G Network Resource Model (NRM)";
+
+  revision 2023-09-18 { reference CR-1043 ; } 
+  revision 2023-04-26 { reference CR-0916; }
+  revision 2021-01-25 { reference CR-0454 ; }
+  revision 2020-06-03 { reference S5-202333 ; }
+  revision 2020-04-23 { reference CR0281 ; }
+  revision 2019-10-28 { reference S5-193518 ; }
+  revision 2019-08-30 {
+    description "Initial revision";
+  }
+
+
+  typedef EnergySavingCoverage {
+    type enumeration {
+      enum FULL;
+      enum NO; 
+      enum PARTIAL;                       
+    }
+  }
+
+  grouping NRCellRelationGrp {
+    description "Represents the NRCellRelation IOC.";
+    reference "3GPP TS 28.541";
+
+    leaf nRTCI {       	
+      description "Target NR Cell Identifier. It consists of NR Cell
+        Identifier (NCI) and Physical Cell Identifier of the target NR cell
+        (nRPCI).";
+      type uint64;    	
+    }
+
+    container cellIndividualOffset {
+      description "A set of offset values for the neighbour cell. Used when
+        UE is in connected mode. Defined for rsrpOffsetSSB, rsrqOffsetSSB, 
+        sinrOffsetSSB, rsrpOffsetCSI-RS, rsrqOffsetCSI-RS and
+        sinrOffsetCSI-RS.";
+      reference "cellIndividualOffset in MeasObjectNR in 3GPP TS 38.331";
+
+      leaf rsrpOffsetSsb {	
+        description "Offset value of rsrpOffsetSSB.";
+        default 0;
+        type types3gpp:QOffsetRange;	    
+      }
+
+      leaf rsrqOffsetSsb{	
+        description "Offset value of rsrqOffsetSSB.";
+        default 0;
+        type types3gpp:QOffsetRange;	    
+      }
+
+      leaf sinrOffsetSsb {	
+        description "Offset value of sinrOffsetSSB.";
+        default 0;
+        type types3gpp:QOffsetRange;	    
+      }
+
+      leaf rsrpOffsetCsiRs{	
+        description "Offset value of rsrpOffsetCSI-RS.";
+        default 0;
+        type types3gpp:QOffsetRange;	    
+      }
+
+      leaf rsrqOffsetCsiRs {	
+        description "Offset value of rsrqOffsetCSI-RS.";
+        default 0;
+        type types3gpp:QOffsetRange;	    
+      }
+
+      leaf sinrOffsetCsiRs {	
+        description "Offset value of sinrOffsetCSI-RS.";
+        default 0;
+        type types3gpp:QOffsetRange;	    
+      }
+    }
+
+    leaf nRFreqRelationRef {       	
+      description "Reference to a corresponding NRFreqRelation instance.";
+      mandatory true;
+      type types3gpp:DistinguishedName;
+    }
+
+    leaf adjacentNRCellRef {       	
+      description "Reference to an adjacent NR cell (NRCellCU or
+        ExternalNRCellCU).";
+      mandatory true;
+      type types3gpp:DistinguishedName;
+    }
+
+    leaf isRemoveAllowed {	
+      type boolean;	    
+      default true;
+      description "True if the ANR function in the node is allowed to remove this relation.";
+    }
+
+    leaf isHOAllowed {	
+      type boolean;	    
+      default true;
+      description "True if handovers are allowed over this relation.";
+    }
+
+    leaf isESCoveredBy {
+      description "Indicates whether the adjacent cell
+        provides no, partial or full coverage for the parent cell
+        instance. Adjacent cells with this attribute equal to FULL are
+        recommended to be considered as candidate cells to take over the
+        coverage when the original cell is about to be changed to energy
+        saving state. All adjacent cells with this property equal
+        to PARTIAL are recommended to be considered as entirety of candidate
+        cells to take over the coverage when the original cell is about to be
+        changed to energy saving state.";
+      type EnergySavingCoverage;
+    }
+  }
+
+  augment /me3gpp:ManagedElement/gnbcucp3gpp:GNBCUCPFunction/nrcellcu3gpp:NRCellCU {
+
+    list NRCellRelation {
+      description "Represents a neighbour cell relation from a source cell
+        to a target cell, where the target cell is an NRCellCU or
+        ExternalNRCellCU instance.";
+      reference "3GPP TS 28.541";
+      key id;
+      uses top3gpp:Top_Grp;
+      container attributes {
+        uses NRCellRelationGrp;
+      }
+    }
+  }
+}

original/Rel-20/28_series/_3gpp-nr-nrm-nrfrequency.yang

@@ -0,0 +1,82 @@
+module _3gpp-nr-nrm-nrfrequency {
+  yang-version 1.1;
+  namespace "urn:3gpp:sa5:_3gpp-nr-nrm-nrfrequency";
+  prefix "nrfreq3gpp";
+
+  import _3gpp-common-managed-element { prefix me3gpp; }
+  import _3gpp-nr-nrm-gnbcucpfunction { prefix gnbcucp3gpp; }
+  import _3gpp-nr-nrm-nrnetwork { prefix nrnet3gpp; }
+  import _3gpp-common-subnetwork { prefix subnet3gpp; }
+  import _3gpp-common-top { prefix top3gpp; }
+
+  organization "3GPP SA5";
+  contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464";
+  description "Defines the YANG mapping of the NRFrequency Information Object
+    Class (IOC) that is part of the NR Network Resource Model (NRM).
+    Copyright 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI,
+    TTA, TTC). All rights reserved.";
+  reference "3GPP TS 28.541 5G Network Resource Model (NRM)";
+
+  revision 2025-04-25 { reference "CR-1526 CR-1527"; } // common for r18, r19
+  revision 2023-09-18 { reference CR-1043 ; }
+  revision 2019-10-28 { reference S5-193518 ; }
+  revision 2019-06-17 { reference "Initial version"; }
+
+  grouping NRFrequencyGrp {
+    description "Represents the NRFrequency IOC.";
+
+    leaf absoluteFrequencySSB {
+      description "The absolute frequency applicable for a downlink NR carrier
+        frequency associated with the SSB, in terms of NR-ARFCN.";
+      mandatory true;
+      type uint32 { range "0.. 3279165"; }
+    }
+
+    leaf ssBSubCarrierSpacing {
+      description "Sub-carrier spacing of the SSB.
+        Note that the allowed values of SSB used for representing data,
+        by e.g. a BWP, are: 15, 30, 60 and 120 in units of kHz.";
+      mandatory true;
+      type uint8 { range "15 | 30 | 60 | 120 | 240"; }
+      units "kHz";
+    }
+
+    leaf multiFrequencyBandListNR {
+      description "List of additional frequency bands the frequency belongs to.
+        The list is automatically set by the gNB.";
+      mandatory true;
+      config false;
+      type uint16 { range "1..256"; }
+    }
+  }
+
+  grouping NRFrequencyWrapper {
+    list NRFrequency {
+      description "Represents certain NR frequency properties.";
+      key id;
+      uses top3gpp:Top_Grp;
+      container attributes {
+        uses NRFrequencyGrp;
+      }
+    }
+  }
+
+  feature NRFrequencyUnderNRNetwork {
+    description "NRFrequency shall be contained under NRNetwork";
+  }
+
+  augment "/me3gpp:ManagedElement/gnbcucp3gpp:GNBCUCPFunction/"
+      + "nrnet3gpp:NRNetwork" {
+    if-feature NRFrequencyUnderNRNetwork;
+    uses NRFrequencyWrapper;
+  }
+
+  feature NRFrequencyUnderSubNetwork {
+    description "NRFrequency shall be contained under SubNetwork";
+  }
+
+  augment "/subnet3gpp:SubNetwork" {
+    if-feature NRFrequencyUnderSubNetwork;
+    uses NRFrequencyWrapper;
+  }
+}

original/Rel-20/28_series/_3gpp-nr-nrm-nrsectorcarrier.yang

@@ -0,0 +1,122 @@
+module _3gpp-nr-nrm-nrsectorcarrier {
+  yang-version 1.1;
+  namespace "urn:3gpp:sa5:_3gpp-nr-nrm-nrnetwork-nrsectorcarrier";
+  prefix "nrsectcarr3gpp";
+
+  import _3gpp-common-yang-types { prefix types3gpp; }
+  import _3gpp-common-managed-function { prefix mf3gpp; }
+  import _3gpp-common-managed-element { prefix me3gpp; }
+  import _3gpp-nr-nrm-gnbdufunction { prefix gnbdu3gpp; }
+  import _3gpp-common-top { prefix top3gpp; }
+
+  organization "3GPP SA5";
+  contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464";
+  description "Defines the YANG mapping of the NRSectorCarrier Information
+    Object Class (IOC) that is part of the NR Network Resource Model (NRM).
+    Copyright 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, 
+    TTA, TTC). All rights reserved.";
+  reference "3GPP TS 28.541 5G Network Resource Model (NRM)";
+
+  revision 2023-09-18 { reference CR-1043 ; } 
+  revision 2020-05-28 { reference CR-0316 ; }
+  revision 2019-10-28 { reference S5-193518 ; }
+  revision 2019-06-17 {
+    description "Initial revision";
+  }
+
+  grouping NRSectorCarrierGrp {
+    description "Represents the NRSectorCarrier IOC.";
+    reference "3GPP TS 28.541";
+    uses mf3gpp:ManagedFunctionGrp;
+
+    leaf txDirection {
+      description "Indicates if the transmission direction is downlink,
+        uplink, or both downlink and uplink.";
+      mandatory true;
+      type types3gpp:TxDirection;
+    }
+
+    leaf configuredMaxTxPower {
+      description "Maximum transmisssion power at the antenna port for all 
+        downlink channels, used simultaneously in a cell, added together.
+        Condition:  The sector-carrier has a downlink and the 
+        configuration of Tx power at antenna port reference point is supported.";
+      mandatory true;
+      type int32;
+      units mW;
+    }
+
+    leaf configuredMaxTxEIRP {
+      type int64;
+      units dBm;
+      mandatory true;
+      description "The maximum emitted isotroptic radiated power (EIRP) in dBm 
+        for all downlink channels, used simultaneously in a cell, added together.
+        Condition: the sector-carrier has a downlink and the 
+        configuration of emitted isotropic radiated power is supported";
+    }
+
+    leaf arfcnDL {
+      description "NR Absolute Radio Frequency Channel Number (NR-ARFCN)
+        for downlink. 
+        Condition:  The sector-carrier has a downlink AND the value 
+        differs from the referring cell's value of arfcnDL.";
+      reference "3GPP TS 38.104";
+      mandatory true;
+      type int32 { range "0..3279165"; }
+    }
+
+    leaf arfcnUL {
+      description "NR Absolute Radio Frequency Channel Number (NR-ARFCN)
+        for uplink. 
+        Condition: The sector-carrier has an uplink AND the value 
+        differs from the referring cell's value of arfcnUL.";
+      reference "3GPP TS 38.104";
+      mandatory true;
+      type int32 { range "0..3279165"; }
+    }
+
+    leaf bSChannelBwDL {
+      description "Base station channel bandwitdth for downlink. 
+        Condition: The sector-carrier has a downlink AND the value 
+        differs from the referring cell's value of bSChannelBwDL.";
+      reference "3GPP TS 38.104";
+      mandatory true;
+      type int32 { range "5 | 10 | 15 | 20 | 30 | 40 | 50 | 60 | 70 | 80 |
+        90 | 100"; }
+      units MHz;
+    }
+
+    leaf bSChannelBwUL {
+      description "Base station channel bandwitdth for uplink.";
+      reference "3GPP TS 38.104";
+      mandatory true;
+      type int32 { range "5 | 10 | 15 | 20 | 30 | 40 | 50 | 60 | 70 | 80 |
+        90 | 100"; }
+      units MHz;
+    }
+
+    leaf sectorEquipmentFunctionRef {
+      description "Reference to corresponding SectorEquipmentFunction
+        instance.";
+      reference "3GPP TS 23.622";
+      mandatory true;
+      type types3gpp:DistinguishedName;      	
+    }		
+  }    
+
+  augment "/me3gpp:ManagedElement/gnbdu3gpp:GNBDUFunction" {
+
+    list NRSectorCarrier {
+      description "Represents the resources of each transmission point
+        included in the cell.";
+      reference "3GPP TS 28.541";
+      key id;
+      uses top3gpp:Top_Grp;
+      container attributes {
+        uses NRSectorCarrierGrp;
+      }
+      uses mf3gpp:ManagedFunctionContainedClasses;
+    }
+  }
+}

original/Rel-20/28_series/_3gpp-nr-nrm-redcapaccess.yang

@@ -0,0 +1,137 @@
+module _3gpp-nr-nrm-redcapaccess {
+  yang-version 1.1;
+  namespace "urn:3gpp:sa5:_3gpp-nr-nrm-redcapaccess";
+  prefix "redcap3gpp";
+  import _3gpp-common-yang-types { prefix types3gpp; }
+  import _3gpp-common-subnetwork { prefix subnet3gpp; }
+  import _3gpp-common-top { prefix top3gpp; }
+
+  organization "3GPP SA5";
+  contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464";
+  description "Defines the YANG mapping of the NRCellDU Information Object
+  Class (IOC) that is part of the NR Network Resource Model (NRM).
+  Copyright 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI,
+  TTA, TTC). All rights reserved.";
+
+  reference "3GPP TS 28.541 5G Network Resource Model (NRM)";
+
+  revision 2025-11-02 { reference CR-1643; }
+  revision 2025-07-07 { reference CR-; }
+
+  feature redcapaccesscriteriasubnertwork {
+    description "The RedCap acsess criterea shall be contained under
+    SubNetwork";
+  }
+
+  grouping CellReselectionRedcapGrp {
+    description "This data type defines configuration parameters
+     to allow relaxation of RRM measurement requirements for (e)RedCap UE 
+     cell reselection. ";
+     reference "TS 38.331 , clasue 6.3.1 and TS 38.304 , clause 5.2.4.9"; 
+
+    leaf sSearchDeltaPStationary {
+        type uint8 {
+          range "2 | 3 | 6 | 9 | 12 | 15";
+        }
+        mandatory true;
+        description "This specifies the threshold (in dB) on Srxlev variation
+        to evaluate stationary criterion for relaxed measurement. It 
+         corresponds to the SSearchDeltaP-Stationary in TS 38.304 [49].
+        Its unit is 1 dB. Where Srxlev is the cell selection received 
+        signal level value. ";
+        // optional 
+      }
+    leaf tSearchDeltaPStationary {
+        type uint16 {
+          range "5 | 10 | 20 | 30 | 60 | 120 | 180 | 240 | 300";
+        }
+        mandatory true;
+        description "TThis specifies the time period over which the Srxlev
+         variation is evaluated for stationary criterion for relaxed measurement.
+          It corresponds to the TSearchDeltaP-Stationary in TS 38.304 [49]. Its 
+          unit is seconds. Where Srxlev is the cell selection received signal 
+          level value. ";
+          //optional
+      }
+    leaf sSearchThresholdP2 {
+        type uint16 {
+          range "0..31";
+        }        
+        mandatory true;
+        description "This specifies the Srxlev threshold (in dB) to evaluate
+         not at cell edge criterion for relaxed measurement. It corresponds
+          to the SSearchThresholdP2 in TS 38.304 [49]. Its unit is 1 dB. 
+          Where Srxlev is the cell selection received signal level value.  ";
+          //optional
+      }
+    leaf sSearchThresholdQ2 {
+        type uint16 {
+          range "0..31";
+        }       
+        mandatory true;
+        description "This specifies the Squal threshold (in dB) to 
+        evaluate not at cell edge criterion for relaxed measurement. It 
+        corresponds to the SSearchThresholdQ2 in TS 38.304 [49]. Its unit
+         is 1 dB. Where Srxlev is the cell selection quality level value. ";
+        //optional
+      }
+
+    }
+
+  grouping RedCapAccessCriteriaGrp {
+    description "Represents the RedCapAccessCriteria <<IOC>> ";
+
+    leaf nRCellDURef {
+        type types3gpp:DistinguishedName;
+        mandatory true;
+        description "This attribute contains the DN of a NR Cell (NRCellDU) ";
+      }
+
+    leaf criteriaConditionRef {
+        type types3gpp:DistinguishedName;
+        mandatory true;
+        description "This specifies the DN of the ConditionMonitor MOI.The
+        attribute condition will contain information on the condition to be
+        satisfied to restrict Redcap UE access. This means that the value of
+        attribute uECellBarredAccess of NRCellDU IOC will be set to
+        REDCAP_1RX and REDCAP_2RX if this condition is met.The condition
+        will be created providing following information:
+          The performance metrics (KPIs and performance measurements) that are
+          to be considered in the criteria for deciding whether the cell in a
+          RAN node is barred or allowed for (e)RedCap UEs
+          The direction (up and down) that is to be considered for crossing
+          the threshold value of the given performance metrics for taking a
+          decision whether the RAN node is barred or allowed for
+          (e)RedCap UEs.
+          The threshold level of performance metrics value which when crossed
+          the RAN node is barred or allowed for (e)RedCap UEs";
+      }
+
+
+    }
+
+    augment "/subnet3gpp:SubNetwork" {
+        if-feature redcapaccesscriteriasubnertwork;
+        list RedCapAccessCriteria {
+            description "The RedCapAccessCriteria <<IOC>> contains attributes
+            to support the controlling of RedCap access in a NR Cell.
+            It provides information of a condition (for example, KPIs such as
+            Total DRB accessibility, DRB Retainability , Utilization KPI,
+            NG-RAN data Energy Efficiency, Downlink/Uplink delay in gNB-DU etc.
+            and  Performance measurements such as DL/UL Total PRB Usage,
+            Average DL/UL UE throughput in gNB etc.) which can be used to
+            control decision of barring or allowing access of RedCap/eRedCap
+            UEs to a NR Cell. This information can be used to decide whether
+            RedCap/eRedCap UEs are barred or allowed at the time of new UE
+            access attempt in NR cell during applicable RAN procedures.";
+
+            key id;
+            max-elements 1;
+            uses top3gpp:Top_Grp;
+            container attributes {
+                uses RedCapAccessCriteriaGrp;
+                }
+        }
+    }
+
+}

original/Rel-20/28_series/_3gpp-nr-nrm-rimrsset.yang

@@ -0,0 +1,500 @@
+module _3gpp-nr-nrm-rimrsset {
+  yang-version 1.1;
+  namespace "urn:3gpp:sa5:_3gpp-nr-nrm-rimrsset";
+  prefix "rrsset3gpp";
+
+  import _3gpp-common-subnetwork { prefix subnet3gpp; }
+  import _3gpp-common-top { prefix top3gpp; }
+  import _3gpp-common-yang-types { prefix types3gpp; }
+
+  organization "3GPP SA5";
+  contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464";
+  description "Defines the YANG mapping of the RimRSSet Information Object
+    Class (IOC) that is part of the NR Network Resource Model (NRM).
+    Copyright 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, 
+    TTA, TTC). All rights reserved.";
+  reference "3GPP TS 28.541 5G Network Resource Model (NRM)";
+
+  revision 2023-09-18 { reference CR-1043 ; } 
+  revision 2021-10-28 { reference CR-0607 ; }
+  
+  grouping FrequencyDomainParaGrp {
+    description "Configuration parameters of frequency domain resource to 
+      support RIM RS. ";
+      
+    leaf rimRSSubcarrierSpacing {
+      type  uint8 {
+        range 0|1 ;
+      }
+      mandatory true;
+      description 
+        "It is the subcarrier spacing configuration (u) for the RIM-RS. 
+        Subcarrier spacing delta-f=2^u*15 kHz. (see 38.211 subclause 5.3.3).";
+    }
+    
+    leaf rIMRSBandwidth {
+      type  uint8 {
+        range 1..96 ;
+      }
+      mandatory true;
+      description "It is the bandwidth of the RIM-RS in resource blocks 
+        (see 38.211 subclause 5.3.3).
+        For carrier bandwidth larger than 20MHz, this attribute should be
+          96 if subcarrier spacing is15kHz
+          48 or 96 if subcarrier spacing is 30kHz
+        For carrier bandwidth smaller than or equal to 20MHz, this attribute 
+          should be
+          Minimum of {96 , bandwidth of downlink carrier in number of PRBs} if 
+            subcarrier spacing is15kHz
+          Minimum of {48, bandwidth of downlink carrier in number of PRBs } if 
+            subcarrier spacing is 30kHz";
+    }
+    
+    leaf nrofGlobalRIMRSFrequencyCandidates {
+      type  uint8 {
+        range 1|2|4 ;
+      }
+      mandatory true;
+      description "The number of candidate frequency resources in the whole 
+        network (N_f^RIM ) (see 38.211 subclause 7.4.1.6).";
+    }
+
+    leaf-list rimRSCommonCarrierReferencePoint {
+      type  int32 ;
+    }
+
+    leaf rimRSStartingFrequencyOffsetIdList {
+      type  uint32 {
+        range 0..550;
+      }
+      must 'count(.) = ../nrofGlobalRIMRSFrequencyCandidates' {
+        error-message 
+          "The multiplicity must be equal to nrofGlobalRIMRSFrequencyCandidates";
+      }
+      description "List of configured frequency offsets in units of resource 
+        blocks, where each element is the frequency offset relative to a 
+        configured reference point for RIM-RS. The size of the list is 
+        nrofGlobalRIMRSFrequencyCandidates and the resulting frequency resource 
+        blocks of RIM-RS corresponding to different configured frequency offset 
+        have no overlapping bandwidth.  (see 38.211 subclause 7.4.1.6).
+
+        allowedValues: 0..maxNrofPhysicalResourceBlocks-1 where 
+        maxNrofPhysicalResourceBlocks = 550";
+    }
+  }
+  
+  grouping SequenceDomainParaGrp {
+    description "Configuration parameters of sequence domain resource to 
+      support RIM RS. ";
+      
+    leaf nrofRIMRSSequenceCandidatesofRS1 {
+      type  uint8 {
+        range 1..8 ;
+      }
+      mandatory true;
+      description "The number of candidate sequences assigned for RIM RS-1 
+      (N_s^RIM,1) (see 38.211 [subclause 7.4.1.6). It should be even when 
+      enableEnoughNotEnoughIndication for RS-1 is ON";
+    }
+
+    leaf-list rimRSScrambleIdListofRS1 {
+      type uint32 {
+        range 0..1023 ;
+      }
+      must 'count(.) = ../nrofRIMRSSequenceCandidatesofRS1' {
+        error-message 
+          "The multiplicity must be equal to nrofRIMRSSequenceCandidatesofRS1";
+      }
+      description "List of configured scrambling identities for RIM RS-1 (
+        see 38.211 [subclause 7.4.1.6). The size of the list is 
+        nrofRIMRSSequenceCandidatesofRS1.";
+    }
+
+    leaf nrofRIMRSSequenceCandidatesofRS2 {
+      type  uint8 {
+        range 1..8 ;
+      }
+      mandatory true;
+      description "The number of candidate sequences assigned for RIM RS-2 
+        (N_s^RIM,2) (see 38.211 subclause 7.4.1.6).";
+    }
+
+    leaf rimRSScrambleIdListofRS2 {
+      type uint32 {
+        range 0..1023 ;
+      }
+      must 'count(.) = ../nrofRIMRSSequenceCandidatesofRS2' {
+        error-message 
+          "The multiplicity must be equal to nrofRIMRSSequenceCandidatesofRS2";
+      }
+      description "List of configured scrambling identities for RIM RS-2 (
+        see 38.211 subclause 7.4.1.6). 
+        The size of the list is nrofRIMRSSequenceCandidatesofRS2.";
+    }
+
+    leaf enableEnoughNotEnoughIndication {
+      type types3gpp:EnabledDisabled;
+      default DISABLED;
+      description "It is indication of whether 'Enough'/'Not enough' indication 
+        functionality is enabled for RIM RS-1 (see 38.211 subclause 7.4.1.6).
+
+        If the indication is 'ENABLED', the first half of 
+        nrofRIMRSSequenceCandidatesofRS1  sequences indicates 'Not enough 
+        mitigation', and the second half indicates 'Enough mitigation', where,
+        'Enough mitigation' indicates that IoT going back to certain level at 
+        victim side and/or no further interference mitigation actions are 
+        needed at aggressor side
+        'Not enough mitigation' indicates that IoT exceeding certain level at 
+        victim side and/or further interference mitigation actions are needed 
+        at aggressor side
+
+        enableEnoughNotEnoughIndication is equivalent to EnoughIndication 
+        (see 38.211 subclause 7.4.1.6)";
+    }
+
+    leaf RIMRSScrambleTimerMultiplier {
+      type uint32  {
+        range 0..2147483647;
+      }
+      mandatory true;
+      description "It is parameter multiplier factor gamma for initialization 
+        seed of the pseudo-random sequence c~(i) 
+        (see 38.211 subclause 7.4.1.6.2).
+        allowedValues:  0,1...2^31-1";
+    }
+
+    leaf RIMRSScrambleTimerOffset {
+      type uint32  {
+        range 0..2147483647;
+      }
+      mandatory true;
+      description "It is parameter offset delta for initialization seed of 
+        the pseudo-random sequence c~(i) (see 38.211 subclause 7.4.1.6.2).
+        allowedValues: 0,1...2^31-1";
+    }
+  }
+  
+  grouping TimeDomainParaGrp {
+    description "Configuration parameters of time domain resource to 
+      support RIM RS. ";
+      
+    leaf dlULSwitchingPeriod1 {
+      type enumeration {
+        enum  MS0P5;
+        enum  MS0P625;
+        enum  MS1;
+        enum  MS1P25;
+        enum  MS2;
+        enum  MS2P5;
+        enum  MS3;
+        enum  MS4;
+        enum  MS5;
+        enum  MS10;
+        enum  MS20;
+      }
+      mandatory true;
+      description "This attribute is used to configure the first uplink-downlink 
+        switching period (P1) for RIM RS transmission in the network, where one 
+        RIM RS is configured in one uplink-downlink switching period. 
+        (see 38.211 subclause 7.4.1.6). 
+
+        When only one TDD-UL-DL-Pattern is configured, only 
+        dl-UL-SwitchingPeriod1 is configured, where P1 equals to the 
+        transmission periodicity of the TDD-UL-DL-Pattern.
+        When two concatenated TDD-UL-DL-Patterns are configured, and RIM-RS 
+        resources is configured only in one of the TDD patterns, only 
+        dl-UL-SwitchingPeriod1 is configured, where P1 equals to the addition 
+        of the concatenated transmission periodicity of the two 
+        TDD-UL-DL-Patterns.
+        When two concatenated TDD-UL-DL-Patterns are configured, and RIM-RS 
+        resources are configured in both TDD patterns, both 
+        dl-UL-SwitchingPeriod1 and dl-UL-SwitchingPeriod2 are configured, 
+        where P1 equals to the transmission periodicity of the first 
+        TDD-UL-DL-Pattern.
+
+        P1 is equivalent to T_(per,1)^RIM  (see 38.211, subclause 7.4.1.6).
+
+        allowedValues: 
+        MS0P5, MS0P625, MS1, MS1P25, MS2, MS2P5, MS4, MS5, MS10, MS20,  
+          if a single uplink-downlink period is configured for RIM-RS purposes;
+        MS0P5, MS0P625, MS1, MS1P25, MS2, MS2P5, MS3, MS4, MS5, MS10, MS20,  
+          if two uplink-downlink periods are configured for RIM-RS purposes.";
+    }
+
+    leaf symbolOffsetOfReferencePoint1 {
+      type uint32  {
+        range 2..327679 ;
+      }
+      mandatory true;
+      description "This attribute is used to configure the reference point in 
+        the first uplink-downlink switching period, which is the symbols offset 
+        of the reference point after the starting boundary of the first 
+        uplink-downlink switching period. It's Configured together with 
+        dl-UL-SwitchingPeriod1 (see 38.211 subclause 7.4.1.6).
+
+        When only one TDD-UL-DL-Pattern is configured, the reference point 
+        configured for the first uplink-downlink switching period is the DL 
+        transmission boundary of the TDD-UL-DL-Pattern.
+        When two concatenated TDD-UL-DL-Patterns are configured, and RIM-RS 
+        resources is configured only in one of the TDD patterns, the reference 
+        point configured for the first uplink-downlink switching period is the 
+        DL transmission boundary of the TDD-UL-DL-Pattern where the RIM-RS 
+        resource is configured.
+        When two concatenated TDD-UL-DL-Patterns are configured, and RIM-RS 
+        resources are configured in both TDD patterns, the reference points 
+        configured for first uplink-downlink switching period is the DL 
+        transmission boundary of the first TDD-UL-DL-Pattern.
+
+        allowedValues: 2, 3..20*2*maxNrofSymbols-1, where maxNrofSymbols=14";
+    }
+
+    leaf dlULSwitchingPeriod2 {
+      type enumeration {
+        enum  MS0P5;
+        enum  MS0P625;
+        enum  MS1;
+        enum  MS1P25;
+        enum  MS2;
+        enum  MS2P5;
+        enum  MS3;
+        enum  MS4;
+        enum  MS5;
+        enum  MS10;
+      }
+      mandatory true;
+      description "Used to configure the second uplink-downlink switching 
+        period (P2) for RIM RS transmission in the network, where one RIM RS is 
+        configured in one uplink-downlink switching period 
+        (see 38.211 subclause 7.4.1.6).
+
+        When two concatenated TDD-UL-DL-Patterns are configured, and RIM-RS 
+        resources are configured in both TDD patterns, both 
+        dl-UL-SwitchingPeriod1 and dl-UL-SwitchingPeriod2 are configured, 
+        where P2 equals to the transmission periodicity of the second 
+        TDD-UL-DL-Pattern, and where (P1 + P2) divides 20 ms.
+
+        allowedValues: MS0P5, MS0P625, MS1, MS1P25, MS2, MS2P5, MS3, MS4, MS5, 
+          MS10
+  
+        P2 is equivalent to T_(per,2)^RIM  (see 38.211 subclause 7.4.1.6)";
+    }
+
+    leaf symbolOffsetOfReferencePoint2 {
+      type uint32  {
+        range 2..327679 ;
+      }
+      mandatory true;
+      description "This attribute is used to configure the reference point in 
+        the second uplink-downlink switching period, which is the symbol offset 
+        of the reference point after starting boundary of the second 
+        uplink-downlink switching period. Configured together with 
+        dl-UL-SwitchingPeriod2 (see 38.211 subclause 7.4.1.6).
+        When two concatenated TDD-UL-DL-Patterns are configured, and RIM-RS 
+        resources are configured in both TDD patterns, the reference points 
+        configured for second uplink-downlink switching period is the 
+        DL transmission boundary of the second TDD-UL-DL-Pattern.
+
+        allowedValues: 2, 3..20*2*maxNrofSymbols-1, where maxNrofSymbols=14";
+    }
+
+    leaf totalnrofSetIdofRS1 {
+      type uint32  {
+        range 0..4194303 ;
+      }
+      mandatory true;
+      description "It is the total number of set IDs for RIM RS-1 
+        (N_setID ^RIM,1) (see 38.211 subclause 7.4.1.6).
+
+        allowedValues: 0,1...2^22-1";
+    }
+
+    leaf totalnrofSetIdofRS2 {
+      type uint32  {
+        range 0..4194304 ;
+      }
+      mandatory true;
+      description "It is the total number of set IDs for RIM RS-2 
+        (N_setID^RIM,2) (see 38.211 subclause 7.4.1.6).
+
+        allowedValues: 0,1...2^22";
+    }
+
+    leaf nrofConsecutiveRIMRS1 {
+      type uint8 {
+        range 1|2|4|8 ;
+      }
+      mandatory true;
+      description "It is the number of consecutive uplink-downlink switching 
+        periods for RS-1 (R1) for repetition/near-far indication:. 
+        (see 38.211 subclause 7.4.1.6).
+
+        allowedValues: 1,2,4,8";
+    }
+
+    leaf nrofConsecutiveRIMRS2 {
+      type uint8 {
+        range 1|2|4|8 ;
+      }
+      mandatory true;
+      description "It is the number of consecutive uplink-downlink switching 
+        periods for RS-2 (R2) for repetition/near-far indication. 
+        (see 38.211 subclause 7.4.1.6).
+
+        allowedValues: 1,2,4,8";
+    }
+
+    leaf-list consecutiveRIMRS1List {
+      type  uint32 {
+        range 2..327679 ;
+      }
+      description "It is used to configure the OFDM symbol position(s) of RIM 
+        RS-1 within the uplink-downlink switching period. It is a list of symbol 
+        offset of RIM RS-1 (N_symb,ref^(RIM,1)) before the reference point. 
+        The size of the list is nrofConsecutiveRIMRS1 
+        (see 38.211 subclause 7.4.1.6).
+        The resulting RIM RS-1 symbols and its reference point shall belong to 
+        the same 10ms frame.
+
+        allowedValues: 2,3..20*2**maxNrofSymbols-1, where maxNrofSymbols=14";
+    }
+
+    leaf-list consecutiveRIMRS2List {
+      type  uint32 {
+        range 2..327679 ;                                         
+      }
+      description "It is used to configure the OFDM symbol position(s) of 
+        RIM RS-2 within the uplink-downlink switching period. It is a list of 
+        symbol offset of RIM RS-2 (N_symb,ref^(RIM,2)) before the reference 
+        point. The size of the list is nrofConsecutiveRIMRS2 
+        (see 38.211 subclause 7.4.1.6).
+        The resulting RIM RS-2 symbols and its reference point shall belong to 
+        the same 10ms frame.
+
+        allowedValues: 2,3..20*2**maxNrofSymbols-1, where maxNrofSymbols=14";
+    }
+
+    leaf enablenearfarIndicationRS1 {
+      type types3gpp:EnabledDisabled;
+      default DISABLED;
+      description "It is indication of whether near-far functionality is enabled 
+        for RIM RS1.
+
+        If the indication is 'ENABLED', 
+        the first half of nrofConsecutiveRIMRS1 (R1) consecutive uplink-downlink 
+        switching period is for 'Near' indication with R1/2 repetitions,
+        the second half of R1 consecutive uplink-downlink switching period is 
+        for 'Far' indication with R1/2 repetitions.";
+    }
+
+    leaf enablenearfarIndicationRS2 {
+      type types3gpp:EnabledDisabled;
+      default DISABLED;
+      description "It is indication of whether near-far functionality is enabled 
+        for RIM RS2.
+
+        If the indication is 'enable', 
+        the first half of nrofConsecutiveRIMRS2 (R2) consecutive uplink-downlink 
+        switching period is for 'Near' indication with R2/2  repetitions,
+        the second half of R2 consecutive uplink-downlink switching period is 
+        for 'Far' indication with R2/2 repetitions.";
+    }
+  }  
+
+  grouping RimRSGlobalGrp {
+    description "Represents the RimRSGlobal IOC.";
+    
+    list frequencyDomainPara {
+      key  rimRSSubcarrierSpacing;
+      min-elements 1;
+      max-elements 1;
+      description "Configuration parameters of frequency domain resource to 
+        support RIM RS. ";
+        uses FrequencyDomainParaGrp;
+    }
+    
+    list sequenceDomainPara {
+      key  nrofRIMRSSequenceCandidatesofRS1;
+      min-elements 1;
+      max-elements 1;
+      description "Configuration parameters of sequence domain resource to 
+        support RIM RS. ";
+        uses SequenceDomainParaGrp;
+    }
+    
+    list timeDomainPara {
+      key  dlULSwitchingPeriod1;
+      min-elements 1;
+      max-elements 1;
+      description "Configuration parameters of time domain resource to 
+        support RIM RS. ";
+        uses TimeDomainParaGrp;
+    }
+  }
+  
+  grouping RimRSSetGrp {
+    description "Represents the RimRSSet IOC.";
+    
+    leaf setId {
+      type uint32 {
+        range 0..4194303 ;
+      }
+      mandatory true;
+      description "This specifies the set ID of a victim Set (RIM-RS1 Set) or 
+        aggressor Set (RIM-RS2 set). (See subclause 7.4.1.6 in TS 38.211). 
+
+        allowedValues: The bit length of the set ID is maximum 22bit.";
+    }
+    
+    leaf setType {
+      type enumeration {
+        enum RS1;
+        enum RS2;
+      }
+      mandatory true;
+      description "The attribute specifies type of a RIM-RS Set .  
+        RIM RS1 is generated and transmitted by victim to indicate its suffering 
+        remote interference, and RIM RS2 is generated and transmitted by 
+        aggressor to measure if Remote Interference still exist
+
+        If the attribute value is 'RS1', the RIM-RS Set is victim set.
+        If the attribute value is 'RS2', the RIM-RS Set is aggressor set.";
+    }
+    
+    leaf-list nRCellDURef {
+      type types3gpp:DistinguishedName;
+      config false;
+      description "This attribute contains the DN of a NR Cell (NRCellDU)";
+    }
+  }
+  
+  augment "/subnet3gpp:SubNetwork" {
+    list RimRSGlobal {
+      description "Represents global/common Remote Interference Management (RIM) 
+        Reference Signal (RS) resource allocated for the whole network. 
+        Resource for RIM-RS transmission is defined by Sequence domain resource, 
+        Time domain resource and Frequency resource. The configure parameters 
+        of the RIM RS resource are applied to all Sets of RIM RS Resource 
+        across gNBs/cells in the network.";
+      key id;
+      max-elements 1;
+      uses top3gpp:Top_Grp;
+      container attributes {
+        uses RimRSGlobalGrp;
+      }
+
+      list RimRSSet {
+        description "Represents aggressor or victim Set organized by OAM. 
+          The RIM RS Resource is assigned to each Set, which is identified by 
+          triple indices set of 
+          <Time domain index, Frequency domain index, and  Sequence index >. 
+          The triple indices set can be derived by setId attribute 
+          (See subclause 7.4.1.6 in TS 38.211 ).";
+        key id;
+        uses top3gpp:Top_Grp;
+        container attributes {
+          uses RimRSSetGrp;
+        }
+      }
+    }
+  }  
+}

original/Rel-20/28_series/_3gpp-nr-nrm-rrmpolicy.yang

@@ -0,0 +1,202 @@
+module _3gpp-nr-nrm-rrmpolicy {
+  yang-version 1.1;
+  namespace "urn:3gpp:sa5:_3gpp-nr-nrm-rrmpolicy";
+  prefix "rrmpolicy3gpp";
+
+  import _3gpp-5g-common-yang-types { prefix types5g3gpp; }
+  import _3gpp-common-top { prefix top3gpp; }
+  import _3gpp-common-managed-element { prefix me3gpp; }
+  import _3gpp-nr-nrm-nrcellcu { prefix nrcellcu3gpp ; }
+  import _3gpp-nr-nrm-nrcelldu { prefix nrcelldu3gpp ; }
+  import _3gpp-nr-nrm-gnbcucpfunction { prefix gnbcucp3gpp ; }
+  import _3gpp-nr-nrm-gnbcuupfunction { prefix gnbcuup3gpp ; }
+  import _3gpp-nr-nrm-gnbdufunction { prefix gnbdu3gpp ; }
+
+  organization "3GPP SA5";
+  contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464";
+  description "Defines the YANG mapping of the RRMPolicy abstract class that
+    is part of the NR Network Resource Model (NRM).
+    Copyright 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI,
+    TTA, TTC). All rights reserved.";
+  reference "3GPP TS 28.541 5G Network Resource Model (NRM)";
+
+  revision 2023-09-19 { reference CR-1043 ; } //date updated; it was already used in R18
+  revision 2022-07-28 { reference "CR-0770"; }
+  revision 2020-11-05 { reference CR-0412 ; }
+  revision 2020-04-28 { reference "CR0285"; }
+  revision 2020-02-14 { reference "Initial revision"; }
+
+  grouping RRMPolicyMemberGrp {
+    description "This data type represents an RRM Policy member that will be
+      part of a rRMPolicyMemberList. A RRMPolicyMember is defined by its
+      pLMNId and sNSSAI (S-NSSAI).
+      The members in a rRMPolicyMemberList are assigned a specific amount of
+      RRM resources based on settings in RRMPolicy.";
+
+    uses types5g3gpp:PLMNInfo;
+  }
+
+  grouping RRMPolicy_Grp {
+    description "This IOC represents the properties of an abstract RRMPolicy
+      . The RRMPolicy_ IOC needs to be subclassed to be instantiated.
+      It defines two attributes apart from those inherited from Top IOC, the
+      resourceType attribute defines type of resource (PRB, RRC
+      connected users, DRB usage etc.) and the rRMPolicyMemberList attribute
+      defines the RRMPolicyMember(s)that are subject to this policy.
+      An RRM resource (defined in resourceType
+      attribute) is located in NRCellDU, NRCellCU, GNBDUFunction,
+      GNBCUCPFunction or in GNBCUUPFunction. The RRMPolicyRatio IOC is one
+      realization of a RRMPolicy_ IOC. This RRM framework allows adding new
+      policies, both standardized (like RRMPolicyRatio) or as vendor specific,
+      by inheriting from the abstract RRMPolicy_ IOC.";
+
+    leaf resourceType {
+      description "The resourceType attribute defines type of resource (PRB,
+        RRC connected users, DRB usage etc.) that is subject to policy.
+       Valid values are 'PRB', 'PRB_UL', 'PRB_DL', 'RRC' or 'DRB'";
+      mandatory true;
+      type enumeration {
+        enum PRB;
+        enum PRB_UL;
+        enum PRB_DL;
+        enum RRC;
+        enum DRB;
+      }
+    }
+
+    list rRMPolicyMemberList{
+      description "It represents the list of RRMPolicyMember (s) that the
+        managed object is supporting. A RRMPolicyMember <<dataType>> include
+        the PLMNId <<dataType>> and S-NSSAI <<dataType>>." ;
+      min-elements 1;
+      key "mcc mnc sd sst";
+      uses RRMPolicyMemberGrp;
+    }
+  } // grouping
+
+  grouping RRMPolicyRatioGrp {
+    description "Represents the RRMPolicyRatio concrete IOC.";
+
+    uses RRMPolicy_Grp;    // Inherits RRMPolicy_
+
+    leaf rRMPolicyMaxRatio {
+      description " This attribute specifies the maximum percentage of radio
+       resource that can be used by the associated rRMPolicyMemberList.
+       The maximum percentage of radio resource include at least one of
+       the shared resources, prioritized resources and dedicated resources.
+       The sum of the rRMPolicyMaxRatio values assigned to all RRMPolicyRatio(s)
+       name-contained by same ManagedEntity can be greater that 100.";
+      default 100;
+      type uint8 { range "0..100"; }
+      units percent;
+    }
+
+    leaf rRMPolicyMinRatio {
+      description " This attribute specifies the minimum percentage of radio
+        resources that can be used by the associated rRMPolicyMemberList.
+        The minimum percentage of radio resources including at least one of
+        prioritized resources and dedicated resources. The sum of the
+        rRMPolicyMinRatio values assigned to all RRM PolicyRatio(s)
+        name-contained by same ManagedEntity shall be less or equal 100.";
+      default 0;
+      type uint8 { range "0..100"; }
+      units percent;
+    }
+
+    leaf rRMPolicyDedicatedRatio {
+      description " This attribute specifies the percentage of radio resource
+        that dedicatedly used by the associated rRMPolicyMemberList. The sum of
+        the rRMPolicyDeidctaedRatio values assigned to all RRMPolicyRatio(s)
+        name-contained by same ManagedEntity shall be less or equal 100. ";
+      default 0;
+      type uint8 { range "0..100"; }
+      units percent;
+      }
+    }
+
+  grouping RRMPolicySubtree {
+    description "Contains RrmPolicy related classes.
+      Should be used in all classes (or classes inheriting from)
+      - NRCellCU, NRCellDU, GNBCUUPFunction, GNBCUCPFunction, GNBDUFunction
+
+      If some YAM wants to augment these classes/list/groupings they must
+      augment all user classes!";
+
+    list RRMPolicyRatio {
+      description "This IOC represents the properties of RRMPolicyRatio.
+        RRMPolicyRatio is one realization of abstract RRMPolicy_ IOC.
+        RRMPolicyRatio has three attributes, apart from those inherited
+        (DN, resourceType, rRMPolicyMemberList).
+
+        Structure of RRMPolicyRatio includes in order: Dedicated Resources,
+        Prioritized Resources, Shared Resources, etc.
+
+        - The attribute rRMPolicyMaxRatio defines the maximum resource usage
+        quota for the associated rRMPolicyMemberList, including at least one of
+        shared resources, prioritized resources and dedicated resources. The
+        sum of the 'rRMPolicyMaxRatio' values assigned to all RRMPolicyRatio(s)
+        name-contained by same MangedEntity can be greater than 100.
+        - The attribute rRMPolicyMinRatio defines the minimum resource usage
+        quota for the associated RRMPolicyMemberList, including at least one
+        of prioritized resources and dedicated resources, which means the
+        resources quota that need to be guaranteed for use by the associated
+        rRMPolicyMemberList. The sum of the 'rRMPolicyMinRatio' values assigned
+        to all RRMPolicyRatio(s) name-contained by same MangedEntity shall be
+        less or equal 100.
+        - The attribute rRMPolicyDedicatedRatio defines the dedicated resource
+        usage quota for the RRMPolicyMemberList, including dedicated resources.
+        The sum of the 'rRMPolicyDedicatedRatio' values assigned to all
+        RRMPolicyRatio(s) name-contained by same MangedEntity shall be less
+        or equal 100.
+
+        The following are the definition for above mentioned three resource
+        categories:
+        - Shared resources: means the resources that are shared with other
+        rRMPolicyMemberList(s) (i.e. the rRMPolicyMemberList(s) defined in
+        RRMPolicyRatio(s) name-contained by the same ManagedEntity). The shared
+        resources are not guaranteed for use by the associated
+        rRMPolicyMemberList. The shared resources quota is represented by
+        [rRMPolicyMaxRatio-rRMPolicyMinRatio].
+        - Priortized resources: means the resources are preferentially used by
+        the associated RRMPolicyMemberList. These resources are guaranteed for
+        use by the associated RRMPolicyMemberList when it needs to use them.
+        When not used, these resources may be used by other
+        rRMPolicyMemberList(s) (i.e. the rRMPolicyMemberList(s) defined in
+        RRMPolicyRatio(s) name-contained by the same ManagedEntity).
+        The prioritized resources quota is represented by
+        [rRMPolicyMinRatio-rRMPolicyDedicatedRatio]
+        - Dedicated resources: means the resources are dedicated for use by
+        the associated RRMPolicyMemberList. These resources can not be shared
+        even if the associated RRMPolicyMember does not use them. The Dedicated
+        resources quota is represented by [rRMPolicyDedicatedRatio].";
+      key id;
+      uses top3gpp:Top_Grp;
+      container attributes {
+        uses RRMPolicyRatioGrp;
+      }
+    }
+  }
+
+  augment "/me3gpp:ManagedElement/gnbcucp3gpp:GNBCUCPFunction/" +
+      "nrcellcu3gpp:NRCellCU" {
+    uses RRMPolicySubtree;
+  }
+
+  augment "/me3gpp:ManagedElement/gnbdu3gpp:GNBDUFunction/" +
+      "nrcelldu3gpp:NRCellDU" {
+    uses RRMPolicySubtree;
+  }
+
+  augment "/me3gpp:ManagedElement/gnbcuup3gpp:GNBCUUPFunction" {
+    uses RRMPolicySubtree;
+  }
+
+  augment "/me3gpp:ManagedElement/gnbcucp3gpp:GNBCUCPFunction" {
+    uses RRMPolicySubtree;
+  }
+
+  augment "/me3gpp:ManagedElement/gnbdu3gpp:GNBDUFunction" {
+    uses RRMPolicySubtree;
+  }
+
+}

original/Rel-20/28_series/_3gpp-ns-nrm-serviceprofile.yang

@@ -0,0 +1,506 @@
+submodule _3gpp-ns-nrm-serviceprofile {
+  yang-version 1.1;
+  belongs-to _3gpp-ns-nrm-networkslice { prefix ns3gpp; }
+
+  import _3gpp-common-yang-types { prefix types3gpp; }
+  import _3gpp-5g-common-yang-types { prefix types5g3gpp; }
+  import _3gpp-ns-nrm-common { prefix ns3cmn; }
+
+  organization "3GPP SA5";
+  contact 
+    "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464";
+  description "A network slice instance in a 5G network.
+    Copyright 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, 
+    TTA, TTC). All rights reserved.";
+  reference "3GPP TS 28.541
+    Management and orchestration; 
+    5G Network Resource Model (NRM);
+    Information model definitions for network slice NRM (chapter 6)
+    ";
+
+  revision 2023-09-18 { reference CR-1043 ; } 
+  revision 2020-06-02 {
+    reference "CR-0485, CR-0508";
+  }
+
+  revision 2020-02-19 {
+    description "Introduction of YANG definitions for network slice NRM";
+    reference "CR-0458";
+  }
+
+  revision 2019-06-23 {
+    description "Initial revision";
+    reference "3GPP TS 28.541 V15.X.XX";
+  }
+
+  typedef availability-percentage {
+    description "
+      Percentage value of the amount of time the end-to-end communication 
+      service is delivered according to an agreed QoS, divided by the amount 
+      of time the system is expected to deliver the end-to-end service 
+      according to the specification in a specific area.";
+    reference "3GPP TS 22.261 3.1";
+    type decimal64 { 
+      fraction-digits 4; // E.g. 99.9999
+      range 0..100;
+    }
+  }
+
+  typedef V2XMode-enum {
+    type enumeration {
+      enum NOT_SUPPORTED;
+      enum SUPPORTED_BY_NR;
+    }
+  }
+
+  grouping ServiceProfileGrp {
+
+    leaf serviceProfileId {
+      description "Service profile identifier.";
+      type types3gpp:DistinguishedName;
+    }
+
+    list sNSSAIList {
+      description "The S-NSSAI list to be supported by the new NSI to be 
+        created or the existing NSI to be re-used.";
+      min-elements 1;
+      key idx;
+      unique "sst sd";
+      leaf idx {
+        description "Synthetic index for the element.";
+        type uint32;
+      }
+      uses types5g3gpp:SNssai;
+    }
+
+    list pLMNIdList {
+      description "List of PLMN IDs.";
+      min-elements 1;
+      key "mcc mnc";
+      ordered-by user;
+      uses types3gpp:PLMNId;
+    }
+
+    leaf maxNumberofUEs {
+      description "The maximum number of UEs that may simultaneously 
+        access the network slice instance.";
+      mandatory true;
+      type uint64;
+    }
+
+    leaf-list coverageArea {
+       min-elements 1;
+       description "A list of TrackingAreas where the NSI can be selected.";
+       type types3gpp:Tac;
+    }
+
+    leaf latency {
+      description "The packet transmission latency (milliseconds) through 
+        the RAN, CN, and TN part of 5G network, used to evaluate utilization 
+        performance of the end-to-end network slice instance.";
+      reference "3GPP TS 28.554 clause 6.3.1";
+      mandatory true;
+      type uint16;
+      units milliseconds;
+    }
+
+    leaf uEMobilityLevel {
+      description "The mobility level of UE accessing the network slice 
+        instance.";
+      reference "3GPP TS 22.261 clause 6.2.1";
+      type types3gpp:UeMobilityLevel;
+    }
+
+    leaf resourceSharingLevel {
+      description "Specifies whether the resources to be allocated to the 
+        network slice instance may be shared with another network slice 
+        instance(s).";
+      type types3gpp:ResourceSharingLevel;
+    }
+
+    //Stage2 issue: The sNSSAIList above specifies one or potentially 
+    //              several sST objects for the service profile.
+    //              How do they relate?
+    leaf sST {
+      description "Specifies the slice/service type. See 3GPP TS 23.501 
+        for defined values.";
+      mandatory true;
+      type uint32;
+      reference "3GPP TS 23.501 5.15.2.2";
+    }
+
+    leaf availability {
+      description "The availability requirement for a network slice 
+        instance, expressed as a percentage.";
+      type availability-percentage;
+    }
+
+    list delayTolerance {
+      description "An attribute specifies the properties of service delivery 
+        flexibility, especially for the vertical services that are not 
+        chasing a high system performance.";
+      reference "TS 22.104 clause 4.3";
+      config false;
+      key idx;
+      max-elements 1;
+      leaf idx {
+        description "Synthetic index for the element.";
+        type uint32;
+      }
+      list servAttrCom {
+        description "This list represents the common properties of service 
+          requirement related attributes.";
+        reference "GSMA NG.116 corresponding to Attribute categories, 
+          tagging and exposure";
+        key idx;
+        max-elements 1;
+        leaf idx {
+          description "Synthetic index for the element.";
+          type uint32;
+        }
+        uses ns3cmn:ServAttrComGrp;
+      }
+      leaf support {
+        description "An attribute specifies whether or not the network 
+          slice supports service delivery flexibility, especially for the 
+          vertical services that are not chasing a high system performance.";
+        type ns3cmn:Support-enum;
+      }
+    }
+    list deterministicComm {
+      //Stage2 issue: deterministicComm is not defined in 28.541 chapter 6, 
+      //              but I guess deterministicComm is meant
+      description "This list represents the properties of the deterministic 
+        communication for periodic user traffic. Periodic traffic refers to the 
+        type of traffic with periodic transmissions.";
+      key idx;
+      max-elements 1;
+      leaf idx {
+        description "Synthetic index for the element.";
+        type uint32;
+      }
+      list servAttrCom {
+        description "This list represents the common properties of service 
+          requirement related attributes.";
+        reference "GSMA NG.116 corresponding to Attribute categories, 
+          tagging and exposure";
+        config false;
+        key idx;
+        max-elements 1;
+        leaf idx {
+          description "Synthetic index for the element.";
+          type uint32;
+        }
+        uses ns3cmn:ServAttrComGrp;
+      }
+      leaf availability {
+        //Stage2 issue: Defined differently in 28.541 chapter 6, but XML 
+        //              uses DeterministicCommAvailability
+        config false;
+        type ns3cmn:DeterminCommAvailability;
+      }
+      leaf periodicityList {
+        //Stage2 issue: Not defined in 28.541 chapter 6. XML and YAML 
+        //              says "string".
+        type string;
+      }
+    }
+    list dLThptPerSlice {
+      description "This attribute defines achievable data rate of the 
+        network slice in downlink that is available ubiquitously across 
+        the coverage area of the slice";
+      key idx;
+      max-elements 1;
+      leaf idx {
+        description "Synthetic index for the element.";
+        type uint32;
+      }
+      uses ns3cmn:XLThptGrp;
+    }
+    list dLThptPerUE {
+      description "This attribute defines data rate supported by the network 
+        slice per UE";
+      key idx;
+      max-elements 1;
+      leaf idx {
+        description "Synthetic index for the element.";
+        type uint32;
+      }
+      uses ns3cmn:XLThptGrp;
+    }
+    list uLThptPerSlice {
+      key idx;
+      max-elements 1;
+      leaf idx {
+        description "Synthetic index for the element.";
+        type uint32;
+      }
+      description "This attribute defines achievable data rate of the 
+        network slice in uplink that is available ubiquitously across 
+        the coverage area of the slice";
+      uses ns3cmn:XLThptGrp;
+    }
+    list uLThptPerUE {
+      key idx;
+      max-elements 1;
+      leaf idx {
+        description "Synthetic index for the element.";
+        type uint32;
+      }
+      description "This attribute defines data rate supported by the 
+        network slice per UE";
+      uses ns3cmn:XLThptGrp;
+    }
+    list maxPktSize {
+      config false;
+      key idx;
+      max-elements 1;
+      leaf idx {
+        description "Synthetic index for the element.";
+        type uint32;
+      }
+      description "This parameter specifies the maximum packet size 
+        supported by the network slice";
+      list servAttrCom {
+        description "This list represents the common properties of service 
+          requirement related attributes.";
+        reference "GSMA NG.116 corresponding to Attribute categories, 
+          tagging and exposure";
+        key idx;
+        max-elements 1;
+        leaf idx {
+          description "Synthetic index for the element.";
+          type uint32;
+        }
+        uses ns3cmn:ServAttrComGrp;
+      }
+      leaf maxSize {
+        //Stage2 issue: Not defined in 28.541, guessing integer bytes
+        type uint32;
+        units bytes;
+      }
+    }
+    list maxNumberofPDUSessions {
+      description "Represents the maximum number of 
+        concurrent PDU sessions supported by the network slice";
+      config false;
+      key idx;
+      max-elements 1;
+      leaf idx {
+        description "Synthetic index for the element.";
+        type uint32;
+      }
+      list servAttrCom {
+        description "This list represents the common properties of service 
+          requirement related attributes.";
+        reference "GSMA NG.116 corresponding to Attribute categories, 
+          tagging and exposure";
+        key idx;
+        max-elements 1;
+        leaf idx {
+          description "Synthetic index for the element.";
+          type uint32;
+        }
+        uses ns3cmn:ServAttrComGrp;
+      }
+      leaf nOofPDUSessions {
+        //Stage2 issue: Not defined in 28.541, guessing integer
+        type uint32;
+      }
+    }
+    list kPIMonitoring {
+      description "Represents performance monitoring";
+      config false;
+      key idx;
+      max-elements 1;
+      leaf idx {
+        description "Synthetic index for the element.";
+        type uint32;
+      }
+      list servAttrCom {
+        description "This list represents the common properties of service 
+          requirement related attributes.";
+        reference "GSMA NG.116 corresponding to Attribute categories, 
+          tagging and exposure";
+        key idx;
+        max-elements 1;
+        leaf idx {
+          description "Synthetic index for the element.";
+          type uint32;
+        }
+        uses ns3cmn:ServAttrComGrp;
+      }
+      leaf kPIList {
+        //Stage2 issue: Data format not specified, low interoperability
+        description "An attribute specifies the name list of KQIs and KPIs 
+        available for performance monitoring";
+        type string;
+      }
+    }
+    list userMgmtOpen {
+      description "An attribute specifies whether or not the network slice 
+        supports the capability for the NSC to manage their users or groups 
+        of users' network services and corresponding requirements.";
+      config false;
+      key idx;
+      max-elements 1;
+      leaf idx {
+        description "Synthetic index for the element.";
+        type uint32;
+      }
+      list servAttrCom {
+        description "This list represents the common properties of service 
+          requirement related attributes.";
+        reference "GSMA NG.116 corresponding to Attribute categories, 
+          tagging and exposure";
+        key idx;
+        max-elements 1;
+        leaf idx {
+          description "Synthetic index for the element.";
+          type uint32;
+        }
+        uses ns3cmn:ServAttrComGrp;
+      }
+      leaf support {
+        type ns3cmn:Support-enum;
+      }
+    }
+    list v2XCommModels {
+      description "An attribute specifies whether or not the V2X 
+        communication mode is supported by the network slice.";
+      config false;
+      key idx;
+      max-elements 1;
+      leaf idx {
+        description "Synthetic index for the element.";
+        type uint32;
+      }
+      list servAttrCom {
+        description "This list represents the common properties of service 
+          requirement related attributes.";
+        reference "GSMA NG.116 corresponding to Attribute categories, 
+        tagging and exposure";
+        key idx;
+        max-elements 1;
+        leaf idx {
+          description "Synthetic index for the element.";
+          type uint32;
+        }
+        uses ns3cmn:ServAttrComGrp;
+      }
+      leaf v2XMode {
+        type V2XMode-enum;
+      }        
+    }
+    list termDensity {
+      description "An attribute specifies the overall user density over 
+        the coverage area of the network slice";
+      config false;
+      key idx;
+      max-elements 1;
+      leaf idx {
+        description "Synthetic index for the element.";
+        type uint32;
+      }
+      list servAttrCom {
+        description "This list represents the common properties of service 
+          requirement related attributes.";
+        reference "GSMA NG.116 corresponding to Attribute categories, 
+          tagging and exposure";
+        key idx;
+        max-elements 1;
+        leaf idx {
+          description "Synthetic index for the element.";
+          type uint32;
+        }
+        uses ns3cmn:ServAttrComGrp;
+      }
+      leaf density {
+        type uint32;
+        units users/km2;
+      }        
+    }
+    leaf activityFactor {
+      //Stage2 issue: This is modeled as writable/config true in 28.542, 
+      //              but that does not appear to match the description
+      description "An attribute specifies the percentage value of the 
+        amount of simultaneous active UEs to the total number of UEs where 
+        active means the UEs are exchanging data with the network";
+      reference "TS 22.261 Table 7.1-1";
+      type decimal64 {
+        fraction-digits 1;
+      }
+    }
+    leaf uESpeed {
+      //Stage2 issue: This is modeled as writable/config true in 28.542, 
+      //              but that does not appear to match the description
+      description "An attribute specifies the maximum speed (in km/hour) 
+        supported by the network slice at which a defined QoS can be 
+        achieved";
+      type uint32;
+      units km/h;
+    }
+    leaf jitter {
+      //Stage2 issue: This is modeled as writable/config true in 28.542, 
+      //              but that does not appear to match the description
+      description "An attribute specifies the deviation from the desired 
+        value to the actual value when assessing time parameters";
+      reference "TS 22.104 clause C.4.1";
+      type uint32;
+      units microseconds;
+    }
+    leaf survivalTime {
+      description "An attribute specifies the time that an application 
+        consuming a communication service may continue without an 
+        anticipated message.";
+      reference "TS 22.104 clause 5";
+      type string;
+    }
+    leaf reliability {
+      description "An attribute specifies in the context of network layer 
+        packet transmissions, percentage value of the amount of sent 
+        network layer packets successfully delivered to a given system 
+        entity within the time constraint required by the targeted service, 
+        divided by the total number of sent network layer packets.";
+      reference "TS 22.261, TS 22.104";
+      type string;
+    }
+    leaf maxDLDataVolume {
+      //Stage2 issue: Not defined in 28.541. XML and YAML says "string"
+      type string;
+    }
+    leaf maxULDataVolume {
+      //Stage2 issue: Not defined in 28.541. XML and YAML says "string"
+      type string;
+    }
+    list nBIoT {
+      description "An attribute specifies whether NB-IoT is supported in 
+        the RAN in the network slice";
+      config false;
+      key idx;
+      max-elements 1;
+      leaf idx {
+        description "Synthetic index for the element.";
+        type uint32;
+      }
+      list servAttrCom {
+        description "This list represents the common properties of service 
+          requirement related attributes.";
+        reference "GSMA NG.116 corresponding to Attribute categories, 
+          tagging and exposure";
+        key idx;
+        max-elements 1;
+        leaf idx {
+          description "Synthetic index for the element.";
+          type uint32;
+        }
+        uses ns3cmn:ServAttrComGrp;
+      }
+      leaf support {
+        description "An attribute specifies whether NB-IoT is supported 
+          in the RAN in the network slice";
+        type ns3cmn:Support-enum;
+      }
+    }
+  }
+}

original/Rel-20/28_series/_3gpp-ns-nrm-sliceprofile.yang

@@ -0,0 +1,1006 @@
+submodule _3gpp-ns-nrm-sliceprofile {
+  yang-version 1.1;
+  belongs-to _3gpp-ns-nrm-networkslicesubnet { prefix nss3gpp; }
+
+  import _3gpp-common-yang-types { prefix types3gpp; }
+  import _3gpp-5g-common-yang-types { prefix types5g3gpp; }
+  // import _3gpp-ns-nrm-networkslice { prefix ns3gpp; }
+  import _3gpp-ns-nrm-common { prefix ns3cmn3gpp; }
+
+  organization "3GPP SA5";
+  contact
+    "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464";
+  description "Represents the properties of network slice subnet related
+    requirement that should be supported by the network slice subnet
+    instance in a 5G network.
+    Copyright 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI,
+    TTA, TTC). All rights reserved.";
+  reference "3GPP TS 28.541
+    Management and orchestration;
+    5G Network Resource Model (NRM);
+    Information model definitions for network slice NRM (chapter 6)
+    ";
+
+  revision 2025-01-25 { reference CR-1442; }
+  revision 2023-11-04 { reference CR-1129; }
+  revision 2023-09-18 { reference CR-1043 ; }
+  revision 2023-04-26 { reference CR-0916; }
+  revision 2021-07-20 { reference CR-0566; }
+  revision 2021-05-05 { reference CR-0485; }
+
+  revision 2020-02-19 {
+    description "Introduction of YANG definitions for network slice NRM";
+    reference "CR-0458";
+  }
+
+  revision 2019-05-27 {
+    description "initial revision.";
+    reference "Based on
+      3GPP TS 28.541 V15.X.XX";
+  }
+  typedef SliceSimultaneousUse-enum {
+    type enumeration {
+      enum ZERO;
+      enum ONE;
+      enum TWO;
+      enum THREE;
+      enum FOUR;
+    }
+  }
+  typedef ServiceType-enum {
+    type enumeration {
+      enum eMBB;
+      enum URLLC;
+      enum MIoT;
+      enum V2X;
+    }
+  }
+
+  grouping PositioningGrp {
+    description "Represents positioning support.";
+    reference "Clause 3.4.20 of GSMA NG.116 ";
+
+    uses ns3cmn3gpp:ServAttrComGrp ;
+    leaf-list availability {
+      type enumeration {
+        enum CIDE_CID ;
+        enum OTDOA;
+        enum RF_FINGERPRINTING;
+        enum AECID;
+        enum HYBRID_POSITIONING;
+        enum NET_RTK;
+      }
+      min-elements 1;
+      config false;
+      description "Specifies if this attribute is provided by the RAN domain
+        of the network slice and contains a list of positioning methods
+        provided by the RAN domain. If the list is empty this attribute is
+        not available in the RAN domain and the other parameters might be
+        ignored, see NG.116. Values allowed: are
+        CIDE-CID (LTE and NR), OTDOA (LTE and NR), RF fingerprinting, AECID,
+        Hybrid positioning, NET-RTK.";
+    }
+    leaf predictionfrequency {
+      type enumeration {
+        enum PERSEC;
+        enum PERMIN;
+        enum PERHOUR;
+      }
+      mandatory true;
+      description "Specifies how often location information is provided.
+        This parameter simply defines how often the customer is allowed to
+        request location information. This is not related to the time it
+        takes to determine the location, which is a characteristic of the
+        positioning method.
+        If leaf-list availability is empty, the value has no meaning.";
+        reference "NG.116";
+    }
+    leaf accuracy {
+      type decimal64 {
+         fraction-digits 2;
+      }
+      units meter;
+      mandatory true;
+      description "Specifies the accuracy of the location information.
+        Accuracy depends on the respective positioning solution applied in the
+        RAN domain of the network slice.";
+      reference "NG.116";
+    }
+  }
+
+  grouping TopSliceSubnetProfileGrp {
+    leaf latency {
+      description "The packet transmission latency (milliseconds) through
+        the RAN, CN, and TN part of 5G network, used to evaluate
+        utilization performance of the end-to-end network slice instance.";
+      reference "3GPP TS 28.554 clause 6.3.1";
+      //optional support
+      mandatory true;
+      type uint16;
+      units milliseconds;
+    }
+    leaf maxNumberofUEs {
+      description "Specifies the maximum number of UEs may simultaneously
+        access the network slice instance.";
+      //optional support
+      mandatory true;
+      type uint64;
+    }
+    list dLThptPerSliceSubnet {
+      description "This attribute defines achievable data rate of the
+        network slice subnet in downlink that is available ubiquitously
+        across the coverage area of the slice";
+      key idx;
+      max-elements 1;
+      leaf idx {
+        description "Synthetic index for the element.";
+        type uint32;
+      }
+      uses ns3cmn3gpp:XLThptGrp;
+    }
+    list dLThptPerUE {
+      description "This attribute defines data rate supported by the
+        network slice per UE, refer NG.116.";
+      key idx;
+      max-elements 1;
+      leaf idx {
+        description "Synthetic index for the element.";
+        type uint32;
+      }
+      uses ns3cmn3gpp:XLThptGrp;
+    }
+    list uLThptPerSliceSubnet {
+      description "This attribute defines achievable data rate of the
+        network slice subnet in uplink that is available ubiquitously
+        across the coverage area of the slice";
+      key idx;
+      max-elements 1;
+      leaf idx {
+        description "Synthetic index for the element.";
+        type uint32;
+      }
+      uses ns3cmn3gpp:XLThptGrp;
+    }
+    list uLThptPerUE {
+      description "This attribute defines data rate supported by the
+        network slice per UE, refer NG.116";
+      key idx;
+      max-elements 1;
+      leaf idx {
+        description "Synthetic index for the element.";
+        type uint32;
+      }
+      uses ns3cmn3gpp:XLThptGrp;
+    }
+    list maxPktSize {
+      config false;
+      key idx;
+      max-elements 1;
+      leaf idx {
+        description "Synthetic index for the element.";
+        type uint32;
+      }
+      description "This parameter specifies the maximum packet size
+        supported by the network slice";
+      list servAttrCom {
+        description "This list represents the common properties of service
+          requirement related attributes.";
+        reference "GSMA NG.116 corresponding to Attribute categories,
+          tagging and exposure";
+        key idx;
+        max-elements 1;
+        leaf idx {
+          description "Synthetic index for the element.";
+          type uint32;
+        }
+        uses ns3cmn3gpp:ServAttrComGrp;
+      }
+      leaf maxSize {
+        //Stage2 issue: Not defined in 28.541, guessing integer bytes
+        type uint32;
+        units bytes;
+      }
+    }
+    list maxNumberofPDUSessions {
+      description "Represents the maximum number of
+        concurrent PDU sessions supported by the network slice";
+      config false;
+      key idx;
+      max-elements 1;
+      leaf idx {
+        description "Synthetic index for the element.";
+        type uint32;
+      }
+      list servAttrCom {
+        description "This list represents the common properties of service
+          requirement related attributes.";
+        reference "GSMA NG.116 corresponding to Attribute categories,
+          tagging and exposure";
+        key idx;
+        max-elements 1;
+        leaf idx {
+          description "Synthetic index for the element.";
+          type uint32;
+        }
+        uses ns3cmn3gpp:ServAttrComGrp;
+      }
+      leaf nOofPDUSessions {
+        //Stage2 issue: Not defined in 28.541, guessing integer
+        type uint32;
+      }
+    }
+    leaf sliceSimultaneousUse {
+      description "This attribute describes whether a network slice
+      can be simultaneously used by a device together with other
+      network slices and if so, with which other classes of network slices.";
+      type SliceSimultaneousUse-enum;
+    }
+    list delayTolerance {
+      description "An attribute specifies the properties of service delivery
+        flexibility, especially for the vertical services that are not
+        chasing a high system performance.";
+      reference "TS 22.104 clause 4.3";
+      config false;
+      key idx;
+      max-elements 1;
+      leaf idx {
+        description "Synthetic index for the element.";
+        type uint32;
+      }
+      list servAttrCom {
+        description "This list represents the common properties of service
+          requirement related attributes.";
+        reference "GSMA NG.116 corresponding to Attribute categories,
+          tagging and exposure";
+        key idx;
+        max-elements 1;
+        leaf idx {
+          description "Synthetic index for the element.";
+          type uint32;
+        }
+        uses ns3cmn3gpp:ServAttrComGrp;
+      }
+      leaf support {
+        description "An attribute specifies whether or not the network
+          slice supports service delivery flexibility, especially for the
+          vertical services that are not chasing a high system performance.";
+        type ns3cmn3gpp:Support-enum;
+      }
+    }
+    list termDensity {
+      description "An attribute specifies the overall user density over
+        the coverage area of the network slice";
+      config false;
+      key idx;
+      max-elements 1;
+      leaf idx {
+        description "Synthetic index for the element.";
+        type uint32;
+      }
+      list servAttrCom {
+        description "This list represents the common properties of service
+          requirement related attributes.";
+        reference "GSMA NG.116 corresponding to Attribute categories,
+          tagging and exposure";
+        key idx;
+        max-elements 1;
+        leaf idx {
+          description "Synthetic index for the element.";
+          type uint32;
+        }
+        uses ns3cmn3gpp:ServAttrComGrp;
+      }
+      leaf density {
+        type uint32;
+        units users/km2;
+      }
+    }
+    leaf activityFactor {
+      //Stage2 issue: This is modeled as writable/config true in 28.542,
+      //              but that does not appear to match the description
+      description "An attribute specifies the percentage value of the
+        amount of simultaneous active UEs to the total number of UEs where
+        active means the UEs are exchanging data with the network";
+      reference "TS 22.261 Table 7.1-1";
+      type decimal64 {
+        fraction-digits 1;
+      }
+    }
+    list coverageAreaTAList {
+      description "A list of TrackingAreas where the NSI can be selected.";
+      key idx; //no obvious leaf to use as a key
+      leaf idx { type uint32; }
+      //optional support
+      min-elements 1;
+      uses types3gpp:TaiGrp;
+    }
+    leaf uEMobilityLevel {
+      description "The mobility level of UE accessing the network slice
+        instance.";
+      //optional support
+      type types3gpp:UeMobilityLevel;
+    }
+
+    leaf resourceSharingLevel {
+      description "Specifies whether the resources to be allocated to the
+        network slice subnet instance may be shared with another network
+        slice subnet instance(s).";
+      //optional support
+      type types3gpp:ResourceSharingLevel;
+    }
+    leaf uESpeed {
+      //Stage2 issue: This is modeled as writable/config true in 28.542,
+      //              but that does not appear to match the description
+      description "An attribute specifies the maximum speed (in km/hour)
+        supported by the network slice at which a defined QoS can be
+        achieved";
+      type uint32;
+      units km/h;
+    }
+    leaf reliability {
+      description "An attribute specifies in the context of network layer
+        packet transmissions, percentage value of the amount of sent
+        network layer packets successfully delivered to a given system
+        entity within the time constraint required by the targeted service,
+        divided by the total number of sent network layer packets.";
+      reference "TS 22.261, TS 22.104";
+      type string;
+    }
+    leaf serviceType {
+      description "An attribute specifies the standardized network slice type.
+    allowedValues: eMBB, URLLC, MIoT, V2X.";
+      type ServiceType-enum;
+    }
+    list deterministicComm {
+      //Stage2 issue: deterministicComm is not defined in 28.541 chapter 6,
+      //              but I guess determinComm is meant
+      description "This list represents the properties of the deterministic
+        communication for periodic user traffic. Periodic traffic refers to the
+        type of traffic with periodic transmissions.";
+      key idx;
+      max-elements 1;
+      leaf idx {
+        description "Synthetic index for the element.";
+        type uint32;
+      }
+      list servAttrCom {
+        description "This list represents the common properties of service
+          requirement related attributes.";
+        reference "GSMA NG.116 corresponding to Attribute categories,
+          tagging and exposure";
+        config false;
+        key idx;
+        max-elements 1;
+        leaf idx {
+          description "Synthetic index for the element.";
+          type uint32;
+        }
+        uses ns3cmn3gpp:ServAttrComGrp;
+      }
+      leaf availability {
+        //Stage2 issue: Defined differently in 28.541 chapter 6, but XML
+        //              uses DeterminCommAvailability
+        config false;
+        type ns3cmn3gpp:DeterminCommAvailability;
+      }
+      leaf periodicityList {
+        //Stage2 issue: Not defined in 28.541 chapter 6. XML and YAML
+        //              says "string".
+        type string;
+      }
+    }
+    leaf survivalTime {
+      description "An attribute specifies the time that an application
+        consuming a communication service may continue without an
+        anticipated message.";
+      reference "TS 22.104 clause 5";
+      type string;
+    }
+    list positioning {
+      key predictionfrequency;
+      min-elements 1;
+      max-elements 1;
+      description "Specifies whether the network slice provides
+        geo-localization methods or supporting methods";
+      reference "Clause 3.4.20 of NG.116";
+      uses PositioningGrp;
+    }
+  }
+
+  grouping CNSliceSubnetProfileGrp {
+    leaf latency {
+      description "The packet transmission latency (milliseconds) through
+        the RAN, CN, and TN part of 5G network, used to evaluate
+        utilization performance of the end-to-end network slice instance.";
+      reference "3GPP TS 28.554 clause 6.3.1";
+      //optional support
+      mandatory true;
+      type uint16;
+      units milliseconds;
+    }
+    leaf maxNumberofUEs {
+      description "Specifies the maximum number of UEs may simultaneously
+        access the network slice instance.";
+      //optional support
+      mandatory true;
+      type uint64;
+    }
+    list dLThptPerSliceSubnet {
+      description "This attribute defines achievable data rate of the
+        network slice subnet in downlink that is available ubiquitously
+        across the coverage area of the slice";
+      key idx;
+      max-elements 1;
+      leaf idx {
+        description "Synthetic index for the element.";
+        type uint32;
+      }
+      uses ns3cmn3gpp:XLThptGrp;
+    }
+    list dLThptPerUE {
+      description "This attribute defines data rate supported by the
+        network slice per UE, refer NG.116.";
+      key idx;
+      max-elements 1;
+      leaf idx {
+        description "Synthetic index for the element.";
+        type uint32;
+      }
+      uses ns3cmn3gpp:XLThptGrp;
+    }
+    list uLThptPerSliceSubnet {
+      description "This attribute defines achievable data rate of the
+        network slice subnet in uplink that is available ubiquitously
+        across the coverage area of the slice";
+      key idx;
+      max-elements 1;
+      leaf idx {
+        description "Synthetic index for the element.";
+        type uint32;
+      }
+      uses ns3cmn3gpp:XLThptGrp;
+    }
+    list uLThptPerUE {
+      description "This attribute defines data rate supported by the
+        network slice per UE, refer NG.116";
+      key idx;
+      max-elements 1;
+      leaf idx {
+        description "Synthetic index for the element.";
+        type uint32;
+      }
+      uses ns3cmn3gpp:XLThptGrp;
+    }
+    list maxPktSize {
+      config false;
+      key idx;
+      max-elements 1;
+      leaf idx {
+        description "Synthetic index for the element.";
+        type uint32;
+      }
+      description "This parameter specifies the maximum packet size
+        supported by the network slice";
+      list servAttrCom {
+        description "This list represents the common properties of service
+          requirement related attributes.";
+        reference "GSMA NG.116 corresponding to Attribute categories,
+          tagging and exposure";
+        key idx;
+        max-elements 1;
+        leaf idx {
+          description "Synthetic index for the element.";
+          type uint32;
+        }
+        uses ns3cmn3gpp:ServAttrComGrp;
+      }
+      leaf maxSize {
+        //Stage2 issue: Not defined in 28.541, guessing integer bytes
+        type uint32;
+        units bytes;
+      }
+    }
+    list maxNumberofPDUSessions {
+      description "Represents the maximum number of
+        concurrent PDU sessions supported by the network slice";
+      //optional
+      config false;
+      key idx;
+      max-elements 1;
+      leaf idx {
+        description "Synthetic index for the element.";
+        type uint32;
+      }
+      list servAttrCom {
+        description "This list represents the common properties of service
+          requirement related attributes.";
+        reference "GSMA NG.116 corresponding to Attribute categories,
+          tagging and exposure";
+        key idx;
+        max-elements 1;
+        leaf idx {
+          description "Synthetic index for the element.";
+          type uint32;
+        }
+        uses ns3cmn3gpp:ServAttrComGrp;
+      }
+      leaf nOofPDUSessions {
+        //Stage2 issue: Not defined in 28.541, guessing integer
+        type uint32;
+      }
+    }
+    leaf sliceSimultaneousUse {
+      description "This attribute describes whether a network slice
+      can be simultaneously used by a device together with other
+      network slices and if so, with which other classes of network slices.";
+      type SliceSimultaneousUse-enum;
+    }
+    list delayTolerance {
+      description "An attribute specifies the properties of service delivery
+        flexibility, especially for the vertical services that are not
+        chasing a high system performance.";
+      reference "TS 22.104 clause 4.3";
+      config false;
+      key idx;
+      max-elements 1;
+      leaf idx {
+        description "Synthetic index for the element.";
+        type uint32;
+      }
+      list servAttrCom {
+        description "This list represents the common properties of service
+          requirement related attributes.";
+        reference "GSMA NG.116 corresponding to Attribute categories,
+          tagging and exposure";
+        key idx;
+        max-elements 1;
+        leaf idx {
+          description "Synthetic index for the element.";
+          type uint32;
+        }
+        uses ns3cmn3gpp:ServAttrComGrp;
+      }
+      leaf support {
+        description "An attribute specifies whether or not the network
+          slice supports service delivery flexibility, especially for the
+          vertical services that are not chasing a high system performance.";
+        type ns3cmn3gpp:Support-enum;
+      }
+    }
+    list coverageAreaTAList {
+      description "A list of TrackingAreas where the NSI can be selected.";
+      key idx; //no obvious leaf to use as a key
+      leaf idx { type uint32; }
+      //optional support
+      min-elements 1;
+      uses types3gpp:TaiGrp;
+    }
+    leaf resourceSharingLevel {
+      description "Specifies whether the resources to be allocated to the
+        network slice subnet instance may be shared with another network
+        slice subnet instance(s).";
+      //optional support
+      type types3gpp:ResourceSharingLevel;
+    }
+
+    list deterministicComm {
+      //Stage2 issue: deterministicComm is not defined in 28.541 chapter 6,
+      //              but I guess determinComm is meant
+      description "This list represents the properties of the deterministic
+        communication for periodic user traffic. Periodic traffic refers to the
+        type of traffic with periodic transmissions.";
+      key idx;
+      max-elements 1;
+      leaf idx {
+        description "Synthetic index for the element.";
+        type uint32;
+      }
+      list servAttrCom {
+        description "This list represents the common properties of service
+          requirement related attributes.";
+        reference "GSMA NG.116 corresponding to Attribute categories,
+          tagging and exposure";
+        config false;
+        key idx;
+        max-elements 1;
+        leaf idx {
+          description "Synthetic index for the element.";
+          type uint32;
+        }
+        uses ns3cmn3gpp:ServAttrComGrp;
+      }
+      leaf availability {
+        //Stage2 issue: Defined differently in 28.541 chapter 6, but XML
+        //              uses DeterminCommAvailability
+        config false;
+        type ns3cmn3gpp:DeterminCommAvailability;
+      }
+      leaf periodicityList {
+        //Stage2 issue: Not defined in 28.541 chapter 6. XML and YAML
+        //              says "string".
+        type string;
+      }
+    }
+  }
+
+  grouping RANSliceSubnetProfileGrp {
+    description "Represents the RANSliceSubnetProfile datatype";
+    leaf latency {
+      description "The packet transmission latency (milliseconds) through
+        the RAN, CN, and TN part of 5G network, used to evaluate
+        utilization performance of the end-to-end network slice instance.";
+      reference "3GPP TS 28.554 clause 6.3.1";
+      //optional support
+      mandatory true;
+      type uint16;
+      units milliseconds;
+    }
+    leaf maxNumberofUEs {
+      description "Specifies the maximum number of UEs may simultaneously
+        access the network slice instance.";
+      //optional support
+      mandatory true;
+      type uint64;
+    }
+    list dLThptPerSliceSubnet {
+      description "This attribute defines achievable data rate of the
+        network slice subnet in downlink that is available ubiquitously
+        across the coverage area of the slice";
+      key idx;
+      max-elements 1;
+      leaf idx {
+        description "Synthetic index for the element.";
+        type uint32;
+      }
+      uses ns3cmn3gpp:XLThptGrp;
+    }
+    list dLThptPerUE {
+      description "This attribute defines data rate supported by the
+        network slice per UE, refer NG.116.";
+      key idx;
+      max-elements 1;
+      leaf idx {
+        description "Synthetic index for the element.";
+        type uint32;
+      }
+      uses ns3cmn3gpp:XLThptGrp;
+    }
+    list uLThptPerSliceSubnet {
+      description "This attribute defines achievable data rate of the
+        network slice subnet in uplink that is available ubiquitously
+        across the coverage area of the slice";
+      key idx;
+      max-elements 1;
+      leaf idx {
+        description "Synthetic index for the element.";
+        type uint32;
+      }
+      uses ns3cmn3gpp:XLThptGrp;
+    }
+    list uLThptPerUE {
+      description "This attribute defines data rate supported by the
+        network slice per UE, refer NG.116";
+      key idx;
+      max-elements 1;
+      leaf idx {
+        description "Synthetic index for the element.";
+        type uint32;
+      }
+      uses ns3cmn3gpp:XLThptGrp;
+    }
+    list maxPktSize {
+      config false;
+      key idx;
+      max-elements 1;
+      leaf idx {
+        description "Synthetic index for the element.";
+        type uint32;
+      }
+      description "This parameter specifies the maximum packet size
+        supported by the network slice";
+      list servAttrCom {
+        description "This list represents the common properties of service
+          requirement related attributes.";
+        reference "GSMA NG.116 corresponding to Attribute categories,
+          tagging and exposure";
+        key idx;
+        max-elements 1;
+        leaf idx {
+          description "Synthetic index for the element.";
+          type uint32;
+        }
+        uses ns3cmn3gpp:ServAttrComGrp;
+      }
+      leaf maxSize {
+        //Stage2 issue: Not defined in 28.541, guessing integer bytes
+        type uint32;
+        units bytes;
+      }
+    }
+    list delayTolerance {
+      description "An attribute specifies the properties of service delivery
+        flexibility, especially for the vertical services that are not
+        chasing a high system performance.";
+      reference "TS 22.104 clause 4.3";
+      config false;
+      key idx;
+      max-elements 1;
+      leaf idx {
+        description "Synthetic index for the element.";
+        type uint32;
+      }
+      list servAttrCom {
+        description "This list represents the common properties of service
+          requirement related attributes.";
+        reference "GSMA NG.116 corresponding to Attribute categories,
+          tagging and exposure";
+        key idx;
+        max-elements 1;
+        leaf idx {
+          description "Synthetic index for the element.";
+          type uint32;
+        }
+        uses ns3cmn3gpp:ServAttrComGrp;
+      }
+      leaf support {
+        description "An attribute specifies whether or not the network
+          slice supports service delivery flexibility, especially for the
+          vertical services that are not chasing a high system performance.";
+        type ns3cmn3gpp:Support-enum;
+      }
+    }
+    leaf sliceSimultaneousUse {
+      description "This attribute describes whether a network slice
+      can be simultaneously used by a device together with other
+      network slices and if so, with which other classes of network slices.";
+      type SliceSimultaneousUse-enum;
+    }
+    list termDensity {
+      description "An attribute specifies the overall user density over
+        the coverage area of the network slice";
+      config false;
+      key idx;
+      max-elements 1;
+      leaf idx {
+        description "Synthetic index for the element.";
+        type uint32;
+      }
+      list servAttrCom {
+        description "This list represents the common properties of service
+          requirement related attributes.";
+        reference "GSMA NG.116 corresponding to Attribute categories,
+          tagging and exposure";
+        key idx;
+        max-elements 1;
+        leaf idx {
+          description "Synthetic index for the element.";
+          type uint32;
+        }
+        uses ns3cmn3gpp:ServAttrComGrp;
+      }
+      leaf density {
+        type uint32;
+        units users/km2;
+      }
+    }
+    leaf activityFactor {
+      //Stage2 issue: This is modeled as writable/config true in 28.542,
+      //              but that does not appear to match the description
+      description "An attribute specifies the percentage value of the
+        amount of simultaneous active UEs to the total number of UEs where
+        active means the UEs are exchanging data with the network";
+      reference "TS 22.261 Table 7.1-1";
+      type decimal64 {
+        fraction-digits 1;
+      }
+    }
+    list coverageAreaTAList {
+      description "A list of TrackingAreas where the NSI can be selected.";
+      key idx; //no obvious leaf to use as a key
+      leaf idx { type uint32; }
+      //optional support
+      min-elements 1;
+      uses types3gpp:TaiGrp;
+    }
+    leaf uEMobilityLevel {
+      description "The mobility level of UE accessing the network slice
+        instance.";
+      //optional support
+      type types3gpp:UeMobilityLevel;
+    }
+
+    leaf resourceSharingLevel {
+      description "Specifies whether the resources to be allocated to the
+        network slice subnet instance may be shared with another network
+        slice subnet instance(s).";
+      //optional support
+      type types3gpp:ResourceSharingLevel;
+    }
+    leaf uESpeed {
+      //Stage2 issue: This is modeled as writable/config true in 28.542,
+      //              but that does not appear to match the description
+      description "An attribute specifies the maximum speed (in km/hour)
+        supported by the network slice at which a defined QoS can be
+        achieved";
+      type uint32;
+      units km/h;
+    }
+    leaf reliability {
+      description "An attribute specifies in the context of network layer
+        packet transmissions, percentage value of the amount of sent
+        network layer packets successfully delivered to a given system
+        entity within the time constraint required by the targeted service,
+        divided by the total number of sent network layer packets.";
+      reference "TS 22.261, TS 22.104";
+      type string;
+    }
+    leaf serviceType {
+      description "An attribute specifies the standardized network slice type.
+    allowedValues: eMBB, URLLC, MIoT, V2X.";
+      type ServiceType-enum;
+    }
+    list deterministicComm {
+      //Stage2 issue: deterministicComm is not defined in 28.541 chapter 6,
+      //              but I guess determinComm is meant
+      description "This list represents the properties of the deterministic
+        communication for periodic user traffic. Periodic traffic refers to the
+        type of traffic with periodic transmissions.";
+      key idx;
+      max-elements 1;
+      leaf idx {
+        description "Synthetic index for the element.";
+        type uint32;
+      }
+      list servAttrCom {
+        description "This list represents the common properties of service
+          requirement related attributes.";
+        reference "GSMA NG.116 corresponding to Attribute categories,
+          tagging and exposure";
+        config false;
+        key idx;
+        max-elements 1;
+        leaf idx {
+          description "Synthetic index for the element.";
+          type uint32;
+        }
+        uses ns3cmn3gpp:ServAttrComGrp;
+      }
+      leaf availability {
+        //Stage2 issue: Defined differently in 28.541 chapter 6, but XML
+        //              uses DeterminCommAvailability
+        config false;
+        type ns3cmn3gpp:DeterminCommAvailability;
+      }
+      leaf periodicityList {
+        //Stage2 issue: Not defined in 28.541 chapter 6. XML and YAML
+        //              says "string".
+        type string;
+      }
+    }
+    leaf survivalTime {
+      description "An attribute specifies the time that an application
+        consuming a communication service may continue without an
+        anticipated message.";
+      reference "TS 22.104 clause 5";
+      type string;
+    }
+    list positioning {
+      min-elements 1;
+      max-elements 1;
+      description "Specifies whether the RAN domain of the network slice
+        provides geo-localization methods or supporting methods.";
+      reference "Clause 3.4.20 of NG.116 [50].";
+      uses PositioningGrp;
+    }
+  }
+
+  grouping SliceProfileGrp {
+    leaf sliceProfileId {
+      description "A unique identifier of the property of network slice
+        subnet related requirement should be supported by the network
+        slice subnet instance.";
+      type types3gpp:DistinguishedName;
+    }
+
+    list sNSSAIList {
+      description "List of S-NSSAIs the managed object is capable of
+        supporting. (Single Network Slice Selection Assistance Information)
+        An S-NSSAI has an SST (Slice/Service type) and an optional SD
+        (Slice Differentiator) field.";
+      key idx;
+      unique "sst sd";
+      leaf idx {
+        description "Synthetic index for the element.";
+        type uint32;
+      }
+      uses types5g3gpp:SNssai;
+    }
+
+    list pLMNIdList {
+      description "List of at most six entries of PLMN Identifiers, but at
+        least one (the primary PLMN Id).  The PLMN Identifier is composed
+        of a Mobile Country Code (MCC) and a Mobile Network Code (MNC).";
+      min-elements 1;
+      max-elements 6;
+      key "mcc mnc";
+      ordered-by user;
+      uses types3gpp:PLMNId;
+    }
+
+    leaf maxNumberofUEs {
+      description "Specifies the maximum number of UEs may simultaneously
+        access the network slice instance.";
+      //optional support
+      mandatory true;
+      type uint64;
+    }
+
+    list coverageAreaTAList {
+      description "A list of TrackingAreas where the NSI can be selected.";
+      key idx; //no obvious leaf to use as a key
+      leaf idx { type uint32; }
+      //optional support
+      min-elements 1;
+      uses types3gpp:TaiGrp;
+    }
+
+    leaf latency {
+      description "The packet transmission latency (milliseconds) through
+        the RAN, CN, and TN part of 5G network, used to evaluate
+        utilization performance of the end-to-end network slice instance.";
+      reference "3GPP TS 28.554 clause 6.3.1";
+      //optional support
+      mandatory true;
+      type uint16;
+      units milliseconds;
+    }
+
+    leaf uEMobilityLevel {
+      description "The mobility level of UE accessing the network slice
+        instance.";
+      //optional support
+      type types3gpp:UeMobilityLevel;
+    }
+
+    leaf resourceSharingLevel {
+      description "Specifies whether the resources to be allocated to the
+        network slice subnet  instance may be shared with another network
+        slice subnet instance(s).";
+      //optional support
+      type types3gpp:ResourceSharingLevel;
+    }
+    list CNSliceSubnetProfile {
+      description " This represents the requirements for the top slice associated with the
+    network slice. ";
+      key idx;
+      max-elements 1;
+      leaf idx {
+        description "Synthetic index for the element.";
+        type uint32;
+      }
+    uses TopSliceSubnetProfileGrp;
+    }
+    list RANSliceSubnetProfile {
+      description " This represents the requirements for the top slice associated with the
+    network slice. ";
+      key idx;
+      max-elements 1;
+      leaf idx {
+        description "Synthetic index for the element.";
+        type uint32;
+      }
+    uses TopSliceSubnetProfileGrp;
+    }
+    list TopSliceSubnetProfile {
+      description " This represents the requirements for the top slice associated with the
+    network slice. ";
+      key idx;
+      max-elements 1;
+      leaf idx {
+        description "Synthetic index for the element.";
+        type uint32;
+      }
+    uses TopSliceSubnetProfileGrp;
+    }
+  }
+}