migrate sdnr features to phosphorus

fix mapper and switch to dom api
Updated to use phosphorus version of parent poms

Issue-ID: CCSDK-3566

Signed-off-by: Michael DÜrre <michael.duerre@highstreet-technologies.com>
Change-Id: I98c5bef9286622e0d66b53db687557d798cd53f5
Signed-off-by: Michael DÜrre <michael.duerre@highstreet-technologies.com>

19 files changed, 1687 insertions, 46 deletions

diff --git a/sdnr/wt/devicemanager-o-ran-sc/o-ran/ru-fh/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/oran/impl/DeviceManagerORanImpl.java b/sdnr/wt/devicemanager-o-ran-sc/o-ran/ru-fh/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/oran/impl/binding/DeviceManagerORanImpl.java
index 87157e8ce..7e04e8c1a 100644
--- a/sdnr/wt/devicemanager-o-ran-sc/o-ran/ru-fh/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/oran/impl/DeviceManagerORanImpl.java
+++ b/sdnr/wt/devicemanager-o-ran-sc/o-ran/ru-fh/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/oran/impl/binding/DeviceManagerORanImpl.java
@@ -15,10 +15,11 @@
  * the License.
  * ============LICENSE_END==========================================================================
  */
-package org.onap.ccsdk.features.sdnr.wt.devicemanager.oran.impl;
+package org.onap.ccsdk.features.sdnr.wt.devicemanager.oran.impl.binding;
 
 import org.onap.ccsdk.features.sdnr.wt.common.database.HtDatabaseClient;
 import org.onap.ccsdk.features.sdnr.wt.devicemanager.ne.factory.FactoryRegistration;
+import org.onap.ccsdk.features.sdnr.wt.devicemanager.oran.impl.startup.ORanNetworkElementFactory;
 import org.onap.ccsdk.features.sdnr.wt.devicemanager.service.NetconfNetworkElementService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
diff --git a/sdnr/wt/devicemanager-o-ran-sc/o-ran/ru-fh/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/oran/impl/ORanChangeNotificationListener.java b/sdnr/wt/devicemanager-o-ran-sc/o-ran/ru-fh/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/oran/impl/binding/ORanChangeNotificationListener.java
index c0aa0ac9b..abed01a44 100644
--- a/sdnr/wt/devicemanager-o-ran-sc/o-ran/ru-fh/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/oran/impl/ORanChangeNotificationListener.java
+++ b/sdnr/wt/devicemanager-o-ran-sc/o-ran/ru-fh/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/oran/impl/binding/ORanChangeNotificationListener.java
@@ -15,7 +15,7 @@
  * the License.
  * ============LICENSE_END==========================================================================
  */
-package org.onap.ccsdk.features.sdnr.wt.devicemanager.oran.impl;
+package org.onap.ccsdk.features.sdnr.wt.devicemanager.oran.impl.binding;
 
 import com.fasterxml.jackson.core.JsonProcessingException;
 import java.util.List;
diff --git a/sdnr/wt/devicemanager-o-ran-sc/o-ran/ru-fh/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/oran/impl/ORanFaultNotificationListener.java b/sdnr/wt/devicemanager-o-ran-sc/o-ran/ru-fh/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/oran/impl/binding/ORanFaultNotificationListener.java
index a17dcd726..d03b39480 100644
--- a/sdnr/wt/devicemanager-o-ran-sc/o-ran/ru-fh/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/oran/impl/ORanFaultNotificationListener.java
+++ b/sdnr/wt/devicemanager-o-ran-sc/o-ran/ru-fh/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/oran/impl/binding/ORanFaultNotificationListener.java
@@ -15,7 +15,7 @@
  * the License.
  * ============LICENSE_END==========================================================================
  */
-package org.onap.ccsdk.features.sdnr.wt.devicemanager.oran.impl;
+package org.onap.ccsdk.features.sdnr.wt.devicemanager.oran.impl.binding;
 
 import com.fasterxml.jackson.core.JsonProcessingException;
 import java.time.Instant;
diff --git a/sdnr/wt/devicemanager-o-ran-sc/o-ran/ru-fh/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/oran/impl/ORanFaultToVESFaultMapper.java b/sdnr/wt/devicemanager-o-ran-sc/o-ran/ru-fh/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/oran/impl/binding/ORanFaultToVESFaultMapper.java
index ec8eaa7b7..f5873df96 100644
--- a/sdnr/wt/devicemanager-o-ran-sc/o-ran/ru-fh/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/oran/impl/ORanFaultToVESFaultMapper.java
+++ b/sdnr/wt/devicemanager-o-ran-sc/o-ran/ru-fh/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/oran/impl/binding/ORanFaultToVESFaultMapper.java
@@ -19,7 +19,7 @@
  * ============LICENSE_END=========================================================
  *
  */
-package org.onap.ccsdk.features.sdnr.wt.devicemanager.oran.impl;
+package org.onap.ccsdk.features.sdnr.wt.devicemanager.oran.impl.binding;
 
 import java.time.Instant;
 import org.onap.ccsdk.features.sdnr.wt.devicemanager.service.VESCollectorService;
diff --git a/sdnr/wt/devicemanager-o-ran-sc/o-ran/ru-fh/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/oran/impl/ORanNetworkElement.java b/sdnr/wt/devicemanager-o-ran-sc/o-ran/ru-fh/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/oran/impl/binding/ORanNetworkElement.java
index d3ae5014e..e16df1d1c 100644
--- a/sdnr/wt/devicemanager-o-ran-sc/o-ran/ru-fh/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/oran/impl/ORanNetworkElement.java
+++ b/sdnr/wt/devicemanager-o-ran-sc/o-ran/ru-fh/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/oran/impl/binding/ORanNetworkElement.java
@@ -15,12 +15,12 @@
  * the License.
  * ============LICENSE_END==========================================================================
  */
-package org.onap.ccsdk.features.sdnr.wt.devicemanager.oran.impl;
+package org.onap.ccsdk.features.sdnr.wt.devicemanager.oran.impl.binding;
 
-import com.fasterxml.jackson.core.JsonProcessingException;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.List;
+import java.util.Map;
 import java.util.Optional;
 import org.eclipse.jdt.annotation.NonNull;
 import org.eclipse.jdt.annotation.Nullable;
@@ -30,14 +30,20 @@ import org.onap.ccsdk.features.sdnr.wt.devicemanager.ne.service.NetworkElement;
 import org.onap.ccsdk.features.sdnr.wt.devicemanager.ne.service.NetworkElementService;
 import org.onap.ccsdk.features.sdnr.wt.devicemanager.service.DeviceManagerServiceProvider;
 import org.onap.ccsdk.features.sdnr.wt.devicemanager.service.VESCollectorService;
-import org.onap.ccsdk.features.sdnr.wt.devicemanager.types.VESCommonEventHeaderPOJO;
-import org.onap.ccsdk.features.sdnr.wt.devicemanager.types.VESPNFRegistrationFieldsPOJO;
 import org.onap.ccsdk.features.sdnr.wt.netconfnodestateservice.Capabilities;
 import org.onap.ccsdk.features.sdnr.wt.netconfnodestateservice.NetconfAccessor;
 import org.onap.ccsdk.features.sdnr.wt.netconfnodestateservice.NetconfBindingAccessor;
+import org.onap.ccsdk.features.sdnr.wt.netconfnodestateservice.NetconfDomAccessor;
 import org.opendaylight.mdsal.common.api.LogicalDatastoreType;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.netmod.notification.rev080714.netconf.streams.Stream;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.netmod.notification.rev080714.netconf.streams.StreamKey;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.hardware.rev180313.Hardware;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.hardware.rev180313.hardware.Component;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.netconf.notifications.rev120206.NetconfCapabilityChange;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.netconf.notifications.rev120206.NetconfConfigChange;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.netconf.notifications.rev120206.NetconfConfirmedCommit;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.netconf.notifications.rev120206.NetconfSessionEnd;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.netconf.notifications.rev120206.NetconfSessionStart;
 import org.opendaylight.yang.gen.v1.urn.onap.system.rev201026.System1;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev201110.Guicutthrough;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev201110.Inventory;
@@ -64,20 +70,25 @@ public class ORanNetworkElement implements NetworkElement {
             .augmentation(System1.class).build();
 
     private final NetconfBindingAccessor netconfAccessor;
+    private final Optional<NetconfBindingAccessor> netconfAccessorOpt;
+
+    private final Optional<NetconfDomAccessor> netconfDomAccessor;
     private final DataProvider databaseService;
     private final ORanRegistrationToVESpnfRegistrationMapper mapper;
     private final VESCollectorService vesCollectorService;
 
     private ListenerRegistration<NotificationListener> oRanListenerRegistrationResult;
-    private @NonNull final ORanChangeNotificationListener oRanListener;
+    //private @NonNull final ORanChangeNotificationListener oRanListener;
     private ListenerRegistration<NotificationListener> oRanFaultListenerRegistrationResult;
     private @NonNull final ORanFaultNotificationListener oRanFaultListener;
 
-    ORanNetworkElement(NetconfBindingAccessor netconfAccess, DeviceManagerServiceProvider serviceProvider) {
+    //ORanNetworkElement(NetconfBindingAccessor netconfAccess, DeviceManagerServiceProvider serviceProvider) {
+    ORanNetworkElement(NetconfAccessor netconfAccess, DeviceManagerServiceProvider serviceProvider) {
         LOG.info("Create {}", ORanNetworkElement.class.getSimpleName());
         // Read parameters
-        this.netconfAccessor = netconfAccess;
-
+        this.netconfAccessorOpt = netconfAccess.getNetconfBindingAccessor();
+        this.netconfAccessor = netconfAccessorOpt.get();
+        this.netconfDomAccessor = netconfAccess.getNetconfDomAccessor();
         // Get services
         this.databaseService = serviceProvider.getDataProvider();
         this.vesCollectorService = serviceProvider.getVESCollectorService();
@@ -86,11 +97,12 @@ public class ORanNetworkElement implements NetworkElement {
 
         // Register callbacks
         this.oRanListenerRegistrationResult = null;
-        this.oRanListener = new ORanChangeNotificationListener(netconfAccessor, serviceProvider);
+        //this.oRanListener = new ORanChangeNotificationListener(netconfAccessor, serviceProvider);
 
         this.oRanFaultListenerRegistrationResult = null;
         this.oRanFaultListener = new ORanFaultNotificationListener(netconfAccessor, vesCollectorService,
                 serviceProvider.getFaultService(), serviceProvider.getWebsocketService(), databaseService);
+
     }
 
     private Collection<Component> initialReadFromNetworkElement() {
@@ -125,12 +137,21 @@ public class ORanNetworkElement implements NetworkElement {
         // Publish the mountpoint to VES if enabled
         publishMountpointToVES(componentList);
         // Register call back class for receiving notifications
-        this.oRanListenerRegistrationResult = netconfAccessor.doRegisterNotificationListener(oRanListener);
+        //this.oRanListenerRegistrationResult = netconfAccessor.doRegisterNotificationListener(oRanListener);
         this.oRanFaultListenerRegistrationResult = netconfAccessor.doRegisterNotificationListener(oRanFaultListener);
         // Register notifications stream
-        if (netconfAccessor.isNotificationsRFC5277Supported()) {
+        /*if (netconfAccessor.isNotificationsRFC5277Supported()) {
             netconfAccessor.registerNotificationsStream();
-        }
+        }*/
+
+        QName[] notifications = { NetconfConfigChange.QNAME, NetconfConfirmedCommit.QNAME,
+                NetconfSessionStart.QNAME, NetconfSessionEnd.QNAME, NetconfCapabilityChange.QNAME };
+        //netconfDomAccessor.get().doRegisterNotificationListener(new ORanDOMChangeNotificationListener(netconfDomAccessor.get(), databaseService), notifications);
+     // Output notification streams to LOG
+        Map<StreamKey, Stream> streams = netconfDomAccessor.get().getNotificationStreamsAsMap();
+        LOG.info("Available notifications streams: {}", streams);
+        // Register to default stream
+        netconfDomAccessor.get().invokeCreateSubscription();
     }
 
     @Override
@@ -220,14 +241,13 @@ public class ORanNetworkElement implements NetworkElement {
                     // If the device supports subtended configuration then it is assumed that the
                     // Chassis containing the management interface will be the root component and
                     // there will be only one root.
-                    VESCommonEventHeaderPOJO header = mapper.mapCommonEventHeader(component);
+                    /*VESCommonEventHeaderPOJO header = mapper.mapCommonEventHeader(component);
                     VESPNFRegistrationFieldsPOJO body = mapper.mapPNFRegistrationFields(component);
                     try {
                         vesCollectorService.publishVESMessage(vesCollectorService.generateVESEvent(header, body));
                     } catch (JsonProcessingException e) {
                         LOG.warn("Error while serializing VES Event to String ", e);
-                        e.printStackTrace();
-                    }
+                    }*/
                 }
             }
         }
diff --git a/sdnr/wt/devicemanager-o-ran-sc/o-ran/ru-fh/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/oran/impl/ORanNotifToVESEventAssembly.java b/sdnr/wt/devicemanager-o-ran-sc/o-ran/ru-fh/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/oran/impl/binding/ORanNotifToVESEventAssembly.java
index d99f1c874..6e31ffb6f 100644
--- a/sdnr/wt/devicemanager-o-ran-sc/o-ran/ru-fh/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/oran/impl/ORanNotifToVESEventAssembly.java
+++ b/sdnr/wt/devicemanager-o-ran-sc/o-ran/ru-fh/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/oran/impl/binding/ORanNotifToVESEventAssembly.java
@@ -19,7 +19,7 @@
  * ============LICENSE_END=========================================================
  *
  */
-package org.onap.ccsdk.features.sdnr.wt.devicemanager.oran.impl;
+package org.onap.ccsdk.features.sdnr.wt.devicemanager.oran.impl.binding;
 
 import java.time.Instant;
 import java.util.ArrayList;
diff --git a/sdnr/wt/devicemanager-o-ran-sc/o-ran/ru-fh/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/oran/impl/ORanRegistrationToVESpnfRegistrationMapper.java b/sdnr/wt/devicemanager-o-ran-sc/o-ran/ru-fh/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/oran/impl/binding/ORanRegistrationToVESpnfRegistrationMapper.java
index 3524383f2..206abb5d7 100644
--- a/sdnr/wt/devicemanager-o-ran-sc/o-ran/ru-fh/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/oran/impl/ORanRegistrationToVESpnfRegistrationMapper.java
+++ b/sdnr/wt/devicemanager-o-ran-sc/o-ran/ru-fh/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/oran/impl/binding/ORanRegistrationToVESpnfRegistrationMapper.java
@@ -19,14 +19,16 @@
  * ============LICENSE_END=========================================================
  *
  */
-package org.onap.ccsdk.features.sdnr.wt.devicemanager.oran.impl;
+package org.onap.ccsdk.features.sdnr.wt.devicemanager.oran.impl.binding;
 
 import java.time.Instant;
+import org.onap.ccsdk.features.sdnr.wt.devicemanager.oran.impl.dom.ORanDMDOMUtility;
+import org.onap.ccsdk.features.sdnr.wt.devicemanager.oran.impl.dom.ORanDeviceManagerQNames;
 import org.onap.ccsdk.features.sdnr.wt.devicemanager.service.VESCollectorService;
 import org.onap.ccsdk.features.sdnr.wt.devicemanager.types.VESCommonEventHeaderPOJO;
 import org.onap.ccsdk.features.sdnr.wt.devicemanager.types.VESPNFRegistrationFieldsPOJO;
 import org.onap.ccsdk.features.sdnr.wt.netconfnodestateservice.NetconfAccessor;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.hardware.rev180313.hardware.Component;
+import org.opendaylight.yangtools.yang.data.api.schema.MapEntryNode;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -53,7 +55,7 @@ public class ORanRegistrationToVESpnfRegistrationMapper {
         this.sequenceNo = 0;
     }
 
-    public VESCommonEventHeaderPOJO mapCommonEventHeader(Component component) {
+    public VESCommonEventHeaderPOJO mapCommonEventHeader(MapEntryNode component) {
         VESCommonEventHeaderPOJO vesCEH = new VESCommonEventHeaderPOJO();
         vesCEH.setDomain(VES_EVENT_DOMAIN);
         vesCEH.setEventId(netconfAccessor.getNodeId().getValue());
@@ -63,26 +65,48 @@ public class ORanRegistrationToVESpnfRegistrationMapper {
 
         vesCEH.setStartEpochMicrosec(Instant.now().toEpochMilli() * 1000);
         vesCEH.setLastEpochMicrosec(Instant.now().toEpochMilli() * 1000);
-        vesCEH.setNfVendorName(component.getMfgName());
+        vesCEH.setNfVendorName(
+                ORanDMDOMUtility.getLeafValue(component, ORanDeviceManagerQNames.IETF_HW_COMPONENT_LIST_MFG_NAME));
         vesCEH.setReportingEntityName(vesProvider.getConfig().getReportingEntityName());
         vesCEH.setSequence(sequenceNo++);
-        vesCEH.setSourceId(component.getUuid() != null ? component.getUuid().toString():netconfAccessor.getNodeId().getValue());
+        vesCEH.setSourceId(
+                ORanDMDOMUtility.getLeafValue(component, ORanDeviceManagerQNames.IETF_HW_COMPONENT_LIST_UUID) != null
+                        ? ORanDMDOMUtility.getLeafValue(component, ORanDeviceManagerQNames.IETF_HW_COMPONENT_LIST_UUID)
+                        : netconfAccessor.getNodeId().getValue());
         vesCEH.setSourceName(netconfAccessor.getNodeId().getValue());
 
         return vesCEH;
     }
 
-    public VESPNFRegistrationFieldsPOJO mapPNFRegistrationFields(Component component) {
+    public VESPNFRegistrationFieldsPOJO mapPNFRegistrationFields(MapEntryNode component) {
         VESPNFRegistrationFieldsPOJO vesPnfFields = new VESPNFRegistrationFieldsPOJO();
-        vesPnfFields.setModelNumber(component.getModelName());
-        vesPnfFields.setOamV4IpAddress(netconfAccessor.getNetconfNode().getHost().getIpAddress().getIpv4Address()!=null?netconfAccessor.getNetconfNode().getHost().getIpAddress().getIpv4Address().getValue():null);
-        vesPnfFields.setOamV6IpAddress(netconfAccessor.getNetconfNode().getHost().getIpAddress().getIpv6Address()!=null?netconfAccessor.getNetconfNode().getHost().getIpAddress().getIpv6Address().getValue():null);
-        vesPnfFields.setSerialNumber(component.getSerialNum());
-        vesPnfFields.setVendorName(component.getMfgName());
-        vesPnfFields.setSoftwareVersion(component.getSoftwareRev());
-        vesPnfFields.setUnitType(component.getAlias());
-        vesPnfFields.setUnitFamily(component.getXmlClass().toString());
-        vesPnfFields.setManufactureDate(component.getMfgDate()!=null?component.getMfgDate().toString():"Unknown");
+        vesPnfFields.setModelNumber(
+                ORanDMDOMUtility.getLeafValue(component, ORanDeviceManagerQNames.IETF_HW_COMPONENT_LIST_MFG_NAME));
+        vesPnfFields
+                .setOamV4IpAddress(netconfAccessor.getNetconfNode().getHost().getIpAddress().getIpv4Address() != null
+                        ? netconfAccessor.getNetconfNode().getHost().getIpAddress().getIpv4Address().getValue()
+                        : null);
+        vesPnfFields
+                .setOamV6IpAddress(netconfAccessor.getNetconfNode().getHost().getIpAddress().getIpv6Address() != null
+                        ? netconfAccessor.getNetconfNode().getHost().getIpAddress().getIpv6Address().getValue()
+                        : null);
+        vesPnfFields.setSerialNumber(
+                ORanDMDOMUtility.getLeafValue(component, ORanDeviceManagerQNames.IETF_HW_COMPONENT_LIST_SER_NUM));
+        vesPnfFields.setVendorName(
+                ORanDMDOMUtility.getLeafValue(component, ORanDeviceManagerQNames.IETF_HW_COMPONENT_LIST_MFG_NAME));
+        vesPnfFields.setSoftwareVersion(
+                ORanDMDOMUtility.getLeafValue(component, ORanDeviceManagerQNames.IETF_HW_COMPONENT_LIST_SW_REV));
+        vesPnfFields.setUnitType(
+                ORanDMDOMUtility.getLeafValue(component, ORanDeviceManagerQNames.IETF_HW_COMPONENT_LIST_ALIAS));
+        vesPnfFields.setUnitFamily(
+                ORanDMDOMUtility.getLeafValue(component, ORanDeviceManagerQNames.IETF_HW_COMPONENT_LIST_CLASS));
+        vesPnfFields
+                .setManufactureDate(
+                        ORanDMDOMUtility.getLeafValue(component,
+                                ORanDeviceManagerQNames.IETF_HW_COMPONENT_LIST_MFG_DATE) != null
+                                        ? ORanDMDOMUtility.getLeafValue(component,
+                                                ORanDeviceManagerQNames.IETF_HW_COMPONENT_LIST_MFG_DATE)
+                                        : "Unknown");
         //vesPnfFields.setLastServiceDate(component.getLastChange());
 
         return vesPnfFields;
diff --git a/sdnr/wt/devicemanager-o-ran-sc/o-ran/ru-fh/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/oran/impl/ORanToInternalDataModel.java b/sdnr/wt/devicemanager-o-ran-sc/o-ran/ru-fh/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/oran/impl/binding/ORanToInternalDataModel.java
index 71ab613d2..2469e46b7 100644
--- a/sdnr/wt/devicemanager-o-ran-sc/o-ran/ru-fh/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/oran/impl/ORanToInternalDataModel.java
+++ b/sdnr/wt/devicemanager-o-ran-sc/o-ran/ru-fh/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/oran/impl/binding/ORanToInternalDataModel.java
@@ -15,7 +15,7 @@
  * the License.
  * ============LICENSE_END==========================================================================
  */
-package org.onap.ccsdk.features.sdnr.wt.devicemanager.oran.impl;
+package org.onap.ccsdk.features.sdnr.wt.devicemanager.oran.impl.binding;
 
 import java.time.Instant;
 import java.util.ArrayList;
@@ -236,7 +236,7 @@ public class ORanToInternalDataModel {
         faultAlarm.setNodeId(nodeId.getValue());
         faultAlarm.setObjectId(notification.getFaultSource());
         faultAlarm.setProblem(notification.getFaultText());
-        faultAlarm.setSeverity(getSeverityType(notification.getFaultSeverity(), notification.isIsCleared()));
+        faultAlarm.setSeverity(getSeverityType(notification.getFaultSeverity(), notification.getIsCleared()));
         faultAlarm.setCounter(counter);
         faultAlarm.setId(String.valueOf(notification.getFaultId()));
         faultAlarm.setSourceType(SourceType.Netconf);
diff --git a/sdnr/wt/devicemanager-o-ran-sc/o-ran/ru-fh/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/oran/impl/dom/DOMNotificationToXPath.java b/sdnr/wt/devicemanager-o-ran-sc/o-ran/ru-fh/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/oran/impl/dom/DOMNotificationToXPath.java
new file mode 100644
index 000000000..64fb9b857
--- /dev/null
+++ b/sdnr/wt/devicemanager-o-ran-sc/o-ran/ru-fh/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/oran/impl/dom/DOMNotificationToXPath.java
@@ -0,0 +1,235 @@
+/*
+ * ============LICENSE_START=======================================================
+ * ONAP : ccsdk features
+ * ================================================================================
+ * Copyright (C) 2020 highstreet technologies GmbH Intellectual Property.
+ * All rights reserved.
+ * ================================================================================
+ * 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.
+ * ============LICENSE_END=========================================================
+ *
+ */
+package org.onap.ccsdk.features.sdnr.wt.devicemanager.oran.impl.dom;
+
+import java.time.Instant;
+import java.util.Collection;
+import java.util.HashMap;
+import org.eclipse.jdt.annotation.NonNull;
+import org.opendaylight.mdsal.dom.api.DOMEvent;
+import org.opendaylight.mdsal.dom.api.DOMNotification;
+import org.opendaylight.yangtools.yang.common.QName;
+import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.NodeIdentifierWithPredicates;
+import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.PathArgument;
+import org.opendaylight.yangtools.yang.data.api.schema.ChoiceNode;
+import org.opendaylight.yangtools.yang.data.api.schema.ContainerNode;
+import org.opendaylight.yangtools.yang.data.api.schema.DataContainerChild;
+import org.opendaylight.yangtools.yang.data.api.schema.DataContainerNode;
+import org.opendaylight.yangtools.yang.data.api.schema.LeafSetEntryNode;
+import org.opendaylight.yangtools.yang.data.api.schema.LeafSetNode;
+import org.opendaylight.yangtools.yang.data.api.schema.MapEntryNode;
+import org.opendaylight.yangtools.yang.data.api.schema.MapNode;
+import org.opendaylight.yangtools.yang.data.api.schema.UnkeyedListEntryNode;
+import org.opendaylight.yangtools.yang.data.api.schema.UnkeyedListNode;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.google.common.base.VerifyException;
+
+public class DOMNotificationToXPath {
+	private static final Logger LOG = LoggerFactory.getLogger(DOMNotificationToXPath.class);
+
+	public HashMap<String, String> convertDomNotifToXPath(@NonNull DOMNotification domNotification) {
+		@NonNull
+		ContainerNode notifContainer = domNotification.getBody();
+		HashMap<String, String> xPathData = new HashMap<String, String>();
+
+		Collection<DataContainerChild> data = notifContainer.body();
+		for (DataContainerChild data1 : data) {
+			String namePath = "";
+			recurseDOMData(notifContainer, data1, notifContainer, xPathData, namePath);
+		}
+		LOG.debug("XPath Data = {}", xPathData);
+		return xPathData;
+
+	}
+
+	private void recurseDOMData(@NonNull ContainerNode notifContainer, DataContainerChild domData, DataContainerNode cn,
+			HashMap<String, String> result, String namePath) {
+		PathArgument pa1 = domData.getIdentifier();
+		namePath += "/" + pa1.getNodeType().getLocalName();
+		if (domData.getClass().getSimpleName().equals("ImmutableContainerNode")) {
+			try {
+				ContainerNode cn1 = (ContainerNode) cn.getChildByArg(pa1);
+				for (DataContainerChild data1 : cn1.body()) {
+					recurseDOMData(notifContainer, data1, cn1, result, namePath);
+				}
+			} catch (VerifyException ve) {
+				LOG.debug("{} does not exist", pa1);
+			}
+		}
+
+		if (domData.getClass().getSimpleName().equals("ImmutableChoiceNode")) {
+			try {
+				ChoiceNode cn1 = (ChoiceNode) cn.getChildByArg(pa1);
+				for (DataContainerChild data1 : cn1.body()) {
+					// recurseChoiceData(data1, cn1, namePath);
+					recurseDOMData(notifContainer, data1, cn1, result, namePath);
+				}
+			} catch (VerifyException ve) {
+				LOG.debug("{} does not exist", pa1);
+			}
+		}
+
+		if (domData.getClass().getSimpleName().equals("ImmutableUnkeyedListNode")) {
+			try {
+				UnkeyedListNode cn1 = (UnkeyedListNode) cn.getChildByArg(pa1);
+				for (UnkeyedListEntryNode data1 : cn1.body()) {
+					recurseUnkeyedListEntryNodeData(data1, cn1, result, namePath);
+				}
+			} catch (VerifyException ve) {
+				LOG.debug("{} does not exist", pa1);
+			}
+		}
+
+		if (domData.getClass().getSimpleName().equals("ImmutableMapNode")) {
+			try {
+				MapNode cn1 = (MapNode) cn.getChildByArg(pa1);
+				for (MapEntryNode data1 : cn1.body()) {
+					recurseMapEntryNodeData(notifContainer, data1, cn1, result, namePath);
+				}
+			} catch (VerifyException ve) {
+				LOG.debug("{} does not exist", pa1);
+			}
+		}
+
+		if (domData.getClass().getSimpleName().equals("ImmutableLeafSetNode")) {
+			try {
+				LeafSetNode<?> cn1 = (LeafSetNode<?>) cn.getChildByArg(pa1);
+				for (LeafSetEntryNode<?> data1 : cn1.body()) {
+					recurseLeafSetEntryNodeData(data1, cn1, result, namePath);
+				}
+			} catch (VerifyException ve) {
+				LOG.debug("{} does not exist", pa1);
+			}
+		}
+
+		if (domData.getClass().getSimpleName().equals("ImmutableLeafNode")) {
+			recurseLeafNode(domData, result, namePath);
+		}
+	}
+
+	private void recurseLeafSetEntryNodeData(LeafSetEntryNode<?> data, LeafSetNode<?> cn1,
+			HashMap<String, String> result, String namePath) {
+		PathArgument pa1 = data.getIdentifier();
+		namePath += "/" + pa1.getNodeType().getLocalName();
+
+		if (data.getClass().getSimpleName().equals("ImmutableLeafSetEntryNode")) {
+			LOG.debug("{}={}", namePath, data.body());
+			result.put(namePath, data.body().toString());
+		}
+	}
+
+	private void recurseMapEntryNodeData(@NonNull ContainerNode notifContainer, MapEntryNode data, MapNode cn1,
+			HashMap<String, String> result, String namePath) {
+		PathArgument pa1 = data.getIdentifier();
+		NodeIdentifierWithPredicates ni = data.getIdentifier();
+
+		for (QName qn : ni.keySet()) {
+			namePath += "/" + ni.getValue(qn);
+		}
+
+		if (data.getClass().getSimpleName().equals("ImmutableMapEntryNode")) {
+			for (DataContainerChild data1 : data.body()) {
+				if (data1.getClass().getSimpleName().equals("ImmutableLeafSetNode")) {
+					try {
+						LeafSetNode<?> cn2 = (LeafSetNode<?>) data.getChildByArg(data1.getIdentifier());
+						for (LeafSetEntryNode<?> data2 : cn2.body()) {
+							recurseLeafSetEntryNodeData(data2, cn2, result, namePath);
+						}
+					} catch (VerifyException ve) {
+						LOG.debug("{} does not exist", data1.getIdentifier());
+					}
+				} else {
+					recurseLeafNode(data1, result, namePath);
+				}
+			}
+		}
+
+		if (data.getClass().getSimpleName().equals("ImmutableLeafSetNode")) {
+			try {
+				LeafSetNode<?> cn2 = (LeafSetNode<?>) notifContainer.getChildByArg(pa1);
+				for (LeafSetEntryNode<?> data1 : cn2.body()) {
+					recurseLeafSetEntryNodeData(data1, cn2, result, namePath);
+				}
+			} catch (VerifyException ve) {
+				LOG.debug("{} does not exist", pa1);
+			}
+		}
+
+		if (data.getClass().getSimpleName().equals("ImmutableLeafNode")) {
+			LOG.debug("{}={}", namePath, data.body());
+			result.put(namePath, data.body().toString());
+		}
+	}
+
+	private void recurseUnkeyedListEntryNodeData(UnkeyedListEntryNode data, UnkeyedListNode cn1,
+			HashMap<String, String> result, String namePath) {
+		PathArgument pa1 = data.getIdentifier();
+		namePath += "/" + pa1.getNodeType().getLocalName();
+
+		if (data.getClass().getSimpleName().equals("ImmutableUnkeyedListEntryNode")) {
+			for (DataContainerChild data1 : data.body()) {
+				recurseLeafNode(data1, result, namePath);
+			}
+		}
+
+		if (data.getClass().getSimpleName().equals("ImmutableLeafNode")) {
+			LOG.debug("{}={}", namePath, data.body());
+			result.put(namePath, data.body().toString());
+		}
+	}
+
+	public void recurseLeafNode(DataContainerChild data, HashMap<String, String> result, String namePath) {
+		PathArgument pa1 = data.getIdentifier();
+		if (!(data.getClass().getSimpleName().equals("ImmutableAugmentationNode")))
+			namePath += "/" + pa1.getNodeType().getLocalName();
+		if (data.getClass().getSimpleName().equals("ImmutableLeafNode")) {
+			LOG.debug("{}={}", namePath, data.body());
+			result.put(namePath, data.body().toString());
+		}
+	}
+
+	public void recurseChoiceData(HashMap<String, String> result, DataContainerChild data, ChoiceNode cn,
+			String namePath) {
+		PathArgument pa1 = data.getIdentifier();
+		namePath += "/" + pa1.getNodeType().getLocalName();
+		// NodeIdentifier nodeId = new NodeIdentifier(pa1.getNodeType());
+		if (data.getClass().getSimpleName().equals("ImmutableLeafNode")) {
+			LOG.debug("{}={}", namePath, data.body());
+			result.put(namePath, data.body().toString());
+		}
+	}
+
+	public Instant getTime(@NonNull DOMNotification domNotification) {
+		@NonNull
+		Instant eventTime;
+		if (domNotification instanceof DOMEvent) {
+			eventTime = ((DOMEvent) domNotification).getEventInstant();
+			LOG.info("Event time {}", eventTime);
+		} else {
+			eventTime = Instant.now();
+			LOG.info("Defaulting to actual time of processing the notification - {}", eventTime);
+		}
+		return eventTime;
+	}
+}
diff --git a/sdnr/wt/devicemanager-o-ran-sc/o-ran/ru-fh/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/oran/impl/dom/ORanDMDOMUtility.java b/sdnr/wt/devicemanager-o-ran-sc/o-ran/ru-fh/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/oran/impl/dom/ORanDMDOMUtility.java
new file mode 100644
index 000000000..947677bb6
--- /dev/null
+++ b/sdnr/wt/devicemanager-o-ran-sc/o-ran/ru-fh/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/oran/impl/dom/ORanDMDOMUtility.java
@@ -0,0 +1,90 @@
+/*
+ * ============LICENSE_START=======================================================
+ * ONAP : ccsdk features
+ * ================================================================================
+ * Copyright (C) 2021 highstreet technologies GmbH Intellectual Property.
+ * All rights reserved.
+ * ================================================================================
+ * 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.
+ * ============LICENSE_END=========================================================
+ *
+ */
+package org.onap.ccsdk.features.sdnr.wt.devicemanager.oran.impl.dom;
+
+import java.time.Instant;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Iterator;
+import java.util.List;
+import org.opendaylight.mdsal.dom.api.DOMEvent;
+import org.opendaylight.mdsal.dom.api.DOMNotification;
+import org.opendaylight.yangtools.yang.common.QName;
+import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.NodeIdentifier;
+import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.NodeIdentifierWithPredicates;
+import org.opendaylight.yangtools.yang.data.api.schema.DataContainerChild;
+import org.opendaylight.yangtools.yang.data.api.schema.DataContainerNode;
+import org.opendaylight.yangtools.yang.data.api.schema.LeafNode;
+import org.opendaylight.yangtools.yang.data.api.schema.LeafSetEntryNode;
+import org.opendaylight.yangtools.yang.data.api.schema.MapEntryNode;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.google.common.base.VerifyException;
+
+public class ORanDMDOMUtility {
+	public static final Logger LOG = LoggerFactory.getLogger(ORanDMDOMUtility.class);
+
+	public static String getKeyValue(MapEntryNode componentEntry) {
+		NodeIdentifierWithPredicates componentKey = componentEntry.getIdentifier(); // list key
+		return (String) componentKey.getValue(ORanDeviceManagerQNames.IETF_HW_COMPONENT_LIST_KEY);
+	}
+
+	public static String getLeafValue(DataContainerNode componentEntry, QName leafQName) {
+		NodeIdentifier leafNodeIdentifier = new NodeIdentifier(leafQName);
+		try {
+			LeafNode<?> optLeafNode = (LeafNode<?>) componentEntry.getChildByArg(leafNodeIdentifier);
+			if (optLeafNode.body() instanceof QName) {
+				LOG.debug("Leaf is of type QName");
+			}
+			return optLeafNode.body().toString();
+		} catch (VerifyException ve) {
+			LOG.debug("Leaf with QName {} not found", leafQName.toString());
+			return null;
+		}
+	}
+
+	public static List<String> getLeafListValue(DataContainerNode componentEntry, QName leafListQName) {
+		List<String> containsChildList = new ArrayList<String>();
+		try {
+			DataContainerChild childSet = componentEntry.getChildByArg(new NodeIdentifier(leafListQName));
+			Collection<?> childEntry = (Collection<?>) childSet.body();
+			Iterator<?> childEntryItr = childEntry.iterator();
+			while (childEntryItr.hasNext()) {
+				LeafSetEntryNode<?> childEntryNode = (LeafSetEntryNode<?>) childEntryItr.next();
+				containsChildList.add(childEntryNode.body().toString());
+			}
+		} catch (VerifyException ve) {
+			LOG.debug("Child for {} does not exist", leafListQName);
+		}
+		return containsChildList;
+	}
+
+	public static Instant getNotificationInstant(DOMNotification notification) {
+		if (notification instanceof DOMEvent) {
+			return ((DOMEvent) notification).getEventInstant();
+		} else {
+			return Instant.now();
+		}
+	}
+
+}
diff --git a/sdnr/wt/devicemanager-o-ran-sc/o-ran/ru-fh/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/oran/impl/dom/ORanDOMChangeNotificationListener.java b/sdnr/wt/devicemanager-o-ran-sc/o-ran/ru-fh/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/oran/impl/dom/ORanDOMChangeNotificationListener.java
new file mode 100644
index 000000000..aa375eff7
--- /dev/null
+++ b/sdnr/wt/devicemanager-o-ran-sc/o-ran/ru-fh/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/oran/impl/dom/ORanDOMChangeNotificationListener.java
@@ -0,0 +1,150 @@
+/*
+ * ============LICENSE_START=======================================================
+ * ONAP : ccsdk features
+ * ================================================================================
+ * Copyright (C) 2021 highstreet technologies GmbH Intellectual Property.
+ * All rights reserved.
+ * ================================================================================
+ * 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.
+ * ============LICENSE_END=========================================================
+ *
+ */
+package org.onap.ccsdk.features.sdnr.wt.devicemanager.oran.impl.dom;
+
+import com.fasterxml.jackson.core.JsonProcessingException;
+import java.time.Instant;
+import org.eclipse.jdt.annotation.NonNull;
+import org.onap.ccsdk.features.sdnr.wt.dataprovider.model.DataProvider;
+import org.onap.ccsdk.features.sdnr.wt.dataprovider.model.types.NetconfTimeStampImpl;
+import org.onap.ccsdk.features.sdnr.wt.devicemanager.service.VESCollectorService;
+import org.onap.ccsdk.features.sdnr.wt.devicemanager.types.VESCommonEventHeaderPOJO;
+import org.onap.ccsdk.features.sdnr.wt.devicemanager.types.VESNotificationFieldsPOJO;
+import org.onap.ccsdk.features.sdnr.wt.netconfnodestateservice.NetconfDomAccessor;
+import org.opendaylight.mdsal.dom.api.DOMEvent;
+import org.opendaylight.mdsal.dom.api.DOMNotification;
+import org.opendaylight.mdsal.dom.api.DOMNotificationListener;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.yang.types.rev130715.DateAndTime;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev201110.EventlogBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev201110.EventlogEntity;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev201110.SourceType;
+import org.opendaylight.yangtools.yang.binding.CodeHelpers;
+import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.NodeIdentifier;
+import org.opendaylight.yangtools.yang.data.api.schema.ChoiceNode;
+import org.opendaylight.yangtools.yang.data.api.schema.ContainerNode;
+import org.opendaylight.yangtools.yang.data.api.schema.UnkeyedListNode;
+import org.opendaylight.yangtools.yang.model.api.stmt.SchemaNodeIdentifier.Absolute;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class ORanDOMChangeNotificationListener implements DOMNotificationListener {
+
+	private static final Logger log = LoggerFactory.getLogger(ORanDOMChangeNotificationListener.class);
+
+	private final NetconfDomAccessor netconfDomAccessor;
+	private final DataProvider databaseService;
+	private @NonNull VESCollectorService vesCollectorService;
+	private final DOMNotificationToXPath domNotificationXPath;
+	private ORanDOMNotifToVESEventAssembly mapper = null;
+	private static int sequenceNo = 0;
+
+	public ORanDOMChangeNotificationListener(NetconfDomAccessor netconfDomAccessor,
+			@NonNull VESCollectorService vesCollectorService, DataProvider databaseService) {
+		this.netconfDomAccessor = netconfDomAccessor;
+		this.databaseService = databaseService;
+		this.vesCollectorService = vesCollectorService;
+		domNotificationXPath = new DOMNotificationToXPath();
+	}
+
+	@Override
+	public void onNotification(@NonNull DOMNotification domNotification) {
+		if (domNotification.getType()
+				.equals(Absolute.of(ORanDeviceManagerQNames.IETF_NETCONF_NOTIFICATIONS_NETCONF_CONFIG_CHANGE))) {
+			handleNetconfConfigChange(domNotification);
+		}
+	}
+
+	private void handleNetconfConfigChange(@NonNull DOMNotification domNotification) {
+		DateAndTime eventTime;
+		Instant notificationEventTime = null;
+		if (domNotification instanceof DOMEvent) {
+			notificationEventTime = ((DOMEvent) domNotification).getEventInstant();
+			eventTime = NetconfTimeStampImpl.getConverter().getTimeStamp(notificationEventTime.toString());
+		} else {
+			eventTime = NetconfTimeStampImpl.getConverter().getTimeStamp();
+		}
+
+		ContainerNode cn = domNotification.getBody();
+
+		// Process the changed-by child
+//		ContainerNode changedByContainerNode = (ContainerNode) cn
+//				.childByArg(new NodeIdentifier(ORanDeviceManagerQNames.IETF_NETCONF_NOTIFICATIONS_CHANGEDBY));
+//		ChoiceNode serverOrUserIDVal = (ChoiceNode) changedByContainerNode
+//				.childByArg(new NodeIdentifier(ORanDeviceManagerQNames.IETF_NETCONF_NOTIFICATIONS_SERVERORUSER));
+//		@SuppressWarnings("unused")
+//		String userIDValue = serverOrUserIDVal
+//				.childByArg(new NodeIdentifier(ORanDeviceManagerQNames.IETF_NETCONF_NOTIFICATIONS_USERNAME)).body()
+//				.toString();
+//		@SuppressWarnings("unused")
+//		Integer sessionIDVal = Integer.valueOf(serverOrUserIDVal
+//				.childByArg(new NodeIdentifier(ORanDeviceManagerQNames.IETF_NETCONF_NOTIFICATIONS_SESSIONID)).body()
+//				.toString());
+//
+//		// Process the datastore child
+//		@SuppressWarnings("unused")
+//		String datastoreValue = cn
+//				.childByArg(new NodeIdentifier(ORanDeviceManagerQNames.IETF_NETCONF_NOTIFICATIONS_DATASTORE)).body()
+//				.toString();
+
+		// Process the edit child
+		UnkeyedListNode editList = (UnkeyedListNode) cn
+				.childByArg(new NodeIdentifier(ORanDeviceManagerQNames.IETF_NETCONF_NOTIFICATIONS_EDITNODE));
+		if (editList != null) {
+			for (int listCnt = 0; listCnt < editList.size(); listCnt++) {
+				String operationValue = editList.childAt(listCnt)
+						.childByArg(new NodeIdentifier(ORanDeviceManagerQNames.IETF_NETCONF_NOTIFICATIONS_OPERATION))
+						.body().toString();
+				String targetValue = editList.childAt(listCnt)
+						.childByArg(new NodeIdentifier(ORanDeviceManagerQNames.IETF_NETCONF_NOTIFICATIONS_TARGET))
+						.body().toString();
+
+				EventlogEntity eventLogEntity1 = new EventlogBuilder()
+						.setNodeId(netconfDomAccessor.getNodeId().getValue()).setCounter(sequenceNo++)
+						.setTimestamp(eventTime).setObjectId(targetValue).setAttributeName("N.A")
+						.setSourceType(SourceType.Netconf).setNewValue(String.valueOf(operationValue)).build();
+				databaseService.writeEventLog(eventLogEntity1);
+			}
+		}
+
+		if (vesCollectorService.getConfig().isVESCollectorEnabled()) {
+			if (mapper == null) {
+				this.mapper = new ORanDOMNotifToVESEventAssembly(netconfDomAccessor, vesCollectorService);
+			}
+			VESCommonEventHeaderPOJO header = mapper.createVESCommonEventHeader(
+					domNotificationXPath.getTime(domNotification),
+					ORanDeviceManagerQNames.IETF_NETCONF_NOTIFICATIONS_NETCONF_CONFIG_CHANGE.getLocalName(),
+					sequenceNo);
+			VESNotificationFieldsPOJO body = mapper.createVESNotificationFields(
+					domNotificationXPath.convertDomNotifToXPath(domNotification),
+					ORanDeviceManagerQNames.IETF_NETCONF_NOTIFICATIONS_NETCONF_CONFIG_CHANGE.getLocalName());
+			log.info("domNotification in XPath format = {}",
+					domNotificationXPath.convertDomNotifToXPath(domNotification));
+			try {
+				vesCollectorService.publishVESMessage(vesCollectorService.generateVESEvent(header, body));
+			} catch (JsonProcessingException e) {
+				log.warn("Exception while generating JSON object ", e);
+
+			}
+		}
+
+	}
+}
diff --git a/sdnr/wt/devicemanager-o-ran-sc/o-ran/ru-fh/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/oran/impl/dom/ORanDOMFaultNotificationListener.java b/sdnr/wt/devicemanager-o-ran-sc/o-ran/ru-fh/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/oran/impl/dom/ORanDOMFaultNotificationListener.java
new file mode 100644
index 000000000..494a01f71
--- /dev/null
+++ b/sdnr/wt/devicemanager-o-ran-sc/o-ran/ru-fh/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/oran/impl/dom/ORanDOMFaultNotificationListener.java
@@ -0,0 +1,171 @@
+/*
+ * ============LICENSE_START=======================================================
+ * ONAP : ccsdk features
+ * ================================================================================
+ * Copyright (C) 2021 highstreet technologies GmbH Intellectual Property.
+ * All rights reserved.
+ * ================================================================================
+ * 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.
+ * ============LICENSE_END=========================================================
+ *
+ */
+package org.onap.ccsdk.features.sdnr.wt.devicemanager.oran.impl.dom;
+
+import com.fasterxml.jackson.core.JsonProcessingException;
+import java.time.Instant;
+import java.time.format.DateTimeParseException;
+import java.util.Collection;
+import java.util.Objects;
+import org.eclipse.jdt.annotation.NonNull;
+import org.json.JSONException;
+import org.json.JSONObject;
+import org.onap.ccsdk.features.sdnr.wt.dataprovider.model.DataProvider;
+import org.onap.ccsdk.features.sdnr.wt.devicemanager.service.FaultService;
+import org.onap.ccsdk.features.sdnr.wt.devicemanager.service.VESCollectorService;
+import org.onap.ccsdk.features.sdnr.wt.devicemanager.types.VESCommonEventHeaderPOJO;
+import org.onap.ccsdk.features.sdnr.wt.devicemanager.types.VESFaultFieldsPOJO;
+import org.onap.ccsdk.features.sdnr.wt.devicemanager.types.VESMessage;
+import org.onap.ccsdk.features.sdnr.wt.netconfnodestateservice.NetconfDomAccessor;
+import org.onap.ccsdk.features.sdnr.wt.websocketmanager.model.WebsocketManagerService;
+import org.opendaylight.mdsal.dom.api.DOMNotification;
+import org.opendaylight.mdsal.dom.api.DOMNotificationListener;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev201110.EventlogBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev201110.SourceType;
+import org.opendaylight.yangtools.yang.data.api.schema.MapEntryNode;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class ORanDOMFaultNotificationListener implements DOMNotificationListener {
+
+    private static final Logger LOG = LoggerFactory.getLogger(ORanDOMFaultNotificationListener.class);
+
+    private final @NonNull NetconfDomAccessor netconfDomAccessor;
+    private final @NonNull VESCollectorService vesCollectorService;
+    private final @NonNull ORanDOMFaultToVESFaultMapper mapper;
+    private final @NonNull FaultService faultService;
+    private final @NonNull WebsocketManagerService websocketManagerService;
+    private final @NonNull DataProvider databaseService;
+
+    private Integer counter; //Local counter is assigned to Notifications
+
+    public ORanDOMFaultNotificationListener(@NonNull NetconfDomAccessor netconfDomAccessor,
+            @NonNull VESCollectorService vesCollectorService, @NonNull FaultService faultService,
+            @NonNull WebsocketManagerService websocketManagerService, @NonNull DataProvider databaseService) {
+        this.netconfDomAccessor = Objects.requireNonNull(netconfDomAccessor);
+        this.vesCollectorService = Objects.requireNonNull(vesCollectorService);
+        this.faultService = Objects.requireNonNull(faultService);
+        this.websocketManagerService = Objects.requireNonNull(websocketManagerService);
+        this.databaseService = Objects.requireNonNull(databaseService);
+
+        this.mapper =
+                new ORanDOMFaultToVESFaultMapper(netconfDomAccessor.getNodeId(), vesCollectorService, "AlarmNotif");
+        this.counter = 0;
+    }
+
+    @Override
+    public void onNotification(@NonNull DOMNotification notification) {
+        onAlarmNotif(notification);
+    }
+
+    /**
+     * Gets the mfg name, mode-name and Uuid of the root component (Ex: Chassis.) In cases where there are multiple root
+     * components i.e., components with no parent, the Uuid of the last occurred component from the componentList will
+     * be considered. Till now we haven't seen Uuid set for root components, so not an issue for now.
+     *
+     * @param componentList
+     */
+    public void setComponentList(Collection<MapEntryNode> componentList) {
+        for (MapEntryNode component : ORanDOMToInternalDataModel.getRootComponents(componentList)) {
+            mapper.setMfgName(
+                    ORanDMDOMUtility.getLeafValue(component, ORanDeviceManagerQNames.IETF_HW_COMPONENT_LIST_MFG_NAME));
+            mapper.setUuid(ORanDMDOMUtility.getLeafValue(component,
+                    ORanDeviceManagerQNames.IETF_HW_COMPONENT_LIST_UUID) != null
+                            ? ORanDMDOMUtility.getLeafValue(component,
+                                    ORanDeviceManagerQNames.IETF_HW_COMPONENT_LIST_UUID)
+                            : netconfDomAccessor.getNodeId().getValue());
+            mapper.setModelName(ORanDMDOMUtility.getLeafValue(component,
+                    ORanDeviceManagerQNames.IETF_HW_COMPONENT_LIST_MODEL_NAME));
+        }
+    }
+
+    public void onAlarmNotif(DOMNotification notification) {
+
+        LOG.debug("onAlarmNotif {}", notification.getClass().getSimpleName());
+        counter++;
+        // Send devicemanager specific notification for database and ODLUX
+        Instant eventTimeInstant = ORanDMDOMUtility.getNotificationInstant(notification);
+        faultService.faultNotification(
+                ORanDOMToInternalDataModel.getFaultLog(notification, netconfDomAccessor.getNodeId(), counter));
+        // Send model specific notification to WebSocketManager
+        websocketManagerService.sendNotification(notification, netconfDomAccessor.getNodeId(), ORanDeviceManagerQNames.ORAN_FM_ALARM_NOTIF);
+
+        try {
+            if (vesCollectorService.getConfig().isVESCollectorEnabled()) {
+                VESCommonEventHeaderPOJO header = mapper.mapCommonEventHeader(notification, eventTimeInstant, counter);
+                VESFaultFieldsPOJO body = mapper.mapFaultFields(notification);
+                VESMessage vesMsg = vesCollectorService.generateVESEvent(header, body);
+                vesCollectorService.publishVESMessage(vesMsg);
+                LOG.info("VES Message is  {}", vesMsg.getMessage());
+                writeToEventLog(vesMsg.getMessage(), eventTimeInstant, ORanDeviceManagerQNames.ORAN_FM_ALARM_NOTIF.getLocalName(), counter);
+            }
+        } catch (JsonProcessingException | DateTimeParseException e) {
+            LOG.debug("Can not convert event into VES message {}", notification, e);
+        }
+    }
+
+    private void writeToEventLog(String data, Instant eventTimeInstant, String notificationName, int sequenceNo) {
+        EventlogBuilder eventlogBuilder = new EventlogBuilder();
+
+        eventlogBuilder.setObjectId("Device");
+        eventlogBuilder.setCounter(sequenceNo);
+        eventlogBuilder.setAttributeName(notificationName);
+        eventlogBuilder.setNodeId(netconfDomAccessor.getNodeId().getValue());
+        String eventLogMsgLvl = vesCollectorService.getConfig().getEventLogMsgDetail();
+        if (eventLogMsgLvl.equalsIgnoreCase("SHORT")) {
+            data = getShortEventLogMessage(data);
+        } else if (eventLogMsgLvl.equalsIgnoreCase("MEDIUM")) {
+            data = getMediumEventLogMessage(data);
+        } else if (eventLogMsgLvl.equalsIgnoreCase("LONG")) {
+            // do nothing, data already contains long message
+        } else { // Unknown value, default to "SHORT"
+            data = getShortEventLogMessage(data);
+        }
+        eventlogBuilder.setNewValue(data);
+        eventlogBuilder.setSourceType(SourceType.Netconf);
+        eventlogBuilder.setTimestamp(ORanDOMToInternalDataModel.getDateAndTimeOfInstant(eventTimeInstant));
+
+        databaseService.writeEventLog(eventlogBuilder.build());
+    }
+
+    private String getShortEventLogMessage(String data) {
+        try {
+            JSONObject jsonObj = new JSONObject(data);
+            String domain = jsonObj.getJSONObject("event").getJSONObject("commonEventHeader").getString("domain");
+            String eventId = jsonObj.getJSONObject("event").getJSONObject("commonEventHeader").getString("eventId");
+            return "domain:" + domain + " eventId:" + eventId;
+        } catch (JSONException e) {
+            LOG.debug("{}", e);
+            return "Invalid message received";
+        }
+    }
+
+    private String getMediumEventLogMessage(String data) {
+        try {
+            JSONObject jsonObj = new JSONObject(data);
+            return jsonObj.getJSONObject("event").getJSONObject("commonEventHeader").toString();
+        } catch (JSONException e) {
+            LOG.debug("{}", e);
+            return "Invalid message received";
+        }
+    }
+}
diff --git a/sdnr/wt/devicemanager-o-ran-sc/o-ran/ru-fh/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/oran/impl/dom/ORanDOMFaultToVESFaultMapper.java b/sdnr/wt/devicemanager-o-ran-sc/o-ran/ru-fh/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/oran/impl/dom/ORanDOMFaultToVESFaultMapper.java
new file mode 100644
index 000000000..b05e83f9a
--- /dev/null
+++ b/sdnr/wt/devicemanager-o-ran-sc/o-ran/ru-fh/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/oran/impl/dom/ORanDOMFaultToVESFaultMapper.java
@@ -0,0 +1,155 @@
+/*
+ * ============LICENSE_START=======================================================
+ * ONAP : ccsdk features
+ * ================================================================================
+ * Copyright (C) 2021 highstreet technologies GmbH Intellectual Property.
+ * All rights reserved.
+ * ================================================================================
+ * 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.
+ * ============LICENSE_END=========================================================
+ *
+ */
+package org.onap.ccsdk.features.sdnr.wt.devicemanager.oran.impl.dom;
+
+import java.time.Instant;
+import org.onap.ccsdk.features.sdnr.wt.devicemanager.oran.impl.binding.ORanFaultToVESFaultMapper;
+import org.onap.ccsdk.features.sdnr.wt.devicemanager.service.VESCollectorService;
+import org.onap.ccsdk.features.sdnr.wt.devicemanager.types.VESCommonEventHeaderPOJO;
+import org.onap.ccsdk.features.sdnr.wt.devicemanager.types.VESFaultFieldsPOJO;
+import org.opendaylight.mdsal.dom.api.DOMNotification;
+import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.NodeId;
+import org.opendaylight.yangtools.yang.data.api.schema.ContainerNode;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+//@formatter:off
+/*
+* Maps ORAN Fault fields to VES fault domain fields and VES commonEventHeader fields
+*
+*
+*      VES Fields                  Mapping
+*      ----------                  -------
+*      domain                      "fault"
+*      eventId                     "nt:network-topology/nt:topology/nt:node/nt:node-id"
+*      eventName                   "nt:network-topology/nt:topology/nt:node/nt:node-id"
+*      eventType                   "O-RAN-RU-Fault"
+*      lastEpochMicrosec           TimeStamp represented by <eventTime> field in NetConf notification header in unix time format - as microseconds elapsed since 1 Jan 1970 not including leap seconds.
+*      nfcNamingCode               always ""
+*      nfNamingCode                always ""
+*      nfVendorName                /ietf-hardware:hardware/component[not(parent)][1]/mfg-name
+*      priority                    "Normal"
+*      reportingEntityId           The OAM-Controller identifier with in the SMO - e.g. the fully qualified domain name or IP-Address.
+*      reportingEntityName         as configured by helm charts for the OpenDaylight cluster name ??????
+*      sequence                    As per NetConf notification increasing sequence number as unsigned integer 32 bits. The value is reused in the eventId field.
+*      sourceId                    Value of ietf-hardware (RFC8348) /hardware/component[not(parent)][1]/uuid or 'nt:network-topology/nt:topology/nt:node/nt:node-id' if ietf component not found.
+*      sourceName                  "nt:network-topology/nt:topology/nt:node/nt:node-id"
+*      startEpochMicrosec          Current OAM-Controller Node timestamp in unix time format - as microseconds elapsed since 1 Jan 1970 not including leap seconds.
+*      timeZoneOffset              Static text: "+00:00"
+*      version                     "4.1"
+*      vesEventListenerVersion     "7.2.1"
+*
+*
+*      alarmAdditionalInformation
+*      alarmCondition              Value of "o-ran-fm:alarm-notif/fault-id"
+*      alarmInterfaceA             Value of "o-ran-fm:alarm-notif/fault-source"
+*      eventCategory               Static text "O-RU failure"
+*      eventSeverity               Value of "o-ran-fm:alarm-notif/fault-severity". But if "o-ran-fm:alarm-notif/is-cleared" then "NORMAL"
+*      eventSourceType             The value of ietf-hardware (RFC8348) /hardware/component[not(parent)][1]/model-name or "O-RU" if not found.
+*      faultFieldsVersion          "4.0"
+*      specificProblem             A mapping of the fault-id to its description according to O-RAN OpenFronthaul specification.
+*      vfStatus                    "Active"
+*
+*/
+//@formatter:on
+
+public class ORanDOMFaultToVESFaultMapper {
+    @SuppressWarnings("unused")
+    private static final Logger LOG = LoggerFactory.getLogger(ORanFaultToVESFaultMapper.class);
+    private static final String VES_EVENT_DOMAIN = "fault";
+    private static final String VES_EVENTTYPE = "ORAN_Fault";
+    private static final String VES_EVENT_PRIORITY = "Normal";
+    private static final String VES_EVENT_CATEGORY = "O-RU Failure";
+    private static final String VES_FAULT_FIELDS_VERSION = "4.0";
+    private static final String VES_FAULT_FIELDS_VFSTATUS = "Active"; //virtual function status
+
+    private final VESCollectorService vesProvider;
+    private final String notifName; // Name
+    private final String nodeIdString; // Sourcename
+    //Initialized during registration
+    private String mfgName;
+    private String uuid;
+    private String modelName;
+
+    public ORanDOMFaultToVESFaultMapper(NodeId nodeId, VESCollectorService vesCollectorService, String notifName) {
+        this.nodeIdString = nodeId.getValue();
+        this.vesProvider = vesCollectorService;
+        this.notifName = notifName;
+    }
+
+    public void setMfgName(String mfgName) {
+        this.mfgName = mfgName;
+    }
+
+    public void setUuid(String uuid) {
+        this.uuid = uuid;
+    }
+
+    public void setModelName(String modelName) {
+        this.modelName = modelName;
+    }
+
+    public VESCommonEventHeaderPOJO mapCommonEventHeader(DOMNotification notification, Instant eventTime,
+            int sequenceNo) {
+        VESCommonEventHeaderPOJO vesCEH = new VESCommonEventHeaderPOJO();
+        vesCEH.setDomain(VES_EVENT_DOMAIN);
+        vesCEH.setEventName(notifName);
+        vesCEH.setEventType(VES_EVENTTYPE);
+        vesCEH.setPriority(VES_EVENT_PRIORITY);
+
+        String eventId = notifName + "-" + Long.toUnsignedString(sequenceNo);
+
+        vesCEH.setEventId(eventId);
+        vesCEH.setStartEpochMicrosec(eventTime.toEpochMilli() * 1000);
+        vesCEH.setLastEpochMicrosec(eventTime.toEpochMilli() * 1000);
+        vesCEH.setNfVendorName(mfgName);
+        vesCEH.setReportingEntityName(vesProvider.getConfig().getReportingEntityName());
+        vesCEH.setSequence(sequenceNo);
+        vesCEH.setSourceId(uuid);
+        vesCEH.setSourceName(nodeIdString);
+
+        return vesCEH;
+    }
+
+    public VESFaultFieldsPOJO mapFaultFields(DOMNotification alarmNotif) {
+        VESFaultFieldsPOJO vesFaultFields = new VESFaultFieldsPOJO();
+        ContainerNode cn = alarmNotif.getBody();
+        vesFaultFields.setAlarmCondition(ORanDMDOMUtility.getLeafValue(cn, ORanDeviceManagerQNames.ORAN_FM_FAULT_ID));
+        vesFaultFields
+                .setAlarmInterfaceA(ORanDMDOMUtility.getLeafValue(cn, ORanDeviceManagerQNames.ORAN_FM_FAULT_SOURCE));
+        vesFaultFields.setEventCategory(VES_EVENT_CATEGORY);
+        if (ORanDMDOMUtility.getLeafValue(cn, ORanDeviceManagerQNames.ORAN_FM_FAULT_IS_CLEARED).equals("true")) {
+            vesFaultFields.setEventSeverity("NORMAL");
+        } else {
+            vesFaultFields.setEventSeverity(
+                    ORanDMDOMUtility.getLeafValue(cn, ORanDeviceManagerQNames.ORAN_FM_FAULT_SEVERITY));
+        }
+        vesFaultFields.setEventSourceType(modelName);
+        vesFaultFields.setFaultFieldsVersion(VES_FAULT_FIELDS_VERSION);
+        vesFaultFields
+                .setSpecificProblem(ORanDMDOMUtility.getLeafValue(cn, ORanDeviceManagerQNames.ORAN_FM_FAULT_TEXT));
+        vesFaultFields.setVfStatus(VES_FAULT_FIELDS_VFSTATUS);
+
+        return vesFaultFields;
+    }
+
+}
diff --git a/sdnr/wt/devicemanager-o-ran-sc/o-ran/ru-fh/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/oran/impl/dom/ORanDOMNetworkElement.java b/sdnr/wt/devicemanager-o-ran-sc/o-ran/ru-fh/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/oran/impl/dom/ORanDOMNetworkElement.java
new file mode 100644
index 000000000..64006339d
--- /dev/null
+++ b/sdnr/wt/devicemanager-o-ran-sc/o-ran/ru-fh/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/oran/impl/dom/ORanDOMNetworkElement.java
@@ -0,0 +1,283 @@
+/*
+ * ============LICENSE_START=======================================================
+ * ONAP : ccsdk features
+ * ================================================================================
+ * Copyright (C) 2021 highstreet technologies GmbH Intellectual Property.
+ * All rights reserved.
+ * ================================================================================
+ * 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.
+ * ============LICENSE_END=========================================================
+ *
+ */
+package org.onap.ccsdk.features.sdnr.wt.devicemanager.oran.impl.dom;
+
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.google.common.collect.Sets;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+import java.util.Optional;
+import org.eclipse.jdt.annotation.NonNull;
+import org.eclipse.jdt.annotation.Nullable;
+import org.onap.ccsdk.features.sdnr.wt.dataprovider.model.DataProvider;
+import org.onap.ccsdk.features.sdnr.wt.devicemanager.ne.service.NetworkElement;
+import org.onap.ccsdk.features.sdnr.wt.devicemanager.ne.service.NetworkElementService;
+import org.onap.ccsdk.features.sdnr.wt.devicemanager.oran.impl.binding.ORanRegistrationToVESpnfRegistrationMapper;
+import org.onap.ccsdk.features.sdnr.wt.devicemanager.service.DeviceManagerServiceProvider;
+import org.onap.ccsdk.features.sdnr.wt.devicemanager.service.FaultService;
+import org.onap.ccsdk.features.sdnr.wt.devicemanager.service.NotificationService;
+import org.onap.ccsdk.features.sdnr.wt.devicemanager.service.VESCollectorService;
+import org.onap.ccsdk.features.sdnr.wt.devicemanager.types.VESCommonEventHeaderPOJO;
+import org.onap.ccsdk.features.sdnr.wt.devicemanager.types.VESPNFRegistrationFieldsPOJO;
+import org.onap.ccsdk.features.sdnr.wt.netconfnodestateservice.Capabilities;
+import org.onap.ccsdk.features.sdnr.wt.netconfnodestateservice.NetconfAccessor;
+import org.onap.ccsdk.features.sdnr.wt.netconfnodestateservice.NetconfDomAccessor;
+import org.opendaylight.mdsal.common.api.LogicalDatastoreType;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.netmod.notification.rev080714.netconf.streams.Stream;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.netmod.notification.rev080714.netconf.streams.StreamKey;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev201110.Guicutthrough;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev201110.Inventory;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev201110.NetworkElementDeviceType;
+import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.NodeId;
+import org.opendaylight.yangtools.yang.common.QName;
+import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier;
+import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.AugmentationIdentifier;
+import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.InstanceIdentifierBuilder;
+import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.NodeIdentifier;
+import org.opendaylight.yangtools.yang.data.api.schema.ContainerNode;
+import org.opendaylight.yangtools.yang.data.api.schema.MapEntryNode;
+import org.opendaylight.yangtools.yang.data.api.schema.MapNode;
+import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class ORanDOMNetworkElement implements NetworkElement {
+
+    private static final Logger LOG = LoggerFactory.getLogger(ORanDOMNetworkElement.class);
+
+    private final @NonNull NetconfDomAccessor netconfDomAccessor;
+    private final @NonNull DataProvider databaseService;
+    private final @NonNull FaultService faultService;
+    private final @NonNull NotificationService notificationService;
+    private final @NonNull ORanDOMChangeNotificationListener oranDomChangeNotificationListener;
+    private final @NonNull ORanDOMFaultNotificationListener oranDomFaultNotificationListener;
+    private final @NonNull VESCollectorService vesCollectorService;
+    private final @NonNull ORanRegistrationToVESpnfRegistrationMapper mapper;
+
+    public ORanDOMNetworkElement(@NonNull NetconfDomAccessor netconfDomAccessor,
+            @NonNull DeviceManagerServiceProvider serviceProvider) {
+        LOG.info("Create {}", ORanDOMNetworkElement.class.getSimpleName());
+        this.netconfDomAccessor = Objects.requireNonNull(netconfDomAccessor);
+        Objects.requireNonNull(serviceProvider);
+        this.databaseService = serviceProvider.getDataProvider();
+        this.vesCollectorService = serviceProvider.getVESCollectorService();
+        this.faultService = serviceProvider.getFaultService();
+        this.notificationService = serviceProvider.getNotificationService();
+
+        this.oranDomChangeNotificationListener =
+                new ORanDOMChangeNotificationListener(netconfDomAccessor, vesCollectorService, databaseService);
+
+        this.oranDomFaultNotificationListener =
+                new ORanDOMFaultNotificationListener(netconfDomAccessor, vesCollectorService,
+                        serviceProvider.getFaultService(), serviceProvider.getWebsocketService(), databaseService);
+
+        this.mapper = new ORanRegistrationToVESpnfRegistrationMapper(netconfDomAccessor, vesCollectorService);
+    }
+
+    @Override
+    public void register() {
+        Collection<MapEntryNode> componentList = initialReadFromNetworkElement();
+        oranDomFaultNotificationListener.setComponentList(componentList);
+        publishMountpointToVES(componentList);
+        QName[] notifications = {ORanDeviceManagerQNames.IETF_NETCONF_NOTIFICATIONS_NETCONF_CONFIG_CHANGE,
+                ORanDeviceManagerQNames.IETF_NETCONF_NOTIFICATIONS_NETCONF_CONFIRMED_COMMIT,
+                ORanDeviceManagerQNames.IETF_NETCONF_NOTIFICATIONS_NETCONF_SESSION_START,
+                ORanDeviceManagerQNames.IETF_NETCONF_NOTIFICATIONS_NETCONF_SESSION_END,
+                ORanDeviceManagerQNames.IETF_NETCONF_NOTIFICATIONS_NETCONF_CAPABILITY_CHANGE};
+        netconfDomAccessor.doRegisterNotificationListener(oranDomChangeNotificationListener, notifications);
+        QName[] faultNotification = {ORanDeviceManagerQNames.ORAN_FM_ALARM_NOTIF};
+        netconfDomAccessor.doRegisterNotificationListener(oranDomFaultNotificationListener, faultNotification);
+        // Output notification streams to LOG
+        @SuppressWarnings("unused")
+        Map<StreamKey, Stream> streams = netconfDomAccessor.getNotificationStreamsAsMap();
+        // Register to default stream
+        netconfDomAccessor.invokeCreateSubscription();
+    }
+
+    public Collection<MapEntryNode> initialReadFromNetworkElement() {
+        Collection<MapEntryNode> componentMapEntries = null;
+        NormalizedNode hwData = readHardware();
+
+        if (hwData != null) {
+            ContainerNode hwContainer = (ContainerNode) hwData;
+            MapNode componentMap = (MapNode) hwContainer
+                    .childByArg(new NodeIdentifier(ORanDeviceManagerQNames.IETF_HW_COMPONENT_LIST));
+            if (componentMap != null) {
+                componentMapEntries = componentMap.body();
+                List<Inventory> inventoryList =
+                        ORanDOMToInternalDataModel.getInventoryList(netconfDomAccessor.getNodeId(), hwData);
+                databaseService.writeInventory(netconfDomAccessor.getNodeId().getValue(), inventoryList);
+            }
+        } else {
+            componentMapEntries = Collections.emptyList();
+        }
+
+        Optional<Guicutthrough> oGuicutthrough = ORanDOMToInternalDataModel.getGuicutthrough(getOnapSystemData());
+        if (oGuicutthrough.isPresent()) {
+            databaseService.writeGuiCutThroughData(oGuicutthrough.get(), netconfDomAccessor.getNodeId().getValue());
+        }
+        return componentMapEntries;
+    }
+
+    @Override
+    public void deregister() {
+        /*
+         * if (oranDomChangeNotificationListener != null) {
+         * this.oranDomChangeNotificationListener.close(); } if
+         * (oRanFaultListenerRegistrationResult != null) {
+         * this.oRanFaultListenerRegistrationResult.close(); } ;
+         */
+        databaseService.clearGuiCutThroughEntriesOfNode(getMountpointId());
+    }
+
+    @Override
+    public NodeId getNodeId() {
+        return netconfDomAccessor.getNodeId();
+    }
+
+    @Override
+    public NetworkElementDeviceType getDeviceType() {
+        return NetworkElementDeviceType.ORAN;
+    }
+
+    @Override
+    public <L extends NetworkElementService> Optional<L> getService(Class<L> clazz) {
+        return Optional.empty();
+    }
+
+    @Override
+    public void warmstart() {}
+
+    @Override
+    public Optional<NetconfAccessor> getAcessor() {
+        return Optional.of(netconfDomAccessor);
+    }
+
+    // Private functions
+
+    private String getMountpointId() {
+        return getNodeId().getValue();
+    }
+
+    private NormalizedNode readHardware() {
+        InstanceIdentifierBuilder hardwareIIDBuilder =
+                YangInstanceIdentifier.builder().node(ORanDeviceManagerQNames.IETF_HW_CONTAINER);
+
+        Optional<NormalizedNode> oData =
+                netconfDomAccessor.readDataNode(LogicalDatastoreType.OPERATIONAL, hardwareIIDBuilder.build());
+        if (oData.isPresent()) {
+            return oData.get();
+        }
+        return null;
+    }
+
+    // Read from device
+    /**
+     * Read system data with GUI cut through information from device if ONAP_SYSTEM YANG is supported.
+     *
+     * @return NormalizedNode data with GUI cut through information or null if not available.
+     */
+    private @Nullable NormalizedNode getOnapSystemData() {
+        LOG.info("Get System1 for mountpoint {}", netconfDomAccessor.getNodeId().getValue());
+        @NonNull
+        InstanceIdentifierBuilder ietfSystemIID =
+                YangInstanceIdentifier.builder().node(ORanDeviceManagerQNames.IETF_SYSTEM_CONTAINER);
+        @NonNull
+        AugmentationIdentifier onapSystemIID = YangInstanceIdentifier.AugmentationIdentifier.create(
+                Sets.newHashSet(ORanDeviceManagerQNames.ONAP_SYSTEM_NAME, ORanDeviceManagerQNames.ONAP_SYSTEM_WEB_UI));
+        InstanceIdentifierBuilder augmentedOnapSystem =
+                YangInstanceIdentifier.builder(ietfSystemIID.build()).node(onapSystemIID);
+        Capabilities x = netconfDomAccessor.getCapabilites();
+        LOG.info("Capabilites: {}", x);
+        if (x.isSupportingNamespace(ORanDeviceManagerQNames.ONAP_SYSTEM_QNAME)) {
+            Optional<NormalizedNode> res =
+                    netconfDomAccessor.readDataNode(LogicalDatastoreType.OPERATIONAL, augmentedOnapSystem.build());
+            LOG.debug("Result of System1 = {}", res);
+            return res.isPresent() ? res.get() : null;
+        } else {
+            LOG.debug("No GUI cut through support");
+            return null;
+        }
+    }
+
+    // VES related
+    private void publishMountpointToVES(Collection<MapEntryNode> componentList) {
+        /*
+         * 1. Check if this device is in the list of allowed-devices. 2. If device
+         * exists in allowed-devices, then create VES pnfRegistration event and publish
+         * to VES
+         */
+        if (vesCollectorService.getConfig().isVESCollectorEnabled() && inAllowedDevices(getMountpointId())) {
+            for (MapEntryNode component : ORanDOMToInternalDataModel.getRootComponents(componentList)) {
+                // Just get one component. At the moment we don't care which one. Also since
+                // there is only one management address, we assume there will be only one
+                // chassis.
+                // If the device supports subtended configuration then it is assumed that the
+                // Chassis containing the management interface will be the root component and
+                // there will be only one root.
+                VESCommonEventHeaderPOJO header = mapper.mapCommonEventHeader(component);
+                VESPNFRegistrationFieldsPOJO body = mapper.mapPNFRegistrationFields(component);
+                try {
+                    vesCollectorService.publishVESMessage(vesCollectorService.generateVESEvent(header, body));
+                } catch (JsonProcessingException e) {
+                    LOG.warn("Error while serializing VES Event to String ", e);
+                }
+            }
+        }
+    }
+
+    private boolean inAllowedDevices(String mountpointName) {
+        InstanceIdentifierBuilder callhomeServerIID =
+                YangInstanceIdentifier.builder().node(ORanDeviceManagerQNames.CALLHOME_SERVER_CONTAINER);
+        final InstanceIdentifierBuilder allowedDevicesIID = YangInstanceIdentifier.builder(callhomeServerIID.build())
+                .node(ORanDeviceManagerQNames.CALLHOME_SERVER_ALLOWED_DEVICE);
+
+        Optional<NormalizedNode> allowedDevices = netconfDomAccessor
+                .readControllerDataNode(LogicalDatastoreType.CONFIGURATION, allowedDevicesIID.build());
+
+        if (allowedDevices.isPresent()) {
+            ContainerNode allowedDevicesNode = (ContainerNode) allowedDevices.get();
+            MapNode deviceList = (MapNode) allowedDevicesNode
+                    .childByArg(new NodeIdentifier(ORanDeviceManagerQNames.CALLHOME_SERVER_ALLOWED_DEVICE_DEVICE_LIST));
+            if (deviceList != null) {
+                Collection<MapEntryNode> deviceListCollection = deviceList.body();
+                for (MapEntryNode device : deviceListCollection) {
+                    //					String deviceName = device.getIdentifier()
+                    //							.getValue(ORanDeviceManagerQNames.CALLHOME_SERVER_ALLOWED_DEVICE_KEY).toString();
+                    String deviceName = ORanDMDOMUtility.getLeafValue(device,
+                            ORanDeviceManagerQNames.CALLHOME_SERVER_ALLOWED_DEVICE_KEY);
+                    if (deviceName != null && deviceName.equals(mountpointName)) {
+                        LOG.info("Mountpoint {} is part of allowed-devices list", mountpointName);
+                        return true;
+                    }
+                }
+            }
+        }
+
+        LOG.info("Mountpoint {} is not part of allowed-devices list", mountpointName);
+        return false;
+    }
+
+}
diff --git a/sdnr/wt/devicemanager-o-ran-sc/o-ran/ru-fh/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/oran/impl/dom/ORanDOMNotifToVESEventAssembly.java b/sdnr/wt/devicemanager-o-ran-sc/o-ran/ru-fh/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/oran/impl/dom/ORanDOMNotifToVESEventAssembly.java
new file mode 100644
index 000000000..b8b5151fe
--- /dev/null
+++ b/sdnr/wt/devicemanager-o-ran-sc/o-ran/ru-fh/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/oran/impl/dom/ORanDOMNotifToVESEventAssembly.java
@@ -0,0 +1,102 @@
+/*
+ * ============LICENSE_START=======================================================
+ * ONAP : ccsdk features
+ * ================================================================================
+ * Copyright (C) 2021 highstreet technologies GmbH Intellectual Property.
+ * All rights reserved.
+ * ================================================================================
+ * 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.
+ * ============LICENSE_END=========================================================
+ *
+ */
+package org.onap.ccsdk.features.sdnr.wt.devicemanager.oran.impl.dom;
+
+import java.time.Instant;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.Map.Entry;
+import java.util.Objects;
+import org.eclipse.jdt.annotation.NonNull;
+import org.onap.ccsdk.features.sdnr.wt.devicemanager.service.VESCollectorService;
+import org.onap.ccsdk.features.sdnr.wt.devicemanager.types.VESCommonEventHeaderPOJO;
+import org.onap.ccsdk.features.sdnr.wt.devicemanager.types.VESNotificationFieldsPOJO;
+import org.onap.ccsdk.features.sdnr.wt.netconfnodestateservice.NetconfDomAccessor;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class ORanDOMNotifToVESEventAssembly {
+
+    private static final Logger log = LoggerFactory.getLogger(ORanDOMNotifToVESEventAssembly.class);
+    private static final String VES_EVENT_DOMAIN = "notification";
+    private static final String VES_EVENTTYPE = "ORAN_notification";
+    private static final String VES_EVENT_PRIORITY = "Normal";
+    private NetconfDomAccessor netconfDomAccessor;
+    private VESCollectorService vesProvider;
+
+    public ORanDOMNotifToVESEventAssembly(@NonNull NetconfDomAccessor netconfDomAccessor,
+            @NonNull VESCollectorService vesCollectorService) {
+        this.netconfDomAccessor = Objects.requireNonNull(netconfDomAccessor);
+        this.vesProvider = Objects.requireNonNull(vesCollectorService);
+    }
+
+    // VES CommonEventHeader fields
+    public VESCommonEventHeaderPOJO createVESCommonEventHeader(Instant time, String notificationTypeName,
+            long sequenceNo) {
+        VESCommonEventHeaderPOJO vesCEH = new VESCommonEventHeaderPOJO();
+        vesCEH.setDomain(VES_EVENT_DOMAIN);
+        vesCEH.setEventName(notificationTypeName);
+        vesCEH.setEventType(VES_EVENTTYPE);
+        vesCEH.setPriority(VES_EVENT_PRIORITY);
+
+        String eventId;
+
+        eventId = notificationTypeName + "-" + Long.toUnsignedString(sequenceNo);
+
+        vesCEH.setEventId(eventId);
+        vesCEH.setStartEpochMicrosec(time.toEpochMilli() * 1000);
+        vesCEH.setLastEpochMicrosec(time.toEpochMilli() * 1000);
+        vesCEH.setNfVendorName("ORAN");
+        vesCEH.setReportingEntityName(vesProvider.getConfig().getReportingEntityName());
+        vesCEH.setSequence(sequenceNo);
+        vesCEH.setSourceId("ORAN");
+        vesCEH.setSourceName(netconfDomAccessor.getNodeId().getValue());
+        return vesCEH;
+    }
+
+    // Notification fields
+    public VESNotificationFieldsPOJO createVESNotificationFields(HashMap<String, String> xPathFields,
+            String notificationTypeName) {
+        VESNotificationFieldsPOJO vesNotifFields = new VESNotificationFieldsPOJO();
+
+        vesNotifFields.setChangeType(notificationTypeName);
+        vesNotifFields.setChangeIdentifier(netconfDomAccessor.getNodeId().getValue());
+
+        StringBuffer buf = new StringBuffer();
+        Iterator<Entry<String, String>> it = xPathFields.entrySet().iterator();
+        while (it.hasNext()) {
+            Entry<String, String> pair = it.next();
+            buf.append("\n" + pair.getKey() + " = " + pair.getValue());
+        }
+        log.info("Resultlist({}):{}", xPathFields.size(), buf.toString());
+
+        ArrayList<HashMap<String, Object>> arrayOfNamedHashMap = new ArrayList<HashMap<String, Object>>();
+        HashMap<String, Object> namedHashMap = new HashMap<String, Object>();
+        namedHashMap.put("hashMap", xPathFields);
+        namedHashMap.put("name", notificationTypeName);
+        arrayOfNamedHashMap.add(namedHashMap);
+        vesNotifFields.setArrayOfNamedHashMap(arrayOfNamedHashMap);
+        return vesNotifFields;
+
+    }
+}
diff --git a/sdnr/wt/devicemanager-o-ran-sc/o-ran/ru-fh/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/oran/impl/dom/ORanDOMToInternalDataModel.java b/sdnr/wt/devicemanager-o-ran-sc/o-ran/ru-fh/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/oran/impl/dom/ORanDOMToInternalDataModel.java
new file mode 100644
index 000000000..b157ae4b5
--- /dev/null
+++ b/sdnr/wt/devicemanager-o-ran-sc/o-ran/ru-fh/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/oran/impl/dom/ORanDOMToInternalDataModel.java
@@ -0,0 +1,293 @@
+/*
+ * ============LICENSE_START=======================================================
+ * ONAP : ccsdk features
+ * ================================================================================
+ * Copyright (C) 2021 highstreet technologies GmbH Intellectual Property.
+ * All rights reserved.
+ * ================================================================================
+ * 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.
+ * ============LICENSE_END=========================================================
+ *
+ */
+package org.onap.ccsdk.features.sdnr.wt.devicemanager.oran.impl.dom;
+
+import java.time.Instant;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Date;
+import java.util.List;
+import java.util.Objects;
+import java.util.Optional;
+import org.eclipse.jdt.annotation.Nullable;
+import org.onap.ccsdk.features.sdnr.wt.dataprovider.model.NetconfTimeStamp;
+import org.onap.ccsdk.features.sdnr.wt.dataprovider.model.types.NetconfTimeStampImpl;
+import org.opendaylight.mdsal.dom.api.DOMEvent;
+import org.opendaylight.mdsal.dom.api.DOMNotification;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.Uri;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.yang.types.rev130715.DateAndTime;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev201110.FaultlogBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev201110.FaultlogEntity;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev201110.Guicutthrough;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev201110.GuicutthroughBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev201110.Inventory;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev201110.InventoryBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev201110.SeverityType;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev201110.SourceType;
+import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.NodeId;
+import org.opendaylight.yangtools.yang.binding.CodeHelpers;
+import org.opendaylight.yangtools.yang.common.Uint32;
+import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.NodeIdentifier;
+import org.opendaylight.yangtools.yang.data.api.schema.AugmentationNode;
+import org.opendaylight.yangtools.yang.data.api.schema.ContainerNode;
+import org.opendaylight.yangtools.yang.data.api.schema.MapEntryNode;
+import org.opendaylight.yangtools.yang.data.api.schema.MapNode;
+import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class ORanDOMToInternalDataModel {
+
+    private static final Logger LOG = LoggerFactory.getLogger(ORanDOMToInternalDataModel.class);
+    private static final NetconfTimeStamp NETCONFTIME_CONVERTER = NetconfTimeStampImpl.getConverter();
+
+    public static List<Inventory> getInventoryList(NodeId nodeId, NormalizedNode hwData) {
+
+        List<Inventory> inventoryResultList = new ArrayList<Inventory>();
+        ContainerNode hwContainer = (ContainerNode) hwData;
+        MapNode componentMap = (MapNode) hwContainer
+                .getChildByArg(new NodeIdentifier(ORanDeviceManagerQNames.IETF_HW_COMPONENT_LIST));
+        Collection<MapEntryNode> componentMapEntries = componentMap.body();
+
+        for (MapEntryNode componentMapEntryNode : getRootComponents(componentMapEntries)) {
+            inventoryResultList =
+                    recurseGetInventory(nodeId, componentMapEntryNode, componentMapEntries, 0, inventoryResultList);
+        }
+        // Verify if result is complete
+        if (componentMapEntries.size() != inventoryResultList.size()) {
+            LOG.warn(
+                    "Not all data were written to the Inventory. Potential entries with missing "
+                            + "contained-child. Node Id = {}, Components Found = {}, Entries written to Database = {}",
+                    nodeId.getValue(), componentMapEntries.size(), inventoryResultList.size());
+        }
+        return inventoryResultList;
+    }
+
+    private static List<Inventory> recurseGetInventory(NodeId nodeId, MapEntryNode component,
+            Collection<MapEntryNode> componentList, int treeLevel, List<Inventory> inventoryResultList) {
+        //Add element to list, if conversion successfull
+        Optional<Inventory> oInventory = getInternalEquipment(nodeId, component, treeLevel);
+        if (oInventory.isPresent()) {
+            inventoryResultList.add(oInventory.get());
+        }
+        //Walk through list of child keys and add to list
+        for (String childUuid : CodeHelpers.nonnull(ORanDMDOMUtility.getLeafListValue(component,
+                ORanDeviceManagerQNames.IETF_HW_COMPONENT_LIST_CONTAINS_CHILD))) {
+            for (MapEntryNode c : getComponentsByName(childUuid, componentList)) {
+                inventoryResultList = recurseGetInventory(nodeId, c, componentList, treeLevel + 1, inventoryResultList);
+            }
+        }
+        return inventoryResultList;
+    }
+
+    public static List<MapEntryNode> getRootComponents(Collection<MapEntryNode> componentMapEntries) {
+        List<MapEntryNode> resultList = new ArrayList<>();
+        for (MapEntryNode componentMapEntryNode : componentMapEntries) {
+            if (ORanDMDOMUtility.getLeafValue(componentMapEntryNode,
+                    ORanDeviceManagerQNames.IETF_HW_COMPONENT_LIST_PARENT) == null) { // Root elements do not have a parent
+                resultList.add(componentMapEntryNode);
+            }
+        }
+        return resultList;
+    }
+
+    private static List<MapEntryNode> getComponentsByName(String name, Collection<MapEntryNode> componentList) {
+        List<MapEntryNode> resultList = new ArrayList<>();
+        for (MapEntryNode c : componentList) {
+            if (name.equals(ORanDMDOMUtility.getKeyValue(c))) { // <-- Component list is flat search for child's of name
+                resultList.add(c);
+            }
+        }
+        return resultList;
+    }
+
+    public static Optional<Inventory> getInternalEquipment(NodeId nodeId, MapEntryNode component, int treeLevel) {
+
+        // Make sure that expected data are not null
+        Objects.requireNonNull(nodeId);
+        Objects.requireNonNull(component);
+
+        // Read mandatory data
+
+        @Nullable
+        String nodeIdString = nodeId.getValue();
+        @Nullable
+        String uuid = ORanDMDOMUtility.getKeyValue(component);
+        @Nullable
+        String idParent =
+                ORanDMDOMUtility.getLeafValue(component, ORanDeviceManagerQNames.IETF_HW_COMPONENT_LIST_PARENT);
+        @Nullable
+        String uuidParent = idParent != null ? idParent : uuid; //<- Passt nicht
+
+        // do consistency check if all mandatory parameters are there
+        if (treeLevel >= 0 && nodeIdString != null && uuid != null && uuidParent != null) {
+            // Build output data
+
+            InventoryBuilder inventoryBuilder = new InventoryBuilder();
+
+            // General assumed as mandatory
+            inventoryBuilder.setNodeId(nodeIdString);
+            inventoryBuilder.setUuid(uuid);
+            inventoryBuilder.setParentUuid(uuidParent);
+            inventoryBuilder.setTreeLevel(Uint32.valueOf(treeLevel));
+
+            // -- String list with ids of holders (optional)
+            inventoryBuilder.setContainedHolder(ORanDMDOMUtility.getLeafListValue(component,
+                    ORanDeviceManagerQNames.IETF_HW_COMPONENT_LIST_CONTAINS_CHILD));
+
+            // -- Manufacturer related things (optional)
+            @Nullable
+            String mfgName =
+                    ORanDMDOMUtility.getLeafValue(component, ORanDeviceManagerQNames.IETF_HW_COMPONENT_LIST_MFG_NAME);
+            inventoryBuilder.setManufacturerName(mfgName);
+            inventoryBuilder.setManufacturerIdentifier(mfgName);
+
+            // Equipment type (optional)
+            inventoryBuilder.setDescription(
+                    ORanDMDOMUtility.getLeafValue(component, ORanDeviceManagerQNames.IETF_HW_COMPONENT_LIST_DESC));
+            inventoryBuilder.setModelIdentifier(ORanDMDOMUtility.getLeafValue(component,
+                    ORanDeviceManagerQNames.IETF_HW_COMPONENT_LIST_MODEL_NAME));
+
+            inventoryBuilder.setPartTypeId(
+                    ORanDMDOMUtility.getLeafValue(component, ORanDeviceManagerQNames.IETF_HW_COMPONENT_LIST_CLASS));
+
+            inventoryBuilder.setTypeName(ORanDMDOMUtility.getKeyValue(component));
+            inventoryBuilder.setVersion(
+                    ORanDMDOMUtility.getLeafValue(component, ORanDeviceManagerQNames.IETF_HW_COMPONENT_LIST_HW_REV));
+
+            // Equipment instance (optional)
+            @Nullable
+            String mfgDate =
+                    ORanDMDOMUtility.getLeafValue(component, ORanDeviceManagerQNames.IETF_HW_COMPONENT_LIST_MFG_DATE);
+            if (mfgDate != null) {
+                inventoryBuilder.setDate(mfgDate);
+            }
+            inventoryBuilder.setSerial(
+                    ORanDMDOMUtility.getLeafValue(component, ORanDeviceManagerQNames.IETF_HW_COMPONENT_LIST_SER_NUM));
+
+            return Optional.of(inventoryBuilder.build());
+        }
+        return Optional.empty();
+    }
+
+    /**
+     * If system data is available convert
+     *
+     * @param sys
+     * @return
+     */
+    public static Optional<Guicutthrough> getGuicutthrough(@Nullable NormalizedNode sys) {
+        AugmentationNode onapSys = (AugmentationNode) sys;
+        if (onapSys != null) {
+            String name = ORanDMDOMUtility.getLeafValue(onapSys, ORanDeviceManagerQNames.ONAP_SYSTEM_NAME);
+            @Nullable
+            Uri uri = new Uri(ORanDMDOMUtility.getLeafValue(onapSys, ORanDeviceManagerQNames.ONAP_SYSTEM_WEB_UI));
+            if (uri.getValue() != null) {
+                GuicutthroughBuilder gcBuilder = new GuicutthroughBuilder();
+                if (name != null) {
+                    gcBuilder.setName(name);
+                }
+                gcBuilder.setWeburi(uri.getValue());
+                return Optional.of(gcBuilder.build());
+            }
+            LOG.warn("Uri not set to invoke a Gui cut through session to the device. Please set the Uri in the device");
+        }
+        LOG.warn("Retrieving augmented System details failed. Gui cut through information not available");
+        return Optional.empty();
+    }
+
+    /**
+     * Convert fault notification into data-provider FaultLogEntity
+     *
+     * @param notification with O-RAN notification
+     * @param nodeId of node to handle
+     * @param counter to be integrated into data
+     * @return FaultlogEntity with data
+     */
+    public static FaultlogEntity getFaultLog(DOMNotification notification, NodeId nodeId, Integer counter) {
+        ContainerNode cn = notification.getBody();
+        FaultlogBuilder faultAlarm = new FaultlogBuilder();
+        faultAlarm.setNodeId(nodeId.getValue());
+        faultAlarm.setObjectId(ORanDMDOMUtility.getLeafValue(cn, ORanDeviceManagerQNames.ORAN_FM_FAULT_SOURCE));
+        faultAlarm.setProblem(ORanDMDOMUtility.getLeafValue(cn, ORanDeviceManagerQNames.ORAN_FM_FAULT_TEXT));
+        faultAlarm.setSeverity(getSeverityType(
+                ORanDMDOMUtility.getLeafValue(cn, ORanDeviceManagerQNames.ORAN_FM_FAULT_SEVERITY),
+                ORanDMDOMUtility.getLeafValue(cn, ORanDeviceManagerQNames.ORAN_FM_FAULT_IS_CLEARED).equals("true")));
+        faultAlarm.setCounter(counter);
+        faultAlarm.setId(ORanDMDOMUtility.getLeafValue(cn, ORanDeviceManagerQNames.ORAN_FM_FAULT_ID));
+        faultAlarm.setSourceType(SourceType.Netconf);
+        faultAlarm.setTimestamp(getEventTime(notification));
+        return faultAlarm.build();
+    }
+
+    public static DateAndTime getEventTime(DOMNotification notification) {
+        DateAndTime eventTime;
+        Instant notificationEventTime = null;
+        if (notification instanceof DOMEvent) {
+            notificationEventTime = ((DOMEvent) notification).getEventInstant();
+            eventTime = NetconfTimeStampImpl.getConverter().getTimeStamp(notificationEventTime.toString());
+        } else {
+            eventTime = NetconfTimeStampImpl.getConverter().getTimeStamp();
+        }
+        return eventTime;
+    }
+
+    /**
+     * Convert O-RAN specific severity into data-provider severity
+     *
+     * @param faultSeverity O-RAN severity
+     * @param isCleared clear indicator
+     * @return data-provider severity type
+     * @throws IllegalArgumentException if conversion not possible.
+     */
+    public static SeverityType getSeverityType(@Nullable String faultSeverity, @Nullable Boolean isCleared)
+            throws IllegalArgumentException {
+        if (isCleared != null && isCleared) {
+            return SeverityType.NonAlarmed;
+        }
+        if (faultSeverity != null) {
+            switch (faultSeverity) {
+                case "CRITICAL":
+                    return SeverityType.Critical;
+                case "MAJOR":
+                    return SeverityType.Major;
+                case "MINOR":
+                    return SeverityType.Minor;
+                case "WARNING":
+                    return SeverityType.Warning;
+            }
+        }
+        throw new IllegalArgumentException("Unknown Alarm state represent as Critical. isCleared=" + isCleared
+                + " faultSeverity=" + faultSeverity);
+    }
+
+    /**
+     * Convert Instant to NETCONF DataAndTime
+     * @param eventTimeInstant
+     * @return DateAndTime
+     */
+    public static DateAndTime getDateAndTimeOfInstant(Instant eventTimeInstant) {
+        Date eventDate = Date.from(eventTimeInstant);
+        return new DateAndTime(NETCONFTIME_CONVERTER.getTimeStamp(eventDate));
+    }
+
+}
diff --git a/sdnr/wt/devicemanager-o-ran-sc/o-ran/ru-fh/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/oran/impl/dom/ORanDeviceManagerQNames.java b/sdnr/wt/devicemanager-o-ran-sc/o-ran/ru-fh/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/oran/impl/dom/ORanDeviceManagerQNames.java
new file mode 100644
index 000000000..e86168abd
--- /dev/null
+++ b/sdnr/wt/devicemanager-o-ran-sc/o-ran/ru-fh/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/oran/impl/dom/ORanDeviceManagerQNames.java
@@ -0,0 +1,114 @@
+/*
+ * ============LICENSE_START=======================================================
+ * ONAP : ccsdk features
+ * ================================================================================
+ * Copyright (C) 2021 highstreet technologies GmbH Intellectual Property.
+ * All rights reserved.
+ * ================================================================================
+ * 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.
+ * ============LICENSE_END=========================================================
+ *
+ */
+package org.onap.ccsdk.features.sdnr.wt.devicemanager.oran.impl.dom;
+
+import org.eclipse.jdt.annotation.NonNull;
+import org.opendaylight.yangtools.yang.common.QName;
+
+public class ORanDeviceManagerQNames {
+
+    //ietf-system
+    public static final String IETF_SYSTEM_NS = "urn:ietf:params:xml:ns:yang:ietf-system";
+    public static final String IETF_SYSTEM_REVISION = "2014-08-06";
+    public static final @NonNull QName IETF_SYSTEM_QNAME =
+            QName.create(IETF_SYSTEM_NS, IETF_SYSTEM_REVISION, "ietf-system");
+    public static final @NonNull QName IETF_SYSTEM_CONTAINER = QName.create(IETF_SYSTEM_QNAME, "system");
+
+    // onap-system.yang
+    public static final String ONAP_SYSTEM_NS = "urn:onap:system";
+    public static final String ONAP_SYSTEM_REVISION = "2020-10-26";
+    public static final @NonNull QName ONAP_SYSTEM_QNAME =
+            QName.create(ONAP_SYSTEM_NS, ONAP_SYSTEM_REVISION, "onap-system");
+    public static final @NonNull QName ONAP_SYSTEM_NAME = QName.create(ONAP_SYSTEM_QNAME, "name");
+    public static final @NonNull QName ONAP_SYSTEM_WEB_UI = QName.create(ONAP_SYSTEM_QNAME, "web-ui");
+
+    //ietf-hardware.yang
+    public static final String IETF_HW_NS = "urn:ietf:params:xml:ns:yang:ietf-hardware";
+    public static final String IETF_HW_REVISION = "2018-03-13";
+    public static final @NonNull QName IETF_HW_MODULE_NAME =
+            QName.create(IETF_HW_NS, IETF_HW_REVISION, "ietf-hardware");
+    public static final @NonNull QName IETF_HW_CONTAINER = QName.create(IETF_HW_MODULE_NAME, "hardware");
+    public static final @NonNull QName IETF_HW_COMPONENT_LIST = QName.create(IETF_HW_MODULE_NAME, "component");
+    public static final @NonNull QName IETF_HW_COMPONENT_LIST_KEY = QName.create(IETF_HW_MODULE_NAME, "name");
+    public static final @NonNull QName IETF_HW_COMPONENT_LIST_MFG_NAME = QName.create(IETF_HW_MODULE_NAME, "mfg-name"); //leaf:String
+    public static final @NonNull QName IETF_HW_COMPONENT_LIST_UUID = QName.create(IETF_HW_MODULE_NAME, "uuid"); //leaf:yang:uuid
+    public static final @NonNull QName IETF_HW_COMPONENT_LIST_MODEL_NAME = QName.create(IETF_HW_MODULE_NAME, "model-name"); //leaf:String
+    public static final @NonNull QName IETF_HW_COMPONENT_LIST_SER_NUM = QName.create(IETF_HW_MODULE_NAME, "serial-num"); //leaf:String
+    public static final @NonNull QName IETF_HW_COMPONENT_LIST_SW_REV = QName.create(IETF_HW_MODULE_NAME, "software-rev"); //leaf:String
+    public static final @NonNull QName IETF_HW_COMPONENT_LIST_ALIAS = QName.create(IETF_HW_MODULE_NAME, "alias"); //leaf:String
+    public static final @NonNull QName IETF_HW_COMPONENT_LIST_CLASS = QName.create(IETF_HW_MODULE_NAME, "class");
+    public static final @NonNull QName IETF_HW_COMPONENT_LIST_MFG_DATE = QName.create(IETF_HW_MODULE_NAME, "mfg-date"); //leaf:yang:date-and-time
+    public static final @NonNull QName IETF_HW_COMPONENT_LIST_CONTAINS_CHILD = QName.create(IETF_HW_MODULE_NAME, "contains-child"); //leaf-list:leafref
+    public static final @NonNull QName IETF_HW_COMPONENT_LIST_PARENT = QName.create(IETF_HW_MODULE_NAME, "parent"); //leaf:leafref
+    public static final @NonNull QName IETF_HW_COMPONENT_LIST_DESC = QName.create(IETF_HW_MODULE_NAME, "description"); //leaf:String
+    public static final @NonNull QName IETF_HW_COMPONENT_LIST_HW_REV = QName.create(IETF_HW_MODULE_NAME, "hardware-rev"); //leaf:String
+
+    //odl-netconf-callhome-server.yang
+    public static final String CALLHOME_SERVER_NS = "urn:opendaylight:params:xml:ns:yang:netconf-callhome-server";
+    public static final String CALLHOME_SERVER_REVISION = "2020-10-15";
+    public static final @NonNull QName CALLHOME_SERVER_MODULE =
+            QName.create(CALLHOME_SERVER_NS, CALLHOME_SERVER_REVISION, "odl-netconf-callhome-server");
+    public static final @NonNull QName CALLHOME_SERVER_CONTAINER =
+            QName.create(CALLHOME_SERVER_MODULE, "netconf-callhome-server");
+    public static final @NonNull QName CALLHOME_SERVER_ALLOWED_DEVICE =
+            QName.create(CALLHOME_SERVER_MODULE, "allowed-devices");
+    public static final @NonNull QName CALLHOME_SERVER_ALLOWED_DEVICE_DEVICE_LIST =
+            QName.create(CALLHOME_SERVER_MODULE, "device");
+    public static final @NonNull QName CALLHOME_SERVER_ALLOWED_DEVICE_KEY =
+            QName.create(CALLHOME_SERVER_MODULE, "unique-id");
+
+    //o-ran-hardware.yang
+    public static final String ORAN_HW_NS = "urn:o-ran:hardware:1.0";
+    public static final String ORAN_HW_REVISION = "2019-03-28";
+    public static final @NonNull QName ORAN_HW_MODULE = QName.create(ORAN_HW_NS, ORAN_HW_REVISION, "o-ran-hardware").intern();
+    public static final @NonNull QName ORAN_HW_COMPONENT = QName.create(ORAN_HW_MODULE, "O-RAN-HW-COMPONENT");
+
+    //o-ran-fm.yang
+    public static final String ORAN_FM_NS = "urn:o-ran:fm:1.0";
+    public static final String ORAN_FM_REVISION = "2019-02-04";
+    public static final @NonNull QName ORAN_FM_MODULE = QName.create(ORAN_FM_NS, ORAN_FM_REVISION, "o-ran-fm");
+    public static final @NonNull QName ORAN_FM_ALARM_NOTIF = QName.create(ORAN_FM_MODULE, "alarm-notif");
+    public static final @NonNull QName ORAN_FM_FAULT_ID = QName.create(ORAN_FM_MODULE, "fault-id");
+    public static final @NonNull QName ORAN_FM_FAULT_SOURCE = QName.create(ORAN_FM_MODULE, "fault-source");
+    public static final @NonNull QName ORAN_FM_FAULT_SEVERITY = QName.create(ORAN_FM_MODULE, "fault-severity");
+    public static final @NonNull QName ORAN_FM_FAULT_TEXT = QName.create(ORAN_FM_MODULE, "fault-text");
+    public static final @NonNull QName ORAN_FM_FAULT_IS_CLEARED = QName.create(ORAN_FM_MODULE, "is-cleared");
+
+    //ietf-netconf-notifications.yang
+    public static final String IETF_NETCONF_NOTIFICATIONS_NS = "urn:ietf:params:xml:ns:yang:ietf-netconf-notifications";
+    public static final String IETF_NETCONF_NOTIFICATIONS_REVISION = "2012-02-06";
+    public static final @NonNull QName IETF_NETCONF_NOTIFICATIONS_MODULE = QName.create(IETF_NETCONF_NOTIFICATIONS_NS, IETF_NETCONF_NOTIFICATIONS_REVISION, "ietf-netconf-notifications").intern();
+    public static final @NonNull QName IETF_NETCONF_NOTIFICATIONS_NETCONF_CONFIG_CHANGE = QName.create(IETF_NETCONF_NOTIFICATIONS_MODULE, "netconf-config-change");
+    public static final @NonNull QName IETF_NETCONF_NOTIFICATIONS_NETCONF_CONFIRMED_COMMIT = QName.create(IETF_NETCONF_NOTIFICATIONS_MODULE, "netconf-confirmed-commit");
+    public static final @NonNull QName IETF_NETCONF_NOTIFICATIONS_NETCONF_SESSION_START = QName.create(IETF_NETCONF_NOTIFICATIONS_MODULE, "netconf-session-start");
+    public static final @NonNull QName IETF_NETCONF_NOTIFICATIONS_NETCONF_SESSION_END = QName.create(IETF_NETCONF_NOTIFICATIONS_MODULE, "netconf-session-end");
+    public static final @NonNull QName IETF_NETCONF_NOTIFICATIONS_NETCONF_CAPABILITY_CHANGE = QName.create(IETF_NETCONF_NOTIFICATIONS_MODULE, "netconf-capability-change");
+    public static final @NonNull QName IETF_NETCONF_NOTIFICATIONS_CHANGEDBY = QName.create(IETF_NETCONF_NOTIFICATIONS_MODULE, "changed-by");
+    public static final @NonNull QName IETF_NETCONF_NOTIFICATIONS_SERVERORUSER = QName.create(IETF_NETCONF_NOTIFICATIONS_MODULE, "server-or-user");
+    public static final @NonNull QName IETF_NETCONF_NOTIFICATIONS_EDITNODE = QName.create(IETF_NETCONF_NOTIFICATIONS_MODULE, "edit");
+    public static final @NonNull QName IETF_NETCONF_NOTIFICATIONS_USERNAME = QName.create(IETF_NETCONF_NOTIFICATIONS_MODULE, "username");
+    public static final @NonNull QName IETF_NETCONF_NOTIFICATIONS_SESSIONID = QName.create(IETF_NETCONF_NOTIFICATIONS_MODULE, "session-id");
+    public static final @NonNull QName IETF_NETCONF_NOTIFICATIONS_OPERATION = QName.create(IETF_NETCONF_NOTIFICATIONS_MODULE, "operation");
+    public static final @NonNull QName IETF_NETCONF_NOTIFICATIONS_TARGET = QName.create(IETF_NETCONF_NOTIFICATIONS_MODULE, "target");
+    public static final @NonNull QName IETF_NETCONF_NOTIFICATIONS_DATASTORE = QName.create(IETF_NETCONF_NOTIFICATIONS_MODULE, "datastore");
+
+}
diff --git a/sdnr/wt/devicemanager-o-ran-sc/o-ran/ru-fh/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/oran/impl/ORanNetworkElementFactory.java b/sdnr/wt/devicemanager-o-ran-sc/o-ran/ru-fh/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/oran/impl/startup/ORanNetworkElementFactory.java
index fff1fba79..afeac1932 100644
--- a/sdnr/wt/devicemanager-o-ran-sc/o-ran/ru-fh/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/oran/impl/ORanNetworkElementFactory.java
+++ b/sdnr/wt/devicemanager-o-ran-sc/o-ran/ru-fh/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/oran/impl/startup/ORanNetworkElementFactory.java
@@ -18,16 +18,17 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
  */
-package org.onap.ccsdk.features.sdnr.wt.devicemanager.oran.impl;
+package org.onap.ccsdk.features.sdnr.wt.devicemanager.oran.impl.startup;
 
 import java.util.Optional;
 import org.onap.ccsdk.features.sdnr.wt.devicemanager.ne.factory.NetworkElementFactory;
 import org.onap.ccsdk.features.sdnr.wt.devicemanager.ne.service.NetworkElement;
+import org.onap.ccsdk.features.sdnr.wt.devicemanager.oran.impl.dom.ORanDOMNetworkElement;
+import org.onap.ccsdk.features.sdnr.wt.devicemanager.oran.impl.dom.ORanDeviceManagerQNames;
 import org.onap.ccsdk.features.sdnr.wt.devicemanager.service.DeviceManagerServiceProvider;
 import org.onap.ccsdk.features.sdnr.wt.netconfnodestateservice.Capabilities;
 import org.onap.ccsdk.features.sdnr.wt.netconfnodestateservice.NetconfAccessor;
-import org.onap.ccsdk.features.sdnr.wt.netconfnodestateservice.NetconfBindingAccessor;
-import org.opendaylight.yang.gen.v1.urn.o.ran.hardware._1._0.rev190328.ORANHWCOMPONENT;
+import org.onap.ccsdk.features.sdnr.wt.netconfnodestateservice.NetconfDomAccessor;
 import org.opendaylight.yangtools.yang.common.QName;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -43,11 +44,13 @@ public class ORanNetworkElementFactory implements NetworkElementFactory {
     public Optional<NetworkElement> create(NetconfAccessor accessor, DeviceManagerServiceProvider serviceProvider) {
         Capabilities capabilites = accessor.getCapabilites();
         if (!capabilites.isSupportingNamespace(OneCell)) {
-            if (capabilites.isSupportingNamespace(ORANHWCOMPONENT.QNAME)) {
-                log.info("Create device {} ", ORanNetworkElement.class.getName());
-                Optional<NetconfBindingAccessor> bindingAccessor = accessor.getNetconfBindingAccessor();
-                if (bindingAccessor.isPresent()) {
-                    return Optional.of(new ORanNetworkElement(bindingAccessor.get(), serviceProvider));
+            if (capabilites.isSupportingNamespace(ORanDeviceManagerQNames.ORAN_HW_COMPONENT)) {
+                log.info("Create device {} ", ORanDOMNetworkElement.class.getName());
+                //Optional<NetconfBindingAccessor> bindingAccessor = accessor.getNetconfBindingAccessor();
+                Optional<NetconfDomAccessor> domAccessor = accessor.getNetconfDomAccessor();
+                if (domAccessor.isPresent()) {
+                    //return Optional.of(new ORanNetworkElement(bindingAccessor.get(), serviceProvider));
+                    return Optional.of(new ORanDOMNetworkElement(domAccessor.get(), serviceProvider));
                 }
             }
         }
diff --git a/sdnr/wt/devicemanager-o-ran-sc/o-ran/ru-fh/provider/src/main/resources/org/opendaylight/blueprint/impl-blueprint.xml b/sdnr/wt/devicemanager-o-ran-sc/o-ran/ru-fh/provider/src/main/resources/org/opendaylight/blueprint/impl-blueprint.xml
index 21b761ce2..b4cc2d927 100644
--- a/sdnr/wt/devicemanager-o-ran-sc/o-ran/ru-fh/provider/src/main/resources/org/opendaylight/blueprint/impl-blueprint.xml
+++ b/sdnr/wt/devicemanager-o-ran-sc/o-ran/ru-fh/provider/src/main/resources/org/opendaylight/blueprint/impl-blueprint.xml
@@ -31,7 +31,7 @@
                interface="org.onap.ccsdk.features.sdnr.wt.devicemanager.service.NetconfNetworkElementService"/>
 
     <bean id="provider"
-          class="org.onap.ccsdk.features.sdnr.wt.devicemanager.oran.impl.DeviceManagerORanImpl"
+          class="org.onap.ccsdk.features.sdnr.wt.devicemanager.oran.impl.binding.DeviceManagerORanImpl"
           init-method="init" destroy-method="close">
         <property name="netconfNetworkElementService" ref="netconfNetworkElementService"/>
     </bean>