From: Alex Stancu <alexandru.stancu@highstreet-technologies.com>
Date: Thu, 23 Jan 2025 13:19:32 +0000 (+0200)
Subject: Update solution to pyNTS
X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F38%2F14138%2F1;p=oam.git

Update solution to pyNTS

Issue-ID: OAM-426
Change-Id: Ie75c1e52e1633591c5e1864a1e59345984cfe983
Signed-off-by: Alex Stancu <alexandru.stancu@highstreet-technologies.com>
---

diff --git a/solution/README.md b/solution/README.md
index b7cacbb..b24ab0f 100644
--- a/solution/README.md
+++ b/solution/README.md
@@ -166,8 +166,7 @@ docker compose -f smo/apps/docker-compose.yaml up -d
 # the cpu load is low again, we can start a simulated network
 
 docker compose -f network/docker-compose.yaml up -d
-docker compose -f network/docker-compose.yaml restart ntsim-ng-o-du-1122
-python3 network/config.py
+docker compose -f network/docker-compose.yaml restart pynts-o-du-o1
 ```
 
 #### Check (adjust if required) environment variables
diff --git a/solution/network/.env b/solution/network/.env
index a976b52..e9ae0a4 100644
--- a/solution/network/.env
+++ b/solution/network/.env
@@ -14,7 +14,7 @@
 # limitations under the License.
 #
 
-HOST_IP=aaa.bbb.ccc.ddd
+HOST_IP=192.168.10.253
 # NETWORK_SUBNET_DCN_IPv4=172.60.0.0/24
 NETWORK_SUBNET_DCN_IPv6=2001:db8:1:50::/96
 
@@ -26,36 +26,18 @@ ADMIN_PASSWORD=Kp8bJ4SXszM0WXlhak3eHlcse2gAw84vaoGGmJvUy2U
 HTTP_DOMAIN=smo.o-ran-sc.org
 
 # SDN Controller
-SDN_CONTROLLER_PROTOCOL=https
-SDNC_OAM_HOST=odlux.oam.${HTTP_DOMAIN}
-SDNC_DCN_HOST=controller.dcn.${HTTP_DOMAIN}
-SDNC_REST_PORT=443
-SDN_CONTROLLER_CALLHOME_SSH_PORT=4334
-SDN_CONTROLLER_CALLHOME_TLS_PORT=4335
+SDNR_RESTCONF_URL=https://controller.dcn.${HTTP_DOMAIN}
 
 # VES Collector
-VES_ENDPOINT_PROTOCOL=https
-VES_COLLECTOR_DCN_HOST=ves-collector.dcn.${HTTP_DOMAIN}
-VES_ENDPOINT_PORT=443
-VES_COMMON_HEADER_VERSION=7.2.1
-VES_ENDPOINT_AUTH_METHOD=basic-auth
+VES_URL=https://ves-collector.dcn.${HTTP_DOMAIN}/eventListener/v7
 VES_ENDPOINT_USERNAME=sample1
 VES_ENDPOINT_PASSWORD=sample1
 
-# NTS NG settings
+# PyNTS settings
 NEXUS3_DOCKER_REPO=nexus3.o-ran-sc.org:10004/o-ran-sc/
-LOCAL_DOCKER_REPO=o-ran-sc/
-NTS_MANAGER_PORT=8300
-NTS_BUILD_VERSION=1.8.1
-
-IPv6_ENABLED=true
-SSH_CONNECTIONS=0
-TLS_CONNECTIONS=1
-NTS_HOST_IP=2a00:7b80:454:2000::2
-NTS_HOST_BASE_PORT=50000
-NTS_HOST_NETCONF_SSH_BASE_PORT=0
-NTS_HOST_NETCONF_TLS_BASE_PORT=1000
-NTS_HOST_TRANSFER_FTP_BASE_PORT=2000
-NTS_HOST_TRANSFER_SFTP_BASE_PORT=2000
-
-NTS_NF_MOUNT_POINT_ADDRESSING_METHOD=docker-mapping
+LOCAL_DOCKER_REPO=
+
+PYNTS_VERSION=0.6.4
+
+NETCONF_USERNAME=netconf
+NETCONF_PASSWORD=netconf!
diff --git a/solution/network/config.py b/solution/network/config.py
deleted file mode 100644
index 6bbb1f9..0000000
--- a/solution/network/config.py
+++ /dev/null
@@ -1,85 +0,0 @@
-#!/usr/bin/env python
-################################################################################
-# Copyright 2024 highstreet technologies
-#
-# Licensed under the Apache License, Version 2.0 (the 'License');
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an 'AS IS' BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-# importing the sys, json, requests library
-import os
-import sys
-import json
-import re
-import requests
-import subprocess
-import pathlib
-from jproperties import Properties
-
-def get_environment_variable(name):
-    configs = Properties()
-    path = pathlib.Path(os.path.dirname(os.path.abspath(__file__)))
-    env_file = str(path.absolute()) + '/.env'
-    with open(env_file, "rb") as read_prop:
-        configs.load(read_prop)
-    value = configs.get(name).data
-
-    regex = r"\$\{([^\}]+)\}"
-    matches = re.finditer(regex, value)
-    while True:
-        match = next(matches, None)
-        if match is None:
-            break
-        inner = get_environment_variable(match.group(1))
-        value = value.replace("${" + match.group(1) + "}", inner )
-    return value
-
-dockerFilter = subprocess.check_output("docker ps --format '{{.Names}}'", shell=True)
-containers = dockerFilter.splitlines()
-
-mapping = dict({"ntsim-ng-o-ru": "O-RU", "ntsim-ng-o-du": "O-DU"})
-base = get_environment_variable('SDN_CONTROLLER_PROTOCOL') + '://' + get_environment_variable('SDNC_OAM_HOST')
-username = get_environment_variable('ADMIN_USERNAME')
-password = get_environment_variable('ADMIN_PASSWORD')
-
-# REST to set event settings
-def configEventSettings(nfName, nfType):
-  file = os.path.dirname(os.path.abspath(__file__)) + '/' + nfType + '/event-settings.json'
-  with open(file) as json_file:
-    body = json.load(json_file)
-    url = base + '/rests/data/network-topology:network-topology/topology=topology-netconf/node=' + nfName + '/yang-ext:mount/nts-network-function:simulation/network-function'
-    headers = {
-        'content-type': 'application/yang-data+json',
-        'accept': 'application/yang-data+json'
-    }
-    try:
-      response = requests.put(url, verify=False, auth=(username, password), json=body, headers=headers)
-    except requests.exceptions.Timeout:
-      sys.exit('HTTP request failed, please check you internet connection.')
-    except requests.exceptions.TooManyRedirects:
-      sys.exit('HTTP request failed, please check your proxy settings.')
-    except requests.exceptions.RequestException as e:
-      # catastrophic error. bail.
-      raise SystemExit(e)
-
-    return response.status_code >= 200 and response.status_code < 300
-
-# main
-for container in containers:
-  name = container.decode("utf-8")
-  if "ntsim-ng" in name:
-    if "ntsim-ng-o-ru" in name:
-      nfName = mapping["ntsim-ng-o-ru"] + name[name.rindex("-"):]
-      print("Set", nfName, configEventSettings(nfName, "ntsim-ng-o-ru"))
-    if "ntsim-ng-o-du" in name:
-      nfName = mapping["ntsim-ng-o-du"] + name[name.rindex("-"):]
-      print("Set", nfName, configEventSettings(nfName, "ntsim-ng-o-du"))
diff --git a/solution/network/docker-compose.yaml b/solution/network/docker-compose.yaml
index 61e8d6b..0854309 100755
--- a/solution/network/docker-compose.yaml
+++ b/solution/network/docker-compose.yaml
@@ -14,125 +14,61 @@
 # limitations under the License.
 #
 x-common_env: &common_env
-    IPv6_ENABLED: ${IPv6_ENABLED}
-    SSH_CONNECTIONS: ${SSH_CONNECTIONS}
-    TLS_CONNECTIONS: ${TLS_CONNECTIONS}
-    NTS_NF_MOUNT_POINT_ADDRESSING_METHOD: ${NTS_NF_MOUNT_POINT_ADDRESSING_METHOD}
-
-    NTS_HOST_IP: ${NTS_HOST_IP}
-    NTS_HOST_BASE_PORT: ${NTS_HOST_BASE_PORT}
-    NTS_HOST_NETCONF_SSH_BASE_PORT: ${NTS_HOST_NETCONF_SSH_BASE_PORT}
-    NTS_HOST_NETCONF_TLS_BASE_PORT: ${NTS_HOST_NETCONF_TLS_BASE_PORT}
-    NTS_HOST_TRANSFER_FTP_BASE_PORT: ${NTS_HOST_TRANSFER_FTP_BASE_PORT}
-    NTS_HOST_TRANSFER_SFTP_BASE_PORT: ${NTS_HOST_TRANSFER_SFTP_BASE_PORT}
-
-    SDN_CONTROLLER_PROTOCOL: ${SDN_CONTROLLER_PROTOCOL}
-    SDN_CONTROLLER_IP: ${SDNC_DCN_HOST}
-    SDN_CONTROLLER_CALLHOME_IP: ${SDNC_DCN_HOST}
-    SDN_CONTROLLER_USERNAME: ${ADMIN_USERNAME}
-    SDN_CONTROLLER_PASSWORD: ${ADMIN_PASSWORD}
-
-    VES_COMMON_HEADER_VERSION: ${VES_COMMON_HEADER_VERSION}
-    VES_ENDPOINT_PROTOCOL: ${VES_ENDPOINT_PROTOCOL}
-    VES_ENDPOINT_IP: ${VES_COLLECTOR_DCN_HOST}
-    VES_ENDPOINT_PORT: ${VES_ENDPOINT_PORT}
-    VES_ENDPOINT_AUTH_METHOD: ${VES_ENDPOINT_AUTH_METHOD}
-    VES_ENDPOINT_USERNAME: ${VES_ENDPOINT_USERNAME}
-    VES_ENDPOINT_PASSWORD: ${VES_ENDPOINT_PASSWORD}
+    SDNR_RESTCONF_URL: ${SDNR_RESTCONF_URL}
+    SDNR_USERNAME: ${ADMIN_USERNAME}
+    SDNR_PASSWORD: ${ADMIN_PASSWORD}    
 
 x-du_env: &du_env
-    # NTS_NF_STANDALONE_START_FEATURES: "datastore-populate ves-heartbeat ves-file-ready ves-pnf-registration web-cut-through"
-    NTS_NF_STANDALONE_START_FEATURES: "datastore-populate ves-heartbeat ves-file-ready ves-pnf-registration ves-o1-pnf-registration web-cut-through"
-
-x-ru-env: &ru_env
-    NTS_NF_STANDALONE_START_FEATURES: "datastore-populate netconf-call-home web-cut-through"
+    NETCONF_USERNAME: ${NETCONF_USERNAME}
+    NETCONF_PASSWORD: ${NETCONF_PASSWORD}
 
-x-topo-env: &topo_env
-    NTS_NF_STANDALONE_START_FEATURES: "datastore-populate netconf-call-home web-cut-through"
+    VES_URL: ${VES_URL}
+    VES_USERNAME: ${VES_ENDPOINT_USERNAME}
+    VES_PASSWORD: ${VES_ENDPOINT_PASSWORD}
 
 x-nf: &common_nf
+    privileged: true
     stop_grace_period: 5m
     extra_hosts:
       - "controller.dcn.${HTTP_DOMAIN}:${HOST_IP}"
       - "ves-collector.dcn.${HTTP_DOMAIN}:${HOST_IP}"
-    cap_add:
-    - SYS_ADMIN
-    - SYS_PTRACE
     networks:
       dcn:
 
 services:
-  ntsim-ng-o-du-1122:
+  pynts-o-du-o1:
     <<: *common_nf
-    image: "${NEXUS3_DOCKER_REPO}nts-ng-o-ran-du:${NTS_BUILD_VERSION}"
-    container_name: ntsim-ng-o-du-1122
-    hostname: O-DU-1122
-    volumes:
-        - ./ntsim-ng-o-du/config.json:/opt/dev/ntsim-ng/config/config.json
-        - ./ntsim-ng-o-du/o-ran-sc-du-hello-world-running.xml:/opt/dev/deploy/data/o-ran-sc-du-hello-world-running.xml
-        - ./ntsim-ng-o-du/o-ran-sc-du-hello-world-operational.xml:/opt/dev/deploy/data/o-ran-sc-du-hello-world-operational.xml
+    image: ${LOCAL_DOCKER_REPO}pynts-o-du-o1:${PYNTS_VERSION}
+    container_name: pynts-o-du-o1
+    hostname: pynts-o-du-o1
     environment:
         <<: [*common_env, *du_env]
-
-  ntsim-ng-o-ru-11221:
-    <<: *common_nf
-    image: "${NEXUS3_DOCKER_REPO}nts-ng-o-ran-ru-fh:${NTS_BUILD_VERSION}"
-    container_name: ntsim-ng-o-ru-11221
-    hostname: O-RU-11221
+        O_DU_CALLHOME_PORT: 4335
     volumes:
-        - ./ntsim-ng-o-ru/o-ru-11221/config.json:/opt/dev/ntsim-ng/config/config.json
-        - ./ntsim-ng-o-ru/o-ru-11221/ietf-hardware-operational.json:/opt/dev/deploy/data/ietf-hardware-operational.json
-        - ./ntsim-ng-o-ru/o-ru-11221/ietf-hardware-running.json:/opt/dev/deploy/data/ietf-hardware-running.json
-        - ./ntsim-ng-o-ru/o-ru-11221/ietf-interfaces-operational.xml:/opt/dev/deploy/data/ietf-interfaces-operational.xml
-        - ./ntsim-ng-o-ru/o-ru-11221/ietf-interfaces-running.xml:/opt/dev/deploy/data/ietf-interfaces-running.xml
-    environment:
-        SDN_CONTROLLER_CALLHOME_PORT: ${SDN_CONTROLLER_CALLHOME_SSH_PORT}
-        <<: [*common_env, *ru_env]
+      - ./o-du-o1/data:/data
 
-  ntsim-ng-o-ru-11222:
-    <<: *common_nf
-    image: "${NEXUS3_DOCKER_REPO}nts-ng-o-ran-ru-fh:${NTS_BUILD_VERSION}"
-    container_name: ntsim-ng-o-ru-11222
-    hostname: O-RU-11222
-    volumes:
-        - ./ntsim-ng-o-ru/o-ru-11222/config.json:/opt/dev/ntsim-ng/config/config.json
-        - ./ntsim-ng-o-ru/o-ru-11222/ietf-hardware-operational.json:/opt/dev/deploy/data/ietf-hardware-operational.json
-        - ./ntsim-ng-o-ru/o-ru-11222/ietf-hardware-running.json:/opt/dev/deploy/data/ietf-hardware-running.json
-        - ./ntsim-ng-o-ru/o-ru-11222/ietf-interfaces-operational.xml:/opt/dev/deploy/data/ietf-interfaces-operational.xml
-        - ./ntsim-ng-o-ru/o-ru-11222/ietf-interfaces-running.xml:/opt/dev/deploy/data/ietf-interfaces-running.xml
-    environment:
-        SDN_CONTROLLER_CALLHOME_PORT: ${SDN_CONTROLLER_CALLHOME_SSH_PORT}
-        <<: [*common_env, *ru_env]
 
-  ntsim-ng-o-ru-11223:
+  pynts-o-ru-hybrid:
     <<: *common_nf
-    image: "${NEXUS3_DOCKER_REPO}nts-ng-o-ran-ru-fh:${NTS_BUILD_VERSION}"
-    container_name: ntsim-ng-o-ru-11223
-    hostname: O-RU-11223
-    volumes:
-        - ./ntsim-ng-o-ru/o-ru-11223/config.json:/opt/dev/ntsim-ng/config/config.json
-        - ./ntsim-ng-o-ru/o-ru-11223/ietf-hardware-operational.json:/opt/dev/deploy/data/ietf-hardware-operational.json
-        - ./ntsim-ng-o-ru/o-ru-11223/ietf-hardware-running.json:/opt/dev/deploy/data/ietf-hardware-running.json
-        - ./ntsim-ng-o-ru/o-ru-11223/ietf-interfaces-operational.xml:/opt/dev/deploy/data/ietf-interfaces-operational.xml
-        - ./ntsim-ng-o-ru/o-ru-11223/ietf-interfaces-running.xml:/opt/dev/deploy/data/ietf-interfaces-running.xml
+    image: ${LOCAL_DOCKER_REPO}pynts-o-ru-mplane:${PYNTS_VERSION}
+    container_name: pynts-o-ru-hybrid
+    hostname: pynts-o-ru-hybrid
     environment:
-        SDN_CONTROLLER_CALLHOME_PORT: ${SDN_CONTROLLER_CALLHOME_TLS_PORT}
-        <<: [*common_env, *ru_env]
+        <<: [*common_env]
+    volumes:
+      - ./o-ru-mplane/data:/data
+      - ./o-ru-mplane/data/ietf-netconf-server-running-hybrid.json:/data/ietf-netconf-server-running.json
 
-  ntsim-ng-o-ru-11224:
+  pynts-o-ru-hierarchical:
     <<: *common_nf
-    image: "${NEXUS3_DOCKER_REPO}nts-ng-o-ran-ru-fh:${NTS_BUILD_VERSION}"
-    container_name: ntsim-ng-o-ru-11224
-    hostname: O-RU-11224
-    volumes:
-        - ./ntsim-ng-o-ru/o-ru-11223/config.json:/opt/dev/ntsim-ng/config/config.json
-        - ./ntsim-ng-o-ru/o-ru-11223/ietf-hardware-operational.json:/opt/dev/deploy/data/ietf-hardware-operational.json
-        - ./ntsim-ng-o-ru/o-ru-11223/ietf-hardware-running.json:/opt/dev/deploy/data/ietf-hardware-running.json
-        - ./ntsim-ng-o-ru/o-ru-11223/ietf-interfaces-operational.xml:/opt/dev/deploy/data/ietf-interfaces-operational.xml
-        - ./ntsim-ng-o-ru/o-ru-11223/ietf-interfaces-running.xml:/opt/dev/deploy/data/ietf-interfaces-running.xml
+    image: ${LOCAL_DOCKER_REPO}pynts-o-ru-mplane:${PYNTS_VERSION}
+    container_name: pynts-o-ru-hierarchical
+    hostname: pynts-o-ru-hierarchical
     environment:
-        SDN_CONTROLLER_CALLHOME_PORT: ${SDN_CONTROLLER_CALLHOME_TLS_PORT}
-        <<: [*common_env, *ru_env]
+        <<: [*common_env]
+    volumes:
+      - ./o-ru-mplane/data:/data
+      - ./o-ru-mplane/data/ietf-netconf-server-running-hierarchical.json:/data/ietf-netconf-server-running.json  
 
 networks:
   dcn:
diff --git a/solution/network/ntsim-ng-o-du-rel-18/_3gpp-common-managed-element-operational.xml b/solution/network/ntsim-ng-o-du-rel-18/_3gpp-common-managed-element-operational.xml
deleted file mode 100644
index 6e9682a..0000000
--- a/solution/network/ntsim-ng-o-du-rel-18/_3gpp-common-managed-element-operational.xml
+++ /dev/null
@@ -1,106 +0,0 @@
-  <ManagedElement xmlns="urn:3gpp:sa5:_3gpp-common-managed-element">
-    <id>ManagedElement=1</id>
-    <attributes>
-      <priorityLabel>20</priorityLabel>
-      <swVersion>NTS-1.6.1</swVersion>
-    </attributes>
-    <GNBDUFunction xmlns="urn:3gpp:sa5:_3gpp-nr-nrm-gnbdufunction">
-      <id>ManagedElement=1,GNBDUFunction=1</id>
-      <attributes>
-        <priorityLabel>20</priorityLabel>
-        <gNBId>10</gNBId>
-        <gNBIdLength>32</gNBIdLength>
-        <gNBDUId>1</gNBDUId>
-        <gNBDUName>O-DU-1123</gNBDUName>
-      </attributes>
-      <NRCellDU xmlns="urn:3gpp:sa5:_3gpp-nr-nrm-nrcelldu">
-        <id>ManagedElement=1,GNBDUFunction=1,NRCellDU=1</id>
-        <attributes>
-          <priorityLabel>20</priorityLabel>
-          <cellLocalId>1</cellLocalId>
-          <pLMNInfoList>
-            <mcc>001</mcc>
-            <mnc>001</mnc>
-            <sd>FFFFFF</sd>
-            <sst>1</sst>
-          </pLMNInfoList>
-          <nPNIdentityList>
-            <idx>0</idx>
-            <plmnid>
-              <mcc>001</mcc>
-              <mnc>001</mnc>
-            </plmnid>
-            <cAGIdList>cAGId-1</cAGIdList>
-            <nIDList>nID-1</nIDList>
-          </nPNIdentityList>
-          <nRPCI>0</nRPCI>
-          <arfcnDL>1</arfcnDL>
-          <rimRSMonitoringStartTime>2023-06-18T19:00:00.0Z</rimRSMonitoringStartTime>
-          <rimRSMonitoringStopTime>2023-12-18T19:00:00.0Z</rimRSMonitoringStopTime>
-          <rimRSMonitoringWindowDuration>900</rimRSMonitoringWindowDuration>
-          <rimRSMonitoringWindowStartingOffset>0</rimRSMonitoringWindowStartingOffset>
-          <rimRSMonitoringWindowPeriodicity>1</rimRSMonitoringWindowPeriodicity>
-          <rimRSMonitoringOccasionInterval>900</rimRSMonitoringOccasionInterval>
-          <rimRSMonitoringOccasionStartingOffset>0</rimRSMonitoringOccasionStartingOffset>
-          <ssbFrequency>2100000</ssbFrequency>
-          <ssbPeriodicity>5</ssbPeriodicity>
-          <ssbSubCarrierSpacing>30</ssbSubCarrierSpacing>
-          <ssbOffset>0</ssbOffset>
-          <ssbDuration>5</ssbDuration>
-          <victimSetRef>UID=nobody@example.com,DC=example,DC=com</victimSetRef>
-          <aggressorSetRef>UID=nobody@example.com,DC=example,DC=com</aggressorSetRef>
-          <nRSectorCarrierRef>ManagedElement=1,GNBDUFunction=1,NRSectorCarrier=1</nRSectorCarrierRef>
-        </attributes>
-        <ManagedNFService>
-          <id>ManagedElement=1,GNBDUFunction=1,NRCellDU=1,ManagedNFService=1</id>
-          <attributes>
-            <sAP>
-              <host>172.27.10.1</host>
-              <port>830</port>
-            </sAP>
-            <operations>
-              <name>netconf-edit-config</name>
-              <allowedNFTypes>O-RU</allowedNFTypes>
-            </operations>
-            <administrativeState>UNLOCKED</administrativeState>
-            <nFServiceType>o-ru_serviceX</nFServiceType>
-            <operationalState>ENABLED</operationalState>
-            <usageState>IDLE</usageState>
-            <registrationState>REGISTERED</registrationState>
-          </attributes>
-        </ManagedNFService>
-      </NRCellDU>
-      <NRSectorCarrier xmlns="urn:3gpp:sa5:_3gpp-nr-nrm-nrnetwork-nrsectorcarrier">
-        <id>ManagedElement=1,GNBDUFunction=1,NRSectorCarrier=1</id>
-        <attributes>
-          <priorityLabel>20</priorityLabel>
-          <txDirection>DL_AND_UL</txDirection>
-          <configuredMaxTxPower>10</configuredMaxTxPower>
-          <configuredMaxTxEIRP>-30</configuredMaxTxEIRP>
-          <arfcnDL>2100000</arfcnDL>
-          <arfcnUL>2100000</arfcnUL>
-          <bSChannelBwDL>100</bSChannelBwDL>
-          <bSChannelBwUL>100</bSChannelBwUL>
-          <sectorEquipmentFunctionRef>ManagedElement=1,GNBDUFunction=1,SectorEquipmentFunction=1</sectorEquipmentFunctionRef>
-        </attributes>
-        <ManagedNFService>
-          <id>ManagedElement=1,GNBDUFunction=1,NRSectorCarrier=1,ManagedNFService=1</id>
-          <attributes>
-            <sAP>
-              <host>172.27.10.1</host>
-              <port>830</port>
-            </sAP>
-            <operations>
-              <name>netconf-edit-config</name>
-              <allowedNFTypes>O-RU</allowedNFTypes>
-            </operations>
-            <administrativeState>UNLOCKED</administrativeState>
-            <nFServiceType>o-ru_serviceX</nFServiceType>
-            <operationalState>ENABLED</operationalState>
-            <usageState>IDLE</usageState>
-            <registrationState>REGISTERED</registrationState>
-          </attributes>
-        </ManagedNFService>
-      </NRSectorCarrier>
-    </GNBDUFunction>
-  </ManagedElement>
diff --git a/solution/network/ntsim-ng-o-du-rel-18/_3gpp-common-managed-element-running.xml b/solution/network/ntsim-ng-o-du-rel-18/_3gpp-common-managed-element-running.xml
deleted file mode 100644
index 4aa2d5a..0000000
--- a/solution/network/ntsim-ng-o-du-rel-18/_3gpp-common-managed-element-running.xml
+++ /dev/null
@@ -1,97 +0,0 @@
-  <ManagedElement xmlns="urn:3gpp:sa5:_3gpp-common-managed-element">
-    <id>ManagedElement=1</id>
-    <attributes>
-      <priorityLabel>20</priorityLabel>
-    </attributes>
-    <GNBDUFunction xmlns="urn:3gpp:sa5:_3gpp-nr-nrm-gnbdufunction">
-      <id>ManagedElement=1,GNBDUFunction=1</id>
-      <attributes>
-        <priorityLabel>20</priorityLabel>
-        <gNBId>10</gNBId>
-        <gNBIdLength>32</gNBIdLength>
-        <gNBDUId>1</gNBDUId>
-        <gNBDUName>O-DU-1123</gNBDUName>
-      </attributes>
-      <NRCellDU xmlns="urn:3gpp:sa5:_3gpp-nr-nrm-nrcelldu">
-        <id>ManagedElement=1,GNBDUFunction=1,NRCellDU=1</id>
-        <attributes>
-          <priorityLabel>20</priorityLabel>
-          <cellLocalId>1</cellLocalId>
-          <pLMNInfoList>
-            <mcc>001</mcc>
-            <mnc>001</mnc>
-            <sd>FFFFFF</sd>
-            <sst>1</sst>
-          </pLMNInfoList>
-          <nPNIdentityList>
-            <idx>0</idx>
-            <plmnid>
-              <mcc>001</mcc>
-              <mnc>001</mnc>
-            </plmnid>
-            <cAGIdList>cAGId-1</cAGIdList>
-            <nIDList>nID-1</nIDList>
-          </nPNIdentityList>
-          <nRPCI>0</nRPCI>
-          <arfcnDL>1</arfcnDL>
-          <rimRSMonitoringStartTime>2023-06-18T19:00:00.0Z</rimRSMonitoringStartTime>
-          <rimRSMonitoringStopTime>2023-12-18T19:00:00.0Z</rimRSMonitoringStopTime>
-          <rimRSMonitoringWindowDuration>900</rimRSMonitoringWindowDuration>
-          <rimRSMonitoringWindowStartingOffset>0</rimRSMonitoringWindowStartingOffset>
-          <rimRSMonitoringWindowPeriodicity>1</rimRSMonitoringWindowPeriodicity>
-          <rimRSMonitoringOccasionInterval>900</rimRSMonitoringOccasionInterval>
-          <rimRSMonitoringOccasionStartingOffset>0</rimRSMonitoringOccasionStartingOffset>
-          <ssbFrequency>2100000</ssbFrequency>
-          <ssbPeriodicity>5</ssbPeriodicity>
-          <ssbSubCarrierSpacing>30</ssbSubCarrierSpacing>
-          <ssbOffset>0</ssbOffset>
-          <ssbDuration>5</ssbDuration>
-          <victimSetRef>UID=nobody@example.com,DC=example,DC=com</victimSetRef>
-          <aggressorSetRef>UID=nobody@example.com,DC=example,DC=com</aggressorSetRef>
-          <nRSectorCarrierRef>ManagedElement=1,GNBDUFunction=1,NRSectorCarrier=1</nRSectorCarrierRef>
-        </attributes>
-        <ManagedNFService>
-          <id>ManagedElement=1,GNBDUFunction=1,NRCellDU=1,ManagedNFService=1</id>
-          <attributes>
-            <sAP>
-              <host>172.27.10.1</host>
-              <port>830</port>
-            </sAP>
-            <operations>
-              <name>netconf-edit-config</name>
-              <allowedNFTypes>O-RU</allowedNFTypes>
-            </operations>
-            <administrativeState>UNLOCKED</administrativeState>
-          </attributes>
-        </ManagedNFService>
-      </NRCellDU>
-      <NRSectorCarrier xmlns="urn:3gpp:sa5:_3gpp-nr-nrm-nrnetwork-nrsectorcarrier">
-        <id>ManagedElement=1,GNBDUFunction=1,NRSectorCarrier=1</id>
-        <attributes>
-          <priorityLabel>20</priorityLabel>
-          <txDirection>DL_AND_UL</txDirection>
-          <configuredMaxTxPower>10</configuredMaxTxPower>
-          <configuredMaxTxEIRP>-30</configuredMaxTxEIRP>
-          <arfcnDL>2100000</arfcnDL>
-          <arfcnUL>2100000</arfcnUL>
-          <bSChannelBwDL>100</bSChannelBwDL>
-          <bSChannelBwUL>100</bSChannelBwUL>
-          <sectorEquipmentFunctionRef>ManagedElement=1,GNBDUFunction=1,SectorEquipmentFunction=1</sectorEquipmentFunctionRef>
-        </attributes>
-        <ManagedNFService>
-          <id>ManagedElement=1,GNBDUFunction=1,NRSectorCarrier=1,ManagedNFService=1</id>
-          <attributes>
-            <sAP>
-              <host>172.27.10.1</host>
-              <port>830</port>
-            </sAP>
-            <operations>
-              <name>netconf-edit-config</name>
-              <allowedNFTypes>O-RU</allowedNFTypes>
-            </operations>
-            <administrativeState>UNLOCKED</administrativeState>
-          </attributes>
-        </ManagedNFService>
-      </NRSectorCarrier>
-    </GNBDUFunction>
-  </ManagedElement>
diff --git a/solution/network/ntsim-ng-o-du-rel-18/config.json b/solution/network/ntsim-ng-o-du-rel-18/config.json
deleted file mode 100644
index 59995b1..0000000
--- a/solution/network/ntsim-ng-o-du-rel-18/config.json
+++ /dev/null
@@ -1,144 +0,0 @@
-{
-    "container-rules": {
-        "excluded-modules": [],
-        "excluded-features": []
-    },
-
-    "supervisor-rules": {
-        "netopeer": {
-            "path": "/usr/local/bin/netopeer2-server",
-            "args": ["-d", "-v2"],
-            "autorestart": true,
-            "stdout": "log/netopeer-stdout.log",
-            "stderr": "log/netopeer-stderr.log"
-        },
-
-        "sshd": {
-            "path": "/usr/sbin/sshd",
-            "args": ["-D"],
-            "autorestart": true,
-            "stdout": "log/sshd-stdout.log",
-            "stderr": "log/sshd-stderr.log"
-        },
-
-        "ntsim-network-function": {
-            "path": "/opt/dev/ntsim-ng/ntsim-ng",
-            "args": ["-w/opt/dev/ntsim-ng", "-f"],
-            "nomanual": true
-        }
-    },
-
-    "datastore-random-generation-rules" : {
-        "excluded-modules": [
-            "sysrepo",
-            "sysrepo-monitoring",
-            "ietf-yang-library",
-            "ietf-netconf-acm",
-            "ietf-netconf-monitoring",
-            "nc-notifications",
-            "ietf-keystore",
-            "ietf-truststore",
-            "ietf-system",
-            "ietf-netconf-server",
-            "nts-network-function"
-        ],
-
-        "default-list-instances": 1,
-        "custom-list-instances" : []
-    },
-
-    "datastore-populate-rules": {
-        "random-generation-enabled": false,
-
-        "pre-generated-operational-data": [
-            "../deploy/data/_3gpp-common-managed-element-operational.xml"
-        ],
-        "pre-generated-running-data": [
-            "../deploy/data/_3gpp-common-managed-element-running.xml"
-        ]
-    },
-
-    "fault-rules" : {
-        "yang-notif-template" : "<alarm-notif xmlns=\"urn:o-ran:fm:1.0\"><fault-id>$$uint16_counter$$</fault-id><fault-source>%%object%%</fault-source><affected-objects><name>%%affected-object%%</name></affected-objects><fault-severity>%%fault-severity%%</fault-severity><is-cleared>%%cleared%%</is-cleared><fault-text>%%text%%</fault-text><event-time>%%date-time%%</event-time></alarm-notif>",
-        "choosing-method" : "linear",
-        "faults" : [
-            {
-                "condition" : "CPRI Port Down",
-                "object"    : "Slot-0-Port-A",
-                "severity"  : "MAJOR",
-                "date-time" : "$$time$$",
-                "specific-problem" : "CPRI Port Down",
-
-                "fault-severity" : "MAJOR",
-                "affected-object" : "%%object%%",
-                "cleared" : "false",
-                "text" : "CPRI Port Down"
-            },
-
-            {
-                "condition" : "CPRI Port Down",
-                "object"    : "Slot-0-Port-A",
-                "severity"  : "NORMAL",
-                "date-time" : "$$time$$",
-                "specific-problem" : "CPRI Port Down",
-
-                "fault-severity" : "MAJOR",
-                "affected-object" : "%%object%%",
-                "cleared" : "true",
-                "text" : "CPRI Port Down"
-            },
-
-            {
-                "condition" : "CPRI Port Down",
-                "object"    : "Slot-0-Port-C",
-                "severity"  : "MAJOR",
-                "date-time" : "$$time$$",
-                "specific-problem" : "CPRI Port Down",
-
-                "fault-severity" : "MAJOR",
-                "affected-object" : "%%object%%",
-                "cleared" : "false",
-                "text" : "CPRI Port Down"
-            },
-
-            {
-                "condition" : "CPRI Port Down",
-                "object"    : "Slot-0-Port-C",
-                "severity"  : "NORMAL",
-                "date-time" : "$$time$$",
-                "specific-problem" : "CPRI Port Down",
-
-                "fault-severity" : "MAJOR",
-                "affected-object" : "%%object%%",
-                "cleared" : "true",
-                "text" : "CPRI Port Down"
-            },
-
-            {
-                "condition" : "CPRI Port Down",
-                "object"    : "Slot-2-Port-B",
-                "severity"  : "MAJOR",
-                "date-time" : "$$time$$",
-                "specific-problem" : "CPRI Port Down",
-
-                "fault-severity" : "MAJOR",
-                "affected-object" : "%%object%%",
-                "cleared" : "false",
-                "text" : "CPRI Port Down"
-            },
-
-            {
-                "condition" : "CPRI Port Down",
-                "object"    : "Slot-2-Port-B",
-                "severity"  : "NORMAL",
-                "date-time" : "$$time$$",
-                "specific-problem" : "CPRI Port Down",
-
-                "fault-severity" : "MAJOR",
-                "affected-object" : "%%object%%",
-                "cleared" : "true",
-                "text" : "CPRI Port Down"
-            }
-        ]
-    }
-}
diff --git a/solution/network/ntsim-ng-o-du-rel-18/event-settings.json b/solution/network/ntsim-ng-o-du-rel-18/event-settings.json
deleted file mode 100644
index 108b10a..0000000
--- a/solution/network/ntsim-ng-o-du-rel-18/event-settings.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-    "nts-network-function:network-function": {
-      "fault-generation": {
-        "fault-delay-list": [
-          {
-            "index": 0,
-            "delay-period": 20
-          }
-        ]
-      },
-      "ves": {
-        "pnf-registration": true,
-        "faults-enabled": true,
-        "heartbeat-period": 120
-      },
-      "netconf": {
-        "faults-enabled": false,
-        "call-home": false
-      },
-      "mount-point-addressing-method": "docker-mapping",
-      "function-type": "NTS_FUNCTION_TYPE_O_RAN_O_DU"
-    }
-  }
\ No newline at end of file
diff --git a/solution/network/ntsim-ng-o-du/config.json b/solution/network/ntsim-ng-o-du/config.json
deleted file mode 100644
index 3151184..0000000
--- a/solution/network/ntsim-ng-o-du/config.json
+++ /dev/null
@@ -1,145 +0,0 @@
-{
-    "container-rules": {
-        "excluded-modules": [],
-        "excluded-features": []
-    },
-
-    "supervisor-rules": {
-        "netopeer": {
-            "path": "/usr/local/bin/netopeer2-server",
-            "args": ["-d", "-v2"],
-            "autorestart": true,
-            "stdout": "log/netopeer-stdout.log",
-            "stderr": "log/netopeer-stderr.log"
-        },
-    
-        "sshd": {
-            "path": "/usr/sbin/sshd",
-            "args": ["-D"],
-            "autorestart": true,
-            "stdout": "log/sshd-stdout.log",
-            "stderr": "log/sshd-stderr.log"
-        },
-    
-        "ntsim-network-function": {
-            "path": "/opt/dev/ntsim-ng/ntsim-ng",
-            "args": ["-w/opt/dev/ntsim-ng", "-f"],
-            "nomanual": true
-        }
-    },
-
-    "datastore-random-generation-rules" : {
-        "excluded-modules": [
-            "sysrepo",
-            "sysrepo-monitoring",
-            "ietf-yang-library",
-            "ietf-netconf-acm",
-            "ietf-netconf-monitoring",
-            "nc-notifications",
-            "ietf-keystore",
-            "ietf-truststore",
-            "ietf-system",
-            "ietf-netconf-server",
-            "nts-network-function",
-            "o-ran-sc-du-hello-world"
-        ],
-        
-        "default-list-instances": 1,
-        "custom-list-instances" : []
-    },
-
-    "datastore-populate-rules": {
-        "random-generation-enabled": false,
-
-        "pre-generated-operational-data": [
-            "../deploy/data/o-ran-sc-du-hello-world-operational.xml"
-        ],
-        "pre-generated-running-data": [
-            "../deploy/data/o-ran-sc-du-hello-world-running.xml"
-        ]
-    },
-
-    "fault-rules" : {
-        "yang-notif-template" : "<alarm-notif xmlns=\"urn:o-ran:fm:1.0\"><fault-id>$$uint16_counter$$</fault-id><fault-source>%%object%%</fault-source><affected-objects><name>%%affected-object%%</name></affected-objects><fault-severity>%%fault-severity%%</fault-severity><is-cleared>%%cleared%%</is-cleared><fault-text>%%text%%</fault-text><event-time>%%date-time%%</event-time></alarm-notif>",
-        "choosing-method" : "linear",
-        "faults" : [
-            {
-                "condition" : "CPRI Port Down",
-                "object"    : "Slot-0-Port-A",
-                "severity"  : "MAJOR",
-                "date-time" : "$$time$$",
-                "specific-problem" : "CPRI Port Down",
-
-                "fault-severity" : "MAJOR",
-                "affected-object" : "%%object%%",
-                "cleared" : "false",
-                "text" : "CPRI Port Down"
-            },
-
-            {
-                "condition" : "CPRI Port Down",
-                "object"    : "Slot-0-Port-A",
-                "severity"  : "NORMAL",
-                "date-time" : "$$time$$",
-                "specific-problem" : "CPRI Port Down",
-
-                "fault-severity" : "MAJOR",
-                "affected-object" : "%%object%%",
-                "cleared" : "true",
-                "text" : "CPRI Port Down"
-            },
-
-            {
-                "condition" : "CPRI Port Down",
-                "object"    : "Slot-0-Port-C",
-                "severity"  : "MAJOR",
-                "date-time" : "$$time$$",
-                "specific-problem" : "CPRI Port Down",
-
-                "fault-severity" : "MAJOR",
-                "affected-object" : "%%object%%",
-                "cleared" : "false",
-                "text" : "CPRI Port Down"
-            },
-
-            {
-                "condition" : "CPRI Port Down",
-                "object"    : "Slot-0-Port-C",
-                "severity"  : "NORMAL",
-                "date-time" : "$$time$$",
-                "specific-problem" : "CPRI Port Down",
-
-                "fault-severity" : "MAJOR",
-                "affected-object" : "%%object%%",
-                "cleared" : "true",
-                "text" : "CPRI Port Down"
-            },
-
-            {
-                "condition" : "CPRI Port Down",
-                "object"    : "Slot-2-Port-B",
-                "severity"  : "MAJOR",
-                "date-time" : "$$time$$",
-                "specific-problem" : "CPRI Port Down",
-
-                "fault-severity" : "MAJOR",
-                "affected-object" : "%%object%%",
-                "cleared" : "false",
-                "text" : "CPRI Port Down"
-            },
-
-            {
-                "condition" : "CPRI Port Down",
-                "object"    : "Slot-2-Port-B",
-                "severity"  : "NORMAL",
-                "date-time" : "$$time$$",
-                "specific-problem" : "CPRI Port Down",
-
-                "fault-severity" : "MAJOR",
-                "affected-object" : "%%object%%",
-                "cleared" : "true",
-                "text" : "CPRI Port Down"
-            }
-        ]
-    }
-}
\ No newline at end of file
diff --git a/solution/network/ntsim-ng-o-du/event-settings.json b/solution/network/ntsim-ng-o-du/event-settings.json
deleted file mode 100644
index 108b10a..0000000
--- a/solution/network/ntsim-ng-o-du/event-settings.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-    "nts-network-function:network-function": {
-      "fault-generation": {
-        "fault-delay-list": [
-          {
-            "index": 0,
-            "delay-period": 20
-          }
-        ]
-      },
-      "ves": {
-        "pnf-registration": true,
-        "faults-enabled": true,
-        "heartbeat-period": 120
-      },
-      "netconf": {
-        "faults-enabled": false,
-        "call-home": false
-      },
-      "mount-point-addressing-method": "docker-mapping",
-      "function-type": "NTS_FUNCTION_TYPE_O_RAN_O_DU"
-    }
-  }
\ No newline at end of file
diff --git a/solution/network/ntsim-ng-o-du/o-ran-sc-du-hello-world-operational.xml b/solution/network/ntsim-ng-o-du/o-ran-sc-du-hello-world-operational.xml
deleted file mode 100644
index 503cd79..0000000
--- a/solution/network/ntsim-ng-o-du/o-ran-sc-du-hello-world-operational.xml
+++ /dev/null
@@ -1,102 +0,0 @@
-<network-function xmlns="urn:o-ran-sc:yang:o-ran-sc-du-hello-world">
-    <id>network-function-1</id>
-    <administrative-state>locked</administrative-state>
-    <operational-state>enabled</operational-state>
-    <user-label>nf1</user-label>
-    <distinguished-name-prefix>CN=KarenBerge,CN=admin,DC=corp,DC=Fabrikam,DC=COM</distinguished-name-prefix>
-    <location-name>address name</location-name>
-    <distributed-unit-functions>
-      <id>O-DU-1122</id>
-      <administrative-state>locked</administrative-state>
-      <operational-state>enabled</operational-state>
-      <user-label>o-du-1</user-label>
-      <cell>
-        <id>cell-1</id>
-        <administrative-state>locked</administrative-state>
-        <operational-state>enabled</operational-state>
-        <user-label>cell-1</user-label>
-        <traffic-state>active</traffic-state>
-        <local-id>1</local-id>
-        <public-land-mobile-networks>
-          <mobile-country-code>310</mobile-country-code>
-          <mobile-network-code>150</mobile-network-code>
-          <slice-differentiator>1</slice-differentiator>
-          <slice-service-type>1</slice-service-type>
-        </public-land-mobile-networks>
-        <physical-cell-id>1</physical-cell-id>
-        <tracking-area-code>10</tracking-area-code>
-        <absolute-radio-frequency-channel-number>
-          <downlink>15000</downlink>
-          <uplink>14000</uplink>
-          <supplementary-uplink>14500</supplementary-uplink>
-        </absolute-radio-frequency-channel-number>
-        <base-station-channel-bandwidth>
-          <downlink>80000</downlink>
-          <uplink>83000</uplink>
-          <supplementary-uplink>84000</supplementary-uplink>
-        </base-station-channel-bandwidth>
-        <synchronization-signal-block>
-          <frequency-channel-number>12</frequency-channel-number>
-          <periodicity>10</periodicity>
-          <subcarrier-spacing>30</subcarrier-spacing>
-          <offset>3</offset>
-          <duration>2</duration>
-        </synchronization-signal-block>
-        <supported-measurements>
-          <performance-measurement-type>user-equipment-average-throughput-downlink</performance-measurement-type>
-          <supported-snssai-subcounter-instances>
-            <slice-differentiator>1</slice-differentiator>
-            <slice-service-type>1</slice-service-type>
-          </supported-snssai-subcounter-instances>
-          <supported-snssai-subcounter-instances>
-            <slice-differentiator>1</slice-differentiator>
-            <slice-service-type>2</slice-service-type>
-          </supported-snssai-subcounter-instances>
-          <supported-snssai-subcounter-instances>
-            <slice-differentiator>2</slice-differentiator>
-            <slice-service-type>1</slice-service-type>
-          </supported-snssai-subcounter-instances>
-          <supported-snssai-subcounter-instances>
-            <slice-differentiator>2</slice-differentiator>
-            <slice-service-type>2</slice-service-type>
-          </supported-snssai-subcounter-instances>
-        </supported-measurements>
-        <supported-measurements>
-          <performance-measurement-type>user-equipment-average-throughput-uplink</performance-measurement-type>
-          <supported-snssai-subcounter-instances>
-            <slice-differentiator>1</slice-differentiator>
-            <slice-service-type>1</slice-service-type>
-          </supported-snssai-subcounter-instances>
-          <supported-snssai-subcounter-instances>
-            <slice-differentiator>1</slice-differentiator>
-            <slice-service-type>2</slice-service-type>
-          </supported-snssai-subcounter-instances>
-          <supported-snssai-subcounter-instances>
-            <slice-differentiator>2</slice-differentiator>
-            <slice-service-type>1</slice-service-type>
-          </supported-snssai-subcounter-instances>
-          <supported-snssai-subcounter-instances>
-            <slice-differentiator>2</slice-differentiator>
-            <slice-service-type>2</slice-service-type>
-          </supported-snssai-subcounter-instances>
-        </supported-measurements>
-      </cell>
-      <radio-resource-management-policy-ratio>
-        <id>rrm-pol-1</id>
-        <administrative-state>locked</administrative-state>
-        <operational-state>enabled</operational-state>
-        <user-label>rrm-pol-1</user-label>
-        <resource-type>prb</resource-type>
-        <radio-resource-management-policy-members>
-          <mobile-country-code>310</mobile-country-code>
-          <mobile-network-code>150</mobile-network-code>
-          <slice-differentiator>1</slice-differentiator>
-          <slice-service-type>1</slice-service-type>
-        </radio-resource-management-policy-members>
-        <radio-resource-management-policy-max-ratio>20</radio-resource-management-policy-max-ratio>
-        <radio-resource-management-policy-min-ratio>10</radio-resource-management-policy-min-ratio>
-        <radio-resource-management-policy-dedicated-ratio>15</radio-resource-management-policy-dedicated-ratio>
-      </radio-resource-management-policy-ratio>
-    </distributed-unit-functions>
-  </network-function>
-  
\ No newline at end of file
diff --git a/solution/network/ntsim-ng-o-du/o-ran-sc-du-hello-world-running.xml b/solution/network/ntsim-ng-o-du/o-ran-sc-du-hello-world-running.xml
deleted file mode 100644
index a6ca63a..0000000
--- a/solution/network/ntsim-ng-o-du/o-ran-sc-du-hello-world-running.xml
+++ /dev/null
@@ -1,58 +0,0 @@
-<network-function xmlns="urn:o-ran-sc:yang:o-ran-sc-du-hello-world">
-    <id>network-function-1</id>
-    <administrative-state>unlocked</administrative-state>
-    <user-label>nf1</user-label>
-    <distinguished-name-prefix>CN=KarenBerge,CN=admin,DC=corp,DC=Fabrikam,DC=COM</distinguished-name-prefix>
-    <distributed-unit-functions>
-      <id>O-DU-1122</id>
-      <administrative-state>unlocked</administrative-state>
-      <user-label>o-du-1</user-label>
-      <cell>
-        <id>cell-1</id>
-        <administrative-state>unlocked</administrative-state>
-        <user-label>cell-1</user-label>
-        <local-id>1</local-id>
-        <public-land-mobile-networks>
-          <mobile-country-code>310</mobile-country-code>
-          <mobile-network-code>150</mobile-network-code>
-          <slice-differentiator>1</slice-differentiator>
-          <slice-service-type>1</slice-service-type>
-        </public-land-mobile-networks>
-        <physical-cell-id>1</physical-cell-id>
-        <tracking-area-code>10</tracking-area-code>
-        <absolute-radio-frequency-channel-number>
-          <downlink>15000</downlink>
-          <uplink>14000</uplink>
-          <supplementary-uplink>14500</supplementary-uplink>
-        </absolute-radio-frequency-channel-number>
-        <base-station-channel-bandwidth>
-          <downlink>80000</downlink>
-          <uplink>83000</uplink>
-          <supplementary-uplink>84000</supplementary-uplink>
-        </base-station-channel-bandwidth>
-        <synchronization-signal-block>
-          <frequency-channel-number>12</frequency-channel-number>
-          <periodicity>10</periodicity>
-          <subcarrier-spacing>30</subcarrier-spacing>
-          <offset>3</offset>
-          <duration>2</duration>
-        </synchronization-signal-block>
-      </cell>
-      <radio-resource-management-policy-ratio>
-        <id>rrm-pol-1</id>
-        <administrative-state>unlocked</administrative-state>
-        <user-label>rrm-pol-1</user-label>
-        <resource-type>prb</resource-type>
-        <radio-resource-management-policy-members>
-          <mobile-country-code>310</mobile-country-code>
-          <mobile-network-code>150</mobile-network-code>
-          <slice-differentiator>1</slice-differentiator>
-          <slice-service-type>1</slice-service-type>
-        </radio-resource-management-policy-members>
-        <radio-resource-management-policy-max-ratio>20</radio-resource-management-policy-max-ratio>
-        <radio-resource-management-policy-min-ratio>10</radio-resource-management-policy-min-ratio>
-        <radio-resource-management-policy-dedicated-ratio>15</radio-resource-management-policy-dedicated-ratio>
-      </radio-resource-management-policy-ratio>
-    </distributed-unit-functions>
-  </network-function>
-  
\ No newline at end of file
diff --git a/solution/network/ntsim-ng-o-ru/event-settings.json b/solution/network/ntsim-ng-o-ru/event-settings.json
deleted file mode 100644
index ff875de..0000000
--- a/solution/network/ntsim-ng-o-ru/event-settings.json
+++ /dev/null
@@ -1,27 +0,0 @@
-{
-    "nts-network-function:network-function": {
-      "fault-generation": {
-        "fault-delay-list": [
-          {
-            "index": 0,
-            "delay-period": 10
-          },
-          {
-            "index": 1,
-            "delay-period": 30
-          }
-        ]
-      },
-      "ves": {
-        "pnf-registration": false,
-        "faults-enabled": false,
-        "heartbeat-period": 0
-      },
-      "netconf": {
-        "faults-enabled": true,
-        "call-home": true
-      },
-      "mount-point-addressing-method": "docker-mapping",
-      "function-type": "NTS_FUNCTION_TYPE_O_RAN_O_RU_FH"
-    }
-  }
\ No newline at end of file
diff --git a/solution/network/ntsim-ng-o-ru/o-ru-11221/config.json b/solution/network/ntsim-ng-o-ru/o-ru-11221/config.json
deleted file mode 100644
index 76ede7a..0000000
--- a/solution/network/ntsim-ng-o-ru/o-ru-11221/config.json
+++ /dev/null
@@ -1,135 +0,0 @@
-{
-    "container-rules": {
-        "excluded-modules": [],
-        "excluded-features": []
-    },
-
-    "supervisor-rules": {
-        "netopeer": {
-            "path": "/usr/local/bin/netopeer2-server",
-            "args": ["-d", "-v2"],
-            "autorestart": true,
-            "stdout": "log/netopeer-stdout.log",
-            "stderr": "log/netopeer-stderr.log"
-        },
-
-        "ntsim-network-function": {
-            "path": "/opt/dev/ntsim-ng/ntsim-ng",
-            "args": ["-w/opt/dev/ntsim-ng", "-f"],
-            "nomanual": true
-        }
-    },
-
-    "datastore-random-generation-rules" : {
-        "excluded-modules": [
-            "sysrepo",
-            "sysrepo-monitoring",
-            "ietf-yang-library",
-            "ietf-netconf-acm",
-            "ietf-netconf-monitoring",
-            "nc-notifications",
-            "ietf-keystore",
-            "ietf-truststore",
-            "ietf-system",
-            "ietf-netconf-server",
-            "ietf-alarms",
-            "ietf-network-instance",
-            "ietf-restconf",
-            "ietf-yang-schema-mount",
-            "ietf-subscribed-notifications",
-            "o-ran-uplane-conf",
-            "o-ran-performance-management",
-            "o-ran-transceiver",
-            "o-ran-mplane-int",
-            "o-ran-processing-element",
-            "o-ran-shared-cell",
-            "nts-network-function"
-        ],
-
-        "default-list-instances": 2,
-        "custom-list-instances" : [
-            {"/ietf-interfaces:interfaces/interface": 4}
-
-        ],
-
-        "restrict-schema": [
-            {"/ietf-interfaces:interfaces/interface/type": ["iana-if-type:ethernetCsmacd"]}
-        ]
-
-    },
-
-    "datastore-populate-rules": {
-        "random-generation-enabled": false,
-
-        "pre-generated-operational-data": [
-            "../deploy/data/ietf-hardware-operational.json",
-            "../deploy/data/ietf-interfaces-operational.xml"
-        ],
-        "pre-generated-running-data": [
-            "../deploy/data/ietf-hardware-running.json",
-            "../deploy/data/ietf-interfaces-running.xml"
-        ]
-    },
-
-    "fault-rules" : {
-        "yang-notif-template" : "<alarm-notif xmlns=\"urn:o-ran:fm:1.0\"><fault-id>%%fault-id%%</fault-id><fault-source>%%object%%</fault-source><affected-objects><name>%%affected-object%%</name></affected-objects><fault-severity>%%fault-severity%%</fault-severity><is-cleared>%%cleared%%</is-cleared><fault-text>%%text%%</fault-text><event-time>%%date-time%%</event-time></alarm-notif>",
-        "choosing-method" : "linear",
-        "faults" : [
-            {
-                "condition" : "Interface Fault",
-                "object"    : "09a95e08-5b53-4734-815f-a9c12300fc62",
-                "severity"  : "CRITICAL",
-                "date-time" : "$$time$$",
-                "specific-problem" : "Interface Fault",
-
-                "fault-id": "30",
-                "fault-severity" : "CRITICAL",
-                "affected-object" : "$$hostname$$",
-                "cleared" : "false",
-                "text" : "Interface Fault"
-            },
-
-            {
-                "condition" : "Interface Fault",
-                "object"    : "09a95e08-5b53-4734-815f-a9c12300fc62",
-                "severity"  : "NORMAL",
-                "date-time" : "$$time$$",
-                "specific-problem" : "Interface Fault",
-
-                "fault-id": "30",
-                "fault-severity" : "CRITICAL",
-                "affected-object" : "$$hostname$$",
-                "cleared" : "true",
-                "text" : "Interface Fault"
-            },
-
-            {
-                "condition" : "C/U-plane logical Connection faulty",
-                "object"    : "09a95e08-5b53-4734-815f-a9c12300fc62",
-                "severity"  : "CRITICAL",
-                "date-time" : "$$time$$",
-                "specific-problem" : "C/U-plane logical Connection faulty",
-
-                "fault-id": "28",
-                "fault-severity" : "CRITICAL",
-                "affected-object" : "$$hostname$$",
-                "cleared" : "false",
-                "text" : "C/U-plane logical Connection faulty"
-            },
-
-            {
-                "condition" : "C/U-plane logical Connection faulty",
-                "object"    : "09a95e08-5b53-4734-815f-a9c12300fc62",
-                "severity"  : "NORMAL",
-                "date-time" : "$$time$$",
-                "specific-problem" : "C/U-plane logical Connection faulty",
-
-                "fault-id": "28",
-                "fault-severity" : "CRITICAL",
-                "affected-object" : "$$hostname$$",
-                "cleared" : "true",
-                "text" : "C/U-plane logical Connection faulty"
-            }
-        ]
-    }
-}
diff --git a/solution/network/ntsim-ng-o-ru/o-ru-11221/ietf-hardware-operational.json b/solution/network/ntsim-ng-o-ru/o-ru-11221/ietf-hardware-operational.json
deleted file mode 100644
index b0a474c..0000000
--- a/solution/network/ntsim-ng-o-ru/o-ru-11221/ietf-hardware-operational.json
+++ /dev/null
@@ -1,442 +0,0 @@
-{
-  "ietf-hardware:hardware": {
-    "component": [
-      {
-        "name": "chassis-temperature-exhaust",
-        "alias": "chassis-temperature-exhaust",
-        "sensor-data": {
-          "value": 30,
-          "value-type": "celsius",
-          "oper-status": "ok",
-          "value-timestamp": "2021-03-18T19:51:50.3Z"
-        },
-        "class": "iana-hardware:sensor",
-        "state": {
-          "oper-state": "enabled",
-          "admin-state": "locked"
-        },
-        "parent-rel-pos": 0,
-        "parent": "chassis"
-      },
-      {
-        "name": "slot2-logical2",
-        "alias": "Slot3-B",
-        "description": "SLOT3-B",
-        "class": "iana-hardware:module",
-        "state": {
-          "oper-state": "disabled",
-          "admin-state": "unlocked"
-        },
-        "parent-rel-pos": 3,
-        "parent": "slot2"
-      },
-      {
-        "name": "chassis-temperature-inlet",
-        "alias": "chassis-temperature-inlet",
-        "sensor-data": {
-          "value": 29,
-          "value-type": "celsius",
-          "oper-status": "ok",
-          "value-timestamp": "2021-03-18T19:51:50.3Z"
-        },
-        "class": "iana-hardware:sensor",
-        "state": {
-          "oper-state": "enabled",
-          "admin-state": "locked"
-        },
-        "parent-rel-pos": 1,
-        "parent": "chassis"
-      },
-      {
-        "name": "slot0-logical0-rrh",
-        "alias": "Slot0-A-rrh",
-        "class": "iana-hardware:port",
-        "contains-child": [
-          "slot0-logical0-rrh-temperature"
-        ],
-        "o-ran-hardware:o-ran-name": "slot0-logical0-rrh",
-        "state": {
-          "oper-state": "enabled",
-          "admin-state": "locked"
-        },
-        "serial-num": "AGNF714S",
-        "mfg-name": "ACME GMBH.",
-        "parent-rel-pos": 1,
-        "parent": "slot0-logical0",
-        "model-name": "ANSHEONXH-E7"
-      },
-      {
-        "name": "chassis-fan1",
-        "alias": "chassis-fan1",
-        "class": "iana-hardware:fan",
-        "contains-child": [
-          "chassis-fan1-speed"
-        ],
-        "state": {
-          "oper-state": "enabled",
-          "admin-state": "locked"
-        },
-        "parent-rel-pos": 3,
-        "parent": "chassis"
-      },
-      {
-        "name": "chassis-fan3-speed",
-        "alias": "chassis-fan3-speed",
-        "sensor-data": {
-          "value": 1000,
-          "value-type": "rpm",
-          "oper-status": "ok",
-          "value-timestamp": "2021-03-18T19:51:50.3Z"
-        },
-        "class": "iana-hardware:sensor",
-        "state": {
-          "oper-state": "enabled",
-          "admin-state": "locked"
-        },
-        "parent-rel-pos": 0,
-        "parent": "chassis-fan3"
-      },
-      {
-        "name": "slot0-logical1",
-        "alias": "Slot0-B",
-        "description": "SLOT0-B",
-        "class": "iana-hardware:module",
-        "state": {
-          "oper-state": "disabled",
-          "admin-state": "unlocked"
-        },
-        "parent-rel-pos": 2,
-        "parent": "slot0"
-      },
-      {
-        "name": "chassis-fan0",
-        "alias": "chassis-fan0",
-        "class": "iana-hardware:fan",
-        "contains-child": [
-          "chassis-fan0-speed"
-        ],
-        "state": {
-          "oper-state": "enabled",
-          "admin-state": "locked"
-        },
-        "parent-rel-pos": 2,
-        "parent": "chassis"
-      },
-      {
-        "name": "slot0-logical0",
-        "alias": "Slot0-A",
-        "description": "SLOT0-AZ",
-        "class": "iana-hardware:module",
-        "contains-child": [
-          "slot0-logical0-bbu",
-          "slot0-logical0-rrh"
-        ],
-        "state": {
-          "oper-state": "enabled",
-          "admin-state": "unlocked"
-        },
-        "parent-rel-pos": 1,
-        "parent": "slot0"
-      },
-      {
-        "name": "chassis",
-        "alias": "chassis",
-        "description": "O-RAN O-RU O1 Simulator",
-        "class": "iana-hardware:chassis",
-        "contains-child": [
-          "cpu",
-          "chassis-temperature-inlet",
-          "chassis-temperature-exhaust",
-          "chassis-fan1",
-          "slot0",
-          "chassis-fan2",
-          "chassis-fan3",
-          "slot2",
-          "chassis-fan0"
-        ],
-        "state": {
-          "oper-state": "enabled",
-          "admin-state": "unlocked"
-        },
-        "serial-num": "23412",
-        "mfg-name": "NTS",
-        "software-rev": "3.8.1 (2029-10-30 11:47:59)",
-        "model-name": "O1-O-RU-Simulator"
-      },
-      {
-        "name": "slot0-logical2",
-        "alias": "Slot0-C",
-        "description": "SLOT0-C",
-        "class": "iana-hardware:module",
-        "state": {
-          "oper-state": "disabled",
-          "admin-state": "unlocked"
-        },
-        "parent-rel-pos": 3,
-        "parent": "slot0"
-      },
-      {
-        "name": "slot0-logical0-bbu-temperature",
-        "alias": "Slot0-A-bbu-temperature",
-        "sensor-data": {
-          "value": 37,
-          "value-type": "celsius",
-          "oper-status": "ok",
-          "value-timestamp": "2021-03-18T19:51:50.3Z"
-        },
-        "class": "iana-hardware:sensor",
-        "state": {
-          "oper-state": "enabled",
-          "admin-state": "locked"
-        },
-        "parent-rel-pos": 0,
-        "parent": "slot0-logical0-bbu"
-      },
-      {
-        "name": "chassis-fan3",
-        "alias": "chassis-fan3",
-        "class": "iana-hardware:fan",
-        "contains-child": [
-          "chassis-fan3-speed"
-        ],
-        "state": {
-          "oper-state": "enabled",
-          "admin-state": "locked"
-        },
-        "parent-rel-pos": 5,
-        "parent": "chassis"
-      },
-      {
-        "name": "chassis-fan2",
-        "alias": "chassis-fan2",
-        "class": "iana-hardware:fan",
-        "contains-child": [
-          "chassis-fan2-speed"
-        ],
-        "state": {
-          "oper-state": "enabled",
-          "admin-state": "locked"
-        },
-        "parent-rel-pos": 4,
-        "parent": "chassis"
-      },
-      {
-        "name": "cpu-temperature",
-        "alias": "cpu-temperature",
-        "sensor-data": {
-          "value": 30,
-          "value-type": "celsius",
-          "oper-status": "ok",
-          "value-timestamp": "2021-03-18T19:51:50.3Z"
-        },
-        "class": "iana-hardware:sensor",
-        "state": {
-          "oper-state": "enabled",
-          "admin-state": "locked"
-        },
-        "parent-rel-pos": 0,
-        "parent": "cpu"
-      },
-      {
-        "name": "slot2-logical0",
-        "alias": "Slot2-C",
-        "description": "SLOT2-C",
-        "class": "iana-hardware:module",
-        "state": {
-          "oper-state": "disabled",
-          "admin-state": "unlocked"
-        },
-        "parent-rel-pos": 1,
-        "parent": "slot2"
-      },
-      {
-        "name": "slot2-logical1",
-        "alias": "Slot3-A",
-        "description": "SLOT3-A",
-        "class": "iana-hardware:module",
-        "state": {
-          "oper-state": "disabled",
-          "admin-state": "unlocked"
-        },
-        "parent-rel-pos": 2,
-        "parent": "slot2"
-      },
-      {
-        "name": "slot0-logical0-bbu",
-        "alias": "Slot0-A-bbu",
-        "class": "iana-hardware:port",
-        "contains-child": [
-          "slot0-logical0-bbu-temperature"
-        ],
-        "o-ran-hardware:o-ran-name": "slot0-logical0-bbu",
-        "state": {
-          "oper-state": "enabled",
-          "admin-state": "unlocked"
-        },
-        "serial-num": "AGNN214S",
-        "mfg-name": "ACME GMBH.",
-        "parent-rel-pos": 0,
-        "parent": "slot0-logical0",
-        "model-name": "ANSHEONXH-E7"
-      },
-      {
-        "name": "chassis-fan1-speed",
-        "alias": "chassis-fan1-speed",
-        "sensor-data": {
-          "value": 4100,
-          "value-type": "rpm",
-          "oper-status": "ok",
-          "value-timestamp": "2021-03-18T19:51:50.3Z"
-        },
-        "class": "iana-hardware:sensor",
-        "state": {
-          "oper-state": "enabled",
-          "admin-state": "locked"
-        },
-        "parent-rel-pos": 0,
-        "parent": "chassis-fan1"
-      },
-      {
-        "name": "chassis-fan0-speed",
-        "alias": "chassis-fan0-speed",
-        "sensor-data": {
-          "value": 4100,
-          "value-type": "rpm",
-          "oper-status": "ok",
-          "value-timestamp": "2021-03-18T19:51:50.3Z"
-        },
-        "class": "iana-hardware:sensor",
-        "state": {
-          "oper-state": "enabled",
-          "admin-state": "locked"
-        },
-        "parent-rel-pos": 0,
-        "parent": "chassis-fan0"
-      },
-      {
-        "name": "slot0",
-        "alias": "slot0",
-        "class": "iana-hardware:module",
-        "contains-child": [
-          "slot0-logical1",
-          "slot0-logical2",
-          "slot0-logical0",
-          "slot0-temperature"
-        ],
-        "state": {
-          "oper-state": "enabled",
-          "admin-state": "unlocked"
-        },
-        "serial-num": "7220530",
-        "parent-rel-pos": 7,
-        "software-rev": "0",
-        "parent": "chassis",
-        "firmware-rev": "12.00.42-S (0F7F1001)",
-        "model-name": "385A-SFP-2P-40-FHL-JC3"
-      },
-      {
-        "name": "slot2",
-        "alias": "slot2",
-        "class": "iana-hardware:module",
-        "contains-child": [
-          "slot2-temperature",
-          "slot2-logical0",
-          "slot2-logical2",
-          "slot2-logical1"
-        ],
-        "state": {
-          "oper-state": "enabled",
-          "admin-state": "unlocked"
-        },
-        "serial-num": "2522642",
-        "parent-rel-pos": 9,
-        "software-rev": "0",
-        "parent": "chassis",
-        "firmware-rev": "12.00.42-S (0F7F1001)",
-        "model-name": "339B-SFP-2P-75-FHL-JC3"
-      },
-      {
-        "name": "slot0-logical0-rrh-temperature",
-        "alias": "Slot0-A-rrh-temperature",
-        "sensor-data": {
-          "value": 35,
-          "value-type": "celsius",
-          "oper-status": "ok",
-          "value-timestamp": "2021-03-18T19:51:50.3Z"
-        },
-        "class": "iana-hardware:sensor",
-        "state": {
-          "oper-state": "enabled",
-          "admin-state": "locked"
-        },
-        "parent-rel-pos": 0,
-        "parent": "slot0-logical0-rrh"
-      },
-      {
-        "name": "slot0-temperature",
-        "alias": "slot0-temperature",
-        "sensor-data": {
-          "value": 51,
-          "value-type": "celsius",
-          "oper-status": "ok",
-          "value-timestamp": "2021-03-18T19:51:50.3Z"
-        },
-        "class": "iana-hardware:sensor",
-        "state": {
-          "oper-state": "enabled",
-          "admin-state": "locked"
-        },
-        "parent-rel-pos": 0,
-        "parent": "slot0"
-      },
-      {
-        "name": "cpu",
-        "alias": "cpu",
-        "class": "iana-hardware:cpu",
-        "contains-child": [
-          "cpu-temperature"
-        ],
-        "state": {
-          "oper-state": "enabled",
-          "admin-state": "locked"
-        },
-        "parent-rel-pos": 6,
-        "parent": "chassis"
-      },
-      {
-        "name": "chassis-fan2-speed",
-        "alias": "chassis-fan2-speed",
-        "sensor-data": {
-          "value": 4100,
-          "value-type": "rpm",
-          "oper-status": "ok",
-          "value-timestamp": "2021-03-18T19:51:50.3Z"
-        },
-        "class": "iana-hardware:sensor",
-        "state": {
-          "oper-state": "enabled",
-          "admin-state": "locked"
-        },
-        "parent-rel-pos": 0,
-        "parent": "chassis-fan2"
-      },
-      {
-        "name": "slot2-temperature",
-        "alias": "slot2-temperature",
-        "sensor-data": {
-          "value": 49,
-          "value-type": "celsius",
-          "oper-status": "ok",
-          "value-timestamp": "2021-03-18T19:51:50.3Z"
-        },
-        "class": "iana-hardware:sensor",
-        "state": {
-          "oper-state": "enabled",
-          "admin-state": "locked"
-        },
-        "parent-rel-pos": 0,
-        "parent": "slot2"
-      }
-    ]
-  }
-}
diff --git a/solution/network/ntsim-ng-o-ru/o-ru-11221/ietf-hardware-running.json b/solution/network/ntsim-ng-o-ru/o-ru-11221/ietf-hardware-running.json
deleted file mode 100644
index 4800c35..0000000
--- a/solution/network/ntsim-ng-o-ru/o-ru-11221/ietf-hardware-running.json
+++ /dev/null
@@ -1,276 +0,0 @@
-{
-  "ietf-hardware:hardware": {
-    "component": [
-      {
-        "name": "chassis-temperature-exhaust",
-        "alias": "chassis-temperature-exhaust",
-        "class": "iana-hardware:sensor",
-        "state": {
-          "admin-state": "locked"
-        },
-        "parent-rel-pos": 0,
-        "parent": "chassis"
-      },
-      {
-        "name": "slot2-logical2",
-        "alias": "Slot3-B",
-        "class": "iana-hardware:module",
-        "state": {
-          "admin-state": "unlocked"
-        },
-        "parent-rel-pos": 3,
-        "parent": "slot2"
-      },
-      {
-        "name": "chassis-temperature-inlet",
-        "alias": "chassis-temperature-inlet",
-        "class": "iana-hardware:sensor",
-        "state": {
-          "admin-state": "locked"
-        },
-        "parent-rel-pos": 1,
-        "parent": "chassis"
-      },
-      {
-        "name": "slot0-logical0-rrh",
-        "alias": "Slot0-A-rrh",
-        "class": "iana-hardware:port",
-        "o-ran-hardware:o-ran-name": "slot0-logical0-rrh",
-        "state": {
-          "admin-state": "locked"
-        },
-        "parent-rel-pos": 1,
-        "parent": "slot0-logical0"
-      },
-      {
-        "name": "chassis-fan1",
-        "alias": "chassis-fan1",
-        "class": "iana-hardware:fan",
-        "state": {
-          "admin-state": "locked"
-        },
-        "parent-rel-pos": 3,
-        "parent": "chassis"
-      },
-      {
-        "name": "chassis-fan3-speed",
-        "alias": "chassis-fan3-speed",
-        "class": "iana-hardware:sensor",
-        "state": {
-          "admin-state": "locked"
-        },
-        "parent-rel-pos": 0,
-        "parent": "chassis-fan3"
-      },
-      {
-        "name": "slot0-logical1",
-        "alias": "Slot0-B",
-        "class": "iana-hardware:module",
-        "state": {
-          "admin-state": "unlocked"
-        },
-        "parent-rel-pos": 2,
-        "parent": "slot0"
-      },
-      {
-        "name": "chassis-fan0",
-        "alias": "chassis-fan0",
-        "class": "iana-hardware:fan",
-        "state": {
-          "admin-state": "locked"
-        },
-        "parent-rel-pos": 2,
-        "parent": "chassis"
-      },
-      {
-        "name": "slot0-logical0",
-        "alias": "Slot0-A",
-        "class": "iana-hardware:module",
-        "state": {
-          "admin-state": "unlocked"
-        },
-        "parent-rel-pos": 1,
-        "parent": "slot0"
-      },
-      {
-        "name": "chassis",
-        "alias": "chassis",
-        "class": "iana-hardware:chassis",
-        "state": {
-          "admin-state": "unlocked"
-        }
-      },
-      {
-        "name": "slot0-logical2",
-        "alias": "Slot0-C",
-        "class": "iana-hardware:module",
-        "state": {
-          "admin-state": "unlocked"
-        },
-        "parent-rel-pos": 3,
-        "parent": "slot0"
-      },
-      {
-        "name": "slot0-logical0-bbu-temperature",
-        "alias": "Slot0-A-bbu-temperature",
-        "class": "iana-hardware:sensor",
-        "state": {
-          "admin-state": "locked"
-        },
-        "parent-rel-pos": 0,
-        "parent": "slot0-logical0-bbu"
-      },
-      {
-        "name": "chassis-fan3",
-        "alias": "chassis-fan3",
-        "class": "iana-hardware:fan",
-        "state": {
-          "admin-state": "locked"
-        },
-        "parent-rel-pos": 5,
-        "parent": "chassis"
-      },
-      {
-        "name": "chassis-fan2",
-        "alias": "chassis-fan2",
-        "class": "iana-hardware:fan",
-        "state": {
-          "admin-state": "locked"
-        },
-        "parent-rel-pos": 4,
-        "parent": "chassis"
-      },
-      {
-        "name": "cpu-temperature",
-        "alias": "cpu-temperature",
-        "class": "iana-hardware:sensor",
-        "state": {
-          "admin-state": "locked"
-        },
-        "parent-rel-pos": 0,
-        "parent": "cpu"
-      },
-      {
-        "name": "slot2-logical0",
-        "alias": "Slot2-C",
-        "class": "iana-hardware:module",
-        "state": {
-          "admin-state": "unlocked"
-        },
-        "parent-rel-pos": 1,
-        "parent": "slot2"
-      },
-      {
-        "name": "slot2-logical1",
-        "alias": "Slot3-A",
-        "class": "iana-hardware:module",
-        "state": {
-          "admin-state": "unlocked"
-        },
-        "parent-rel-pos": 2,
-        "parent": "slot2"
-      },
-      {
-        "name": "slot0-logical0-bbu",
-        "alias": "Slot0-A-bbu",
-        "class": "iana-hardware:port",
-        "o-ran-hardware:o-ran-name": "slot0-logical0-bbu",
-        "state": {
-          "admin-state": "unlocked"
-        },
-        "parent-rel-pos": 0,
-        "parent": "slot0-logical0"
-      },
-      {
-        "name": "chassis-fan1-speed",
-        "alias": "chassis-fan1-speed",
-        "class": "iana-hardware:sensor",
-        "state": {
-          "admin-state": "locked"
-        },
-        "parent-rel-pos": 0,
-        "parent": "chassis-fan1"
-      },
-      {
-        "name": "chassis-fan0-speed",
-        "alias": "chassis-fan0-speed",
-        "class": "iana-hardware:sensor",
-        "state": {
-          "admin-state": "locked"
-        },
-        "parent-rel-pos": 0,
-        "parent": "chassis-fan0"
-      },
-      {
-        "name": "slot0",
-        "alias": "slot0",
-        "class": "iana-hardware:module",
-        "state": {
-          "admin-state": "unlocked"
-        },
-        "parent-rel-pos": 7,
-        "parent": "chassis"
-      },
-      {
-        "name": "slot2",
-        "alias": "slot2",
-        "class": "iana-hardware:module",
-        "state": {
-          "admin-state": "unlocked"
-        },
-        "parent-rel-pos": 9,
-        "parent": "chassis"
-      },
-      {
-        "name": "slot0-logical0-rrh-temperature",
-        "alias": "Slot0-A-rrh-temperature",
-        "class": "iana-hardware:sensor",
-        "state": {
-          "admin-state": "locked"
-        },
-        "parent-rel-pos": 0,
-        "parent": "slot0-logical0-rrh"
-      },
-      {
-        "name": "slot0-temperature",
-        "alias": "slot0-temperature",
-        "class": "iana-hardware:sensor",
-        "state": {
-          "admin-state": "locked"
-        },
-        "parent-rel-pos": 0,
-        "parent": "slot0"
-      },
-      {
-        "name": "cpu",
-        "alias": "cpu",
-        "class": "iana-hardware:cpu",
-        "state": {
-          "admin-state": "locked"
-        },
-        "parent-rel-pos": 6,
-        "parent": "chassis"
-      },
-      {
-        "name": "chassis-fan2-speed",
-        "alias": "chassis-fan2-speed",
-        "class": "iana-hardware:sensor",
-        "state": {
-          "admin-state": "locked"
-        },
-        "parent-rel-pos": 0,
-        "parent": "chassis-fan2"
-      },
-      {
-        "name": "slot2-temperature",
-        "alias": "slot2-temperature",
-        "class": "iana-hardware:sensor",
-        "state": {
-          "admin-state": "locked"
-        },
-        "parent-rel-pos": 0,
-        "parent": "slot2"
-      }
-    ]
-  }
-}
diff --git a/solution/network/ntsim-ng-o-ru/o-ru-11221/ietf-interfaces-operational.xml b/solution/network/ntsim-ng-o-ru/o-ru-11221/ietf-interfaces-operational.xml
deleted file mode 100644
index 75f0eec..0000000
--- a/solution/network/ntsim-ng-o-ru/o-ru-11221/ietf-interfaces-operational.xml
+++ /dev/null
@@ -1,151 +0,0 @@
-  <interfaces xmlns="urn:ietf:params:xml:ns:yang:ietf-interfaces">
-    <interface>
-      <name>09a95e08-5b53-4734-815f-a9c12300fc62</name>
-      <description>Simulated interface for O-RU</description>
-      <type xmlns:ianaift="urn:ietf:params:xml:ns:yang:iana-if-type">ianaift:ethernetCsmacd</type>
-      <enabled>true</enabled>
-      <link-up-down-trap-enable>disabled</link-up-down-trap-enable>
-      <ipv4 xmlns="urn:ietf:params:xml:ns:yang:ietf-ip">
-        <enabled>false</enabled>
-        <forwarding>false</forwarding>
-        <mtu>42783</mtu>
-        <address>
-          <ip>6.122.172.49</ip>
-          <prefix-length>14</prefix-length>
-          <origin>static</origin>
-        </address>
-        <address>
-          <ip>206.35.59.57</ip>
-          <netmask>199.41.255.188</netmask>
-          <origin>random</origin>
-        </address>
-        <neighbor>
-          <ip>48.159.72.129</ip>
-          <link-layer-address>42:8f:12:23:03:d3</link-layer-address>
-          <origin>other</origin>
-        </neighbor>
-        <neighbor>
-          <ip>187.230.45.63</ip>
-          <link-layer-address>77:b5:38:45:08:be</link-layer-address>
-          <origin>dynamic</origin>
-        </neighbor>
-        <m-plane-marking xmlns="urn:o-ran:interfaces:1.0">13</m-plane-marking>
-        <diffserv-markings xmlns="urn:o-ran:interfaces:1.0">
-          <u-plane-marking>38</u-plane-marking>
-          <c-plane-marking>16</c-plane-marking>
-          <s-plane-marking>62</s-plane-marking>
-          <other-marking>27</other-marking>
-          <enhanced-uplane-markings>
-            <up-marking-name>X5f0ExbIx4jg5fpd9c0wiOEJbCXzpYxe3M7AkiaRnlZsAgxCsx0LlFmwhk6yavM5iTFu4Idr3cTwtj0NQ0ycFVAO7ymh41meM2IQCNhFZ33km30c4ygJlRqshMJlFYrsS1iuOs1Gv5SJ8SNcr4WENm740IiyGJ0qLaUrCW7Z10A9SombsaQ7oPboptWYdOoQRjhl7hl8hV91bv5vxNCVuOcTh0RmP84Grm1qD</up-marking-name>
-            <enhanced-marking>21</enhanced-marking>
-          </enhanced-uplane-markings>
-          <enhanced-uplane-markings>
-            <up-marking-name>2zF55KBup</up-marking-name>
-            <enhanced-marking>5</enhanced-marking>
-          </enhanced-uplane-markings>
-        </diffserv-markings>
-      </ipv4>
-      <ipv6 xmlns="urn:ietf:params:xml:ns:yang:ietf-ip">
-        <enabled>true</enabled>
-        <forwarding>true</forwarding>
-        <mtu>1163652863</mtu>
-        <address>
-          <ip>ea87:d264:da5e:5b19:4713:7266:f91e:14f7</ip>
-          <prefix-length>124</prefix-length>
-          <origin>other</origin>
-          <status>tentative</status>
-        </address>
-        <address>
-          <ip>2853:6b9:c531:f3c1:6875:f55:17ea:157b</ip>
-          <prefix-length>65</prefix-length>
-          <origin>link-layer</origin>
-          <status>preferred</status>
-        </address>
-        <neighbor>
-          <ip>e6ae:4eeb:25c8:4ce6:9a7:5c2c:4293:f42e</ip>
-          <link-layer-address>65:58:a4:47:f1:91</link-layer-address>
-          <origin>other</origin>
-          <is-router/>
-          <state>probe</state>
-        </neighbor>
-        <neighbor>
-          <ip>f88d:e8e9:8f68:ff46:ae1a:8329:67bc:bd6f</ip>
-          <link-layer-address>32:d7:a9:c1:37:14</link-layer-address>
-          <origin>other</origin>
-          <state>incomplete</state>
-        </neighbor>
-        <dup-addr-detect-transmits>1225514618</dup-addr-detect-transmits>
-        <autoconf>
-          <create-global-addresses>true</create-global-addresses>
-          <create-temporary-addresses>true</create-temporary-addresses>
-          <temporary-valid-lifetime>2335597472</temporary-valid-lifetime>
-          <temporary-preferred-lifetime>922813230</temporary-preferred-lifetime>
-        </autoconf>
-        <m-plane-marking xmlns="urn:o-ran:interfaces:1.0">33</m-plane-marking>
-        <diffserv-markings xmlns="urn:o-ran:interfaces:1.0">
-          <u-plane-marking>29</u-plane-marking>
-          <c-plane-marking>50</c-plane-marking>
-          <s-plane-marking>14</s-plane-marking>
-          <other-marking>61</other-marking>
-          <enhanced-uplane-markings>
-            <up-marking-name>8iROcw05EJqk0qe08RerP</up-marking-name>
-            <enhanced-marking>18</enhanced-marking>
-          </enhanced-uplane-markings>
-          <enhanced-uplane-markings>
-            <up-marking-name>M14steKtoB9s09xEKPYLf4LfWZHDetPSuUkP05bgykIym746WUR3ZCjVuSqIlgAI2Nx2KIiaV0Bh7xnVs7YjB965TwF7E8PGVeAxPSHKKaTJI8w2fnlRwjWqPuxmCe2xsDWhnvT0GMBoV8i2vDTTOIbvcAROOUd9p9qMEcEcYgsLgKODfzw3hAzlaq9Zce8BfqgUCUYt2r6abMNrmcuDMVZWm0Nq7N2m6a8IW73Zy21BOP2aTpGxkxlyp9ZwO</up-marking-name>
-            <enhanced-marking>29</enhanced-marking>
-          </enhanced-uplane-markings>
-        </diffserv-markings>
-      </ipv6>
-      <alias-macs xmlns="urn:o-ran:interfaces:1.0">b2:24:6a:90:68:bb</alias-macs>
-      <alias-macs xmlns="urn:o-ran:interfaces:1.0">ba:33:50:5b:58:f7</alias-macs>
-      <mac-address xmlns="urn:o-ran:interfaces:1.0">2c:2b:1f:8c:3f:a2</mac-address>
-      <port-reference xmlns="urn:o-ran:interfaces:1.0">
-        <port-number>113</port-number>
-      </port-reference>
-      <l2-mtu xmlns="urn:o-ran:interfaces:1.0">60489</l2-mtu>
-      <vlan-tagging xmlns="urn:o-ran:interfaces:1.0">true</vlan-tagging>
-      <class-of-service xmlns="urn:o-ran:interfaces:1.0">
-        <u-plane-marking>3</u-plane-marking>
-        <c-plane-marking>0</c-plane-marking>
-        <m-plane-marking>1</m-plane-marking>
-        <s-plane-marking>6</s-plane-marking>
-        <other-marking>4</other-marking>
-        <enhanced-uplane-markings>
-          <up-marking-name>dtSbiQU8fgixwU6tOQNLIc1PPuz2LFeQ862rPWr44JtAvzVbi</up-marking-name>
-          <enhanced-marking>5</enhanced-marking>
-        </enhanced-uplane-markings>
-        <enhanced-uplane-markings>
-          <up-marking-name>MQHBk8vYNCGOII7pwymAaP2xhPJrxxjcn1NA9bqPN6D</up-marking-name>
-          <enhanced-marking>2</enhanced-marking>
-        </enhanced-uplane-markings>
-      </class-of-service>
-      <admin-status>up</admin-status>
-      <oper-status>unknown</oper-status>
-      <last-change>2018-12-04T01:22:44Z</last-change>
-      <if-index>1399123220</if-index>
-      <phys-address>fc:07:1e:ec:24:a3</phys-address>
-      <higher-layer-if>80kcD05DwnN81FHWZgSwQXgpN7kjx4KF44JzXOcl3St5p21gjLM9A2yg1LzyPk</higher-layer-if>
-      <lower-layer-if>80kcD05DwnN81FHWZgSwQXgpN7kjx4KF44JzXOcl3St5p21gjLM9A2yg1LzyPk</lower-layer-if>
-      <speed>2897952377425309696</speed>
-      <statistics>
-        <discontinuity-time>2037-04-15T16:07:29Z</discontinuity-time>
-        <in-octets>2571268368646403584</in-octets>
-        <in-unicast-pkts>6267618126971935744</in-unicast-pkts>
-        <in-broadcast-pkts>1109994561130658944</in-broadcast-pkts>
-        <in-multicast-pkts>3315305959068576256</in-multicast-pkts>
-        <in-discards>1267048002</in-discards>
-        <in-errors>2454029092</in-errors>
-        <in-unknown-protos>603209482</in-unknown-protos>
-        <out-octets>1059514199864528128</out-octets>
-        <out-unicast-pkts>6657904184753078272</out-unicast-pkts>
-        <out-broadcast-pkts>5105130509884859392</out-broadcast-pkts>
-        <out-multicast-pkts>2014558074734005248</out-multicast-pkts>
-        <out-discards>2053161590</out-discards>
-        <out-errors>1475901304</out-errors>
-      </statistics>
-      <last-cleared xmlns="urn:o-ran:interfaces:1.0">1976-10-15T10:34:12Z</last-cleared>
-      <interface-groups-id xmlns="urn:o-ran:interfaces:1.0">56</interface-groups-id>
-      <interface-groups-id xmlns="urn:o-ran:interfaces:1.0">143</interface-groups-id>
-    </interface>
-  </interfaces>
diff --git a/solution/network/ntsim-ng-o-ru/o-ru-11221/ietf-interfaces-running.xml b/solution/network/ntsim-ng-o-ru/o-ru-11221/ietf-interfaces-running.xml
deleted file mode 100644
index 3de642b..0000000
--- a/solution/network/ntsim-ng-o-ru/o-ru-11221/ietf-interfaces-running.xml
+++ /dev/null
@@ -1,111 +0,0 @@
-  <interfaces xmlns="urn:ietf:params:xml:ns:yang:ietf-interfaces">
-    <interface>
-      <name>09a95e08-5b53-4734-815f-a9c12300fc62</name>
-      <description>Simulated interface for O-RU</description>
-      <type xmlns:ianaift="urn:ietf:params:xml:ns:yang:iana-if-type">ianaift:ethernetCsmacd</type>
-      <enabled>true</enabled>
-      <link-up-down-trap-enable>disabled</link-up-down-trap-enable>
-      <ipv4 xmlns="urn:ietf:params:xml:ns:yang:ietf-ip">
-        <enabled>false</enabled>
-        <forwarding>false</forwarding>
-        <mtu>42783</mtu>
-        <address>
-          <ip>6.122.172.49</ip>
-          <prefix-length>14</prefix-length>
-        </address>
-        <address>
-          <ip>206.35.59.57</ip>
-          <netmask>199.41.255.188</netmask>
-        </address>
-        <neighbor>
-          <ip>48.159.72.129</ip>
-          <link-layer-address>42:8f:12:23:03:d3</link-layer-address>
-        </neighbor>
-        <neighbor>
-          <ip>187.230.45.63</ip>
-          <link-layer-address>77:b5:38:45:08:be</link-layer-address>
-        </neighbor>
-        <m-plane-marking xmlns="urn:o-ran:interfaces:1.0">13</m-plane-marking>
-        <diffserv-markings xmlns="urn:o-ran:interfaces:1.0">
-          <u-plane-marking>38</u-plane-marking>
-          <c-plane-marking>16</c-plane-marking>
-          <s-plane-marking>62</s-plane-marking>
-          <other-marking>27</other-marking>
-          <enhanced-uplane-markings>
-            <up-marking-name>X5f0ExbIx4jg5fpd9c0wiOEJbCXzpYxe3M7AkiaRnlZsAgxCsx0LlFmwhk6yavM5iTFu4Idr3cTwtj0NQ0ycFVAO7ymh41meM2IQCNhFZ33km30c4ygJlRqshMJlFYrsS1iuOs1Gv5SJ8SNcr4WENm740IiyGJ0qLaUrCW7Z10A9SombsaQ7oPboptWYdOoQRjhl7hl8hV91bv5vxNCVuOcTh0RmP84Grm1qD</up-marking-name>
-            <enhanced-marking>21</enhanced-marking>
-          </enhanced-uplane-markings>
-          <enhanced-uplane-markings>
-            <up-marking-name>2zF55KBup</up-marking-name>
-            <enhanced-marking>5</enhanced-marking>
-          </enhanced-uplane-markings>
-        </diffserv-markings>
-      </ipv4>
-      <ipv6 xmlns="urn:ietf:params:xml:ns:yang:ietf-ip">
-        <enabled>true</enabled>
-        <forwarding>true</forwarding>
-        <mtu>1163652863</mtu>
-        <address>
-          <ip>ea87:d264:da5e:5b19:4713:7266:f91e:14f7</ip>
-          <prefix-length>124</prefix-length>
-        </address>
-        <address>
-          <ip>2853:6b9:c531:f3c1:6875:f55:17ea:157b</ip>
-          <prefix-length>65</prefix-length>
-        </address>
-        <neighbor>
-          <ip>e6ae:4eeb:25c8:4ce6:9a7:5c2c:4293:f42e</ip>
-          <link-layer-address>65:58:a4:47:f1:91</link-layer-address>
-        </neighbor>
-        <neighbor>
-          <ip>f88d:e8e9:8f68:ff46:ae1a:8329:67bc:bd6f</ip>
-          <link-layer-address>32:d7:a9:c1:37:14</link-layer-address>
-        </neighbor>
-        <dup-addr-detect-transmits>1225514618</dup-addr-detect-transmits>
-        <autoconf>
-          <create-global-addresses>true</create-global-addresses>
-          <create-temporary-addresses>true</create-temporary-addresses>
-          <temporary-valid-lifetime>2335597472</temporary-valid-lifetime>
-          <temporary-preferred-lifetime>922813230</temporary-preferred-lifetime>
-        </autoconf>
-        <m-plane-marking xmlns="urn:o-ran:interfaces:1.0">33</m-plane-marking>
-        <diffserv-markings xmlns="urn:o-ran:interfaces:1.0">
-          <u-plane-marking>29</u-plane-marking>
-          <c-plane-marking>50</c-plane-marking>
-          <s-plane-marking>14</s-plane-marking>
-          <other-marking>61</other-marking>
-          <enhanced-uplane-markings>
-            <up-marking-name>8iROcw05EJqk0qe08RerP</up-marking-name>
-            <enhanced-marking>18</enhanced-marking>
-          </enhanced-uplane-markings>
-          <enhanced-uplane-markings>
-            <up-marking-name>M14steKtoB9s09xEKPYLf4LfWZHDetPSuUkP05bgykIym746WUR3ZCjVuSqIlgAI2Nx2KIiaV0Bh7xnVs7YjB965TwF7E8PGVeAxPSHKKaTJI8w2fnlRwjWqPuxmCe2xsDWhnvT0GMBoV8i2vDTTOIbvcAROOUd9p9qMEcEcYgsLgKODfzw3hAzlaq9Zce8BfqgUCUYt2r6abMNrmcuDMVZWm0Nq7N2m6a8IW73Zy21BOP2aTpGxkxlyp9ZwO</up-marking-name>
-            <enhanced-marking>29</enhanced-marking>
-          </enhanced-uplane-markings>
-        </diffserv-markings>
-      </ipv6>
-      <alias-macs xmlns="urn:o-ran:interfaces:1.0">b2:24:6a:90:68:bb</alias-macs>
-      <alias-macs xmlns="urn:o-ran:interfaces:1.0">ba:33:50:5b:58:f7</alias-macs>
-      <mac-address xmlns="urn:o-ran:interfaces:1.0">2c:2b:1f:8c:3f:a2</mac-address>
-      <port-reference xmlns="urn:o-ran:interfaces:1.0">
-        <port-number>113</port-number>
-      </port-reference>
-      <l2-mtu xmlns="urn:o-ran:interfaces:1.0">60489</l2-mtu>
-      <vlan-tagging xmlns="urn:o-ran:interfaces:1.0">true</vlan-tagging>
-      <class-of-service xmlns="urn:o-ran:interfaces:1.0">
-        <u-plane-marking>3</u-plane-marking>
-        <c-plane-marking>0</c-plane-marking>
-        <m-plane-marking>1</m-plane-marking>
-        <s-plane-marking>6</s-plane-marking>
-        <other-marking>4</other-marking>
-        <enhanced-uplane-markings>
-          <up-marking-name>dtSbiQU8fgixwU6tOQNLIc1PPuz2LFeQ862rPWr44JtAvzVbi</up-marking-name>
-          <enhanced-marking>5</enhanced-marking>
-        </enhanced-uplane-markings>
-        <enhanced-uplane-markings>
-          <up-marking-name>MQHBk8vYNCGOII7pwymAaP2xhPJrxxjcn1NA9bqPN6D</up-marking-name>
-          <enhanced-marking>2</enhanced-marking>
-        </enhanced-uplane-markings>
-      </class-of-service>
-    </interface>
-  </interfaces>
diff --git a/solution/network/ntsim-ng-o-ru/o-ru-11221/nts-network-function-running.xml b/solution/network/ntsim-ng-o-ru/o-ru-11221/nts-network-function-running.xml
deleted file mode 100644
index 7e558f2..0000000
--- a/solution/network/ntsim-ng-o-ru/o-ru-11221/nts-network-function-running.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<simulation xmlns="urn:o-ran-sc:params:xml:ns:yang:nts:network:function">
-    <network-function>
-      <mount-point-addressing-method>docker-mapping</mount-point-addressing-method>
-      <fault-generation>
-        <fault-delay-list>
-          <index>0</index>
-          <delay-period>10</delay-period>
-        </fault-delay-list>
-      </fault-generation>
-      <netconf>
-        <faults-enabled>true</faults-enabled>
-        <call-home>true</call-home>
-      </netconf>
-      <ves>
-        <faults-enabled>false</faults-enabled>
-        <pnf-registration>false</pnf-registration>
-        <heartbeat-period>120</heartbeat-period>
-      </ves>
-      <function-type>NTS_FUNCTION_TYPE_O_RAN_O_RU_FH</function-type>
-    </network-function>
-  </simulation>
\ No newline at end of file
diff --git a/solution/network/ntsim-ng-o-ru/o-ru-11222/config.json b/solution/network/ntsim-ng-o-ru/o-ru-11222/config.json
deleted file mode 100644
index 76ede7a..0000000
--- a/solution/network/ntsim-ng-o-ru/o-ru-11222/config.json
+++ /dev/null
@@ -1,135 +0,0 @@
-{
-    "container-rules": {
-        "excluded-modules": [],
-        "excluded-features": []
-    },
-
-    "supervisor-rules": {
-        "netopeer": {
-            "path": "/usr/local/bin/netopeer2-server",
-            "args": ["-d", "-v2"],
-            "autorestart": true,
-            "stdout": "log/netopeer-stdout.log",
-            "stderr": "log/netopeer-stderr.log"
-        },
-
-        "ntsim-network-function": {
-            "path": "/opt/dev/ntsim-ng/ntsim-ng",
-            "args": ["-w/opt/dev/ntsim-ng", "-f"],
-            "nomanual": true
-        }
-    },
-
-    "datastore-random-generation-rules" : {
-        "excluded-modules": [
-            "sysrepo",
-            "sysrepo-monitoring",
-            "ietf-yang-library",
-            "ietf-netconf-acm",
-            "ietf-netconf-monitoring",
-            "nc-notifications",
-            "ietf-keystore",
-            "ietf-truststore",
-            "ietf-system",
-            "ietf-netconf-server",
-            "ietf-alarms",
-            "ietf-network-instance",
-            "ietf-restconf",
-            "ietf-yang-schema-mount",
-            "ietf-subscribed-notifications",
-            "o-ran-uplane-conf",
-            "o-ran-performance-management",
-            "o-ran-transceiver",
-            "o-ran-mplane-int",
-            "o-ran-processing-element",
-            "o-ran-shared-cell",
-            "nts-network-function"
-        ],
-
-        "default-list-instances": 2,
-        "custom-list-instances" : [
-            {"/ietf-interfaces:interfaces/interface": 4}
-
-        ],
-
-        "restrict-schema": [
-            {"/ietf-interfaces:interfaces/interface/type": ["iana-if-type:ethernetCsmacd"]}
-        ]
-
-    },
-
-    "datastore-populate-rules": {
-        "random-generation-enabled": false,
-
-        "pre-generated-operational-data": [
-            "../deploy/data/ietf-hardware-operational.json",
-            "../deploy/data/ietf-interfaces-operational.xml"
-        ],
-        "pre-generated-running-data": [
-            "../deploy/data/ietf-hardware-running.json",
-            "../deploy/data/ietf-interfaces-running.xml"
-        ]
-    },
-
-    "fault-rules" : {
-        "yang-notif-template" : "<alarm-notif xmlns=\"urn:o-ran:fm:1.0\"><fault-id>%%fault-id%%</fault-id><fault-source>%%object%%</fault-source><affected-objects><name>%%affected-object%%</name></affected-objects><fault-severity>%%fault-severity%%</fault-severity><is-cleared>%%cleared%%</is-cleared><fault-text>%%text%%</fault-text><event-time>%%date-time%%</event-time></alarm-notif>",
-        "choosing-method" : "linear",
-        "faults" : [
-            {
-                "condition" : "Interface Fault",
-                "object"    : "09a95e08-5b53-4734-815f-a9c12300fc62",
-                "severity"  : "CRITICAL",
-                "date-time" : "$$time$$",
-                "specific-problem" : "Interface Fault",
-
-                "fault-id": "30",
-                "fault-severity" : "CRITICAL",
-                "affected-object" : "$$hostname$$",
-                "cleared" : "false",
-                "text" : "Interface Fault"
-            },
-
-            {
-                "condition" : "Interface Fault",
-                "object"    : "09a95e08-5b53-4734-815f-a9c12300fc62",
-                "severity"  : "NORMAL",
-                "date-time" : "$$time$$",
-                "specific-problem" : "Interface Fault",
-
-                "fault-id": "30",
-                "fault-severity" : "CRITICAL",
-                "affected-object" : "$$hostname$$",
-                "cleared" : "true",
-                "text" : "Interface Fault"
-            },
-
-            {
-                "condition" : "C/U-plane logical Connection faulty",
-                "object"    : "09a95e08-5b53-4734-815f-a9c12300fc62",
-                "severity"  : "CRITICAL",
-                "date-time" : "$$time$$",
-                "specific-problem" : "C/U-plane logical Connection faulty",
-
-                "fault-id": "28",
-                "fault-severity" : "CRITICAL",
-                "affected-object" : "$$hostname$$",
-                "cleared" : "false",
-                "text" : "C/U-plane logical Connection faulty"
-            },
-
-            {
-                "condition" : "C/U-plane logical Connection faulty",
-                "object"    : "09a95e08-5b53-4734-815f-a9c12300fc62",
-                "severity"  : "NORMAL",
-                "date-time" : "$$time$$",
-                "specific-problem" : "C/U-plane logical Connection faulty",
-
-                "fault-id": "28",
-                "fault-severity" : "CRITICAL",
-                "affected-object" : "$$hostname$$",
-                "cleared" : "true",
-                "text" : "C/U-plane logical Connection faulty"
-            }
-        ]
-    }
-}
diff --git a/solution/network/ntsim-ng-o-ru/o-ru-11222/ietf-hardware-operational.json b/solution/network/ntsim-ng-o-ru/o-ru-11222/ietf-hardware-operational.json
deleted file mode 100644
index b0a474c..0000000
--- a/solution/network/ntsim-ng-o-ru/o-ru-11222/ietf-hardware-operational.json
+++ /dev/null
@@ -1,442 +0,0 @@
-{
-  "ietf-hardware:hardware": {
-    "component": [
-      {
-        "name": "chassis-temperature-exhaust",
-        "alias": "chassis-temperature-exhaust",
-        "sensor-data": {
-          "value": 30,
-          "value-type": "celsius",
-          "oper-status": "ok",
-          "value-timestamp": "2021-03-18T19:51:50.3Z"
-        },
-        "class": "iana-hardware:sensor",
-        "state": {
-          "oper-state": "enabled",
-          "admin-state": "locked"
-        },
-        "parent-rel-pos": 0,
-        "parent": "chassis"
-      },
-      {
-        "name": "slot2-logical2",
-        "alias": "Slot3-B",
-        "description": "SLOT3-B",
-        "class": "iana-hardware:module",
-        "state": {
-          "oper-state": "disabled",
-          "admin-state": "unlocked"
-        },
-        "parent-rel-pos": 3,
-        "parent": "slot2"
-      },
-      {
-        "name": "chassis-temperature-inlet",
-        "alias": "chassis-temperature-inlet",
-        "sensor-data": {
-          "value": 29,
-          "value-type": "celsius",
-          "oper-status": "ok",
-          "value-timestamp": "2021-03-18T19:51:50.3Z"
-        },
-        "class": "iana-hardware:sensor",
-        "state": {
-          "oper-state": "enabled",
-          "admin-state": "locked"
-        },
-        "parent-rel-pos": 1,
-        "parent": "chassis"
-      },
-      {
-        "name": "slot0-logical0-rrh",
-        "alias": "Slot0-A-rrh",
-        "class": "iana-hardware:port",
-        "contains-child": [
-          "slot0-logical0-rrh-temperature"
-        ],
-        "o-ran-hardware:o-ran-name": "slot0-logical0-rrh",
-        "state": {
-          "oper-state": "enabled",
-          "admin-state": "locked"
-        },
-        "serial-num": "AGNF714S",
-        "mfg-name": "ACME GMBH.",
-        "parent-rel-pos": 1,
-        "parent": "slot0-logical0",
-        "model-name": "ANSHEONXH-E7"
-      },
-      {
-        "name": "chassis-fan1",
-        "alias": "chassis-fan1",
-        "class": "iana-hardware:fan",
-        "contains-child": [
-          "chassis-fan1-speed"
-        ],
-        "state": {
-          "oper-state": "enabled",
-          "admin-state": "locked"
-        },
-        "parent-rel-pos": 3,
-        "parent": "chassis"
-      },
-      {
-        "name": "chassis-fan3-speed",
-        "alias": "chassis-fan3-speed",
-        "sensor-data": {
-          "value": 1000,
-          "value-type": "rpm",
-          "oper-status": "ok",
-          "value-timestamp": "2021-03-18T19:51:50.3Z"
-        },
-        "class": "iana-hardware:sensor",
-        "state": {
-          "oper-state": "enabled",
-          "admin-state": "locked"
-        },
-        "parent-rel-pos": 0,
-        "parent": "chassis-fan3"
-      },
-      {
-        "name": "slot0-logical1",
-        "alias": "Slot0-B",
-        "description": "SLOT0-B",
-        "class": "iana-hardware:module",
-        "state": {
-          "oper-state": "disabled",
-          "admin-state": "unlocked"
-        },
-        "parent-rel-pos": 2,
-        "parent": "slot0"
-      },
-      {
-        "name": "chassis-fan0",
-        "alias": "chassis-fan0",
-        "class": "iana-hardware:fan",
-        "contains-child": [
-          "chassis-fan0-speed"
-        ],
-        "state": {
-          "oper-state": "enabled",
-          "admin-state": "locked"
-        },
-        "parent-rel-pos": 2,
-        "parent": "chassis"
-      },
-      {
-        "name": "slot0-logical0",
-        "alias": "Slot0-A",
-        "description": "SLOT0-AZ",
-        "class": "iana-hardware:module",
-        "contains-child": [
-          "slot0-logical0-bbu",
-          "slot0-logical0-rrh"
-        ],
-        "state": {
-          "oper-state": "enabled",
-          "admin-state": "unlocked"
-        },
-        "parent-rel-pos": 1,
-        "parent": "slot0"
-      },
-      {
-        "name": "chassis",
-        "alias": "chassis",
-        "description": "O-RAN O-RU O1 Simulator",
-        "class": "iana-hardware:chassis",
-        "contains-child": [
-          "cpu",
-          "chassis-temperature-inlet",
-          "chassis-temperature-exhaust",
-          "chassis-fan1",
-          "slot0",
-          "chassis-fan2",
-          "chassis-fan3",
-          "slot2",
-          "chassis-fan0"
-        ],
-        "state": {
-          "oper-state": "enabled",
-          "admin-state": "unlocked"
-        },
-        "serial-num": "23412",
-        "mfg-name": "NTS",
-        "software-rev": "3.8.1 (2029-10-30 11:47:59)",
-        "model-name": "O1-O-RU-Simulator"
-      },
-      {
-        "name": "slot0-logical2",
-        "alias": "Slot0-C",
-        "description": "SLOT0-C",
-        "class": "iana-hardware:module",
-        "state": {
-          "oper-state": "disabled",
-          "admin-state": "unlocked"
-        },
-        "parent-rel-pos": 3,
-        "parent": "slot0"
-      },
-      {
-        "name": "slot0-logical0-bbu-temperature",
-        "alias": "Slot0-A-bbu-temperature",
-        "sensor-data": {
-          "value": 37,
-          "value-type": "celsius",
-          "oper-status": "ok",
-          "value-timestamp": "2021-03-18T19:51:50.3Z"
-        },
-        "class": "iana-hardware:sensor",
-        "state": {
-          "oper-state": "enabled",
-          "admin-state": "locked"
-        },
-        "parent-rel-pos": 0,
-        "parent": "slot0-logical0-bbu"
-      },
-      {
-        "name": "chassis-fan3",
-        "alias": "chassis-fan3",
-        "class": "iana-hardware:fan",
-        "contains-child": [
-          "chassis-fan3-speed"
-        ],
-        "state": {
-          "oper-state": "enabled",
-          "admin-state": "locked"
-        },
-        "parent-rel-pos": 5,
-        "parent": "chassis"
-      },
-      {
-        "name": "chassis-fan2",
-        "alias": "chassis-fan2",
-        "class": "iana-hardware:fan",
-        "contains-child": [
-          "chassis-fan2-speed"
-        ],
-        "state": {
-          "oper-state": "enabled",
-          "admin-state": "locked"
-        },
-        "parent-rel-pos": 4,
-        "parent": "chassis"
-      },
-      {
-        "name": "cpu-temperature",
-        "alias": "cpu-temperature",
-        "sensor-data": {
-          "value": 30,
-          "value-type": "celsius",
-          "oper-status": "ok",
-          "value-timestamp": "2021-03-18T19:51:50.3Z"
-        },
-        "class": "iana-hardware:sensor",
-        "state": {
-          "oper-state": "enabled",
-          "admin-state": "locked"
-        },
-        "parent-rel-pos": 0,
-        "parent": "cpu"
-      },
-      {
-        "name": "slot2-logical0",
-        "alias": "Slot2-C",
-        "description": "SLOT2-C",
-        "class": "iana-hardware:module",
-        "state": {
-          "oper-state": "disabled",
-          "admin-state": "unlocked"
-        },
-        "parent-rel-pos": 1,
-        "parent": "slot2"
-      },
-      {
-        "name": "slot2-logical1",
-        "alias": "Slot3-A",
-        "description": "SLOT3-A",
-        "class": "iana-hardware:module",
-        "state": {
-          "oper-state": "disabled",
-          "admin-state": "unlocked"
-        },
-        "parent-rel-pos": 2,
-        "parent": "slot2"
-      },
-      {
-        "name": "slot0-logical0-bbu",
-        "alias": "Slot0-A-bbu",
-        "class": "iana-hardware:port",
-        "contains-child": [
-          "slot0-logical0-bbu-temperature"
-        ],
-        "o-ran-hardware:o-ran-name": "slot0-logical0-bbu",
-        "state": {
-          "oper-state": "enabled",
-          "admin-state": "unlocked"
-        },
-        "serial-num": "AGNN214S",
-        "mfg-name": "ACME GMBH.",
-        "parent-rel-pos": 0,
-        "parent": "slot0-logical0",
-        "model-name": "ANSHEONXH-E7"
-      },
-      {
-        "name": "chassis-fan1-speed",
-        "alias": "chassis-fan1-speed",
-        "sensor-data": {
-          "value": 4100,
-          "value-type": "rpm",
-          "oper-status": "ok",
-          "value-timestamp": "2021-03-18T19:51:50.3Z"
-        },
-        "class": "iana-hardware:sensor",
-        "state": {
-          "oper-state": "enabled",
-          "admin-state": "locked"
-        },
-        "parent-rel-pos": 0,
-        "parent": "chassis-fan1"
-      },
-      {
-        "name": "chassis-fan0-speed",
-        "alias": "chassis-fan0-speed",
-        "sensor-data": {
-          "value": 4100,
-          "value-type": "rpm",
-          "oper-status": "ok",
-          "value-timestamp": "2021-03-18T19:51:50.3Z"
-        },
-        "class": "iana-hardware:sensor",
-        "state": {
-          "oper-state": "enabled",
-          "admin-state": "locked"
-        },
-        "parent-rel-pos": 0,
-        "parent": "chassis-fan0"
-      },
-      {
-        "name": "slot0",
-        "alias": "slot0",
-        "class": "iana-hardware:module",
-        "contains-child": [
-          "slot0-logical1",
-          "slot0-logical2",
-          "slot0-logical0",
-          "slot0-temperature"
-        ],
-        "state": {
-          "oper-state": "enabled",
-          "admin-state": "unlocked"
-        },
-        "serial-num": "7220530",
-        "parent-rel-pos": 7,
-        "software-rev": "0",
-        "parent": "chassis",
-        "firmware-rev": "12.00.42-S (0F7F1001)",
-        "model-name": "385A-SFP-2P-40-FHL-JC3"
-      },
-      {
-        "name": "slot2",
-        "alias": "slot2",
-        "class": "iana-hardware:module",
-        "contains-child": [
-          "slot2-temperature",
-          "slot2-logical0",
-          "slot2-logical2",
-          "slot2-logical1"
-        ],
-        "state": {
-          "oper-state": "enabled",
-          "admin-state": "unlocked"
-        },
-        "serial-num": "2522642",
-        "parent-rel-pos": 9,
-        "software-rev": "0",
-        "parent": "chassis",
-        "firmware-rev": "12.00.42-S (0F7F1001)",
-        "model-name": "339B-SFP-2P-75-FHL-JC3"
-      },
-      {
-        "name": "slot0-logical0-rrh-temperature",
-        "alias": "Slot0-A-rrh-temperature",
-        "sensor-data": {
-          "value": 35,
-          "value-type": "celsius",
-          "oper-status": "ok",
-          "value-timestamp": "2021-03-18T19:51:50.3Z"
-        },
-        "class": "iana-hardware:sensor",
-        "state": {
-          "oper-state": "enabled",
-          "admin-state": "locked"
-        },
-        "parent-rel-pos": 0,
-        "parent": "slot0-logical0-rrh"
-      },
-      {
-        "name": "slot0-temperature",
-        "alias": "slot0-temperature",
-        "sensor-data": {
-          "value": 51,
-          "value-type": "celsius",
-          "oper-status": "ok",
-          "value-timestamp": "2021-03-18T19:51:50.3Z"
-        },
-        "class": "iana-hardware:sensor",
-        "state": {
-          "oper-state": "enabled",
-          "admin-state": "locked"
-        },
-        "parent-rel-pos": 0,
-        "parent": "slot0"
-      },
-      {
-        "name": "cpu",
-        "alias": "cpu",
-        "class": "iana-hardware:cpu",
-        "contains-child": [
-          "cpu-temperature"
-        ],
-        "state": {
-          "oper-state": "enabled",
-          "admin-state": "locked"
-        },
-        "parent-rel-pos": 6,
-        "parent": "chassis"
-      },
-      {
-        "name": "chassis-fan2-speed",
-        "alias": "chassis-fan2-speed",
-        "sensor-data": {
-          "value": 4100,
-          "value-type": "rpm",
-          "oper-status": "ok",
-          "value-timestamp": "2021-03-18T19:51:50.3Z"
-        },
-        "class": "iana-hardware:sensor",
-        "state": {
-          "oper-state": "enabled",
-          "admin-state": "locked"
-        },
-        "parent-rel-pos": 0,
-        "parent": "chassis-fan2"
-      },
-      {
-        "name": "slot2-temperature",
-        "alias": "slot2-temperature",
-        "sensor-data": {
-          "value": 49,
-          "value-type": "celsius",
-          "oper-status": "ok",
-          "value-timestamp": "2021-03-18T19:51:50.3Z"
-        },
-        "class": "iana-hardware:sensor",
-        "state": {
-          "oper-state": "enabled",
-          "admin-state": "locked"
-        },
-        "parent-rel-pos": 0,
-        "parent": "slot2"
-      }
-    ]
-  }
-}
diff --git a/solution/network/ntsim-ng-o-ru/o-ru-11222/ietf-hardware-running.json b/solution/network/ntsim-ng-o-ru/o-ru-11222/ietf-hardware-running.json
deleted file mode 100644
index 4800c35..0000000
--- a/solution/network/ntsim-ng-o-ru/o-ru-11222/ietf-hardware-running.json
+++ /dev/null
@@ -1,276 +0,0 @@
-{
-  "ietf-hardware:hardware": {
-    "component": [
-      {
-        "name": "chassis-temperature-exhaust",
-        "alias": "chassis-temperature-exhaust",
-        "class": "iana-hardware:sensor",
-        "state": {
-          "admin-state": "locked"
-        },
-        "parent-rel-pos": 0,
-        "parent": "chassis"
-      },
-      {
-        "name": "slot2-logical2",
-        "alias": "Slot3-B",
-        "class": "iana-hardware:module",
-        "state": {
-          "admin-state": "unlocked"
-        },
-        "parent-rel-pos": 3,
-        "parent": "slot2"
-      },
-      {
-        "name": "chassis-temperature-inlet",
-        "alias": "chassis-temperature-inlet",
-        "class": "iana-hardware:sensor",
-        "state": {
-          "admin-state": "locked"
-        },
-        "parent-rel-pos": 1,
-        "parent": "chassis"
-      },
-      {
-        "name": "slot0-logical0-rrh",
-        "alias": "Slot0-A-rrh",
-        "class": "iana-hardware:port",
-        "o-ran-hardware:o-ran-name": "slot0-logical0-rrh",
-        "state": {
-          "admin-state": "locked"
-        },
-        "parent-rel-pos": 1,
-        "parent": "slot0-logical0"
-      },
-      {
-        "name": "chassis-fan1",
-        "alias": "chassis-fan1",
-        "class": "iana-hardware:fan",
-        "state": {
-          "admin-state": "locked"
-        },
-        "parent-rel-pos": 3,
-        "parent": "chassis"
-      },
-      {
-        "name": "chassis-fan3-speed",
-        "alias": "chassis-fan3-speed",
-        "class": "iana-hardware:sensor",
-        "state": {
-          "admin-state": "locked"
-        },
-        "parent-rel-pos": 0,
-        "parent": "chassis-fan3"
-      },
-      {
-        "name": "slot0-logical1",
-        "alias": "Slot0-B",
-        "class": "iana-hardware:module",
-        "state": {
-          "admin-state": "unlocked"
-        },
-        "parent-rel-pos": 2,
-        "parent": "slot0"
-      },
-      {
-        "name": "chassis-fan0",
-        "alias": "chassis-fan0",
-        "class": "iana-hardware:fan",
-        "state": {
-          "admin-state": "locked"
-        },
-        "parent-rel-pos": 2,
-        "parent": "chassis"
-      },
-      {
-        "name": "slot0-logical0",
-        "alias": "Slot0-A",
-        "class": "iana-hardware:module",
-        "state": {
-          "admin-state": "unlocked"
-        },
-        "parent-rel-pos": 1,
-        "parent": "slot0"
-      },
-      {
-        "name": "chassis",
-        "alias": "chassis",
-        "class": "iana-hardware:chassis",
-        "state": {
-          "admin-state": "unlocked"
-        }
-      },
-      {
-        "name": "slot0-logical2",
-        "alias": "Slot0-C",
-        "class": "iana-hardware:module",
-        "state": {
-          "admin-state": "unlocked"
-        },
-        "parent-rel-pos": 3,
-        "parent": "slot0"
-      },
-      {
-        "name": "slot0-logical0-bbu-temperature",
-        "alias": "Slot0-A-bbu-temperature",
-        "class": "iana-hardware:sensor",
-        "state": {
-          "admin-state": "locked"
-        },
-        "parent-rel-pos": 0,
-        "parent": "slot0-logical0-bbu"
-      },
-      {
-        "name": "chassis-fan3",
-        "alias": "chassis-fan3",
-        "class": "iana-hardware:fan",
-        "state": {
-          "admin-state": "locked"
-        },
-        "parent-rel-pos": 5,
-        "parent": "chassis"
-      },
-      {
-        "name": "chassis-fan2",
-        "alias": "chassis-fan2",
-        "class": "iana-hardware:fan",
-        "state": {
-          "admin-state": "locked"
-        },
-        "parent-rel-pos": 4,
-        "parent": "chassis"
-      },
-      {
-        "name": "cpu-temperature",
-        "alias": "cpu-temperature",
-        "class": "iana-hardware:sensor",
-        "state": {
-          "admin-state": "locked"
-        },
-        "parent-rel-pos": 0,
-        "parent": "cpu"
-      },
-      {
-        "name": "slot2-logical0",
-        "alias": "Slot2-C",
-        "class": "iana-hardware:module",
-        "state": {
-          "admin-state": "unlocked"
-        },
-        "parent-rel-pos": 1,
-        "parent": "slot2"
-      },
-      {
-        "name": "slot2-logical1",
-        "alias": "Slot3-A",
-        "class": "iana-hardware:module",
-        "state": {
-          "admin-state": "unlocked"
-        },
-        "parent-rel-pos": 2,
-        "parent": "slot2"
-      },
-      {
-        "name": "slot0-logical0-bbu",
-        "alias": "Slot0-A-bbu",
-        "class": "iana-hardware:port",
-        "o-ran-hardware:o-ran-name": "slot0-logical0-bbu",
-        "state": {
-          "admin-state": "unlocked"
-        },
-        "parent-rel-pos": 0,
-        "parent": "slot0-logical0"
-      },
-      {
-        "name": "chassis-fan1-speed",
-        "alias": "chassis-fan1-speed",
-        "class": "iana-hardware:sensor",
-        "state": {
-          "admin-state": "locked"
-        },
-        "parent-rel-pos": 0,
-        "parent": "chassis-fan1"
-      },
-      {
-        "name": "chassis-fan0-speed",
-        "alias": "chassis-fan0-speed",
-        "class": "iana-hardware:sensor",
-        "state": {
-          "admin-state": "locked"
-        },
-        "parent-rel-pos": 0,
-        "parent": "chassis-fan0"
-      },
-      {
-        "name": "slot0",
-        "alias": "slot0",
-        "class": "iana-hardware:module",
-        "state": {
-          "admin-state": "unlocked"
-        },
-        "parent-rel-pos": 7,
-        "parent": "chassis"
-      },
-      {
-        "name": "slot2",
-        "alias": "slot2",
-        "class": "iana-hardware:module",
-        "state": {
-          "admin-state": "unlocked"
-        },
-        "parent-rel-pos": 9,
-        "parent": "chassis"
-      },
-      {
-        "name": "slot0-logical0-rrh-temperature",
-        "alias": "Slot0-A-rrh-temperature",
-        "class": "iana-hardware:sensor",
-        "state": {
-          "admin-state": "locked"
-        },
-        "parent-rel-pos": 0,
-        "parent": "slot0-logical0-rrh"
-      },
-      {
-        "name": "slot0-temperature",
-        "alias": "slot0-temperature",
-        "class": "iana-hardware:sensor",
-        "state": {
-          "admin-state": "locked"
-        },
-        "parent-rel-pos": 0,
-        "parent": "slot0"
-      },
-      {
-        "name": "cpu",
-        "alias": "cpu",
-        "class": "iana-hardware:cpu",
-        "state": {
-          "admin-state": "locked"
-        },
-        "parent-rel-pos": 6,
-        "parent": "chassis"
-      },
-      {
-        "name": "chassis-fan2-speed",
-        "alias": "chassis-fan2-speed",
-        "class": "iana-hardware:sensor",
-        "state": {
-          "admin-state": "locked"
-        },
-        "parent-rel-pos": 0,
-        "parent": "chassis-fan2"
-      },
-      {
-        "name": "slot2-temperature",
-        "alias": "slot2-temperature",
-        "class": "iana-hardware:sensor",
-        "state": {
-          "admin-state": "locked"
-        },
-        "parent-rel-pos": 0,
-        "parent": "slot2"
-      }
-    ]
-  }
-}
diff --git a/solution/network/ntsim-ng-o-ru/o-ru-11222/ietf-interfaces-operational.xml b/solution/network/ntsim-ng-o-ru/o-ru-11222/ietf-interfaces-operational.xml
deleted file mode 100644
index 11f4d8d..0000000
--- a/solution/network/ntsim-ng-o-ru/o-ru-11222/ietf-interfaces-operational.xml
+++ /dev/null
@@ -1,151 +0,0 @@
-  <interfaces xmlns="urn:ietf:params:xml:ns:yang:ietf-interfaces">
-    <interface>
-      <name>0d242150-33a6-4e7c-9988-ae3b01e8a7ea</name>
-      <description>Simulated interface for O-RU</description>
-      <type xmlns:ianaift="urn:ietf:params:xml:ns:yang:iana-if-type">ianaift:ethernetCsmacd</type>
-      <enabled>true</enabled>
-      <link-up-down-trap-enable>disabled</link-up-down-trap-enable>
-      <ipv4 xmlns="urn:ietf:params:xml:ns:yang:ietf-ip">
-        <enabled>false</enabled>
-        <forwarding>false</forwarding>
-        <mtu>42783</mtu>
-        <address>
-          <ip>6.122.172.49</ip>
-          <prefix-length>14</prefix-length>
-          <origin>static</origin>
-        </address>
-        <address>
-          <ip>206.35.59.57</ip>
-          <netmask>199.41.255.188</netmask>
-          <origin>random</origin>
-        </address>
-        <neighbor>
-          <ip>48.159.72.129</ip>
-          <link-layer-address>42:8f:12:23:03:d3</link-layer-address>
-          <origin>other</origin>
-        </neighbor>
-        <neighbor>
-          <ip>187.230.45.63</ip>
-          <link-layer-address>77:b5:38:45:08:be</link-layer-address>
-          <origin>dynamic</origin>
-        </neighbor>
-        <m-plane-marking xmlns="urn:o-ran:interfaces:1.0">13</m-plane-marking>
-        <diffserv-markings xmlns="urn:o-ran:interfaces:1.0">
-          <u-plane-marking>38</u-plane-marking>
-          <c-plane-marking>16</c-plane-marking>
-          <s-plane-marking>62</s-plane-marking>
-          <other-marking>27</other-marking>
-          <enhanced-uplane-markings>
-            <up-marking-name>X5f0ExbIx4jg5fpd9c0wiOEJbCXzpYxe3M7AkiaRnlZsAgxCsx0LlFmwhk6yavM5iTFu4Idr3cTwtj0NQ0ycFVAO7ymh41meM2IQCNhFZ33km30c4ygJlRqshMJlFYrsS1iuOs1Gv5SJ8SNcr4WENm740IiyGJ0qLaUrCW7Z10A9SombsaQ7oPboptWYdOoQRjhl7hl8hV91bv5vxNCVuOcTh0RmP84Grm1qD</up-marking-name>
-            <enhanced-marking>21</enhanced-marking>
-          </enhanced-uplane-markings>
-          <enhanced-uplane-markings>
-            <up-marking-name>2zF55KBup</up-marking-name>
-            <enhanced-marking>5</enhanced-marking>
-          </enhanced-uplane-markings>
-        </diffserv-markings>
-      </ipv4>
-      <ipv6 xmlns="urn:ietf:params:xml:ns:yang:ietf-ip">
-        <enabled>true</enabled>
-        <forwarding>true</forwarding>
-        <mtu>1163652863</mtu>
-        <address>
-          <ip>ea87:d264:da5e:5b19:4713:7266:f91e:14f7</ip>
-          <prefix-length>124</prefix-length>
-          <origin>other</origin>
-          <status>tentative</status>
-        </address>
-        <address>
-          <ip>2853:6b9:c531:f3c1:6875:f55:17ea:157b</ip>
-          <prefix-length>65</prefix-length>
-          <origin>link-layer</origin>
-          <status>preferred</status>
-        </address>
-        <neighbor>
-          <ip>e6ae:4eeb:25c8:4ce6:9a7:5c2c:4293:f42e</ip>
-          <link-layer-address>65:58:a4:47:f1:91</link-layer-address>
-          <origin>other</origin>
-          <is-router/>
-          <state>probe</state>
-        </neighbor>
-        <neighbor>
-          <ip>f88d:e8e9:8f68:ff46:ae1a:8329:67bc:bd6f</ip>
-          <link-layer-address>32:d7:a9:c1:37:14</link-layer-address>
-          <origin>other</origin>
-          <state>incomplete</state>
-        </neighbor>
-        <dup-addr-detect-transmits>1225514618</dup-addr-detect-transmits>
-        <autoconf>
-          <create-global-addresses>true</create-global-addresses>
-          <create-temporary-addresses>true</create-temporary-addresses>
-          <temporary-valid-lifetime>2335597472</temporary-valid-lifetime>
-          <temporary-preferred-lifetime>922813230</temporary-preferred-lifetime>
-        </autoconf>
-        <m-plane-marking xmlns="urn:o-ran:interfaces:1.0">33</m-plane-marking>
-        <diffserv-markings xmlns="urn:o-ran:interfaces:1.0">
-          <u-plane-marking>29</u-plane-marking>
-          <c-plane-marking>50</c-plane-marking>
-          <s-plane-marking>14</s-plane-marking>
-          <other-marking>61</other-marking>
-          <enhanced-uplane-markings>
-            <up-marking-name>8iROcw05EJqk0qe08RerP</up-marking-name>
-            <enhanced-marking>18</enhanced-marking>
-          </enhanced-uplane-markings>
-          <enhanced-uplane-markings>
-            <up-marking-name>M14steKtoB9s09xEKPYLf4LfWZHDetPSuUkP05bgykIym746WUR3ZCjVuSqIlgAI2Nx2KIiaV0Bh7xnVs7YjB965TwF7E8PGVeAxPSHKKaTJI8w2fnlRwjWqPuxmCe2xsDWhnvT0GMBoV8i2vDTTOIbvcAROOUd9p9qMEcEcYgsLgKODfzw3hAzlaq9Zce8BfqgUCUYt2r6abMNrmcuDMVZWm0Nq7N2m6a8IW73Zy21BOP2aTpGxkxlyp9ZwO</up-marking-name>
-            <enhanced-marking>29</enhanced-marking>
-          </enhanced-uplane-markings>
-        </diffserv-markings>
-      </ipv6>
-      <alias-macs xmlns="urn:o-ran:interfaces:1.0">b2:24:6a:90:68:bb</alias-macs>
-      <alias-macs xmlns="urn:o-ran:interfaces:1.0">ba:33:50:5b:58:f7</alias-macs>
-      <mac-address xmlns="urn:o-ran:interfaces:1.0">2c:2b:1f:8c:3f:a2</mac-address>
-      <port-reference xmlns="urn:o-ran:interfaces:1.0">
-        <port-number>113</port-number>
-      </port-reference>
-      <l2-mtu xmlns="urn:o-ran:interfaces:1.0">60489</l2-mtu>
-      <vlan-tagging xmlns="urn:o-ran:interfaces:1.0">true</vlan-tagging>
-      <class-of-service xmlns="urn:o-ran:interfaces:1.0">
-        <u-plane-marking>3</u-plane-marking>
-        <c-plane-marking>0</c-plane-marking>
-        <m-plane-marking>1</m-plane-marking>
-        <s-plane-marking>6</s-plane-marking>
-        <other-marking>4</other-marking>
-        <enhanced-uplane-markings>
-          <up-marking-name>dtSbiQU8fgixwU6tOQNLIc1PPuz2LFeQ862rPWr44JtAvzVbi</up-marking-name>
-          <enhanced-marking>5</enhanced-marking>
-        </enhanced-uplane-markings>
-        <enhanced-uplane-markings>
-          <up-marking-name>MQHBk8vYNCGOII7pwymAaP2xhPJrxxjcn1NA9bqPN6D</up-marking-name>
-          <enhanced-marking>2</enhanced-marking>
-        </enhanced-uplane-markings>
-      </class-of-service>
-      <admin-status>up</admin-status>
-      <oper-status>unknown</oper-status>
-      <last-change>2018-12-04T01:22:44Z</last-change>
-      <if-index>1399123220</if-index>
-      <phys-address>fc:07:1e:ec:24:a3</phys-address>
-      <higher-layer-if>80kcD05DwnN81FHWZgSwQXgpN7kjx4KF44JzXOcl3St5p21gjLM9A2yg1LzyPk</higher-layer-if>
-      <lower-layer-if>80kcD05DwnN81FHWZgSwQXgpN7kjx4KF44JzXOcl3St5p21gjLM9A2yg1LzyPk</lower-layer-if>
-      <speed>2897952377425309696</speed>
-      <statistics>
-        <discontinuity-time>2037-04-15T16:07:29Z</discontinuity-time>
-        <in-octets>2571268368646403584</in-octets>
-        <in-unicast-pkts>6267618126971935744</in-unicast-pkts>
-        <in-broadcast-pkts>1109994561130658944</in-broadcast-pkts>
-        <in-multicast-pkts>3315305959068576256</in-multicast-pkts>
-        <in-discards>1267048002</in-discards>
-        <in-errors>2454029092</in-errors>
-        <in-unknown-protos>603209482</in-unknown-protos>
-        <out-octets>1059514199864528128</out-octets>
-        <out-unicast-pkts>6657904184753078272</out-unicast-pkts>
-        <out-broadcast-pkts>5105130509884859392</out-broadcast-pkts>
-        <out-multicast-pkts>2014558074734005248</out-multicast-pkts>
-        <out-discards>2053161590</out-discards>
-        <out-errors>1475901304</out-errors>
-      </statistics>
-      <last-cleared xmlns="urn:o-ran:interfaces:1.0">1976-10-15T10:34:12Z</last-cleared>
-      <interface-groups-id xmlns="urn:o-ran:interfaces:1.0">56</interface-groups-id>
-      <interface-groups-id xmlns="urn:o-ran:interfaces:1.0">143</interface-groups-id>
-    </interface>
-  </interfaces>
diff --git a/solution/network/ntsim-ng-o-ru/o-ru-11222/ietf-interfaces-running.xml b/solution/network/ntsim-ng-o-ru/o-ru-11222/ietf-interfaces-running.xml
deleted file mode 100644
index cdf695e..0000000
--- a/solution/network/ntsim-ng-o-ru/o-ru-11222/ietf-interfaces-running.xml
+++ /dev/null
@@ -1,111 +0,0 @@
-  <interfaces xmlns="urn:ietf:params:xml:ns:yang:ietf-interfaces">
-    <interface>
-      <name>0d242150-33a6-4e7c-9988-ae3b01e8a7ea</name>
-      <description>Simulated interface for O-RU</description>
-      <type xmlns:ianaift="urn:ietf:params:xml:ns:yang:iana-if-type">ianaift:ethernetCsmacd</type>
-      <enabled>true</enabled>
-      <link-up-down-trap-enable>disabled</link-up-down-trap-enable>
-      <ipv4 xmlns="urn:ietf:params:xml:ns:yang:ietf-ip">
-        <enabled>false</enabled>
-        <forwarding>false</forwarding>
-        <mtu>42783</mtu>
-        <address>
-          <ip>6.122.172.49</ip>
-          <prefix-length>14</prefix-length>
-        </address>
-        <address>
-          <ip>206.35.59.57</ip>
-          <netmask>199.41.255.188</netmask>
-        </address>
-        <neighbor>
-          <ip>48.159.72.129</ip>
-          <link-layer-address>42:8f:12:23:03:d3</link-layer-address>
-        </neighbor>
-        <neighbor>
-          <ip>187.230.45.63</ip>
-          <link-layer-address>77:b5:38:45:08:be</link-layer-address>
-        </neighbor>
-        <m-plane-marking xmlns="urn:o-ran:interfaces:1.0">13</m-plane-marking>
-        <diffserv-markings xmlns="urn:o-ran:interfaces:1.0">
-          <u-plane-marking>38</u-plane-marking>
-          <c-plane-marking>16</c-plane-marking>
-          <s-plane-marking>62</s-plane-marking>
-          <other-marking>27</other-marking>
-          <enhanced-uplane-markings>
-            <up-marking-name>X5f0ExbIx4jg5fpd9c0wiOEJbCXzpYxe3M7AkiaRnlZsAgxCsx0LlFmwhk6yavM5iTFu4Idr3cTwtj0NQ0ycFVAO7ymh41meM2IQCNhFZ33km30c4ygJlRqshMJlFYrsS1iuOs1Gv5SJ8SNcr4WENm740IiyGJ0qLaUrCW7Z10A9SombsaQ7oPboptWYdOoQRjhl7hl8hV91bv5vxNCVuOcTh0RmP84Grm1qD</up-marking-name>
-            <enhanced-marking>21</enhanced-marking>
-          </enhanced-uplane-markings>
-          <enhanced-uplane-markings>
-            <up-marking-name>2zF55KBup</up-marking-name>
-            <enhanced-marking>5</enhanced-marking>
-          </enhanced-uplane-markings>
-        </diffserv-markings>
-      </ipv4>
-      <ipv6 xmlns="urn:ietf:params:xml:ns:yang:ietf-ip">
-        <enabled>true</enabled>
-        <forwarding>true</forwarding>
-        <mtu>1163652863</mtu>
-        <address>
-          <ip>ea87:d264:da5e:5b19:4713:7266:f91e:14f7</ip>
-          <prefix-length>124</prefix-length>
-        </address>
-        <address>
-          <ip>2853:6b9:c531:f3c1:6875:f55:17ea:157b</ip>
-          <prefix-length>65</prefix-length>
-        </address>
-        <neighbor>
-          <ip>e6ae:4eeb:25c8:4ce6:9a7:5c2c:4293:f42e</ip>
-          <link-layer-address>65:58:a4:47:f1:91</link-layer-address>
-        </neighbor>
-        <neighbor>
-          <ip>f88d:e8e9:8f68:ff46:ae1a:8329:67bc:bd6f</ip>
-          <link-layer-address>32:d7:a9:c1:37:14</link-layer-address>
-        </neighbor>
-        <dup-addr-detect-transmits>1225514618</dup-addr-detect-transmits>
-        <autoconf>
-          <create-global-addresses>true</create-global-addresses>
-          <create-temporary-addresses>true</create-temporary-addresses>
-          <temporary-valid-lifetime>2335597472</temporary-valid-lifetime>
-          <temporary-preferred-lifetime>922813230</temporary-preferred-lifetime>
-        </autoconf>
-        <m-plane-marking xmlns="urn:o-ran:interfaces:1.0">33</m-plane-marking>
-        <diffserv-markings xmlns="urn:o-ran:interfaces:1.0">
-          <u-plane-marking>29</u-plane-marking>
-          <c-plane-marking>50</c-plane-marking>
-          <s-plane-marking>14</s-plane-marking>
-          <other-marking>61</other-marking>
-          <enhanced-uplane-markings>
-            <up-marking-name>8iROcw05EJqk0qe08RerP</up-marking-name>
-            <enhanced-marking>18</enhanced-marking>
-          </enhanced-uplane-markings>
-          <enhanced-uplane-markings>
-            <up-marking-name>M14steKtoB9s09xEKPYLf4LfWZHDetPSuUkP05bgykIym746WUR3ZCjVuSqIlgAI2Nx2KIiaV0Bh7xnVs7YjB965TwF7E8PGVeAxPSHKKaTJI8w2fnlRwjWqPuxmCe2xsDWhnvT0GMBoV8i2vDTTOIbvcAROOUd9p9qMEcEcYgsLgKODfzw3hAzlaq9Zce8BfqgUCUYt2r6abMNrmcuDMVZWm0Nq7N2m6a8IW73Zy21BOP2aTpGxkxlyp9ZwO</up-marking-name>
-            <enhanced-marking>29</enhanced-marking>
-          </enhanced-uplane-markings>
-        </diffserv-markings>
-      </ipv6>
-      <alias-macs xmlns="urn:o-ran:interfaces:1.0">b2:24:6a:90:68:bb</alias-macs>
-      <alias-macs xmlns="urn:o-ran:interfaces:1.0">ba:33:50:5b:58:f7</alias-macs>
-      <mac-address xmlns="urn:o-ran:interfaces:1.0">2c:2b:1f:8c:3f:a2</mac-address>
-      <port-reference xmlns="urn:o-ran:interfaces:1.0">
-        <port-number>113</port-number>
-      </port-reference>
-      <l2-mtu xmlns="urn:o-ran:interfaces:1.0">60489</l2-mtu>
-      <vlan-tagging xmlns="urn:o-ran:interfaces:1.0">true</vlan-tagging>
-      <class-of-service xmlns="urn:o-ran:interfaces:1.0">
-        <u-plane-marking>3</u-plane-marking>
-        <c-plane-marking>0</c-plane-marking>
-        <m-plane-marking>1</m-plane-marking>
-        <s-plane-marking>6</s-plane-marking>
-        <other-marking>4</other-marking>
-        <enhanced-uplane-markings>
-          <up-marking-name>dtSbiQU8fgixwU6tOQNLIc1PPuz2LFeQ862rPWr44JtAvzVbi</up-marking-name>
-          <enhanced-marking>5</enhanced-marking>
-        </enhanced-uplane-markings>
-        <enhanced-uplane-markings>
-          <up-marking-name>MQHBk8vYNCGOII7pwymAaP2xhPJrxxjcn1NA9bqPN6D</up-marking-name>
-          <enhanced-marking>2</enhanced-marking>
-        </enhanced-uplane-markings>
-      </class-of-service>
-    </interface>
-  </interfaces>
diff --git a/solution/network/ntsim-ng-o-ru/o-ru-11223/config.json b/solution/network/ntsim-ng-o-ru/o-ru-11223/config.json
deleted file mode 100644
index 76ede7a..0000000
--- a/solution/network/ntsim-ng-o-ru/o-ru-11223/config.json
+++ /dev/null
@@ -1,135 +0,0 @@
-{
-    "container-rules": {
-        "excluded-modules": [],
-        "excluded-features": []
-    },
-
-    "supervisor-rules": {
-        "netopeer": {
-            "path": "/usr/local/bin/netopeer2-server",
-            "args": ["-d", "-v2"],
-            "autorestart": true,
-            "stdout": "log/netopeer-stdout.log",
-            "stderr": "log/netopeer-stderr.log"
-        },
-
-        "ntsim-network-function": {
-            "path": "/opt/dev/ntsim-ng/ntsim-ng",
-            "args": ["-w/opt/dev/ntsim-ng", "-f"],
-            "nomanual": true
-        }
-    },
-
-    "datastore-random-generation-rules" : {
-        "excluded-modules": [
-            "sysrepo",
-            "sysrepo-monitoring",
-            "ietf-yang-library",
-            "ietf-netconf-acm",
-            "ietf-netconf-monitoring",
-            "nc-notifications",
-            "ietf-keystore",
-            "ietf-truststore",
-            "ietf-system",
-            "ietf-netconf-server",
-            "ietf-alarms",
-            "ietf-network-instance",
-            "ietf-restconf",
-            "ietf-yang-schema-mount",
-            "ietf-subscribed-notifications",
-            "o-ran-uplane-conf",
-            "o-ran-performance-management",
-            "o-ran-transceiver",
-            "o-ran-mplane-int",
-            "o-ran-processing-element",
-            "o-ran-shared-cell",
-            "nts-network-function"
-        ],
-
-        "default-list-instances": 2,
-        "custom-list-instances" : [
-            {"/ietf-interfaces:interfaces/interface": 4}
-
-        ],
-
-        "restrict-schema": [
-            {"/ietf-interfaces:interfaces/interface/type": ["iana-if-type:ethernetCsmacd"]}
-        ]
-
-    },
-
-    "datastore-populate-rules": {
-        "random-generation-enabled": false,
-
-        "pre-generated-operational-data": [
-            "../deploy/data/ietf-hardware-operational.json",
-            "../deploy/data/ietf-interfaces-operational.xml"
-        ],
-        "pre-generated-running-data": [
-            "../deploy/data/ietf-hardware-running.json",
-            "../deploy/data/ietf-interfaces-running.xml"
-        ]
-    },
-
-    "fault-rules" : {
-        "yang-notif-template" : "<alarm-notif xmlns=\"urn:o-ran:fm:1.0\"><fault-id>%%fault-id%%</fault-id><fault-source>%%object%%</fault-source><affected-objects><name>%%affected-object%%</name></affected-objects><fault-severity>%%fault-severity%%</fault-severity><is-cleared>%%cleared%%</is-cleared><fault-text>%%text%%</fault-text><event-time>%%date-time%%</event-time></alarm-notif>",
-        "choosing-method" : "linear",
-        "faults" : [
-            {
-                "condition" : "Interface Fault",
-                "object"    : "09a95e08-5b53-4734-815f-a9c12300fc62",
-                "severity"  : "CRITICAL",
-                "date-time" : "$$time$$",
-                "specific-problem" : "Interface Fault",
-
-                "fault-id": "30",
-                "fault-severity" : "CRITICAL",
-                "affected-object" : "$$hostname$$",
-                "cleared" : "false",
-                "text" : "Interface Fault"
-            },
-
-            {
-                "condition" : "Interface Fault",
-                "object"    : "09a95e08-5b53-4734-815f-a9c12300fc62",
-                "severity"  : "NORMAL",
-                "date-time" : "$$time$$",
-                "specific-problem" : "Interface Fault",
-
-                "fault-id": "30",
-                "fault-severity" : "CRITICAL",
-                "affected-object" : "$$hostname$$",
-                "cleared" : "true",
-                "text" : "Interface Fault"
-            },
-
-            {
-                "condition" : "C/U-plane logical Connection faulty",
-                "object"    : "09a95e08-5b53-4734-815f-a9c12300fc62",
-                "severity"  : "CRITICAL",
-                "date-time" : "$$time$$",
-                "specific-problem" : "C/U-plane logical Connection faulty",
-
-                "fault-id": "28",
-                "fault-severity" : "CRITICAL",
-                "affected-object" : "$$hostname$$",
-                "cleared" : "false",
-                "text" : "C/U-plane logical Connection faulty"
-            },
-
-            {
-                "condition" : "C/U-plane logical Connection faulty",
-                "object"    : "09a95e08-5b53-4734-815f-a9c12300fc62",
-                "severity"  : "NORMAL",
-                "date-time" : "$$time$$",
-                "specific-problem" : "C/U-plane logical Connection faulty",
-
-                "fault-id": "28",
-                "fault-severity" : "CRITICAL",
-                "affected-object" : "$$hostname$$",
-                "cleared" : "true",
-                "text" : "C/U-plane logical Connection faulty"
-            }
-        ]
-    }
-}
diff --git a/solution/network/ntsim-ng-o-ru/o-ru-11223/ietf-hardware-operational.json b/solution/network/ntsim-ng-o-ru/o-ru-11223/ietf-hardware-operational.json
deleted file mode 100644
index b0a474c..0000000
--- a/solution/network/ntsim-ng-o-ru/o-ru-11223/ietf-hardware-operational.json
+++ /dev/null
@@ -1,442 +0,0 @@
-{
-  "ietf-hardware:hardware": {
-    "component": [
-      {
-        "name": "chassis-temperature-exhaust",
-        "alias": "chassis-temperature-exhaust",
-        "sensor-data": {
-          "value": 30,
-          "value-type": "celsius",
-          "oper-status": "ok",
-          "value-timestamp": "2021-03-18T19:51:50.3Z"
-        },
-        "class": "iana-hardware:sensor",
-        "state": {
-          "oper-state": "enabled",
-          "admin-state": "locked"
-        },
-        "parent-rel-pos": 0,
-        "parent": "chassis"
-      },
-      {
-        "name": "slot2-logical2",
-        "alias": "Slot3-B",
-        "description": "SLOT3-B",
-        "class": "iana-hardware:module",
-        "state": {
-          "oper-state": "disabled",
-          "admin-state": "unlocked"
-        },
-        "parent-rel-pos": 3,
-        "parent": "slot2"
-      },
-      {
-        "name": "chassis-temperature-inlet",
-        "alias": "chassis-temperature-inlet",
-        "sensor-data": {
-          "value": 29,
-          "value-type": "celsius",
-          "oper-status": "ok",
-          "value-timestamp": "2021-03-18T19:51:50.3Z"
-        },
-        "class": "iana-hardware:sensor",
-        "state": {
-          "oper-state": "enabled",
-          "admin-state": "locked"
-        },
-        "parent-rel-pos": 1,
-        "parent": "chassis"
-      },
-      {
-        "name": "slot0-logical0-rrh",
-        "alias": "Slot0-A-rrh",
-        "class": "iana-hardware:port",
-        "contains-child": [
-          "slot0-logical0-rrh-temperature"
-        ],
-        "o-ran-hardware:o-ran-name": "slot0-logical0-rrh",
-        "state": {
-          "oper-state": "enabled",
-          "admin-state": "locked"
-        },
-        "serial-num": "AGNF714S",
-        "mfg-name": "ACME GMBH.",
-        "parent-rel-pos": 1,
-        "parent": "slot0-logical0",
-        "model-name": "ANSHEONXH-E7"
-      },
-      {
-        "name": "chassis-fan1",
-        "alias": "chassis-fan1",
-        "class": "iana-hardware:fan",
-        "contains-child": [
-          "chassis-fan1-speed"
-        ],
-        "state": {
-          "oper-state": "enabled",
-          "admin-state": "locked"
-        },
-        "parent-rel-pos": 3,
-        "parent": "chassis"
-      },
-      {
-        "name": "chassis-fan3-speed",
-        "alias": "chassis-fan3-speed",
-        "sensor-data": {
-          "value": 1000,
-          "value-type": "rpm",
-          "oper-status": "ok",
-          "value-timestamp": "2021-03-18T19:51:50.3Z"
-        },
-        "class": "iana-hardware:sensor",
-        "state": {
-          "oper-state": "enabled",
-          "admin-state": "locked"
-        },
-        "parent-rel-pos": 0,
-        "parent": "chassis-fan3"
-      },
-      {
-        "name": "slot0-logical1",
-        "alias": "Slot0-B",
-        "description": "SLOT0-B",
-        "class": "iana-hardware:module",
-        "state": {
-          "oper-state": "disabled",
-          "admin-state": "unlocked"
-        },
-        "parent-rel-pos": 2,
-        "parent": "slot0"
-      },
-      {
-        "name": "chassis-fan0",
-        "alias": "chassis-fan0",
-        "class": "iana-hardware:fan",
-        "contains-child": [
-          "chassis-fan0-speed"
-        ],
-        "state": {
-          "oper-state": "enabled",
-          "admin-state": "locked"
-        },
-        "parent-rel-pos": 2,
-        "parent": "chassis"
-      },
-      {
-        "name": "slot0-logical0",
-        "alias": "Slot0-A",
-        "description": "SLOT0-AZ",
-        "class": "iana-hardware:module",
-        "contains-child": [
-          "slot0-logical0-bbu",
-          "slot0-logical0-rrh"
-        ],
-        "state": {
-          "oper-state": "enabled",
-          "admin-state": "unlocked"
-        },
-        "parent-rel-pos": 1,
-        "parent": "slot0"
-      },
-      {
-        "name": "chassis",
-        "alias": "chassis",
-        "description": "O-RAN O-RU O1 Simulator",
-        "class": "iana-hardware:chassis",
-        "contains-child": [
-          "cpu",
-          "chassis-temperature-inlet",
-          "chassis-temperature-exhaust",
-          "chassis-fan1",
-          "slot0",
-          "chassis-fan2",
-          "chassis-fan3",
-          "slot2",
-          "chassis-fan0"
-        ],
-        "state": {
-          "oper-state": "enabled",
-          "admin-state": "unlocked"
-        },
-        "serial-num": "23412",
-        "mfg-name": "NTS",
-        "software-rev": "3.8.1 (2029-10-30 11:47:59)",
-        "model-name": "O1-O-RU-Simulator"
-      },
-      {
-        "name": "slot0-logical2",
-        "alias": "Slot0-C",
-        "description": "SLOT0-C",
-        "class": "iana-hardware:module",
-        "state": {
-          "oper-state": "disabled",
-          "admin-state": "unlocked"
-        },
-        "parent-rel-pos": 3,
-        "parent": "slot0"
-      },
-      {
-        "name": "slot0-logical0-bbu-temperature",
-        "alias": "Slot0-A-bbu-temperature",
-        "sensor-data": {
-          "value": 37,
-          "value-type": "celsius",
-          "oper-status": "ok",
-          "value-timestamp": "2021-03-18T19:51:50.3Z"
-        },
-        "class": "iana-hardware:sensor",
-        "state": {
-          "oper-state": "enabled",
-          "admin-state": "locked"
-        },
-        "parent-rel-pos": 0,
-        "parent": "slot0-logical0-bbu"
-      },
-      {
-        "name": "chassis-fan3",
-        "alias": "chassis-fan3",
-        "class": "iana-hardware:fan",
-        "contains-child": [
-          "chassis-fan3-speed"
-        ],
-        "state": {
-          "oper-state": "enabled",
-          "admin-state": "locked"
-        },
-        "parent-rel-pos": 5,
-        "parent": "chassis"
-      },
-      {
-        "name": "chassis-fan2",
-        "alias": "chassis-fan2",
-        "class": "iana-hardware:fan",
-        "contains-child": [
-          "chassis-fan2-speed"
-        ],
-        "state": {
-          "oper-state": "enabled",
-          "admin-state": "locked"
-        },
-        "parent-rel-pos": 4,
-        "parent": "chassis"
-      },
-      {
-        "name": "cpu-temperature",
-        "alias": "cpu-temperature",
-        "sensor-data": {
-          "value": 30,
-          "value-type": "celsius",
-          "oper-status": "ok",
-          "value-timestamp": "2021-03-18T19:51:50.3Z"
-        },
-        "class": "iana-hardware:sensor",
-        "state": {
-          "oper-state": "enabled",
-          "admin-state": "locked"
-        },
-        "parent-rel-pos": 0,
-        "parent": "cpu"
-      },
-      {
-        "name": "slot2-logical0",
-        "alias": "Slot2-C",
-        "description": "SLOT2-C",
-        "class": "iana-hardware:module",
-        "state": {
-          "oper-state": "disabled",
-          "admin-state": "unlocked"
-        },
-        "parent-rel-pos": 1,
-        "parent": "slot2"
-      },
-      {
-        "name": "slot2-logical1",
-        "alias": "Slot3-A",
-        "description": "SLOT3-A",
-        "class": "iana-hardware:module",
-        "state": {
-          "oper-state": "disabled",
-          "admin-state": "unlocked"
-        },
-        "parent-rel-pos": 2,
-        "parent": "slot2"
-      },
-      {
-        "name": "slot0-logical0-bbu",
-        "alias": "Slot0-A-bbu",
-        "class": "iana-hardware:port",
-        "contains-child": [
-          "slot0-logical0-bbu-temperature"
-        ],
-        "o-ran-hardware:o-ran-name": "slot0-logical0-bbu",
-        "state": {
-          "oper-state": "enabled",
-          "admin-state": "unlocked"
-        },
-        "serial-num": "AGNN214S",
-        "mfg-name": "ACME GMBH.",
-        "parent-rel-pos": 0,
-        "parent": "slot0-logical0",
-        "model-name": "ANSHEONXH-E7"
-      },
-      {
-        "name": "chassis-fan1-speed",
-        "alias": "chassis-fan1-speed",
-        "sensor-data": {
-          "value": 4100,
-          "value-type": "rpm",
-          "oper-status": "ok",
-          "value-timestamp": "2021-03-18T19:51:50.3Z"
-        },
-        "class": "iana-hardware:sensor",
-        "state": {
-          "oper-state": "enabled",
-          "admin-state": "locked"
-        },
-        "parent-rel-pos": 0,
-        "parent": "chassis-fan1"
-      },
-      {
-        "name": "chassis-fan0-speed",
-        "alias": "chassis-fan0-speed",
-        "sensor-data": {
-          "value": 4100,
-          "value-type": "rpm",
-          "oper-status": "ok",
-          "value-timestamp": "2021-03-18T19:51:50.3Z"
-        },
-        "class": "iana-hardware:sensor",
-        "state": {
-          "oper-state": "enabled",
-          "admin-state": "locked"
-        },
-        "parent-rel-pos": 0,
-        "parent": "chassis-fan0"
-      },
-      {
-        "name": "slot0",
-        "alias": "slot0",
-        "class": "iana-hardware:module",
-        "contains-child": [
-          "slot0-logical1",
-          "slot0-logical2",
-          "slot0-logical0",
-          "slot0-temperature"
-        ],
-        "state": {
-          "oper-state": "enabled",
-          "admin-state": "unlocked"
-        },
-        "serial-num": "7220530",
-        "parent-rel-pos": 7,
-        "software-rev": "0",
-        "parent": "chassis",
-        "firmware-rev": "12.00.42-S (0F7F1001)",
-        "model-name": "385A-SFP-2P-40-FHL-JC3"
-      },
-      {
-        "name": "slot2",
-        "alias": "slot2",
-        "class": "iana-hardware:module",
-        "contains-child": [
-          "slot2-temperature",
-          "slot2-logical0",
-          "slot2-logical2",
-          "slot2-logical1"
-        ],
-        "state": {
-          "oper-state": "enabled",
-          "admin-state": "unlocked"
-        },
-        "serial-num": "2522642",
-        "parent-rel-pos": 9,
-        "software-rev": "0",
-        "parent": "chassis",
-        "firmware-rev": "12.00.42-S (0F7F1001)",
-        "model-name": "339B-SFP-2P-75-FHL-JC3"
-      },
-      {
-        "name": "slot0-logical0-rrh-temperature",
-        "alias": "Slot0-A-rrh-temperature",
-        "sensor-data": {
-          "value": 35,
-          "value-type": "celsius",
-          "oper-status": "ok",
-          "value-timestamp": "2021-03-18T19:51:50.3Z"
-        },
-        "class": "iana-hardware:sensor",
-        "state": {
-          "oper-state": "enabled",
-          "admin-state": "locked"
-        },
-        "parent-rel-pos": 0,
-        "parent": "slot0-logical0-rrh"
-      },
-      {
-        "name": "slot0-temperature",
-        "alias": "slot0-temperature",
-        "sensor-data": {
-          "value": 51,
-          "value-type": "celsius",
-          "oper-status": "ok",
-          "value-timestamp": "2021-03-18T19:51:50.3Z"
-        },
-        "class": "iana-hardware:sensor",
-        "state": {
-          "oper-state": "enabled",
-          "admin-state": "locked"
-        },
-        "parent-rel-pos": 0,
-        "parent": "slot0"
-      },
-      {
-        "name": "cpu",
-        "alias": "cpu",
-        "class": "iana-hardware:cpu",
-        "contains-child": [
-          "cpu-temperature"
-        ],
-        "state": {
-          "oper-state": "enabled",
-          "admin-state": "locked"
-        },
-        "parent-rel-pos": 6,
-        "parent": "chassis"
-      },
-      {
-        "name": "chassis-fan2-speed",
-        "alias": "chassis-fan2-speed",
-        "sensor-data": {
-          "value": 4100,
-          "value-type": "rpm",
-          "oper-status": "ok",
-          "value-timestamp": "2021-03-18T19:51:50.3Z"
-        },
-        "class": "iana-hardware:sensor",
-        "state": {
-          "oper-state": "enabled",
-          "admin-state": "locked"
-        },
-        "parent-rel-pos": 0,
-        "parent": "chassis-fan2"
-      },
-      {
-        "name": "slot2-temperature",
-        "alias": "slot2-temperature",
-        "sensor-data": {
-          "value": 49,
-          "value-type": "celsius",
-          "oper-status": "ok",
-          "value-timestamp": "2021-03-18T19:51:50.3Z"
-        },
-        "class": "iana-hardware:sensor",
-        "state": {
-          "oper-state": "enabled",
-          "admin-state": "locked"
-        },
-        "parent-rel-pos": 0,
-        "parent": "slot2"
-      }
-    ]
-  }
-}
diff --git a/solution/network/ntsim-ng-o-ru/o-ru-11223/ietf-hardware-running.json b/solution/network/ntsim-ng-o-ru/o-ru-11223/ietf-hardware-running.json
deleted file mode 100644
index 4800c35..0000000
--- a/solution/network/ntsim-ng-o-ru/o-ru-11223/ietf-hardware-running.json
+++ /dev/null
@@ -1,276 +0,0 @@
-{
-  "ietf-hardware:hardware": {
-    "component": [
-      {
-        "name": "chassis-temperature-exhaust",
-        "alias": "chassis-temperature-exhaust",
-        "class": "iana-hardware:sensor",
-        "state": {
-          "admin-state": "locked"
-        },
-        "parent-rel-pos": 0,
-        "parent": "chassis"
-      },
-      {
-        "name": "slot2-logical2",
-        "alias": "Slot3-B",
-        "class": "iana-hardware:module",
-        "state": {
-          "admin-state": "unlocked"
-        },
-        "parent-rel-pos": 3,
-        "parent": "slot2"
-      },
-      {
-        "name": "chassis-temperature-inlet",
-        "alias": "chassis-temperature-inlet",
-        "class": "iana-hardware:sensor",
-        "state": {
-          "admin-state": "locked"
-        },
-        "parent-rel-pos": 1,
-        "parent": "chassis"
-      },
-      {
-        "name": "slot0-logical0-rrh",
-        "alias": "Slot0-A-rrh",
-        "class": "iana-hardware:port",
-        "o-ran-hardware:o-ran-name": "slot0-logical0-rrh",
-        "state": {
-          "admin-state": "locked"
-        },
-        "parent-rel-pos": 1,
-        "parent": "slot0-logical0"
-      },
-      {
-        "name": "chassis-fan1",
-        "alias": "chassis-fan1",
-        "class": "iana-hardware:fan",
-        "state": {
-          "admin-state": "locked"
-        },
-        "parent-rel-pos": 3,
-        "parent": "chassis"
-      },
-      {
-        "name": "chassis-fan3-speed",
-        "alias": "chassis-fan3-speed",
-        "class": "iana-hardware:sensor",
-        "state": {
-          "admin-state": "locked"
-        },
-        "parent-rel-pos": 0,
-        "parent": "chassis-fan3"
-      },
-      {
-        "name": "slot0-logical1",
-        "alias": "Slot0-B",
-        "class": "iana-hardware:module",
-        "state": {
-          "admin-state": "unlocked"
-        },
-        "parent-rel-pos": 2,
-        "parent": "slot0"
-      },
-      {
-        "name": "chassis-fan0",
-        "alias": "chassis-fan0",
-        "class": "iana-hardware:fan",
-        "state": {
-          "admin-state": "locked"
-        },
-        "parent-rel-pos": 2,
-        "parent": "chassis"
-      },
-      {
-        "name": "slot0-logical0",
-        "alias": "Slot0-A",
-        "class": "iana-hardware:module",
-        "state": {
-          "admin-state": "unlocked"
-        },
-        "parent-rel-pos": 1,
-        "parent": "slot0"
-      },
-      {
-        "name": "chassis",
-        "alias": "chassis",
-        "class": "iana-hardware:chassis",
-        "state": {
-          "admin-state": "unlocked"
-        }
-      },
-      {
-        "name": "slot0-logical2",
-        "alias": "Slot0-C",
-        "class": "iana-hardware:module",
-        "state": {
-          "admin-state": "unlocked"
-        },
-        "parent-rel-pos": 3,
-        "parent": "slot0"
-      },
-      {
-        "name": "slot0-logical0-bbu-temperature",
-        "alias": "Slot0-A-bbu-temperature",
-        "class": "iana-hardware:sensor",
-        "state": {
-          "admin-state": "locked"
-        },
-        "parent-rel-pos": 0,
-        "parent": "slot0-logical0-bbu"
-      },
-      {
-        "name": "chassis-fan3",
-        "alias": "chassis-fan3",
-        "class": "iana-hardware:fan",
-        "state": {
-          "admin-state": "locked"
-        },
-        "parent-rel-pos": 5,
-        "parent": "chassis"
-      },
-      {
-        "name": "chassis-fan2",
-        "alias": "chassis-fan2",
-        "class": "iana-hardware:fan",
-        "state": {
-          "admin-state": "locked"
-        },
-        "parent-rel-pos": 4,
-        "parent": "chassis"
-      },
-      {
-        "name": "cpu-temperature",
-        "alias": "cpu-temperature",
-        "class": "iana-hardware:sensor",
-        "state": {
-          "admin-state": "locked"
-        },
-        "parent-rel-pos": 0,
-        "parent": "cpu"
-      },
-      {
-        "name": "slot2-logical0",
-        "alias": "Slot2-C",
-        "class": "iana-hardware:module",
-        "state": {
-          "admin-state": "unlocked"
-        },
-        "parent-rel-pos": 1,
-        "parent": "slot2"
-      },
-      {
-        "name": "slot2-logical1",
-        "alias": "Slot3-A",
-        "class": "iana-hardware:module",
-        "state": {
-          "admin-state": "unlocked"
-        },
-        "parent-rel-pos": 2,
-        "parent": "slot2"
-      },
-      {
-        "name": "slot0-logical0-bbu",
-        "alias": "Slot0-A-bbu",
-        "class": "iana-hardware:port",
-        "o-ran-hardware:o-ran-name": "slot0-logical0-bbu",
-        "state": {
-          "admin-state": "unlocked"
-        },
-        "parent-rel-pos": 0,
-        "parent": "slot0-logical0"
-      },
-      {
-        "name": "chassis-fan1-speed",
-        "alias": "chassis-fan1-speed",
-        "class": "iana-hardware:sensor",
-        "state": {
-          "admin-state": "locked"
-        },
-        "parent-rel-pos": 0,
-        "parent": "chassis-fan1"
-      },
-      {
-        "name": "chassis-fan0-speed",
-        "alias": "chassis-fan0-speed",
-        "class": "iana-hardware:sensor",
-        "state": {
-          "admin-state": "locked"
-        },
-        "parent-rel-pos": 0,
-        "parent": "chassis-fan0"
-      },
-      {
-        "name": "slot0",
-        "alias": "slot0",
-        "class": "iana-hardware:module",
-        "state": {
-          "admin-state": "unlocked"
-        },
-        "parent-rel-pos": 7,
-        "parent": "chassis"
-      },
-      {
-        "name": "slot2",
-        "alias": "slot2",
-        "class": "iana-hardware:module",
-        "state": {
-          "admin-state": "unlocked"
-        },
-        "parent-rel-pos": 9,
-        "parent": "chassis"
-      },
-      {
-        "name": "slot0-logical0-rrh-temperature",
-        "alias": "Slot0-A-rrh-temperature",
-        "class": "iana-hardware:sensor",
-        "state": {
-          "admin-state": "locked"
-        },
-        "parent-rel-pos": 0,
-        "parent": "slot0-logical0-rrh"
-      },
-      {
-        "name": "slot0-temperature",
-        "alias": "slot0-temperature",
-        "class": "iana-hardware:sensor",
-        "state": {
-          "admin-state": "locked"
-        },
-        "parent-rel-pos": 0,
-        "parent": "slot0"
-      },
-      {
-        "name": "cpu",
-        "alias": "cpu",
-        "class": "iana-hardware:cpu",
-        "state": {
-          "admin-state": "locked"
-        },
-        "parent-rel-pos": 6,
-        "parent": "chassis"
-      },
-      {
-        "name": "chassis-fan2-speed",
-        "alias": "chassis-fan2-speed",
-        "class": "iana-hardware:sensor",
-        "state": {
-          "admin-state": "locked"
-        },
-        "parent-rel-pos": 0,
-        "parent": "chassis-fan2"
-      },
-      {
-        "name": "slot2-temperature",
-        "alias": "slot2-temperature",
-        "class": "iana-hardware:sensor",
-        "state": {
-          "admin-state": "locked"
-        },
-        "parent-rel-pos": 0,
-        "parent": "slot2"
-      }
-    ]
-  }
-}
diff --git a/solution/network/ntsim-ng-o-ru/o-ru-11223/ietf-interfaces-operational.xml b/solution/network/ntsim-ng-o-ru/o-ru-11223/ietf-interfaces-operational.xml
deleted file mode 100644
index c6d3038..0000000
--- a/solution/network/ntsim-ng-o-ru/o-ru-11223/ietf-interfaces-operational.xml
+++ /dev/null
@@ -1,151 +0,0 @@
-  <interfaces xmlns="urn:ietf:params:xml:ns:yang:ietf-interfaces">
-    <interface>
-      <name>d3ea2f17-a841-4e71-9ef9-9549159aabe7</name>
-      <description>Simulated interface for O-RU</description>
-      <type xmlns:ianaift="urn:ietf:params:xml:ns:yang:iana-if-type">ianaift:ethernetCsmacd</type>
-      <enabled>true</enabled>
-      <link-up-down-trap-enable>disabled</link-up-down-trap-enable>
-      <ipv4 xmlns="urn:ietf:params:xml:ns:yang:ietf-ip">
-        <enabled>false</enabled>
-        <forwarding>false</forwarding>
-        <mtu>42783</mtu>
-        <address>
-          <ip>6.122.172.49</ip>
-          <prefix-length>14</prefix-length>
-          <origin>static</origin>
-        </address>
-        <address>
-          <ip>206.35.59.57</ip>
-          <netmask>199.41.255.188</netmask>
-          <origin>random</origin>
-        </address>
-        <neighbor>
-          <ip>48.159.72.129</ip>
-          <link-layer-address>42:8f:12:23:03:d3</link-layer-address>
-          <origin>other</origin>
-        </neighbor>
-        <neighbor>
-          <ip>187.230.45.63</ip>
-          <link-layer-address>77:b5:38:45:08:be</link-layer-address>
-          <origin>dynamic</origin>
-        </neighbor>
-        <m-plane-marking xmlns="urn:o-ran:interfaces:1.0">13</m-plane-marking>
-        <diffserv-markings xmlns="urn:o-ran:interfaces:1.0">
-          <u-plane-marking>38</u-plane-marking>
-          <c-plane-marking>16</c-plane-marking>
-          <s-plane-marking>62</s-plane-marking>
-          <other-marking>27</other-marking>
-          <enhanced-uplane-markings>
-            <up-marking-name>X5f0ExbIx4jg5fpd9c0wiOEJbCXzpYxe3M7AkiaRnlZsAgxCsx0LlFmwhk6yavM5iTFu4Idr3cTwtj0NQ0ycFVAO7ymh41meM2IQCNhFZ33km30c4ygJlRqshMJlFYrsS1iuOs1Gv5SJ8SNcr4WENm740IiyGJ0qLaUrCW7Z10A9SombsaQ7oPboptWYdOoQRjhl7hl8hV91bv5vxNCVuOcTh0RmP84Grm1qD</up-marking-name>
-            <enhanced-marking>21</enhanced-marking>
-          </enhanced-uplane-markings>
-          <enhanced-uplane-markings>
-            <up-marking-name>2zF55KBup</up-marking-name>
-            <enhanced-marking>5</enhanced-marking>
-          </enhanced-uplane-markings>
-        </diffserv-markings>
-      </ipv4>
-      <ipv6 xmlns="urn:ietf:params:xml:ns:yang:ietf-ip">
-        <enabled>true</enabled>
-        <forwarding>true</forwarding>
-        <mtu>1163652863</mtu>
-        <address>
-          <ip>ea87:d264:da5e:5b19:4713:7266:f91e:14f7</ip>
-          <prefix-length>124</prefix-length>
-          <origin>other</origin>
-          <status>tentative</status>
-        </address>
-        <address>
-          <ip>2853:6b9:c531:f3c1:6875:f55:17ea:157b</ip>
-          <prefix-length>65</prefix-length>
-          <origin>link-layer</origin>
-          <status>preferred</status>
-        </address>
-        <neighbor>
-          <ip>e6ae:4eeb:25c8:4ce6:9a7:5c2c:4293:f42e</ip>
-          <link-layer-address>65:58:a4:47:f1:91</link-layer-address>
-          <origin>other</origin>
-          <is-router/>
-          <state>probe</state>
-        </neighbor>
-        <neighbor>
-          <ip>f88d:e8e9:8f68:ff46:ae1a:8329:67bc:bd6f</ip>
-          <link-layer-address>32:d7:a9:c1:37:14</link-layer-address>
-          <origin>other</origin>
-          <state>incomplete</state>
-        </neighbor>
-        <dup-addr-detect-transmits>1225514618</dup-addr-detect-transmits>
-        <autoconf>
-          <create-global-addresses>true</create-global-addresses>
-          <create-temporary-addresses>true</create-temporary-addresses>
-          <temporary-valid-lifetime>2335597472</temporary-valid-lifetime>
-          <temporary-preferred-lifetime>922813230</temporary-preferred-lifetime>
-        </autoconf>
-        <m-plane-marking xmlns="urn:o-ran:interfaces:1.0">33</m-plane-marking>
-        <diffserv-markings xmlns="urn:o-ran:interfaces:1.0">
-          <u-plane-marking>29</u-plane-marking>
-          <c-plane-marking>50</c-plane-marking>
-          <s-plane-marking>14</s-plane-marking>
-          <other-marking>61</other-marking>
-          <enhanced-uplane-markings>
-            <up-marking-name>8iROcw05EJqk0qe08RerP</up-marking-name>
-            <enhanced-marking>18</enhanced-marking>
-          </enhanced-uplane-markings>
-          <enhanced-uplane-markings>
-            <up-marking-name>M14steKtoB9s09xEKPYLf4LfWZHDetPSuUkP05bgykIym746WUR3ZCjVuSqIlgAI2Nx2KIiaV0Bh7xnVs7YjB965TwF7E8PGVeAxPSHKKaTJI8w2fnlRwjWqPuxmCe2xsDWhnvT0GMBoV8i2vDTTOIbvcAROOUd9p9qMEcEcYgsLgKODfzw3hAzlaq9Zce8BfqgUCUYt2r6abMNrmcuDMVZWm0Nq7N2m6a8IW73Zy21BOP2aTpGxkxlyp9ZwO</up-marking-name>
-            <enhanced-marking>29</enhanced-marking>
-          </enhanced-uplane-markings>
-        </diffserv-markings>
-      </ipv6>
-      <alias-macs xmlns="urn:o-ran:interfaces:1.0">b2:24:6a:90:68:bb</alias-macs>
-      <alias-macs xmlns="urn:o-ran:interfaces:1.0">ba:33:50:5b:58:f7</alias-macs>
-      <mac-address xmlns="urn:o-ran:interfaces:1.0">2c:2b:1f:8c:3f:a2</mac-address>
-      <port-reference xmlns="urn:o-ran:interfaces:1.0">
-        <port-number>113</port-number>
-      </port-reference>
-      <l2-mtu xmlns="urn:o-ran:interfaces:1.0">60489</l2-mtu>
-      <vlan-tagging xmlns="urn:o-ran:interfaces:1.0">true</vlan-tagging>
-      <class-of-service xmlns="urn:o-ran:interfaces:1.0">
-        <u-plane-marking>3</u-plane-marking>
-        <c-plane-marking>0</c-plane-marking>
-        <m-plane-marking>1</m-plane-marking>
-        <s-plane-marking>6</s-plane-marking>
-        <other-marking>4</other-marking>
-        <enhanced-uplane-markings>
-          <up-marking-name>dtSbiQU8fgixwU6tOQNLIc1PPuz2LFeQ862rPWr44JtAvzVbi</up-marking-name>
-          <enhanced-marking>5</enhanced-marking>
-        </enhanced-uplane-markings>
-        <enhanced-uplane-markings>
-          <up-marking-name>MQHBk8vYNCGOII7pwymAaP2xhPJrxxjcn1NA9bqPN6D</up-marking-name>
-          <enhanced-marking>2</enhanced-marking>
-        </enhanced-uplane-markings>
-      </class-of-service>
-      <admin-status>up</admin-status>
-      <oper-status>unknown</oper-status>
-      <last-change>2018-12-04T01:22:44Z</last-change>
-      <if-index>1399123220</if-index>
-      <phys-address>fc:07:1e:ec:24:a3</phys-address>
-      <higher-layer-if>80kcD05DwnN81FHWZgSwQXgpN7kjx4KF44JzXOcl3St5p21gjLM9A2yg1LzyPk</higher-layer-if>
-      <lower-layer-if>80kcD05DwnN81FHWZgSwQXgpN7kjx4KF44JzXOcl3St5p21gjLM9A2yg1LzyPk</lower-layer-if>
-      <speed>2897952377425309696</speed>
-      <statistics>
-        <discontinuity-time>2037-04-15T16:07:29Z</discontinuity-time>
-        <in-octets>2571268368646403584</in-octets>
-        <in-unicast-pkts>6267618126971935744</in-unicast-pkts>
-        <in-broadcast-pkts>1109994561130658944</in-broadcast-pkts>
-        <in-multicast-pkts>3315305959068576256</in-multicast-pkts>
-        <in-discards>1267048002</in-discards>
-        <in-errors>2454029092</in-errors>
-        <in-unknown-protos>603209482</in-unknown-protos>
-        <out-octets>1059514199864528128</out-octets>
-        <out-unicast-pkts>6657904184753078272</out-unicast-pkts>
-        <out-broadcast-pkts>5105130509884859392</out-broadcast-pkts>
-        <out-multicast-pkts>2014558074734005248</out-multicast-pkts>
-        <out-discards>2053161590</out-discards>
-        <out-errors>1475901304</out-errors>
-      </statistics>
-      <last-cleared xmlns="urn:o-ran:interfaces:1.0">1976-10-15T10:34:12Z</last-cleared>
-      <interface-groups-id xmlns="urn:o-ran:interfaces:1.0">56</interface-groups-id>
-      <interface-groups-id xmlns="urn:o-ran:interfaces:1.0">143</interface-groups-id>
-    </interface>
-  </interfaces>
diff --git a/solution/network/ntsim-ng-o-ru/o-ru-11223/ietf-interfaces-running.xml b/solution/network/ntsim-ng-o-ru/o-ru-11223/ietf-interfaces-running.xml
deleted file mode 100644
index 19d5f98..0000000
--- a/solution/network/ntsim-ng-o-ru/o-ru-11223/ietf-interfaces-running.xml
+++ /dev/null
@@ -1,111 +0,0 @@
-  <interfaces xmlns="urn:ietf:params:xml:ns:yang:ietf-interfaces">
-    <interface>
-      <name>d3ea2f17-a841-4e71-9ef9-9549159aabe7</name>
-      <description>Simulated interface for O-RU</description>
-      <type xmlns:ianaift="urn:ietf:params:xml:ns:yang:iana-if-type">ianaift:ethernetCsmacd</type>
-      <enabled>true</enabled>
-      <link-up-down-trap-enable>disabled</link-up-down-trap-enable>
-      <ipv4 xmlns="urn:ietf:params:xml:ns:yang:ietf-ip">
-        <enabled>false</enabled>
-        <forwarding>false</forwarding>
-        <mtu>42783</mtu>
-        <address>
-          <ip>6.122.172.49</ip>
-          <prefix-length>14</prefix-length>
-        </address>
-        <address>
-          <ip>206.35.59.57</ip>
-          <netmask>199.41.255.188</netmask>
-        </address>
-        <neighbor>
-          <ip>48.159.72.129</ip>
-          <link-layer-address>42:8f:12:23:03:d3</link-layer-address>
-        </neighbor>
-        <neighbor>
-          <ip>187.230.45.63</ip>
-          <link-layer-address>77:b5:38:45:08:be</link-layer-address>
-        </neighbor>
-        <m-plane-marking xmlns="urn:o-ran:interfaces:1.0">13</m-plane-marking>
-        <diffserv-markings xmlns="urn:o-ran:interfaces:1.0">
-          <u-plane-marking>38</u-plane-marking>
-          <c-plane-marking>16</c-plane-marking>
-          <s-plane-marking>62</s-plane-marking>
-          <other-marking>27</other-marking>
-          <enhanced-uplane-markings>
-            <up-marking-name>X5f0ExbIx4jg5fpd9c0wiOEJbCXzpYxe3M7AkiaRnlZsAgxCsx0LlFmwhk6yavM5iTFu4Idr3cTwtj0NQ0ycFVAO7ymh41meM2IQCNhFZ33km30c4ygJlRqshMJlFYrsS1iuOs1Gv5SJ8SNcr4WENm740IiyGJ0qLaUrCW7Z10A9SombsaQ7oPboptWYdOoQRjhl7hl8hV91bv5vxNCVuOcTh0RmP84Grm1qD</up-marking-name>
-            <enhanced-marking>21</enhanced-marking>
-          </enhanced-uplane-markings>
-          <enhanced-uplane-markings>
-            <up-marking-name>2zF55KBup</up-marking-name>
-            <enhanced-marking>5</enhanced-marking>
-          </enhanced-uplane-markings>
-        </diffserv-markings>
-      </ipv4>
-      <ipv6 xmlns="urn:ietf:params:xml:ns:yang:ietf-ip">
-        <enabled>true</enabled>
-        <forwarding>true</forwarding>
-        <mtu>1163652863</mtu>
-        <address>
-          <ip>ea87:d264:da5e:5b19:4713:7266:f91e:14f7</ip>
-          <prefix-length>124</prefix-length>
-        </address>
-        <address>
-          <ip>2853:6b9:c531:f3c1:6875:f55:17ea:157b</ip>
-          <prefix-length>65</prefix-length>
-        </address>
-        <neighbor>
-          <ip>e6ae:4eeb:25c8:4ce6:9a7:5c2c:4293:f42e</ip>
-          <link-layer-address>65:58:a4:47:f1:91</link-layer-address>
-        </neighbor>
-        <neighbor>
-          <ip>f88d:e8e9:8f68:ff46:ae1a:8329:67bc:bd6f</ip>
-          <link-layer-address>32:d7:a9:c1:37:14</link-layer-address>
-        </neighbor>
-        <dup-addr-detect-transmits>1225514618</dup-addr-detect-transmits>
-        <autoconf>
-          <create-global-addresses>true</create-global-addresses>
-          <create-temporary-addresses>true</create-temporary-addresses>
-          <temporary-valid-lifetime>2335597472</temporary-valid-lifetime>
-          <temporary-preferred-lifetime>922813230</temporary-preferred-lifetime>
-        </autoconf>
-        <m-plane-marking xmlns="urn:o-ran:interfaces:1.0">33</m-plane-marking>
-        <diffserv-markings xmlns="urn:o-ran:interfaces:1.0">
-          <u-plane-marking>29</u-plane-marking>
-          <c-plane-marking>50</c-plane-marking>
-          <s-plane-marking>14</s-plane-marking>
-          <other-marking>61</other-marking>
-          <enhanced-uplane-markings>
-            <up-marking-name>8iROcw05EJqk0qe08RerP</up-marking-name>
-            <enhanced-marking>18</enhanced-marking>
-          </enhanced-uplane-markings>
-          <enhanced-uplane-markings>
-            <up-marking-name>M14steKtoB9s09xEKPYLf4LfWZHDetPSuUkP05bgykIym746WUR3ZCjVuSqIlgAI2Nx2KIiaV0Bh7xnVs7YjB965TwF7E8PGVeAxPSHKKaTJI8w2fnlRwjWqPuxmCe2xsDWhnvT0GMBoV8i2vDTTOIbvcAROOUd9p9qMEcEcYgsLgKODfzw3hAzlaq9Zce8BfqgUCUYt2r6abMNrmcuDMVZWm0Nq7N2m6a8IW73Zy21BOP2aTpGxkxlyp9ZwO</up-marking-name>
-            <enhanced-marking>29</enhanced-marking>
-          </enhanced-uplane-markings>
-        </diffserv-markings>
-      </ipv6>
-      <alias-macs xmlns="urn:o-ran:interfaces:1.0">b2:24:6a:90:68:bb</alias-macs>
-      <alias-macs xmlns="urn:o-ran:interfaces:1.0">ba:33:50:5b:58:f7</alias-macs>
-      <mac-address xmlns="urn:o-ran:interfaces:1.0">2c:2b:1f:8c:3f:a2</mac-address>
-      <port-reference xmlns="urn:o-ran:interfaces:1.0">
-        <port-number>113</port-number>
-      </port-reference>
-      <l2-mtu xmlns="urn:o-ran:interfaces:1.0">60489</l2-mtu>
-      <vlan-tagging xmlns="urn:o-ran:interfaces:1.0">true</vlan-tagging>
-      <class-of-service xmlns="urn:o-ran:interfaces:1.0">
-        <u-plane-marking>3</u-plane-marking>
-        <c-plane-marking>0</c-plane-marking>
-        <m-plane-marking>1</m-plane-marking>
-        <s-plane-marking>6</s-plane-marking>
-        <other-marking>4</other-marking>
-        <enhanced-uplane-markings>
-          <up-marking-name>dtSbiQU8fgixwU6tOQNLIc1PPuz2LFeQ862rPWr44JtAvzVbi</up-marking-name>
-          <enhanced-marking>5</enhanced-marking>
-        </enhanced-uplane-markings>
-        <enhanced-uplane-markings>
-          <up-marking-name>MQHBk8vYNCGOII7pwymAaP2xhPJrxxjcn1NA9bqPN6D</up-marking-name>
-          <enhanced-marking>2</enhanced-marking>
-        </enhanced-uplane-markings>
-      </class-of-service>
-    </interface>
-  </interfaces>
diff --git a/solution/network/ntsim-ng-o-ru/o-ru-11224/config.json b/solution/network/ntsim-ng-o-ru/o-ru-11224/config.json
deleted file mode 100644
index 76ede7a..0000000
--- a/solution/network/ntsim-ng-o-ru/o-ru-11224/config.json
+++ /dev/null
@@ -1,135 +0,0 @@
-{
-    "container-rules": {
-        "excluded-modules": [],
-        "excluded-features": []
-    },
-
-    "supervisor-rules": {
-        "netopeer": {
-            "path": "/usr/local/bin/netopeer2-server",
-            "args": ["-d", "-v2"],
-            "autorestart": true,
-            "stdout": "log/netopeer-stdout.log",
-            "stderr": "log/netopeer-stderr.log"
-        },
-
-        "ntsim-network-function": {
-            "path": "/opt/dev/ntsim-ng/ntsim-ng",
-            "args": ["-w/opt/dev/ntsim-ng", "-f"],
-            "nomanual": true
-        }
-    },
-
-    "datastore-random-generation-rules" : {
-        "excluded-modules": [
-            "sysrepo",
-            "sysrepo-monitoring",
-            "ietf-yang-library",
-            "ietf-netconf-acm",
-            "ietf-netconf-monitoring",
-            "nc-notifications",
-            "ietf-keystore",
-            "ietf-truststore",
-            "ietf-system",
-            "ietf-netconf-server",
-            "ietf-alarms",
-            "ietf-network-instance",
-            "ietf-restconf",
-            "ietf-yang-schema-mount",
-            "ietf-subscribed-notifications",
-            "o-ran-uplane-conf",
-            "o-ran-performance-management",
-            "o-ran-transceiver",
-            "o-ran-mplane-int",
-            "o-ran-processing-element",
-            "o-ran-shared-cell",
-            "nts-network-function"
-        ],
-
-        "default-list-instances": 2,
-        "custom-list-instances" : [
-            {"/ietf-interfaces:interfaces/interface": 4}
-
-        ],
-
-        "restrict-schema": [
-            {"/ietf-interfaces:interfaces/interface/type": ["iana-if-type:ethernetCsmacd"]}
-        ]
-
-    },
-
-    "datastore-populate-rules": {
-        "random-generation-enabled": false,
-
-        "pre-generated-operational-data": [
-            "../deploy/data/ietf-hardware-operational.json",
-            "../deploy/data/ietf-interfaces-operational.xml"
-        ],
-        "pre-generated-running-data": [
-            "../deploy/data/ietf-hardware-running.json",
-            "../deploy/data/ietf-interfaces-running.xml"
-        ]
-    },
-
-    "fault-rules" : {
-        "yang-notif-template" : "<alarm-notif xmlns=\"urn:o-ran:fm:1.0\"><fault-id>%%fault-id%%</fault-id><fault-source>%%object%%</fault-source><affected-objects><name>%%affected-object%%</name></affected-objects><fault-severity>%%fault-severity%%</fault-severity><is-cleared>%%cleared%%</is-cleared><fault-text>%%text%%</fault-text><event-time>%%date-time%%</event-time></alarm-notif>",
-        "choosing-method" : "linear",
-        "faults" : [
-            {
-                "condition" : "Interface Fault",
-                "object"    : "09a95e08-5b53-4734-815f-a9c12300fc62",
-                "severity"  : "CRITICAL",
-                "date-time" : "$$time$$",
-                "specific-problem" : "Interface Fault",
-
-                "fault-id": "30",
-                "fault-severity" : "CRITICAL",
-                "affected-object" : "$$hostname$$",
-                "cleared" : "false",
-                "text" : "Interface Fault"
-            },
-
-            {
-                "condition" : "Interface Fault",
-                "object"    : "09a95e08-5b53-4734-815f-a9c12300fc62",
-                "severity"  : "NORMAL",
-                "date-time" : "$$time$$",
-                "specific-problem" : "Interface Fault",
-
-                "fault-id": "30",
-                "fault-severity" : "CRITICAL",
-                "affected-object" : "$$hostname$$",
-                "cleared" : "true",
-                "text" : "Interface Fault"
-            },
-
-            {
-                "condition" : "C/U-plane logical Connection faulty",
-                "object"    : "09a95e08-5b53-4734-815f-a9c12300fc62",
-                "severity"  : "CRITICAL",
-                "date-time" : "$$time$$",
-                "specific-problem" : "C/U-plane logical Connection faulty",
-
-                "fault-id": "28",
-                "fault-severity" : "CRITICAL",
-                "affected-object" : "$$hostname$$",
-                "cleared" : "false",
-                "text" : "C/U-plane logical Connection faulty"
-            },
-
-            {
-                "condition" : "C/U-plane logical Connection faulty",
-                "object"    : "09a95e08-5b53-4734-815f-a9c12300fc62",
-                "severity"  : "NORMAL",
-                "date-time" : "$$time$$",
-                "specific-problem" : "C/U-plane logical Connection faulty",
-
-                "fault-id": "28",
-                "fault-severity" : "CRITICAL",
-                "affected-object" : "$$hostname$$",
-                "cleared" : "true",
-                "text" : "C/U-plane logical Connection faulty"
-            }
-        ]
-    }
-}
diff --git a/solution/network/ntsim-ng-o-ru/o-ru-11224/ietf-hardware-operational.json b/solution/network/ntsim-ng-o-ru/o-ru-11224/ietf-hardware-operational.json
deleted file mode 100644
index b0a474c..0000000
--- a/solution/network/ntsim-ng-o-ru/o-ru-11224/ietf-hardware-operational.json
+++ /dev/null
@@ -1,442 +0,0 @@
-{
-  "ietf-hardware:hardware": {
-    "component": [
-      {
-        "name": "chassis-temperature-exhaust",
-        "alias": "chassis-temperature-exhaust",
-        "sensor-data": {
-          "value": 30,
-          "value-type": "celsius",
-          "oper-status": "ok",
-          "value-timestamp": "2021-03-18T19:51:50.3Z"
-        },
-        "class": "iana-hardware:sensor",
-        "state": {
-          "oper-state": "enabled",
-          "admin-state": "locked"
-        },
-        "parent-rel-pos": 0,
-        "parent": "chassis"
-      },
-      {
-        "name": "slot2-logical2",
-        "alias": "Slot3-B",
-        "description": "SLOT3-B",
-        "class": "iana-hardware:module",
-        "state": {
-          "oper-state": "disabled",
-          "admin-state": "unlocked"
-        },
-        "parent-rel-pos": 3,
-        "parent": "slot2"
-      },
-      {
-        "name": "chassis-temperature-inlet",
-        "alias": "chassis-temperature-inlet",
-        "sensor-data": {
-          "value": 29,
-          "value-type": "celsius",
-          "oper-status": "ok",
-          "value-timestamp": "2021-03-18T19:51:50.3Z"
-        },
-        "class": "iana-hardware:sensor",
-        "state": {
-          "oper-state": "enabled",
-          "admin-state": "locked"
-        },
-        "parent-rel-pos": 1,
-        "parent": "chassis"
-      },
-      {
-        "name": "slot0-logical0-rrh",
-        "alias": "Slot0-A-rrh",
-        "class": "iana-hardware:port",
-        "contains-child": [
-          "slot0-logical0-rrh-temperature"
-        ],
-        "o-ran-hardware:o-ran-name": "slot0-logical0-rrh",
-        "state": {
-          "oper-state": "enabled",
-          "admin-state": "locked"
-        },
-        "serial-num": "AGNF714S",
-        "mfg-name": "ACME GMBH.",
-        "parent-rel-pos": 1,
-        "parent": "slot0-logical0",
-        "model-name": "ANSHEONXH-E7"
-      },
-      {
-        "name": "chassis-fan1",
-        "alias": "chassis-fan1",
-        "class": "iana-hardware:fan",
-        "contains-child": [
-          "chassis-fan1-speed"
-        ],
-        "state": {
-          "oper-state": "enabled",
-          "admin-state": "locked"
-        },
-        "parent-rel-pos": 3,
-        "parent": "chassis"
-      },
-      {
-        "name": "chassis-fan3-speed",
-        "alias": "chassis-fan3-speed",
-        "sensor-data": {
-          "value": 1000,
-          "value-type": "rpm",
-          "oper-status": "ok",
-          "value-timestamp": "2021-03-18T19:51:50.3Z"
-        },
-        "class": "iana-hardware:sensor",
-        "state": {
-          "oper-state": "enabled",
-          "admin-state": "locked"
-        },
-        "parent-rel-pos": 0,
-        "parent": "chassis-fan3"
-      },
-      {
-        "name": "slot0-logical1",
-        "alias": "Slot0-B",
-        "description": "SLOT0-B",
-        "class": "iana-hardware:module",
-        "state": {
-          "oper-state": "disabled",
-          "admin-state": "unlocked"
-        },
-        "parent-rel-pos": 2,
-        "parent": "slot0"
-      },
-      {
-        "name": "chassis-fan0",
-        "alias": "chassis-fan0",
-        "class": "iana-hardware:fan",
-        "contains-child": [
-          "chassis-fan0-speed"
-        ],
-        "state": {
-          "oper-state": "enabled",
-          "admin-state": "locked"
-        },
-        "parent-rel-pos": 2,
-        "parent": "chassis"
-      },
-      {
-        "name": "slot0-logical0",
-        "alias": "Slot0-A",
-        "description": "SLOT0-AZ",
-        "class": "iana-hardware:module",
-        "contains-child": [
-          "slot0-logical0-bbu",
-          "slot0-logical0-rrh"
-        ],
-        "state": {
-          "oper-state": "enabled",
-          "admin-state": "unlocked"
-        },
-        "parent-rel-pos": 1,
-        "parent": "slot0"
-      },
-      {
-        "name": "chassis",
-        "alias": "chassis",
-        "description": "O-RAN O-RU O1 Simulator",
-        "class": "iana-hardware:chassis",
-        "contains-child": [
-          "cpu",
-          "chassis-temperature-inlet",
-          "chassis-temperature-exhaust",
-          "chassis-fan1",
-          "slot0",
-          "chassis-fan2",
-          "chassis-fan3",
-          "slot2",
-          "chassis-fan0"
-        ],
-        "state": {
-          "oper-state": "enabled",
-          "admin-state": "unlocked"
-        },
-        "serial-num": "23412",
-        "mfg-name": "NTS",
-        "software-rev": "3.8.1 (2029-10-30 11:47:59)",
-        "model-name": "O1-O-RU-Simulator"
-      },
-      {
-        "name": "slot0-logical2",
-        "alias": "Slot0-C",
-        "description": "SLOT0-C",
-        "class": "iana-hardware:module",
-        "state": {
-          "oper-state": "disabled",
-          "admin-state": "unlocked"
-        },
-        "parent-rel-pos": 3,
-        "parent": "slot0"
-      },
-      {
-        "name": "slot0-logical0-bbu-temperature",
-        "alias": "Slot0-A-bbu-temperature",
-        "sensor-data": {
-          "value": 37,
-          "value-type": "celsius",
-          "oper-status": "ok",
-          "value-timestamp": "2021-03-18T19:51:50.3Z"
-        },
-        "class": "iana-hardware:sensor",
-        "state": {
-          "oper-state": "enabled",
-          "admin-state": "locked"
-        },
-        "parent-rel-pos": 0,
-        "parent": "slot0-logical0-bbu"
-      },
-      {
-        "name": "chassis-fan3",
-        "alias": "chassis-fan3",
-        "class": "iana-hardware:fan",
-        "contains-child": [
-          "chassis-fan3-speed"
-        ],
-        "state": {
-          "oper-state": "enabled",
-          "admin-state": "locked"
-        },
-        "parent-rel-pos": 5,
-        "parent": "chassis"
-      },
-      {
-        "name": "chassis-fan2",
-        "alias": "chassis-fan2",
-        "class": "iana-hardware:fan",
-        "contains-child": [
-          "chassis-fan2-speed"
-        ],
-        "state": {
-          "oper-state": "enabled",
-          "admin-state": "locked"
-        },
-        "parent-rel-pos": 4,
-        "parent": "chassis"
-      },
-      {
-        "name": "cpu-temperature",
-        "alias": "cpu-temperature",
-        "sensor-data": {
-          "value": 30,
-          "value-type": "celsius",
-          "oper-status": "ok",
-          "value-timestamp": "2021-03-18T19:51:50.3Z"
-        },
-        "class": "iana-hardware:sensor",
-        "state": {
-          "oper-state": "enabled",
-          "admin-state": "locked"
-        },
-        "parent-rel-pos": 0,
-        "parent": "cpu"
-      },
-      {
-        "name": "slot2-logical0",
-        "alias": "Slot2-C",
-        "description": "SLOT2-C",
-        "class": "iana-hardware:module",
-        "state": {
-          "oper-state": "disabled",
-          "admin-state": "unlocked"
-        },
-        "parent-rel-pos": 1,
-        "parent": "slot2"
-      },
-      {
-        "name": "slot2-logical1",
-        "alias": "Slot3-A",
-        "description": "SLOT3-A",
-        "class": "iana-hardware:module",
-        "state": {
-          "oper-state": "disabled",
-          "admin-state": "unlocked"
-        },
-        "parent-rel-pos": 2,
-        "parent": "slot2"
-      },
-      {
-        "name": "slot0-logical0-bbu",
-        "alias": "Slot0-A-bbu",
-        "class": "iana-hardware:port",
-        "contains-child": [
-          "slot0-logical0-bbu-temperature"
-        ],
-        "o-ran-hardware:o-ran-name": "slot0-logical0-bbu",
-        "state": {
-          "oper-state": "enabled",
-          "admin-state": "unlocked"
-        },
-        "serial-num": "AGNN214S",
-        "mfg-name": "ACME GMBH.",
-        "parent-rel-pos": 0,
-        "parent": "slot0-logical0",
-        "model-name": "ANSHEONXH-E7"
-      },
-      {
-        "name": "chassis-fan1-speed",
-        "alias": "chassis-fan1-speed",
-        "sensor-data": {
-          "value": 4100,
-          "value-type": "rpm",
-          "oper-status": "ok",
-          "value-timestamp": "2021-03-18T19:51:50.3Z"
-        },
-        "class": "iana-hardware:sensor",
-        "state": {
-          "oper-state": "enabled",
-          "admin-state": "locked"
-        },
-        "parent-rel-pos": 0,
-        "parent": "chassis-fan1"
-      },
-      {
-        "name": "chassis-fan0-speed",
-        "alias": "chassis-fan0-speed",
-        "sensor-data": {
-          "value": 4100,
-          "value-type": "rpm",
-          "oper-status": "ok",
-          "value-timestamp": "2021-03-18T19:51:50.3Z"
-        },
-        "class": "iana-hardware:sensor",
-        "state": {
-          "oper-state": "enabled",
-          "admin-state": "locked"
-        },
-        "parent-rel-pos": 0,
-        "parent": "chassis-fan0"
-      },
-      {
-        "name": "slot0",
-        "alias": "slot0",
-        "class": "iana-hardware:module",
-        "contains-child": [
-          "slot0-logical1",
-          "slot0-logical2",
-          "slot0-logical0",
-          "slot0-temperature"
-        ],
-        "state": {
-          "oper-state": "enabled",
-          "admin-state": "unlocked"
-        },
-        "serial-num": "7220530",
-        "parent-rel-pos": 7,
-        "software-rev": "0",
-        "parent": "chassis",
-        "firmware-rev": "12.00.42-S (0F7F1001)",
-        "model-name": "385A-SFP-2P-40-FHL-JC3"
-      },
-      {
-        "name": "slot2",
-        "alias": "slot2",
-        "class": "iana-hardware:module",
-        "contains-child": [
-          "slot2-temperature",
-          "slot2-logical0",
-          "slot2-logical2",
-          "slot2-logical1"
-        ],
-        "state": {
-          "oper-state": "enabled",
-          "admin-state": "unlocked"
-        },
-        "serial-num": "2522642",
-        "parent-rel-pos": 9,
-        "software-rev": "0",
-        "parent": "chassis",
-        "firmware-rev": "12.00.42-S (0F7F1001)",
-        "model-name": "339B-SFP-2P-75-FHL-JC3"
-      },
-      {
-        "name": "slot0-logical0-rrh-temperature",
-        "alias": "Slot0-A-rrh-temperature",
-        "sensor-data": {
-          "value": 35,
-          "value-type": "celsius",
-          "oper-status": "ok",
-          "value-timestamp": "2021-03-18T19:51:50.3Z"
-        },
-        "class": "iana-hardware:sensor",
-        "state": {
-          "oper-state": "enabled",
-          "admin-state": "locked"
-        },
-        "parent-rel-pos": 0,
-        "parent": "slot0-logical0-rrh"
-      },
-      {
-        "name": "slot0-temperature",
-        "alias": "slot0-temperature",
-        "sensor-data": {
-          "value": 51,
-          "value-type": "celsius",
-          "oper-status": "ok",
-          "value-timestamp": "2021-03-18T19:51:50.3Z"
-        },
-        "class": "iana-hardware:sensor",
-        "state": {
-          "oper-state": "enabled",
-          "admin-state": "locked"
-        },
-        "parent-rel-pos": 0,
-        "parent": "slot0"
-      },
-      {
-        "name": "cpu",
-        "alias": "cpu",
-        "class": "iana-hardware:cpu",
-        "contains-child": [
-          "cpu-temperature"
-        ],
-        "state": {
-          "oper-state": "enabled",
-          "admin-state": "locked"
-        },
-        "parent-rel-pos": 6,
-        "parent": "chassis"
-      },
-      {
-        "name": "chassis-fan2-speed",
-        "alias": "chassis-fan2-speed",
-        "sensor-data": {
-          "value": 4100,
-          "value-type": "rpm",
-          "oper-status": "ok",
-          "value-timestamp": "2021-03-18T19:51:50.3Z"
-        },
-        "class": "iana-hardware:sensor",
-        "state": {
-          "oper-state": "enabled",
-          "admin-state": "locked"
-        },
-        "parent-rel-pos": 0,
-        "parent": "chassis-fan2"
-      },
-      {
-        "name": "slot2-temperature",
-        "alias": "slot2-temperature",
-        "sensor-data": {
-          "value": 49,
-          "value-type": "celsius",
-          "oper-status": "ok",
-          "value-timestamp": "2021-03-18T19:51:50.3Z"
-        },
-        "class": "iana-hardware:sensor",
-        "state": {
-          "oper-state": "enabled",
-          "admin-state": "locked"
-        },
-        "parent-rel-pos": 0,
-        "parent": "slot2"
-      }
-    ]
-  }
-}
diff --git a/solution/network/ntsim-ng-o-ru/o-ru-11224/ietf-hardware-running.json b/solution/network/ntsim-ng-o-ru/o-ru-11224/ietf-hardware-running.json
deleted file mode 100644
index 4800c35..0000000
--- a/solution/network/ntsim-ng-o-ru/o-ru-11224/ietf-hardware-running.json
+++ /dev/null
@@ -1,276 +0,0 @@
-{
-  "ietf-hardware:hardware": {
-    "component": [
-      {
-        "name": "chassis-temperature-exhaust",
-        "alias": "chassis-temperature-exhaust",
-        "class": "iana-hardware:sensor",
-        "state": {
-          "admin-state": "locked"
-        },
-        "parent-rel-pos": 0,
-        "parent": "chassis"
-      },
-      {
-        "name": "slot2-logical2",
-        "alias": "Slot3-B",
-        "class": "iana-hardware:module",
-        "state": {
-          "admin-state": "unlocked"
-        },
-        "parent-rel-pos": 3,
-        "parent": "slot2"
-      },
-      {
-        "name": "chassis-temperature-inlet",
-        "alias": "chassis-temperature-inlet",
-        "class": "iana-hardware:sensor",
-        "state": {
-          "admin-state": "locked"
-        },
-        "parent-rel-pos": 1,
-        "parent": "chassis"
-      },
-      {
-        "name": "slot0-logical0-rrh",
-        "alias": "Slot0-A-rrh",
-        "class": "iana-hardware:port",
-        "o-ran-hardware:o-ran-name": "slot0-logical0-rrh",
-        "state": {
-          "admin-state": "locked"
-        },
-        "parent-rel-pos": 1,
-        "parent": "slot0-logical0"
-      },
-      {
-        "name": "chassis-fan1",
-        "alias": "chassis-fan1",
-        "class": "iana-hardware:fan",
-        "state": {
-          "admin-state": "locked"
-        },
-        "parent-rel-pos": 3,
-        "parent": "chassis"
-      },
-      {
-        "name": "chassis-fan3-speed",
-        "alias": "chassis-fan3-speed",
-        "class": "iana-hardware:sensor",
-        "state": {
-          "admin-state": "locked"
-        },
-        "parent-rel-pos": 0,
-        "parent": "chassis-fan3"
-      },
-      {
-        "name": "slot0-logical1",
-        "alias": "Slot0-B",
-        "class": "iana-hardware:module",
-        "state": {
-          "admin-state": "unlocked"
-        },
-        "parent-rel-pos": 2,
-        "parent": "slot0"
-      },
-      {
-        "name": "chassis-fan0",
-        "alias": "chassis-fan0",
-        "class": "iana-hardware:fan",
-        "state": {
-          "admin-state": "locked"
-        },
-        "parent-rel-pos": 2,
-        "parent": "chassis"
-      },
-      {
-        "name": "slot0-logical0",
-        "alias": "Slot0-A",
-        "class": "iana-hardware:module",
-        "state": {
-          "admin-state": "unlocked"
-        },
-        "parent-rel-pos": 1,
-        "parent": "slot0"
-      },
-      {
-        "name": "chassis",
-        "alias": "chassis",
-        "class": "iana-hardware:chassis",
-        "state": {
-          "admin-state": "unlocked"
-        }
-      },
-      {
-        "name": "slot0-logical2",
-        "alias": "Slot0-C",
-        "class": "iana-hardware:module",
-        "state": {
-          "admin-state": "unlocked"
-        },
-        "parent-rel-pos": 3,
-        "parent": "slot0"
-      },
-      {
-        "name": "slot0-logical0-bbu-temperature",
-        "alias": "Slot0-A-bbu-temperature",
-        "class": "iana-hardware:sensor",
-        "state": {
-          "admin-state": "locked"
-        },
-        "parent-rel-pos": 0,
-        "parent": "slot0-logical0-bbu"
-      },
-      {
-        "name": "chassis-fan3",
-        "alias": "chassis-fan3",
-        "class": "iana-hardware:fan",
-        "state": {
-          "admin-state": "locked"
-        },
-        "parent-rel-pos": 5,
-        "parent": "chassis"
-      },
-      {
-        "name": "chassis-fan2",
-        "alias": "chassis-fan2",
-        "class": "iana-hardware:fan",
-        "state": {
-          "admin-state": "locked"
-        },
-        "parent-rel-pos": 4,
-        "parent": "chassis"
-      },
-      {
-        "name": "cpu-temperature",
-        "alias": "cpu-temperature",
-        "class": "iana-hardware:sensor",
-        "state": {
-          "admin-state": "locked"
-        },
-        "parent-rel-pos": 0,
-        "parent": "cpu"
-      },
-      {
-        "name": "slot2-logical0",
-        "alias": "Slot2-C",
-        "class": "iana-hardware:module",
-        "state": {
-          "admin-state": "unlocked"
-        },
-        "parent-rel-pos": 1,
-        "parent": "slot2"
-      },
-      {
-        "name": "slot2-logical1",
-        "alias": "Slot3-A",
-        "class": "iana-hardware:module",
-        "state": {
-          "admin-state": "unlocked"
-        },
-        "parent-rel-pos": 2,
-        "parent": "slot2"
-      },
-      {
-        "name": "slot0-logical0-bbu",
-        "alias": "Slot0-A-bbu",
-        "class": "iana-hardware:port",
-        "o-ran-hardware:o-ran-name": "slot0-logical0-bbu",
-        "state": {
-          "admin-state": "unlocked"
-        },
-        "parent-rel-pos": 0,
-        "parent": "slot0-logical0"
-      },
-      {
-        "name": "chassis-fan1-speed",
-        "alias": "chassis-fan1-speed",
-        "class": "iana-hardware:sensor",
-        "state": {
-          "admin-state": "locked"
-        },
-        "parent-rel-pos": 0,
-        "parent": "chassis-fan1"
-      },
-      {
-        "name": "chassis-fan0-speed",
-        "alias": "chassis-fan0-speed",
-        "class": "iana-hardware:sensor",
-        "state": {
-          "admin-state": "locked"
-        },
-        "parent-rel-pos": 0,
-        "parent": "chassis-fan0"
-      },
-      {
-        "name": "slot0",
-        "alias": "slot0",
-        "class": "iana-hardware:module",
-        "state": {
-          "admin-state": "unlocked"
-        },
-        "parent-rel-pos": 7,
-        "parent": "chassis"
-      },
-      {
-        "name": "slot2",
-        "alias": "slot2",
-        "class": "iana-hardware:module",
-        "state": {
-          "admin-state": "unlocked"
-        },
-        "parent-rel-pos": 9,
-        "parent": "chassis"
-      },
-      {
-        "name": "slot0-logical0-rrh-temperature",
-        "alias": "Slot0-A-rrh-temperature",
-        "class": "iana-hardware:sensor",
-        "state": {
-          "admin-state": "locked"
-        },
-        "parent-rel-pos": 0,
-        "parent": "slot0-logical0-rrh"
-      },
-      {
-        "name": "slot0-temperature",
-        "alias": "slot0-temperature",
-        "class": "iana-hardware:sensor",
-        "state": {
-          "admin-state": "locked"
-        },
-        "parent-rel-pos": 0,
-        "parent": "slot0"
-      },
-      {
-        "name": "cpu",
-        "alias": "cpu",
-        "class": "iana-hardware:cpu",
-        "state": {
-          "admin-state": "locked"
-        },
-        "parent-rel-pos": 6,
-        "parent": "chassis"
-      },
-      {
-        "name": "chassis-fan2-speed",
-        "alias": "chassis-fan2-speed",
-        "class": "iana-hardware:sensor",
-        "state": {
-          "admin-state": "locked"
-        },
-        "parent-rel-pos": 0,
-        "parent": "chassis-fan2"
-      },
-      {
-        "name": "slot2-temperature",
-        "alias": "slot2-temperature",
-        "class": "iana-hardware:sensor",
-        "state": {
-          "admin-state": "locked"
-        },
-        "parent-rel-pos": 0,
-        "parent": "slot2"
-      }
-    ]
-  }
-}
diff --git a/solution/network/ntsim-ng-o-ru/o-ru-11224/ietf-interfaces-operational.xml b/solution/network/ntsim-ng-o-ru/o-ru-11224/ietf-interfaces-operational.xml
deleted file mode 100644
index c6d3038..0000000
--- a/solution/network/ntsim-ng-o-ru/o-ru-11224/ietf-interfaces-operational.xml
+++ /dev/null
@@ -1,151 +0,0 @@
-  <interfaces xmlns="urn:ietf:params:xml:ns:yang:ietf-interfaces">
-    <interface>
-      <name>d3ea2f17-a841-4e71-9ef9-9549159aabe7</name>
-      <description>Simulated interface for O-RU</description>
-      <type xmlns:ianaift="urn:ietf:params:xml:ns:yang:iana-if-type">ianaift:ethernetCsmacd</type>
-      <enabled>true</enabled>
-      <link-up-down-trap-enable>disabled</link-up-down-trap-enable>
-      <ipv4 xmlns="urn:ietf:params:xml:ns:yang:ietf-ip">
-        <enabled>false</enabled>
-        <forwarding>false</forwarding>
-        <mtu>42783</mtu>
-        <address>
-          <ip>6.122.172.49</ip>
-          <prefix-length>14</prefix-length>
-          <origin>static</origin>
-        </address>
-        <address>
-          <ip>206.35.59.57</ip>
-          <netmask>199.41.255.188</netmask>
-          <origin>random</origin>
-        </address>
-        <neighbor>
-          <ip>48.159.72.129</ip>
-          <link-layer-address>42:8f:12:23:03:d3</link-layer-address>
-          <origin>other</origin>
-        </neighbor>
-        <neighbor>
-          <ip>187.230.45.63</ip>
-          <link-layer-address>77:b5:38:45:08:be</link-layer-address>
-          <origin>dynamic</origin>
-        </neighbor>
-        <m-plane-marking xmlns="urn:o-ran:interfaces:1.0">13</m-plane-marking>
-        <diffserv-markings xmlns="urn:o-ran:interfaces:1.0">
-          <u-plane-marking>38</u-plane-marking>
-          <c-plane-marking>16</c-plane-marking>
-          <s-plane-marking>62</s-plane-marking>
-          <other-marking>27</other-marking>
-          <enhanced-uplane-markings>
-            <up-marking-name>X5f0ExbIx4jg5fpd9c0wiOEJbCXzpYxe3M7AkiaRnlZsAgxCsx0LlFmwhk6yavM5iTFu4Idr3cTwtj0NQ0ycFVAO7ymh41meM2IQCNhFZ33km30c4ygJlRqshMJlFYrsS1iuOs1Gv5SJ8SNcr4WENm740IiyGJ0qLaUrCW7Z10A9SombsaQ7oPboptWYdOoQRjhl7hl8hV91bv5vxNCVuOcTh0RmP84Grm1qD</up-marking-name>
-            <enhanced-marking>21</enhanced-marking>
-          </enhanced-uplane-markings>
-          <enhanced-uplane-markings>
-            <up-marking-name>2zF55KBup</up-marking-name>
-            <enhanced-marking>5</enhanced-marking>
-          </enhanced-uplane-markings>
-        </diffserv-markings>
-      </ipv4>
-      <ipv6 xmlns="urn:ietf:params:xml:ns:yang:ietf-ip">
-        <enabled>true</enabled>
-        <forwarding>true</forwarding>
-        <mtu>1163652863</mtu>
-        <address>
-          <ip>ea87:d264:da5e:5b19:4713:7266:f91e:14f7</ip>
-          <prefix-length>124</prefix-length>
-          <origin>other</origin>
-          <status>tentative</status>
-        </address>
-        <address>
-          <ip>2853:6b9:c531:f3c1:6875:f55:17ea:157b</ip>
-          <prefix-length>65</prefix-length>
-          <origin>link-layer</origin>
-          <status>preferred</status>
-        </address>
-        <neighbor>
-          <ip>e6ae:4eeb:25c8:4ce6:9a7:5c2c:4293:f42e</ip>
-          <link-layer-address>65:58:a4:47:f1:91</link-layer-address>
-          <origin>other</origin>
-          <is-router/>
-          <state>probe</state>
-        </neighbor>
-        <neighbor>
-          <ip>f88d:e8e9:8f68:ff46:ae1a:8329:67bc:bd6f</ip>
-          <link-layer-address>32:d7:a9:c1:37:14</link-layer-address>
-          <origin>other</origin>
-          <state>incomplete</state>
-        </neighbor>
-        <dup-addr-detect-transmits>1225514618</dup-addr-detect-transmits>
-        <autoconf>
-          <create-global-addresses>true</create-global-addresses>
-          <create-temporary-addresses>true</create-temporary-addresses>
-          <temporary-valid-lifetime>2335597472</temporary-valid-lifetime>
-          <temporary-preferred-lifetime>922813230</temporary-preferred-lifetime>
-        </autoconf>
-        <m-plane-marking xmlns="urn:o-ran:interfaces:1.0">33</m-plane-marking>
-        <diffserv-markings xmlns="urn:o-ran:interfaces:1.0">
-          <u-plane-marking>29</u-plane-marking>
-          <c-plane-marking>50</c-plane-marking>
-          <s-plane-marking>14</s-plane-marking>
-          <other-marking>61</other-marking>
-          <enhanced-uplane-markings>
-            <up-marking-name>8iROcw05EJqk0qe08RerP</up-marking-name>
-            <enhanced-marking>18</enhanced-marking>
-          </enhanced-uplane-markings>
-          <enhanced-uplane-markings>
-            <up-marking-name>M14steKtoB9s09xEKPYLf4LfWZHDetPSuUkP05bgykIym746WUR3ZCjVuSqIlgAI2Nx2KIiaV0Bh7xnVs7YjB965TwF7E8PGVeAxPSHKKaTJI8w2fnlRwjWqPuxmCe2xsDWhnvT0GMBoV8i2vDTTOIbvcAROOUd9p9qMEcEcYgsLgKODfzw3hAzlaq9Zce8BfqgUCUYt2r6abMNrmcuDMVZWm0Nq7N2m6a8IW73Zy21BOP2aTpGxkxlyp9ZwO</up-marking-name>
-            <enhanced-marking>29</enhanced-marking>
-          </enhanced-uplane-markings>
-        </diffserv-markings>
-      </ipv6>
-      <alias-macs xmlns="urn:o-ran:interfaces:1.0">b2:24:6a:90:68:bb</alias-macs>
-      <alias-macs xmlns="urn:o-ran:interfaces:1.0">ba:33:50:5b:58:f7</alias-macs>
-      <mac-address xmlns="urn:o-ran:interfaces:1.0">2c:2b:1f:8c:3f:a2</mac-address>
-      <port-reference xmlns="urn:o-ran:interfaces:1.0">
-        <port-number>113</port-number>
-      </port-reference>
-      <l2-mtu xmlns="urn:o-ran:interfaces:1.0">60489</l2-mtu>
-      <vlan-tagging xmlns="urn:o-ran:interfaces:1.0">true</vlan-tagging>
-      <class-of-service xmlns="urn:o-ran:interfaces:1.0">
-        <u-plane-marking>3</u-plane-marking>
-        <c-plane-marking>0</c-plane-marking>
-        <m-plane-marking>1</m-plane-marking>
-        <s-plane-marking>6</s-plane-marking>
-        <other-marking>4</other-marking>
-        <enhanced-uplane-markings>
-          <up-marking-name>dtSbiQU8fgixwU6tOQNLIc1PPuz2LFeQ862rPWr44JtAvzVbi</up-marking-name>
-          <enhanced-marking>5</enhanced-marking>
-        </enhanced-uplane-markings>
-        <enhanced-uplane-markings>
-          <up-marking-name>MQHBk8vYNCGOII7pwymAaP2xhPJrxxjcn1NA9bqPN6D</up-marking-name>
-          <enhanced-marking>2</enhanced-marking>
-        </enhanced-uplane-markings>
-      </class-of-service>
-      <admin-status>up</admin-status>
-      <oper-status>unknown</oper-status>
-      <last-change>2018-12-04T01:22:44Z</last-change>
-      <if-index>1399123220</if-index>
-      <phys-address>fc:07:1e:ec:24:a3</phys-address>
-      <higher-layer-if>80kcD05DwnN81FHWZgSwQXgpN7kjx4KF44JzXOcl3St5p21gjLM9A2yg1LzyPk</higher-layer-if>
-      <lower-layer-if>80kcD05DwnN81FHWZgSwQXgpN7kjx4KF44JzXOcl3St5p21gjLM9A2yg1LzyPk</lower-layer-if>
-      <speed>2897952377425309696</speed>
-      <statistics>
-        <discontinuity-time>2037-04-15T16:07:29Z</discontinuity-time>
-        <in-octets>2571268368646403584</in-octets>
-        <in-unicast-pkts>6267618126971935744</in-unicast-pkts>
-        <in-broadcast-pkts>1109994561130658944</in-broadcast-pkts>
-        <in-multicast-pkts>3315305959068576256</in-multicast-pkts>
-        <in-discards>1267048002</in-discards>
-        <in-errors>2454029092</in-errors>
-        <in-unknown-protos>603209482</in-unknown-protos>
-        <out-octets>1059514199864528128</out-octets>
-        <out-unicast-pkts>6657904184753078272</out-unicast-pkts>
-        <out-broadcast-pkts>5105130509884859392</out-broadcast-pkts>
-        <out-multicast-pkts>2014558074734005248</out-multicast-pkts>
-        <out-discards>2053161590</out-discards>
-        <out-errors>1475901304</out-errors>
-      </statistics>
-      <last-cleared xmlns="urn:o-ran:interfaces:1.0">1976-10-15T10:34:12Z</last-cleared>
-      <interface-groups-id xmlns="urn:o-ran:interfaces:1.0">56</interface-groups-id>
-      <interface-groups-id xmlns="urn:o-ran:interfaces:1.0">143</interface-groups-id>
-    </interface>
-  </interfaces>
diff --git a/solution/network/ntsim-ng-o-ru/o-ru-11224/ietf-interfaces-running.xml b/solution/network/ntsim-ng-o-ru/o-ru-11224/ietf-interfaces-running.xml
deleted file mode 100644
index 19d5f98..0000000
--- a/solution/network/ntsim-ng-o-ru/o-ru-11224/ietf-interfaces-running.xml
+++ /dev/null
@@ -1,111 +0,0 @@
-  <interfaces xmlns="urn:ietf:params:xml:ns:yang:ietf-interfaces">
-    <interface>
-      <name>d3ea2f17-a841-4e71-9ef9-9549159aabe7</name>
-      <description>Simulated interface for O-RU</description>
-      <type xmlns:ianaift="urn:ietf:params:xml:ns:yang:iana-if-type">ianaift:ethernetCsmacd</type>
-      <enabled>true</enabled>
-      <link-up-down-trap-enable>disabled</link-up-down-trap-enable>
-      <ipv4 xmlns="urn:ietf:params:xml:ns:yang:ietf-ip">
-        <enabled>false</enabled>
-        <forwarding>false</forwarding>
-        <mtu>42783</mtu>
-        <address>
-          <ip>6.122.172.49</ip>
-          <prefix-length>14</prefix-length>
-        </address>
-        <address>
-          <ip>206.35.59.57</ip>
-          <netmask>199.41.255.188</netmask>
-        </address>
-        <neighbor>
-          <ip>48.159.72.129</ip>
-          <link-layer-address>42:8f:12:23:03:d3</link-layer-address>
-        </neighbor>
-        <neighbor>
-          <ip>187.230.45.63</ip>
-          <link-layer-address>77:b5:38:45:08:be</link-layer-address>
-        </neighbor>
-        <m-plane-marking xmlns="urn:o-ran:interfaces:1.0">13</m-plane-marking>
-        <diffserv-markings xmlns="urn:o-ran:interfaces:1.0">
-          <u-plane-marking>38</u-plane-marking>
-          <c-plane-marking>16</c-plane-marking>
-          <s-plane-marking>62</s-plane-marking>
-          <other-marking>27</other-marking>
-          <enhanced-uplane-markings>
-            <up-marking-name>X5f0ExbIx4jg5fpd9c0wiOEJbCXzpYxe3M7AkiaRnlZsAgxCsx0LlFmwhk6yavM5iTFu4Idr3cTwtj0NQ0ycFVAO7ymh41meM2IQCNhFZ33km30c4ygJlRqshMJlFYrsS1iuOs1Gv5SJ8SNcr4WENm740IiyGJ0qLaUrCW7Z10A9SombsaQ7oPboptWYdOoQRjhl7hl8hV91bv5vxNCVuOcTh0RmP84Grm1qD</up-marking-name>
-            <enhanced-marking>21</enhanced-marking>
-          </enhanced-uplane-markings>
-          <enhanced-uplane-markings>
-            <up-marking-name>2zF55KBup</up-marking-name>
-            <enhanced-marking>5</enhanced-marking>
-          </enhanced-uplane-markings>
-        </diffserv-markings>
-      </ipv4>
-      <ipv6 xmlns="urn:ietf:params:xml:ns:yang:ietf-ip">
-        <enabled>true</enabled>
-        <forwarding>true</forwarding>
-        <mtu>1163652863</mtu>
-        <address>
-          <ip>ea87:d264:da5e:5b19:4713:7266:f91e:14f7</ip>
-          <prefix-length>124</prefix-length>
-        </address>
-        <address>
-          <ip>2853:6b9:c531:f3c1:6875:f55:17ea:157b</ip>
-          <prefix-length>65</prefix-length>
-        </address>
-        <neighbor>
-          <ip>e6ae:4eeb:25c8:4ce6:9a7:5c2c:4293:f42e</ip>
-          <link-layer-address>65:58:a4:47:f1:91</link-layer-address>
-        </neighbor>
-        <neighbor>
-          <ip>f88d:e8e9:8f68:ff46:ae1a:8329:67bc:bd6f</ip>
-          <link-layer-address>32:d7:a9:c1:37:14</link-layer-address>
-        </neighbor>
-        <dup-addr-detect-transmits>1225514618</dup-addr-detect-transmits>
-        <autoconf>
-          <create-global-addresses>true</create-global-addresses>
-          <create-temporary-addresses>true</create-temporary-addresses>
-          <temporary-valid-lifetime>2335597472</temporary-valid-lifetime>
-          <temporary-preferred-lifetime>922813230</temporary-preferred-lifetime>
-        </autoconf>
-        <m-plane-marking xmlns="urn:o-ran:interfaces:1.0">33</m-plane-marking>
-        <diffserv-markings xmlns="urn:o-ran:interfaces:1.0">
-          <u-plane-marking>29</u-plane-marking>
-          <c-plane-marking>50</c-plane-marking>
-          <s-plane-marking>14</s-plane-marking>
-          <other-marking>61</other-marking>
-          <enhanced-uplane-markings>
-            <up-marking-name>8iROcw05EJqk0qe08RerP</up-marking-name>
-            <enhanced-marking>18</enhanced-marking>
-          </enhanced-uplane-markings>
-          <enhanced-uplane-markings>
-            <up-marking-name>M14steKtoB9s09xEKPYLf4LfWZHDetPSuUkP05bgykIym746WUR3ZCjVuSqIlgAI2Nx2KIiaV0Bh7xnVs7YjB965TwF7E8PGVeAxPSHKKaTJI8w2fnlRwjWqPuxmCe2xsDWhnvT0GMBoV8i2vDTTOIbvcAROOUd9p9qMEcEcYgsLgKODfzw3hAzlaq9Zce8BfqgUCUYt2r6abMNrmcuDMVZWm0Nq7N2m6a8IW73Zy21BOP2aTpGxkxlyp9ZwO</up-marking-name>
-            <enhanced-marking>29</enhanced-marking>
-          </enhanced-uplane-markings>
-        </diffserv-markings>
-      </ipv6>
-      <alias-macs xmlns="urn:o-ran:interfaces:1.0">b2:24:6a:90:68:bb</alias-macs>
-      <alias-macs xmlns="urn:o-ran:interfaces:1.0">ba:33:50:5b:58:f7</alias-macs>
-      <mac-address xmlns="urn:o-ran:interfaces:1.0">2c:2b:1f:8c:3f:a2</mac-address>
-      <port-reference xmlns="urn:o-ran:interfaces:1.0">
-        <port-number>113</port-number>
-      </port-reference>
-      <l2-mtu xmlns="urn:o-ran:interfaces:1.0">60489</l2-mtu>
-      <vlan-tagging xmlns="urn:o-ran:interfaces:1.0">true</vlan-tagging>
-      <class-of-service xmlns="urn:o-ran:interfaces:1.0">
-        <u-plane-marking>3</u-plane-marking>
-        <c-plane-marking>0</c-plane-marking>
-        <m-plane-marking>1</m-plane-marking>
-        <s-plane-marking>6</s-plane-marking>
-        <other-marking>4</other-marking>
-        <enhanced-uplane-markings>
-          <up-marking-name>dtSbiQU8fgixwU6tOQNLIc1PPuz2LFeQ862rPWr44JtAvzVbi</up-marking-name>
-          <enhanced-marking>5</enhanced-marking>
-        </enhanced-uplane-markings>
-        <enhanced-uplane-markings>
-          <up-marking-name>MQHBk8vYNCGOII7pwymAaP2xhPJrxxjcn1NA9bqPN6D</up-marking-name>
-          <enhanced-marking>2</enhanced-marking>
-        </enhanced-uplane-markings>
-      </class-of-service>
-    </interface>
-  </interfaces>
diff --git a/solution/network/o-du-o1/data/_3gpp-common-managed-element-running.json b/solution/network/o-du-o1/data/_3gpp-common-managed-element-running.json
new file mode 100644
index 0000000..8ddc6bc
--- /dev/null
+++ b/solution/network/o-du-o1/data/_3gpp-common-managed-element-running.json
@@ -0,0 +1,102 @@
+{
+    "_3gpp-common-managed-element:ManagedElement": [
+      {
+        "id": "ManagedElement-002",
+        "attributes": {
+          "priorityLabel": 1
+        },
+        "_3gpp-nr-nrm-gnbdufunction:GNBDUFunction": [
+          {
+            "id": "GNBDUFunction-001",
+            "attributes": {
+              "priorityLabel": 1,
+              "gNBId": "1",
+              "gNBIdLength": 24,
+              "gNBDUId": "1",
+              "gNBDUName": "hostname_here"
+            },
+            "_3gpp-nr-nrm-nrcelldu:NRCellDU": [
+              {
+                "id": "NRCellDU-001",
+                "attributes": {
+                  "priorityLabel": 1,
+                  "cellLocalId": 1,
+                  "pLMNInfoList": [
+                    {
+                      "mcc": "310",
+                      "mnc": "410",
+                      "sd": "ff:ff:ff",
+                      "sst": 1
+                    },
+                    {
+                      "mcc": "310",
+                      "mnc": "410",
+                      "sd": "ff:ff:ff",
+                      "sst": 2
+                    },
+                    {
+                      "mcc": "310",
+                      "mnc": "410",
+                      "sd": "ff:ff:ff",
+                      "sst": 3
+                    },
+                    {
+                      "mcc": "310",
+                      "mnc": "410",
+                      "sd": "ff:ff:ff",
+                      "sst": 4
+                    },
+                    {
+                      "mcc": "310",
+                      "mnc": "410",
+                      "sd": "ff:ff:ff",
+                      "sst": 5
+                    },
+                    {
+                      "mcc": "310",
+                      "mnc": "410",
+                      "sd": "ff:ff:ff",
+                      "sst": 6
+                    }
+                  ],
+                  "nPNIdentityList": [
+                    {
+                      "idx": 0,
+                      "plmnid": [
+                        {
+                          "mcc": "310",
+                          "mnc": "410"
+                        }
+                      ],
+                      "cAGIdList": "cAGIdList1",
+                      "nIDList": "nIDList1"
+                    }
+                  ],
+                  "nRPCI": 1,
+                  "arfcnDL": 1,
+                  "rimRSMonitoringStartTime": "2024-06-19T20:00:00+00:00",
+                  "rimRSMonitoringStopTime": "2024-06-19T21:00:00+00:00",
+                  "rimRSMonitoringWindowDuration": 1,
+                  "rimRSMonitoringWindowStartingOffset": 1,
+                  "rimRSMonitoringWindowPeriodicity": 1,
+                  "rimRSMonitoringOccasionInterval": 1,
+                  "rimRSMonitoringOccasionStartingOffset": 0,
+                  "ssbFrequency": 1,
+                  "ssbPeriodicity": 5,
+                  "ssbSubCarrierSpacing": 15,
+                  "ssbOffset": 1,
+                  "ssbDuration": 1,
+                  "nRSectorCarrierRef": [
+                    "CN=NR-Sector-Carrier-001"
+                  ],
+                  "victimSetRef": "CN=Victim-Set-001",
+                  "aggressorSetRef": "CN=Aggressor-Set-001"
+                }
+              }
+            ]
+          }
+        ]
+      }
+    ]
+  }
+  
\ No newline at end of file
diff --git a/solution/network/o-du-o1/data/draft-schema-mount.json b/solution/network/o-du-o1/data/draft-schema-mount.json
new file mode 100644
index 0000000..62ebfb0
--- /dev/null
+++ b/solution/network/o-du-o1/data/draft-schema-mount.json
@@ -0,0 +1,42 @@
+{
+  "ietf-yang-schema-mount:schema-mounts": {
+    "namespace": [
+      {
+        "prefix": "or-agg-base",
+        "uri": "urn:o-ran:agg-base:1.0"
+      },
+      {
+        "prefix": "o-ran-int",
+        "uri": "urn:o-ran:interfaces:1.0"
+      },
+      {
+        "prefix": "o-ran-hw",
+        "uri": "urn:o-ran:hardware:1.0"
+      },
+      {
+        "prefix": "hw",
+        "uri": "urn:ietf:params:xml:ns:yang:ietf-hardware"
+      }
+    ],
+    "mount-point": [
+      {
+        "module": "o-ran-agg-interfaces",
+        "label": "interfaces-root",
+        "config": true,
+        "shared-schema": {}
+      },
+      {
+        "module": "o-ran-agg-hardware",
+        "label": "hardware-root",
+        "config": true,
+        "shared-schema": {}
+      },
+      {
+        "module": "o-ran-agg-ietf-hardware",
+        "label": "ietf-hardware-root",
+        "config": true,
+        "shared-schema": {}
+      }
+    ]
+  }
+}
diff --git a/solution/network/o-du-o1/data/ietf-hardware-running.json b/solution/network/o-du-o1/data/ietf-hardware-running.json
new file mode 100644
index 0000000..d4ca9c3
--- /dev/null
+++ b/solution/network/o-du-o1/data/ietf-hardware-running.json
@@ -0,0 +1,79 @@
+{
+    "ietf-hardware:hardware": {
+      "component": [
+        {
+          "name": "O-RU-Chassis",
+          "class": "iana-hardware:chassis",
+          "parent-rel-pos": 0,
+          "alias": "concat(node-id, '-', component/name)",
+          "asset-id": "uuid(node-id, component/name)",          
+          "state": {
+            "admin-state": "unlocked"
+          }
+        },
+        {
+          "name": "O-RU-Board",
+          "class": "o-ran-hardware:O-RAN-RADIO",
+          "parent": "O-RU-Chassis",
+          "parent-rel-pos": 0,
+          "alias": "concat(node-id, '-', component/name)",
+          "asset-id": "uuid(node-id, component/name)",          
+          "state": {
+            "admin-state": "unlocked"
+          },
+          "o-ran-hardware:energy-saving-enabled": true,
+          "o-ran-hardware:o-ran-name": "O-RU-Board"
+        },        
+        
+        {
+          "name": "O-RU-BF-CAL",
+          "class": "o-ran-hardware:O-RU-BF-CAL",
+          "parent": "O-RU-Chassis",
+          "parent-rel-pos": 3,
+          "alias": "concat(node-id, '-', component/name)",
+          "asset-id": "uuid(node-id, component/name)",          
+          "state": {
+            "admin-state": "unlocked"
+          }
+        },
+        {
+          "name": "O-RU-FEEDER",
+          "class": "o-ran-hardware:O-RU-FEEDER",
+          "parent": "O-RU-Chassis",
+          "parent-rel-pos": 4,
+          "alias": "concat(node-id, '-', component/name)",
+          "asset-id": "uuid(node-id, component/name)",          
+          "state": {
+            "admin-state": "unlocked"
+          }
+        },
+        {
+          "name": "O-RU-FPGA",
+          "class": "o-ran-hardware:O-RU-FPGA",
+          "parent": "O-RU-Chassis",
+          "parent-rel-pos": 5,
+          "alias": "concat(node-id, '-', component/name)",
+          "asset-id": "uuid(node-id, component/name)",          
+          "state": {
+            "admin-state": "unlocked"
+          },
+          "o-ran-hardware:energy-saving-enabled": true,
+          "o-ran-hardware:o-ran-name": "O-RU-FPGA"
+        },
+        {
+          "name": "O-RU-POWER-AMPLIFIER",
+          "class": "o-ran-hardware:O-RU-POWER-AMPLIFIER",
+          "parent": "O-RU-Chassis",
+          "parent-rel-pos": 6,
+          "alias": "concat(node-id, '-', component/name)",
+          "asset-id": "uuid(node-id, component/name)",          
+          "state": {
+            "admin-state": "unlocked"
+          },
+          "o-ran-hardware:energy-saving-enabled": true,
+          "o-ran-hardware:o-ran-name": "O-RU-POWER-AMPLIFIER"
+        }
+      ]
+    }
+  }
+  
\ No newline at end of file
diff --git a/solution/network/o-du-o1/data/ietf-netconf-acm-running.json b/solution/network/o-du-o1/data/ietf-netconf-acm-running.json
new file mode 100644
index 0000000..49561a7
--- /dev/null
+++ b/solution/network/o-du-o1/data/ietf-netconf-acm-running.json
@@ -0,0 +1,88 @@
+{
+    "ietf-netconf-acm:nacm": {
+      "enable-nacm": true,
+      "read-default": "permit",
+      "write-default": "deny",
+      "exec-default": "permit",
+      "enable-external-groups": false,
+      "groups": {
+        "group": [
+          {
+            "name": "sudo",
+            "user-name": [
+              "sudo",
+              "admin",
+              "demx8as6",
+              "netconf"
+            ]
+          },
+          {
+            "name": "nms",
+            "user-name": [
+              "nms",
+              "nero"
+            ]
+          },
+          {
+            "name": "fm-pm",
+            "user-name": [
+              "fm-pm",
+              "filippa"
+            ]
+          },
+          {
+            "name": "swm",
+            "user-name": [
+              "swm",
+              "swami"
+            ]
+          },
+          {
+            "name": "smo",
+            "user-name": [
+              "smo",
+              "simone"
+            ]
+          },
+          {
+            "name": "hybrid-odu",
+            "user-name": [
+              "hybrid-odu",
+              "haydon"
+            ]
+          },
+          {
+            "name": "carrier",
+            "user-name": [
+              "carrier",
+              "carron"
+            ]
+          }
+        ]
+      },
+      "rule-list": [
+        {
+          "name": "admin-rule",
+          "group": [
+            "sudo",
+            "nms",
+            "fm-pm",
+            "swm",
+            "smo",
+            "hybrid-odu",
+            "carrier"
+          ],
+          "rule": [
+            {
+              "name": "allow-all",
+              "module-name": "*",
+              "access-operations": "*",
+              "action": "permit",
+              "comment": "All is allowed, no restictions!"
+            }
+          ]
+        }
+      ]
+    }
+  }
+  
\ No newline at end of file
diff --git a/solution/network/o-du-o1/data/ietf-netconf-server-running.json b/solution/network/o-du-o1/data/ietf-netconf-server-running.json
new file mode 100644
index 0000000..432111d
--- /dev/null
+++ b/solution/network/o-du-o1/data/ietf-netconf-server-running.json
@@ -0,0 +1,46 @@
+{
+  "ietf-netconf-server:netconf-server": {
+    "listen": {
+      "idle-timeout": 0,
+      "endpoints": {
+        "endpoint": [
+          {
+            "name": "tls-endpoint",
+            "tls": {
+              "tcp-server-parameters": {
+                "local-address": "0.0.0.0",
+                "local-port": 6513
+              },
+              "tls-server-parameters": {
+                "server-identity": {
+                  "certificate": {
+                    "central-keystore-reference": {
+                      "asymmetric-key": "serverkey-tls",
+                      "certificate": "servercert-smo"
+                    }
+                  }
+                },
+                "client-authentication": {
+                  "ca-certs": {
+                    "central-truststore-reference": "cacerts"
+                  }
+                }
+              },
+              "netconf-server-parameters": {
+                "client-identity-mappings": {
+                  "cert-to-name": [
+                    {
+                      "id": 1,
+                      "fingerprint": "02:DC:CB:E3:29:E2:65:04:A8:DF:B3:63:E7:E4:1A:06:81:64:C6:DA:37",
+                      "map-type": "ietf-x509-cert-to-name:san-rfc822-name"
+                    }
+                  ]
+                }
+              }
+            }
+          }
+        ]
+      }
+    }
+  }
+}
\ No newline at end of file
diff --git a/solution/network/o-du-o1/data/ietf-yang-schema-mount.xml b/solution/network/o-du-o1/data/ietf-yang-schema-mount.xml
new file mode 100644
index 0000000..a2aa2f0
--- /dev/null
+++ b/solution/network/o-du-o1/data/ietf-yang-schema-mount.xml
@@ -0,0 +1,36 @@
+<schema-mounts xmlns="urn:ietf:params:xml:ns:yang:ietf-yang-schema-mount">
+	<namespace>
+		<prefix>or-agg-base</prefix>
+		<uri>urn:o-ran:agg-base:1.0</uri>
+	</namespace>
+	<namespace>
+		<prefix>o-ran-int</prefix>
+		<uri>urn:o-ran:interfaces:1.0</uri>
+	</namespace>
+	<namespace>
+		<prefix>o-ran-hw</prefix>
+		<uri>urn:o-ran:hardware:1.0</uri>
+	</namespace>
+	<namespace>
+		<prefix>hw</prefix>
+		<uri>urn:ietf:params:xml:ns:yang:ietf-hardware</uri>
+	</namespace>
+	<mount-point>
+		<module>o-ran-agg-interfaces</module>
+		<label>interfaces-root</label>
+		<config>true</config>
+		<inline/>
+	</mount-point>
+	<mount-point>
+		<module>o-ran-agg-hardware</module>
+		<label>hardware-root</label>
+		<config>true</config>
+		<inline/>
+	</mount-point>
+	<mount-point>
+		<module>o-ran-agg-ietf-hardware</module>
+		<label>ietf-hardware-root</label>
+		<config>true</config>
+		<inline/>
+	</mount-point>
+</schema-mounts>
diff --git a/solution/network/o-du-o1/data/o-ran-aggregation-base-d-operational-draft.xml b/solution/network/o-du-o1/data/o-ran-aggregation-base-d-operational-draft.xml
new file mode 100644
index 0000000..df13fb3
--- /dev/null
+++ b/solution/network/o-du-o1/data/o-ran-aggregation-base-d-operational-draft.xml
@@ -0,0 +1,37 @@
+<aggregated-o-ru xmlns="urn:o-ran:agg-base:1.0">
+  <aggregation>
+    <ru-instance>Baciells_sRU67XXX_B122601202134000326</ru-instance>
+    <interfaces-model  xmlns="urn:o-ran:agg-interfaces:1.0"> 
+        <interfaces xmlns="urn:ietf:params:xml:ns:yang:ietf-interfaces">
+          <interface>
+            <name>eth2-UPlane-VLAN</name>
+            <type xmlns:ianaift="urn:ietf:params:xml:ns:yang:iana-if-type">ianaift:l2vlan</type>
+            <enabled>true</enabled>
+            <ipv4 xmlns="urn:ietf:params:xml:ns:yang:ietf-ip">
+              <enabled>false</enabled>
+            </ipv4>
+            <vlan-id xmlns="urn:o-ran:interfaces:1.0">5</vlan-id>
+            <mac-address xmlns="urn:o-ran:interfaces:1.0">00:11:22:33:44:55</mac-address>
+          </interface>
+        </interfaces>
+    </interfaces-model>
+    <hardware-model  xmlns="urn:o-ran:agg-hardware:1.0"> 
+        <hardware xmlns="urn:ietf:params:xml:ns:yang:ietf-hardware">          
+          <component>
+            <name>slot0-logical0-bbu</name>
+            <class xmlns:ianahw="urn:ietf:params:xml:ns:yang:iana-hardware">ianahw:port</class>
+            <o-ran-name xmlns="urn:o-ran:hardware:1.0">slot0-logical0-bbu</o-ran-name> 
+          </component>
+        </hardware>
+    </hardware-model>
+    <ietf-hardware-model  xmlns="urn:o-ran:agg-ietf-hardware:1.0"> 
+        <hardware xmlns="urn:ietf:params:xml:ns:yang:ietf-hardware">          
+          <component>
+            <name>slot0-logical0-bbu</name>
+            <class xmlns:ianahw="urn:ietf:params:xml:ns:yang:iana-hardware">ianahw:port</class>
+            <o-ran-name xmlns="urn:o-ran:hardware:1.0">slot0-logical0-bbu</o-ran-name>
+          </component>
+        </hardware>
+    </ietf-hardware-model>
+  </aggregation>
+</aggregated-o-ru>
diff --git a/solution/network/o-du-o1/data/o-ran-aggregation-base-running-draft.xml b/solution/network/o-du-o1/data/o-ran-aggregation-base-running-draft.xml
new file mode 100644
index 0000000..df13fb3
--- /dev/null
+++ b/solution/network/o-du-o1/data/o-ran-aggregation-base-running-draft.xml
@@ -0,0 +1,37 @@
+<aggregated-o-ru xmlns="urn:o-ran:agg-base:1.0">
+  <aggregation>
+    <ru-instance>Baciells_sRU67XXX_B122601202134000326</ru-instance>
+    <interfaces-model  xmlns="urn:o-ran:agg-interfaces:1.0"> 
+        <interfaces xmlns="urn:ietf:params:xml:ns:yang:ietf-interfaces">
+          <interface>
+            <name>eth2-UPlane-VLAN</name>
+            <type xmlns:ianaift="urn:ietf:params:xml:ns:yang:iana-if-type">ianaift:l2vlan</type>
+            <enabled>true</enabled>
+            <ipv4 xmlns="urn:ietf:params:xml:ns:yang:ietf-ip">
+              <enabled>false</enabled>
+            </ipv4>
+            <vlan-id xmlns="urn:o-ran:interfaces:1.0">5</vlan-id>
+            <mac-address xmlns="urn:o-ran:interfaces:1.0">00:11:22:33:44:55</mac-address>
+          </interface>
+        </interfaces>
+    </interfaces-model>
+    <hardware-model  xmlns="urn:o-ran:agg-hardware:1.0"> 
+        <hardware xmlns="urn:ietf:params:xml:ns:yang:ietf-hardware">          
+          <component>
+            <name>slot0-logical0-bbu</name>
+            <class xmlns:ianahw="urn:ietf:params:xml:ns:yang:iana-hardware">ianahw:port</class>
+            <o-ran-name xmlns="urn:o-ran:hardware:1.0">slot0-logical0-bbu</o-ran-name> 
+          </component>
+        </hardware>
+    </hardware-model>
+    <ietf-hardware-model  xmlns="urn:o-ran:agg-ietf-hardware:1.0"> 
+        <hardware xmlns="urn:ietf:params:xml:ns:yang:ietf-hardware">          
+          <component>
+            <name>slot0-logical0-bbu</name>
+            <class xmlns:ianahw="urn:ietf:params:xml:ns:yang:iana-hardware">ianahw:port</class>
+            <o-ran-name xmlns="urn:o-ran:hardware:1.0">slot0-logical0-bbu</o-ran-name>
+          </component>
+        </hardware>
+    </ietf-hardware-model>
+  </aggregation>
+</aggregated-o-ru>
diff --git a/solution/network/o-du-o1/data/o-ran-usermgmt-operational.json b/solution/network/o-du-o1/data/o-ran-usermgmt-operational.json
new file mode 100644
index 0000000..66b7591
--- /dev/null
+++ b/solution/network/o-du-o1/data/o-ran-usermgmt-operational.json
@@ -0,0 +1,15 @@
+{
+    "o-ran-usermgmt:users":{
+        "user":[
+            {
+                "name":"x",
+                "account-type":"CERTIFICATE",
+                "password":"oiwtbqxj",
+                "enabled":true,
+                "sro-id":[
+                    "x"
+                ]
+            }
+        ]
+    }
+}
diff --git a/solution/network/o-du-o1/data/o-ran-usermgmt-running.json b/solution/network/o-du-o1/data/o-ran-usermgmt-running.json
new file mode 100644
index 0000000..c920e7a
--- /dev/null
+++ b/solution/network/o-du-o1/data/o-ran-usermgmt-running.json
@@ -0,0 +1,15 @@
+{
+    "o-ran-usermgmt:users":{
+        "user":[
+            {
+                "name":"smo",
+                "account-type":"CERTIFICATE",
+                "password":"oiwtbqxj",
+                "enabled":true,
+                "sro-id":[
+                    "x"
+                ]
+            }
+        ]
+    }
+}
diff --git a/solution/network/o-du-o1/data/performance-management/index.json b/solution/network/o-du-o1/data/performance-management/index.json
new file mode 100644
index 0000000..c578f58
--- /dev/null
+++ b/solution/network/o-du-o1/data/performance-management/index.json
@@ -0,0 +1,30 @@
+{
+    "config": {
+        "log-period": 60,
+        "repetition-period": 180,
+
+        "points": [
+            "DRB.MeanActiveUeDl",
+            "DRB.MeanActiveUeUl",
+            "DRB.MaxActiveUeDl"
+        ]
+    },
+
+    "values": [
+        {
+            "DRB.MeanActiveUeDl": 0,
+            "DRB.MaxActiveUeDl": 3,
+            "DRB.MeanActiveUeUl": 17
+        },
+        {
+            "DRB.MeanActiveUeDl": 1,
+            "DRB.MaxActiveUeDl": 4,
+            "DRB.MeanActiveUeUl": 19
+        },
+        {
+            "DRB.MeanActiveUeDl": 2,
+            "DRB.MaxActiveUeDl": 9,
+            "DRB.MeanActiveUeUl": 19
+        }
+    ]
+}
diff --git a/solution/network/o-du-o1/data/performance-management/template.xml b/solution/network/o-du-o1/data/performance-management/template.xml
new file mode 100644
index 0000000..d5ae40e
--- /dev/null
+++ b/solution/network/o-du-o1/data/performance-management/template.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?xml-stylesheet type="text/xsl" href="MeasDataCollection.xsl"?>
+<measCollecFile xmlns="http://www.3gpp.org/ftp/specs/archive/32_series/32.435#measCollec" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.3gpp.org/ftp/specs/archive/32_series/32.435#measCollec http://www.3gpp.org/ftp/specs/archive/32_series/32.435#measCollec">
+	<fileHeader fileFormatVersion="32.435 V7.0" vendorName="PyNTS" dnPrefix="DC=pynts.domain">
+		<fileSender localDn="ManagedElement=@hostname@" elementType="nts-element"/>
+		<measCollec beginTime="@start-time@"/>
+	</fileHeader>
+	<measData>
+		<managedElement localDn="ManagedElement=@hostname@" userLabel=""/>
+		<measInfo>
+			<job jobId="1"/>
+			<granPeriod duration="@log-period@" endTime="@end-time@"/>
+			<repPeriod duration="@rep-period@"/>
+			@point-start@<measType p="@point-id@">@point-name@</measType>@point-end@
+			<measValue measObjLdn="DuFunction=@du-id@,CellId=@cell-id@">
+				@value-start@<r p="@point-id@">@value@</r>@value-end@
+				@suspect@
+			</measValue>
+		</measInfo>
+	</measData>
+	<fileFooter>
+		<measCollec endTime="@end-time@"/>
+	</fileFooter>
+</measCollecFile>
diff --git a/solution/network/o-ru-mplane/data/alarm_notif.xml b/solution/network/o-ru-mplane/data/alarm_notif.xml
new file mode 100644
index 0000000..85a4114
--- /dev/null
+++ b/solution/network/o-ru-mplane/data/alarm_notif.xml
@@ -0,0 +1,11 @@
+<alarm-notif xmlns="urn:o-ran:fm:1.0">
+    <fault-id>1</fault-id>
+    <fault-source>object1</fault-source>
+    <affected-objects>
+        <name>affected_object1</name>
+    </affected-objects>
+    <fault-severity>CRITICAL</fault-severity>
+    <is-cleared>false</is-cleared>
+    <fault-text>Alarm text goes here..</fault-text>
+    <event-time>2024-08-01T10:00:03.12Z</event-time>
+</alarm-notif>
diff --git a/solution/network/o-ru-mplane/data/ietf-hardware-running.json b/solution/network/o-ru-mplane/data/ietf-hardware-running.json
new file mode 100644
index 0000000..d4ca9c3
--- /dev/null
+++ b/solution/network/o-ru-mplane/data/ietf-hardware-running.json
@@ -0,0 +1,79 @@
+{
+    "ietf-hardware:hardware": {
+      "component": [
+        {
+          "name": "O-RU-Chassis",
+          "class": "iana-hardware:chassis",
+          "parent-rel-pos": 0,
+          "alias": "concat(node-id, '-', component/name)",
+          "asset-id": "uuid(node-id, component/name)",          
+          "state": {
+            "admin-state": "unlocked"
+          }
+        },
+        {
+          "name": "O-RU-Board",
+          "class": "o-ran-hardware:O-RAN-RADIO",
+          "parent": "O-RU-Chassis",
+          "parent-rel-pos": 0,
+          "alias": "concat(node-id, '-', component/name)",
+          "asset-id": "uuid(node-id, component/name)",          
+          "state": {
+            "admin-state": "unlocked"
+          },
+          "o-ran-hardware:energy-saving-enabled": true,
+          "o-ran-hardware:o-ran-name": "O-RU-Board"
+        },        
+        
+        {
+          "name": "O-RU-BF-CAL",
+          "class": "o-ran-hardware:O-RU-BF-CAL",
+          "parent": "O-RU-Chassis",
+          "parent-rel-pos": 3,
+          "alias": "concat(node-id, '-', component/name)",
+          "asset-id": "uuid(node-id, component/name)",          
+          "state": {
+            "admin-state": "unlocked"
+          }
+        },
+        {
+          "name": "O-RU-FEEDER",
+          "class": "o-ran-hardware:O-RU-FEEDER",
+          "parent": "O-RU-Chassis",
+          "parent-rel-pos": 4,
+          "alias": "concat(node-id, '-', component/name)",
+          "asset-id": "uuid(node-id, component/name)",          
+          "state": {
+            "admin-state": "unlocked"
+          }
+        },
+        {
+          "name": "O-RU-FPGA",
+          "class": "o-ran-hardware:O-RU-FPGA",
+          "parent": "O-RU-Chassis",
+          "parent-rel-pos": 5,
+          "alias": "concat(node-id, '-', component/name)",
+          "asset-id": "uuid(node-id, component/name)",          
+          "state": {
+            "admin-state": "unlocked"
+          },
+          "o-ran-hardware:energy-saving-enabled": true,
+          "o-ran-hardware:o-ran-name": "O-RU-FPGA"
+        },
+        {
+          "name": "O-RU-POWER-AMPLIFIER",
+          "class": "o-ran-hardware:O-RU-POWER-AMPLIFIER",
+          "parent": "O-RU-Chassis",
+          "parent-rel-pos": 6,
+          "alias": "concat(node-id, '-', component/name)",
+          "asset-id": "uuid(node-id, component/name)",          
+          "state": {
+            "admin-state": "unlocked"
+          },
+          "o-ran-hardware:energy-saving-enabled": true,
+          "o-ran-hardware:o-ran-name": "O-RU-POWER-AMPLIFIER"
+        }
+      ]
+    }
+  }
+  
\ No newline at end of file
diff --git a/solution/network/o-ru-mplane/data/ietf-interfaces-operational.xml b/solution/network/o-ru-mplane/data/ietf-interfaces-operational.xml
new file mode 100644
index 0000000..bb8b458
--- /dev/null
+++ b/solution/network/o-ru-mplane/data/ietf-interfaces-operational.xml
@@ -0,0 +1,12 @@
+<interfaces xmlns="urn:ietf:params:xml:ns:yang:ietf-interfaces">
+  <interface>
+    <name>eth2-UPlane-VLAN</name>
+    <type xmlns:ianaift="urn:ietf:params:xml:ns:yang:iana-if-type">ianaift:l2vlan</type>
+    <enabled>true</enabled>
+    <ipv4 xmlns="urn:ietf:params:xml:ns:yang:ietf-ip">
+      <enabled>false</enabled>
+    </ipv4>
+    <vlan-id xmlns="urn:o-ran:interfaces:1.0">5</vlan-id>
+    <mac-address xmlns="urn:o-ran:interfaces:1.0">00:11:22:33:44:55</mac-address>
+  </interface>
+</interfaces>
diff --git a/solution/network/o-ru-mplane/data/ietf-interfaces-running-template.json b/solution/network/o-ru-mplane/data/ietf-interfaces-running-template.json
new file mode 100644
index 0000000..3ab1115
--- /dev/null
+++ b/solution/network/o-ru-mplane/data/ietf-interfaces-running-template.json
@@ -0,0 +1,201 @@
+{
+    "ietf-interfaces:interfaces": {
+        "interface": [
+            {
+                "name": "x",
+                "description": "x",
+                "type": "iana-if-type:aluELP",
+                "enabled": true,
+                "ietf-ip:ipv4": {
+                    "enabled": false,
+                    "forwarding": true,
+                    "mtu": 68,
+                    "address": [
+                        {
+                            "ip": "152.132.103.50",
+                            "prefix-length": 0
+                        }
+                    ],
+                    "neighbor": [
+                        {
+                            "ip": "108.156.122.35",
+                            "link-layer-address": "81"
+                        }
+                    ],
+                    "ietf-network-instance:bind-ni-name": "x",
+                    "o-ran-interfaces:m-plane-marking": 0,
+                    "o-ran-interfaces:tcp": {
+                        "mss-adjust": 0
+                    },
+                    "o-ran-interfaces:diffserv-markings": {
+                        "u-plane-marking": 0,
+                        "c-plane-marking": 0,
+                        "s-plane-marking": 0,
+                        "other-marking": 0,
+                        "enhanced-uplane-markings": [
+                            {
+                                "up-marking-name": "x",
+                                "enhanced-marking": 0
+                            }
+                        ]
+                    }
+                },
+                "ietf-ip:ipv6": {
+                    "enabled": false,
+                    "forwarding": true,
+                    "mtu": 1280,
+                    "address": [
+                        {
+                            "ip": "::",
+                            "prefix-length": 0
+                        }
+                    ],
+                    "neighbor": [
+                        {
+                            "ip": "::",
+                            "link-layer-address": "47"
+                        }
+                    ],
+                    "dup-addr-detect-transmits": 0,
+                    "autoconf": {
+                        "create-global-addresses": true
+                    },
+                    "ietf-network-instance:bind-ni-name": "x",
+                    "o-ran-interfaces:m-plane-marking": 0,
+                    "o-ran-interfaces:tcp": {
+                        "mss-adjust": 0
+                    },
+                    "o-ran-interfaces:diffserv-markings": {
+                        "u-plane-marking": 0,
+                        "c-plane-marking": 0,
+                        "s-plane-marking": 0,
+                        "other-marking": 0,
+                        "enhanced-uplane-markings": [
+                            {
+                                "up-marking-name": "x",
+                                "enhanced-marking": 0
+                            }
+                        ]
+                    }
+                },
+                "ietf-network-instance:bind-ni-name": "x",
+                "ieee802-dot1x:pae": {
+                    "pae-system": "x",
+                    "vp-enable": false,
+                    "port-capabilities": {
+                        "supp": false,
+                        "auth": true,
+                        "mka": true,
+                        "macsec": false,
+                        "announcements": true,
+                        "listener": false,
+                        "virtual-ports": true,
+                        "in-service-upgrades": true
+                    },
+                    "port-type": "virtual-port",
+                    "supplicant": {
+                        "held-period": 0,
+                        "retry-max": 0
+                    },
+                    "authenticator": {
+                        "quiet-period": 0,
+                        "reauth-period": 0,
+                        "reauth-enable": true,
+                        "retry-max": 0
+                    },
+                    "kay": {
+                        "enable": true,
+                        "actor": {
+                            "priority": 0
+                        },
+                        "key-server": {
+                            "priority": 0
+                        },
+                        "group": {
+                            "join": true,
+                            "form": true,
+                            "new": true
+                        },
+                        "macsec": {
+                            "capable": true,
+                            "desired": false
+                        },
+                        "suspend-on-request": true,
+                        "suspend-for": 0,
+                        "participants": [
+                            {
+                                "participant": 0,
+                                "cached": false,
+                                "active": false,
+                                "retain": false,
+                                "activate": "disabled"
+                            }
+                        ]
+                    },
+                    "logon-nid": {
+                        "selected": "",
+                        "pae-nid-group": [
+                            {
+                                "nid": "",
+                                "use-eap": "immediate",
+                                "unauth-allowed": "immediate",
+                                "unsecure-allowed": "immediate",
+                                "unauthenticated-access": "fallback-access",
+                                "access-capabilities": "eap eapMkaMacSec vendorSpecific mkaMacSec mka"
+                            }
+                        ]
+                    },
+                    "announcer": {
+                        "enable": false,
+                        "announce": [
+                            {
+                                "announces": 0,
+                                "pae-nid-group": [
+                                    {
+                                        "nid": "",
+                                        "use-eap": "immediate",
+                                        "unauth-allowed": "immediate",
+                                        "unsecure-allowed": "immediate",
+                                        "unauthenticated-access": "fallback-access",
+                                        "access-capabilities": "eapMkaMacSec mkaMacSec"
+                                    }
+                                ]
+                            }
+                        ]
+                    },
+                    "listener": {
+                        "enable": true
+                    },
+                    "logon-process": {
+                        "logon": false
+                    }
+                },
+                "o-ran-interfaces:l2-mtu": 64,
+                "o-ran-interfaces:vlan-tagging": true,
+                "o-ran-interfaces:class-of-service": {
+                    "u-plane-marking": 0,
+                    "c-plane-marking": 0,
+                    "m-plane-marking": 0,
+                    "s-plane-marking": 0,
+                    "other-marking": 0,
+                    "enhanced-uplane-markings": [
+                        {
+                            "up-marking-name": "x",
+                            "enhanced-marking": 0
+                        }
+                    ]
+                },
+                "o-ran-interfaces:base-interface": "x",
+                "o-ran-interfaces:vlan-id": 1,
+                "o-ran-interfaces:alias-macs": [
+                    "50:17:53:48:80:40"
+                ],
+                "o-ran-interfaces:mac-address": "26:13:00:15:00:71",
+                "o-ran-interfaces:port-reference": {
+                    "port-name": "x",
+                    "port-number": 0
+                }
+            }
+        ]
+    }
+}
\ No newline at end of file
diff --git a/solution/network/o-ru-mplane/data/ietf-interfaces-running.xml b/solution/network/o-ru-mplane/data/ietf-interfaces-running.xml
new file mode 100644
index 0000000..bb8b458
--- /dev/null
+++ b/solution/network/o-ru-mplane/data/ietf-interfaces-running.xml
@@ -0,0 +1,12 @@
+<interfaces xmlns="urn:ietf:params:xml:ns:yang:ietf-interfaces">
+  <interface>
+    <name>eth2-UPlane-VLAN</name>
+    <type xmlns:ianaift="urn:ietf:params:xml:ns:yang:iana-if-type">ianaift:l2vlan</type>
+    <enabled>true</enabled>
+    <ipv4 xmlns="urn:ietf:params:xml:ns:yang:ietf-ip">
+      <enabled>false</enabled>
+    </ipv4>
+    <vlan-id xmlns="urn:o-ran:interfaces:1.0">5</vlan-id>
+    <mac-address xmlns="urn:o-ran:interfaces:1.0">00:11:22:33:44:55</mac-address>
+  </interface>
+</interfaces>
diff --git a/solution/network/o-ru-mplane/data/ietf-netconf-acm-running.json b/solution/network/o-ru-mplane/data/ietf-netconf-acm-running.json
new file mode 100644
index 0000000..e74df7d
--- /dev/null
+++ b/solution/network/o-ru-mplane/data/ietf-netconf-acm-running.json
@@ -0,0 +1,109 @@
+{
+    "ietf-netconf-acm:nacm": {
+      "enable-nacm": true,
+      "read-default": "permit",
+      "write-default": "deny",
+      "exec-default": "deny",
+      "enable-external-groups": false,
+      "groups": {
+        "group": [
+          {
+            "name": "sudo",
+            "user-name": [
+              "sudo",
+              "admin",
+              "demx8as6",
+              "netconf"
+            ]
+          },
+          {
+            "name": "nms",
+            "user-name": [
+              "nms",
+              "nero"
+            ]
+          },
+          {
+            "name": "fm-pm",
+            "user-name": [
+              "fm-pm",
+              "filippa"
+            ]
+          },
+          {
+            "name": "swm",
+            "user-name": [
+              "swm",
+              "swami"
+            ]
+          },
+          {
+            "name": "smo",
+            "user-name": [
+              "smo",
+              "simone"
+            ]
+          },
+          {
+            "name": "hybrid-odu",
+            "user-name": [
+              "hybrid-odu",
+              "haydon"
+            ]
+          },
+          {
+            "name": "carrier",
+            "user-name": [
+              "carrier",
+              "carron"
+            ]
+          }
+        ]
+      },
+      "rule-list": [
+        {
+          "name": "smo-rule",
+          "group": [          
+            "smo"
+          ],
+          "rule": [
+            {
+              "name": "deny-ecpri",
+              "module-name": "o-ran-ecpri-delay",
+              "access-operations": "create update delete",
+              "action": "deny",
+              "comment": "Deny writing into ecpri."
+            },
+            {
+              "name": "allow-all",
+              "module-name": "*",
+              "access-operations": "*",
+              "action": "permit",
+              "comment": "Allow everything."
+            }
+          ]
+        },        
+        {
+          "name": "admin-rule",
+          "group": [
+            "sudo",
+            "nms",
+            "fm-pm",
+            "swm",
+            "hybrid-odu",
+            "carrier"
+          ],
+          "rule": [
+            {
+              "name": "allow-all",
+              "module-name": "*",
+              "access-operations": "*",
+              "action": "permit",
+              "comment": "All is allowed, no restictions!"
+            }
+          ]
+        }
+      ]
+    }
+  }
+  
\ No newline at end of file
diff --git a/solution/network/o-ru-mplane/data/ietf-netconf-server-running-hierarchical.json b/solution/network/o-ru-mplane/data/ietf-netconf-server-running-hierarchical.json
new file mode 100644
index 0000000..7bc1ca5
--- /dev/null
+++ b/solution/network/o-ru-mplane/data/ietf-netconf-server-running-hierarchical.json
@@ -0,0 +1,54 @@
+{
+  "ietf-netconf-server:netconf-server": {
+    
+    "call-home": {
+      "netconf-client": [
+        {
+          "name": "default-odu-tls",
+          "endpoints": {
+            "endpoint": [
+              {
+                "name": "tls-auth-endpt-odu",
+                "tls": {
+                  "tcp-client-parameters": {
+                    "remote-address": "pynts-o-du-o1",
+                    "remote-port": 4335
+                  },
+                  "tls-server-parameters": {
+                    "server-identity": {
+                      "certificate": {
+                        "central-keystore-reference": {
+                          "asymmetric-key": "serverkey-tls",
+                          "certificate": "servercert-odu"
+                        }
+                      }
+                    },
+                    "client-authentication": {
+                      "ca-certs": {
+                        "central-truststore-reference": "cacerts"
+                      }
+                    }
+                  },
+                  "netconf-server-parameters": {
+                    "client-identity-mappings": {
+                      "cert-to-name": [
+                        {
+                          "id": 1,
+                          "fingerprint": "02:66:68:BD:65:1D:9B:45:54:42:1C:1D:85:33:E5:34:B4:8E:1B:95:F2",
+                          "map-type": "ietf-x509-cert-to-name:san-rfc822-name"
+                        }
+                      ]
+                    }
+                  }
+                }
+              }
+            ]
+          },
+          "connection-type": {
+            "persistent": {}
+          }
+        }
+      ]
+    }
+  }
+}
diff --git a/solution/network/o-ru-mplane/data/ietf-netconf-server-running-hybrid.json b/solution/network/o-ru-mplane/data/ietf-netconf-server-running-hybrid.json
new file mode 100644
index 0000000..e296112
--- /dev/null
+++ b/solution/network/o-ru-mplane/data/ietf-netconf-server-running-hybrid.json
@@ -0,0 +1,99 @@
+{
+  "ietf-netconf-server:netconf-server": {
+    
+    "call-home": {
+      "netconf-client": [
+        {
+          "name": "default-odu-tls",
+          "endpoints": {
+            "endpoint": [
+              {
+                "name": "tls-auth-endpt-odu",
+                "tls": {
+                  "tcp-client-parameters": {
+                    "remote-address": "pynts-o-du-o1",
+                    "remote-port": 4335
+                  },
+                  "tls-server-parameters": {
+                    "server-identity": {
+                      "certificate": {
+                        "central-keystore-reference": {
+                          "asymmetric-key": "serverkey-tls",
+                          "certificate": "servercert-odu"
+                        }
+                      }
+                    },
+                    "client-authentication": {
+                      "ca-certs": {
+                        "central-truststore-reference": "cacerts"
+                      }
+                    }
+                  },
+                  "netconf-server-parameters": {
+                    "client-identity-mappings": {
+                      "cert-to-name": [
+                        {
+                          "id": 1,
+                          "fingerprint": "02:66:68:BD:65:1D:9B:45:54:42:1C:1D:85:33:E5:34:B4:8E:1B:95:F2",
+                          "map-type": "ietf-x509-cert-to-name:san-rfc822-name"
+                        }
+                      ]
+                    }
+                  }
+                }
+              }
+            ]
+          },
+          "connection-type": {
+            "persistent": {}
+          }
+        },
+        {
+          "name": "default-smo-tls",
+          "endpoints": {
+            "endpoint": [
+              {
+                "name": "tls-auth-endpt-smo",
+                "tls": {
+                  "tcp-client-parameters": {
+                    "remote-address": "controller.dcn.smo.o-ran-sc.org",
+                    "remote-port": 4335
+                  },
+                  "tls-server-parameters": {
+                    "server-identity": {
+                      "certificate": {
+                        "central-keystore-reference": {
+                          "asymmetric-key": "serverkey-tls",
+                          "certificate": "servercert-smo"
+                        }
+                      }
+                    },
+                    "client-authentication": {
+                      "ca-certs": {
+                        "central-truststore-reference": "cacerts"
+                      }
+                    }
+                  },
+                  "netconf-server-parameters": {
+                    "client-identity-mappings": {
+                      "cert-to-name": [
+                        {
+                          "id": 1,
+                          "fingerprint": "02:DC:CB:E3:29:E2:65:04:A8:DF:B3:63:E7:E4:1A:06:81:64:C6:DA:37",
+                          "map-type": "ietf-x509-cert-to-name:san-rfc822-name"
+                        }
+                      ]
+                    }
+                  }
+                }
+              }
+            ]
+          },
+          "connection-type": {
+            "persistent": {}
+          }
+        }
+      ]
+    }
+  }
+}
diff --git a/solution/network/o-ru-mplane/data/ietf-netconf-server-running.json b/solution/network/o-ru-mplane/data/ietf-netconf-server-running.json
new file mode 100644
index 0000000..181e792
--- /dev/null
+++ b/solution/network/o-ru-mplane/data/ietf-netconf-server-running.json
@@ -0,0 +1,99 @@
+{
+  "ietf-netconf-server:netconf-server": {
+    
+    "call-home": {
+      "netconf-client": [
+        {
+          "name": "default-odu-tls",
+          "endpoints": {
+            "endpoint": [
+              {
+                "name": "tls-auth-endpt-odu",
+                "tls": {
+                  "tcp-client-parameters": {
+                    "remote-address": "172.20.0.5",
+                    "remote-port": 4335
+                  },
+                  "tls-server-parameters": {
+                    "server-identity": {
+                      "certificate": {
+                        "central-keystore-reference": {
+                          "asymmetric-key": "serverkey-tls",
+                          "certificate": "servercert-odu"
+                        }
+                      }
+                    },
+                    "client-authentication": {
+                      "ca-certs": {
+                        "central-truststore-reference": "cacerts"
+                      }
+                    }
+                  },
+                  "netconf-server-parameters": {
+                    "client-identity-mappings": {
+                      "cert-to-name": [
+                        {
+                          "id": 1,
+                          "fingerprint": "02:66:68:BD:65:1D:9B:45:54:42:1C:1D:85:33:E5:34:B4:8E:1B:95:F2",
+                          "map-type": "ietf-x509-cert-to-name:san-rfc822-name"
+                        }
+                      ]
+                    }
+                  }
+                }
+              }
+            ]
+          },
+          "connection-type": {
+            "persistent": {}
+          }
+        },
+        {
+          "name": "default-smo-tls",
+          "endpoints": {
+            "endpoint": [
+              {
+                "name": "tls-auth-endpt-smo",
+                "tls": {
+                  "tcp-client-parameters": {
+                    "remote-address": "controller.dcn.smo.o-ran-sc.org",
+                    "remote-port": 4335
+                  },
+                  "tls-server-parameters": {
+                    "server-identity": {
+                      "certificate": {
+                        "central-keystore-reference": {
+                          "asymmetric-key": "serverkey-tls",
+                          "certificate": "servercert-smo"
+                        }
+                      }
+                    },
+                    "client-authentication": {
+                      "ca-certs": {
+                        "central-truststore-reference": "cacerts"
+                      }
+                    }
+                  },
+                  "netconf-server-parameters": {
+                    "client-identity-mappings": {
+                      "cert-to-name": [
+                        {
+                          "id": 1,
+                          "fingerprint": "02:DC:CB:E3:29:E2:65:04:A8:DF:B3:63:E7:E4:1A:06:81:64:C6:DA:37",
+                          "map-type": "ietf-x509-cert-to-name:san-rfc822-name"
+                        }
+                      ]
+                    }
+                  }
+                }
+              }
+            ]
+          },
+          "connection-type": {
+            "persistent": {}
+          }
+        }
+      ]
+    }
+  }
+}
diff --git a/solution/network/o-ru-mplane/data/ietf-netconf-server-ssh-callhome.json b/solution/network/o-ru-mplane/data/ietf-netconf-server-ssh-callhome.json
new file mode 100644
index 0000000..018afd5
--- /dev/null
+++ b/solution/network/o-ru-mplane/data/ietf-netconf-server-ssh-callhome.json
@@ -0,0 +1,49 @@
+{
+  "ietf-netconf-server:netconf-server": {
+    "call-home": {
+      "netconf-client": [
+        {
+          "name": "default-client",
+          "endpoints": {
+            "endpoint": [
+              {
+                "name": "default-ssh-callhome",
+                "ssh": {
+                  "tcp-client-parameters": {
+                    "remote-address": "192.168.10.253",
+                    "remote-port": 4334
+                  },
+                  "ssh-server-parameters": {
+                    "server-identity": {
+                      "host-key": [
+                        {
+                          "name": "melacon-key",
+                          "public-key": {
+                            "central-keystore-reference": "serverkey-ssh"
+                          }
+                        }
+                      ]
+                    },
+                    "client-authentication": {
+                      "users": {
+                        "user": [
+                          {
+                            "name": "netconf",
+                            "password": "$0$netconf!"
+                          }
+                        ]
+                      }
+                    }
+                  }
+                }
+              }
+            ]
+          },
+          "connection-type": {
+            "persistent": {}
+          }
+        }
+      ]
+    }
+  }
+}
\ No newline at end of file
diff --git a/solution/network/o-ru-mplane/data/ietf-netconf-server-ssh-listen.json b/solution/network/o-ru-mplane/data/ietf-netconf-server-ssh-listen.json
new file mode 100644
index 0000000..d333bb6
--- /dev/null
+++ b/solution/network/o-ru-mplane/data/ietf-netconf-server-ssh-listen.json
@@ -0,0 +1,41 @@
+{
+  "ietf-netconf-server:netconf-server": {
+    "listen": {
+      "endpoints": {
+        "endpoint": [
+          {
+            "name": "ssh-endpoint-830",
+            "ssh": {
+              "tcp-server-parameters": {
+                "local-address": "0.0.0.0",
+                "local-port": 830
+              },
+              "ssh-server-parameters": {
+                "server-identity": {
+                  "host-key": [
+                    {
+                      "name": "melacon-key",
+                      "public-key": {
+                        "central-keystore-reference": "serverkey-ssh"
+                      }
+                    }
+                  ]
+                },
+                "client-authentication": {
+                  "users": {
+                    "user": [
+                      {
+                        "name": "netconf",
+                        "password": "$0$netconf!"
+                      }
+                    ]
+                  }
+                }
+              }
+            }
+          }
+        ]
+      }
+    }
+  }
+}
diff --git a/solution/network/o-ru-mplane/data/ietf-netconf-server-template.json b/solution/network/o-ru-mplane/data/ietf-netconf-server-template.json
new file mode 100644
index 0000000..f12cf39
--- /dev/null
+++ b/solution/network/o-ru-mplane/data/ietf-netconf-server-template.json
@@ -0,0 +1,179 @@
+{
+  "ietf-netconf-server:netconf-server": {
+    "listen": {
+      "idle-timeout": 0,
+      "endpoints": {
+        "endpoint": [
+          {
+            "name": "ssh-endpoint-830",
+            "ssh": {
+              "tcp-server-parameters": {
+                "local-address": "0.0.0.0",
+                "local-port": 830
+              },
+              "ssh-server-parameters": {
+                "server-identity": {
+                  "host-key": [
+                    {
+                      "name": "melacon-key",
+                      "public-key": {
+                        "central-keystore-reference": "serverkey-ssh"
+                      }
+                    }
+                  ]
+                },
+                "client-authentication": {
+                  "users": {
+                    "user": [
+                      {
+                        "name": "netconf",
+                        "password": "$0$netconf!"
+                      }
+                    ]
+                  }
+                }
+              }
+            }
+          },
+          {
+            "name": "tls-endpoint-6513",
+            "tls": {
+              "tcp-server-parameters": {
+                "local-address": "0.0.0.0",
+                "local-port": 6513
+              },
+              "tls-server-parameters": {
+                "server-identity": {
+                  "certificate": {
+                    "central-keystore-reference": {
+                      "asymmetric-key": "serverkey-tls",
+                      "certificate": "servercert"
+                    }
+                  }
+                },
+                "client-authentication": {
+                  "ca-certs": {
+                    "central-truststore-reference": "cacerts"
+                  }
+                }
+              },
+              "netconf-server-parameters": {
+                "client-identity-mappings": {
+                  "cert-to-name": [
+                    {
+                      "id": 1,
+                      "fingerprint": "02:DC:0A:65:17:7F:E7:6D:2C:9A:8B:F1:AD:64:F9:EC:56:D7:36:F4:70",
+                      "map-type": "ietf-x509-cert-to-name:specified",
+                      "name": "netconf"
+                    }
+                  ]
+                }
+              }
+            }
+          }
+        ]
+      }
+    },
+    "call-home": {
+      "netconf-client": [
+        {
+          "name": "default-callhome",
+          "endpoints": {
+            "endpoint": [
+              {
+                "name": "default-ssh-callhome",
+                "ssh": {
+                  "tcp-client-parameters": {
+                    "remote-address": "192.168.10.253",
+                    "remote-port": 4334
+                  },
+                  "ssh-server-parameters": {
+                    "server-identity": {
+                      "host-key": [
+                        {
+                          "name": "melacon-key",
+                          "public-key": {
+                            "central-keystore-reference": "serverkey-ssh"
+                          }
+                        }
+                      ]
+                    },
+                    "client-authentication": {
+                      "users": {
+                        "user": [
+                          {
+                            "name": "netconf",
+                            "password": "$0$netconf!"
+                          }
+                        ]
+                      }
+                    }
+                  }
+                }
+              }
+            ]
+          },
+          "connection-type": {
+            "persistent": {}
+          },
+          "reconnect-strategy": {
+            "start-with": "last-connected",
+            "max-wait": 1,
+            "max-attempts": 1
+          }
+        },
+        {
+          "name": "default-callhome-tls",
+          "endpoints": {
+            "endpoint": [
+              {
+                "name": "tls-auth-endpt",
+                "tls": {
+                  "tcp-client-parameters": {
+                    "remote-address": "192.168.10.253",
+                    "remote-port": 4335
+                  },
+                  "tls-server-parameters": {
+                    "server-identity": {
+                      "certificate": {
+                        "central-keystore-reference": {
+                          "asymmetric-key": "serverkey-tls",
+                          "certificate": "servercert"
+                        }
+                      }
+                    },
+                    "client-authentication": {
+                      "ca-certs": {
+                        "central-truststore-reference": "cacerts"
+                      }
+                    }
+                  },
+                  "netconf-server-parameters": {
+                    "client-identity-mappings": {
+                      "cert-to-name": [
+                        {
+                          "id": 1,
+                          "fingerprint": "02:DC:0A:65:17:7F:E7:6D:2C:9A:8B:F1:AD:64:F9:EC:56:D7:36:F4:70",
+                          "map-type": "ietf-x509-cert-to-name:specified",
+                          "name": "netconf"
+                        }
+                      ]
+                    }
+                  }
+                }
+              }
+            ]
+          },
+          "connection-type": {
+            "persistent": {}
+          },
+          "reconnect-strategy": {
+            "start-with": "last-connected",
+            "max-wait": 1,
+            "max-attempts": 1
+          }
+        }
+      ]
+    }
+  }
+}
\ No newline at end of file
diff --git a/solution/network/o-ru-mplane/data/ietf-netconf-server-tls-callhome.json b/solution/network/o-ru-mplane/data/ietf-netconf-server-tls-callhome.json
new file mode 100644
index 0000000..c9b286c
--- /dev/null
+++ b/solution/network/o-ru-mplane/data/ietf-netconf-server-tls-callhome.json
@@ -0,0 +1,54 @@
+{
+  "ietf-netconf-server:netconf-server": {
+    "call-home": {
+      "netconf-client": [
+        {
+          "name": "default-client",
+          "endpoints": {
+            "endpoint": [
+              {
+                "name": "tls-auth-endpt",
+                "tls": {
+                  "tcp-client-parameters": {
+                    "remote-address": "172.60.0.71",
+                    "remote-port": 4335
+                  },
+                  "tls-server-parameters": {
+                    "server-identity": {
+                      "certificate": {
+                        "central-keystore-reference": {
+                          "asymmetric-key": "serverkey-tls",
+                          "certificate": "servercert"
+                        }
+                      }
+                    },
+                    "client-authentication": {
+                      "ca-certs": {
+                        "central-truststore-reference": "cacerts"
+                      }
+                    }
+                  },
+                  "netconf-server-parameters": {
+                    "client-identity-mappings": {
+                      "cert-to-name": [
+                        {
+                          "id": 1,
+                          "fingerprint": "02:e9:38:1f:f6:8b:62:de:0a:0b:c5:03:81:a8:03:49:a0:00:7f:8b:f3",
+                          "map-type": "ietf-x509-cert-to-name:specified",
+                          "name": "netconf"
+                        }
+                      ]
+                    }
+                  }
+                }
+              }
+            ]
+          },
+          "connection-type": {
+            "persistent": {}
+          }
+        }
+      ]
+    }
+  }
+}
diff --git a/solution/network/o-ru-mplane/data/ietf-netconf-server-tls-listen.json b/solution/network/o-ru-mplane/data/ietf-netconf-server-tls-listen.json
new file mode 100644
index 0000000..65b8528
--- /dev/null
+++ b/solution/network/o-ru-mplane/data/ietf-netconf-server-tls-listen.json
@@ -0,0 +1,46 @@
+{
+  "ietf-netconf-server:netconf-server": {
+    "listen": {
+      "endpoints": {
+        "endpoint": [
+          {
+            "name": "tls-endpoint-6513",
+            "tls": {
+              "tcp-server-parameters": {
+                "local-address": "0.0.0.0",
+                "local-port": 6513
+              },
+              "tls-server-parameters": {
+                "server-identity": {
+                  "certificate": {
+                    "central-keystore-reference": {
+                      "asymmetric-key": "serverkey-tls",
+                      "certificate": "servercert"
+                    }
+                  }
+                },
+                "client-authentication": {
+                  "ca-certs": {
+                    "central-truststore-reference": "cacerts"
+                  }
+                }
+              },
+              "netconf-server-parameters": {
+                "client-identity-mappings": {
+                  "cert-to-name": [
+                    {
+                      "id": 1,
+                      "fingerprint": "02:02:00:6E:31:7C:65:CB:E0:72:37:5E:32:B2:AF:86:53:48:82:EC:98:3F",
+                      "map-type": "ietf-x509-cert-to-name:specified",
+                      "name": "netconf"
+                    }
+                  ]
+                }
+              }
+            }
+          }
+        ]
+      }
+    }
+  }
+}
diff --git a/solution/network/o-ru-mplane/data/o-ran-ecpri-delay-running.xml b/solution/network/o-ru-mplane/data/o-ran-ecpri-delay-running.xml
new file mode 100644
index 0000000..49db810
--- /dev/null
+++ b/solution/network/o-ru-mplane/data/o-ran-ecpri-delay-running.xml
@@ -0,0 +1,3 @@
+<ecpri-delay-message xmlns="urn:o-ran:message5:1.0">
+  <enable-message5>false</enable-message5>
+</ecpri-delay-message>
diff --git a/solution/network/o-ru-mplane/data/o-ran-mplane-int-running.json b/solution/network/o-ru-mplane/data/o-ran-mplane-int-running.json
new file mode 100644
index 0000000..40dca6f
--- /dev/null
+++ b/solution/network/o-ru-mplane/data/o-ran-mplane-int-running.json
@@ -0,0 +1,47 @@
+{
+    "o-ran-mplane-int:mplane-info":{
+        "searchable-mplane-access-vlans-info":{
+            "searchable-access-vlans":[
+                1
+            ],
+            "vlan-range":{
+                "lowest-vlan-id":1,
+                "highest-vlan-id":1
+            },
+            "scan-interval":0
+        },
+        "m-plane-interfaces":{
+            "m-plane-sub-interfaces":[
+                {
+                    "interface-name":"x",
+                    "sub-interface":"1"
+                }
+            ],
+            "m-plane-ssh-ports":{
+                "call-home-ssh-port":0,
+                "server-ssh-port":0
+            },
+            "m-plane-tls-ports":{
+                "call-home-tls-port":0,
+                "server-tls-port":0
+            }
+        },
+        "configured-client-info":{
+            "mplane-ipv4-info":[
+                {
+                    "mplane-ipv4":"163.184.154.51%9",
+                    "port":0
+                }
+            ],
+            "mplane-ipv6-info":[
+                {
+                    "mplane-ipv6":"::",
+                    "port":0
+                }
+            ],
+            "mplane-fqdn":[
+                "."
+            ]
+        }
+    }
+}
diff --git a/solution/network/o-ru-mplane/data/o-ran-uplane-conf-running.xml b/solution/network/o-ru-mplane/data/o-ran-uplane-conf-running.xml
new file mode 100644
index 0000000..b4e6601
--- /dev/null
+++ b/solution/network/o-ru-mplane/data/o-ran-uplane-conf-running.xml
@@ -0,0 +1,99 @@
+<user-plane-configuration xmlns="urn:o-ran:uplane-conf:1.0">
+    <tx-array-carriers>
+        <name>Operator - 0 degrees</name>
+        <absolute-frequency-center>1800</absolute-frequency-center>
+        <center-of-channel-bandwidth>25000</center-of-channel-bandwidth>
+        <channel-bandwidth>56000</channel-bandwidth>
+        <active>ACTIVE</active>
+        <rw-duplex-scheme>FDD</rw-duplex-scheme>
+        <rw-type>NR</rw-type>
+        <band-number>46</band-number>
+      <laa-carrier-configuration>
+          <transmission-power-for-drs>-42</transmission-power-for-drs>
+      </laa-carrier-configuration>
+        <gain>3</gain>
+        <downlink-radio-frame-offset>0</downlink-radio-frame-offset>
+        <downlink-sfn-offset>0</downlink-sfn-offset>
+    </tx-array-carriers>
+    <tx-array-carriers>
+        <name>Operator - 120 degrees</name>
+        <absolute-frequency-center>1800</absolute-frequency-center>
+        <center-of-channel-bandwidth>25000</center-of-channel-bandwidth>
+        <channel-bandwidth>56000</channel-bandwidth>
+        <active>ACTIVE</active>
+        <rw-duplex-scheme>FDD</rw-duplex-scheme>
+        <rw-type>NR</rw-type>
+        <band-number>46</band-number>
+      <laa-carrier-configuration>
+          <transmission-power-for-drs>-42</transmission-power-for-drs>
+      </laa-carrier-configuration>
+        <gain>3</gain>
+        <downlink-radio-frame-offset>0</downlink-radio-frame-offset>
+        <downlink-sfn-offset>0</downlink-sfn-offset>
+    </tx-array-carriers>
+    <tx-array-carriers>
+        <name>Operator - 240 degrees</name>
+        <absolute-frequency-center>1800</absolute-frequency-center>
+        <center-of-channel-bandwidth>25000</center-of-channel-bandwidth>
+        <channel-bandwidth>56000</channel-bandwidth>
+        <active>ACTIVE</active>
+        <rw-duplex-scheme>FDD</rw-duplex-scheme>
+        <rw-type>NR</rw-type>
+        <band-number>46</band-number>
+      <laa-carrier-configuration>
+          <transmission-power-for-drs>-42</transmission-power-for-drs>
+      </laa-carrier-configuration>
+        <gain>3</gain>
+        <downlink-radio-frame-offset>0</downlink-radio-frame-offset>
+        <downlink-sfn-offset>0</downlink-sfn-offset>
+    </tx-array-carriers>
+    <tx-array-carriers>
+        <name>Public Safety - 0 degrees</name>
+        <absolute-frequency-center>1800</absolute-frequency-center>
+        <center-of-channel-bandwidth>25000</center-of-channel-bandwidth>
+        <channel-bandwidth>56000</channel-bandwidth>
+        <active>INACTIVE</active>
+        <rw-duplex-scheme>FDD</rw-duplex-scheme>
+        <rw-type>NR</rw-type>
+        <band-number>46</band-number>
+      <laa-carrier-configuration>
+          <transmission-power-for-drs>-99</transmission-power-for-drs>
+      </laa-carrier-configuration>
+        <gain>3</gain>
+        <downlink-radio-frame-offset>0</downlink-radio-frame-offset>
+        <downlink-sfn-offset>0</downlink-sfn-offset>
+    </tx-array-carriers>
+    <tx-array-carriers>
+        <name>Public Safety - 120 degrees</name>
+        <absolute-frequency-center>1800</absolute-frequency-center>
+        <center-of-channel-bandwidth>25000</center-of-channel-bandwidth>
+        <channel-bandwidth>56000</channel-bandwidth>
+        <active>INACTIVE</active>
+        <rw-duplex-scheme>FDD</rw-duplex-scheme>
+        <rw-type>NR</rw-type>
+        <band-number>46</band-number>
+      <laa-carrier-configuration>
+          <transmission-power-for-drs>-99</transmission-power-for-drs>
+      </laa-carrier-configuration>
+        <gain>3</gain>
+        <downlink-radio-frame-offset>0</downlink-radio-frame-offset>
+        <downlink-sfn-offset>0</downlink-sfn-offset>
+    </tx-array-carriers>
+    <tx-array-carriers>
+        <name>Public Safety - 240 degrees</name>
+        <absolute-frequency-center>1800</absolute-frequency-center>
+        <center-of-channel-bandwidth>25000</center-of-channel-bandwidth>
+        <channel-bandwidth>56000</channel-bandwidth>
+        <active>INACTIVE</active>
+        <rw-duplex-scheme>FDD</rw-duplex-scheme>
+        <rw-type>NR</rw-type>
+        <band-number>46</band-number>
+      <laa-carrier-configuration>
+          <transmission-power-for-drs>-99</transmission-power-for-drs>
+      </laa-carrier-configuration>
+        <gain>3</gain>
+        <downlink-radio-frame-offset>0</downlink-radio-frame-offset>
+        <downlink-sfn-offset>0</downlink-sfn-offset>
+    </tx-array-carriers>
+
+  </user-plane-configuration>
diff --git a/solution/network/o-ru-mplane/data/o-ran-usermgmt-operational.json b/solution/network/o-ru-mplane/data/o-ran-usermgmt-operational.json
new file mode 100644
index 0000000..66b7591
--- /dev/null
+++ b/solution/network/o-ru-mplane/data/o-ran-usermgmt-operational.json
@@ -0,0 +1,15 @@
+{
+    "o-ran-usermgmt:users":{
+        "user":[
+            {
+                "name":"x",
+                "account-type":"CERTIFICATE",
+                "password":"oiwtbqxj",
+                "enabled":true,
+                "sro-id":[
+                    "x"
+                ]
+            }
+        ]
+    }
+}
diff --git a/solution/network/o-ru-mplane/data/o-ran-usermgmt-running.json b/solution/network/o-ru-mplane/data/o-ran-usermgmt-running.json
new file mode 100644
index 0000000..66b7591
--- /dev/null
+++ b/solution/network/o-ru-mplane/data/o-ran-usermgmt-running.json
@@ -0,0 +1,15 @@
+{
+    "o-ran-usermgmt:users":{
+        "user":[
+            {
+                "name":"x",
+                "account-type":"CERTIFICATE",
+                "password":"oiwtbqxj",
+                "enabled":true,
+                "sro-id":[
+                    "x"
+                ]
+            }
+        ]
+    }
+}
diff --git a/solution/smo/apps/.env b/solution/smo/apps/.env
index ad733dc..b204814 100644
--- a/solution/smo/apps/.env
+++ b/solution/smo/apps/.env
@@ -19,7 +19,7 @@ ADMIN_USERNAME=admin
 ADMIN_PASSWORD=Kp8bJ4SXszM0WXlhak3eHlcse2gAw84vaoGGmJvUy2U
 
 # Network settings
-HOST_IP=aaa.bbb.ccc.ddd
+HOST_IP=192.168.10.253
 
 # flows (implemened by nodered)
 FLOWS_IMAGE=nodered/node-red:latest
diff --git a/solution/smo/oam/.env b/solution/smo/oam/.env
index 88f44bb..9357e9e 100644
--- a/solution/smo/oam/.env
+++ b/solution/smo/oam/.env
@@ -19,7 +19,7 @@ ADMIN_USERNAME=admin
 ADMIN_PASSWORD=Kp8bJ4SXszM0WXlhak3eHlcse2gAw84vaoGGmJvUy2U
 
 # Network settings
-HOST_IP=aaa.bbb.ccc.ddd
+HOST_IP=192.168.10.253
 
 # traefik network
 HTTP_DOMAIN=smo.o-ran-sc.org
diff --git a/solution/smo/oam/controller/certs/keys0.zip b/solution/smo/oam/controller/certs/keys0.zip
index 588315f..d3d45fe 100644
Binary files a/solution/smo/oam/controller/certs/keys0.zip and b/solution/smo/oam/controller/certs/keys0.zip differ
diff --git a/solution/smo/oam/ves-collector/collector.properties b/solution/smo/oam/ves-collector/collector.properties
index e592ca0..655385b 100644
--- a/solution/smo/oam/ves-collector/collector.properties
+++ b/solution/smo/oam/ves-collector/collector.properties
@@ -61,7 +61,7 @@ event.externalSchema.schemaRefPath=$.event.stndDefinedFields.schemaReference
 event.externalSchema.stndDefinedDataPath=$.event.stndDefinedFields.data
 
 ## List all streamid per domain to be supported. The streamid should match to channel name on dmaapfile
-collector.dmaap.streamid=fault=ves-fault|syslog=ves-syslog|heartbeat=ves-heartbeat|measurementsForVfScaling=ves-measurement|mobileFlow=ves-mobileflow|other=ves-other|stateChange=ves-statechange|thresholdCrossingAlert=ves-thresholdCrossingAlert|voiceQuality=ves-voicequality|sipSignaling=ves-sipsignaling|notification=ves-notification|pnfRegistration=ves-pnfRegistration|3GPP-FaultSupervision=ves-3gpp-fault-supervision|3GPP-Heartbeat=ves-3gpp-heartbeat|3GPP-Provisioning=ves-3gpp-provisioning|3GPP-PerformanceAssurance=ves-3gpp-performance-assurance|o-ran-sc-du-hello-world-pm-streaming-oas3=ves-o-ran-sc-du-hello-world-pm-streaming-oas3|o1-notify-pnf-registration=ves-o1-notify-pnf-registration|file-ready=ves-file-ready|o-ran-ald-port:dc-enabled-status-change=o-ran-ald-port:dc-enabled-status-change|o-ran-ald-port:overcurrent-report=o-ran-ald-port:overcurrent-report|o-ran-antenna-calibration:antenna-calibration-coordinated=o-ran-antenna-calibration:antenna-calibration-coordinated|o-ran-antenna-calibration:antenna-calibration-multiple-time-resource-params=o-ran-antenna-calibration:antenna-calibration-multiple-time-resource-params|o-ran-antenna-calibration:antenna-calibration-required=o-ran-antenna-calibration:antenna-calibration-required|o-ran-antenna-calibration:antenna-calibration-result=o-ran-antenna-calibration:antenna-calibration-result|o-ran-beamforming:beamforming-information-update=o-ran-beamforming:beamforming-information-update|o-ran-beamforming:capability-group-beamforming-information-update=o-ran-beamforming:capability-group-beamforming-information-update|o-ran-beamforming:predefined-beam-tilt-offset-complete=o-ran-beamforming:predefined-beam-tilt-offset-complete|o-ran-externalio:external-input-change=o-ran-externalio:external-input-change|o-ran-file-management:file-download-event=o-ran-file-management:file-download-event|o-ran-file-management:file-upload-notification=o-ran-file-management:file-upload-notification|o-ran-fm:alarm-notif=o-ran-fm:alarm-notif|o-ran-laa-operations:measurement-result=o-ran-laa-operations:measurement-result|o-ran-performance-management:measurement-result-stats=o-ran-performance-management:measurement-result-stats|o-ran-software-management:activation-event=o-ran-software-management:activation-event|o-ran-software-management:download-event=o-ran-software-management:download-event|o-ran-software-management:install-event=o-ran-software-management:install-event|o-ran-supervision:supervision-notification=o-ran-supervision:supervision-notification|o-ran-sync:gnss-state-change=o-ran-sync:gnss-state-change|o-ran-sync:ptp-state-change=o-ran-sync:ptp-state-change|o-ran-sync:synce-state-change=o-ran-sync:synce-state-change|o-ran-sync:synchronization-state-change=o-ran-sync:synchronization-state-change|o-ran-trace:trace-log-generated=o-ran-trace:trace-log-generated|o-ran-troubleshooting:troubleshooting-log-generated=o-ran-troubleshooting:troubleshooting-log-generated|o-ran-uplane-conf:rx-array-carriers-state-change=o-ran-uplane-conf:rx-array-carriers-state-change|o-ran-uplane-conf:tx-array-carriers-state-change=o-ran-uplane-conf:tx-array-carriers-state-change
+collector.dmaap.streamid=fault=ves-fault|syslog=ves-syslog|heartbeat=ves-heartbeat|measurementsForVfScaling=ves-measurement|mobileFlow=ves-mobileflow|other=ves-other|stateChange=ves-statechange|thresholdCrossingAlert=ves-thresholdCrossingAlert|voiceQuality=ves-voicequality|sipSignaling=ves-sipsignaling|notification=ves-notification|urn:ietf:params:xml:ns:yang:ietf-netconf-notifications=ves-notification|pnfRegistration=ves-pnfRegistration|3GPP-FaultSupervision=ves-3gpp-fault-supervision|3GPP-Heartbeat=ves-3gpp-heartbeat|3GPP-Provisioning=ves-3gpp-provisioning|3GPP-PerformanceAssurance=ves-3gpp-performance-assurance|o-ran-sc-du-hello-world-pm-streaming-oas3=ves-o-ran-sc-du-hello-world-pm-streaming-oas3|o1-notify-pnf-registration=ves-o1-notify-pnf-registration|file-ready=ves-file-ready|o-ran-ald-port:dc-enabled-status-change=o-ran-ald-port:dc-enabled-status-change|o-ran-ald-port:overcurrent-report=o-ran-ald-port:overcurrent-report|o-ran-antenna-calibration:antenna-calibration-coordinated=o-ran-antenna-calibration:antenna-calibration-coordinated|o-ran-antenna-calibration:antenna-calibration-multiple-time-resource-params=o-ran-antenna-calibration:antenna-calibration-multiple-time-resource-params|o-ran-antenna-calibration:antenna-calibration-required=o-ran-antenna-calibration:antenna-calibration-required|o-ran-antenna-calibration:antenna-calibration-result=o-ran-antenna-calibration:antenna-calibration-result|o-ran-beamforming:beamforming-information-update=o-ran-beamforming:beamforming-information-update|o-ran-beamforming:capability-group-beamforming-information-update=o-ran-beamforming:capability-group-beamforming-information-update|o-ran-beamforming:predefined-beam-tilt-offset-complete=o-ran-beamforming:predefined-beam-tilt-offset-complete|o-ran-externalio:external-input-change=o-ran-externalio:external-input-change|o-ran-file-management:file-download-event=o-ran-file-management:file-download-event|o-ran-file-management:file-upload-notification=o-ran-file-management:file-upload-notification|o-ran-fm:alarm-notif=o-ran-fm:alarm-notif|o-ran-laa-operations:measurement-result=o-ran-laa-operations:measurement-result|o-ran-performance-management:measurement-result-stats=o-ran-performance-management:measurement-result-stats|o-ran-software-management:activation-event=o-ran-software-management:activation-event|o-ran-software-management:download-event=o-ran-software-management:download-event|o-ran-software-management:install-event=o-ran-software-management:install-event|o-ran-supervision:supervision-notification=o-ran-supervision:supervision-notification|o-ran-sync:gnss-state-change=o-ran-sync:gnss-state-change|o-ran-sync:ptp-state-change=o-ran-sync:ptp-state-change|o-ran-sync:synce-state-change=o-ran-sync:synce-state-change|o-ran-sync:synchronization-state-change=o-ran-sync:synchronization-state-change|o-ran-trace:trace-log-generated=o-ran-trace:trace-log-generated|o-ran-troubleshooting:troubleshooting-log-generated=o-ran-troubleshooting:troubleshooting-log-generated|o-ran-uplane-conf:rx-array-carriers-state-change=o-ran-uplane-conf:rx-array-carriers-state-change|o-ran-uplane-conf:tx-array-carriers-state-change=o-ran-uplane-conf:tx-array-carriers-state-change
 
 collector.dmaapfile=etc/ves-dmaap-config.json
 
diff --git a/solution/smo/oam/ves-collector/externalRepo/o-ran-sc/experimental/o-ran-sc-any-standard-defined-message.yaml b/solution/smo/oam/ves-collector/externalRepo/o-ran-sc/experimental/o-ran-sc-any-standard-defined-message.yaml
new file mode 100644
index 0000000..554fcab
--- /dev/null
+++ b/solution/smo/oam/ves-collector/externalRepo/o-ran-sc/experimental/o-ran-sc-any-standard-defined-message.yaml
@@ -0,0 +1,119 @@
+openapi: 3.0.3
+info:
+  version: 0.0.0
+  title: O-RAN-SC-GenericNotification
+  description: >-
+    The O-RAN-SC K-Release provides a generic mechanism to consume any 
+    stndDefined VES message. This OpenAPI specification can be used for
+    the schema-map json file of the ONAP VES Collector, in case a yaml for
+    the schema does not exist.
+
+    Copyright 2024 highstreet technologies USA Corp.
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+
+    reference: https://jira.o-ran-sc.org/browse/OAM-403.
+
+servers:
+  - url: https://management-service-consumer:8443/v1
+    description: The url of an event stream consumer.
+paths:
+  /message:
+    post:
+      description: Posts a message.
+      summary: POST message
+      requestBody:
+        content:
+          application/json:
+            schema:
+              $ref: '#/components/schemas/message'
+        description: A message.
+      responses:
+        '201':
+          description: Posted
+        '400':
+          description: Bad Request
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/error-response'
+        '401':
+          description: Unauthorized
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/error-response'
+        '403':
+          description: Forbidden
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/error-response'
+        '404':
+          description: Not Found
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/error-response'
+        '405':
+          description: Method Not allowed
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/error-response'
+        '409':
+          description: Conflict
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/error-response'
+        '500':
+          description: Internal Server Error
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/error-response'
+        default:
+          description: Error case.
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/error-response'
+components:
+  schemas:
+    message:
+      description: An abstract object class of a message.
+      type: object
+    error-response:
+      description: >-
+        Used when an API throws an error with a HTTP error response-code (3xx,
+        4xx, 5xx)
+      type: object
+      required:
+        - reason
+      properties:
+        reason:
+          type: string
+          description: >-
+            Explanation of the reason for the error which can be shown to a
+            human user.
+        message:
+          type: string
+          description: >-
+            More details and corrective actions related to the error which can
+            be shown to a human user.
+        documentation-reference:
+          type: string
+          format: uri
+          description: URI of describing the error.
diff --git a/solution/smo/oam/ves-collector/externalRepo/schema-map.json b/solution/smo/oam/ves-collector/externalRepo/schema-map.json
index 5fee5c3..7e2d656 100644
--- a/solution/smo/oam/ves-collector/externalRepo/schema-map.json
+++ b/solution/smo/oam/ves-collector/externalRepo/schema-map.json
@@ -1,4 +1,8 @@
 [
+  {
+    "publicURL": "https://o-ran-sc.org/any-standard-defined-message.yaml",
+    "localURL": "o-ran-sc/experimental/o-ran-sc-any-standard-defined-message.yaml"
+  }, 
   {
     "publicURL": "https://gerrit.o-ran-sc.org/r/gitweb?p=scp/oam/modeling.git;a=blob_plain;f=data-model/oas3/experimental/o-ran-sc-du-hello-world-pm-streaming-oas3.yaml",
     "localURL": "o-ran-sc/experimental/o-ran-sc-du-hello-world-pm-streaming-oas3.yaml"
diff --git a/solution/smo/oam/ves-collector/ves-dmaap-config.json b/solution/smo/oam/ves-collector/ves-dmaap-config.json
index 9ad68e0..ac707ec 100644
--- a/solution/smo/oam/ves-collector/ves-dmaap-config.json
+++ b/solution/smo/oam/ves-collector/ves-dmaap-config.json
@@ -6,6 +6,13 @@
       "topic_url": "http://messages:3904/events/DCAE-SE-COLLECTOR-EVENTS-DEV"
     }
   },
+  "ves-notification": {
+    "type": "message_router",
+    "dmaap_info": {
+      "location": "mtl5",
+      "topic_url": "http://messages:3904/events/DCAE-SE-COLLECTOR-EVENTS-DEV"
+    }
+  },
   "ves-statechange": {
     "type": "message_router",
     "dmaap_info": {
@@ -223,6 +230,7 @@
       "topic_url": "http://messages:3904/events/unauthenticated.VES_FILE_READY_OUTPUT/"
     }
   },
+  "ietf-netconf-notifications:netconf-config-change":{"type":"message_router","dmaap_info":{"location":"mtl5","topic_url":"http://messages:3904/events/ietf-netconf-notifications-netconf-config-change/"}},
   "o-ran-ald-port:dc-enabled-status-change":{"type":"message_router","dmaap_info":{"location":"mtl5","topic_url":"http://messages:3904/events/o-ran-ald-port-dc-enabled-status-change/"}},
   "o-ran-ald-port:overcurrent-report":{"type":"message_router","dmaap_info":{"location":"mtl5","topic_url":"http://messages:3904/events/o-ran-ald-port-overcurrent-report/"}},
   "o-ran-antenna-calibration:antenna-calibration-coordinated":{"type":"message_router","dmaap_info":{"location":"mtl5","topic_url":"http://messages:3904/events/o-ran-antenna-calibration-antenna-calibration-coordinated/"}},