Improve device manager 1.4

Add device manager support for ONF Core Model 1.4 notications: AttributeValueChanged, ObjectCreation, ObjectDeletion

Issue-ID: SDNC-1397
Change-Id: I6557f151bc0322b3cef64bc9bf139d352843a7f2
Signed-off-by: alex.stancu <alexandru.stancu@highstreet-technologies.com>

18 files changed, 3669 insertions, 54 deletions

diff --git a/sdnr/wt/common/src/main/java/org/onap/ccsdk/features/sdnr/wt/common/YangHelper.java b/sdnr/wt/common/src/main/java/org/onap/ccsdk/features/sdnr/wt/common/YangHelper.java
new file mode 100644
index 000000000..c6cd8ddda
--- /dev/null
+++ b/sdnr/wt/common/src/main/java/org/onap/ccsdk/features/sdnr/wt/common/YangHelper.java
@@ -0,0 +1,46 @@
+/*
+ * ============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.common;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+import java.util.Map;
+
+public class YangHelper {
+
+    static public <T extends Object> Collection<T> getCollection( Map<?,T> map ) {
+        return map != null ? map.values() : null;
+    }
+
+    static public <T extends Object> Collection<T> getCollection( List<T> map ) {
+        return map;
+    }
+
+    static public <T extends Object> List<T> getList( Map<?,T> map ) {
+        return map != null ? new ArrayList<T>(map.values()) : null;
+    }
+
+    static public <T extends Object> List<T> getList( List<T> map ) {
+        return map;
+    }
+}
diff --git a/sdnr/wt/devicemanager-onf14/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/onf14/impl/Onf14AirInterface.java b/sdnr/wt/devicemanager-onf14/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/onf14/impl/Onf14AirInterface.java
new file mode 100644
index 000000000..9e78a92b1
--- /dev/null
+++ b/sdnr/wt/devicemanager-onf14/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/onf14/impl/Onf14AirInterface.java
@@ -0,0 +1,54 @@
+/*
+ * ============LICENSE_START========================================================================
+ * ONAP : ccsdk feature sdnr wt
+ * =================================================================================================
+ * 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.onf14.impl;
+
+import org.opendaylight.yang.gen.v1.urn.onf.yang.air._interface._2._0.rev200121.SEVERITYTYPE;
+import org.opendaylight.yang.gen.v1.urn.onf.yang.air._interface._2._0.rev200121.SEVERITYTYPECRITICAL;
+import org.opendaylight.yang.gen.v1.urn.onf.yang.air._interface._2._0.rev200121.SEVERITYTYPEMAJOR;
+import org.opendaylight.yang.gen.v1.urn.onf.yang.air._interface._2._0.rev200121.SEVERITYTYPEMINOR;
+import org.opendaylight.yang.gen.v1.urn.onf.yang.air._interface._2._0.rev200121.SEVERITYTYPENONALARMED;
+import org.opendaylight.yang.gen.v1.urn.onf.yang.air._interface._2._0.rev200121.SEVERITYTYPEWARNING;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class Onf14AirInterface {
+
+    private static final Logger log = LoggerFactory.getLogger(Onf14AirInterface.class);
+
+    public static org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev190801.SeverityType mapSeverity(
+            Class<? extends SEVERITYTYPE> severity) {
+
+        if (severity != null) {
+            if (severity.getTypeName() == SEVERITYTYPECRITICAL.class.getName()) {
+                return org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev190801.SeverityType.Critical;
+            } else if (severity.getTypeName() == SEVERITYTYPEMAJOR.class.getName()) {
+                return org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev190801.SeverityType.Major;
+            } else if (severity.getTypeName() == SEVERITYTYPEMINOR.class.getName()) {
+                return org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev190801.SeverityType.Minor;
+            } else if (severity.getTypeName() == SEVERITYTYPEWARNING.class.getName()) {
+                return org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev190801.SeverityType.Warning;
+            } else if (severity.getTypeName() == SEVERITYTYPENONALARMED.class.getName()) {
+                return org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev190801.SeverityType.NonAlarmed;
+            }
+        }
+
+        return org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev190801.SeverityType.NonAlarmed;
+    }
+
+
+}
diff --git a/sdnr/wt/devicemanager-onf14/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/onf14/impl/Onf14AirInterfaceNotificationListener.java b/sdnr/wt/devicemanager-onf14/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/onf14/impl/Onf14AirInterfaceNotificationListener.java
index 1663f61fe..0f25e0ce6 100644
--- a/sdnr/wt/devicemanager-onf14/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/onf14/impl/Onf14AirInterfaceNotificationListener.java
+++ b/sdnr/wt/devicemanager-onf14/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/onf14/impl/Onf14AirInterfaceNotificationListener.java
@@ -28,6 +28,8 @@ import org.opendaylight.yang.gen.v1.urn.onf.yang.air._interface._2._0.rev200121.
 import org.opendaylight.yang.gen.v1.urn.onf.yang.air._interface._2._0.rev200121.ObjectCreationNotification;
 import org.opendaylight.yang.gen.v1.urn.onf.yang.air._interface._2._0.rev200121.ObjectDeletionNotification;
 import org.opendaylight.yang.gen.v1.urn.onf.yang.air._interface._2._0.rev200121.ProblemNotification;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev190801.EventlogBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev190801.SourceType;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -46,9 +48,18 @@ public class Onf14AirInterfaceNotificationListener implements AirInterface20List
 
     @Override
     public void onObjectDeletionNotification(ObjectDeletionNotification notification) {
-        // TODO Auto-generated method stub
-        // this type of notification is not yet supported
         log.debug("Got event of type :: {}", ObjectDeletionNotification.class.getSimpleName());
+
+        EventlogBuilder eventlogBuilder = new EventlogBuilder();
+        eventlogBuilder.setNodeId(netconfAccessor.getNodeId().getValue()).setAttributeName("")
+                .setCounter(notification.getCounter()).setNewValue("deleted")
+                .setObjectId(notification.getObjectIdRef().getValue()).setSourceType(SourceType.Netconf)
+                .setTimestamp(notification.getTimestamp());
+        serviceProvider.getDataProvider().writeEventLog(eventlogBuilder.build());
+        serviceProvider.getNotificationService().deletionNotification(netconfAccessor.getNodeId(),
+                notification.getCounter(), notification.getTimestamp(), notification.getObjectIdRef().getValue());
+
+        log.debug("onObjectDeletionNotification log entry written");
     }
 
     @Override
@@ -57,22 +68,39 @@ public class Onf14AirInterfaceNotificationListener implements AirInterface20List
 
         serviceProvider.getFaultService().faultNotification(netconfAccessor.getNodeId(), notification.getCounter(),
                 notification.getTimestamp(), notification.getObjectIdRef().getValue(), notification.getProblem(),
-                Onf14NetworkElement.mapSeverity(notification.getSeverity()));
+                Onf14AirInterface.mapSeverity(notification.getSeverity()));
 
     }
 
     @Override
     public void onAttributeValueChangedNotification(AttributeValueChangedNotification notification) {
-        // TODO Auto-generated method stub
-        // this type of notification is not yet supported
         log.debug("Got event of type :: {}", AttributeValueChangedNotification.class.getSimpleName());
+
+        EventlogBuilder eventlogBuilder = new EventlogBuilder();
+        eventlogBuilder.setNodeId(netconfAccessor.getNodeId().getValue())
+                .setAttributeName(notification.getAttributeName()).setCounter(notification.getCounter())
+                .setNewValue(notification.getNewValue()).setObjectId(notification.getObjectIdRef().getValue())
+                .setSourceType(SourceType.Netconf).setTimestamp(notification.getTimestamp());
+        serviceProvider.getDataProvider().writeEventLog(eventlogBuilder.build());
+        serviceProvider.getNotificationService().eventNotification(eventlogBuilder.build());
+
+        log.debug("onAttributeValueChangedNotification log entry written");
     }
 
     @Override
     public void onObjectCreationNotification(ObjectCreationNotification notification) {
-        // TODO Auto-generated method stub
-        // this type of notification is not yet supported
         log.debug("Got event of type :: {}", ObjectCreationNotification.class.getSimpleName());
+
+        EventlogBuilder eventlogBuilder = new EventlogBuilder();
+        eventlogBuilder.setNodeId(netconfAccessor.getNodeId().getValue()).setAttributeName(notification.getObjectType())
+                .setCounter(notification.getCounter()).setNewValue("created")
+                .setObjectId(notification.getObjectIdRef().getValue()).setSourceType(SourceType.Netconf)
+                .setTimestamp(notification.getTimestamp());
+        serviceProvider.getDataProvider().writeEventLog(eventlogBuilder.build());
+        serviceProvider.getNotificationService().creationNotification(netconfAccessor.getNodeId(),
+                notification.getCounter(), notification.getTimestamp(), notification.getObjectIdRef().getValue());
+
+        log.debug("onObjectCreationNotification log entry written");
     }
 
 }
diff --git a/sdnr/wt/devicemanager-onf14/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/onf14/impl/Onf14EthernetContainer.java b/sdnr/wt/devicemanager-onf14/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/onf14/impl/Onf14EthernetContainer.java
new file mode 100644
index 000000000..4654bfe2e
--- /dev/null
+++ b/sdnr/wt/devicemanager-onf14/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/onf14/impl/Onf14EthernetContainer.java
@@ -0,0 +1,54 @@
+/*
+ * ============LICENSE_START========================================================================
+ * ONAP : ccsdk feature sdnr wt
+ * =================================================================================================
+ * 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.onf14.impl;
+
+import org.opendaylight.yang.gen.v1.urn.onf.yang.ethernet.container._2._0.rev200121.SEVERITYTYPE;
+import org.opendaylight.yang.gen.v1.urn.onf.yang.ethernet.container._2._0.rev200121.SEVERITYTYPECRITICAL;
+import org.opendaylight.yang.gen.v1.urn.onf.yang.ethernet.container._2._0.rev200121.SEVERITYTYPEMAJOR;
+import org.opendaylight.yang.gen.v1.urn.onf.yang.ethernet.container._2._0.rev200121.SEVERITYTYPEMINOR;
+import org.opendaylight.yang.gen.v1.urn.onf.yang.ethernet.container._2._0.rev200121.SEVERITYTYPENONALARMED;
+import org.opendaylight.yang.gen.v1.urn.onf.yang.ethernet.container._2._0.rev200121.SEVERITYTYPEWARNING;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class Onf14EthernetContainer {
+
+    private static final Logger log = LoggerFactory.getLogger(Onf14EthernetContainer.class);
+
+    public static org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev190801.SeverityType mapSeverity(
+            Class<? extends SEVERITYTYPE> severity) {
+
+        if (severity != null) {
+            if (severity.getTypeName() == SEVERITYTYPECRITICAL.class.getName()) {
+                return org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev190801.SeverityType.Critical;
+            } else if (severity.getTypeName() == SEVERITYTYPEMAJOR.class.getName()) {
+                return org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev190801.SeverityType.Major;
+            } else if (severity.getTypeName() == SEVERITYTYPEMINOR.class.getName()) {
+                return org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev190801.SeverityType.Minor;
+            } else if (severity.getTypeName() == SEVERITYTYPEWARNING.class.getName()) {
+                return org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev190801.SeverityType.Warning;
+            } else if (severity.getTypeName() == SEVERITYTYPENONALARMED.class.getName()) {
+                return org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev190801.SeverityType.NonAlarmed;
+            }
+        }
+
+        return org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev190801.SeverityType.NonAlarmed;
+    }
+
+
+}
diff --git a/sdnr/wt/devicemanager-onf14/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/onf14/impl/Onf14EthernetContainerNotificationListener.java b/sdnr/wt/devicemanager-onf14/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/onf14/impl/Onf14EthernetContainerNotificationListener.java
new file mode 100644
index 000000000..c2fba89e4
--- /dev/null
+++ b/sdnr/wt/devicemanager-onf14/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/onf14/impl/Onf14EthernetContainerNotificationListener.java
@@ -0,0 +1,116 @@
+/*
+ * ============LICENSE_START=======================================================
+ * ONAP : ccsdk feature sdnr wt
+ * ================================================================================
+ * 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.onf14.impl;
+
+import org.onap.ccsdk.features.sdnr.wt.devicemanager.service.DeviceManagerServiceProvider;
+import org.onap.ccsdk.features.sdnr.wt.netconfnodestateservice.NetconfAccessor;
+import org.opendaylight.yang.gen.v1.urn.onf.yang.ethernet.container._2._0.rev200121.AttributeValueChangedNotification;
+import org.opendaylight.yang.gen.v1.urn.onf.yang.ethernet.container._2._0.rev200121.EthernetContainer20Listener;
+import org.opendaylight.yang.gen.v1.urn.onf.yang.ethernet.container._2._0.rev200121.ObjectCreationNotification;
+import org.opendaylight.yang.gen.v1.urn.onf.yang.ethernet.container._2._0.rev200121.ObjectDeletionNotification;
+import org.opendaylight.yang.gen.v1.urn.onf.yang.ethernet.container._2._0.rev200121.ProblemNotification;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev190801.EventlogBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev190801.SourceType;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class Onf14EthernetContainerNotificationListener implements EthernetContainer20Listener {
+
+    private static final Logger log = LoggerFactory.getLogger(Onf14EthernetContainerNotificationListener.class);
+
+    private final NetconfAccessor netconfAccessor;
+    private final DeviceManagerServiceProvider serviceProvider;
+
+    public Onf14EthernetContainerNotificationListener(NetconfAccessor netconfAccessor,
+            DeviceManagerServiceProvider serviceProvider) {
+        this.netconfAccessor = netconfAccessor;
+        this.serviceProvider = serviceProvider;
+    }
+
+    @Override
+    public void onObjectDeletionNotification(ObjectDeletionNotification notification) {
+        log.debug("Got event of type :: {}", ObjectDeletionNotification.class.getSimpleName());
+
+        EventlogBuilder eventlogBuilder = new EventlogBuilder();
+        eventlogBuilder.setNodeId(netconfAccessor.getNodeId().getValue())
+        .setAttributeName("")
+        .setCounter(notification.getCounter().intValue())
+        .setNewValue("deleted")
+        .setObjectId(notification.getObjectIdRef().getValue())
+        .setSourceType(SourceType.Netconf)
+        .setTimestamp(notification.getTimestamp());
+        serviceProvider.getDataProvider().writeEventLog(eventlogBuilder.build());
+        serviceProvider.getNotificationService().deletionNotification(netconfAccessor.getNodeId(),
+                notification.getCounter().intValue(), notification.getTimestamp(), notification.getObjectIdRef().getValue());
+
+        log.debug("onObjectDeletionNotification log entry written");
+    }
+
+    @Override
+    public void onProblemNotification(ProblemNotification notification) {
+        log.debug("Got event of type :: {}", ProblemNotification.class.getSimpleName());
+
+        serviceProvider.getFaultService().faultNotification(netconfAccessor.getNodeId(),
+                notification.getCounter().intValue(), notification.getTimestamp(),
+                notification.getObjectIdRef().getValue(), notification.getProblem(),
+                Onf14EthernetContainer.mapSeverity(notification.getSeverity()));
+
+    }
+
+    @Override
+    public void onAttributeValueChangedNotification(AttributeValueChangedNotification notification) {
+        log.debug("Got event of type :: {}", AttributeValueChangedNotification.class.getSimpleName());
+
+        EventlogBuilder eventlogBuilder = new EventlogBuilder();
+        eventlogBuilder.setNodeId(netconfAccessor.getNodeId().getValue())
+        .setAttributeName(notification.getAttributeName())
+        .setCounter(notification.getCounter().intValue())
+        .setNewValue(notification.getNewValue())
+        .setObjectId(notification.getObjectIdRef().getValue())
+        .setSourceType(SourceType.Netconf)
+        .setTimestamp(notification.getTimestamp());
+        serviceProvider.getDataProvider().writeEventLog(eventlogBuilder.build());
+        serviceProvider.getNotificationService().eventNotification(eventlogBuilder.build());
+
+        log.debug("onAttributeValueChangedNotification log entry written");
+    }
+
+    @Override
+    public void onObjectCreationNotification(ObjectCreationNotification notification) {
+        log.debug("Got event of type :: {}", ObjectCreationNotification.class.getSimpleName());
+
+        EventlogBuilder eventlogBuilder = new EventlogBuilder();
+        eventlogBuilder.setNodeId(netconfAccessor.getNodeId().getValue())
+        .setAttributeName(notification.getObjectType())
+        .setCounter(notification.getCounter().intValue())
+        .setNewValue("created")
+        .setObjectId(notification.getObjectIdRef().getValue())
+        .setSourceType(SourceType.Netconf)
+        .setTimestamp(notification.getTimestamp());
+        serviceProvider.getDataProvider().writeEventLog(eventlogBuilder.build());
+        serviceProvider.getNotificationService().creationNotification(netconfAccessor.getNodeId(),
+                notification.getCounter().intValue(), notification.getTimestamp(), notification.getObjectIdRef().getValue());
+
+        log.debug("onObjectCreationNotification log entry written");
+    }
+
+}
diff --git a/sdnr/wt/devicemanager-onf14/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/onf14/impl/Onf14NetworkElement.java b/sdnr/wt/devicemanager-onf14/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/onf14/impl/Onf14NetworkElement.java
index 816aa50f4..b722a61f0 100644
--- a/sdnr/wt/devicemanager-onf14/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/onf14/impl/Onf14NetworkElement.java
+++ b/sdnr/wt/devicemanager-onf14/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/onf14/impl/Onf14NetworkElement.java
@@ -18,10 +18,12 @@
 package org.onap.ccsdk.features.sdnr.wt.devicemanager.onf14.impl;
 
 import java.util.ArrayList;
+import java.util.Collection;
 import java.util.List;
 import java.util.Optional;
 import org.eclipse.jdt.annotation.NonNull;
 import org.eclipse.jdt.annotation.Nullable;
+import org.onap.ccsdk.features.sdnr.wt.common.YangHelper;
 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;
@@ -32,14 +34,6 @@ import org.onap.ccsdk.features.sdnr.wt.netconfnodestateservice.Capabilities;
 import org.onap.ccsdk.features.sdnr.wt.netconfnodestateservice.NetconfAccessor;
 import org.opendaylight.mdsal.common.api.LogicalDatastoreType;
 import org.opendaylight.yang.gen.v1.urn.onf.yang.air._interface._2._0.rev200121.LAYERPROTOCOLNAMETYPEAIRLAYER;
-import org.opendaylight.yang.gen.v1.urn.onf.yang.air._interface._2._0.rev200121.LayerProtocol1;
-import org.opendaylight.yang.gen.v1.urn.onf.yang.air._interface._2._0.rev200121.SEVERITYTYPE;
-import org.opendaylight.yang.gen.v1.urn.onf.yang.air._interface._2._0.rev200121.SEVERITYTYPECRITICAL;
-import org.opendaylight.yang.gen.v1.urn.onf.yang.air._interface._2._0.rev200121.SEVERITYTYPEMAJOR;
-import org.opendaylight.yang.gen.v1.urn.onf.yang.air._interface._2._0.rev200121.SEVERITYTYPEMINOR;
-import org.opendaylight.yang.gen.v1.urn.onf.yang.air._interface._2._0.rev200121.SEVERITYTYPENONALARMED;
-import org.opendaylight.yang.gen.v1.urn.onf.yang.air._interface._2._0.rev200121.SEVERITYTYPEWARNING;
-import org.opendaylight.yang.gen.v1.urn.onf.yang.air._interface._2._0.rev200121.air._interface.current.problems.CurrentProblemList;
 import org.opendaylight.yang.gen.v1.urn.onf.yang.air._interface._2._0.rev200121.air._interface.lp.spec.AirInterfacePac;
 import org.opendaylight.yang.gen.v1.urn.onf.yang.air._interface._2._0.rev200121.air._interface.pac.AirInterfaceCurrentProblems;
 import org.opendaylight.yang.gen.v1.urn.onf.yang.core.model._1._4.rev191127.ControlConstruct;
@@ -52,6 +46,12 @@ import org.opendaylight.yang.gen.v1.urn.onf.yang.core.model._1._4.rev191127.cont
 import org.opendaylight.yang.gen.v1.urn.onf.yang.core.model._1._4.rev191127.equipment.ContainedHolder;
 import org.opendaylight.yang.gen.v1.urn.onf.yang.core.model._1._4.rev191127.logical.termination.point.LayerProtocol;
 import org.opendaylight.yang.gen.v1.urn.onf.yang.core.model._1._4.rev191127.logical.termination.point.LayerProtocolKey;
+import org.opendaylight.yang.gen.v1.urn.onf.yang.ethernet.container._2._0.rev200121.LAYERPROTOCOLNAMETYPEETHERNETCONTAINERLAYER;
+import org.opendaylight.yang.gen.v1.urn.onf.yang.ethernet.container._2._0.rev200121.ethernet.container.lp.spec.EthernetContainerPac;
+import org.opendaylight.yang.gen.v1.urn.onf.yang.ethernet.container._2._0.rev200121.ethernet.container.pac.EthernetContainerCurrentProblems;
+import org.opendaylight.yang.gen.v1.urn.onf.yang.wire._interface._2._0.rev200123.LAYERPROTOCOLNAMETYPEWIRELAYER;
+import org.opendaylight.yang.gen.v1.urn.onf.yang.wire._interface._2._0.rev200123.wire._interface.lp.spec.WireInterfacePac;
+import org.opendaylight.yang.gen.v1.urn.onf.yang.wire._interface._2._0.rev200123.wire._interface.pac.WireInterfaceCurrentProblems;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.netconf.node.topology.rev150114.NetconfNode;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev190801.NetworkElementConnectionBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev190801.NetworkElementDeviceType;
@@ -89,6 +89,16 @@ public class Onf14NetworkElement implements NetworkElement {
     private ListenerRegistration<NotificationListener> airInterfaceNotificationListenerHandler;
     private @NonNull final Onf14AirInterfaceNotificationListener airInterfaceNotificationListener;
 
+    // ethernet container related members
+    private final List<TechnologySpecificPacKeys> ethernetContainerList = new ArrayList<TechnologySpecificPacKeys>();
+    private ListenerRegistration<NotificationListener> etherneContainerNotificationListenerHandler;
+    private @NonNull final Onf14EthernetContainerNotificationListener ethernetContainerNotificationListener;
+
+    // wire interface related members
+    private final List<TechnologySpecificPacKeys> wireInterfaceList = new ArrayList<TechnologySpecificPacKeys>();
+    private ListenerRegistration<NotificationListener> wireInterfaceNotificationListenerHandler;
+    private @NonNull final Onf14WireInterfaceNotificationListener wireInterfaceNotificationListener;
+
     Onf14NetworkElement(NetconfAccessor netconfAccess, DeviceManagerServiceProvider serviceProvider) {
         log.info("Create {}", Onf14NetworkElement.class.getSimpleName());
         this.netconfAccessor = netconfAccess;
@@ -97,6 +107,11 @@ public class Onf14NetworkElement implements NetworkElement {
         this.onf14Mapper = new Onf14ToInternalDataModel();
         this.airInterfaceNotificationListenerHandler = null;
         airInterfaceNotificationListener = new Onf14AirInterfaceNotificationListener(netconfAccess, serviceProvider);
+        this.etherneContainerNotificationListenerHandler = null;
+        ethernetContainerNotificationListener =
+                new Onf14EthernetContainerNotificationListener(netconfAccess, serviceProvider);
+        this.wireInterfaceNotificationListenerHandler = null;
+        wireInterfaceNotificationListener = new Onf14WireInterfaceNotificationListener(netconfAccess, serviceProvider);
     }
 
     public void initialReadFromNetworkElement() {
@@ -110,8 +125,17 @@ public class Onf14NetworkElement implements NetworkElement {
         log.debug("Removed all {} problems from database at registration", problems);
 
         readAllAirInterfaceCurrentProblems(resultList);
+        problems = resultList.size();
+        log.debug("NETCONF read air interface current problems completed. Got back {} problems.", problems);
+
+        readAllEhernetContainerCurrentProblems(resultList);
+        problems = resultList.size() - problems;
         log.debug("NETCONF read current problems completed. Got back {} problems.", resultList.size());
 
+        readAllWireInterfaceCurrentProblems(resultList);
+        problems = resultList.size();
+        log.debug("NETCONF read wire interface current problems completed. Got back {} problems.", problems);
+
         faultService.initCurrentProblemStatus(netconfAccessor.getNodeId(), resultList);
         log.debug("DB write current problems completed");
 
@@ -129,6 +153,30 @@ public class Onf14NetworkElement implements NetworkElement {
         }
     }
 
+    public void readAllEhernetContainerCurrentProblems(FaultData resultList) {
+
+        int idxStart; // Start index for debug messages
+
+        for (TechnologySpecificPacKeys key : ethernetContainerList) {
+            idxStart = resultList.size();
+
+            readEthernetConainerCurrentProblemForLtp(key.getLtpUuid(), key.getLocalId(), resultList);
+            debugResultList(key.getLtpUuid().getValue(), resultList, idxStart);
+        }
+    }
+
+    public void readAllWireInterfaceCurrentProblems(FaultData resultList) {
+
+        int idxStart; // Start index for debug messages
+
+        for (TechnologySpecificPacKeys key : wireInterfaceList) {
+            idxStart = resultList.size();
+
+            readWireInterfaceCurrentProblemForLtp(key.getLtpUuid(), key.getLocalId(), resultList);
+            debugResultList(key.getLtpUuid().getValue(), resultList, idxStart);
+        }
+    }
+
     /**
      * @param nNode
      * set core-model-capability
@@ -149,15 +197,20 @@ public class Onf14NetworkElement implements NetworkElement {
         }
         databaseService.updateNetworkConnection22(eb.build(), netconfAccessor.getNodeId().getValue());
     }
-    
+
     @Override
     public void register() {
         // Set core-model revision value in "core-model-capability" field
         setCoreModel(netconfAccessor.getNetconfNode());
         initialReadFromNetworkElement();
+
         // Register netconf stream
         airInterfaceNotificationListenerHandler =
                 netconfAccessor.doRegisterNotificationListener(airInterfaceNotificationListener);
+        etherneContainerNotificationListenerHandler =
+                netconfAccessor.doRegisterNotificationListener(ethernetContainerNotificationListener);
+        wireInterfaceNotificationListenerHandler =
+                netconfAccessor.doRegisterNotificationListener(wireInterfaceNotificationListener);
         netconfAccessor.registerNotificationsStream(NetconfAccessor.DefaultNotificationsStream);
     }
 
@@ -188,26 +241,6 @@ public class Onf14NetworkElement implements NetworkElement {
         return NetworkElementDeviceType.Wireless;
     }
 
-    public static org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev190801.SeverityType mapSeverity(
-            Class<? extends SEVERITYTYPE> severity) {
-
-        if (severity != null) {
-            if (severity.getTypeName() == SEVERITYTYPECRITICAL.class.getName()) {
-                return org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev190801.SeverityType.Critical;
-            } else if (severity.getTypeName() == SEVERITYTYPEMAJOR.class.getName()) {
-                return org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev190801.SeverityType.Major;
-            } else if (severity.getTypeName() == SEVERITYTYPEMINOR.class.getName()) {
-                return org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev190801.SeverityType.Minor;
-            } else if (severity.getTypeName() == SEVERITYTYPEWARNING.class.getName()) {
-                return org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev190801.SeverityType.Warning;
-            } else if (severity.getTypeName() == SEVERITYTYPENONALARMED.class.getName()) {
-                return org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev190801.SeverityType.NonAlarmed;
-            }
-        }
-
-        return org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev190801.SeverityType.NonAlarmed;
-    }
-
     private void readEquipmentData() {
 
         Optional<ControlConstruct> controlConstruct = readControlConstruct(netconfAccessor);
@@ -233,8 +266,8 @@ public class Onf14NetworkElement implements NetworkElement {
             }
         }
 
-        // storing all the airInterface LTP UUIDs internally, for later usage
-        readAirInterfaceKeys(controlConstruct);
+        // storing all the LTP UUIDs internally, for later usage, for air-interface and ethernet-container
+        readKeys(controlConstruct);
     }
 
     private void addEquipmentToDb(Equipment currentEq, Equipment parentEq, long treeLevel) {
@@ -258,7 +291,7 @@ public class Onf14NetworkElement implements NetworkElement {
         // we iterate the kids of our current equipment and add them to the database recursively
         // the actual reference is here: /core-model:control-construct/equipment/contained-holder/occupying-fru
         @NonNull
-        List<ContainedHolder> holderList = currentEq.nonnullContainedHolder();
+        Collection<ContainedHolder> holderList = YangHelper.getCollection(currentEq.nonnullContainedHolder());
 
         for (ContainedHolder holder : holderList) {
             @Nullable
@@ -275,17 +308,17 @@ public class Onf14NetworkElement implements NetworkElement {
         }
     }
 
-    private void readAirInterfaceKeys(Optional<ControlConstruct> controlConstruct) {
+    private void readKeys(Optional<ControlConstruct> controlConstruct) {
 
         if (controlConstruct.isPresent()) {
             @NonNull
-            List<LogicalTerminationPoint> ltpList = controlConstruct.get().nonnullLogicalTerminationPoint();
+            Collection<LogicalTerminationPoint> ltpList = YangHelper.getCollection(controlConstruct.get().nonnullLogicalTerminationPoint());
             log.debug("Iterating the LTP list for node {}", netconfAccessor.getNodeId().getValue());
 
             // iterating all the Logical Termination Point list
             for (LogicalTerminationPoint ltp : ltpList) {
                 @NonNull
-                List<LayerProtocol> lpList = ltp.nonnullLayerProtocol();
+                List<LayerProtocol> lpList = YangHelper.getList(ltp.nonnullLayerProtocol());
                 // the Layer Protocol list should contain only one item, since we have an 1:1 relationship between the LTP and the LP
                 if (lpList.size() != 1) {
                     log.debug("Layer protocol has no 1:1 relationship with the LTP.");
@@ -296,7 +329,7 @@ public class Onf14NetworkElement implements NetworkElement {
                 @Nullable
                 Class<? extends LAYERPROTOCOLNAMETYPE> layerProtocolName = lp.getLayerProtocolName();
                 if (layerProtocolName != null) {
-                    // it the LTP has an airInterface technology extension, the layer protocol name is air-layer
+                    // if the LTP has an airInterface technology extension, the layer protocol name is air-layer
                     if (layerProtocolName.getTypeName() == LAYERPROTOCOLNAMETYPEAIRLAYER.class.getName()) {
                         TechnologySpecificPacKeys airInterfaceKey =
                                 new TechnologySpecificPacKeys(ltp.getUuid(), lp.getLocalId());
@@ -304,6 +337,21 @@ public class Onf14NetworkElement implements NetworkElement {
                         log.debug("Adding Ltp with uuid {} and local-id {} to the air-interface list",
                                 ltp.getUuid().getValue(), lp.getLocalId());
                     }
+                    // if the LTP has an ethernetContainier technology extension, the layer protocol name is ethernet-container-layer
+                    else if (layerProtocolName.getTypeName() == LAYERPROTOCOLNAMETYPEETHERNETCONTAINERLAYER.class
+                            .getName()) {
+                        TechnologySpecificPacKeys ethernetContainerKey =
+                                new TechnologySpecificPacKeys(ltp.getUuid(), lp.getLocalId());
+                        ethernetContainerList.add(ethernetContainerKey);
+                        log.debug("Adding Ltp with uuid {} and local-id {} to the ethernet-contatinier list",
+                                ltp.getUuid().getValue(), lp.getLocalId());
+                    } else if (layerProtocolName.getTypeName() == LAYERPROTOCOLNAMETYPEWIRELAYER.class.getName()) {
+                        TechnologySpecificPacKeys wireInterfaceKey =
+                                new TechnologySpecificPacKeys(ltp.getUuid(), lp.getLocalId());
+                        wireInterfaceList.add(wireInterfaceKey);
+                        log.debug("Adding Ltp with uuid {} and local-id {} to the wire-interface list",
+                                ltp.getUuid().getValue(), lp.getLocalId());
+                    }
                 }
             }
         }
@@ -317,11 +365,13 @@ public class Onf14NetworkElement implements NetworkElement {
                 clazzPac.getSimpleName(), netconfAccessor.getNodeId().getValue(), ltpUuid.getValue(), localId);
 
         // constructing the IID needs the augmentation exposed byy the air-interface-2-0 model
-        InstanceIdentifier<AirInterfaceCurrentProblems> airInterfaceCurrentProblem_IID =
-                InstanceIdentifier.builder(ControlConstruct.class)
-                        .child(LogicalTerminationPoint.class, new LogicalTerminationPointKey(ltpUuid))
-                        .child(LayerProtocol.class, new LayerProtocolKey(localId)).augmentation(LayerProtocol1.class)
-                        .child(AirInterfacePac.class).child(AirInterfaceCurrentProblems.class).build();
+        InstanceIdentifier<AirInterfaceCurrentProblems> airInterfaceCurrentProblem_IID = InstanceIdentifier
+                .builder(ControlConstruct.class)
+                .child(LogicalTerminationPoint.class, new LogicalTerminationPointKey(ltpUuid))
+                .child(LayerProtocol.class, new LayerProtocolKey(localId))
+                .augmentation(
+                        org.opendaylight.yang.gen.v1.urn.onf.yang.air._interface._2._0.rev200121.LayerProtocol1.class)
+                .child(AirInterfacePac.class).child(AirInterfaceCurrentProblems.class).build();
 
         // reading all the current-problems list for this specific LTP and LP
         AirInterfaceCurrentProblems problems = netconfAccessor.getTransactionUtils().readData(
@@ -332,16 +382,86 @@ public class Onf14NetworkElement implements NetworkElement {
         } else if (problems.getCurrentProblemList() == null) {
             log.debug("DBRead Id {} empty CurrentProblemList", ltpUuid);
         } else {
-            for (CurrentProblemList problem : problems.nonnullCurrentProblemList()) {
+            for (org.opendaylight.yang.gen.v1.urn.onf.yang.air._interface._2._0.rev200121.air._interface.current.problems.CurrentProblemList problem : YangHelper.getCollection(problems
+                    .nonnullCurrentProblemList())) {
+                resultList.add(netconfAccessor.getNodeId(), (int) problem.getSequenceNumber(), problem.getTimestamp(),
+                        ltpUuid.getValue(), problem.getProblemName(),
+                        Onf14AirInterface.mapSeverity(problem.getProblemSeverity()));
+            }
+        }
+    }
+
+    private void readEthernetConainerCurrentProblemForLtp(UniversalId ltpUuid, String localId, FaultData resultList) {
+
+        final Class<EthernetContainerPac> clazzPac = EthernetContainerPac.class;
+
+        log.info("DBRead Get current problems for class {} from mountpoint {} for LTP uuid {} and local-id {}",
+                clazzPac.getSimpleName(), netconfAccessor.getNodeId().getValue(), ltpUuid.getValue(), localId);
+
+        // constructing the IID needs the augmentation exposed by the ethernet-container-2-0 model
+        InstanceIdentifier<EthernetContainerCurrentProblems> etherneContainerCurrentProblem_IID = InstanceIdentifier
+                .builder(ControlConstruct.class)
+                .child(LogicalTerminationPoint.class, new LogicalTerminationPointKey(ltpUuid))
+                .child(LayerProtocol.class, new LayerProtocolKey(localId))
+                .augmentation(
+                        org.opendaylight.yang.gen.v1.urn.onf.yang.ethernet.container._2._0.rev200121.LayerProtocol1.class)
+                .child(EthernetContainerPac.class).child(EthernetContainerCurrentProblems.class).build();
+
+        // reading all the current-problems list for this specific LTP and LP
+        EthernetContainerCurrentProblems problems = netconfAccessor.getTransactionUtils().readData(
+                netconfAccessor.getDataBroker(), LogicalDatastoreType.OPERATIONAL, etherneContainerCurrentProblem_IID);
+
+        if (problems == null) {
+            log.debug("DBRead Id {} no EthernetContainerCurrentProblems", ltpUuid);
+        } else if (problems.getCurrentProblemList() == null) {
+            log.debug("DBRead Id {} empty CurrentProblemList", ltpUuid);
+        } else {
+            for (org.opendaylight.yang.gen.v1.urn.onf.yang.ethernet.container._2._0.rev200121.ethernet.container.current.problems.CurrentProblemList problem : YangHelper.getCollection(problems
+                    .nonnullCurrentProblemList())) {
+                resultList.add(netconfAccessor.getNodeId(), (int) problem.getSequenceNumber(), problem.getTimestamp(),
+                        ltpUuid.getValue(), problem.getProblemName(),
+                        Onf14EthernetContainer.mapSeverity(problem.getProblemSeverity()));
+            }
+        }
+    }
+
+    private void readWireInterfaceCurrentProblemForLtp(UniversalId ltpUuid, String localId, FaultData resultList) {
+
+        final Class<WireInterfacePac> clazzPac = WireInterfacePac.class;
+
+        log.info("DBRead Get current problems for class {} from mountpoint {} for LTP uuid {} and local-id {}",
+                clazzPac.getSimpleName(), netconfAccessor.getNodeId().getValue(), ltpUuid.getValue(), localId);
+
+        // constructing the IID needs the augmentation exposed by the wire-interface-2-0 model
+        InstanceIdentifier<WireInterfaceCurrentProblems> wireInterfaceCurrentProblem_IID = InstanceIdentifier
+                .builder(ControlConstruct.class)
+                .child(LogicalTerminationPoint.class, new LogicalTerminationPointKey(ltpUuid))
+                .child(LayerProtocol.class, new LayerProtocolKey(localId))
+                .augmentation(
+                        org.opendaylight.yang.gen.v1.urn.onf.yang.wire._interface._2._0.rev200123.LayerProtocol1.class)
+                .child(WireInterfacePac.class).child(WireInterfaceCurrentProblems.class).build();
+
+        // reading all the current-problems list for this specific LTP and LP
+        WireInterfaceCurrentProblems problems = netconfAccessor.getTransactionUtils().readData(
+                netconfAccessor.getDataBroker(), LogicalDatastoreType.OPERATIONAL, wireInterfaceCurrentProblem_IID);
+
+        if (problems == null) {
+            log.debug("DBRead Id {} no WireInterfaceCurrentProblems", ltpUuid);
+        } else if (problems.getCurrentProblemList() == null) {
+            log.debug("DBRead Id {} empty CurrentProblemList", ltpUuid);
+        } else {
+            for (org.opendaylight.yang.gen.v1.urn.onf.yang.wire._interface._2._0.rev200123.wire._interface.current.problems.CurrentProblemList problem : YangHelper.getCollection(problems
+                    .nonnullCurrentProblemList())) {
                 resultList.add(netconfAccessor.getNodeId(), (int) problem.getSequenceNumber(), problem.getTimestamp(),
-                        ltpUuid.getValue(), problem.getProblemName(), mapSeverity(problem.getProblemSeverity()));
+                        ltpUuid.getValue(), problem.getProblemName(),
+                        Onf14WireInterface.mapSeverity(problem.getProblemSeverity()));
             }
         }
     }
 
     private Optional<ControlConstruct> readControlConstruct(NetconfAccessor netconfAccessor) {
         return Optional.ofNullable(netconfAccessor.getTransactionUtils().readData(netconfAccessor.getDataBroker(),
-                LogicalDatastoreType.OPERATIONAL, CONTROLCONSTRUCT_IID));
+                LogicalDatastoreType.CONFIGURATION, CONTROLCONSTRUCT_IID));
     }
 
     private @Nullable Equipment readEquipmentInstance(NetconfAccessor accessData, UniversalId equipmentUuid) {
@@ -354,7 +474,7 @@ public class Onf14NetworkElement implements NetworkElement {
         InstanceIdentifier<Equipment> equipmentIID = InstanceIdentifier.builder(ControlConstruct.class)
                 .child(Equipment.class, new EquipmentKey(equipmentUuid)).build();
 
-        return accessData.getTransactionUtils().readData(accessData.getDataBroker(), LogicalDatastoreType.OPERATIONAL,
+        return accessData.getTransactionUtils().readData(accessData.getDataBroker(), LogicalDatastoreType.CONFIGURATION,
                 equipmentIID);
     }
 
diff --git a/sdnr/wt/devicemanager-onf14/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/onf14/impl/Onf14ToInternalDataModel.java b/sdnr/wt/devicemanager-onf14/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/onf14/impl/Onf14ToInternalDataModel.java
index ad42f03ca..63e89f77f 100644
--- a/sdnr/wt/devicemanager-onf14/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/onf14/impl/Onf14ToInternalDataModel.java
+++ b/sdnr/wt/devicemanager-onf14/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/onf14/impl/Onf14ToInternalDataModel.java
@@ -18,9 +18,11 @@
 package org.onap.ccsdk.features.sdnr.wt.devicemanager.onf14.impl;
 
 import java.util.ArrayList;
+import java.util.Collection;
 import java.util.List;
 import org.eclipse.jdt.annotation.NonNull;
 import org.eclipse.jdt.annotation.Nullable;
+import org.onap.ccsdk.features.sdnr.wt.common.YangHelper;
 import org.opendaylight.yang.gen.v1.urn.onf.yang.core.model._1._4.rev191127.Equipment;
 import org.opendaylight.yang.gen.v1.urn.onf.yang.core.model._1._4.rev191127.EquipmentInstance;
 import org.opendaylight.yang.gen.v1.urn.onf.yang.core.model._1._4.rev191127.EquipmentType;
@@ -65,7 +67,7 @@ public class Onf14ToInternalDataModel {
 
             List<String> containedHolderKeyList = new ArrayList<String>();
             @NonNull
-            List<ContainedHolder> containedHolderList = currentEq.nonnullContainedHolder();
+            Collection<ContainedHolder> containedHolderList = YangHelper.getCollection(currentEq.nonnullContainedHolder());
             for (ContainedHolder holder : containedHolderList) {
                 @Nullable
                 UniversalId occupyingFru = holder.getOccupyingFru();
diff --git a/sdnr/wt/devicemanager-onf14/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/onf14/impl/Onf14WireInterface.java b/sdnr/wt/devicemanager-onf14/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/onf14/impl/Onf14WireInterface.java
new file mode 100644
index 000000000..70f552083
--- /dev/null
+++ b/sdnr/wt/devicemanager-onf14/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/onf14/impl/Onf14WireInterface.java
@@ -0,0 +1,54 @@
+/*
+ * ============LICENSE_START========================================================================
+ * ONAP : ccsdk feature sdnr wt
+ * =================================================================================================
+ * 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.onf14.impl;
+
+import org.opendaylight.yang.gen.v1.urn.onf.yang.wire._interface._2._0.rev200123.SEVERITYTYPE;
+import org.opendaylight.yang.gen.v1.urn.onf.yang.wire._interface._2._0.rev200123.SEVERITYTYPECRITICAL;
+import org.opendaylight.yang.gen.v1.urn.onf.yang.wire._interface._2._0.rev200123.SEVERITYTYPEMAJOR;
+import org.opendaylight.yang.gen.v1.urn.onf.yang.wire._interface._2._0.rev200123.SEVERITYTYPEMINOR;
+import org.opendaylight.yang.gen.v1.urn.onf.yang.wire._interface._2._0.rev200123.SEVERITYTYPENONALARMED;
+import org.opendaylight.yang.gen.v1.urn.onf.yang.wire._interface._2._0.rev200123.SEVERITYTYPEWARNING;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class Onf14WireInterface {
+
+    private static final Logger log = LoggerFactory.getLogger(Onf14WireInterface.class);
+
+    public static org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev190801.SeverityType mapSeverity(
+            Class<? extends SEVERITYTYPE> severity) {
+
+        if (severity != null) {
+            if (severity.getTypeName() == SEVERITYTYPECRITICAL.class.getName()) {
+                return org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev190801.SeverityType.Critical;
+            } else if (severity.getTypeName() == SEVERITYTYPEMAJOR.class.getName()) {
+                return org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev190801.SeverityType.Major;
+            } else if (severity.getTypeName() == SEVERITYTYPEMINOR.class.getName()) {
+                return org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev190801.SeverityType.Minor;
+            } else if (severity.getTypeName() == SEVERITYTYPEWARNING.class.getName()) {
+                return org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev190801.SeverityType.Warning;
+            } else if (severity.getTypeName() == SEVERITYTYPENONALARMED.class.getName()) {
+                return org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev190801.SeverityType.NonAlarmed;
+            }
+        }
+
+        return org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev190801.SeverityType.NonAlarmed;
+    }
+
+
+}
diff --git a/sdnr/wt/devicemanager-onf14/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/onf14/impl/Onf14WireInterfaceNotificationListener.java b/sdnr/wt/devicemanager-onf14/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/onf14/impl/Onf14WireInterfaceNotificationListener.java
new file mode 100644
index 000000000..39beaa883
--- /dev/null
+++ b/sdnr/wt/devicemanager-onf14/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/onf14/impl/Onf14WireInterfaceNotificationListener.java
@@ -0,0 +1,115 @@
+/*
+ * ============LICENSE_START=======================================================
+ * ONAP : ccsdk feature sdnr wt
+ * ================================================================================
+ * 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.onf14.impl;
+
+import org.onap.ccsdk.features.sdnr.wt.devicemanager.service.DeviceManagerServiceProvider;
+import org.onap.ccsdk.features.sdnr.wt.netconfnodestateservice.NetconfAccessor;
+import org.opendaylight.yang.gen.v1.urn.onf.yang.wire._interface._2._0.rev200123.AttributeValueChangedNotification;
+import org.opendaylight.yang.gen.v1.urn.onf.yang.wire._interface._2._0.rev200123.ObjectCreationNotification;
+import org.opendaylight.yang.gen.v1.urn.onf.yang.wire._interface._2._0.rev200123.ObjectDeletionNotification;
+import org.opendaylight.yang.gen.v1.urn.onf.yang.wire._interface._2._0.rev200123.ProblemNotification;
+import org.opendaylight.yang.gen.v1.urn.onf.yang.wire._interface._2._0.rev200123.WireInterface20Listener;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev190801.EventlogBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev190801.SourceType;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class Onf14WireInterfaceNotificationListener implements WireInterface20Listener {
+
+    private static final Logger log = LoggerFactory.getLogger(Onf14WireInterfaceNotificationListener.class);
+
+    private final NetconfAccessor netconfAccessor;
+    private final DeviceManagerServiceProvider serviceProvider;
+
+    public Onf14WireInterfaceNotificationListener(NetconfAccessor netconfAccessor,
+            DeviceManagerServiceProvider serviceProvider) {
+        this.netconfAccessor = netconfAccessor;
+        this.serviceProvider = serviceProvider;
+    }
+
+    @Override
+    public void onObjectDeletionNotification(ObjectDeletionNotification notification) {
+        log.debug("Got event of type :: {}", ObjectDeletionNotification.class.getSimpleName());
+
+        EventlogBuilder eventlogBuilder = new EventlogBuilder();
+        eventlogBuilder.setNodeId(netconfAccessor.getNodeId().getValue())
+        .setAttributeName("")
+        .setCounter(notification.getCounter())
+        .setNewValue("deleted")
+        .setObjectId(notification.getObjectIdRef().getValue())
+        .setSourceType(SourceType.Netconf)
+        .setTimestamp(notification.getTimestamp());
+        serviceProvider.getDataProvider().writeEventLog(eventlogBuilder.build());
+        serviceProvider.getNotificationService().deletionNotification(netconfAccessor.getNodeId(),
+                notification.getCounter(), notification.getTimestamp(), notification.getObjectIdRef().getValue());
+
+        log.debug("onObjectDeletionNotification log entry written");
+    }
+
+    @Override
+    public void onProblemNotification(ProblemNotification notification) {
+        log.debug("Got event of type :: {}", ProblemNotification.class.getSimpleName());
+
+        serviceProvider.getFaultService().faultNotification(netconfAccessor.getNodeId(), notification.getCounter(),
+                notification.getTimestamp(), notification.getObjectIdRef().getValue(), notification.getProblem(),
+                Onf14WireInterface.mapSeverity(notification.getSeverity()));
+
+    }
+
+    @Override
+    public void onAttributeValueChangedNotification(AttributeValueChangedNotification notification) {
+        log.debug("Got event of type :: {}", AttributeValueChangedNotification.class.getSimpleName());
+
+        EventlogBuilder eventlogBuilder = new EventlogBuilder();
+        eventlogBuilder.setNodeId(netconfAccessor.getNodeId().getValue())
+        .setAttributeName(notification.getAttributeName())
+        .setCounter(notification.getCounter())
+        .setNewValue(notification.getNewValue())
+        .setObjectId(notification.getObjectIdRef().getValue())
+        .setSourceType(SourceType.Netconf)
+        .setTimestamp(notification.getTimestamp());
+        serviceProvider.getDataProvider().writeEventLog(eventlogBuilder.build());
+        serviceProvider.getNotificationService().eventNotification(eventlogBuilder.build());
+
+        log.debug("onAttributeValueChangedNotification log entry written");
+    }
+
+    @Override
+    public void onObjectCreationNotification(ObjectCreationNotification notification) {
+        log.debug("Got event of type :: {}", ObjectCreationNotification.class.getSimpleName());
+
+        EventlogBuilder eventlogBuilder = new EventlogBuilder();
+        eventlogBuilder.setNodeId(netconfAccessor.getNodeId().getValue())
+        .setAttributeName(notification.getObjectType())
+        .setCounter(notification.getCounter())
+        .setNewValue("created")
+        .setObjectId(notification.getObjectIdRef().getValue())
+        .setSourceType(SourceType.Netconf)
+        .setTimestamp(notification.getTimestamp());
+        serviceProvider.getDataProvider().writeEventLog(eventlogBuilder.build());
+        serviceProvider.getNotificationService().creationNotification(netconfAccessor.getNodeId(),
+                notification.getCounter(), notification.getTimestamp(), notification.getObjectIdRef().getValue());
+
+        log.debug("onObjectCreationNotification log entry written");
+    }
+
+}
diff --git a/sdnr/wt/devicemanager-onf14/provider/src/main/yang/ltp-augment-1-0.yang b/sdnr/wt/devicemanager-onf14/provider/src/main/yang/ltp-augment-1-0.yang
new file mode 100644
index 000000000..a1aae5842
--- /dev/null
+++ b/sdnr/wt/devicemanager-onf14/provider/src/main/yang/ltp-augment-1-0.yang
@@ -0,0 +1,102 @@
+module ltp-augment-1-0 {

+  yang-version 1.1;

+  namespace "urn:onf:yang:ltp-augment-1-0";

+  prefix ltp-augment;

+

+  import ietf-yang-types {

+    prefix yang;

+  }

+  import core-model-1-4 {

+    prefix core-model;

+  }

+

+  organization 

+     "openBackhaul.com proposal to Open Networking Foundation (ONF)";

+  contact

+    "WG Web : https://github.com/openBackhaul/Overview

+    WG List: LtpAugment@openBackhaul.com

+    Editor : Thorsten Heinze

+    Email  : Thorsten.Heinze@openBackhaul.com";

+  description

+    "Copyright 2019 openBackhaul.com

+

+    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.";

+

+  revision 2020-07-30 {

+    description 

+      "Model for the Transport SDN Pilot at Telefonica Germany.

+      Please view https://github.com/openBackhaul/ltpAugment/issues for changes.";

+    reference 

+      "https://github.com/openBackhaul/ltpAugment/tree/tsp: Model definition

+      https://github.com/openBackhaul/onfCoreIm/tree/tsp: ONF TR-512 Core IM incl. Profile and enhanced Equipment definition";

+  }

+

+  augment "/core-model:control-construct/core-model:logical-termination-point"{

+    uses ltp-augment-spec;

+    description

+      "none";

+  }

+

+  /****************************************

+  * grouping statements for object classes

+  **************************************/ 

+    grouping ltp-augment-spec {

+      container ltp-augment-pac {

+        uses ltp-augment-pac;

+        description

+          "none";

+      }

+      description

+        "none";

+    }

+

+    grouping ltp-augment-pac {

+      container ltp-augment-configuration {

+        uses ltp-augment-configuration;

+        description

+          "none";

+      }

+      description

+        "none";

+    }

+

+    grouping ltp-augment-configuration {

+      leaf-list equipment {

+        type leafref {

+          path "/core-model:control-construct/core-model:equipment/core-model:uuid";

+          require-instance false;

+        }

+        config false;

+        description

+          "Equipment, which determines the characteristics of this interface (LTP).";

+      }

+      leaf connector {

+        type leafref {

+          path "/core-model:control-construct/core-model:equipment/core-model:connector/core-model:local-id";

+          require-instance false;

+        }

+        config false;

+        description

+          "Connector, where this interface (LTP) can be physically connected.";

+      }

+      description  

+        "none";

+    }

+

+  /****************************************

+  * typedef statements

+  **************************************/ 

+

+  /*********************************************

+  * grouping statements for complex data types

+  *******************************************/ 

+

+}

diff --git a/sdnr/wt/devicemanager-onf14/provider/src/main/yang/mac-fc-1-0.yang b/sdnr/wt/devicemanager-onf14/provider/src/main/yang/mac-fc-1-0.yang
new file mode 100644
index 000000000..cbe692ca8
--- /dev/null
+++ b/sdnr/wt/devicemanager-onf14/provider/src/main/yang/mac-fc-1-0.yang
@@ -0,0 +1,569 @@
+module mac-fc-1-0 {

+  yang-version 1.1;

+  namespace "urn:onf:yang:mac-fc-1-0";

+  prefix mac-fc;

+

+  import ietf-yang-types {

+    prefix yang;

+  }

+  import core-model-1-4 {

+    prefix core-model;

+  }

+

+  organization

+    "openBackhaul.com proposal to Open Networking Foundation (ONF)";

+  contact

+    "WG Web : https://github.com/openBackhaul/Overview

+     WG List: MacFc@openBackhaul.com

+     Editor : Thorsten Heinze

+     Email  : Thorsten.Heinze@openBackhaul.com";

+  description

+    "Technology specific amendment to the ForwardingConstruct class for documenting entries in the MAC forwarding table according to IEEE 802.1 .

+

+     Copyright 2019 openBackhaul.com

+

+     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.";

+

+  revision 2020-08-26 {

+    description

+      "Model for the Transport SDN Pilot at Telefonica Germany

+       Please view https://github.com/openBackhaul/macFc/issues for changes.";

+    reference

+      "https://github.com/openBackhaul/macFc/tree/tsp: Model definition

+       https://github.com/openBackhaul/onfCoreIm/tree/tsp: ONF TR-512 Core IM incl. Profile and enhanced Equipment definition";

+  }

+

+  identity LAYER_PROTOCOL_NAME_TYPE_MAC_LAYER {

+    base core-model:LAYER_PROTOCOL_NAME_TYPE;

+    description

+      "none";

+  }

+

+  augment "/core-model:control-construct/core-model:forwarding-domain/core-model:fc" {

+    when "derived-from-or-self(./core-model:layer-protocol-name, 'mac-fc:LAYER_PROTOCOL_NAME_TYPE_MAC_LAYER')";

+    uses mac-fc-spec;

+    description

+      "none";

+  }

+

+  /****************************************

+   * package notifications

+   **************************************/ 

+

+  notification object-creation-notification {

+    uses object-creation-notification;

+    description

+      "none";

+  }

+

+  grouping object-creation-notification {

+    leaf counter {

+      type int32;

+      default "-1";

+      config false;

+      description

+        "Counts object creation notifications.";

+    }

+    leaf timestamp {

+      type yang:date-and-time;

+      default "2010-11-20T14:00:00+01:00";

+      config false;

+      description

+        "none";

+    }

+    leaf object-id-ref {

+      type leafref {

+        path "/core-model:control-construct/core-model:forwarding-domain/core-model:fc/core-model:uuid";

+        require-instance false;

+      }

+      config false;

+      description

+        "none";

+    }

+    leaf object-type {

+      type string;

+      default "Type of created object not specified.";

+      config false;

+      description

+        "none";

+    }

+    description

+      "none";

+  }

+

+  notification object-deletion-notification {

+    uses object-deletion-notification;

+    description

+      "none";

+  }

+

+  grouping object-deletion-notification {

+    leaf counter {

+      type int32;

+      default "-1";

+      config false;

+      description

+        "Counts object deletion notifications.";

+    }

+    leaf timestamp {

+      type yang:date-and-time;

+      default "2010-11-20T14:00:00+01:00";

+      config false;

+      description

+        "none";

+    }

+    leaf object-id-ref {

+      type leafref {

+        path "/core-model:control-construct/core-model:forwarding-domain/core-model:fc/core-model:uuid";

+        require-instance false;

+      }

+      config false;

+      description

+        "none";

+    }

+    description

+      "none";

+  }

+

+  notification attribute-value-changed-notification {

+    uses attribute-value-changed-notification;

+    description

+      "none";

+  }

+

+  grouping attribute-value-changed-notification {

+    leaf counter {

+      type int32;

+      default "-1";

+      config false;

+      description

+        "Counts attribute value changed notifications.";

+    }

+    leaf timestamp {

+      type yang:date-and-time;

+      default "2010-11-20T14:00:00+01:00";

+      config false;

+      description

+        "none";

+    }

+    leaf object-id-ref {

+      type leafref {

+        path "/core-model:control-construct/core-model:forwarding-domain/core-model:fc/core-model:uuid";

+        require-instance false;

+      }

+      config false;

+      description

+        "none";

+    }

+    leaf attribute-name {

+      type string;

+      default "Attribute name not specified.";

+      config false;

+      description

+        "Name of the attribute that has been changed.";

+    }

+    leaf new-value {

+      type string;

+      default "New value not specified.";

+      config false;

+      description

+        "Attribute value converted to a string (xml, json, ...)";

+    }

+    description

+      "To be sent when an attribute has changed and one or more controllers have to update their data.";

+  }

+

+  notification problem-notification {

+    uses problem-notification;

+    description

+      "none";

+  }

+

+  grouping problem-notification {

+    leaf counter {

+      type int32;

+      default "-1";

+      config false;

+      description

+        "Counts problem notifications";

+    }

+    leaf timestamp {

+      type yang:date-and-time;

+      default "2010-11-20T14:00:00+01:00";

+      config false;

+      description

+        "none";

+    }

+    leaf object-id-ref {

+      type leafref {

+        path "/core-model:control-construct/core-model:forwarding-domain/core-model:fc/core-model:uuid";

+        require-instance false;

+      }

+      config false;

+      description

+        "none";

+    }

+    leaf problem {

+      type string;

+      default "Problem name not specified.";

+      config false;

+      description

+        "Name of the problem according to *Capability::supportedAlarmList";

+    }

+    leaf severity {

+      type severity-type;

+      default "SEVERITY_TYPE_WARNING";

+      config false;

+      description

+        "Severity of the problem according to *Configuration::problemSeverityList";

+    }

+    description

+      "none";

+  }

+

+  /****************************************

+   * grouping statements for object classes

+   **************************************/ 

+  /****************************************

+   * package super-classes

+   **************************************/ 

+

+  grouping current-problem {

+    leaf sequence-number {

+      type int16;

+      config false;

+      description

+        "Unique sequence number of the current problem object.";

+    }

+    leaf timestamp {

+      type yang:date-and-time;

+      default "2010-11-20T14:00:00+01:00";

+      config false;

+      description

+        "none";

+    }

+    leaf problem-severity {

+      type severity-type;

+      default "SEVERITY_TYPE_NOT_YET_DEFINED";

+      config false;

+      description

+        "Severity of the alarm.";

+    }

+    description

+      "none";

+  }

+

+  grouping mac-fc-spec {

+    container mac-fc-pac {

+      uses mac-fc-pac;

+      description

+        "none";

+    }

+    description

+      "Represents an entry into the MAC forwarding table. Name in ieee802-dot1q-bridge.yang: filtering-entry.";

+  }

+

+  grouping mac-fc-pac {

+    container mac-fc-capability {

+      config false;

+      uses mac-fc-capability;

+      description

+        "none";

+    }

+    container mac-fc-configuration {

+      uses mac-fc-configuration;

+      description

+        "none";

+    }

+    container mac-fc-status {

+      config false;

+      uses mac-fc-status;

+      description

+        "none";

+    }

+    container mac-fc-current-problems {

+      config false;

+      uses mac-fc-current-problems;

+      description

+        "none";

+    }

+    description

+      "none";

+  }

+

+  grouping mac-fc-capability {

+    leaf admin-shut-down-is-avail {

+      type boolean;

+      default "false";

+      config false;

+      description

+        "true = Manual switching on and off of the forwarding construct without deleting it (underlying OSI network layers are also not affected) is available.";

+    }

+    leaf-list supported-alarm-list {

+      type string;

+      default "Supported Alarms not yet defined.";

+      config false;

+      description

+        "Available alarms to be listed.";

+    }

+    description

+      "none";

+  }

+

+  grouping mac-fc-configuration {

+    leaf fc-name {

+      type string;

+      default "FC name not yet defined.";

+      description

+        "Name of the ForwardingConstruct. Free text field to be filled by the operator.";

+    }

+    leaf fc-is-on {

+      type boolean;

+      default "false";

+      description

+        "Only effective if (adminShutDownIsAvail==true). true = Activation of the forwarding of frames. false = De-activation of the ForwardingConstruct without deleting it (underlying OSI network layers are not affected).";

+    }

+    leaf database-id {

+      type int32;

+      default "-1";

+      description

+        "The identity of the Filtering Database. Name in ieee802-dot1q-bridge.yang: database-id.";

+    }

+    leaf mac-address {

+      type string;

+      default "00:00:00:00:00:00";

+      description

+        "Configuration of a MAC address (unicast, multicast, broadcast), for which the device has forwarding and/or filtering information.";

+    }

+    leaf entry-kind {

+      type entry-kind-type;

+      default "ENTRY_KIND_TYPE_NOT_YET_DEFINED";

+      description

+        "The type of filtering entry. Whether static or dynamic. Static entries can be created, deleted, and retrieved. However, dynamic entries can only be deleted or retrieved by the management entity. Consequently, a Bridge is not required to accept a command that can alter the dynamic entries except delete a dynamic entry. Name in ieee802-dot1q-bridge.yang: entry-type.";

+    }

+    list problem-kind-severity-list {

+      key "problem-kind-name";

+      uses problem-kind-severity-type;

+      description

+        "Severity of the problem to be configured.";

+    }

+    description

+      "none";

+  }

+

+  grouping mac-fc-status {

+    leaf fc-status {

+      type fc-status-type;

+      default "FC_STATUS_TYPE_NOT_YET_DEFINED";

+      config false;

+      description

+        "The status of this entry. Name in ieee802-dot1q-bridge.yang: status.";

+    }

+    description

+      "none";

+  }

+

+  grouping mac-fc-current-problems {

+    list current-problem-list {

+      key "sequence-number";

+      config false;

+      uses mac-fc-current-problem-type;

+      description

+        "none";

+    }

+    leaf number-of-current-problems {

+      type int8;

+      default "-1";

+      config false;

+      description

+        "Number of alarms, which are currently active on this interface.";

+    }

+    leaf time-of-latest-change {

+      type yang:date-and-time;

+      default "2010-11-20T14:00:00+01:00";

+      config false;

+      description

+        "Date and time when the list of alarms has been changed for the last time.";

+    }

+    description

+      "none";

+  }

+

+  /****************************************

+   * typedef statements

+   **************************************/ 

+

+  typedef entry-kind-type {

+    type identityref {

+      base ENTRY_KIND_TYPE;

+    }

+    description

+      "none";

+  }

+

+  typedef fc-status-type {

+    type identityref {

+      base FC_STATUS_TYPE;

+    }

+    description

+      "none";

+  }

+

+  /*********************************************

+   * grouping statements for complex data types

+   *******************************************/ 

+

+  identity ENTRY_KIND_TYPE {

+    description

+      "none";

+  }

+

+  identity ENTRY_KIND_TYPE_STATIC {

+    base ENTRY_KIND_TYPE;

+    description

+      "Static entries can be created, deleted, and retrieved. Name in ieee802-dot1q-bridge.yang: static.";

+  }

+

+  identity ENTRY_KIND_TYPE_DYNAMIC {

+    base ENTRY_KIND_TYPE;

+    description

+      "Dynamic/learnt entries can only be deleted or retrieved. Name in ieee802-dot1q-bridge.yang: dynamic.";

+  }

+

+  identity ENTRY_KIND_TYPE_NOT_YET_DEFINED {

+    base ENTRY_KIND_TYPE;

+    description

+      "none";

+  }

+

+  identity FC_STATUS_TYPE {

+    description

+      "none";

+  }

+

+  identity FC_STATUS_TYPE_OTHER {

+    base FC_STATUS_TYPE;

+    description

+      "None of the following. This may include the case where some other object is being used to determine if and how frames addressed to the value of the corresponding instance of 'address' are being forwarded. Name in ieee802-dot1q-bridge.yang: other.";

+  }

+

+  identity FC_STATUS_TYPE_INVALID {

+    base FC_STATUS_TYPE;

+    description

+      "This entry is no longer valid (e.g., it was learned but has since aged out), but has not yet been flushed from the table. Name in ieee802-dot1q-bridge.yang: invalid.";

+  }

+

+  identity FC_STATUS_TYPE_LEARNED {

+    base FC_STATUS_TYPE;

+    description

+      "The value of the corresponding instance of the port node was learned and is being used. Name in ieee802-dot1q-bridge.yang: learned.";

+  }

+

+  identity FC_STATUS_TYPE_SELF {

+    base FC_STATUS_TYPE;

+    description

+      "The value of the corresponding instance of the address node representing one of the devices address. Name in ieee802-dot1q-bridge.yang: self.";

+  }

+

+  identity FC_STATUS_TYPE_MANAGEMENT {

+    base FC_STATUS_TYPE;

+    description

+      "The value of the corresponding instance of address node that is also the value of an existing instance. Name in ieee802-dot1q-bridge.yang: mgmt.";

+  }

+

+  identity FC_STATUS_TYPE_NOT_YET_DEFINED {

+    base FC_STATUS_TYPE;

+    description

+      "none";

+  }

+

+  identity SEVERITY_TYPE {

+    description

+      "none";

+  }

+

+  identity SEVERITY_TYPE_NON_ALARMED {

+    base SEVERITY_TYPE;

+    description

+      "none";

+  }

+

+  identity SEVERITY_TYPE_WARNING {

+    base SEVERITY_TYPE;

+    description

+      "none";

+  }

+

+  identity SEVERITY_TYPE_MINOR {

+    base SEVERITY_TYPE;

+    description

+      "none";

+  }

+

+  identity SEVERITY_TYPE_MAJOR {

+    base SEVERITY_TYPE;

+    description

+      "none";

+  }

+

+  identity SEVERITY_TYPE_CRITICAL {

+    base SEVERITY_TYPE;

+    description

+      "none";

+  }

+

+  identity SEVERITY_TYPE_NOT_YET_DEFINED {

+    base SEVERITY_TYPE;

+    description

+      "none";

+  }

+

+  /****************************************

+   * package super-types

+   **************************************/ 

+

+  typedef severity-type {

+    type identityref {

+      base SEVERITY_TYPE;

+    }

+    description

+      "According to ITU-T M.3160";

+  }

+

+  grouping problem-kind-severity-type {

+    leaf problem-kind-name {

+      type string;

+      description

+        "Name of the alarm according to supportedAlarmList";

+    }

+    leaf problem-kind-severity {

+      type severity-type;

+      default "SEVERITY_TYPE_NOT_YET_DEFINED";

+      description

+        "Severity of this type of alarm.";

+    }

+    description

+      "none";

+  }

+

+  grouping mac-fc-current-problem-type {

+    leaf problem-name {

+      type string;

+      default "Problem name not specified.";

+      config false;

+      description

+        "Name of the alarm according to *Capability::supportedAlarmList.";

+    }

+    uses current-problem;

+    description

+      "none";

+  }

+}

diff --git a/sdnr/wt/devicemanager-onf14/provider/src/main/yang/mac-fd-1-0.yang b/sdnr/wt/devicemanager-onf14/provider/src/main/yang/mac-fd-1-0.yang
new file mode 100644
index 000000000..9347f0354
--- /dev/null
+++ b/sdnr/wt/devicemanager-onf14/provider/src/main/yang/mac-fd-1-0.yang
@@ -0,0 +1,585 @@
+module mac-fd-1-0 {

+  yang-version 1.1;

+  namespace "urn:onf:yang:mac-fd-1-0";

+  prefix mac-fd;

+

+  import ietf-yang-types {

+    prefix yang;

+  }

+  import core-model-1-4 {

+    prefix core-model;

+  }

+

+  organization

+    "openBackhaul.com proposal to Open Networking Foundation (ONF)";

+  contact

+    "WG Web : https://github.com/openBackhaul/Overview

+     WG List: MacFd@openBackhaul.com

+     Editor : Thorsten Heinze

+     Email  : Thorsten.Heinze@openBackhaul.com";

+  description

+    "Technology specific amendment to the ForwardingDomain class for documenting potential forwarding (Ethernet Switch) according to IEEE 802.1 .

+

+     Copyright 2019 openBackhaul.com

+

+     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.";

+

+  revision 2020-08-26 {

+    description

+      "Model for the Transport SDN Pilot at Telefonica Germany.

+       Please view https://github.com/openBackhaul/macFd/issues for changes.";

+    reference

+      "https://github.com/openBackhaul/macFd/tree/tsp: Model definition

+       https://github.com/openBackhaul/onfCoreIm/tree/tsp: ONF TR-512 Core IM incl. Profile and enhanced Equipment definition";

+  }

+

+  identity LAYER_PROTOCOL_NAME_TYPE_MAC_LAYER {

+    base core-model:LAYER_PROTOCOL_NAME_TYPE;

+    description

+      "none";

+  }

+

+  augment "/core-model:control-construct/core-model:forwarding-domain" {

+    when "derived-from-or-self(./core-model:layer-protocol-name, 'vlan-fd:LAYER_PROTOCOL_NAME_TYPE_MAC_LAYER')";

+    uses mac-fd-spec;

+    description

+      "none";

+  }

+

+  /****************************************

+   * package notifications

+   **************************************/ 

+

+  notification object-creation-notification {

+    uses object-creation-notification;

+    description

+      "none";

+  }

+

+  grouping object-creation-notification {

+    leaf counter {

+      type int32;

+      default "-1";

+      config false;

+      description

+        "Counts object creation notifications.";

+    }

+    leaf timestamp {

+      type yang:date-and-time;

+      default "2010-11-20T14:00:00+01:00";

+      config false;

+      description

+        "none";

+    }

+    leaf object-id-ref {

+      type leafref {

+        path "/core-model:control-construct/core-model:forwarding-domain/core-model:uuid";

+        require-instance false;

+      }

+      config false;

+      description

+        "none";

+    }

+    leaf object-type {

+      type string;

+      default "Type of created object not specified.";

+      config false;

+      description

+        "none";

+    }

+    description

+      "none";

+  }

+

+  notification object-deletion-notification {

+    uses object-deletion-notification;

+    description

+      "none";

+  }

+

+  grouping object-deletion-notification {

+    leaf counter {

+      type int32;

+      default "-1";

+      config false;

+      description

+        "Counts object deletion notifications.";

+    }

+    leaf timestamp {

+      type yang:date-and-time;

+      default "2010-11-20T14:00:00+01:00";

+      config false;

+      description

+        "none";

+    }

+    leaf object-id-ref {

+      type leafref {

+        path "/core-model:control-construct/core-model:forwarding-domain/core-model:uuid";

+        require-instance false;

+      }

+      config false;

+      description

+        "none";

+    }

+    description

+      "none";

+  }

+

+  notification attribute-value-changed-notification {

+    uses attribute-value-changed-notification;

+    description

+      "none";

+  }

+

+  grouping attribute-value-changed-notification {

+    leaf counter {

+      type int32;

+      default "-1";

+      config false;

+      description

+        "Counts attribute value changed notifications.";

+    }

+    leaf timestamp {

+      type yang:date-and-time;

+      default "2010-11-20T14:00:00+01:00";

+      config false;

+      description

+        "none";

+    }

+    leaf object-id-ref {

+      type leafref {

+        path "/core-model:control-construct/core-model:forwarding-domain/core-model:uuid";

+        require-instance false;

+      }

+      config false;

+      description

+        "none";

+    }

+    leaf attribute-name {

+      type string;

+      default "Attribute name not specified.";

+      config false;

+      description

+        "Name of the attribute that has been changed.";

+    }

+    leaf new-value {

+      type string;

+      default "New value not specified.";

+      config false;

+      description

+        "Attribute value converted to a string (xml, json, ...)";

+    }

+    description

+      "To be sent when an attribute has changed and one or more controllers have to update their data.";

+  }

+

+  notification problem-notification {

+    uses problem-notification;

+    description

+      "none";

+  }

+

+  grouping problem-notification {

+    leaf counter {

+      type int32;

+      default "-1";

+      config false;

+      description

+        "Counts problem notifications";

+    }

+    leaf timestamp {

+      type yang:date-and-time;

+      default "2010-11-20T14:00:00+01:00";

+      config false;

+      description

+        "none";

+    }

+    leaf object-id-ref {

+      type leafref {

+        path "/core-model:control-construct/core-model:forwarding-domain/core-model:uuid";

+        require-instance false;

+      }

+      config false;

+      description

+        "none";

+    }

+    leaf problem {

+      type string;

+      default "Problem name not specified.";

+      config false;

+      description

+        "Name of the problem according to *Capability::supportedAlarmList";

+    }

+    leaf severity {

+      type severity-type;

+      default "SEVERITY_TYPE_WARNING";

+      config false;

+      description

+        "Severity of the problem according to *Configuration::problemSeverityList";

+    }

+    description

+      "none";

+  }

+

+  /****************************************

+   * grouping statements for object classes

+   **************************************/ 

+  /****************************************

+   * package super-classes

+   **************************************/ 

+

+  grouping current-problem {

+    leaf sequence-number {

+      type int16;

+      config false;

+      description

+        "Unique sequence number of the current problem object.";

+    }

+    leaf timestamp {

+      type yang:date-and-time;

+      default "2010-11-20T14:00:00+01:00";

+      config false;

+      description

+        "none";

+    }

+    leaf problem-severity {

+      type severity-type;

+      default "SEVERITY_TYPE_NOT_YET_DEFINED";

+      config false;

+      description

+        "Severity of the alarm.";

+    }

+    description

+      "none";

+  }

+

+  grouping mac-fd-spec {

+    container mac-fd-pac {

+      uses mac-fd-pac;

+      description

+        "none";

+    }

+    description

+      "The database that holds static and learned entries describing the MAC forwarding. Name in ieee802-dot1q-bridge.yang: filtering-database.";

+  }

+

+  grouping mac-fd-pac {

+    container mac-fd-capability {

+      config false;

+      uses mac-fd-capability;

+      description

+        "none";

+    }

+    container mac-fd-configuration {

+      uses mac-fd-configuration;

+      description

+        "none";

+    }

+    container mac-fd-status {

+      config false;

+      uses mac-fd-status;

+      description

+        "none";

+    }

+    container mac-fd-current-problems {

+      config false;

+      uses mac-fd-current-problems;

+      description

+        "none";

+    }

+    description

+      "none";

+  }

+

+  grouping mac-fd-capability {

+    leaf maximum-number-of-entries {

+      type int32;

+      default "-1";

+      config false;

+      description

+        "The maximum number of entries that can be held in the FDB. Name in ieee802-dot1q-bridge.yang: size.";

+    }

+    leaf admin-shut-down-is-avail {

+      type boolean;

+      default "false";

+      config false;

+      description

+        "true = Manual switching on and off of the forwarding domain without deleting it (underlying OSI network layers are also not affected) is available.";

+    }

+    leaf maintenance-timer-range {

+      type string;

+      default "Range of the maintenance timer not yet defined.";

+      config false;

+      description

+        "Available time periods for maintenance configurations to be described. Concrete values shall be separated by commas (e.g. '10, 60, 360'). Ranges shall be expressed as two values separated by a minus (e.g. '10-360').";

+    }

+    leaf-list supported-alarm-list {

+      type string;

+      default "Supported Alarms Not Yet Defined";

+      config false;

+      description

+        "Available alarms to be listed.";

+    }

+    description

+      "none";

+  }

+

+  grouping mac-fd-configuration {

+    leaf fd-name {

+      type string;

+      default "Forwarding Domain name not yet defined.";

+      description

+        "Name of the ForwardingDomain. Free text field to be filled by the operator.";

+    }

+    leaf fd-is-on {

+      type boolean;

+      default "false";

+      description

+        "Only effective if (adminShutDownIsAvail==true). true = Activation of the ForwardingDomain. false = De-activation of the ForwardingDomain without deleting it (underlying OSI network layers are not affected).";

+    }

+    leaf mac-address {

+      type string;

+      default "00:00:00:00:00:00";

+      description

+        "Configuration of the MAC address of a switch or virtual switch, which is defined by some VLAN.";

+    }

+    leaf aging-time {

+      type int32;

+      units "s";

+      default "-1";

+      description

+        "The timeout period (10..10,000,000) in seconds for aging out dynamically-learned forwarding information. Name in ieee802-dot1q-bridge.yang: aging-time.";

+    }

+    leaf maintenance-timer {

+      type int32;

+      units "s";

+      default "-1";

+      description

+        "Time of existence of any maintenance configuration. false = maintenance timer is switched off. Valid values are defined in *Capability::maintenanceTimerRange.";

+    }

+    list problem-kind-severity-list {

+      key "problem-kind-name";

+      uses problem-kind-severity-type;

+      description

+        "Severity of each entry of the SupportedAlarmList to be configured.";

+    }

+    description

+      "none";

+  }

+

+  grouping mac-fd-status {

+    leaf mac-address-cur {

+      type string;

+      default "00:00:00:00:00:00";

+      config false;

+      description

+        "MAC address assigned to a switch or virtual switch, which is defined by some VLAN.";

+    }

+    leaf number-of-static-entries-cur {

+      type int32;

+      default "-1";

+      config false;

+      description

+        "The number of Static Filtering entries currently in the FDB. Name in ieee802-dot1q-bridge.yang: static-entries.";

+    }

+    leaf number-of-dynamic-entries-cur {

+      type int32;

+      default "-1";

+      config false;

+      description

+        "The number of Dynamic Filtering entries currently in the FDB. Name in ieee802-dot1q-bridge.yang: dynamic-entries.";

+    }

+    leaf number-of-mac-registrations-cur {

+      type int32;

+      default "-1";

+      config false;

+      description

+        "The number of MAC Address Registration entries currently in the FDB. Name in ieee802-dot1q-bridge.yang: mac-address-registration-entries.";

+    }

+    leaf fd-status {

+      type fd-status-type;

+      default "FD_STATUS_TYPE_NOT_YET_DEFINED";

+      config false;

+      description

+        "Operational status of the forwarding domain.";

+    }

+    description

+      "none";

+  }

+

+  grouping mac-fd-current-problems {

+    list current-problem-list {

+      key "sequence-number";

+      config false;

+      uses mac-fd-current-problem-type;

+      description

+        "none";

+    }

+    description

+      "none";

+  }

+

+  /****************************************

+   * typedef statements

+   **************************************/ 

+  /*********************************************

+   * grouping statements for complex data types

+   *******************************************/ 

+

+  identity SEVERITY_TYPE {

+    description

+      "none";

+  }

+

+  identity SEVERITY_TYPE_NON_ALARMED {

+    base SEVERITY_TYPE;

+    description

+      "none";

+  }

+

+  identity SEVERITY_TYPE_WARNING {

+    base SEVERITY_TYPE;

+    description

+      "none";

+  }

+

+  identity SEVERITY_TYPE_MINOR {

+    base SEVERITY_TYPE;

+    description

+      "none";

+  }

+

+  identity SEVERITY_TYPE_MAJOR {

+    base SEVERITY_TYPE;

+    description

+      "none";

+  }

+

+  identity SEVERITY_TYPE_CRITICAL {

+    base SEVERITY_TYPE;

+    description

+      "none";

+  }

+

+  identity SEVERITY_TYPE_NOT_YET_DEFINED {

+    base SEVERITY_TYPE;

+    description

+      "none";

+  }

+

+  identity FD_STATUS_TYPE {

+    description

+      "none";

+  }

+

+  identity FD_STATUS_TYPE_UP {

+    base FD_STATUS_TYPE;

+    description

+      "Ready to pass packets.";

+  }

+

+  identity FD_STATUS_TYPE_DOWN {

+    base FD_STATUS_TYPE;

+    description

+      "The interface does not pass any packets.";

+  }

+

+  identity FD_STATUS_TYPE_TESTING {

+    base FD_STATUS_TYPE;

+    description

+      "In some test mode.  No operational packets can be passed.";

+  }

+

+  identity FD_STATUS_TYPE_UNKNOWN {

+    base FD_STATUS_TYPE;

+    description

+      "Status cannot be determined for some reason.";

+  }

+

+  identity FD_STATUS_TYPE_DORMANT {

+    base FD_STATUS_TYPE;

+    description

+      "Waiting for some external event.";

+  }

+

+  identity FD_STATUS_TYPE_NOT_PRESENT {

+    base FD_STATUS_TYPE;

+    description

+      "Some component (typically hardware) is missing.";

+  }

+

+  identity FD_STATUS_TYPE_LOWER_LAYER_DOWN {

+    base FD_STATUS_TYPE;

+    description

+      "Down due to state of lower-layer interface(s).";

+  }

+

+  identity FD_STATUS_TYPE_ADMIN_DOWN {

+    base FD_STATUS_TYPE;

+    description

+      "Down due to configuration.";

+  }

+

+  identity FD_STATUS_TYPE_NOT_YET_DEFINED {

+    base FD_STATUS_TYPE;

+    description

+      "none";

+  }

+

+  /****************************************

+   * package super-types

+   **************************************/ 

+

+  typedef severity-type {

+    type identityref {

+      base SEVERITY_TYPE;

+    }

+    description

+      "none";

+  }

+

+  typedef fd-status-type {

+    type identityref {

+      base FD_STATUS_TYPE;

+    }

+    description

+      "Current Status of the Forwarding Domain";

+  }

+

+  grouping problem-kind-severity-type {

+    leaf problem-kind-name {

+      type string;

+      description

+        "Name of the alarm according to SupportedAlarmList";

+    }

+    leaf problem-kind-severity {

+      type severity-type;

+      default "SEVERITY_TYPE_NOT_YET_DEFINED";

+      description

+        "Severity of this type of alarm.";

+    }

+    description

+      "none";

+  }

+

+  grouping mac-fd-current-problem-type {

+    leaf problem-name {

+      type string;

+      default "Problem name not specified.";

+      config false;

+      description

+        "Name of the alarm according to SupportedAlarmList";

+    }

+    uses current-problem;

+    description

+      "none";

+  }

+}

diff --git a/sdnr/wt/devicemanager-onf14/provider/src/main/yang/vlan-fc-1-0.yang b/sdnr/wt/devicemanager-onf14/provider/src/main/yang/vlan-fc-1-0.yang
new file mode 100644
index 000000000..5b6cf7b31
--- /dev/null
+++ b/sdnr/wt/devicemanager-onf14/provider/src/main/yang/vlan-fc-1-0.yang
@@ -0,0 +1,523 @@
+module vlan-fc-1-0 {

+  yang-version 1.1;

+  namespace "urn:onf:yang:vlan-fc-1-0";

+  prefix vlan-fc;

+

+  import ietf-yang-types {

+    prefix yang;

+  }

+  import core-model-1-4 {

+    prefix core-model;

+  }

+

+  organization

+    "openBackhaul.com proposal to Open Networking Foundation (ONF)";

+  contact

+    "WG Web : https://github.com/openBackhaul/Overview

+     WG List: VlanFc@openBackhaul.com

+     Editor : Thorsten Heinze

+     Email  : Thorsten.Heinze@openBackhaul.com";

+  description

+    "Technology specific Forwarding Construct for VLANs according to IEEE 802.1Q-2018.

+

+     Copyright 2019 openBackhaul.com

+

+     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.";

+

+  revision 2020-08-26 {

+    description

+      "Model for the Transport SDN Pilot at Telefonica Germany

+       Please view https://github.com/openBackhaul/vlanFc/issues for changes.";

+    reference

+      "https://github.com/openBackhaul/vlanFc/tree/tsp: Model definition

+       https://github.com/openBackhaul/onfCoreIm/tree/tsp: ONF TR-512 Core IM incl. Profile and enhanced Equipment definition";

+  }

+  revision 2019-08-19 {

+    description

+      "Model for the Transport SDN Pilot at Telefonica Germany.

+       Please view https://github.com/openBackhaul/vlanFd/issues for changes.";

+    reference

+      "https://github.com/openBackhaul/vlanFc/tree/tsp: Model definition

+       https://github.com/openBackhaul/onfCoreIm/tree/tsp: ONF TR-512 Core IM incl. Profile and enhanced Equipment definition";

+  }

+

+  identity LAYER_PROTOCOL_NAME_TYPE_VLAN_LAYER {

+    base core-model:LAYER_PROTOCOL_NAME_TYPE;

+    description

+      "none";

+  }

+

+  augment "/core-model:control-construct/core-model:forwarding-domain/core-model:fc" {

+    when "derived-from-or-self(./core-model:layer-protocol-name, 'vlan-fc:LAYER_PROTOCOL_NAME_TYPE_VLAN_LAYER')";

+    uses vlan-fc-spec;

+    description

+      "none";

+  }

+

+  /****************************************

+   * package notifications

+   **************************************/ 

+

+  notification object-creation-notification {

+    uses object-creation-notification;

+    description

+      "none";

+  }

+

+  grouping object-creation-notification {

+    leaf counter {

+      type int32;

+      default "-1";

+      config false;

+      description

+        "Counts object creation notifications.";

+    }

+    leaf timestamp {

+      type yang:date-and-time;

+      default "2010-11-20T14:00:00+01:00";

+      config false;

+      description

+        "none";

+    }

+    leaf object-id-ref {

+      type leafref {

+        path "/core-model:control-construct/core-model:forwarding-domain/core-model:fc/core-model:uuid";

+        require-instance false;

+      }

+      config false;

+      description

+        "none";

+    }

+    leaf object-type {

+      type string;

+      default "Type of created object not specified.";

+      config false;

+      description

+        "none";

+    }

+    description

+      "none";

+  }

+

+  notification object-deletion-notification {

+    uses object-deletion-notification;

+    description

+      "none";

+  }

+

+  grouping object-deletion-notification {

+    leaf counter {

+      type int32;

+      default "-1";

+      config false;

+      description

+        "Counts object deletion notifications.";

+    }

+    leaf timestamp {

+      type yang:date-and-time;

+      default "2010-11-20T14:00:00+01:00";

+      config false;

+      description

+        "none";

+    }

+    leaf object-id-ref {

+      type leafref {

+        path "/core-model:control-construct/core-model:forwarding-domain/core-model:fc/core-model:uuid";

+        require-instance false;

+      }

+      config false;

+      description

+        "none";

+    }

+    description

+      "none";

+  }

+

+  notification attribute-value-changed-notification {

+    uses attribute-value-changed-notification;

+    description

+      "none";

+  }

+

+  grouping attribute-value-changed-notification {

+    leaf counter {

+      type int32;

+      default "-1";

+      config false;

+      description

+        "Counts attribute value changed notifications.";

+    }

+    leaf timestamp {

+      type yang:date-and-time;

+      default "2010-11-20T14:00:00+01:00";

+      config false;

+      description

+        "none";

+    }

+    leaf object-id-ref {

+      type leafref {

+        path "/core-model:control-construct/core-model:forwarding-domain/core-model:fc/core-model:uuid";

+        require-instance false;

+      }

+      config false;

+      description

+        "none";

+    }

+    leaf attribute-name {

+      type string;

+      default "Attribute name not specified.";

+      config false;

+      description

+        "Name of the attribute that has been changed.";

+    }

+    leaf new-value {

+      type string;

+      default "New value not specified.";

+      config false;

+      description

+        "Attribute value converted to a string (xml, json, ...)";

+    }

+    description

+      "To be sent when an attribute has changed and one or more controllers have to update their data.";

+  }

+

+  notification problem-notification {

+    uses problem-notification;

+    description

+      "none";

+  }

+

+  grouping problem-notification {

+    leaf counter {

+      type int32;

+      default "-1";

+      config false;

+      description

+        "Counts problem notifications";

+    }

+    leaf timestamp {

+      type yang:date-and-time;

+      default "2010-11-20T14:00:00+01:00";

+      config false;

+      description

+        "none";

+    }

+    leaf object-id-ref {

+      type leafref {

+        path "/core-model:control-construct/core-model:forwarding-domain/core-model:fc/core-model:uuid";

+        require-instance false;

+      }

+      config false;

+      description

+        "none";

+    }

+    leaf problem {

+      type string;

+      default "Problem name not specified.";

+      config false;

+      description

+        "Name of the problem according to *Capability::supportedAlarmList";

+    }

+    leaf severity {

+      type severity-type;

+      default "SEVERITY_TYPE_WARNING";

+      config false;

+      description

+        "Severity of the problem according to VlanFc::VlanFcConfiguration::problemSeverityList";

+    }

+    description

+      "none";

+  }

+

+  /****************************************

+   * grouping statements for object classes

+   **************************************/ 

+  /****************************************

+   * package super-classes

+   **************************************/ 

+

+  grouping current-problem {

+    leaf sequence-number {

+      type int16;

+      config false;

+      description

+        "Unique sequence number of the current problem object.";

+    }

+    leaf timestamp {

+      type yang:date-and-time;

+      default "2010-11-20T14:00:00+01:00";

+      config false;

+      description

+        "none";

+    }

+    leaf problem-severity {

+      type severity-type;

+      default "SEVERITY_TYPE_NOT_YET_DEFINED";

+      config false;

+      description

+        "Severity of the alarm.";

+    }

+    description

+      "none";

+  }

+

+  grouping vlan-fc-spec {

+    container vlan-fc-pac {

+      uses vlan-fc-pac;

+      description

+        "none";

+    }

+    description

+      "Represents the VLAN, which is configured on the C-VLAN or S-VLAN Component. Name in ieee802-dot1q-bridge.yang: vlan.";

+  }

+

+  grouping vlan-fc-pac {

+    container vlan-fc-capability {

+      config false;

+      uses vlan-fc-capability;

+      description

+        "none";

+    }

+    container vlan-fc-configuration {

+      uses vlan-fc-configuration;

+      description

+        "none";

+    }

+    container vlan-fc-current-problems {

+      config false;

+      uses vlan-fc-current-problems;

+      description

+        "none";

+    }

+    description

+      "none";

+  }

+

+  grouping vlan-fc-capability {

+    leaf-list supported-sub-layer-protocol-name-list {

+      type sub-layer-protocol-name-type;

+      default "SUB_LAYER_PROTOCOL_NAME_TYPE_NOT_YET_DEFINED";

+      config false;

+      description

+        "Lists the supported kinds of Components (implicitly defines the Ethertypes of the VLAN headers, which can be forwarded).";

+    }

+    leaf admin-shut-down-is-avail {

+      type boolean;

+      default "false";

+      config false;

+      description

+        "true = Manual switching on and off of the forwarding construct without deleting it (underlying OSI network layers are also not affected) is available.";

+    }

+    leaf-list supported-alarm-list {

+      type string;

+      default "Supported Alarms not yet defined.";

+      config false;

+      description

+        "Available alarms to be listed.";

+    }

+    description

+      "none";

+  }

+

+  grouping vlan-fc-configuration {

+    leaf fc-name {

+      type string;

+      default "Interface name not yet defined.";

+      description

+        "Description of the VLAN, could be a name, could be a number. Free text of up to 32 letters to be filled by the operator. Name in ieee802-dot1q-bridge.yang: name.";

+    }

+    leaf fc-is-on {

+      type boolean;

+      default "false";

+      description

+        "Only effective if (adminShutDownIsAvail==true). true = Activation of the forwarding of frames with this VLAN ID. false = De-activation of the ForwardingConstruct without deleting it (underlying OSI network layers are not affected).";

+    }

+    leaf sub-layer-protocol-name {

+      type sub-layer-protocol-name-type;

+      default "SUB_LAYER_PROTOCOL_NAME_TYPE_NOT_YET_DEFINED";

+      description

+        "Type of VLAN (e.g. C-VLAN, S-VLAN), respectively Ethertype, which is forwarded.";

+    }

+    leaf vlan-id {

+      type int64;

+      default "-1";

+      description

+        "The VLAN ID, which identifies the frames to be forwarded. Range '1..4094 | 4096..4294967295'. Name in ieee802-dot1q-bridge.yang: vid.";

+    }

+    list problem-kind-severity-list {

+      key "problem-kind-name";

+      uses problem-kind-severity-type;

+      description

+        "Severity of the problem to be configured.";

+    }

+    description

+      "none";

+  }

+

+  grouping vlan-fc-current-problems {

+    list current-problem-list {

+      key "sequence-number";

+      config false;

+      uses vlan-fc-current-problem-type;

+      description

+        "none";

+    }

+    leaf number-of-current-problems {

+      type int8;

+      default "-1";

+      config false;

+      description

+        "Number of alarms, which are currently active on this interface.";

+    }

+    leaf time-of-latest-change {

+      type yang:date-and-time;

+      default "2010-11-20T14:00:00+01:00";

+      config false;

+      description

+        "Date and time when the list of alarms has been changed for the last time.";

+    }

+    description

+      "none";

+  }

+

+  /****************************************

+   * typedef statements

+   **************************************/ 

+

+  typedef sub-layer-protocol-name-type {

+    type identityref {

+      base SUB_LAYER_PROTOCOL_NAME_TYPE;

+    }

+    description

+      "Represents the type of Component. Name in ieee802-dot1q-bridge.yang: type-of-component.";

+  }

+

+  /*********************************************

+   * grouping statements for complex data types

+   *******************************************/ 

+

+  identity SUB_LAYER_PROTOCOL_NAME_TYPE {

+    description

+      "none";

+  }

+

+  identity SUB_LAYER_PROTOCOL_NAME_TYPE_C_VLAN_COMPONENT {

+    base SUB_LAYER_PROTOCOL_NAME_TYPE;

+    description

+      "Base identity for a C-VLAN component. Name in ieee802-dot1q-bridge.yang: c-vlan-component.";

+  }

+

+  identity SUB_LAYER_PROTOCOL_NAME_TYPE_S_VLAN_COMPONENT {

+    base SUB_LAYER_PROTOCOL_NAME_TYPE;

+    description

+      "Base identity for a S-VLAN component. Name in ieee802-dot1q-bridge.yang: s-vlan-component.";

+  }

+

+  identity SUB_LAYER_PROTOCOL_NAME_TYPE_D_BRIDGE_COMPONENT {

+    base SUB_LAYER_PROTOCOL_NAME_TYPE;

+    description

+      "Base identity for a VLAN unaware component. Name in ieee802-dot1q-bridge.yang: d-bridge-component.";

+  }

+

+  identity SUB_LAYER_PROTOCOL_NAME_TYPE_EDGE_RELAY_COMPONENT {

+    base SUB_LAYER_PROTOCOL_NAME_TYPE;

+    description

+      "Base identity for an EVB station ER component. Name in ieee802-dot1q-bridge.yang: edge-relay-component. ";

+  }

+

+  identity SUB_LAYER_PROTOCOL_NAME_TYPE_NOT_YET_DEFINED {

+    base SUB_LAYER_PROTOCOL_NAME_TYPE;

+    description

+      "none";

+  }

+

+  identity SEVERITY_TYPE {

+    description

+      "none";

+  }

+

+  identity SEVERITY_TYPE_NON_ALARMED {

+    base SEVERITY_TYPE;

+    description

+      "none";

+  }

+

+  identity SEVERITY_TYPE_WARNING {

+    base SEVERITY_TYPE;

+    description

+      "none";

+  }

+

+  identity SEVERITY_TYPE_MINOR {

+    base SEVERITY_TYPE;

+    description

+      "none";

+  }

+

+  identity SEVERITY_TYPE_MAJOR {

+    base SEVERITY_TYPE;

+    description

+      "none";

+  }

+

+  identity SEVERITY_TYPE_CRITICAL {

+    base SEVERITY_TYPE;

+    description

+      "none";

+  }

+

+  identity SEVERITY_TYPE_NOT_YET_DEFINED {

+    base SEVERITY_TYPE;

+    description

+      "none";

+  }

+

+  /****************************************

+   * package super-types

+   **************************************/ 

+

+  typedef severity-type {

+    type identityref {

+      base SEVERITY_TYPE;

+    }

+    description

+      "According to ITU-T M.3160";

+  }

+

+  grouping problem-kind-severity-type {

+    leaf problem-kind-name {

+      type string;

+      description

+        "Name of the alarm according to supportedAlarmList";

+    }

+    leaf problem-kind-severity {

+      type severity-type;

+      default "SEVERITY_TYPE_NOT_YET_DEFINED";

+      description

+        "Severity of this type of alarm.";

+    }

+    description

+      "none";

+  }

+

+  grouping vlan-fc-current-problem-type {

+    leaf problem-name {

+      type string;

+      default "Problem name not specified.";

+      config false;

+      description

+        "Name of the alarm according to VlanFc::VlanFcCapability::supportedAlarmList.";

+    }

+    uses current-problem;

+    description

+      "none";

+  }

+}

diff --git a/sdnr/wt/devicemanager-onf14/provider/src/main/yang/vlan-fd-1-0.yang b/sdnr/wt/devicemanager-onf14/provider/src/main/yang/vlan-fd-1-0.yang
new file mode 100644
index 000000000..b3d67eef9
--- /dev/null
+++ b/sdnr/wt/devicemanager-onf14/provider/src/main/yang/vlan-fd-1-0.yang
@@ -0,0 +1,836 @@
+module vlan-fd-1-0 {

+  yang-version 1.1;

+  namespace "urn:onf:yang:vlan-fd-1-0";

+  prefix vlan-fd;

+

+  import ietf-yang-types {

+    prefix yang;

+  }

+  import core-model-1-4 {

+    prefix core-model;

+  }

+  import vlan-interface-1-0 {

+    prefix vlan-interface;

+  }

+

+  organization

+    "openBackhaul.com proposal to Open Networking Foundation (ONF)";

+  contact

+    "WG Web : https://github.com/openBackhaul/Overview

+     WG List: VlanFd@openBackhaul.com

+     Editor : Thorsten Heinze

+     Email  : Thorsten.Heinze@openBackhaul.com";

+  description

+    "Technology specific Forwarding Domain for VLAN Components according to IEEE 802.1Q-2018.

+

+     Copyright 2019 openBackhaul.com

+

+     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.";

+

+  revision 2020-08-26 {

+    description

+      "Model for the Transport SDN Pilot at Telefonica Germany.

+       Please view https://github.com/openBackhaul/vlanFd/issues for changes.";

+    reference

+      "https://github.com/openBackhaul/vlanFd/tree/tsp: Model definition

+       https://github.com/openBackhaul/onfCoreIm/tree/tsp: ONF TR-512 Core IM incl. Profile and enhanced Equipment definition";

+  }

+  revision 2019-08-19 {

+    description

+      "Model for the Transport SDN Pilot at Telefonica Germany.

+       Please view https://github.com/openBackhaul/vlanFd/issues for changes.";

+    reference

+      "https://github.com/openBackhaul/vlanFd/tree/tsp: Model definition

+       https://github.com/openBackhaul/onfCoreIm/tree/tsp: ONF TR-512 Core IM incl. Profile and enhanced Equipment definition";

+  }

+

+  identity LAYER_PROTOCOL_NAME_TYPE_VLAN_LAYER {

+    base core-model:LAYER_PROTOCOL_NAME_TYPE;

+    description

+      "none";

+  }

+

+  augment "/core-model:control-construct/core-model:forwarding-domain" {

+    when "derived-from-or-self(./core-model:layer-protocol-name, 'vlan-interface:LAYER_PROTOCOL_NAME_TYPE_VLAN_LAYER')";

+    uses vlan-fd-spec;

+    description

+      "none";

+  }

+

+  /****************************************

+   * package notifications

+   **************************************/ 

+

+  notification object-creation-notification {

+    uses object-creation-notification;

+    description

+      "none";

+  }

+

+  grouping object-creation-notification {

+    leaf counter {

+      type int32;

+      default "-1";

+      config false;

+      description

+        "Counts object creation notifications.";

+    }

+    leaf timestamp {

+      type yang:date-and-time;

+      default "2010-11-20T14:00:00+01:00";

+      config false;

+      description

+        "none";

+    }

+    leaf object-id-ref {

+      type leafref {

+        path "/core-model:control-construct/core-model:forwarding-domain/core-model:uuid";

+        require-instance false;

+      }

+      config false;

+      description

+        "none";

+    }

+    leaf object-type {

+      type string;

+      default "Type of created object not specified.";

+      config false;

+      description

+        "none";

+    }

+    description

+      "none";

+  }

+

+  notification object-deletion-notification {

+    uses object-deletion-notification;

+    description

+      "none";

+  }

+

+  grouping object-deletion-notification {

+    leaf counter {

+      type int32;

+      default "-1";

+      config false;

+      description

+        "Counts object deletion notifications.";

+    }

+    leaf timestamp {

+      type yang:date-and-time;

+      default "2010-11-20T14:00:00+01:00";

+      config false;

+      description

+        "none";

+    }

+    leaf object-id-ref {

+      type leafref {

+        path "/core-model:control-construct/core-model:forwarding-domain/core-model:uuid";

+        require-instance false;

+      }

+      config false;

+      description

+        "none";

+    }

+    description

+      "none";

+  }

+

+  notification attribute-value-changed-notification {

+    uses attribute-value-changed-notification;

+    description

+      "none";

+  }

+

+  grouping attribute-value-changed-notification {

+    leaf counter {

+      type int32;

+      default "-1";

+      config false;

+      description

+        "Counts attribute value changed notifications.";

+    }

+    leaf timestamp {

+      type yang:date-and-time;

+      default "2010-11-20T14:00:00+01:00";

+      config false;

+      description

+        "none";

+    }

+    leaf object-id-ref {

+      type leafref {

+        path "/core-model:control-construct/core-model:forwarding-domain/core-model:uuid";

+        require-instance false;

+      }

+      config false;

+      description

+        "none";

+    }

+    leaf attribute-name {

+      type string;

+      default "Attribute name not specified.";

+      config false;

+      description

+        "Name of the attribute that has been changed.";

+    }

+    leaf new-value {

+      type string;

+      default "New value not specified.";

+      config false;

+      description

+        "Attribute value converted to a string (xml, json, ...)";

+    }

+    description

+      "To be sent when an attribute has changed and one or more controllers have to update their data.";

+  }

+

+  notification problem-notification {

+    uses problem-notification;

+    description

+      "none";

+  }

+

+  grouping problem-notification {

+    leaf counter {

+      type int32;

+      default "-1";

+      config false;

+      description

+        "Counts problem notifications";

+    }

+    leaf timestamp {

+      type yang:date-and-time;

+      default "2010-11-20T14:00:00+01:00";

+      config false;

+      description

+        "none";

+    }

+    leaf object-id-ref {

+      type leafref {

+        path "/core-model:control-construct/core-model:forwarding-domain/core-model:uuid";

+        require-instance false;

+      }

+      config false;

+      description

+        "none";

+    }

+    leaf problem {

+      type string;

+      default "Problem name not specified.";

+      config false;

+      description

+        "Name of the problem according to *Capability::supportedAlarmList";

+    }

+    leaf severity {

+      type severity-type;

+      default "SEVERITY_TYPE_WARNING";

+      config false;

+      description

+        "Severity of the problem according to *Configuration::problemSeverityList";

+    }

+    description

+      "none";

+  }

+

+  /****************************************

+   * grouping statements for object classes

+   **************************************/ 

+  /****************************************

+   * package super-classes

+   **************************************/ 

+

+  grouping current-problem {

+    leaf sequence-number {

+      type int16;

+      config false;

+      description

+        "Unique sequence number of the current problem object.";

+    }

+    leaf timestamp {

+      type yang:date-and-time;

+      default "2010-11-20T14:00:00+01:00";

+      config false;

+      description

+        "none";

+    }

+    leaf problem-severity {

+      type severity-type;

+      default "SEVERITY_TYPE_NOT_YET_DEFINED";

+      config false;

+      description

+        "Severity of the alarm.";

+    }

+    description

+      "none";

+  }

+

+  grouping vlan-fd-spec {

+    container vlan-fd-pac {

+      uses vlan-fd-pac;

+      description

+        "none";

+    }

+    description

+      "The set of components associated with a given Bridge. For example, - A TPMR is associated with a single VLAN unaware component. - A Customer VLAN Bridge is associated with a single VLAN aware component. - A Provider Bridge is associated with a single S-VLAN component and zero or more C-VLAN components. Name in ieee802-dot1q-bridge.yang: component.";

+  }

+

+  grouping vlan-fd-pac {

+    container vlan-fd-capability {

+      config false;

+      uses vlan-fd-capability;

+      description

+        "none";

+    }

+    container vlan-fd-configuration {

+      uses vlan-fd-configuration;

+      description

+        "none";

+    }

+    container vlan-fd-status {

+      config false;

+      uses vlan-fd-status;

+      description

+        "none";

+    }

+    container vlan-fd-current-problems {

+      config false;

+      uses vlan-fd-current-problems;

+      description

+        "none";

+    }

+    description

+      "none";

+  }

+

+  grouping vlan-fd-capability {

+    leaf-list supported-sub-layer-protocol-name-list {

+      type sub-layer-protocol-name-type;

+      default "SUB_LAYER_PROTOCOL_NAME_TYPE_NOT_YET_DEFINED";

+      config false;

+      description

+        "Lists the supported kinds of Components. ";

+    }

+    leaf component-id {

+      type int32;

+      config false;

+      description

+        "Unique identifier for a particular Bridge component within the system. Name in ieee802-dot1q-bridge.yang: id.";

+    }

+    leaf extended-filtering-is-avail {

+      type boolean;

+      default "false";

+      config false;

+      description

+        "true = Component can perform filtering on individual multicast addresses controlled by MMRP (Multiple MAC Registration Protocol). Name in ieee802-dot1q-bridge.yang: extended-filtering.";

+    }

+    leaf traffic-classes-is-avail {

+      type boolean;

+      default "false";

+      config false;

+      description

+        "true = Component can map the Priority values into multiple traffic classes (there is more than one traffic class at the device). Name in ieee802-dot1q-bridge.yang: traffic-classes.";

+    }

+    leaf static-entries-on-individual-ports-is-avail {

+      type boolean;

+      default "false";

+      config false;

+      description

+        "true = Static entries per port are available. Name in ieee802-dot1q-bridge.yang: static-entry-individual-port.";

+    }

+    leaf independent-vlan-learning-is-avail {

+      type boolean;

+      default "false";

+      config false;

+      description

+        "true = Component supports Independent VLAN Learning (IVL). Name in ieee802-dot1q-bridge.yang: ivl-capable.";

+    }

+    leaf shared-vlan-learning-is-avail {

+      type boolean;

+      default "false";

+      config false;

+      description

+        "true = Component supports Shared VLAN Learning (SVL). Name in ieee802-dot1q-bridge.yang: svl-capable.";

+    }

+    leaf hybrid-vlan-learning-is-avail {

+      type boolean;

+      default "false";

+      config false;

+      description

+        "true = Component supports both Independent and Shared VLAN Learning simultaneously. Name in ieee802-dot1q-bridge.yang: hybrid-capable.";

+    }

+    leaf configurable-port-vlan-id-tagging-is-avail {

+      type boolean;

+      default "false";

+      config false;

+      description

+        "true = Component supports setting the egress status (VLAN-tagged or Untagged) on each port. Name in ieee802-dot1q-bridge.yang: configurable-pvid-tagging.";

+    }

+    leaf multiple-local-bridges-is-avail {

+      type boolean;

+      default "false";

+      config false;

+      description

+        "true = Can support multiple local Bridges, outside the scope of 802.1Q defined VLANs. Name in ieee802-dot1q-bridge.yang: local-vlan-capable.";

+    }

+    leaf supported-version {

+      type int16;

+      default "-1";

+      config false;

+      description

+        "The version number supported. Name in ieee802-dot1q-bridge.yang: version.";

+    }

+    leaf maximum-number-of-vlan-ids {

+      type int16;

+      default "-1";

+      config false;

+      description

+        "The maximum number of VLAN IDs supported. Name in ieee802-dot1q-bridge.yang: max-vids.";

+    }

+    leaf overriding-default-port-vlan-id-is-avail {

+      type boolean;

+      default "false";

+      config false;

+      description

+        "true = Component supports overridding the default PVID on each port. Name in ieee802-dot1q-bridge.yang: override-default-pvid.";

+    }

+    leaf protocol-frame-format {

+      type protocol-frame-format-type;

+      config false;

+      description

+        "Only effective if (portAndProtocolBasedVlanIsAvail==true). The data-link encapsulation format or the detagged_frame_type in a Protocol Template. Name in ieee802-dot1q-bridge.yang: protocol-template.";

+    }

+    leaf maximum-number-of-msti {

+      type int16;

+      default "-1";

+      config false;

+      description

+        "Maximum number of Multiple Spanning Tree Instances (MSTIs) supported within an MST region (i.e., the number of spanning tree instances that can be supported in addition to the CIST), for MST Bridges. For SST Bridges, this parameter may be either omitted or reported as 0.  Name in ieee802-dot1q-bridge.yang: max-msti.";

+    }

+    leaf admin-shut-down-is-avail {

+      type boolean;

+      default "false";

+      config false;

+      description

+        "true = Manual switching on and off of the forwarding domain without deleting it (underlying OSI network layers are also not affected) is available.";

+    }

+    leaf maintenance-timer-range {

+      type string;

+      default "Range of the maintenance timer not yet defined.";

+      config false;

+      description

+        "Available time periods for maintenance configurations to be described. Concrete values shall be separated by commas (e.g. '10, 60, 360'). Ranges shall be expressed as two values separated by a minus (e.g. '10-360').";

+    }

+    leaf-list supported-alarm-list {

+      type string;

+      default "Supported Alarms Not Yet Defined";

+      config false;

+      description

+        "Available alarms to be listed.";

+    }

+    description

+      "none";

+  }

+

+  grouping vlan-fd-configuration {

+    leaf fd-name {

+      type string;

+      default "Forwarding Domain name not yet defined.";

+      description

+        "The name of the Component. Free text field to be filled by the operator. Name in ieee802-dot1q-bridge.yang: name.";

+    }

+    leaf fd-is-on {

+      type boolean;

+      default "false";

+      description

+        "Only effective if (adminShutDownIsAvail==true). true = Activation of the Component. false = De-activation of the forwarding domain without deleting it (underlying OSI network layers are not affected).";

+    }

+    leaf sub-layer-protocol-name {

+      type sub-layer-protocol-name-type;

+      default "SUB_LAYER_PROTOCOL_NAME_TYPE_NOT_YET_DEFINED";

+      description

+        "The type of Component used to classify a particular Bridge component within a Bridge system comprising multiple components. Name in ieee802-dot1q-bridge.yang: type.\n";

+    }

+    leaf mac-address {

+      type string;

+      default "00:00:00:00:00:00";

+      description

+        "Unique EUI-48 Universally Administered MAC address configured on a Bridge Component. Name in ieee802-dot1q-bridge.yang: address.";

+    }

+    leaf traffic-classes-is-on {

+      type boolean;

+      default "false";

+      description

+        "Only effective if (trafficClassesIsAvail==true). true = Traffic Classes are enabled on this Bridge Component. false = Bridge Component operates with a single priority level for all traffic. Name in ieee802-dot1q-bridge.yang: traffic-class-enabled.";

+    }

+    list protocol-group-list {

+      key "db-index";

+      uses protocol-group-type;

+      description

+        "Only effective if (portAndProtocolBasedVlanIsAvail==true). List of the protocol group database entries. Name in ieee802-dot1q-bridge.yang: protocol-group-database.";

+    }

+    leaf maintenance-timer {

+      type int32;

+      units "s";

+      default "-1";

+      description

+        "Time of existence of any maintenance configuration. 0 = maintenance timer is switched off. Valid values are defined in *Capability::maintenanceTimerRange.";

+    }

+    list problem-kind-severity-list {

+      key "problem-kind-name";

+      uses problem-kind-severity-type;

+      description

+        "Severity of each entry of the SupportedAlarmList to be configured.";

+    }

+    description

+      "none";

+  }

+

+  grouping vlan-fd-status {

+    leaf mac-address-cur {

+      type string;

+      default "00:00:00:00:00:00";

+      config false;

+      description

+        "Unique EUI-48 Universally Administered MAC address assigned to a Bridge Component. Name in ieee802-dot1q-bridge.yang: address.";

+    }

+    leaf number-of-ports-cur {

+      type int16;

+      default "-1";

+      config false;

+      description

+        "Number of Bridge Ports associated with the Bridge Component. Values between 1 and 4095. Name in ieee802-dot1q-bridge.yang: ports.";

+    }

+    leaf number-of-static-vlan-registrations-cur {

+      type int32;

+      default "-1";

+      config false;

+      description

+        "The number of Static VLAN Registration entries currently in the FDB. Name in ieee802-dot1q-bridge.yang: static-vlan-registration-entries.";

+    }

+    leaf number-of-dynamic-vlan-registrations-cur {

+      type int32;

+      default "-1";

+      config false;

+      description

+        "The number of Dynamic VLAN Registration entries currently in the FDB. Name in ieee802-dot1q-bridge.yang: static-vlan-registration-entries.";

+    }

+    leaf fd-status {

+      type fd-status-type;

+      default "FD_STATUS_TYPE_NOT_YET_DEFINED";

+      config false;

+      description

+        "Operational status of the forwarding domain.";

+    }

+    description

+      "none";

+  }

+

+  grouping vlan-fd-current-problems {

+    list current-problem-list {

+      key "sequence-number";

+      config false;

+      uses vlan-fd-current-problem-type;

+      description

+        "none";

+    }

+    description

+      "none";

+  }

+

+  /****************************************

+   * typedef statements

+   **************************************/ 

+

+  typedef sub-layer-protocol-name-type {

+    type identityref {

+      base SUB_LAYER_PROTOCOL_NAME_TYPE;

+    }

+    description

+      "Represents the type of Component. Name in ieee802-dot1q-bridge.yang: type-of-component.";

+  }

+

+  typedef protocol-frame-format-type {

+    type identityref {

+      base PROTOCOL_FRAME_FORMAT_TYPE;

+    }

+    description

+      "A value representing the frame format to be matched. Name in ieee802-dot1q-bridge.yang: protocol-frame-format-type.";

+  }

+

+  /*********************************************

+   * grouping statements for complex data types

+   *******************************************/ 

+

+  identity SUB_LAYER_PROTOCOL_NAME_TYPE {

+    description

+      "none";

+  }

+

+  identity SUB_LAYER_PROTOCOL_NAME_TYPE_C_VLAN_COMPONENT {

+    base SUB_LAYER_PROTOCOL_NAME_TYPE;

+    description

+      "c-vlan-component. Base identity for a C-VLAN component. Name in ieee802-dot1q-bridge.yang: c-vlan-component.";

+  }

+

+  identity SUB_LAYER_PROTOCOL_NAME_TYPE_S_VLAN_COMPONENT {

+    base SUB_LAYER_PROTOCOL_NAME_TYPE;

+    description

+      "s-vlan-component. Base identity for a S-VLAN component. Name in ieee802-dot1q-bridge.yang: s-vlan-component.";

+  }

+

+  identity SUB_LAYER_PROTOCOL_NAME_TYPE_D_BRIDGE_COMPONENT {

+    base SUB_LAYER_PROTOCOL_NAME_TYPE;

+    description

+      "d-bridge-component. Base identity for a VLAN unaware component. Name in ieee802-dot1q-bridge.yang: d-bridge-component.";

+  }

+

+  identity SUB_LAYER_PROTOCOL_NAME_TYPE_EDGE_RELAY_COMPONENT {

+    base SUB_LAYER_PROTOCOL_NAME_TYPE;

+    description

+      "edge-relay-component. Base identity for an EVB station ER component. Name in ieee802-dot1q-bridge.yang: edge-relay-component. ";

+  }

+

+  identity SUB_LAYER_PROTOCOL_NAME_TYPE_NOT_YET_DEFINED {

+    base SUB_LAYER_PROTOCOL_NAME_TYPE;

+    description

+      "none";

+  }

+

+  identity PROTOCOL_FRAME_FORMAT_TYPE {

+    description

+      "none";

+  }

+

+  identity PROTOCOL_FRAME_FORMAT_TYPE_ETHERNET {

+    base PROTOCOL_FRAME_FORMAT_TYPE;

+    description

+      "Ethernet frame format. Name in ieee802-dot1q-bridge.yang: Ethernet.";

+  }

+

+  identity PROTOCOL_FRAME_FORMAT_TYPE_RFC1042 {

+    base PROTOCOL_FRAME_FORMAT_TYPE;

+    description

+      "RFC 1042 frame format. Name in ieee802-dot1q-bridge.yang: rfc1042.";

+  }

+

+  identity PROTOCOL_FRAME_FORMAT_TYPE_SNAP8021H_ {

+    base PROTOCOL_FRAME_FORMAT_TYPE;

+    description

+      "SNAP 802.1H frame format. Name in ieee802-dot1q-bridge.yang: snap8021H.";

+  }

+

+  identity PROTOCOL_FRAME_FORMAT_TYPE_SNAP_OTHER {

+    base PROTOCOL_FRAME_FORMAT_TYPE;

+    description

+      "Other SNAP frame format. Name in ieee802-dot1q-bridge.yang: snapOther.";

+  }

+

+  identity PROTOCOL_FRAME_FORMAT_TYPE_LLC_OTHER {

+    base PROTOCOL_FRAME_FORMAT_TYPE;

+    description

+      "Other LLC frame format. Name in ieee802-dot1q-bridge.yang: llcOther.";

+  }

+

+  identity PROTOCOL_FRAME_FORMAT_TYPE_NOT_YET_DEFINED {

+    base PROTOCOL_FRAME_FORMAT_TYPE;

+    description

+      "none";

+  }

+

+  identity SEVERITY_TYPE {

+    description

+      "none";

+  }

+

+  identity SEVERITY_TYPE_NON_ALARMED {

+    base SEVERITY_TYPE;

+    description

+      "none";

+  }

+

+  identity SEVERITY_TYPE_WARNING {

+    base SEVERITY_TYPE;

+    description

+      "none";

+  }

+

+  identity SEVERITY_TYPE_MINOR {

+    base SEVERITY_TYPE;

+    description

+      "none";

+  }

+

+  identity SEVERITY_TYPE_MAJOR {

+    base SEVERITY_TYPE;

+    description

+      "none";

+  }

+

+  identity SEVERITY_TYPE_CRITICAL {

+    base SEVERITY_TYPE;

+    description

+      "none";

+  }

+

+  identity SEVERITY_TYPE_NOT_YET_DEFINED {

+    base SEVERITY_TYPE;

+    description

+      "none";

+  }

+

+  identity FD_STATUS_TYPE {

+    description

+      "none";

+  }

+

+  identity FD_STATUS_TYPE_UP {

+    base FD_STATUS_TYPE;

+    description

+      "Ready to pass packets.";

+  }

+

+  identity FD_STATUS_TYPE_DOWN {

+    base FD_STATUS_TYPE;

+    description

+      "The interface does not pass any packets.";

+  }

+

+  identity FD_STATUS_TYPE_TESTING {

+    base FD_STATUS_TYPE;

+    description

+      "In some test mode.  No operational packets can be passed.";

+  }

+

+  identity FD_STATUS_TYPE_UNKNOWN {

+    base FD_STATUS_TYPE;

+    description

+      "Status cannot be determined for some reason.";

+  }

+

+  identity FD_STATUS_TYPE_DORMANT {

+    base FD_STATUS_TYPE;

+    description

+      "Waiting for some external event.";

+  }

+

+  identity FD_STATUS_TYPE_NOT_PRESENT {

+    base FD_STATUS_TYPE;

+    description

+      "Some component (typically hardware) is missing.";

+  }

+

+  identity FD_STATUS_TYPE_LOWER_LAYER_DOWN {

+    base FD_STATUS_TYPE;

+    description

+      "Down due to state of lower-layer interface(s).";

+  }

+

+  identity FD_STATUS_TYPE_ADMIN_DOWN {

+    base FD_STATUS_TYPE;

+    description

+      "Down due to configuration.";

+  }

+

+  identity FD_STATUS_TYPE_NOT_YET_DEFINED {

+    base FD_STATUS_TYPE;

+    description

+      "none";

+  }

+

+  /****************************************

+   * package super-types

+   **************************************/ 

+

+  typedef severity-type {

+    type identityref {

+      base SEVERITY_TYPE;

+    }

+    description

+      "none";

+  }

+

+  typedef fd-status-type {

+    type identityref {

+      base FD_STATUS_TYPE;

+    }

+    description

+      "Current Status of the Forwarding Domain";

+  }

+

+  grouping problem-kind-severity-type {

+    leaf problem-kind-name {

+      type string;

+      description

+        "Name of the alarm according to SupportedAlarmList";

+    }

+    leaf problem-kind-severity {

+      type severity-type;

+      default "SEVERITY_TYPE_NOT_YET_DEFINED";

+      description

+        "Severity of this type of alarm.";

+    }

+    description

+      "none";

+  }

+

+  grouping protocol-group-type {

+    leaf db-index {

+      type uint16;

+      description

+        "The protocol group database index. Name in ieee802-dot1q-bridge.yang: db-index.";

+    }

+    leaf protocol-group-id {

+      type int32;

+      default "-1";

+      description

+        "Designates a group of protocols in the Protocol Group Database. Name in ieee802-dot1q-bridge.yang: group-id.";

+    }

+    leaf protocol-frame-format {

+      type protocol-frame-format-type;

+      default "PROTOCOL_FRAME_FORMAT_TYPE_NOT_YET_DEFINED";

+      description

+        "The data-link encapsulation format or the detagged_frame_type in a Protocol Template. Name in ieee802-dot1q-bridge.yang: frame-format-type.";

+    }

+    leaf ethertype {

+      type string;

+      default "Ethertype not yet defined.";

+      description

+        "ethertype. Only relevant if (protocolFrameFormat==ETHERNET) OR (protocolFrameFormat==RFC1042) OR (protocolFrameFormat==SNAP8021H). Format containing the 16-bit IEEE 802 EtherType field. The EtherType value represented in the canonical order defined by IEEE 802. The canonical representation is using uppercase characters. Pattern '[0-9a-fA-F]{2}-[0-9a-fA-F]{2}'. Name in ieee802-dot1q-bridge.yang: ethertype.";

+    }

+    leaf protocol-id {

+      type string;

+      default "Protocol ID not yet defined.";

+      description

+        "Only effective if (protocolFrameFormat==SNAP_OTHER). Format containing the 40-bit protocol identifier (PID). The canonical representation is using uppercase characters. Pattern '[0-9a-fA-F]{2}(-[0-9a-fA-F]{2}){4}'. Name in ieee802-dot1q-bridge.yang: protocol-id.";

+    }

+    leaf-list llc-address {

+      type string;

+      default "LLC Address not yet defined.";

+      description

+        "Only effective if (protocolFrameFormat==LLC_OTHER). A pair of ISO/IEC 8802-2 DSAP and SSAP address field values, for matching frame formats of LLC_Other. The canonical representation is using uppercase characters. Pattern '[0-9a-fA-F]{2}-[0-9a-fA-F]{2}'. Name in ieee802-dot1q-bridge.yang: llc-address.";

+    }

+    description

+      "none";

+  }

+

+  grouping vlan-fd-current-problem-type {

+    leaf problem-name {

+      type string;

+      default "Problem name not specified.";

+      config false;

+      description

+        "Name of the alarm according to SupportedAlarmList";

+    }

+    uses current-problem;

+    description

+      "none";

+  }

+}

diff --git a/sdnr/wt/devicemanager-onf14/provider/src/test/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/onf14/TestOnf14AirInterfaceNotificationListener.java b/sdnr/wt/devicemanager-onf14/provider/src/test/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/onf14/TestOnf14AirInterfaceNotificationListener.java
index 0cfd5ae01..7dbbc22b3 100644
--- a/sdnr/wt/devicemanager-onf14/provider/src/test/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/onf14/TestOnf14AirInterfaceNotificationListener.java
+++ b/sdnr/wt/devicemanager-onf14/provider/src/test/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/onf14/TestOnf14AirInterfaceNotificationListener.java
@@ -22,10 +22,12 @@ import org.junit.Test;
 import org.mockito.Mockito;
 import org.mockito.invocation.InvocationOnMock;
 import org.mockito.stubbing.Answer;
+import org.onap.ccsdk.features.sdnr.wt.dataprovider.model.DataProvider;
 import org.onap.ccsdk.features.sdnr.wt.devicemanager.onf14.impl.Onf14AirInterfaceNotificationListener;
 import org.onap.ccsdk.features.sdnr.wt.devicemanager.onf14.test.mock.NetconfAccessorMock;
 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.netconfnodestateservice.NetconfAccessor;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.yang.types.rev130715.DateAndTime;
 import org.opendaylight.yang.gen.v1.urn.onf.yang.air._interface._2._0.rev200121.AttributeValueChangedNotification;
@@ -46,6 +48,8 @@ public class TestOnf14AirInterfaceNotificationListener extends Mockito {
     private NodeId nodeId;
     private DeviceManagerServiceProvider serviceProvider;
     private FaultService faultService;
+    private DataProvider databaseService;
+    private NotificationService notificationService;
 
     private ObjectDeletionNotification deletionNotif;
     private ObjectCreationNotification creationNotif;
@@ -58,6 +62,8 @@ public class TestOnf14AirInterfaceNotificationListener extends Mockito {
         nodeId = mock(NodeId.class);
         serviceProvider = mock(DeviceManagerServiceProvider.class);
         faultService = mock(FaultService.class);
+        databaseService = mock(DataProvider.class);
+        notificationService = mock(NotificationService.class);
 
         problemNotif = mock(ProblemNotification.class);
         deletionNotif = mock(ObjectDeletionNotification.class);
@@ -70,7 +76,24 @@ public class TestOnf14AirInterfaceNotificationListener extends Mockito {
         when(problemNotif.getObjectIdRef()).thenReturn(new UniversalId("12345678-0123-0abc-abcd-0123456789AB"));
         when(problemNotif.getProblem()).thenReturn("modulationIsDownShifted");
 
+        when(attrValChangedNotif.getAttributeName()).thenReturn("12345678-0123-2345-abcd-0123456789AB");
+        when(attrValChangedNotif.getCounter()).thenReturn(20);
+        when(attrValChangedNotif.getNewValue()).thenReturn("new-value");
+        when(attrValChangedNotif.getObjectIdRef()).thenReturn(new UniversalId("12345678-0123-1234-abcd-0123456789AB"));
+        when(attrValChangedNotif.getTimestamp()).thenReturn(new DateAndTime("2020-02-05T12:30:45.283Z"));
+
+        when(creationNotif.getObjectType()).thenReturn("air-interface-name");
+        when(creationNotif.getCounter()).thenReturn(20);
+        when(creationNotif.getObjectIdRef()).thenReturn(new UniversalId("12345678-0123-1234-abcd-0123456789AB"));
+        when(creationNotif.getTimestamp()).thenReturn(new DateAndTime("2020-02-05T12:30:45.283Z"));
+
+        when(deletionNotif.getCounter()).thenReturn(20);
+        when(deletionNotif.getObjectIdRef()).thenReturn(new UniversalId("12345678-0123-1234-abcd-0123456789AB"));
+        when(deletionNotif.getTimestamp()).thenReturn(new DateAndTime("2020-02-05T12:30:45.283Z"));
+
         when(serviceProvider.getFaultService()).thenReturn(faultService);
+        when(serviceProvider.getDataProvider()).thenReturn(databaseService);
+        when(serviceProvider.getNotificationService()).thenReturn(notificationService);
     }
 
     @Test
diff --git a/sdnr/wt/devicemanager-onf14/provider/src/test/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/onf14/TestOnf14EthernetContainerNotificationListener.java b/sdnr/wt/devicemanager-onf14/provider/src/test/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/onf14/TestOnf14EthernetContainerNotificationListener.java
new file mode 100644
index 000000000..dedcf79c8
--- /dev/null
+++ b/sdnr/wt/devicemanager-onf14/provider/src/test/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/onf14/TestOnf14EthernetContainerNotificationListener.java
@@ -0,0 +1,194 @@
+/*
+ * ============LICENSE_START========================================================================
+ * ONAP : ccsdk feature sdnr wt
+ * =================================================================================================
+ * 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.onf14;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.mockito.Mockito;
+import org.mockito.invocation.InvocationOnMock;
+import org.mockito.stubbing.Answer;
+import org.onap.ccsdk.features.sdnr.wt.dataprovider.model.DataProvider;
+import org.onap.ccsdk.features.sdnr.wt.devicemanager.onf14.impl.Onf14EthernetContainerNotificationListener;
+import org.onap.ccsdk.features.sdnr.wt.devicemanager.onf14.test.mock.NetconfAccessorMock;
+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.netconfnodestateservice.NetconfAccessor;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.yang.types.rev130715.DateAndTime;
+import org.opendaylight.yang.gen.v1.urn.onf.yang.core.model._1._4.rev191127.UniversalId;
+import org.opendaylight.yang.gen.v1.urn.onf.yang.ethernet.container._2._0.rev200121.AttributeValueChangedNotification;
+import org.opendaylight.yang.gen.v1.urn.onf.yang.ethernet.container._2._0.rev200121.ObjectCreationNotification;
+import org.opendaylight.yang.gen.v1.urn.onf.yang.ethernet.container._2._0.rev200121.ObjectDeletionNotification;
+import org.opendaylight.yang.gen.v1.urn.onf.yang.ethernet.container._2._0.rev200121.ProblemNotification;
+import org.opendaylight.yang.gen.v1.urn.onf.yang.ethernet.container._2._0.rev200121.SEVERITYTYPE;
+import org.opendaylight.yang.gen.v1.urn.onf.yang.ethernet.container._2._0.rev200121.SEVERITYTYPECRITICAL;
+import org.opendaylight.yang.gen.v1.urn.onf.yang.ethernet.container._2._0.rev200121.SEVERITYTYPEMAJOR;
+import org.opendaylight.yang.gen.v1.urn.onf.yang.ethernet.container._2._0.rev200121.SEVERITYTYPEMINOR;
+import org.opendaylight.yang.gen.v1.urn.onf.yang.ethernet.container._2._0.rev200121.SEVERITYTYPENONALARMED;
+import org.opendaylight.yang.gen.v1.urn.onf.yang.ethernet.container._2._0.rev200121.SEVERITYTYPEWARNING;
+import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.NodeId;
+
+public class TestOnf14EthernetContainerNotificationListener extends Mockito {
+    private NetconfAccessor accessor;
+    private NodeId nodeId;
+    private DeviceManagerServiceProvider serviceProvider;
+    private FaultService faultService;
+    private DataProvider databaseService;
+    private NotificationService notificationService;
+
+    private ObjectDeletionNotification deletionNotif;
+    private ObjectCreationNotification creationNotif;
+    private ProblemNotification problemNotif;
+    private AttributeValueChangedNotification attrValChangedNotif;
+
+    @Before
+    public void init() {
+        accessor = mock(NetconfAccessorMock.class);
+        nodeId = mock(NodeId.class);
+        serviceProvider = mock(DeviceManagerServiceProvider.class);
+        faultService = mock(FaultService.class);
+        databaseService = mock(DataProvider.class);
+        notificationService = mock(NotificationService.class);
+
+        problemNotif = mock(ProblemNotification.class);
+        deletionNotif = mock(ObjectDeletionNotification.class);
+        creationNotif = mock(ObjectCreationNotification.class);
+        attrValChangedNotif = mock(AttributeValueChangedNotification.class);
+
+        when(accessor.getNodeId()).thenReturn(nodeId);
+        when(problemNotif.getCounter()).thenReturn(new Long(10));
+        when(problemNotif.getTimestamp()).thenReturn(new DateAndTime("2020-02-05T12:30:45.283Z"));
+        when(problemNotif.getObjectIdRef()).thenReturn(new UniversalId("12345678-0123-0abc-abcd-0123456789AB"));
+        when(problemNotif.getProblem()).thenReturn("modulationIsDownShifted");
+
+        when(attrValChangedNotif.getAttributeName()).thenReturn("12345678-0123-2345-abcd-0123456789AB");
+        when(attrValChangedNotif.getCounter()).thenReturn(new Long(20));
+        when(attrValChangedNotif.getNewValue()).thenReturn("new-value");
+        when(attrValChangedNotif.getObjectIdRef()).thenReturn(new UniversalId("12345678-0123-1234-abcd-0123456789AB"));
+        when(attrValChangedNotif.getTimestamp()).thenReturn(new DateAndTime("2020-02-05T12:30:45.283Z"));
+
+        when(creationNotif.getObjectType()).thenReturn("air-interface-name");
+        when(creationNotif.getCounter()).thenReturn(new Long(20));
+        when(creationNotif.getObjectIdRef()).thenReturn(new UniversalId("12345678-0123-1234-abcd-0123456789AB"));
+        when(creationNotif.getTimestamp()).thenReturn(new DateAndTime("2020-02-05T12:30:45.283Z"));
+
+        when(deletionNotif.getCounter()).thenReturn(new Long(20));
+        when(deletionNotif.getObjectIdRef()).thenReturn(new UniversalId("12345678-0123-1234-abcd-0123456789AB"));
+        when(deletionNotif.getTimestamp()).thenReturn(new DateAndTime("2020-02-05T12:30:45.283Z"));
+
+        when(serviceProvider.getFaultService()).thenReturn(faultService);
+        when(serviceProvider.getDataProvider()).thenReturn(databaseService);
+        when(serviceProvider.getNotificationService()).thenReturn(notificationService);
+    }
+
+    @Test
+    public void testOtherNotif() {
+        Onf14EthernetContainerNotificationListener notifListener =
+                new Onf14EthernetContainerNotificationListener(accessor, serviceProvider);
+
+        notifListener.onObjectDeletionNotification(deletionNotif);
+        notifListener.onObjectCreationNotification(creationNotif);
+        notifListener.onAttributeValueChangedNotification(attrValChangedNotif);
+    }
+
+    @Test
+    public void testProblemNotifCritical() {
+        Onf14EthernetContainerNotificationListener notifListener =
+                new Onf14EthernetContainerNotificationListener(accessor, serviceProvider);
+
+        when(problemNotif.getSeverity()).thenAnswer(new Answer<Class<? extends SEVERITYTYPE>>() {
+            @Override
+            public Class<? extends SEVERITYTYPE> answer(InvocationOnMock invocation) throws Throwable {
+                return SEVERITYTYPECRITICAL.class;
+            }
+        });
+
+        notifListener.onProblemNotification(problemNotif);
+    }
+
+    @Test
+    public void testProblemNotifMajor() {
+        Onf14EthernetContainerNotificationListener notifListener =
+                new Onf14EthernetContainerNotificationListener(accessor, serviceProvider);
+
+        when(problemNotif.getSeverity()).thenAnswer(new Answer<Class<? extends SEVERITYTYPE>>() {
+            @Override
+            public Class<? extends SEVERITYTYPE> answer(InvocationOnMock invocation) throws Throwable {
+                return SEVERITYTYPEMAJOR.class;
+            }
+        });
+
+        notifListener.onProblemNotification(problemNotif);
+    }
+
+    @Test
+    public void testProblemNotifMinor() {
+        Onf14EthernetContainerNotificationListener notifListener =
+                new Onf14EthernetContainerNotificationListener(accessor, serviceProvider);
+
+        when(problemNotif.getSeverity()).thenAnswer(new Answer<Class<? extends SEVERITYTYPE>>() {
+            @Override
+            public Class<? extends SEVERITYTYPE> answer(InvocationOnMock invocation) throws Throwable {
+                return SEVERITYTYPEMINOR.class;
+            }
+        });
+
+        notifListener.onProblemNotification(problemNotif);
+    }
+
+    @Test
+    public void testProblemNotifWarning() {
+        Onf14EthernetContainerNotificationListener notifListener =
+                new Onf14EthernetContainerNotificationListener(accessor, serviceProvider);
+
+        when(problemNotif.getSeverity()).thenAnswer(new Answer<Class<? extends SEVERITYTYPE>>() {
+            @Override
+            public Class<? extends SEVERITYTYPE> answer(InvocationOnMock invocation) throws Throwable {
+                return SEVERITYTYPEWARNING.class;
+            }
+        });
+
+        notifListener.onProblemNotification(problemNotif);
+    }
+
+    @Test
+    public void testProblemNotifNonalarmed() {
+        Onf14EthernetContainerNotificationListener notifListener =
+                new Onf14EthernetContainerNotificationListener(accessor, serviceProvider);
+
+        when(problemNotif.getSeverity()).thenAnswer(new Answer<Class<? extends SEVERITYTYPE>>() {
+            @Override
+            public Class<? extends SEVERITYTYPE> answer(InvocationOnMock invocation) throws Throwable {
+                return SEVERITYTYPENONALARMED.class;
+            }
+        });
+
+        notifListener.onProblemNotification(problemNotif);
+    }
+
+    @Test
+    public void testProblemNotifNull() {
+        Onf14EthernetContainerNotificationListener notifListener =
+                new Onf14EthernetContainerNotificationListener(accessor, serviceProvider);
+
+        when(problemNotif.getSeverity()).thenReturn(null);
+
+        notifListener.onProblemNotification(problemNotif);
+    }
+
+}
diff --git a/sdnr/wt/devicemanager-onf14/provider/src/test/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/onf14/TestOnf14NetworkElement.java b/sdnr/wt/devicemanager-onf14/provider/src/test/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/onf14/TestOnf14NetworkElement.java
index ff4d1e1e2..d87e6d232 100644
--- a/sdnr/wt/devicemanager-onf14/provider/src/test/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/onf14/TestOnf14NetworkElement.java
+++ b/sdnr/wt/devicemanager-onf14/provider/src/test/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/onf14/TestOnf14NetworkElement.java
@@ -78,7 +78,7 @@ public class TestOnf14NetworkElement extends Mockito {
 
         InstanceIdentifier<ControlConstruct> CONTROLCONSTRUCT_IID =
                 InstanceIdentifier.builder(ControlConstruct.class).build();
-        when(accessor.getTransactionUtils().readData(accessor.getDataBroker(), LogicalDatastoreType.OPERATIONAL,
+        when(accessor.getTransactionUtils().readData(accessor.getDataBroker(), LogicalDatastoreType.CONFIGURATION,
                 CONTROLCONSTRUCT_IID)).thenReturn(controlConstruct);
 
         List<UniversalId> topLevelEqList = null;
diff --git a/sdnr/wt/devicemanager-onf14/provider/src/test/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/onf14/TestOnf14WireInterfaceNotificationListener.java b/sdnr/wt/devicemanager-onf14/provider/src/test/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/onf14/TestOnf14WireInterfaceNotificationListener.java
new file mode 100644
index 000000000..267e9a813
--- /dev/null
+++ b/sdnr/wt/devicemanager-onf14/provider/src/test/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/onf14/TestOnf14WireInterfaceNotificationListener.java
@@ -0,0 +1,194 @@
+/*
+ * ============LICENSE_START========================================================================
+ * ONAP : ccsdk feature sdnr wt
+ * =================================================================================================
+ * 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.onf14;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.mockito.Mockito;
+import org.mockito.invocation.InvocationOnMock;
+import org.mockito.stubbing.Answer;
+import org.onap.ccsdk.features.sdnr.wt.dataprovider.model.DataProvider;
+import org.onap.ccsdk.features.sdnr.wt.devicemanager.onf14.impl.Onf14WireInterfaceNotificationListener;
+import org.onap.ccsdk.features.sdnr.wt.devicemanager.onf14.test.mock.NetconfAccessorMock;
+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.netconfnodestateservice.NetconfAccessor;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.yang.types.rev130715.DateAndTime;
+import org.opendaylight.yang.gen.v1.urn.onf.yang.core.model._1._4.rev191127.UniversalId;
+import org.opendaylight.yang.gen.v1.urn.onf.yang.wire._interface._2._0.rev200123.AttributeValueChangedNotification;
+import org.opendaylight.yang.gen.v1.urn.onf.yang.wire._interface._2._0.rev200123.ObjectCreationNotification;
+import org.opendaylight.yang.gen.v1.urn.onf.yang.wire._interface._2._0.rev200123.ObjectDeletionNotification;
+import org.opendaylight.yang.gen.v1.urn.onf.yang.wire._interface._2._0.rev200123.ProblemNotification;
+import org.opendaylight.yang.gen.v1.urn.onf.yang.wire._interface._2._0.rev200123.SEVERITYTYPE;
+import org.opendaylight.yang.gen.v1.urn.onf.yang.wire._interface._2._0.rev200123.SEVERITYTYPECRITICAL;
+import org.opendaylight.yang.gen.v1.urn.onf.yang.wire._interface._2._0.rev200123.SEVERITYTYPEMAJOR;
+import org.opendaylight.yang.gen.v1.urn.onf.yang.wire._interface._2._0.rev200123.SEVERITYTYPEMINOR;
+import org.opendaylight.yang.gen.v1.urn.onf.yang.wire._interface._2._0.rev200123.SEVERITYTYPENONALARMED;
+import org.opendaylight.yang.gen.v1.urn.onf.yang.wire._interface._2._0.rev200123.SEVERITYTYPEWARNING;
+import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.NodeId;
+
+public class TestOnf14WireInterfaceNotificationListener extends Mockito {
+    private NetconfAccessor accessor;
+    private NodeId nodeId;
+    private DeviceManagerServiceProvider serviceProvider;
+    private FaultService faultService;
+    private DataProvider databaseService;
+    private NotificationService notificationService;
+
+    private ObjectDeletionNotification deletionNotif;
+    private ObjectCreationNotification creationNotif;
+    private ProblemNotification problemNotif;
+    private AttributeValueChangedNotification attrValChangedNotif;
+
+    @Before
+    public void init() {
+        accessor = mock(NetconfAccessorMock.class);
+        nodeId = mock(NodeId.class);
+        serviceProvider = mock(DeviceManagerServiceProvider.class);
+        faultService = mock(FaultService.class);
+        databaseService = mock(DataProvider.class);
+        notificationService = mock(NotificationService.class);
+
+        problemNotif = mock(ProblemNotification.class);
+        deletionNotif = mock(ObjectDeletionNotification.class);
+        creationNotif = mock(ObjectCreationNotification.class);
+        attrValChangedNotif = mock(AttributeValueChangedNotification.class);
+
+        when(accessor.getNodeId()).thenReturn(nodeId);
+        when(problemNotif.getCounter()).thenReturn(10);
+        when(problemNotif.getTimestamp()).thenReturn(new DateAndTime("2020-02-05T12:30:45.283Z"));
+        when(problemNotif.getObjectIdRef()).thenReturn(new UniversalId("12345678-0123-0abc-abcd-0123456789AB"));
+        when(problemNotif.getProblem()).thenReturn("modulationIsDownShifted");
+
+        when(attrValChangedNotif.getAttributeName()).thenReturn("12345678-0123-2345-abcd-0123456789AB");
+        when(attrValChangedNotif.getCounter()).thenReturn(20);
+        when(attrValChangedNotif.getNewValue()).thenReturn("new-value");
+        when(attrValChangedNotif.getObjectIdRef()).thenReturn(new UniversalId("12345678-0123-1234-abcd-0123456789AB"));
+        when(attrValChangedNotif.getTimestamp()).thenReturn(new DateAndTime("2020-02-05T12:30:45.283Z"));
+
+        when(creationNotif.getObjectType()).thenReturn("air-interface-name");
+        when(creationNotif.getCounter()).thenReturn(20);
+        when(creationNotif.getObjectIdRef()).thenReturn(new UniversalId("12345678-0123-1234-abcd-0123456789AB"));
+        when(creationNotif.getTimestamp()).thenReturn(new DateAndTime("2020-02-05T12:30:45.283Z"));
+
+        when(deletionNotif.getCounter()).thenReturn(20);
+        when(deletionNotif.getObjectIdRef()).thenReturn(new UniversalId("12345678-0123-1234-abcd-0123456789AB"));
+        when(deletionNotif.getTimestamp()).thenReturn(new DateAndTime("2020-02-05T12:30:45.283Z"));
+
+        when(serviceProvider.getFaultService()).thenReturn(faultService);
+        when(serviceProvider.getDataProvider()).thenReturn(databaseService);
+        when(serviceProvider.getNotificationService()).thenReturn(notificationService);
+    }
+
+    @Test
+    public void testOtherNotif() {
+        Onf14WireInterfaceNotificationListener notifListener =
+                new Onf14WireInterfaceNotificationListener(accessor, serviceProvider);
+
+        notifListener.onObjectDeletionNotification(deletionNotif);
+        notifListener.onObjectCreationNotification(creationNotif);
+        notifListener.onAttributeValueChangedNotification(attrValChangedNotif);
+    }
+
+    @Test
+    public void testProblemNotifCritical() {
+        Onf14WireInterfaceNotificationListener notifListener =
+                new Onf14WireInterfaceNotificationListener(accessor, serviceProvider);
+
+        when(problemNotif.getSeverity()).thenAnswer(new Answer<Class<? extends SEVERITYTYPE>>() {
+            @Override
+            public Class<? extends SEVERITYTYPE> answer(InvocationOnMock invocation) throws Throwable {
+                return SEVERITYTYPECRITICAL.class;
+            }
+        });
+
+        notifListener.onProblemNotification(problemNotif);
+    }
+
+    @Test
+    public void testProblemNotifMajor() {
+        Onf14WireInterfaceNotificationListener notifListener =
+                new Onf14WireInterfaceNotificationListener(accessor, serviceProvider);
+
+        when(problemNotif.getSeverity()).thenAnswer(new Answer<Class<? extends SEVERITYTYPE>>() {
+            @Override
+            public Class<? extends SEVERITYTYPE> answer(InvocationOnMock invocation) throws Throwable {
+                return SEVERITYTYPEMAJOR.class;
+            }
+        });
+
+        notifListener.onProblemNotification(problemNotif);
+    }
+
+    @Test
+    public void testProblemNotifMinor() {
+        Onf14WireInterfaceNotificationListener notifListener =
+                new Onf14WireInterfaceNotificationListener(accessor, serviceProvider);
+
+        when(problemNotif.getSeverity()).thenAnswer(new Answer<Class<? extends SEVERITYTYPE>>() {
+            @Override
+            public Class<? extends SEVERITYTYPE> answer(InvocationOnMock invocation) throws Throwable {
+                return SEVERITYTYPEMINOR.class;
+            }
+        });
+
+        notifListener.onProblemNotification(problemNotif);
+    }
+
+    @Test
+    public void testProblemNotifWarning() {
+        Onf14WireInterfaceNotificationListener notifListener =
+                new Onf14WireInterfaceNotificationListener(accessor, serviceProvider);
+
+        when(problemNotif.getSeverity()).thenAnswer(new Answer<Class<? extends SEVERITYTYPE>>() {
+            @Override
+            public Class<? extends SEVERITYTYPE> answer(InvocationOnMock invocation) throws Throwable {
+                return SEVERITYTYPEWARNING.class;
+            }
+        });
+
+        notifListener.onProblemNotification(problemNotif);
+    }
+
+    @Test
+    public void testProblemNotifNonalarmed() {
+        Onf14WireInterfaceNotificationListener notifListener =
+                new Onf14WireInterfaceNotificationListener(accessor, serviceProvider);
+
+        when(problemNotif.getSeverity()).thenAnswer(new Answer<Class<? extends SEVERITYTYPE>>() {
+            @Override
+            public Class<? extends SEVERITYTYPE> answer(InvocationOnMock invocation) throws Throwable {
+                return SEVERITYTYPENONALARMED.class;
+            }
+        });
+
+        notifListener.onProblemNotification(problemNotif);
+    }
+
+    @Test
+    public void testProblemNotifNull() {
+        Onf14WireInterfaceNotificationListener notifListener =
+                new Onf14WireInterfaceNotificationListener(accessor, serviceProvider);
+
+        when(problemNotif.getSeverity()).thenReturn(null);
+
+        notifListener.onProblemNotification(problemNotif);
+    }
+
+}