Upgrade parents to 2.5.4-SNAPSHOT

Code changes as a result of changes induced by ODL Chlorine SR1

Issue-ID: CCSDK-3856
Signed-off-by: Ravi Pendurty <ravi.pendurty@highstreet-technologies.com>
Change-Id: Ic08786f050e58bdb8371c8f8c25fb0db9f258cd4
Signed-off-by: Ravi Pendurty <ravi.pendurty@highstreet-technologies.com>

13 files changed, 139 insertions, 139 deletions

diff --git a/sdnr/wt/devicemanager-onap/onf12/provider/pom.xml b/sdnr/wt/devicemanager-onap/onf12/provider/pom.xml
index 2c25468af..641e5ba7e 100644
--- a/sdnr/wt/devicemanager-onap/onf12/provider/pom.xml
+++ b/sdnr/wt/devicemanager-onap/onf12/provider/pom.xml
@@ -22,13 +22,14 @@
   ~ ============LICENSE_END=======================================================
   ~
   -->
+
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
         <groupId>org.onap.ccsdk.parent</groupId>
         <artifactId>binding-parent</artifactId>
-        <version>2.5.3</version>
+        <version>2.5.4-SNAPSHOT</version>
         <relativePath/>
     </parent>
 
diff --git a/sdnr/wt/devicemanager-onap/onf12/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/onf/ifpac/equipment/ONFCoreNetworkElement12Equipment.java b/sdnr/wt/devicemanager-onap/onf12/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/onf/ifpac/equipment/ONFCoreNetworkElement12Equipment.java
index 3c0878495..30f039568 100644
--- a/sdnr/wt/devicemanager-onap/onf12/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/onf/ifpac/equipment/ONFCoreNetworkElement12Equipment.java
+++ b/sdnr/wt/devicemanager-onap/onf12/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/onf/ifpac/equipment/ONFCoreNetworkElement12Equipment.java
@@ -271,7 +271,7 @@ public class ONFCoreNetworkElement12Equipment {
 
         final Class<?> clazzPac = Equipment.class;
 
-        LOG.info("DBRead Get equipment for class {} from mountpoint {} for uuid {}", clazzPac.getSimpleName(),
+        LOG.debug("DBRead Get equipment for class {} from mountpoint {} for uuid {}", clazzPac.getSimpleName(),
                 coreData.getMountpoint(), interfacePacUuid.getValue());
 
         InstanceIdentifier<Equipment> equipmentIID =
@@ -292,7 +292,7 @@ public class ONFCoreNetworkElement12Equipment {
 
         final Class<?> clazzPac = Equipment.class;
 
-        LOG.info("DBRead Get all equipment for class {} from mountpoint {}", clazzPac.getSimpleName(),
+        LOG.debug("DBRead Get all equipment for class {} from mountpoint {}", clazzPac.getSimpleName(),
                 coreData.getMountpoint());
 
         InstanceIdentifier<Equipment> equipmentIID = InstanceIdentifier.builder(Equipment.class).build();
diff --git a/sdnr/wt/devicemanager-onap/onf12/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/onf/ifpac/equipment/WrapperEquipmentPacRev170402.java b/sdnr/wt/devicemanager-onap/onf12/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/onf/ifpac/equipment/WrapperEquipmentPacRev170402.java
index d0b4cc51a..c2cb87f47 100644
--- a/sdnr/wt/devicemanager-onap/onf12/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/onf/ifpac/equipment/WrapperEquipmentPacRev170402.java
+++ b/sdnr/wt/devicemanager-onap/onf12/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/onf/ifpac/equipment/WrapperEquipmentPacRev170402.java
@@ -69,7 +69,7 @@ public class WrapperEquipmentPacRev170402 implements OnfInterfacePac {
         final Class<EquipmentPacKey> clazzPacKey = EquipmentPacKey.class;
         final Class<EquipmentCurrentProblems> clazzProblems = EquipmentCurrentProblems.class;
 
-        LOG.info("DBRead Get problems for class {} from mountpoint {} for uuid {}", clazzPac.getSimpleName(),
+        LOG.debug("DBRead Get problems for class {} from mountpoint {} for uuid {}", clazzPac.getSimpleName(),
                 acessor.getNodeId(), interfacePacUuid.getValue());
 
         try {
diff --git a/sdnr/wt/devicemanager-onap/onf12/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/onf/ifpac/microwave/WrapperMicrowaveModelRev170324.java b/sdnr/wt/devicemanager-onap/onf12/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/onf/ifpac/microwave/WrapperMicrowaveModelRev170324.java
index 553c0103b..58aede57d 100644
--- a/sdnr/wt/devicemanager-onap/onf12/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/onf/ifpac/microwave/WrapperMicrowaveModelRev170324.java
+++ b/sdnr/wt/devicemanager-onap/onf12/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/onf/ifpac/microwave/WrapperMicrowaveModelRev170324.java
@@ -199,7 +199,7 @@ public class WrapperMicrowaveModelRev170324 implements OnfMicrowaveModel, Microw
         } else if (qName.equals(MwTdmContainerPac.QNAME)) {
             res = MwTdmContainerPac.class;
         }
-        LOG.info("Found QName {} mapped to {}", String.valueOf(qName), String.valueOf(res));
+        LOG.debug("Found QName {} mapped to {}", String.valueOf(qName), String.valueOf(res));
         return res;
     }
 
@@ -278,7 +278,7 @@ public class WrapperMicrowaveModelRev170324 implements OnfMicrowaveModel, Microw
         final Class<MwAirInterfacePac> clazzPac = MwAirInterfacePac.class;
 
         String mountpointId = acessor.getNodeId().getValue();
-        LOG.info("DBRead Get problems for class {} from mountpoint {} for uuid {}", clazzPac.getSimpleName(),
+        LOG.debug("DBRead Get problems for class {} from mountpoint {} for uuid {}", clazzPac.getSimpleName(),
                 mountpointId, interfacePacUuid.getValue());
 
         // Step 2.2: construct data and the relative iid
@@ -315,7 +315,7 @@ public class WrapperMicrowaveModelRev170324 implements OnfMicrowaveModel, Microw
         final Class<MwEthernetContainerPac> clazzPac = MwEthernetContainerPac.class;
 
         String mountpointId = acessor.getNodeId().getValue();
-        LOG.info("DBRead Get problems for class {} from mountpoint {} for uuid {}", clazzPac.getSimpleName(),
+        LOG.debug("DBRead Get problems for class {} from mountpoint {} for uuid {}", clazzPac.getSimpleName(),
                 mountpointId, interfacePacUuid.getValue());
 
         InstanceIdentifier<EthernetContainerCurrentProblems> mwEthInterfaceIID = InstanceIdentifier
@@ -349,7 +349,7 @@ public class WrapperMicrowaveModelRev170324 implements OnfMicrowaveModel, Microw
         final Class<AirInterfaceDiversityCurrentProblems> clazzProblems = AirInterfaceDiversityCurrentProblems.class;
 
         String mountpointId = acessor.getNodeId().getValue();
-        LOG.info("DBRead Get problems for class {} from mountpoint {} for uuid {}", clazzPac.getSimpleName(),
+        LOG.debug("DBRead Get problems for class {} from mountpoint {} for uuid {}", clazzPac.getSimpleName(),
                 mountpointId, interfacePacUuid.getValue());
 
         InstanceIdentifier<AirInterfaceDiversityCurrentProblems> mwEthInterfaceIID = InstanceIdentifier
@@ -382,7 +382,7 @@ public class WrapperMicrowaveModelRev170324 implements OnfMicrowaveModel, Microw
         final Class<PureEthernetStructureCurrentProblems> clazzProblems = PureEthernetStructureCurrentProblems.class;
 
         String mountpointId = acessor.getNodeId().getValue();
-        LOG.info("DBRead Get problems for class {} from mountpoint {} for uuid {}", clazzPac.getSimpleName(),
+        LOG.debug("DBRead Get problems for class {} from mountpoint {} for uuid {}", clazzPac.getSimpleName(),
                 mountpointId, interfacePacUuid.getValue());
 
         InstanceIdentifier<PureEthernetStructureCurrentProblems> mwEthInterfaceIID = InstanceIdentifier
@@ -415,7 +415,7 @@ public class WrapperMicrowaveModelRev170324 implements OnfMicrowaveModel, Microw
         final Class<HybridMwStructureCurrentProblems> clazzProblems = HybridMwStructureCurrentProblems.class;
 
         String mountpointId = acessor.getNodeId().getValue();
-        LOG.info("DBRead Get problems for class {} from mountpoint {} for uuid {}", clazzPac.getSimpleName(),
+        LOG.debug("DBRead Get problems for class {} from mountpoint {} for uuid {}", clazzPac.getSimpleName(),
                 mountpointId, interfacePacUuid.getValue());
 
         InstanceIdentifier<HybridMwStructureCurrentProblems> mwEthInterfaceIID = InstanceIdentifier
@@ -456,7 +456,7 @@ public class WrapperMicrowaveModelRev170324 implements OnfMicrowaveModel, Microw
         final Class<TdmContainerCurrentProblems> clazzProblems = TdmContainerCurrentProblems.class;
 
         String mountpointId = acessor.getNodeId().getValue();
-        LOG.info("DBRead Get problems for class {} from mountpoint {} for uuid {}", clazzPac.getSimpleName(),
+        LOG.debug("DBRead Get problems for class {} from mountpoint {} for uuid {}", clazzPac.getSimpleName(),
                 mountpointId, interfacePacUuid.getValue());
 
         try {
@@ -575,8 +575,8 @@ public class WrapperMicrowaveModelRev170324 implements OnfMicrowaveModel, Microw
             SeverityType severity) {
 
         Optional<org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev201110.SeverityType> res =
-                org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev201110.SeverityType
-                        .forName(severity.name());
+                Optional.ofNullable(org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev201110.SeverityType
+                        .forName(severity.name()));
         return res.orElse(
                 org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev201110.SeverityType.NonAlarmed);
     }
diff --git a/sdnr/wt/devicemanager-onap/onf12/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/onf/ifpac/microwave/WrapperMicrowaveModelRev180907.java b/sdnr/wt/devicemanager-onap/onf12/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/onf/ifpac/microwave/WrapperMicrowaveModelRev180907.java
index 5ce91ed65..75b380f34 100644
--- a/sdnr/wt/devicemanager-onap/onf12/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/onf/ifpac/microwave/WrapperMicrowaveModelRev180907.java
+++ b/sdnr/wt/devicemanager-onap/onf12/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/onf/ifpac/microwave/WrapperMicrowaveModelRev180907.java
@@ -221,7 +221,7 @@ public class WrapperMicrowaveModelRev180907 implements OnfMicrowaveModel, Microw
         } else if (qName.equals(MwTdmContainerPac.QNAME)) {
             res = MwTdmContainerPac.class;
         }
-        LOG.info("Found QName {} mapped to {}", String.valueOf(qName), String.valueOf(res));
+        LOG.debug("Found QName {} mapped to {}", String.valueOf(qName), String.valueOf(res));
         return res;
     }
 
@@ -287,7 +287,7 @@ public class WrapperMicrowaveModelRev180907 implements OnfMicrowaveModel, Microw
 
         final Class<MwAirInterfacePac> clazzPac = MwAirInterfacePac.class;
 
-        LOG.info("DBRead Get problems for class {} from mountpoint {} for uuid {}", clazzPac.getSimpleName(),
+        LOG.debug("DBRead Get problems for class {} from mountpoint {} for uuid {}", clazzPac.getSimpleName(),
                 mountpointId, interfacePacUuid.getValue());
 
         // Step 2.2: construct data and the relative iid
@@ -321,7 +321,7 @@ public class WrapperMicrowaveModelRev180907 implements OnfMicrowaveModel, Microw
 
         final Class<MwEthernetContainerPac> clazzPac = MwEthernetContainerPac.class;
 
-        LOG.info("DBRead Get problems for class {} from mountpoint {} for uuid {}", clazzPac.getSimpleName(),
+        LOG.debug("DBRead Get problems for class {} from mountpoint {} for uuid {}", clazzPac.getSimpleName(),
                 mountpointId, interfacePacUuid.getValue());
 
         InstanceIdentifier<EthernetContainerCurrentProblems> mwEthInterfaceIID = InstanceIdentifier
@@ -353,7 +353,7 @@ public class WrapperMicrowaveModelRev180907 implements OnfMicrowaveModel, Microw
         final Class<MwAirInterfaceDiversityPac> clazzPac = MwAirInterfaceDiversityPac.class;
         final Class<AirInterfaceDiversityCurrentProblems> clazzProblems = AirInterfaceDiversityCurrentProblems.class;
 
-        LOG.info("DBRead Get problems for class {} from mountpoint {} for uuid {}", clazzPac.getSimpleName(),
+        LOG.debug("DBRead Get problems for class {} from mountpoint {} for uuid {}", clazzPac.getSimpleName(),
                 mountpointId, interfacePacUuid.getValue());
 
         InstanceIdentifier<AirInterfaceDiversityCurrentProblems> mwEthInterfaceIID = InstanceIdentifier
@@ -384,7 +384,7 @@ public class WrapperMicrowaveModelRev180907 implements OnfMicrowaveModel, Microw
         final Class<MwPureEthernetStructurePac> clazzPac = MwPureEthernetStructurePac.class;
         final Class<PureEthernetStructureCurrentProblems> clazzProblems = PureEthernetStructureCurrentProblems.class;
 
-        LOG.info("DBRead Get problems for class {} from mountpoint {} for uuid {}", clazzPac.getSimpleName(),
+        LOG.debug("DBRead Get problems for class {} from mountpoint {} for uuid {}", clazzPac.getSimpleName(),
                 mountpointId, interfacePacUuid.getValue());
 
         InstanceIdentifier<PureEthernetStructureCurrentProblems> mwEthInterfaceIID = InstanceIdentifier
@@ -415,7 +415,7 @@ public class WrapperMicrowaveModelRev180907 implements OnfMicrowaveModel, Microw
         final Class<MwHybridMwStructurePac> clazzPac = MwHybridMwStructurePac.class;
         final Class<HybridMwStructureCurrentProblems> clazzProblems = HybridMwStructureCurrentProblems.class;
 
-        LOG.info("DBRead Get problems for class {} from mountpoint {} for uuid {}", clazzPac.getSimpleName(),
+        LOG.debug("DBRead Get problems for class {} from mountpoint {} for uuid {}", clazzPac.getSimpleName(),
                 mountpointId, interfacePacUuid.getValue());
 
         InstanceIdentifier<HybridMwStructureCurrentProblems> mwEthInterfaceIID = InstanceIdentifier
@@ -454,7 +454,7 @@ public class WrapperMicrowaveModelRev180907 implements OnfMicrowaveModel, Microw
         final Class<MwTdmContainerPacKey> clazzPacKey = MwTdmContainerPacKey.class;
         final Class<TdmContainerCurrentProblems> clazzProblems = TdmContainerCurrentProblems.class;
 
-        LOG.info("DBRead Get problems for class {} from mountpoint {} for uuid {}", clazzPac.getSimpleName(),
+        LOG.debug("DBRead Get problems for class {} from mountpoint {} for uuid {}", clazzPac.getSimpleName(),
                 mountpointId, interfacePacUuid.getValue());
 
         try {
@@ -568,8 +568,8 @@ public class WrapperMicrowaveModelRev180907 implements OnfMicrowaveModel, Microw
             SeverityType severity) {
 
         Optional<org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev201110.SeverityType> res =
-                org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev201110.SeverityType
-                        .forName(severity.name());
+                Optional.ofNullable(org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev201110.SeverityType
+                        .forName(severity.name()));
         return res.orElse(
                 org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev201110.SeverityType.NonAlarmed);
     }
diff --git a/sdnr/wt/devicemanager-onap/onf12/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/onf/ifpac/microwave/WrapperMicrowaveModelRev181010.java b/sdnr/wt/devicemanager-onap/onf12/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/onf/ifpac/microwave/WrapperMicrowaveModelRev181010.java
index 747ff96a9..95af73927 100644
--- a/sdnr/wt/devicemanager-onap/onf12/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/onf/ifpac/microwave/WrapperMicrowaveModelRev181010.java
+++ b/sdnr/wt/devicemanager-onap/onf12/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/onf/ifpac/microwave/WrapperMicrowaveModelRev181010.java
@@ -216,7 +216,7 @@ public class WrapperMicrowaveModelRev181010 implements OnfMicrowaveModel, Microw
         } else if (qName.equals(MwTdmContainerPac.QNAME)) {
             res = MwTdmContainerPac.class;
         }
-        LOG.info("Found QName {} mapped to {}", String.valueOf(qName), String.valueOf(res));
+        LOG.debug("Found QName {} mapped to {}", String.valueOf(qName), String.valueOf(res));
         return res;
     }
 
@@ -280,7 +280,7 @@ public class WrapperMicrowaveModelRev181010 implements OnfMicrowaveModel, Microw
 
         final Class<MwAirInterfacePac> clazzPac = MwAirInterfacePac.class;
 
-        LOG.info("DBRead Get problems for class {} from mountpoint {} for uuid {}", clazzPac.getSimpleName(),
+        LOG.debug("DBRead Get problems for class {} from mountpoint {} for uuid {}", clazzPac.getSimpleName(),
                 mountpointId, interfacePacUuid.getValue());
 
         // Step 2.2: construct data and the relative iid
@@ -317,7 +317,7 @@ public class WrapperMicrowaveModelRev181010 implements OnfMicrowaveModel, Microw
 
         final Class<MwEthernetContainerPac> clazzPac = MwEthernetContainerPac.class;
 
-        LOG.info("DBRead Get problems for class {} from mountpoint {} for uuid {}", clazzPac.getSimpleName(),
+        LOG.debug("DBRead Get problems for class {} from mountpoint {} for uuid {}", clazzPac.getSimpleName(),
                 mountpointId, interfacePacUuid.getValue());
 
         InstanceIdentifier<EthernetContainerCurrentProblems> mwEthInterfaceIID = InstanceIdentifier
@@ -352,7 +352,7 @@ public class WrapperMicrowaveModelRev181010 implements OnfMicrowaveModel, Microw
         final Class<MwAirInterfaceDiversityPac> clazzPac = MwAirInterfaceDiversityPac.class;
         final Class<AirInterfaceDiversityCurrentProblems> clazzProblems = AirInterfaceDiversityCurrentProblems.class;
 
-        LOG.info("DBRead Get problems for class {} from mountpoint {} for uuid {}", clazzPac.getSimpleName(),
+        LOG.debug("DBRead Get problems for class {} from mountpoint {} for uuid {}", clazzPac.getSimpleName(),
                 mountpointId, interfacePacUuid.getValue());
 
         InstanceIdentifier<AirInterfaceDiversityCurrentProblems> mwEthInterfaceIID = InstanceIdentifier
@@ -386,7 +386,7 @@ public class WrapperMicrowaveModelRev181010 implements OnfMicrowaveModel, Microw
         final Class<MwPureEthernetStructurePac> clazzPac = MwPureEthernetStructurePac.class;
         final Class<PureEthernetStructureCurrentProblems> clazzProblems = PureEthernetStructureCurrentProblems.class;
 
-        LOG.info("DBRead Get problems for class {} from mountpoint {} for uuid {}", clazzPac.getSimpleName(),
+        LOG.debug("DBRead Get problems for class {} from mountpoint {} for uuid {}", clazzPac.getSimpleName(),
                 mountpointId, interfacePacUuid.getValue());
 
         InstanceIdentifier<PureEthernetStructureCurrentProblems> mwEthInterfaceIID = InstanceIdentifier
@@ -420,7 +420,7 @@ public class WrapperMicrowaveModelRev181010 implements OnfMicrowaveModel, Microw
         final Class<MwHybridMwStructurePac> clazzPac = MwHybridMwStructurePac.class;
         final Class<HybridMwStructureCurrentProblems> clazzProblems = HybridMwStructureCurrentProblems.class;
 
-        LOG.info("DBRead Get problems for class {} from mountpoint {} for uuid {}", clazzPac.getSimpleName(),
+        LOG.debug("DBRead Get problems for class {} from mountpoint {} for uuid {}", clazzPac.getSimpleName(),
                 mountpointId, interfacePacUuid.getValue());
 
         InstanceIdentifier<HybridMwStructureCurrentProblems> mwEthInterfaceIID = InstanceIdentifier
@@ -462,7 +462,7 @@ public class WrapperMicrowaveModelRev181010 implements OnfMicrowaveModel, Microw
         final Class<MwTdmContainerPacKey> clazzPacKey = MwTdmContainerPacKey.class;
         final Class<TdmContainerCurrentProblems> clazzProblems = TdmContainerCurrentProblems.class;
 
-        LOG.info("DBRead Get problems for class {} from mountpoint {} for uuid {}", clazzPac.getSimpleName(),
+        LOG.debug("DBRead Get problems for class {} from mountpoint {} for uuid {}", clazzPac.getSimpleName(),
                 mountpointId, interfacePacUuid.getValue());
 
         try {
@@ -584,8 +584,8 @@ public class WrapperMicrowaveModelRev181010 implements OnfMicrowaveModel, Microw
             SeverityType severity) {
 
         Optional<org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev201110.SeverityType> res =
-                org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev201110.SeverityType
-                        .forName(severity.name());
+                Optional.ofNullable(org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev201110.SeverityType
+                        .forName(severity.name()));
         return res.orElse(
                 org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev201110.SeverityType.NonAlarmed);
     }
diff --git a/sdnr/wt/devicemanager-onap/onf12/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/onf/ifpac/microwave/pm/PerformanceDataAirInterface170324Builder.java b/sdnr/wt/devicemanager-onap/onf12/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/onf/ifpac/microwave/pm/PerformanceDataAirInterface170324Builder.java
index 242e100a7..6398c76a8 100644
--- a/sdnr/wt/devicemanager-onap/onf12/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/onf/ifpac/microwave/pm/PerformanceDataAirInterface170324Builder.java
+++ b/sdnr/wt/devicemanager-onap/onf12/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/onf/ifpac/microwave/pm/PerformanceDataAirInterface170324Builder.java
@@ -17,11 +17,9 @@
 package org.onap.ccsdk.features.sdnr.wt.devicemanager.onf.ifpac.microwave.pm;
 
 import java.util.Optional;
-
 import org.eclipse.jdt.annotation.NonNull;
 import org.onap.ccsdk.features.sdnr.wt.devicemanager.onf.ifpac.microwave.Helper;
 import org.onap.ccsdk.features.sdnr.wt.devicemanager.util.InconsistentPMDataException;
-import org.onap.ccsdk.features.sdnr.wt.devicemanager.util.PmUtil;
 import org.opendaylight.yang.gen.v1.urn.onf.params.xml.ns.yang.core.model.rev170320.logical.termination.point.g.Lp;
 import org.opendaylight.yang.gen.v1.urn.onf.params.xml.ns.yang.g._874._1.model.rev170320.OtnHistoryDataG;
 import org.opendaylight.yang.gen.v1.urn.onf.params.xml.ns.yang.microwave.model.rev170324.AirInterfaceHistoricalPerformanceTypeG;
@@ -35,103 +33,104 @@ import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.
 
 public class PerformanceDataAirInterface170324Builder extends PmdataEntityBuilder {
 
-	private PerformanceDataAirInterface170324Builder(NodeId nodeId, Lp lp, OtnHistoryDataG pmRecord) {
-		super();
-		Optional<GranularityPeriodType> gp = GranularityPeriodType
-				.forName(Helper.nnGetGranularityPeriodType(pmRecord.getGranularityPeriod()).getName());
-		this.setGranularityPeriod(gp.orElse(GranularityPeriodType.Unknown));
-		this.setUuidInterface(Helper.nnGetUniversalId(lp.getUuid()).getValue());
-		this.setLayerProtocolName(Helper.nnGetLayerProtocolName(lp.getLayerProtocolName()).getValue());
-		this.setNodeName(nodeId.getValue());
-		this.setScannerId(pmRecord.getHistoryDataId());
-		this.setTimeStamp(pmRecord.getPeriodEndTime());
-		this.setSuspectIntervalFlag(pmRecord.requireSuspectIntervalFlag());
-	}
+    private PerformanceDataAirInterface170324Builder(NodeId nodeId, Lp lp, OtnHistoryDataG pmRecord) {
+        super();
+        Optional<GranularityPeriodType> gp = Optional.ofNullable(GranularityPeriodType
+                .forName(Helper.nnGetGranularityPeriodType(pmRecord.getGranularityPeriod()).getName()));
+        this.setGranularityPeriod(gp.orElse(GranularityPeriodType.Unknown));
+        this.setUuidInterface(Helper.nnGetUniversalId(lp.getUuid()).getValue());
+        this.setLayerProtocolName(Helper.nnGetLayerProtocolName(lp.getLayerProtocolName()).getValue());
+        this.setNodeName(nodeId.getValue());
+        this.setScannerId(pmRecord.getHistoryDataId());
+        this.setTimeStamp(pmRecord.getPeriodEndTime());
+        this.setSuspectIntervalFlag(pmRecord.requireSuspectIntervalFlag());
+    }
 
-	/**
-	 * Move data to generic type
-	 *
-	 * @param nodeId           of node
-	 * @param lp               to get data from
-	 * @param pmRecord         data itself
-	 * @param airConfiguration configuration for additional parameter
-	 * @throws InconsistentPMDataException
-	 */
-	public PerformanceDataAirInterface170324Builder(NodeId nodeId, Lp lp,
-			AirInterfaceHistoricalPerformanceTypeG pmRecord, AirInterfaceConfiguration airConfiguration)
-			throws InconsistentPMDataException {
-		this(nodeId, lp, pmRecord);
+    /**
+     * Move data to generic type
+     *
+     * @param nodeId of node
+     * @param lp to get data from
+     * @param pmRecord data itself
+     * @param airConfiguration configuration for additional parameter
+     * @throws InconsistentPMDataException
+     */
+    public PerformanceDataAirInterface170324Builder(NodeId nodeId, Lp lp,
+            AirInterfaceHistoricalPerformanceTypeG pmRecord, AirInterfaceConfiguration airConfiguration)
+            throws InconsistentPMDataException {
+        this(nodeId, lp, pmRecord);
 
-		this.setRadioSignalId(airConfiguration.getRadioSignalId());
-		@NonNull
-		PerformanceData pmr = Helper.throwIfPerformanceDataNull(pmRecord.getPerformanceData(),
-				getUuidInterface(), getLayerProtocolName());
+        this.setRadioSignalId(airConfiguration.getRadioSignalId());
+        @NonNull
+        PerformanceData pmr = Helper.throwIfPerformanceDataNull(pmRecord.getPerformanceData(), getUuidInterface(),
+                getLayerProtocolName());
 
-		PerformanceDataBuilder bPerformanceData = new PerformanceDataBuilder();
-		bPerformanceData.setTimePeriod(pmr.getTimePeriod());
-		bPerformanceData.setEs(pmr.getEs());
-		bPerformanceData.setSes(pmr.getSes());
-		bPerformanceData.setCses(pmr.getCses());
-		bPerformanceData.setUnavailability(pmr.getUnavailability());
-		bPerformanceData.setTxLevelMin(pmr.getTxLevelMin());
-		bPerformanceData.setTxLevelMax(pmr.getTxLevelMax());
-		bPerformanceData.setTxLevelAvg(pmr.getTxLevelAvg());
-		bPerformanceData.setRxLevelMin(pmr.getRxLevelMin());
-		bPerformanceData.setRxLevelMax(pmr.getRxLevelMax());
-		bPerformanceData.setRxLevelAvg(pmr.getRxLevelAvg());
-		bPerformanceData.setTime2States(pmr.getTime2States());
-		bPerformanceData.setTime4StatesS(pmr.getTime4StatesS());
-		bPerformanceData.setTime4States(pmr.getTime4States());
-		bPerformanceData.setTime8States(pmr.getTime8States());
-		bPerformanceData.setTime16StatesS(pmr.getTime16StatesS());
-		bPerformanceData.setTime16States(pmr.getTime16States());
-		bPerformanceData.setTime32States(pmr.getTime32States());
-		bPerformanceData.setTime64States(pmr.getTime64States());
-		bPerformanceData.setTime128States(pmr.getTime128States());
-		bPerformanceData.setTime256States(pmr.getTime256States());
-		bPerformanceData.setTime512States(pmr.getTime512States());
-		bPerformanceData.setTime512StatesL(pmr.getTime512StatesL());
-		bPerformanceData.setTime1024States(pmr.getTime1024States());
-		bPerformanceData.setTime1024StatesL(pmr.getTime1024StatesL());
-		bPerformanceData.setTime2048States(pmr.getTime2048States());
-		bPerformanceData.setTime2048StatesL(pmr.getTime2048StatesL());
-		bPerformanceData.setTime4096States(pmr.getTime4096States());
-		bPerformanceData.setTime4096StatesL(pmr.getTime4096StatesL());
-		bPerformanceData.setTime8192States(pmr.getTime8192States());
-		bPerformanceData.setTime8192StatesL(pmr.getTime8192StatesL());
-		bPerformanceData.setSnirMin(pmr.getSnirMin());
-		bPerformanceData.setSnirMax(pmr.getSnirMax());
-		bPerformanceData.setSnirAvg(pmr.getSnirAvg());
-		bPerformanceData.setXpdMin(pmr.getXpdMin());
-		bPerformanceData.setXpdMax(pmr.getXpdMax());
-		bPerformanceData.setXpdAvg(pmr.getXpdAvg());
-		bPerformanceData.setRfTempMin(pmr.getRfTempMin());
-		bPerformanceData.setRfTempMax(pmr.getRfTempMax());
-		bPerformanceData.setRfTempAvg(pmr.getRfTempAvg());
-		bPerformanceData.setDefectBlocksSum(pmr.getDefectBlocksSum());
-		this.setPerformanceData(bPerformanceData.build());
-	}
+        PerformanceDataBuilder bPerformanceData = new PerformanceDataBuilder();
+        bPerformanceData.setTimePeriod(pmr.getTimePeriod());
+        bPerformanceData.setEs(pmr.getEs());
+        bPerformanceData.setSes(pmr.getSes());
+        bPerformanceData.setCses(pmr.getCses());
+        bPerformanceData.setUnavailability(pmr.getUnavailability());
+        bPerformanceData.setTxLevelMin(pmr.getTxLevelMin());
+        bPerformanceData.setTxLevelMax(pmr.getTxLevelMax());
+        bPerformanceData.setTxLevelAvg(pmr.getTxLevelAvg());
+        bPerformanceData.setRxLevelMin(pmr.getRxLevelMin());
+        bPerformanceData.setRxLevelMax(pmr.getRxLevelMax());
+        bPerformanceData.setRxLevelAvg(pmr.getRxLevelAvg());
+        bPerformanceData.setTime2States(pmr.getTime2States());
+        bPerformanceData.setTime4StatesS(pmr.getTime4StatesS());
+        bPerformanceData.setTime4States(pmr.getTime4States());
+        bPerformanceData.setTime8States(pmr.getTime8States());
+        bPerformanceData.setTime16StatesS(pmr.getTime16StatesS());
+        bPerformanceData.setTime16States(pmr.getTime16States());
+        bPerformanceData.setTime32States(pmr.getTime32States());
+        bPerformanceData.setTime64States(pmr.getTime64States());
+        bPerformanceData.setTime128States(pmr.getTime128States());
+        bPerformanceData.setTime256States(pmr.getTime256States());
+        bPerformanceData.setTime512States(pmr.getTime512States());
+        bPerformanceData.setTime512StatesL(pmr.getTime512StatesL());
+        bPerformanceData.setTime1024States(pmr.getTime1024States());
+        bPerformanceData.setTime1024StatesL(pmr.getTime1024StatesL());
+        bPerformanceData.setTime2048States(pmr.getTime2048States());
+        bPerformanceData.setTime2048StatesL(pmr.getTime2048StatesL());
+        bPerformanceData.setTime4096States(pmr.getTime4096States());
+        bPerformanceData.setTime4096StatesL(pmr.getTime4096StatesL());
+        bPerformanceData.setTime8192States(pmr.getTime8192States());
+        bPerformanceData.setTime8192StatesL(pmr.getTime8192StatesL());
+        bPerformanceData.setSnirMin(pmr.getSnirMin());
+        bPerformanceData.setSnirMax(pmr.getSnirMax());
+        bPerformanceData.setSnirAvg(pmr.getSnirAvg());
+        bPerformanceData.setXpdMin(pmr.getXpdMin());
+        bPerformanceData.setXpdMax(pmr.getXpdMax());
+        bPerformanceData.setXpdAvg(pmr.getXpdAvg());
+        bPerformanceData.setRfTempMin(pmr.getRfTempMin());
+        bPerformanceData.setRfTempMax(pmr.getRfTempMax());
+        bPerformanceData.setRfTempAvg(pmr.getRfTempAvg());
+        bPerformanceData.setDefectBlocksSum(pmr.getDefectBlocksSum());
+        this.setPerformanceData(bPerformanceData.build());
+    }
 
-	/**
-	 * Move data to generic type
-	 *
-	 * @param nodeId   of node
-	 * @param lp       to get data from
-	 * @param pmRecord data itself
-	 * @throws InconsistentPMDataException
-	 */
-	public PerformanceDataAirInterface170324Builder(NodeId nodeId, Lp lp, ContainerHistoricalPerformanceTypeG pmRecord)
-			throws InconsistentPMDataException {
-		this(nodeId, lp, (OtnHistoryDataG) pmRecord);
-		org.opendaylight.yang.gen.v1.urn.onf.params.xml.ns.yang.microwave.model.rev170324.container.historical.performance.type.g.@NonNull PerformanceData pmr = Helper
-				.throwIfPerformanceDataNull(pmRecord.getPerformanceData(), getUuidInterface(), getLayerProtocolName());
+    /**
+     * Move data to generic type
+     *
+     * @param nodeId of node
+     * @param lp to get data from
+     * @param pmRecord data itself
+     * @throws InconsistentPMDataException
+     */
+    public PerformanceDataAirInterface170324Builder(NodeId nodeId, Lp lp, ContainerHistoricalPerformanceTypeG pmRecord)
+            throws InconsistentPMDataException {
+        this(nodeId, lp, (OtnHistoryDataG) pmRecord);
+        org.opendaylight.yang.gen.v1.urn.onf.params.xml.ns.yang.microwave.model.rev170324.container.historical.performance.type.g.@NonNull PerformanceData pmr =
+                Helper.throwIfPerformanceDataNull(pmRecord.getPerformanceData(), getUuidInterface(),
+                        getLayerProtocolName());
 
-		PerformanceDataBuilder bPerformanceData = new PerformanceDataBuilder();
-		bPerformanceData.setTimePeriod(pmr.getTimePeriod());
-		bPerformanceData.setTxEthernetBytesMaxM(pmr.getTxEthernetBytesMaxM());
-		bPerformanceData.setTxEthernetBytesMaxS(pmr.getTxEthernetBytesMaxS());
-		bPerformanceData.setTxEthernetBytesSum(pmr.getTxEthernetBytesSum());
-		this.setPerformanceData(bPerformanceData.build());
-	}
+        PerformanceDataBuilder bPerformanceData = new PerformanceDataBuilder();
+        bPerformanceData.setTimePeriod(pmr.getTimePeriod());
+        bPerformanceData.setTxEthernetBytesMaxM(pmr.getTxEthernetBytesMaxM());
+        bPerformanceData.setTxEthernetBytesMaxS(pmr.getTxEthernetBytesMaxS());
+        bPerformanceData.setTxEthernetBytesSum(pmr.getTxEthernetBytesSum());
+        this.setPerformanceData(bPerformanceData.build());
+    }
 
 }
diff --git a/sdnr/wt/devicemanager-onap/onf12/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/onf/ifpac/microwave/pm/PerformanceDataAirInterface180907Builder.java b/sdnr/wt/devicemanager-onap/onf12/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/onf/ifpac/microwave/pm/PerformanceDataAirInterface180907Builder.java
index 7faca3c06..db1b7208a 100644
--- a/sdnr/wt/devicemanager-onap/onf12/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/onf/ifpac/microwave/pm/PerformanceDataAirInterface180907Builder.java
+++ b/sdnr/wt/devicemanager-onap/onf12/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/onf/ifpac/microwave/pm/PerformanceDataAirInterface180907Builder.java
@@ -38,8 +38,8 @@ public class PerformanceDataAirInterface180907Builder extends PmdataEntityBuilde
 
 	private PerformanceDataAirInterface180907Builder(NodeId nodeId, Lp lp, OtnHistoryDataG pmRecord) {
 		super();
-		Optional<GranularityPeriodType> gp = GranularityPeriodType
-				.forName(Helper.nnGetGranularityPeriodType(pmRecord.getGranularityPeriod()).getName());
+		Optional<GranularityPeriodType> gp = Optional.ofNullable(GranularityPeriodType
+				.forName(Helper.nnGetGranularityPeriodType(pmRecord.getGranularityPeriod()).getName()));
 		this.setGranularityPeriod(gp.orElse(GranularityPeriodType.Unknown));
 		this.setUuidInterface(Helper.nnGetUniversalId(lp.getUuid()).getValue());
 		this.setLayerProtocolName(Helper.nnGetLayerProtocolName(lp.getLayerProtocolName()).getValue());
diff --git a/sdnr/wt/devicemanager-onap/onf12/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/onf/ifpac/microwave/pm/PerformanceDataAirInterface181010Builder.java b/sdnr/wt/devicemanager-onap/onf12/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/onf/ifpac/microwave/pm/PerformanceDataAirInterface181010Builder.java
index 6b42bd2d3..e2b519507 100644
--- a/sdnr/wt/devicemanager-onap/onf12/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/onf/ifpac/microwave/pm/PerformanceDataAirInterface181010Builder.java
+++ b/sdnr/wt/devicemanager-onap/onf12/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/onf/ifpac/microwave/pm/PerformanceDataAirInterface181010Builder.java
@@ -38,8 +38,8 @@ public class PerformanceDataAirInterface181010Builder extends PmdataEntityBuilde
 
 	private PerformanceDataAirInterface181010Builder(NodeId nodeId, Lp lp, OtnHistoryDataG pmRecord) {
 		super();
-		Optional<GranularityPeriodType> gp = GranularityPeriodType
-				.forName(Helper.nnGetGranularityPeriodType(pmRecord.getGranularityPeriod()).getName());
+		Optional<GranularityPeriodType> gp = Optional.ofNullable(GranularityPeriodType
+				.forName(Helper.nnGetGranularityPeriodType(pmRecord.getGranularityPeriod()).getName()));
 		this.setGranularityPeriod(gp.orElse(GranularityPeriodType.Unknown));
 		this.setUuidInterface(Helper.nnGetUniversalId(lp.getUuid()).getValue());
 		this.setLayerProtocolName(Helper.nnGetLayerProtocolName(lp.getLayerProtocolName()).getValue());
diff --git a/sdnr/wt/devicemanager-onap/onf12/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/onf/ne/ONFCoreNetworkElement12Base.java b/sdnr/wt/devicemanager-onap/onf12/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/onf/ne/ONFCoreNetworkElement12Base.java
index 8c593038b..00f979125 100644
--- a/sdnr/wt/devicemanager-onap/onf12/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/onf/ne/ONFCoreNetworkElement12Base.java
+++ b/sdnr/wt/devicemanager-onap/onf12/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/onf/ne/ONFCoreNetworkElement12Base.java
@@ -288,7 +288,7 @@ public abstract class ONFCoreNetworkElement12Base extends ONFCoreNetworkElementB
      */
     protected FaultData readNetworkElementCurrentProblems12(FaultData resultList) {
 
-        LOG.info("DBRead Get {} NetworkElementCurrentProblems12", getMountpoint());
+        LOG.debug("DBRead Get {} NetworkElementCurrentProblems12", getMountpoint());
 
         InstanceIdentifier<org.opendaylight.yang.gen.v1.urn.onf.params.xml.ns.yang.onf.core.model.conditional.packages.rev170402.NetworkElementPac> networkElementCurrentProblemsIID =
                 InstanceIdentifier.builder(
diff --git a/sdnr/wt/devicemanager-onap/onf12/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/onf/ne/ONFCoreNetworkElement12Basic.java b/sdnr/wt/devicemanager-onap/onf12/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/onf/ne/ONFCoreNetworkElement12Basic.java
index da9b45fd3..c58289f28 100644
--- a/sdnr/wt/devicemanager-onap/onf12/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/onf/ne/ONFCoreNetworkElement12Basic.java
+++ b/sdnr/wt/devicemanager-onap/onf12/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/onf/ne/ONFCoreNetworkElement12Basic.java
@@ -112,7 +112,7 @@ public class ONFCoreNetworkElement12Basic extends ONFCoreNetworkElement12Base {
                 int problems = faultService.removeAllCurrentProblemsOfNode(nodeId);
                 FaultData resultList = readAllCurrentProblemsOfNode();
                 faultService.initCurrentProblemStatus(nodeId, resultList);
-                LOG.info("Resync mountpoint {} for device {}. Removed {}. Current problems: {}", getMountpoint(),
+                LOG.debug("Resync mountpoint {} for device {}. Removed {}. Current problems: {}", getMountpoint(),
                         getUuId(), problems, resultList.size());
             }
         }
@@ -163,7 +163,7 @@ public class ONFCoreNetworkElement12Basic extends ONFCoreNetworkElement12Base {
 
         equipmentService.writeEquipment(nodeId, equipment.getEquipmentData());
 
-        LOG.info("Found info at {} for device {} number of problems: {}", getMountpoint(), getUuId(),
+        LOG.debug("Found info at {} for device {} number of problems: {}", getMountpoint(), getUuId(),
                 resultList.size());
     }
 
diff --git a/sdnr/wt/devicemanager-onap/onf12/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/onf/ne/ONFCoreNetworkElement12Microwave.java b/sdnr/wt/devicemanager-onap/onf12/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/onf/ne/ONFCoreNetworkElement12Microwave.java
index 766ebdd23..1e6264b94 100644
--- a/sdnr/wt/devicemanager-onap/onf12/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/onf/ne/ONFCoreNetworkElement12Microwave.java
+++ b/sdnr/wt/devicemanager-onap/onf12/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/onf/ne/ONFCoreNetworkElement12Microwave.java
@@ -119,7 +119,7 @@ public class ONFCoreNetworkElement12Microwave extends ONFCoreNetworkElement12Bas
                 int problems = microwaveEventListener.removeAllCurrentProblemsOfNode(nodeId);
                 FaultData resultList = readAllCurrentProblemsOfNode();
                 microwaveEventListener.initCurrentProblemStatus(nodeId, resultList);
-                LOG.info("Resync mountpoint {} for device {}. Removed {}. Current problems: {}", getMountpoint(),
+                LOG.debug("Resync mountpoint {} for device {}. Removed {}. Current problems: {}", getMountpoint(),
                         getUuId(), problems, resultList.size());
             }
         }
@@ -218,7 +218,7 @@ public class ONFCoreNetworkElement12Microwave extends ONFCoreNetworkElement12Bas
         LOG.debug("DB write current problems completed");
         equipmentService.writeEquipment(nodeId, equipment.getEquipmentData());
 
-        LOG.info("Found info at {} for device {} number of problems: {}", getMountpoint(), getUuId(),
+        LOG.debug("Found info at {} for device {} number of problems: {}", getMountpoint(), getUuId(),
                 resultList.size());
     }
 
@@ -321,7 +321,7 @@ public class ONFCoreNetworkElement12Microwave extends ONFCoreNetworkElement12Bas
         // QName qName =
         // org.opendaylight.yangtools.yang.common.QName.create("urn:onf:params:xml:ns:yang:microwave-model",
         // "2017-03-24", "mw-air-interface-pac").intern();
-        LOG.info("LpExtension capability={} revision={} conditionalPackage={}", capability, revision,
+        LOG.debug("LpExtension capability={} revision={} conditionalPackage={}", capability, revision,
                 conditionalPackage);
         if (capability != null && !capability.isEmpty() && !revision.isEmpty() && !conditionalPackage.isEmpty()) {
             try {
@@ -377,7 +377,7 @@ public class ONFCoreNetworkElement12Microwave extends ONFCoreNetworkElement12Bas
      */
     @Override
     public void doRegisterEventListener(MountPoint mountPoint) {
-        LOG.info("Begin registration listener for Mountpoint");
+        LOG.debug("Begin registration listener for Mountpoint");
         final Optional<NotificationService> optionalNotificationService =
                 mountPoint.getService(NotificationService.class);
         if (optionalNotificationService.isPresent()) {
@@ -385,7 +385,7 @@ public class ONFCoreNetworkElement12Microwave extends ONFCoreNetworkElement12Bas
             // notificationService.registerNotificationListener(microwaveEventListener);
             listenerRegistrationresult =
                     notificationService.registerNotificationListener(microwaveModel.getNotificationListener());
-            LOG.info("End registration listener for Mountpoint Result: {}", listenerRegistrationresult);
+            LOG.debug("End registration listener for Mountpoint Result: {}", listenerRegistrationresult);
         } else {
             LOG.error("Could not get NotificationService, hence microwave notification listener not registered");
         }
diff --git a/sdnr/wt/devicemanager-onap/onf12/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/onf/ne/ONFCoreNetworkElementBase.java b/sdnr/wt/devicemanager-onap/onf12/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/onf/ne/ONFCoreNetworkElementBase.java
index 318741dd9..8195772a8 100644
--- a/sdnr/wt/devicemanager-onap/onf12/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/onf/ne/ONFCoreNetworkElementBase.java
+++ b/sdnr/wt/devicemanager-onap/onf12/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/onf/ne/ONFCoreNetworkElementBase.java
@@ -46,7 +46,7 @@ public abstract class ONFCoreNetworkElementBase implements AutoCloseable, ONFCor
     private final NetconfBindingAccessor acessor;
 
     protected ONFCoreNetworkElementBase(NetconfBindingAccessor acessor) {
-        LOG.info("Create ONFCoreNetworkElementBase");
+        LOG.debug("Create ONFCoreNetworkElementBase");
         this.mountPointNodeName = acessor.getNodeId().getValue();
         this.nodeId = acessor.getNodeId();
         this.netconfNodeDataBroker = acessor.getDataBroker();