Revert "update common and data-provider"

This reverts commit a3e70a1a48d13193d9f28a2d91089d5b253d3e91. Change was incomplete - many modules still reference version 2.1.0 (Sodium-based) of CCSDK parent poms, causing version conflicts in odlsli docker. Issue-ID: CCSDK-3076 Signed-off-by: Dan Timoney <dtimoney@att.com> Change-Id: I447371239a1bfe102b705e7ecbd964f368780657
author: Dan Timoney <dtimoney@att.com> 2021-01-29 12:46:06 -0500
committer: Dan Timoney <dtimoney@att.com> 2021-01-29 12:47:35 -0500
commit: 4e69f3358d31173a222b275e2a82da692846aa1a (patch)
tree: 7355744a66614a0811113ee6a43a423e68257fe3 /sdnr/wt
parent: 123b423cddbe01bdaba0bea50d986ff1b18a25bc (diff)
85 files changed, 777 insertions, 1785 deletions
diff --git a/sdnr/wt/common/pom.xml b/sdnr/wt/common/pom.xml
index 83b07536f..54ffc01c3 100644
--- a/sdnr/wt/common/pom.xml
+++ b/sdnr/wt/common/pom.xml
@@ -29,14 +29,14 @@
     <parent>
         <groupId>org.onap.ccsdk.parent</groupId>
         <artifactId>binding-parent</artifactId>
-        <version>2.1.1-SNAPSHOT</version>
+        <version>2.1.0</version>
         <relativePath/>
     </parent>
 
     <groupId>org.onap.ccsdk.features.sdnr.wt</groupId>
     <artifactId>sdnr-wt-common</artifactId>
     <version>1.1.1-SNAPSHOT</version>
-    <packaging>bundle</packaging>
+    <packaging>jar</packaging>
 
     <name>ccsdk-features :: ${project.artifactId}</name>
     <licenses>
@@ -47,6 +47,7 @@
     </licenses>
 
     <properties>
+        <checkstyle.skip>true</checkstyle.skip> <!-- POM configuration -->
         <maven.javadoc.skip>true</maven.javadoc.skip>
         <maven.build.timestamp.format>yyyy-MM-dd HH:mm</maven.build.timestamp.format>
         <buildtime>${maven.build.timestamp} UTC</buildtime>
@@ -62,7 +63,7 @@
         </dependency>
         <dependency>
             <groupId>javax.servlet</groupId>
-            <artifactId>javax.servlet-api</artifactId>
+            <artifactId>servlet-api</artifactId>
         </dependency>
         <dependency>
             <groupId>org.osgi</groupId>
@@ -76,6 +77,7 @@
         <dependency>
             <groupId>org.elasticsearch.client</groupId>
             <artifactId>elasticsearch-rest-client</artifactId>
+            <version>${elasticsearch-rest-client.version}</version>
         </dependency>
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
@@ -90,8 +92,8 @@
             <artifactId>jackson-databind</artifactId>
         </dependency>
         <dependency>
-              <groupId>com.google.code.findbugs</groupId>
-              <artifactId>annotations</artifactId>
+            <groupId>com.google.code.findbugs</groupId>
+            <artifactId>annotations</artifactId>
         </dependency>
     </dependencies>
 
@@ -112,6 +114,7 @@
             <plugin>
                 <groupId>com.github.alexcojocaru</groupId>
                 <artifactId>elasticsearch-maven-plugin</artifactId>
+                <version>6.16</version>
                 <configuration>
                     <skip>${skipTests}</skip>
                     <clusterName>testCluster</clusterName>
diff --git a/sdnr/wt/common/src/main/java/org/onap/ccsdk/features/sdnr/wt/common/database/SearchResult.java b/sdnr/wt/common/src/main/java/org/onap/ccsdk/features/sdnr/wt/common/database/SearchResult.java
index 529853e08..5a011eec9 100644
--- a/sdnr/wt/common/src/main/java/org/onap/ccsdk/features/sdnr/wt/common/database/SearchResult.java
+++ b/sdnr/wt/common/src/main/java/org/onap/ccsdk/features/sdnr/wt/common/database/SearchResult.java
@@ -45,6 +45,10 @@ public class SearchResult<T> {
         this.total = total;
     }
 
+    //	public SearchResult(List<T> hits,long total) {
+    //		this.hits = hits;
+    //		this.total = total;
+    //	}
     public SearchResult() {
         this.hits = new ArrayList<>();
         this.total = 0;
@@ -65,11 +69,4 @@ public class SearchResult<T> {
     public void add(T object) {
         this.hits.add(object);
     }
-
-    @Override
-    public String toString() {
-        return "SearchResult [hits=" + hits + ", total=" + total + "]";
-    }
-
-
 }
diff --git a/sdnr/wt/common/src/main/java/org/onap/ccsdk/features/sdnr/wt/common/http/BaseHTTPClient.java b/sdnr/wt/common/src/main/java/org/onap/ccsdk/features/sdnr/wt/common/http/BaseHTTPClient.java
index 198fb920c..155e51609 100644
--- a/sdnr/wt/common/src/main/java/org/onap/ccsdk/features/sdnr/wt/common/http/BaseHTTPClient.java
+++ b/sdnr/wt/common/src/main/java/org/onap/ccsdk/features/sdnr/wt/common/http/BaseHTTPClient.java
@@ -48,11 +48,7 @@ import java.security.interfaces.RSAPrivateKey;
 import java.security.spec.InvalidKeySpecException;
 import java.security.spec.PKCS8EncodedKeySpec;
 import java.util.Base64;
-import java.util.Enumeration;
-import java.util.HashMap;
-import java.util.List;
 import java.util.Map;
-import java.util.Map.Entry;
 import javax.annotation.Nonnull;
 import javax.net.ssl.HostnameVerifier;
 import javax.net.ssl.HttpsURLConnection;
@@ -60,7 +56,7 @@ import javax.net.ssl.KeyManager;
 import javax.net.ssl.KeyManagerFactory;
 import javax.net.ssl.SSLContext;
 import javax.net.ssl.TrustManager;
-import javax.servlet.http.HttpServletRequest;
+import javax.xml.bind.DatatypeConverter;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -115,29 +111,6 @@ public class BaseHTTPClient {
             throws IOException {
         return this.sendRequest(uri, method, body != null ? body.getBytes(CHARSET) : null, headers);
     }
-    public BaseHTTPResponse sendRequest(HttpServletRequest req) throws IOException {
-        final String method = req.getMethod();
-        byte[] buffer=null;
-
-        if(!"GET".equals(method)) {
-            InputStream is = req.getInputStream();
-            buffer=is.readAllBytes();
-            is.close();
-
-        }
-        return this.sendRequest(req.getRequestURI(), method, buffer,mapHeaders(req));
-    }
-
-    private Map<String, String> mapHeaders(HttpServletRequest req) {
-        Map<String,String> headers = new HashMap<>();
-        Enumeration<String> keys = req.getHeaderNames();
-        String key;
-        while(keys.hasMoreElements()) {
-            key=keys.nextElement();
-            headers.put(key,req.getHeader(key));
-        }
-        return headers;
-    }
 
     protected @Nonnull BaseHTTPResponse sendRequest(String uri, String method, byte[] body, Map<String, String> headers)
             throws IOException {
@@ -191,16 +164,10 @@ public class BaseHTTPClient {
         // Receive answer
         int responseCode = ((HttpURLConnection) http).getResponseCode();
         String sresponse = "";
-        Map<String,String> responseHeaders = null;
         InputStream response = null;
         try {
             if (responseCode >= 200 && responseCode < 300) {
                 response = http.getInputStream();
-                responseHeaders = new HashMap<>();
-                for(Entry<String,List<String>> entry:http.getHeaderFields().entrySet()) {
-                    responseHeaders.put(entry.getKey(), String.join(";", entry.getValue()));
-                }
-
             } else {
                 response = ((HttpURLConnection) http).getErrorStream();
                 if (response == null) {
@@ -228,7 +195,7 @@ public class BaseHTTPClient {
         }
         LOG.debug("ResponseCode: " + responseCode);
         LOG.trace("Response (len:{}): {}", String.valueOf(lensum), sresponse);
-        return new BaseHTTPResponse(responseCode, sresponse,responseHeaders);
+        return new BaseHTTPResponse(responseCode, sresponse);
     }
 
     public static SSLContext setupSsl(boolean trustall)
@@ -332,7 +299,7 @@ public class BaseHTTPClient {
         String data = new String(pem);
         String[] tokens = data.split(beginDelimiter);
         tokens = tokens[1].split(endDelimiter);
-        return Base64.getDecoder().decode(tokens[0]);
+        return DatatypeConverter.parseBase64Binary(tokens[0]);
     }
 
     protected static RSAPrivateKey generatePrivateKeyFromDER(byte[] keyBytes)
@@ -370,6 +337,4 @@ public class BaseHTTPClient {
         return SSLCERT_PEM;
     }
 
-
-
 }
diff --git a/sdnr/wt/common/src/main/java/org/onap/ccsdk/features/sdnr/wt/common/http/BaseHTTPResponse.java b/sdnr/wt/common/src/main/java/org/onap/ccsdk/features/sdnr/wt/common/http/BaseHTTPResponse.java
index a0fd7220e..91a2cc27c 100644
--- a/sdnr/wt/common/src/main/java/org/onap/ccsdk/features/sdnr/wt/common/http/BaseHTTPResponse.java
+++ b/sdnr/wt/common/src/main/java/org/onap/ccsdk/features/sdnr/wt/common/http/BaseHTTPResponse.java
@@ -21,8 +21,6 @@
  */
 package org.onap.ccsdk.features.sdnr.wt.common.http;
 
-import java.util.Map;
-
 public class BaseHTTPResponse {
 
     public static final int CODE404 = 404;
@@ -30,14 +28,10 @@ public class BaseHTTPResponse {
     public static final BaseHTTPResponse UNKNOWN = new BaseHTTPResponse(-1, "");
     public final int code;
     public final String body;
-    public final Map<String,String> headers;
+
     public BaseHTTPResponse(int code, String body) {
-        this(code, body, null);
-    }
-    public BaseHTTPResponse(int code, String body, Map<String,String> rawData) {
         this.code = code;
         this.body = body;
-        this.headers = rawData;
     }
 
     @Override
@@ -46,6 +40,6 @@ public class BaseHTTPResponse {
     }
 
     public boolean isSuccess() {
-        return this.code >= CODE200 && this.code<300;
+        return this.code == CODE200;
     }
 }
diff --git a/sdnr/wt/common/src/main/java/org/onap/ccsdk/features/sdnr/wt/common/http/BaseServlet.java b/sdnr/wt/common/src/main/java/org/onap/ccsdk/features/sdnr/wt/common/http/BaseServlet.java
index f66070200..59e4e7705 100644
--- a/sdnr/wt/common/src/main/java/org/onap/ccsdk/features/sdnr/wt/common/http/BaseServlet.java
+++ b/sdnr/wt/common/src/main/java/org/onap/ccsdk/features/sdnr/wt/common/http/BaseServlet.java
@@ -32,6 +32,7 @@ import java.security.NoSuchAlgorithmException;
 import java.util.Enumeration;
 import java.util.List;
 import java.util.Map;
+
 import javax.net.ssl.HostnameVerifier;
 import javax.net.ssl.HttpsURLConnection;
 import javax.net.ssl.SSLContext;
@@ -40,6 +41,7 @@ import javax.servlet.ServletException;
 import javax.servlet.http.HttpServlet;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
+
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -326,9 +328,9 @@ public abstract class BaseServlet extends HttpServlet {
             response = http.getInputStream();
         } else {
             response = http.getErrorStream();
-//            if (response == null) {
-//                response = http.getInputStream();
-//            }
+            if (response == null) {
+                http.getInputStream();
+            }
         }
 
         LOG.debug("ResponseCode: {}", responseCode);
diff --git a/sdnr/wt/common/src/main/java/org/onap/ccsdk/features/sdnr/wt/common/test/ServletInputStreamFromByteArrayInputStream.java b/sdnr/wt/common/src/main/java/org/onap/ccsdk/features/sdnr/wt/common/test/ServletInputStreamFromByteArrayInputStream.java
index 6475ac3c9..b926ff65c 100644
--- a/sdnr/wt/common/src/main/java/org/onap/ccsdk/features/sdnr/wt/common/test/ServletInputStreamFromByteArrayInputStream.java
+++ b/sdnr/wt/common/src/main/java/org/onap/ccsdk/features/sdnr/wt/common/test/ServletInputStreamFromByteArrayInputStream.java
@@ -23,7 +23,6 @@ package org.onap.ccsdk.features.sdnr.wt.common.test;
 
 import java.io.ByteArrayInputStream;
 import java.io.IOException;
-import javax.servlet.ReadListener;
 import javax.servlet.ServletInputStream;
 
 public class ServletInputStreamFromByteArrayInputStream extends ServletInputStream {
@@ -43,18 +42,4 @@ public class ServletInputStreamFromByteArrayInputStream extends ServletInputStre
         return bis.read();
     }
 
-    @Override
-    public boolean isFinished() {
-        return false;
-    }
-
-    @Override
-    public boolean isReady() {
-        return false;
-    }
-
-    @Override
-    public void setReadListener(ReadListener readListener) {
-    }
-
 }
diff --git a/sdnr/wt/common/src/main/java/org/onap/ccsdk/features/sdnr/wt/common/test/ServletOutputStreamToByteArrayOutputStream.java b/sdnr/wt/common/src/main/java/org/onap/ccsdk/features/sdnr/wt/common/test/ServletOutputStreamToByteArrayOutputStream.java
index 3ea607cc0..1914d9b67 100644
--- a/sdnr/wt/common/src/main/java/org/onap/ccsdk/features/sdnr/wt/common/test/ServletOutputStreamToByteArrayOutputStream.java
+++ b/sdnr/wt/common/src/main/java/org/onap/ccsdk/features/sdnr/wt/common/test/ServletOutputStreamToByteArrayOutputStream.java
@@ -24,7 +24,6 @@ package org.onap.ccsdk.features.sdnr.wt.common.test;
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import javax.servlet.ServletOutputStream;
-import javax.servlet.WriteListener;
 
 public class ServletOutputStreamToByteArrayOutputStream extends ServletOutputStream {
 
@@ -33,21 +32,12 @@ public class ServletOutputStreamToByteArrayOutputStream extends ServletOutputStr
 
     // end of variables
 
-    public ByteArrayOutputStream getByteArrayOutputStream() {
-        return out;
-    }
-
-    @Override
-    public void setWriteListener(WriteListener writeListener) {
-    }
-
     @Override
-    public void write(int b) throws IOException {
-        out.write(b);
+    public void write(int arg0) throws IOException {
+        out.write(arg0);
     }
 
-    @Override
-    public boolean isReady() {
-        return false;
+    public ByteArrayOutputStream getByteArrayOutputStream() {
+        return out;
     }
 }
diff --git a/sdnr/wt/common/src/main/java/org/onap/ccsdk/features/sdnr/wt/common/test/ServletOutputStreamToStringWriter.java b/sdnr/wt/common/src/main/java/org/onap/ccsdk/features/sdnr/wt/common/test/ServletOutputStreamToStringWriter.java
index 48d9f940f..57ed596ae 100644
--- a/sdnr/wt/common/src/main/java/org/onap/ccsdk/features/sdnr/wt/common/test/ServletOutputStreamToStringWriter.java
+++ b/sdnr/wt/common/src/main/java/org/onap/ccsdk/features/sdnr/wt/common/test/ServletOutputStreamToStringWriter.java
@@ -24,7 +24,6 @@ package org.onap.ccsdk.features.sdnr.wt.common.test;
 import java.io.IOException;
 import java.io.StringWriter;
 import javax.servlet.ServletOutputStream;
-import javax.servlet.WriteListener;
 
 public class ServletOutputStreamToStringWriter extends ServletOutputStream {
 
@@ -32,28 +31,13 @@ public class ServletOutputStreamToStringWriter extends ServletOutputStream {
     private StringWriter out = new StringWriter();
     // end of variables
 
-    public StringWriter getStringWriter() {
-        return out;
-    }
-
     @Override
     public void write(int arg0) throws IOException {
         out.write(arg0);
     }
 
-    @Override
-    public String toString() {
-        return out.toString();
-    }
-
-    @Override
-    public boolean isReady() {
-        return false;
-    }
-
-    @Override
-    public void setWriteListener(WriteListener writeListener) {
+    public StringWriter getStringWriter() {
+        return out;
     }
 
-
 }
diff --git a/sdnr/wt/common/src/test/resources/testpom.xml b/sdnr/wt/common/src/test/resources/testpom.xml
index 6fba87af9..1adf713c1 100644
--- a/sdnr/wt/common/src/test/resources/testpom.xml
+++ b/sdnr/wt/common/src/test/resources/testpom.xml
@@ -29,13 +29,13 @@
     <parent>
         <groupId>org.onap.ccsdk.parent</groupId>
         <artifactId>binding-parent</artifactId>
-        <version>2.0.0-SNAPSHOT</version>
+        <version>2.1.0</version>
         <relativePath/>
     </parent>
 
     <groupId>org.onap.ccsdk.features.sdnr.wt</groupId>
     <artifactId>sdnr-wt-common</artifactId>
-    <version>1.0.0-SNAPSHOT</version>
+    <version>1.1.1-SNAPSHOT</version>
     <packaging>jar</packaging>
 
     <name>ccsdk-features :: ${project.artifactId}</name>
diff --git a/sdnr/wt/data-provider/feature/pom.xml b/sdnr/wt/data-provider/feature/pom.xml
index 9b80c59ac..f16715772 100644
--- a/sdnr/wt/data-provider/feature/pom.xml
+++ b/sdnr/wt/data-provider/feature/pom.xml
@@ -29,7 +29,7 @@
     <parent>
         <groupId>org.onap.ccsdk.parent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>2.1.1-SNAPSHOT</version>
+        <version>2.1.0</version>
         <relativePath/>
     </parent>
 
diff --git a/sdnr/wt/data-provider/installer/pom.xml b/sdnr/wt/data-provider/installer/pom.xml
index 3f859fbb4..00bc0e061 100755
--- a/sdnr/wt/data-provider/installer/pom.xml
+++ b/sdnr/wt/data-provider/installer/pom.xml
@@ -29,7 +29,7 @@
     <parent>
         <groupId>org.onap.ccsdk.parent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>2.1.1-SNAPSHOT</version>
+        <version>2.1.0</version>
         <relativePath/>
     </parent>
 
diff --git a/sdnr/wt/data-provider/model/pom.xml b/sdnr/wt/data-provider/model/pom.xml
index f968bf409..0f8ce415a 100644
--- a/sdnr/wt/data-provider/model/pom.xml
+++ b/sdnr/wt/data-provider/model/pom.xml
@@ -29,7 +29,7 @@
     <parent>
         <groupId>org.onap.ccsdk.parent</groupId>
         <artifactId>binding-parent</artifactId>
-        <version>2.1.1-SNAPSHOT</version>
+        <version>2.1.0</version>
         <relativePath/>
     </parent>
 
diff --git a/sdnr/wt/data-provider/model/src/main/java/org/onap/ccsdk/features/sdnr/wt/dataprovider/model/types/NetconfTimeStampImpl.java b/sdnr/wt/data-provider/model/src/main/java/org/onap/ccsdk/features/sdnr/wt/dataprovider/model/types/NetconfTimeStampImpl.java
index bd71d5ba1..c7f921708 100644
--- a/sdnr/wt/data-provider/model/src/main/java/org/onap/ccsdk/features/sdnr/wt/dataprovider/model/types/NetconfTimeStampImpl.java
+++ b/sdnr/wt/data-provider/model/src/main/java/org/onap/ccsdk/features/sdnr/wt/dataprovider/model/types/NetconfTimeStampImpl.java
@@ -24,7 +24,6 @@ import java.time.ZonedDateTime;
 import java.time.format.DateTimeFormatter;
 import java.time.format.DateTimeParseException;
 import java.util.Date;
-import org.eclipse.jdt.annotation.Nullable;
 import org.onap.ccsdk.features.sdnr.wt.dataprovider.model.NetconfTimeStamp;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.yang.types.rev130715.DateAndTime;
 import org.slf4j.Logger;
@@ -67,10 +66,6 @@ public class NetconfTimeStampImpl implements NetconfTimeStamp {
     private static final Logger LOG = LoggerFactory.getLogger(NetconfTimeStamp.class);
 
     private static final NetconfTimeStamp CONVERTER = new NetconfTimeStampImpl();
-    private static final String TESTPATTERNSTRING = "2017-01-01T00:00:00.0Z";
-    //private static final String INITIALPATTERN = "0000-00-00T00:00:00.0Z";
-
-    private static final DateAndTime TESTPATTERN = new DateAndTime(TESTPATTERNSTRING);
 
     /**
      * Specify the input format expected from netconf, and from specific devices.
@@ -96,7 +91,7 @@ public class NetconfTimeStampImpl implements NetconfTimeStamp {
 
     /**
      * Use this function to get the converter
-     *
+     * 
      * @return global converter
      */
     public static NetconfTimeStamp getConverter() {
@@ -115,7 +110,7 @@ public class NetconfTimeStampImpl implements NetconfTimeStamp {
 
     /**
      * Get actual timestamp as NETCONF specific type NETCONF/YANG 1.0 Format
-     *
+     * 
      * @return String with Date in NETCONF/YANG Format Version 1.0.
      */
     @Override
@@ -137,7 +132,7 @@ public class NetconfTimeStampImpl implements NetconfTimeStamp {
 
     /**
      * Get time from date as NETCONF specific type NETCONF/YANG 1.0 Format in GMT
-     *
+     * 
      * @param date specifying the date and time
      * @return DateAndTime Type 1.0. Date in NETCONF/YANG Format Version 1.0.
      */
@@ -148,7 +143,7 @@ public class NetconfTimeStampImpl implements NetconfTimeStamp {
 
     /**
      * Get time from date as NETCONF specific type NETCONF/YANG 1.0 Format in GMT
-     *
+     * 
      * @param date specifying the date and time
      * @return DateAndTime Type 1.0. Date in NETCONF/YANG Format Version 1.0.
      */
@@ -194,14 +189,6 @@ public class NetconfTimeStampImpl implements NetconfTimeStamp {
         return "Malformed date: " + netconfTime; // Error handling
     }
 
-    /**
-     * Return testpattern
-     * @return
-     */
-    public static @Nullable DateAndTime getTestpatternDateAndTime() {
-        return TESTPATTERN;
-    }
-
     /*----------------------------------------------------
      * Private functions
      */
diff --git a/sdnr/wt/data-provider/model/src/main/java/org/onap/ccsdk/features/sdnr/wt/dataprovider/model/types/ScalarTypeObject.java b/sdnr/wt/data-provider/model/src/main/java/org/onap/ccsdk/features/sdnr/wt/dataprovider/model/types/ScalarTypeObject.java
deleted file mode 100644
index da52f3125..000000000
--- a/sdnr/wt/data-provider/model/src/main/java/org/onap/ccsdk/features/sdnr/wt/dataprovider/model/types/ScalarTypeObject.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * ============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.dataprovider.model.types;
-
-public class ScalarTypeObject {
-
-    // constants
-    // end of constants
-
-    // variables
-    // end of variables
-
-    // constructors
-    // end of constructors
-
-    // getters and setters
-    // end of getters and setters
-
-    // private methods
-    // end of private methods
-
-    // public methods
-    // end of public methods
-
-    // static methods
-    // end of static methods
-
-    // private classes
-    // end of private classes
-}
diff --git a/sdnr/wt/data-provider/model/src/main/java/org/onap/ccsdk/features/sdnr/wt/dataprovider/model/types/YangHelper2.java b/sdnr/wt/data-provider/model/src/main/java/org/onap/ccsdk/features/sdnr/wt/dataprovider/model/types/YangHelper2.java
index dd90d29c8..339bf7c6e 100644
--- a/sdnr/wt/data-provider/model/src/main/java/org/onap/ccsdk/features/sdnr/wt/dataprovider/model/types/YangHelper2.java
+++ b/sdnr/wt/data-provider/model/src/main/java/org/onap/ccsdk/features/sdnr/wt/dataprovider/model/types/YangHelper2.java
@@ -69,18 +69,10 @@ public class YangHelper2 {
     public static @NonNull Integer getInteger(@Nullable Uint16 val) {
         return val.intValue();
     }
-
-    public static @NonNull Long getInteger(@Nullable Long val) {
-        return val;
-    }
-
-    public static @NonNull Long getInteger(@Nullable Uint32 val) {
-        return val.longValue();
-    }
     /**
      * Aluminium version
      */
-    public static <K extends Identifier<T>,T extends Identifiable<K>> Map<K, T> getListOrMap(Class<K> clazz, List<T> list) {
+    public static <K extends Identifier<T>,T extends Identifiable<K>> Map<K, T> getListOrMapALUMINIUM(Class<K> clazz, List<T> list) {
         Map<K,T> map = new HashMap<>();
         for(T listelement:list) {
             Constructor<K> constructor;
@@ -94,20 +86,17 @@ public class YangHelper2 {
         }
         return map;
     }
-    public static <K extends Identifier<T>,T extends Identifiable<K>> Map<K, T> getListOrMap(Class<K> clazz, T listElement) {
-        return getListOrMap(clazz, Arrays.asList(listElement) );
+    public static <K extends Identifier<T>,T extends Identifiable<K>> Map<K, T> getListOrMapALUMINIUM(Class<K> clazz, T listElement) {
+        return getListOrMapALUMINIUM(clazz, Arrays.asList(listElement) );
     }
-    public static Uint32 getLongOrUint32(long longVal) {
-        return Uint32.valueOf(longVal);
-    }
-    public static Uint32 getLongOrUint32(Long longVal) {
-        return Uint32.valueOf(longVal);
-    }
-    public static Uint64 getBigIntegerOrUint64(BigInteger value) {
-        return Uint64.valueOf(value);
+    /**
+     * Sodium version
+     */
+    public static <K extends Identifier<T>,T extends Identifiable<K>> List<T> getListOrMap(Class<K> clazz, List<T> list) {
+        return list;
     }
-    public static Class<?> getScalarTypeObjectClass() {
-        return org.opendaylight.yangtools.yang.binding.ScalarTypeObject.class;
+    public static <K extends Identifier<T>,T extends Identifiable<K>> List<T> getListOrMap(Class<K> clazz, T listElement) {
+        return Arrays.asList(listElement);
     }
 
 }
diff --git a/sdnr/wt/data-provider/model/src/main/java/org/opendaylight/yang/gen/v1/http/org/openroadm/pm/types/rev191129/PmDataTypeBuilder.java b/sdnr/wt/data-provider/model/src/main/java/org/opendaylight/yang/gen/v1/http/org/openroadm/pm/types/rev191129/PmDataTypeBuilder.java
index f89197b82..b660787c6 100644
--- a/sdnr/wt/data-provider/model/src/main/java/org/opendaylight/yang/gen/v1/http/org/openroadm/pm/types/rev191129/PmDataTypeBuilder.java
+++ b/sdnr/wt/data-provider/model/src/main/java/org/opendaylight/yang/gen/v1/http/org/openroadm/pm/types/rev191129/PmDataTypeBuilder.java
@@ -1,7 +1,11 @@
 package org.opendaylight.yang.gen.v1.http.org.openroadm.pm.types.rev191129;
 
 import com.fasterxml.jackson.databind.annotation.JsonPOJOBuilder;
+import java.lang.reflect.Constructor;
+import java.lang.reflect.InvocationTargetException;
 import java.math.BigDecimal;
+import java.math.BigInteger;
+import java.util.Optional;
 import org.opendaylight.yangtools.yang.common.Uint64;
 
 /**
@@ -13,17 +17,20 @@ import org.opendaylight.yangtools.yang.common.Uint64;
  * finished by the user. This class is generated only once to prevent loss of user code.
  *
  */
-@JsonPOJOBuilder(buildMethodName = "build", withPrefix = "set")
+@JsonPOJOBuilder(buildMethodName = "build", withPrefix = "with")
 public class PmDataTypeBuilder {
     private Uint64 _uint64;
+    private BigInteger _unint64;
     private Long _int64;
     private BigDecimal _decimal64;
 
-    public PmDataTypeBuilder() {}
+    public PmDataTypeBuilder() {
+        System.out.println("--  Builder");
+    }
 
-    //Aluminium uses constructor
-    public PmDataTypeBuilder(String v) {
-        this.setUint64(v);
+    public PmDataTypeBuilder setUnint64(String v) {
+        _unint64 = new BigInteger(v);
+        return this;
     }
 
     public PmDataTypeBuilder setUint64(String v) {
@@ -32,7 +39,7 @@ public class PmDataTypeBuilder {
     }
 
     public PmDataTypeBuilder setInt64(String v) {
-        _int64 = Long.valueOf(v);
+        _int64 = new Long(v);
         return this;
     }
 
@@ -42,17 +49,37 @@ public class PmDataTypeBuilder {
     }
 
     public PmDataType build() {
-        if (_uint64 != null) {
-            return new PmDataType(_uint64);
-        } else if (_int64 != null) {
-            return new PmDataType(_int64);
-        } else {
-            return new PmDataType(_decimal64);
+        Optional<Constructor<PmDataType>> cons1;
+        try {
+            cons1 = Optional.of(PmDataType.class.getConstructor(BigInteger.class));
+        } catch (NoSuchMethodException | SecurityException e) {
+            cons1 = Optional.empty();
+        }
+        Optional<Constructor<PmDataType>> cons2;
+        try {
+            cons2 = Optional.of(PmDataType.class.getConstructor(Uint64.class));
+        } catch (NoSuchMethodException | SecurityException e) {
+            cons2 = Optional.empty();
+        }
+
+        try {
+            if (_unint64 != null) {
+                return cons1.get().newInstance(_unint64);
+            } else if (_uint64 != null) {
+                return cons2.get().newInstance(_uint64);
+            } else if (_int64 != null) {
+                return new PmDataType(_int64);
+            } else {
+                return new PmDataType(_decimal64);
+            }
+        } catch (InstantiationException | IllegalAccessException | IllegalArgumentException
+                | InvocationTargetException e) {
+            throw new IllegalArgumentException("Wrong stuff");
         }
     }
 
     public static PmDataType getDefaultInstance(String defaultValue) {
-        return new PmDataTypeBuilder().setUint64(defaultValue).build();
+        return new PmDataTypeBuilder().setInt64("-1").build();
     }
 
 }
diff --git a/sdnr/wt/data-provider/pom.xml b/sdnr/wt/data-provider/pom.xml
index 05b121ce0..605cd2008 100755
--- a/sdnr/wt/data-provider/pom.xml
+++ b/sdnr/wt/data-provider/pom.xml
@@ -29,7 +29,7 @@
     <parent>
         <groupId>org.onap.ccsdk.parent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>2.1.1-SNAPSHOT</version>
+        <version>2.1.0</version>
         <relativePath/>
     </parent>
 
diff --git a/sdnr/wt/data-provider/provider/java.sh b/sdnr/wt/data-provider/provider/java.sh
deleted file mode 100755
index 26d5aea4b..000000000
--- a/sdnr/wt/data-provider/provider/java.sh
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/bin/bash
-# Java startup helper
-# if JAVA_HOME is specified, use related version
-
-echo "Java run helper"
-
-if [ ! -z "$JAVA_HOME" ] ; then
-  echo "JAVA_HOME=$JAVA_HOME"
-  $JAVA_HOME/bin/java "$@"
-else
-  echo "Java on path"
-  java "$@"
-fi
-
diff --git a/sdnr/wt/data-provider/provider/pom.xml b/sdnr/wt/data-provider/provider/pom.xml
index 445c66daf..cb40f71cc 100644
--- a/sdnr/wt/data-provider/provider/pom.xml
+++ b/sdnr/wt/data-provider/provider/pom.xml
@@ -29,7 +29,7 @@
     <parent>
         <groupId>org.onap.ccsdk.parent</groupId>
         <artifactId>binding-parent</artifactId>
-        <version>2.1.1-SNAPSHOT</version>
+        <version>2.1.0</version>
         <relativePath/>
     </parent>
 
@@ -79,7 +79,7 @@
         </dependency>
         <dependency>
             <groupId>javax.servlet</groupId>
-            <artifactId>javax.servlet-api</artifactId>
+            <artifactId>servlet-api</artifactId>
         </dependency>
         <dependency>
             <groupId>org.osgi</groupId>
@@ -92,11 +92,11 @@
             <artifactId>org.apache.karaf.shell.core</artifactId>
             <scope>provided</scope>
         </dependency>
-<!--          <dependency> -->
-<!--             <groupId>org.apache.karaf.bundle</groupId> -->
-<!--             <artifactId>org.apache.karaf.bundle.core</artifactId> -->
-<!--             <scope>provided</scope> -->
-<!--         </dependency> -->
+        <!--          <dependency> -->
+        <!--             <groupId>org.apache.karaf.bundle</groupId> -->
+        <!--             <artifactId>org.apache.karaf.bundle.core</artifactId> -->
+        <!--             <scope>provided</scope> -->
+        <!--         </dependency> -->
         <dependency>
             <groupId>org.opendaylight.netconf</groupId>
             <artifactId>sal-netconf-connector</artifactId>
@@ -149,7 +149,7 @@
                             <goal>exec</goal>
                         </goals>
                         <configuration>
-                            <executable>${basedir}/java.sh</executable>
+                            <executable>java</executable>
                             <arguments>
                                 <argument>-jar</argument>
                                 <argument>${basedir}/../../data-provider/setup/target/sdnr-dmt.jar</argument>
diff --git a/sdnr/wt/data-provider/provider/simplelogger.properties b/sdnr/wt/data-provider/provider/simplelogger.properties
deleted file mode 100644
index f29f44e61..000000000
--- a/sdnr/wt/data-provider/provider/simplelogger.properties
+++ /dev/null
@@ -1,34 +0,0 @@
-# SLF4J's SimpleLogger configuration file
-# Simple implementation of Logger that sends all enabled log messages, for all defined loggers, to System.err.
-
-# Default logging detail level for all instances of SimpleLogger.
-# Must be one of ("trace", "debug", "info", "warn", or "error").
-# If not specified, defaults to "info".
-#org.slf4j.simpleLogger.defaultLogLevel=info
-
-# Logging detail level for a SimpleLogger instance named "xxxxx".
-# Must be one of ("trace", "debug", "info", "warn", or "error").
-# If not specified, the default logging detail level is used.
-#org.slf4j.simpleLogger.log.xxxxx=
-
-# Set to true if you want the current date and time to be included in output messages.
-# Default is false, and will output the number of milliseconds elapsed since startup.
-#org.slf4j.simpleLogger.showDateTime=false
-
-# The date and time format to be used in the output messages.
-# The pattern describing the date and time format is the same that is used in java.text.SimpleDateFormat.
-# If the format is not specified or is invalid, the default format is used.
-# The default format is yyyy-MM-dd HH:mm:ss:SSS Z.
-org.slf4j.simpleLogger.dateTimeFormat=yyyy-MM-dd HH:mm:ss:SSS Z
-
-# Set to true if you want to output the current thread name.
-# Defaults to true.
-org.slf4j.simpleLogger.showThreadName=true
-
-# Set to true if you want the Logger instance name to be included in output messages.
-# Defaults to true.
-org.slf4j.simpleLogger.showLogName=true
-
-# Set to true if you want the last component of the name to be included in output messages.
-# Defaults to false.
-org.slf4j.simpleLogger.showShortLogName=false
diff --git a/sdnr/wt/data-provider/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/dataprovider/data/ElasticSearchDataProvider.java b/sdnr/wt/data-provider/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/dataprovider/data/ElasticSearchDataProvider.java
index 0a966aef6..7a30542b4 100644
--- a/sdnr/wt/data-provider/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/dataprovider/data/ElasticSearchDataProvider.java
+++ b/sdnr/wt/data-provider/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/dataprovider/data/ElasticSearchDataProvider.java
@@ -47,7 +47,6 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.pro
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev201110.DeleteNetworkElementConnectionOutputBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev201110.Entity;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev201110.EntityInput;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev201110.Guicutthrough;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev201110.MaintenanceEntity;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev201110.MediatorServerEntity;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev201110.NetworkElementConnectionEntity;
@@ -56,7 +55,6 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.pro
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev201110.ReadEventlogListOutputBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev201110.ReadFaultcurrentListOutputBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev201110.ReadFaultlogListOutputBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev201110.ReadGuiCutThroughEntryOutputBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev201110.ReadInventoryListOutputBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev201110.ReadMaintenanceListOutputBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev201110.ReadMediatorServerListOutputBuilder;
@@ -74,10 +72,13 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.pro
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev201110.UpdateMediatorServerOutputBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev201110.UpdateNetworkElementConnectionInput;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev201110.UpdateNetworkElementConnectionOutputBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev201110.Guicutthrough;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev201110.ReadGuiCutThroughEntryInput;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev201110.ReadGuiCutThroughEntryOutputBuilder;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-public class ElasticSearchDataProvider {
+public class ElasticSearchDataProvider /*extends BaseStatusProvider /* implements IEntityDataProvider*/ {
 
     private static final Logger LOG = LoggerFactory.getLogger(ElasticSearchDataProvider.class);
 
@@ -164,6 +165,9 @@ public class ElasticSearchDataProvider {
      * Provide access to model API
      */
 
+    //org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev201110.read.faultcurrent.list.output.Data
+    //org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev201110.read.faultcurrent.list.output.PaginationBuilder
+    //eventRWFaultCurrent
     public ReadFaultcurrentListOutputBuilder readFaultCurrentList(EntityInput input) {
 
         ReadFaultcurrentListOutputBuilder outputBuilder = new ReadFaultcurrentListOutputBuilder();
@@ -177,6 +181,9 @@ public class ElasticSearchDataProvider {
         return outputBuilder;
     }
 
+    //org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev201110.read.faultlog.list.output.Data
+    //org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev201110.read.faultlog.list.output.PaginationBuilder
+    //eventRWFaultLog
     public ReadFaultlogListOutputBuilder readFaultLogList(EntityInput input) {
         ReadFaultlogListOutputBuilder outputBuilder = new ReadFaultlogListOutputBuilder();
         QueryResult<org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev201110.read.faultlog.list.output.Data> result =
@@ -188,6 +195,9 @@ public class ElasticSearchDataProvider {
         return outputBuilder;
     }
 
+    //org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev201110.read.maintenance.list.output.Data
+    //org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev201110.read.maintenance.list.output.PaginationBuilder
+    //maintenanceRW
     public ReadMaintenanceListOutputBuilder readMaintenanceList(EntityInput input) {
         ReadMaintenanceListOutputBuilder outputBuilder = new ReadMaintenanceListOutputBuilder();
         QueryResult<org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev201110.read.maintenance.list.output.Data> result =
@@ -199,6 +209,9 @@ public class ElasticSearchDataProvider {
         return outputBuilder;
     }
 
+    //org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev201110.read.mediator.server.list.output.Data
+    //org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev201110.read.mediator.server.list.output.Pagination
+    //mediatorserverRW
     public ReadMediatorServerListOutputBuilder readMediatorServerList(EntityInput input) {
 
         ReadMediatorServerListOutputBuilder outputBuilder = new ReadMediatorServerListOutputBuilder();
@@ -211,6 +224,9 @@ public class ElasticSearchDataProvider {
         return outputBuilder;
     }
 
+    //org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev201110.read.network.element.connection.list.output.Data
+    //org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev201110.read.network.element.connection.list.output.PaginationBuilder
+    //networkelementConnectionRW
     public ReadNetworkElementConnectionListOutputBuilder readNetworkElementConnectionList(EntityInput input) {
         ReadNetworkElementConnectionListOutputBuilder outputBuilder =
                 new ReadNetworkElementConnectionListOutputBuilder();
@@ -223,6 +239,9 @@ public class ElasticSearchDataProvider {
         return outputBuilder;
     }
 
+    //org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev201110.read.inventory.list.output.Data
+    //org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev201110.read.inventory.list.output.PaginationBuilder
+    //equipmentRW
     public ReadInventoryListOutputBuilder readInventoryList(EntityInput input) {
         ReadInventoryListOutputBuilder outputBuilder = new ReadInventoryListOutputBuilder();
         QueryResult<org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev201110.read.inventory.list.output.Data> result =
@@ -234,6 +253,9 @@ public class ElasticSearchDataProvider {
         return outputBuilder;
     }
 
+    //org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev201110.read.inventory.list.output.Data
+    //org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev201110.read.inventory.list.output.PaginationBuilder
+    //connnectionlogRW
     public ReadConnectionlogListOutputBuilder readConnectionlogList(EntityInput input) {
         ReadConnectionlogListOutputBuilder outputBuilder = new ReadConnectionlogListOutputBuilder();
         QueryResult<org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev201110.read.connectionlog.list.output.Data> result =
@@ -245,6 +267,9 @@ public class ElasticSearchDataProvider {
         return outputBuilder;
     }
 
+    //org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev201110.read.eventlog.list.output.Data
+    //org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev201110.read.eventlog.list.output.PaginationBuilder
+    //eventlogRW
     public ReadEventlogListOutputBuilder readEventlogList(ReadEventlogListInput input) throws IOException {
         ReadEventlogListOutputBuilder outputBuilder = new ReadEventlogListOutputBuilder();
         QueryResult<org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev201110.read.eventlog.list.output.Data> result =
@@ -256,11 +281,12 @@ public class ElasticSearchDataProvider {
         return outputBuilder;
     }
 
+    //org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev201110.read.pmdata._15m.list.output.Data
+    //org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev201110.read.pmdata._15m.list.output.PaginationBuilder
     public ReadPmdata15mListOutputBuilder readPmdata15mList(EntityInput input) {
         ReadPmdata15mListOutputBuilder outputBuilder = new ReadPmdata15mListOutputBuilder();
         QueryResult<org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev201110.read.pmdata._15m.list.output.Data> result =
                 this.pm15mRW.getData(input);
-        LOG.debug("Read data: readPmdata15mList: {}", result);
         outputBuilder.setData(result.getResult().getHits());
         outputBuilder.setPagination(
                 new org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev201110.read.pmdata._15m.list.output.PaginationBuilder(
@@ -268,6 +294,8 @@ public class ElasticSearchDataProvider {
         return outputBuilder;
     }
 
+    //org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev201110.read.pmdata._24h.list.output.Data
+    //org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev201110.read.pmdata._24h.list.output.Pagination
     public ReadPmdata24hListOutputBuilder readPmdata24hList(EntityInput input) {
         ReadPmdata24hListOutputBuilder outputBuilder = new ReadPmdata24hListOutputBuilder();
         QueryResult<org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev201110.read.pmdata._24h.list.output.Data> result =
diff --git a/sdnr/wt/data-provider/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/dataprovider/data/acessor/DataObjectAcessorStatus.java b/sdnr/wt/data-provider/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/dataprovider/data/acessor/DataObjectAcessorStatus.java
index efb52213d..3926d3f51 100644
--- a/sdnr/wt/data-provider/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/dataprovider/data/acessor/DataObjectAcessorStatus.java
+++ b/sdnr/wt/data-provider/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/dataprovider/data/acessor/DataObjectAcessorStatus.java
@@ -22,6 +22,7 @@
 package org.onap.ccsdk.features.sdnr.wt.dataprovider.data.acessor;
 
 import java.io.IOException;
+
 import org.onap.ccsdk.features.sdnr.wt.common.database.ExtRestClient;
 import org.onap.ccsdk.features.sdnr.wt.common.database.HtDatabaseClient;
 import org.onap.ccsdk.features.sdnr.wt.common.database.SearchResult;
@@ -30,7 +31,6 @@ import org.onap.ccsdk.features.sdnr.wt.common.database.requests.SearchRequest;
 import org.onap.ccsdk.features.sdnr.wt.common.database.responses.AggregationEntries;
 import org.onap.ccsdk.features.sdnr.wt.common.database.responses.SearchResponse;
 import org.onap.ccsdk.features.sdnr.wt.dataprovider.data.rpctypehelper.QueryResult;
-import org.onap.ccsdk.features.sdnr.wt.dataprovider.model.types.YangHelper2;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev201110.Entity;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev201110.read.status.output.Data;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev201110.read.status.output.DataBuilder;
@@ -55,13 +55,9 @@ public class DataObjectAcessorStatus extends DataObjectAcessor<Data> {
         SearchResponse response = this.dbClient.search(request);
         AggregationEntries aggs = response.getAggregations(ESDATATYPE_FAULTCURRENT_SEVERITY_KEY);
 
-        Data[] data = {new DataBuilder()
-                .setFaults(
-                        new FaultsBuilder().setCriticals(YangHelper2.getLongOrUint32(aggs.getOrDefault("Critical", 0L)))
-                                .setMajors(YangHelper2.getLongOrUint32(aggs.getOrDefault("Major", 0L)))
-                                .setMinors(YangHelper2.getLongOrUint32(aggs.getOrDefault("Minor", 0L)))
-                                .setWarnings(YangHelper2.getLongOrUint32(aggs.getOrDefault("Warning", 0L))).build())
-                .build()};
+        Data[] data = {new DataBuilder().setFaults(new FaultsBuilder().setCriticals(aggs.getOrDefault("Critical", 0L))
+                .setMajors(aggs.getOrDefault("Major", 0L)).setMinors(aggs.getOrDefault("Minor", 0L))
+                .setWarnings(aggs.getOrDefault("Warning", 0L)).build()).build()};
         long toalsize = data.length;
         return new QueryResult<Data>(1L, 1L, new SearchResult<Data>(data, toalsize));
 
diff --git a/sdnr/wt/data-provider/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/dataprovider/data/rpctypehelper/QueryResult.java b/sdnr/wt/data-provider/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/dataprovider/data/rpctypehelper/QueryResult.java
index 6e653baf2..4cd015a7f 100644
--- a/sdnr/wt/data-provider/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/dataprovider/data/rpctypehelper/QueryResult.java
+++ b/sdnr/wt/data-provider/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/dataprovider/data/rpctypehelper/QueryResult.java
@@ -22,8 +22,8 @@
 package org.onap.ccsdk.features.sdnr.wt.dataprovider.data.rpctypehelper;
 
 import java.math.BigInteger;
+
 import org.onap.ccsdk.features.sdnr.wt.common.database.SearchResult;
-import org.onap.ccsdk.features.sdnr.wt.dataprovider.model.types.YangHelper2;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev201110.PaginationOutputG;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev201110.read.connectionlog.list.output.PaginationBuilder;
 
@@ -36,9 +36,9 @@ public class QueryResult<T> {
         this.result = result;
 
         PaginationBuilder x = new PaginationBuilder();
-        x.setPage(YangHelper2.getBigIntegerOrUint64(BigInteger.valueOf(page)));
-        x.setSize(YangHelper2.getLongOrUint32(pageSize));
-        x.setTotal(YangHelper2.getBigIntegerOrUint64(BigInteger.valueOf(result.getTotal())));
+        x.setPage(BigInteger.valueOf(page));
+        x.setSize(pageSize);
+        x.setTotal(BigInteger.valueOf(result.getTotal()));
         pagination = x.build();
     }
 
@@ -46,9 +46,9 @@ public class QueryResult<T> {
         this.result = result;
 
         PaginationBuilder x = new PaginationBuilder();
-        x.setPage(YangHelper2.getBigIntegerOrUint64(BigInteger.valueOf(queryByFilter.getPage())));
-        x.setSize(YangHelper2.getLongOrUint32(queryByFilter.getPageSize()));
-        x.setTotal(YangHelper2.getBigIntegerOrUint64(BigInteger.valueOf(result.getTotal())));
+        x.setPage(BigInteger.valueOf(queryByFilter.getPage()));
+        x.setSize(queryByFilter.getPageSize());
+        x.setTotal(BigInteger.valueOf(result.getTotal()));
         pagination = x.build();
     }
 
@@ -61,11 +61,6 @@ public class QueryResult<T> {
         return pagination;
     }
 
-    @Override
-    public String toString() {
-        return "QueryResult [result=" + result + ", pagination=" + pagination + "]";
-    }
-
 
 
 }
diff --git a/sdnr/wt/data-provider/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/dataprovider/database/EsDataObjectReaderWriter2.java b/sdnr/wt/data-provider/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/dataprovider/database/EsDataObjectReaderWriter2.java
index 603c25bae..bf1aff372 100644
--- a/sdnr/wt/data-provider/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/dataprovider/database/EsDataObjectReaderWriter2.java
+++ b/sdnr/wt/data-provider/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/dataprovider/database/EsDataObjectReaderWriter2.java
@@ -33,7 +33,6 @@ import org.onap.ccsdk.features.sdnr.wt.common.database.SearchHit;
 import org.onap.ccsdk.features.sdnr.wt.common.database.SearchResult;
 import org.onap.ccsdk.features.sdnr.wt.common.database.queries.QueryBuilder;
 import org.onap.ccsdk.features.sdnr.wt.dataprovider.yangtools.YangToolsMapper2;
-import org.onap.ccsdk.features.sdnr.wt.dataprovider.yangtools.YangToolsMapperHelper;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev201110.Entity;
 import org.opendaylight.yangtools.concepts.Builder;
 import org.opendaylight.yangtools.yang.binding.DataObject;
@@ -143,7 +142,7 @@ public class EsDataObjectReaderWriter2<T extends DataObject> {
      * @return this for further operations.
      */
     public EsDataObjectReaderWriter2<T> setEsIdAttributeNameCamelized(String esIdAttributeName) {
-        return setEsIdAttributeName(YangToolsMapperHelper.toCamelCaseAttributeName(esIdAttributeName));
+        return setEsIdAttributeName(YangToolsMapper2.toCamelCaseAttributeName(esIdAttributeName));
     }
 
     /**
@@ -361,13 +360,14 @@ public class EsDataObjectReaderWriter2<T extends DataObject> {
             result = db.doReadAllJsonData(dataTypeName, ignoreException);
         }
         hits = result.getHits();
-        LOG.debug("Read: {} elements: {}", dataTypeName, hits.size());
+        LOG.debug("Read: {} elements: {}  Failures: {}", dataTypeName, hits.size(),
+                yangtoolsMapper.getMappingFailures());
 
         T object;
         for (SearchHit hit : hits) {
             object = getT(hit.getSourceAsString());
-            LOG.debug("Mapp Object: {}\nSource: '{}'\nResult: '{}'\n", hit.getId(),
-                    hit.getSourceAsString(), object);
+            LOG.debug("Mapp Object: {}\nSource: '{}'\nResult: '{}'\n Failures: {}", hit.getId(),
+                    hit.getSourceAsString(), object, yangtoolsMapper.getMappingFailures());
             if (object != null) {
                 setEsId(object, hit.getId());
                 res.add(object);
@@ -397,7 +397,7 @@ public class EsDataObjectReaderWriter2<T extends DataObject> {
         try {
             return yangtoolsMapper.readValue(jsonString, clazz);
         } catch (IOException e) {
-            LOG.info("Mapping problem {}:", clazz.getName(), e);
+            LOG.info("Mapping problem", e);
             return null;
         }
     }
diff --git a/sdnr/wt/data-provider/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/dataprovider/http/DataTreeHttpServlet.java b/sdnr/wt/data-provider/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/dataprovider/http/DataTreeHttpServlet.java
index bb4023abc..085d3816a 100644
--- a/sdnr/wt/data-provider/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/dataprovider/http/DataTreeHttpServlet.java
+++ b/sdnr/wt/data-provider/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/dataprovider/http/DataTreeHttpServlet.java
@@ -28,13 +28,16 @@ import java.io.InputStreamReader;
 import java.io.UnsupportedEncodingException;
 import java.net.URLDecoder;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
+
 import javax.servlet.ServletException;
 import javax.servlet.http.HttpServlet;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
+
 import org.json.JSONObject;
 import org.onap.ccsdk.features.sdnr.wt.common.database.HtDatabaseClient;
 import org.onap.ccsdk.features.sdnr.wt.dataprovider.impl.DataTreeProviderImpl;
diff --git a/sdnr/wt/data-provider/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/dataprovider/http/about/AboutHttpServlet.java b/sdnr/wt/data-provider/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/dataprovider/http/about/AboutHttpServlet.java
index fd6be82db..81b9645fe 100644
--- a/sdnr/wt/data-provider/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/dataprovider/http/about/AboutHttpServlet.java
+++ b/sdnr/wt/data-provider/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/dataprovider/http/about/AboutHttpServlet.java
@@ -73,7 +73,7 @@ public class AboutHttpServlet extends HttpServlet {
     private static final String README_FILE = "README.md";
     private static final String NO_DEVICEMANAGERS_RUNNING_MESSAGE = null;
 
-    private final String groupId = this.getGroupIdOrDefault("org.onap.ccsdk.features.sdnr.wt");
+    private final String groupId = "org.onap.ccsdk.features.sdnr.wt";
     private final String artifactId = "sdnr-wt-data-provider-provider";
 
     private final Map<Integer,String> BUNDLESTATE_LUT;
@@ -97,18 +97,7 @@ public class AboutHttpServlet extends HttpServlet {
 
     }
 
-    protected String getGroupIdOrDefault(String def) {
-		String symbolicName = this.getManifestValue("Bundle-SymbolicName");
-		if(symbolicName!=null) {
-			int idx =  symbolicName.indexOf(this.artifactId);
-			if(idx>0) {
-				return symbolicName.substring(0, idx-1);
-			}
-		}
-		return def;
-	}
-
-	//	public void setBundleService(BundleService bundleService) {
+    //	public void setBundleService(BundleService bundleService) {
     //		this.bundleService = bundleService;
     //	}
 
@@ -210,7 +199,7 @@ public class AboutHttpServlet extends HttpServlet {
      * @param key
      * @return
      */
-    protected String getManifestValue(String key) {
+    private String getManifestValue(String key) {
         URL url = Resources.getUrlForRessource(AboutHttpServlet.class, "/META-INF/MANIFEST.MF");
         if (url == null) {
             return null;
diff --git a/sdnr/wt/data-provider/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/dataprovider/http/about/ODLVersionLUT.java b/sdnr/wt/data-provider/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/dataprovider/http/about/ODLVersionLUT.java
index 491775eb0..b08e5ad16 100644
--- a/sdnr/wt/data-provider/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/dataprovider/http/about/ODLVersionLUT.java
+++ b/sdnr/wt/data-provider/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/dataprovider/http/about/ODLVersionLUT.java
@@ -60,7 +60,6 @@ public class ODLVersionLUT {
         }
         if(odlMdsalVersionLUT==null) {
             odlMdsalVersionLUT = new HashMap<>();
-            odlMdsalVersionLUT.put("6.0.7","aluminium-SR1 (0.13.1)");
             odlMdsalVersionLUT.put("6.0.4","aluminium-SR0 (0.13.0)");
             odlMdsalVersionLUT.put("5.0.14","magnesium-SR2 (0.12.2)");
             odlMdsalVersionLUT.put("5.0.10","magnesium-SR1 (0.12.1)");
diff --git a/sdnr/wt/data-provider/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/dataprovider/impl/DataProviderServiceImpl.java b/sdnr/wt/data-provider/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/dataprovider/impl/DataProviderServiceImpl.java
index 5ef7a0ad9..30819dca2 100644
--- a/sdnr/wt/data-provider/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/dataprovider/impl/DataProviderServiceImpl.java
+++ b/sdnr/wt/data-provider/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/dataprovider/impl/DataProviderServiceImpl.java
@@ -57,8 +57,6 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.pro
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev201110.ReadFaultcurrentListOutput;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev201110.ReadFaultlogListInput;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev201110.ReadFaultlogListOutput;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev201110.ReadGuiCutThroughEntryInput;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev201110.ReadGuiCutThroughEntryOutput;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev201110.ReadInventoryListInput;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev201110.ReadInventoryListOutput;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev201110.ReadMaintenanceListInput;
@@ -87,6 +85,9 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.pro
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev201110.UpdateMediatorServerOutput;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev201110.UpdateNetworkElementConnectionInput;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev201110.UpdateNetworkElementConnectionOutput;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev201110.ReadGuiCutThroughEntryInput;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev201110.ReadGuiCutThroughEntryOutput;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev201110.ReadGuiCutThroughEntryOutputBuilder;
 import org.opendaylight.yangtools.concepts.Builder;
 import org.opendaylight.yangtools.concepts.ObjectRegistration;
 import org.opendaylight.yangtools.yang.binding.DataObject;
@@ -164,7 +165,7 @@ public class DataProviderServiceImpl implements DataProviderService, AutoCloseab
     @Override
     public ListenableFuture<RpcResult<ReadFaultcurrentListOutput>> readFaultcurrentList(
             ReadFaultcurrentListInput input) {
-        LOG.debug("RPC Request: readFaultCurrentList with input {}", input);
+        LOG.debug("RPC Request: getFaultCurrentEntityList with input {}", input);
         RpcResultBuilder<ReadFaultcurrentListOutput> result =
                 read(() -> DataProviderServiceImpl.this.dataProvider.readFaultCurrentList(input));
         return result.buildFuture();
@@ -172,7 +173,7 @@ public class DataProviderServiceImpl implements DataProviderService, AutoCloseab
 
     @Override
     public ListenableFuture<RpcResult<ReadFaultlogListOutput>> readFaultlogList(ReadFaultlogListInput input) {
-        LOG.debug("RPC Request: readFaultlogList with input {}", input);
+        LOG.debug("RPC Request: getFaultCurrentEntityList with input {}", input);
         RpcResultBuilder<ReadFaultlogListOutput> result =
                 read(() -> DataProviderServiceImpl.this.dataProvider.readFaultLogList(input));
         return result.buildFuture();
@@ -180,7 +181,7 @@ public class DataProviderServiceImpl implements DataProviderService, AutoCloseab
 
     @Override
     public ListenableFuture<RpcResult<ReadMaintenanceListOutput>> readMaintenanceList(ReadMaintenanceListInput input) {
-        LOG.debug("RPC Request: readMaintenanceList with input {}", input);
+        LOG.debug("RPC Request: getMaintenanceEntityList with input {}", input);
         RpcResultBuilder<ReadMaintenanceListOutput> result =
                 read(() -> DataProviderServiceImpl.this.dataProvider.readMaintenanceList(input));
         return result.buildFuture();
@@ -189,7 +190,7 @@ public class DataProviderServiceImpl implements DataProviderService, AutoCloseab
     @Override
     public ListenableFuture<RpcResult<ReadMediatorServerListOutput>> readMediatorServerList(
             ReadMediatorServerListInput input) {
-        LOG.debug("RPC Request: readMediatorServerList with input {}", input);
+        LOG.debug("RPC Request: getMediatorServerEntityList with input {}", input);
         RpcResultBuilder<ReadMediatorServerListOutput> result =
                 read(() -> DataProviderServiceImpl.this.dataProvider.readMediatorServerList(input));
         return result.buildFuture();
@@ -198,7 +199,7 @@ public class DataProviderServiceImpl implements DataProviderService, AutoCloseab
     @Override
     public ListenableFuture<RpcResult<ReadNetworkElementConnectionListOutput>> readNetworkElementConnectionList(
             ReadNetworkElementConnectionListInput input) {
-        LOG.debug("RPC Request: readNetworkElementConnectionList with input {}", input);
+        LOG.debug("RPC Request: getNetworkElementConnectionEntityList with input {}", input);
         RpcResultBuilder<ReadNetworkElementConnectionListOutput> result =
                 read(() -> DataProviderServiceImpl.this.dataProvider.readNetworkElementConnectionList(input));
         return result.buildFuture();
@@ -207,7 +208,7 @@ public class DataProviderServiceImpl implements DataProviderService, AutoCloseab
 
     @Override
     public ListenableFuture<RpcResult<ReadPmdata15mListOutput>> readPmdata15mList(ReadPmdata15mListInput input) {
-        LOG.debug("RPC Request: readPmdata15mList with input {}", input);
+        LOG.debug("RPC Request: getNetworkElementConnectionEntityList with input {}", input);
         RpcResultBuilder<ReadPmdata15mListOutput> result =
                 read(() -> DataProviderServiceImpl.this.dataProvider.readPmdata15mList(input));
         return result.buildFuture();
@@ -216,7 +217,7 @@ public class DataProviderServiceImpl implements DataProviderService, AutoCloseab
 
     @Override
     public ListenableFuture<RpcResult<ReadPmdata24hListOutput>> readPmdata24hList(ReadPmdata24hListInput input) {
-        LOG.debug("RPC Request: readPmdata24hList with input {}", input);
+        LOG.debug("RPC Request: getNetworkElementConnectionEntityList with input {}", input);
         RpcResultBuilder<ReadPmdata24hListOutput> result =
                 read(() -> DataProviderServiceImpl.this.dataProvider.readPmdata24hList(input));
         return result.buildFuture();
@@ -225,7 +226,7 @@ public class DataProviderServiceImpl implements DataProviderService, AutoCloseab
 
     @Override
     public ListenableFuture<RpcResult<ReadStatusOutput>> readStatus(ReadStatusInput input) {
-        LOG.debug("RPC Request: readStatusEntityList with input {}", input);
+        LOG.debug("RPC Request: getStatusEntityList with input {}", input);
         RpcResultBuilder<ReadStatusOutput> result = read(() -> DataProviderServiceImpl.this.dataProvider.readStatus());
         return result.buildFuture();
 
@@ -233,7 +234,7 @@ public class DataProviderServiceImpl implements DataProviderService, AutoCloseab
 
     @Override
     public ListenableFuture<RpcResult<ReadInventoryListOutput>> readInventoryList(ReadInventoryListInput input) {
-        LOG.debug("RPC Request: readInventoryList with input {}", input);
+        LOG.debug("RPC Request: getInventoryEntityList with input {}", input);
         RpcResultBuilder<ReadInventoryListOutput> result =
                 read(() -> DataProviderServiceImpl.this.dataProvider.readInventoryList(input));
         return result.buildFuture();
@@ -242,7 +243,7 @@ public class DataProviderServiceImpl implements DataProviderService, AutoCloseab
     @Override
     public ListenableFuture<RpcResult<ReadPmdata15mLtpListOutput>> readPmdata15mLtpList(
             ReadPmdata15mLtpListInput input) {
-        LOG.debug("RPC Request: readPmdata15mLtpList with input {}", input);
+        LOG.debug("RPC Request: readPmdataLtpList with input {}", input);
         RpcResultBuilder<ReadPmdata15mLtpListOutput> result =
                 read(() -> DataProviderServiceImpl.this.dataProvider.readPmdata15mLtpList(input));
         return result.buildFuture();
@@ -251,7 +252,7 @@ public class DataProviderServiceImpl implements DataProviderService, AutoCloseab
     @Override
     public ListenableFuture<RpcResult<ReadPmdata15mDeviceListOutput>> readPmdata15mDeviceList(
             ReadPmdata15mDeviceListInput input) {
-        LOG.debug("RPC Request: readPmdata15mDeviceList with input {}", input);
+        LOG.debug("RPC Request: readPmdataDeviceList with input {}", input);
         RpcResultBuilder<ReadPmdata15mDeviceListOutput> result =
                 read(() -> DataProviderServiceImpl.this.dataProvider.readPmdata15mDeviceList(input));
         return result.buildFuture();
@@ -260,7 +261,7 @@ public class DataProviderServiceImpl implements DataProviderService, AutoCloseab
     @Override
     public ListenableFuture<RpcResult<ReadPmdata24hLtpListOutput>> readPmdata24hLtpList(
             ReadPmdata24hLtpListInput input) {
-        LOG.debug("RPC Request: readPmdata24hLtpList with input {}", input);
+        LOG.debug("RPC Request: readPmdataLtpList with input {}", input);
         RpcResultBuilder<ReadPmdata24hLtpListOutput> result =
                 read(() -> DataProviderServiceImpl.this.dataProvider.readPmdata24hLtpList(input));
         return result.buildFuture();
@@ -269,7 +270,7 @@ public class DataProviderServiceImpl implements DataProviderService, AutoCloseab
     @Override
     public ListenableFuture<RpcResult<ReadPmdata24hDeviceListOutput>> readPmdata24hDeviceList(
             ReadPmdata24hDeviceListInput input) {
-        LOG.debug("RPC Request: readPmdata24hDeviceList with input {}", input);
+        LOG.debug("RPC Request: readPmdataDeviceList with input {}", input);
         RpcResultBuilder<ReadPmdata24hDeviceListOutput> result =
                 read(() -> DataProviderServiceImpl.this.dataProvider.readPmdata24hDeviceList(input));
         return result.buildFuture();
@@ -305,7 +306,6 @@ public class DataProviderServiceImpl implements DataProviderService, AutoCloseab
     @Override
     public ListenableFuture<RpcResult<DeleteNetworkElementConnectionOutput>> deleteNetworkElementConnection(
             DeleteNetworkElementConnectionInput input) {
-        LOG.debug("RPC Request: deleteNetworkElementConnection with input {}", input);
         RpcResultBuilder<DeleteNetworkElementConnectionOutput> result =
                 read(() -> DataProviderServiceImpl.this.dataProvider.deleteNetworkElementConnection(input));
         return result.buildFuture();
@@ -376,7 +376,7 @@ public class DataProviderServiceImpl implements DataProviderService, AutoCloseab
     @Override
     public ListenableFuture<RpcResult<ReadGuiCutThroughEntryOutput>> readGuiCutThroughEntry(
             ReadGuiCutThroughEntryInput input) {
-        LOG.debug("RPC Request: getGuiCutThroughEntry with input {}", input);
+        LOG.debug("RPC Request: readGuiCutThroughEntry with input {}", input);
         RpcResultBuilder<ReadGuiCutThroughEntryOutput> result =
                 read(() -> DataProviderServiceImpl.this.dataProvider.readGuiCutThroughEntry(input));
         return result.buildFuture();
diff --git a/sdnr/wt/data-provider/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/dataprovider/yangtools/DateAndTimeBuilder.java b/sdnr/wt/data-provider/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/dataprovider/yangtools/DateAndTimeBuilder.java
new file mode 100644
index 000000000..628890018
--- /dev/null
+++ b/sdnr/wt/data-provider/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/dataprovider/yangtools/DateAndTimeBuilder.java
@@ -0,0 +1,15 @@
+package org.onap.ccsdk.features.sdnr.wt.dataprovider.yangtools;
+
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.yang.types.rev130715.DateAndTime;
+
+public class DateAndTimeBuilder {
+	 private final String _value;
+
+     public DateAndTimeBuilder(String v) {
+         this._value = v;
+     }
+
+     public DateAndTime build() {
+         return new DateAndTime(_value);
+     }
+}
diff --git a/sdnr/wt/data-provider/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/dataprovider/yangtools/YangToolsMapper.java b/sdnr/wt/data-provider/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/dataprovider/yangtools/YangToolsMapper.java
index e7580c69a..0b1e7d520 100644
--- a/sdnr/wt/data-provider/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/dataprovider/yangtools/YangToolsMapper.java
+++ b/sdnr/wt/data-provider/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/dataprovider/yangtools/YangToolsMapper.java
@@ -21,15 +21,33 @@
  */
 package org.onap.ccsdk.features.sdnr.wt.dataprovider.yangtools;
 
+import java.io.IOException;
+import javax.annotation.Nullable;
+
+import org.opendaylight.yang.gen.v1.urn.opendaylight.netconf.node.topology.rev150114.netconf.node.credentials.Credentials;
+import org.opendaylight.yangtools.concepts.Builder;
+import org.opendaylight.yangtools.yang.binding.DataObject;
+import org.osgi.framework.Bundle;
+import org.osgi.framework.BundleContext;
+import org.osgi.framework.FrameworkUtil;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 import com.fasterxml.jackson.annotation.JsonInclude.Include;
+import com.fasterxml.jackson.core.JsonGenerator;
+import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.DeserializationFeature;
-import com.fasterxml.jackson.databind.MapperFeature;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.PropertyNamingStrategy;
-import org.onap.ccsdk.features.sdnr.wt.dataprovider.yangtools.mapperextensions.YangToolsBuilderAnnotationIntrospector;
-import org.onap.ccsdk.features.sdnr.wt.dataprovider.yangtools.mapperextensions.YangToolsModule;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import com.fasterxml.jackson.databind.SerializerProvider;
+import com.fasterxml.jackson.databind.annotation.JsonPOJOBuilder;
+import com.fasterxml.jackson.databind.annotation.JsonPOJOBuilder.Value;
+import com.fasterxml.jackson.databind.introspect.AnnotatedClass;
+import com.fasterxml.jackson.databind.introspect.JacksonAnnotationIntrospector;
+import com.fasterxml.jackson.databind.module.SimpleModule;
+import com.fasterxml.jackson.databind.ser.std.StdSerializer;
+
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.yang.types.rev130715.DateAndTime;
 
 /**
  * YangToolsMapper is a specific Jackson mapper configuration for opendaylight yangtools serialization or
@@ -38,23 +56,182 @@ import org.slf4j.LoggerFactory;
  */
 public class YangToolsMapper extends ObjectMapper {
 
-    @SuppressWarnings("unused")
     private final Logger LOG = LoggerFactory.getLogger(YangToolsMapper.class);
     private static final long serialVersionUID = 1L;
+    private static BundleContext context;
 
     public YangToolsMapper() {
-        this(new YangToolsBuilderAnnotationIntrospector());
-    }
-
-    protected YangToolsMapper(YangToolsBuilderAnnotationIntrospector yangToolsBuilderAnnotationIntrospector) {
         super();
-
         configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
         setPropertyNamingStrategy(PropertyNamingStrategy.KEBAB_CASE);
         setSerializationInclusion(Include.NON_NULL);
-        enable(MapperFeature.USE_GETTERS_AS_SETTERS);
-        setAnnotationIntrospector(yangToolsBuilderAnnotationIntrospector);
-        registerModule(new YangToolsModule());
+        setAnnotationIntrospector(new YangToolsBuilderAnnotationIntrospector());
+        SimpleModule dateAndTimeSerializerModule = new SimpleModule();
+        dateAndTimeSerializerModule.addSerializer(DateAndTime.class, new CustomDateAndTimeSerializer());
+        registerModule(dateAndTimeSerializerModule);
+        Bundle bundle = FrameworkUtil.getBundle(YangToolsMapper.class);
+        context = bundle != null ? bundle.getBundleContext() : null;
+    }
+
+    @Override
+    public String writeValueAsString(Object value) throws JsonProcessingException {
+        // TODO Auto-generated method stub
+        return super.writeValueAsString(value);
+    }
+
+    /**
+     * Get Builder object for yang tools interface.
+     * 
+     * @param <T> yang-tools base datatype
+     * @param clazz class with interface.
+     * @return builder for interface or null if not existing
+     */
+    @SuppressWarnings("unchecked")
+    public @Nullable <T extends DataObject> Builder<T> getBuilder(Class<T> clazz) {
+        String builder = clazz.getName() + "Builder";
+        try {
+            Class<?> clazzBuilder = findClass(builder);
+            return (Builder<T>) clazzBuilder.newInstance();
+        } catch (InstantiationException | IllegalAccessException | ClassNotFoundException e) {
+            LOG.debug("Problem ", e);
+            return null;
+        }
+    }
+
+    /**
+     * Callback for handling mapping failures.
+     * 
+     * @return
+     */
+    public int getMappingFailures() {
+        return 0;
+    }
+
+    /**
+     * Provide mapping of string to attribute names, generated by yang-tools. "netconf-id" converted to "_netconfId"
+     * 
+     * @param name with attribute name, not null or empty
+     * @return converted string or null if name was empty or null
+     */
+    public @Nullable static String toCamelCaseAttributeName(final String name) {
+        if (name == null || name.isEmpty())
+            return null;
+
+        final StringBuilder ret = new StringBuilder(name.length());
+        if (!name.startsWith("_"))
+            ret.append('_');
+        int start = 0;
+        for (final String word : name.split("-")) {
+            if (!word.isEmpty()) {
+                if (start++ == 0) {
+                    ret.append(Character.toLowerCase(word.charAt(0)));
+                } else {
+                    ret.append(Character.toUpperCase(word.charAt(0)));
+                }
+                ret.append(word.substring(1));
+            }
+        }
+        return ret.toString();
     }
 
+    /**
+     * Adapted Builder callbacks
+     */
+    private static class YangToolsBuilderAnnotationIntrospector extends JacksonAnnotationIntrospector {
+        private static final long serialVersionUID = 1L;
+
+        @Override
+        public Class<?> findPOJOBuilder(AnnotatedClass ac) {
+            try {
+                String builder = null;
+                if (ac.getRawType().equals(Credentials.class)) {
+                    builder =
+                            "org.opendaylight.yang.gen.v1.urn.opendaylight.netconf.node.topology.rev150114.netconf.node.credentials.credentials.LoginPasswordBuilder";
+                    //System.out.println(DataContainer.class.isAssignableFrom(ac.getRawType()));
+                    //System.out.println(ChoiceIn.class.isAssignableFrom(ac.getRawType()));
+
+                } else if (ac.getRawType().equals(DateAndTime.class)) {
+                    builder = DateAndTimeBuilder.class.getName();
+                }
+
+                else {
+                    if (ac.getRawType().isInterface()) {
+                        builder = ac.getName() + "Builder";
+                    }
+                }
+                if (builder != null) {
+                    //System.out.println("XX1: "+ac.getRawType());
+                    //System.out.println("XX2: "+builder);
+                    //Class<?> innerBuilder = Class.forName(builder);
+                    Class<?> innerBuilder = findClass(builder);
+                    //System.out.println("Builder found: "+ innerBuilder);
+                    return innerBuilder;
+                }
+            } catch (ClassNotFoundException e) {
+                // No problem .. try next
+            }
+            return super.findPOJOBuilder(ac);
+        }
+
+        @Override
+        public Value findPOJOBuilderConfig(AnnotatedClass ac) {
+            if (ac.hasAnnotation(JsonPOJOBuilder.class)) {
+                return super.findPOJOBuilderConfig(ac);
+            }
+            return new JsonPOJOBuilder.Value("build", "set");
+        }
+    }
+
+    private static Class<?> findClass(String name) throws ClassNotFoundException {
+        // Try to find in other bundles
+        if (context != null) {
+            //OSGi environment
+            for (Bundle b : context.getBundles()) {
+                try {
+                    return b.loadClass(name);
+                } catch (ClassNotFoundException e) {
+                    // No problem, this bundle doesn't have the class
+                }
+            }
+            throw new ClassNotFoundException("Can not find Class in OSGi context.");
+        } else {
+            return Class.forName(name);
+        }
+        // not found in any bundle
+    }
+
+    public static class DateAndTimeBuilder {
+
+        private final String _value;
+
+        public DateAndTimeBuilder(String v) {
+            this._value = v;
+        }
+
+        public DateAndTime build() {
+            return new DateAndTime(_value);
+        }
+
+    }
+    public static class CustomDateAndTimeSerializer extends StdSerializer<DateAndTime> {
+
+        /**
+         * 
+         */
+        private static final long serialVersionUID = 1L;
+
+        public CustomDateAndTimeSerializer() {
+            this(null);
+        }
+
+        protected CustomDateAndTimeSerializer(Class<DateAndTime> t) {
+            super(t);
+        }
+
+        @Override
+        public void serialize(DateAndTime value, JsonGenerator gen, SerializerProvider serializers) throws IOException {
+            gen.writeString(value.getValue());
+        }
+
+    }
 }
diff --git a/sdnr/wt/data-provider/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/dataprovider/yangtools/YangToolsMapper2.java b/sdnr/wt/data-provider/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/dataprovider/yangtools/YangToolsMapper2.java
index a19f114e3..8f05437c9 100644
--- a/sdnr/wt/data-provider/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/dataprovider/yangtools/YangToolsMapper2.java
+++ b/sdnr/wt/data-provider/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/dataprovider/yangtools/YangToolsMapper2.java
@@ -21,12 +21,31 @@
  */
 package org.onap.ccsdk.features.sdnr.wt.dataprovider.yangtools;
 
-import java.lang.reflect.InvocationTargetException;
+import com.fasterxml.jackson.annotation.JsonInclude.Include;
+import com.fasterxml.jackson.core.JsonGenerator;
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.DeserializationFeature;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.PropertyNamingStrategy;
+import com.fasterxml.jackson.databind.SerializerProvider;
+import com.fasterxml.jackson.databind.annotation.JsonPOJOBuilder;
+import com.fasterxml.jackson.databind.annotation.JsonPOJOBuilder.Value;
+import com.fasterxml.jackson.databind.introspect.AnnotatedClass;
+import com.fasterxml.jackson.databind.introspect.JacksonAnnotationIntrospector;
+import com.fasterxml.jackson.databind.module.SimpleModule;
+import com.fasterxml.jackson.databind.ser.std.StdSerializer;
+import java.io.IOException;
 import javax.annotation.Nullable;
 import org.eclipse.jdt.annotation.NonNull;
-import org.onap.ccsdk.features.sdnr.wt.dataprovider.yangtools.mapperextensions.YangToolsBuilderAnnotationIntrospector;
+import org.opendaylight.yang.gen.v1.http.org.openroadm.pm.types.rev191129.PmDataType;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.yang.types.rev130715.DateAndTime;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.netconf.node.topology.rev150114.netconf.node.credentials.Credentials;
 import org.opendaylight.yangtools.concepts.Builder;
 import org.opendaylight.yangtools.yang.binding.DataObject;
+import org.opendaylight.yangtools.yang.binding.TypeObject;
+import org.osgi.framework.Bundle;
+import org.osgi.framework.BundleContext;
+import org.osgi.framework.FrameworkUtil;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -35,13 +54,17 @@ import org.slf4j.LoggerFactory;
  * deserialization of DataObject to/from JSON TODO ChoiceIn and Credentials deserialization only for
  * LoginPasswordBuilder
  */
-public class YangToolsMapper2<T extends DataObject> extends YangToolsMapper {
+public class YangToolsMapper2<T extends DataObject> extends ObjectMapper {
 
     private static final Logger LOG = LoggerFactory.getLogger(YangToolsMapper2.class);
     private static final long serialVersionUID = 1L;
+    private static String BUILDER = "Builder";
 
+    private @Nullable final Class<T> clazz;
     private @Nullable final Class<? extends Builder<? extends T>> builderClazz;
 
+    private BundleContext context;
+
     /**
      * Generic Object creation of yangtools java class builder pattern.
      *
@@ -54,10 +77,32 @@ public class YangToolsMapper2<T extends DataObject> extends YangToolsMapper {
      */
     public <X extends T, B extends Builder<X>> YangToolsMapper2(@NonNull Class<T> clazz,
             @Nullable Class<B> builderClazz) throws ClassNotFoundException {
-        super(new YangToolsBuilderAnnotationIntrospector(clazz, builderClazz));
+        super();
+        configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
+        setPropertyNamingStrategy(PropertyNamingStrategy.KEBAB_CASE);
+        setSerializationInclusion(Include.NON_NULL);
+        setAnnotationIntrospector(new YangToolsBuilderAnnotationIntrospector());
+        SimpleModule dateAndTimeSerializerModule = new SimpleModule();
+        dateAndTimeSerializerModule.addSerializer(DateAndTime.class, new CustomDateAndTimeSerializer());
+        registerModule(dateAndTimeSerializerModule);
+
+        SimpleModule pmDataTypeSerializerModule = new SimpleModule();
+        pmDataTypeSerializerModule.addSerializer(PmDataType.class, new CustomPMDataTypeSerializer());
+        registerModule(pmDataTypeSerializerModule);
+        Bundle bundle = FrameworkUtil.getBundle(YangToolsMapper2.class);
 
-        this.builderClazz =
-                builderClazz != null ? builderClazz : getBuilderClass(YangToolsMapperHelper.getBuilderClassName(clazz));
+        this.clazz = clazz;
+        this.builderClazz = builderClazz != null ? builderClazz : getBuilderClass(getBuilderClassName(clazz));
+        context = bundle != null ? bundle.getBundleContext() : null;
+    }
+
+    public <X extends T, B extends Builder<X>> YangToolsMapper2(@NonNull Class<T> clazz) throws ClassNotFoundException {
+        this(clazz, null);
+    }
+
+    @Override
+    public String writeValueAsString(Object value) throws JsonProcessingException {
+        return super.writeValueAsString(value);
     }
 
     /**
@@ -70,19 +115,75 @@ public class YangToolsMapper2<T extends DataObject> extends YangToolsMapper {
     public @Nullable Builder<? extends T> getBuilder(Class<T> clazz) {
         try {
             if (builderClazz != null)
-                return builderClazz.getDeclaredConstructor().newInstance();
+                return builderClazz.newInstance();
             else
                 return null;
-        } catch (InstantiationException | IllegalAccessException | IllegalArgumentException | InvocationTargetException
-                | NoSuchMethodException | SecurityException e) {
-            LOG.warn("Problem intantiating Builder", e);
+        } catch (InstantiationException | IllegalAccessException e) {
+            LOG.debug("Problem ", e);
+            return null;
+        }
+    }
+
+    /**
+     * Callback for handling mapping failures.
+     *
+     * @return
+     */
+    public int getMappingFailures() {
+        return 0;
+    }
+
+    /**
+     * Provide mapping of string to attribute names, generated by yang-tools. "netconf-id" converted to "_netconfId"
+     *
+     * @param name with attribute name, not null or empty
+     * @return converted string or null if name was empty or null
+     */
+    public @Nullable static String toCamelCaseAttributeName(final String name) {
+        if (name == null || name.isEmpty())
             return null;
+
+        final StringBuilder ret = new StringBuilder(name.length());
+        if (!name.startsWith("_"))
+            ret.append('_');
+        int start = 0;
+        for (final String word : name.split("-")) {
+            if (!word.isEmpty()) {
+                if (start++ == 0) {
+                    ret.append(Character.toLowerCase(word.charAt(0)));
+                } else {
+                    ret.append(Character.toUpperCase(word.charAt(0)));
+                }
+                ret.append(word.substring(1));
+            }
         }
+        return ret.toString();
+    }
+
+    /**
+     * Verify if builder is available
+     *
+     * @throws ClassNotFoundException
+     **/
+    public Class<?> assertBuilderClass(Class<?> clazz) throws ClassNotFoundException {
+        return getBuilderClass(getBuilderClassName(clazz));
     }
 
     // --- Private functions
 
     /**
+     * Create name of builder class
+     *
+     * @param <T>
+     * @param clazz
+     * @return builders class name
+     * @throws ClassNotFoundException
+     */
+    private static String getBuilderClassName(Class<?> clazz) {
+        return clazz.getName() + BUILDER;
+    }
+
+    /**
      * Search builder in context
      *
      * @param name
@@ -91,7 +192,128 @@ public class YangToolsMapper2<T extends DataObject> extends YangToolsMapper {
      */
     @SuppressWarnings("unchecked")
     private <X extends T, B extends Builder<X>> Class<B> getBuilderClass(String name) throws ClassNotFoundException {
-        return (Class<B>) YangToolsMapperHelper.getBuilderClass(name);
+        // Try to find in other bundles
+        if (context != null) {
+            //OSGi environment
+            for (Bundle b : context.getBundles()) {
+                LOG.info("Search in bundle: {}", b.getSymbolicName());
+                try {
+                    return (Class<B>) b.loadClass(name);
+                } catch (ClassNotFoundException e) {
+                    // No problem, this bundle doesn't have the class
+                }
+            }
+            throw new ClassNotFoundException("Can not find Class in OSGi context.");
+        } else {
+            return (Class<B>) Class.forName(name);
+        }
+        // not found in any bundle
+    }
+
+    // --- Classes
+
+    /**
+     * Adapted Builder callbacks
+     */
+    private class YangToolsBuilderAnnotationIntrospector extends JacksonAnnotationIntrospector {
+        private static final long serialVersionUID = 1L;
+
+        @Override
+        public Class<?> findPOJOBuilder(AnnotatedClass ac) {
+            Class<?> clazz2build = ac.getRawType();
+            if (clazz2build.equals(Credentials.class)) {
+                return org.opendaylight.yang.gen.v1.urn.opendaylight.netconf.node.topology.rev150114.netconf.node.credentials.credentials.LoginPasswordBuilder.class;
+
+            } else if (clazz2build.equals(DateAndTime.class)) {
+                return DateAndTimeBuilder.class;
+                //            } else if (ac.getRawType().equals(PmDataType.class)) {
+                //                LOG.info("Builder class");
+                //                return PMDataTypeBuilder.class;
+            } else if (clazz2build.equals(clazz)) {
+                return builderClazz;
+            }
+
+            if (clazz2build.isInterface() || TypeObject.class.isAssignableFrom(clazz2build)) {
+                String builder = getBuilderClassName(clazz2build);
+                LOG.info("Search: {}", builder);
+                Class<?> innerBuilder;
+                try {
+                    innerBuilder = Class.forName(builder);
+                    LOG.info("Found1: {}", innerBuilder);
+                    return innerBuilder;
+                } catch (ClassNotFoundException e) {
+                    LOG.info("Could not find {}", clazz2build);
+                    // No problem .. try next
+                }
+                try {
+                    innerBuilder = getBuilderClass(builder);
+                    LOG.info("Found2: {}", innerBuilder);
+                    return innerBuilder;
+                } catch (ClassNotFoundException e) {
+                    LOG.info("Could not find {}", clazz2build);
+                    // No problem .. try next
+                }
+            }
+            Class<?> clazz = super.findPOJOBuilder(ac);
+            return clazz;
+        }
+
+        @Override
+        public Value findPOJOBuilderConfig(AnnotatedClass ac) {
+            if (ac.hasAnnotation(JsonPOJOBuilder.class)) {
+                return super.findPOJOBuilderConfig(ac);
+            }
+            return new JsonPOJOBuilder.Value("build", "set");
+        }
+    }
+
+    public static class DateAndTimeBuilder {
+
+        private final String _value;
+
+        public DateAndTimeBuilder(String v) {
+            this._value = v;
+        }
+
+        public DateAndTime build() {
+            return new DateAndTime(_value);
+        }
+
     }
+    public static class CustomDateAndTimeSerializer extends StdSerializer<@NonNull DateAndTime> {
 
+        private static final long serialVersionUID = 1L;
+
+        public CustomDateAndTimeSerializer() {
+            this(null);
+        }
+
+        protected CustomDateAndTimeSerializer(Class<DateAndTime> t) {
+            super(t);
+        }
+
+        @Override
+        public void serialize(DateAndTime value, JsonGenerator gen, SerializerProvider serializers) throws IOException {
+            gen.writeString(value.getValue());
+        }
+
+    }
+    public static class CustomPMDataTypeSerializer extends StdSerializer<@NonNull PmDataType> {
+
+        private static final long serialVersionUID = 1L;
+
+        public CustomPMDataTypeSerializer() {
+            this(null);
+        }
+
+        protected CustomPMDataTypeSerializer(Class<PmDataType> t) {
+            super(t);
+        }
+
+        @Override
+        public void serialize(PmDataType value, JsonGenerator gen, SerializerProvider serializers) throws IOException {
+            gen.writeString(value.toString());
+        }
+
+    }
 }
diff --git a/sdnr/wt/data-provider/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/dataprovider/yangtools/YangToolsMapperHelper.java b/sdnr/wt/data-provider/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/dataprovider/yangtools/YangToolsMapperHelper.java
deleted file mode 100644
index a2afab0a8..000000000
--- a/sdnr/wt/data-provider/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/dataprovider/yangtools/YangToolsMapperHelper.java
+++ /dev/null
@@ -1,244 +0,0 @@
-/*
- * ============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.dataprovider.yangtools;
-
-import com.fasterxml.jackson.databind.DeserializationContext;
-import java.lang.reflect.Constructor;
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Optional;
-import java.util.concurrent.ConcurrentHashMap;
-import javax.annotation.Nullable;
-import org.opendaylight.yangtools.concepts.Builder;
-import org.osgi.framework.Bundle;
-import org.osgi.framework.BundleContext;
-import org.osgi.framework.FrameworkUtil;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-public class YangToolsMapperHelper {
-
-    private static final Logger LOG = LoggerFactory.getLogger(YangToolsMapperHelper.class);
-    private static final String TYPEOBJECT_INSTANCE_METHOD = "getDefaultInstance";
-    private static final String BUILDER = "Builder";
-
-    private static BundleContext context = getBundleContext();
-    private static ConcurrentHashMap<String, Class<?>> cache = new ConcurrentHashMap<>();
-
-    private YangToolsMapperHelper() {
-        //Make unaccessible
-    }
-
-    public static Class<?> findClass(String name) throws ClassNotFoundException {
-
-        //Try first in cache
-        Class<?> res = cache.get(name);
-        if (res != null) {
-            return res;
-        }
-        //Try first in actual bundle
-        try {
-            return loadClass(null, name);
-        } catch (ClassNotFoundException e) {
-            // No problem, this bundle doesn't have the class
-        }
-        // Try to find in other bundles
-        if (context != null) {
-            //OSGi environment
-            for (Bundle b : context.getBundles()) {
-                try {
-                    return loadClass(b, name);
-                } catch (ClassNotFoundException e) {
-                    // No problem, this bundle doesn't have the class
-                }
-            }
-        }
-        // really not found in any bundle
-        throw new ClassNotFoundException("Can not find class '"+name+"'");
-    }
-
-    private static Class<?> loadClass(Bundle b, String name) throws ClassNotFoundException {
-        Class<?> res = b == null ? Class.forName(name) : b.loadClass(name);
-        cache.put(name, res);
-        return res;
-    }
-
-    /**
-     * Verify if builder is available
-     *
-     * @throws ClassNotFoundException
-     **/
-    public static Class<?> assertBuilderClass(Class<?> clazz) throws ClassNotFoundException {
-        return getBuilderClass(getBuilderClassName(clazz));
-    }
-
-    public static Class<?> getBuilderClass(String name) throws ClassNotFoundException {
-        return findClass(name);
-    }
-
-    public static Class<?> getBuilderClass(Class<?> clazz) throws ClassNotFoundException {
-        return findClass(getBuilderClassName(clazz));
-    }
-
-    /**
-     * Create name of builder class
-     *
-     * @param <T>
-     * @param clazz
-     * @return builders class name
-     * @throws ClassNotFoundException
-     */
-    public static String getBuilderClassName(Class<?> clazz) {
-        return clazz.getName() + BUILDER;
-    }
-
-    @SuppressWarnings("unchecked")
-    public static <B extends Builder<?>> Class<B> findBuilderClass(DeserializationContext ctxt, Class<?> clazz) throws ClassNotFoundException {
-        return (Class<B>) findClass(getBuilderClassName(clazz));
-    }
-
-    public static <B extends Builder<?>> Optional<Class<B>> findBuilderClassOptional(DeserializationContext ctxt, Class<?> clazz) {
-        try {
-            return Optional.of(findBuilderClass(ctxt, clazz));
-        } catch (ClassNotFoundException e) {
-            return Optional.empty();
-        }
-    }
-
-    public static boolean hasClassDeclaredMethod(Class<?> clazz, String name) {
-        Method[] methods = clazz.getDeclaredMethods();
-        for (Method m : methods) {
-            if (m.getName().equals(name)) {
-                return true;
-            }
-        }
-        return false;
-    }
-
-    @SuppressWarnings("unchecked")
-    public static <T> Optional<T> getInstanceByConstructor(Class<?> clazz, String arg) throws InstantiationException, IllegalAccessException, IllegalArgumentException, InvocationTargetException, NoSuchMethodException, SecurityException {
-        List<Class<?>> ctypes = getConstructorParameterTypes(clazz, String.class);
-        Optional<Object> oObj;
-        for (Class<?> ctype : ctypes) {
-            if (ctype.equals(String.class)) {
-                return Optional.of((T) clazz.getConstructor(ctype).newInstance(arg));
-            } else if ((oObj = getDefaultInstance(ctype, arg)).isPresent()) {
-                return Optional.of((T) clazz.getConstructor(ctype).newInstance(oObj.get()));
-            } else {
-                // TODO: recursive instantiation down to string constructor or
-                // getDefaultInstance method
-                LOG.debug("Not implemented arg:'{}' class:'{}'", arg, clazz);
-            }
-        }
-        return Optional.empty();
-    }
-
-    @SuppressWarnings("unchecked")
-    public static <T> Optional<T> getDefaultInstance(@Nullable Class<?> clazz, String arg)
-            throws NoSuchMethodException, SecurityException, IllegalAccessException, IllegalArgumentException,
-            InvocationTargetException {
-        LOG.trace("arg:'{}' clazz '{}'", arg, clazz.getName());
-        if (clazz != null) {
-            Method[] methods = clazz.getDeclaredMethods();
-            for (Method m : methods) {
-                //TODO Verify argument type to avoid exception
-                if (m.getName().equals(TYPEOBJECT_INSTANCE_METHOD)) {
-                    Method method = clazz.getDeclaredMethod(TYPEOBJECT_INSTANCE_METHOD, String.class);
-                    LOG.trace("Invoke {} available {}",TYPEOBJECT_INSTANCE_METHOD, method != null);
-                    return Optional.of((T) method.invoke(null, arg));
-                }
-            }
-        }
-        return Optional.empty();
-    }
-
-    public static <T> Optional<T> getDefaultInstance(Optional<Class<T>> optionalClazz, String arg)
-            throws NoSuchMethodException, SecurityException, IllegalAccessException, IllegalArgumentException,
-            InvocationTargetException {
-        if (optionalClazz.isPresent()) {
-            return getDefaultInstance(optionalClazz.get(), arg);
-        }
-        return Optional.empty();
-    }
-
-    public static List<Class<?>> getConstructorParameterTypes(Class<?> clazz, Class<?> prefer) {
-
-        Constructor<?>[] constructors = clazz.getConstructors();
-        List<Class<?>> res = new ArrayList<>();
-        for (Constructor<?> c : constructors) {
-            Class<?>[] ptypes = c.getParameterTypes();
-            if (ptypes.length == 1) {
-                res.add(ptypes[0]);
-            }
-
-            if (prefer != null && ptypes.length == 1 && ptypes[0].equals(prefer)) {
-                return Arrays.asList(prefer);
-            }
-        }
-        return res;
-    }
-
-    public static boolean implementsInterface(Class<?> clz, Class<?> ifToImplement) {
-        Class<?>[] ifs = clz.getInterfaces();
-        for (Class<?> iff : ifs) {
-            if (iff.equals(ifToImplement)) {
-                return true;
-            }
-        }
-        return false;
-    }
-
-    /**
-     * Provide mapping of string to attribute names, generated by yang-tools. "netconf-id" converted to "_netconfId"
-     *
-     * @param name with attribute name, not null or empty
-     * @return converted string or null if name was empty or null
-     */
-    public @Nullable static String toCamelCaseAttributeName(final String name) {
-        if (name == null || name.isEmpty())
-            return null;
-
-        final StringBuilder ret = new StringBuilder(name.length());
-        if (!name.startsWith("_"))
-            ret.append('_');
-        int start = 0;
-        for (final String word : name.split("-")) {
-            if (!word.isEmpty()) {
-                if (start++ == 0) {
-                    ret.append(Character.toLowerCase(word.charAt(0)));
-                } else {
-                    ret.append(Character.toUpperCase(word.charAt(0)));
-                }
-                ret.append(word.substring(1));
-            }
-        }
-        return ret.toString();
-    }
-
-    private static BundleContext getBundleContext() {
-        Bundle bundle = FrameworkUtil.getBundle(YangToolsMapperHelper.class);
-        return bundle != null ? bundle.getBundleContext() : null;
-    }
-}
diff --git a/sdnr/wt/data-provider/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/dataprovider/yangtools/builder/DateAndTimeBuilder.java b/sdnr/wt/data-provider/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/dataprovider/yangtools/builder/DateAndTimeBuilder.java
deleted file mode 100644
index 8dbaf4ab9..000000000
--- a/sdnr/wt/data-provider/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/dataprovider/yangtools/builder/DateAndTimeBuilder.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * ============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.dataprovider.yangtools.builder;
-
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.yang.types.rev130715.DateAndTime;
-
-public class DateAndTimeBuilder {
-	 private final String _value;
-
-     public DateAndTimeBuilder(String v) {
-         this._value = v;
-     }
-
-     public DateAndTime build() {
-         return new DateAndTime(_value);
-     }
-}
diff --git a/sdnr/wt/data-provider/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/dataprovider/yangtools/mapperextensions/YangToolsBuilderAnnotationIntrospector.java b/sdnr/wt/data-provider/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/dataprovider/yangtools/mapperextensions/YangToolsBuilderAnnotationIntrospector.java
deleted file mode 100644
index 0a119e0a7..000000000
--- a/sdnr/wt/data-provider/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/dataprovider/yangtools/mapperextensions/YangToolsBuilderAnnotationIntrospector.java
+++ /dev/null
@@ -1,130 +0,0 @@
-/*
- * ============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.dataprovider.yangtools.mapperextensions;
-
-import com.fasterxml.jackson.databind.annotation.JsonPOJOBuilder;
-import com.fasterxml.jackson.databind.annotation.JsonPOJOBuilder.Value;
-import com.fasterxml.jackson.databind.cfg.MapperConfig;
-import com.fasterxml.jackson.databind.introspect.AnnotatedClass;
-import com.fasterxml.jackson.databind.introspect.AnnotatedMethod;
-import com.fasterxml.jackson.databind.introspect.JacksonAnnotationIntrospector;
-import java.math.BigInteger;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import org.onap.ccsdk.features.sdnr.wt.dataprovider.yangtools.YangToolsMapperHelper;
-import org.onap.ccsdk.features.sdnr.wt.dataprovider.yangtools.builder.DateAndTimeBuilder;
-//import org.onap.ccsdk.features.sdnr.wt.dataprovider.data.builders.rev201110.read.network.element.connection.list.output.DataBuilder;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.yang.types.rev130715.DateAndTime;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.netconf.node.topology.rev150114.netconf.node.credentials.Credentials;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.netconf.node.topology.rev150114.netconf.node.credentials.credentials.LoginPasswordBuilder;
-import org.opendaylight.yangtools.yang.common.Uint16;
-import org.opendaylight.yangtools.yang.common.Uint32;
-import org.opendaylight.yangtools.yang.common.Uint64;
-import org.opendaylight.yangtools.yang.common.Uint8;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-public class YangToolsBuilderAnnotationIntrospector extends JacksonAnnotationIntrospector {
-
-    private static final Logger LOG = LoggerFactory.getLogger(YangToolsBuilderAnnotationIntrospector.class);
-    private static final long serialVersionUID = 1L;
-
-    private final Map<Class<?>, String> customDeserializer;
-
-    public YangToolsBuilderAnnotationIntrospector() {
-        this(null, null);
-    }
-
-    public YangToolsBuilderAnnotationIntrospector(Class<?> cls, Class<?> builderClass) {
-        this.customDeserializer = new HashMap<>();
-        if (cls != null && builderClass != null) {
-            this.customDeserializer.put(cls, builderClass.getName());
-        }
-        this.customDeserializer.put(DateAndTime.class, DateAndTimeBuilder.class.getName());
-        this.customDeserializer.put(Credentials.class, LoginPasswordBuilder.class.getName());
-    }
-
-    @Override
-    public Class<?> findPOJOBuilder(AnnotatedClass ac) {
-        try {
-            String builder = null;
-            if (this.customDeserializer.containsKey(ac.getRawType())) {
-                builder = this.customDeserializer.get(ac.getRawType());
-            } else {
-                if (ac.getRawType().isInterface()) {
-                    builder = ac.getName() + "Builder";
-                }
-            }
-            if (builder != null) {
-                LOG.trace("map {} with builder {}", ac.getName(), builder);
-                Class<?> innerBuilder = YangToolsMapperHelper.findClass(builder);
-                return innerBuilder;
-            }
-        } catch (ClassNotFoundException e) {
-            LOG.trace("builder class not found for {}", ac.getName());
-        }
-        return super.findPOJOBuilder(ac);
-    }
-
-    @Override
-    public Value findPOJOBuilderConfig(AnnotatedClass ac) {
-        if (ac.hasAnnotation(JsonPOJOBuilder.class)) {
-            return super.findPOJOBuilderConfig(ac);
-        }
-        return new JsonPOJOBuilder.Value("build", "set");
-    }
-
-    @Override
-    public AnnotatedMethod resolveSetterConflict(MapperConfig<?> config, AnnotatedMethod setter1,
-            AnnotatedMethod setter2) {
-        Class<?> p1 = setter1.getRawParameterType(0);
-        Class<?> p2 = setter2.getRawParameterType(0);
-        AnnotatedMethod res = null;
-
-        if (this.isAssignable(p1, p2, Map.class, List.class)) {
-			res = p1.isAssignableFrom(List.class) ? setter1 : setter2; //prefer List setter
-        } else if (this.isAssignable(p1, p2, Uint64.class, BigInteger.class)) {
-            res = setter1;
-        } else if (this.isAssignable(p1, p2, Uint32.class, Long.class)) {
-            res = setter1;
-        } else if (this.isAssignable(p1, p2, Uint16.class, Integer.class)) {
-            res = setter1;
-        } else if (this.isAssignable(p1, p2, Uint8.class, Short.class)) {
-            res = setter1;
-        }
-        if (res == null) {
-            res = super.resolveSetterConflict(config, setter1, setter2);
-        }
-        LOG.debug("{} (m1={} <=> m2={} => result:{})", setter1.getName(), p1.getSimpleName(), p2.getSimpleName(),
-                res.getRawParameterType(0).getSimpleName());
-
-        return res;
-    }
-
-    private boolean isAssignable(Class<?> p1, Class<?> p2, Class<?> c1, Class<?> c2) {
-        return ((p1.isAssignableFrom(c1) && p2.isAssignableFrom(c2))
-                || (p2.isAssignableFrom(c1) && p1.isAssignableFrom(c2)));
-
-    }
-
-}
diff --git a/sdnr/wt/data-provider/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/dataprovider/yangtools/mapperextensions/YangToolsDeserializerModifier.java b/sdnr/wt/data-provider/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/dataprovider/yangtools/mapperextensions/YangToolsDeserializerModifier.java
deleted file mode 100644
index 634a3bc5b..000000000
--- a/sdnr/wt/data-provider/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/dataprovider/yangtools/mapperextensions/YangToolsDeserializerModifier.java
+++ /dev/null
@@ -1,117 +0,0 @@
-/*
- * ============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.dataprovider.yangtools.mapperextensions;
-
-import com.fasterxml.jackson.core.JsonParser;
-import com.fasterxml.jackson.databind.BeanDescription;
-import com.fasterxml.jackson.databind.DeserializationConfig;
-import com.fasterxml.jackson.databind.DeserializationContext;
-import com.fasterxml.jackson.databind.JavaType;
-import com.fasterxml.jackson.databind.JsonDeserializer;
-import com.fasterxml.jackson.databind.KeyDeserializer;
-import com.fasterxml.jackson.databind.deser.BeanDeserializerModifier;
-import java.io.IOException;
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-import java.util.NoSuchElementException;
-import org.onap.ccsdk.features.sdnr.wt.dataprovider.model.types.ScalarTypeObject;
-//import org.onap.ccsdk.features.sdnr.wt.dataprovider.model.types.ScalarTypeObject;
-import org.onap.ccsdk.features.sdnr.wt.dataprovider.model.types.YangHelper2;
-import org.onap.ccsdk.features.sdnr.wt.dataprovider.yangtools.YangToolsMapperHelper;
-import org.onap.ccsdk.features.sdnr.wt.dataprovider.yangtools.serialize.BaseIdentityDeserializer;
-import org.onap.ccsdk.features.sdnr.wt.dataprovider.yangtools.serialize.ClassDeserializer;
-import org.onap.ccsdk.features.sdnr.wt.dataprovider.yangtools.serialize.IdentifierDeserializer;
-import org.onap.ccsdk.features.sdnr.wt.dataprovider.yangtools.serialize.TypeObjectDeserializer;
-import org.opendaylight.yangtools.yang.binding.BaseIdentity;
-import org.opendaylight.yangtools.yang.binding.Identifier;
-import org.opendaylight.yangtools.yang.binding.TypeObject;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-public class YangToolsDeserializerModifier extends BeanDeserializerModifier {
-
-    private static final Logger LOG = LoggerFactory.getLogger(YangToolsDeserializerModifier.class);
-    private static final String getEnumMethodName="valueOf";
-
-    @Override
-    public JsonDeserializer<Enum<?>> modifyEnumDeserializer(DeserializationConfig config, final JavaType type,
-            BeanDescription beanDesc, final JsonDeserializer<?> deserializer) {
-        return new JsonDeserializer<Enum<?>>() {
-
-            @Override
-            public Enum<?> deserialize(JsonParser jp, DeserializationContext ctxt) throws IOException {
-                Class<?> clazz = type.getRawClass();
-
-                try {
-                    Method method = clazz.getDeclaredMethod(getEnumMethodName, String.class);
-                    Enum<?> result = (Enum<?>) method.invoke(null, jp.getValueAsString());
-                    LOG.debug("Deserialize '{}' with class '{}' to '{}'", jp.getValueAsString(), clazz.getName(), result);
-                    return result;
-                } catch (IllegalAccessException | IllegalArgumentException | InvocationTargetException
-                        | NoSuchMethodException | NoSuchElementException | SecurityException e) {
-                    LOG.warn("problem deserializing enum for {} with value {}: {}", clazz.getName(),
-                            jp.getValueAsString(), e);
-                }
-                throw new IOException(
-                        "unable to parse enum (" + type.getRawClass() + ")for value " + jp.getValueAsString());
-            }
-        };
-    }
-
-    @Override
-    public JsonDeserializer<?> modifyDeserializer(DeserializationConfig config, BeanDescription beanDesc,
-            JsonDeserializer<?> deserializer) {
-        final JavaType type = beanDesc.getType();
-        final Class<?> rawClass = type.getRawClass();
-
-        JsonDeserializer<?> deser = super.modifyDeserializer(config, beanDesc, deserializer);
-
-        if (YangToolsMapperHelper.implementsInterface(rawClass, TypeObject.class)) {
-            deser = new TypeObjectDeserializer<TypeObject>(type, deser);
-        } else if (YangToolsMapperHelper.implementsInterface(rawClass, YangHelper2.getScalarTypeObjectClass())) {
-            deser = new TypeObjectDeserializer<ScalarTypeObject>(type, deser);
-        } else if (YangToolsMapperHelper.implementsInterface(rawClass, BaseIdentity.class)) {
-            deser = new BaseIdentityDeserializer<BaseIdentity>(deser);
-        } else if (rawClass.equals(Class.class)) {
-            deser = new ClassDeserializer(rawClass);
-        }
-
-        LOG.debug("Deserialize '{}' with deserializer '{}'", rawClass.getName(), deser.getClass().getName());
-        return deser;
-    }
-
-    @Override
-    public KeyDeserializer modifyKeyDeserializer(DeserializationConfig config, JavaType type, KeyDeserializer deser) {
-        KeyDeserializer res;
-        if (YangToolsMapperHelper.implementsInterface(type.getRawClass(), Identifier.class)) {
-            res = new IdentifierDeserializer();
-        } else {
-            res = super.modifyKeyDeserializer(config, type, deser);
-        }
-        LOG.debug("Keydeserialize '{}' with deserializer '{}'", type.getRawClass().getName(), res.getClass().getName());
-        return res;
-    }
-
-    void test() {
-        com.fasterxml.jackson.databind.util.ClassUtil xy;
-    }
-}
diff --git a/sdnr/wt/data-provider/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/dataprovider/yangtools/mapperextensions/YangToolsModule.java b/sdnr/wt/data-provider/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/dataprovider/yangtools/mapperextensions/YangToolsModule.java
deleted file mode 100644
index 46f69d4f9..000000000
--- a/sdnr/wt/data-provider/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/dataprovider/yangtools/mapperextensions/YangToolsModule.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- * ============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.dataprovider.yangtools.mapperextensions;
-
-import com.fasterxml.jackson.databind.module.SimpleModule;
-import java.util.Map;
-import org.onap.ccsdk.features.sdnr.wt.dataprovider.yangtools.serialize.DateAndTimeSerializer;
-import org.onap.ccsdk.features.sdnr.wt.dataprovider.yangtools.serialize.EnumSerializer;
-import org.onap.ccsdk.features.sdnr.wt.dataprovider.yangtools.serialize.IdentifierDeserializer;
-import org.onap.ccsdk.features.sdnr.wt.dataprovider.yangtools.serialize.MapSerializer;
-import org.onap.ccsdk.features.sdnr.wt.dataprovider.yangtools.serialize.TypeObjectSerializer;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.yang.types.rev130715.DateAndTime;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev201110.pmdata.grp.MeasurementKey;
-import org.opendaylight.yangtools.yang.binding.TypeObject;
-
-public class YangToolsModule extends SimpleModule {
-
-    private static final long serialVersionUID = 1L;
-
-    public YangToolsModule() {
-        super();
-        setDeserializerModifier(new YangToolsDeserializerModifier());
-
-        addKeyDeserializer(MeasurementKey.class, new IdentifierDeserializer());
-        addSerializer(DateAndTime.class, new DateAndTimeSerializer());
-        addSerializer(TypeObject.class, new TypeObjectSerializer());
-        addSerializer(Enum.class, new EnumSerializer());
-        addSerializer(Map.class, new MapSerializer());
-    }
-
-}
diff --git a/sdnr/wt/data-provider/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/dataprovider/yangtools/serialize/BaseIdentityDeserializer.java b/sdnr/wt/data-provider/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/dataprovider/yangtools/serialize/BaseIdentityDeserializer.java
deleted file mode 100644
index 10f18e796..000000000
--- a/sdnr/wt/data-provider/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/dataprovider/yangtools/serialize/BaseIdentityDeserializer.java
+++ /dev/null
@@ -1,64 +0,0 @@
-/*
- * ============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.dataprovider.yangtools.serialize;
-
-import com.fasterxml.jackson.core.JsonParser;
-import com.fasterxml.jackson.core.JsonProcessingException;
-import com.fasterxml.jackson.databind.DeserializationContext;
-import com.fasterxml.jackson.databind.JsonDeserializer;
-import java.io.IOException;
-import org.onap.ccsdk.features.sdnr.wt.dataprovider.yangtools.YangToolsMapperHelper;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-public class BaseIdentityDeserializer<T> extends JsonDeserializer<T> {
-
-    private static final Logger LOG = LoggerFactory.getLogger(BaseIdentityDeserializer.class);
-    private final JsonDeserializer<?> deser;
-
-    public BaseIdentityDeserializer(final JsonDeserializer<?> deser) {
-        this.deser = deser;
-    }
-
-    @SuppressWarnings("unchecked")
-    @Override
-    public T deserialize(JsonParser parser, DeserializationContext ctxt) throws IOException, JsonProcessingException {
-        LOG.debug("BaseIdentityDeserializer class for '{}'",parser.getValueAsString());
-        String clazzToSearch = parser.getValueAsString();
-        // clazz from Elasticsearch is full qualified
-        int lastDot = clazzToSearch.lastIndexOf(".");
-        if (lastDot > -1) {
-            clazzToSearch = clazzToSearch.substring(lastDot+1);
-        } else {
-            clazzToSearch = clazzToSearch.substring(0, 1).toUpperCase() + clazzToSearch.substring(1);
-        }
-        Class<?> clazz;
-        try {
-            clazz = YangToolsMapperHelper.findClass(clazzToSearch);
-            if (clazz != null)
-                return (T)clazz;
-        } catch (ClassNotFoundException e) {
-            LOG.warn("BaseIdentityDeserializer class not found for '"+parser.getValueAsString()+"'",e);
-        }
-        return (T) deser.deserialize(parser, ctxt);
-    }
-}
diff --git a/sdnr/wt/data-provider/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/dataprovider/yangtools/serialize/ClassDeserializer.java b/sdnr/wt/data-provider/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/dataprovider/yangtools/serialize/ClassDeserializer.java
deleted file mode 100644
index 2627c2ae0..000000000
--- a/sdnr/wt/data-provider/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/dataprovider/yangtools/serialize/ClassDeserializer.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * ============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.dataprovider.yangtools.serialize;
-
-import com.fasterxml.jackson.databind.DeserializationContext;
-import com.fasterxml.jackson.databind.deser.std.FromStringDeserializer;
-import java.io.IOException;
-import org.onap.ccsdk.features.sdnr.wt.dataprovider.yangtools.YangToolsMapperHelper;
-
-public class ClassDeserializer extends FromStringDeserializer<Class<?>> {
-
-    private static final long serialVersionUID = 1L;
-
-    public ClassDeserializer(Class<?> vc) {
-        super(vc);
-    }
-
-    @Override
-    protected Class<?> _deserialize(String value, DeserializationContext ctxt) throws IOException {
-        try {
-            return YangToolsMapperHelper.findClass(value);
-        } catch (ClassNotFoundException e) {
-            throw new IOException("Can not find class "+value,e);
-        }
-    }
-}
diff --git a/sdnr/wt/data-provider/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/dataprovider/yangtools/serialize/DateAndTimeSerializer.java b/sdnr/wt/data-provider/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/dataprovider/yangtools/serialize/DateAndTimeSerializer.java
deleted file mode 100644
index a35aad75a..000000000
--- a/sdnr/wt/data-provider/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/dataprovider/yangtools/serialize/DateAndTimeSerializer.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * ============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.dataprovider.yangtools.serialize;
-
-import com.fasterxml.jackson.core.JsonGenerator;
-import com.fasterxml.jackson.databind.SerializerProvider;
-import com.fasterxml.jackson.databind.ser.std.StdSerializer;
-import java.io.IOException;
-import org.eclipse.jdt.annotation.NonNull;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.yang.types.rev130715.DateAndTime;
-
-/**
- * DateAndTime shouldn't be encapsulated into a json object to be able to use elasticsearch date time query functions.
- */
-public class DateAndTimeSerializer extends StdSerializer<@NonNull DateAndTime> {
-
-    private static final long serialVersionUID = 1L;
-
-    public DateAndTimeSerializer() {
-        this(null);
-    }
-
-    protected DateAndTimeSerializer(Class<DateAndTime> t) {
-        super(t);
-    }
-
-    @Override
-    public void serialize(DateAndTime value, JsonGenerator gen, SerializerProvider serializers) throws IOException {
-        gen.writeString(value.getValue());
-    }
-
-}
diff --git a/sdnr/wt/data-provider/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/dataprovider/yangtools/serialize/EnumSerializer.java b/sdnr/wt/data-provider/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/dataprovider/yangtools/serialize/EnumSerializer.java
deleted file mode 100644
index f8220c2d4..000000000
--- a/sdnr/wt/data-provider/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/dataprovider/yangtools/serialize/EnumSerializer.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * ============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.dataprovider.yangtools.serialize;
-
-import com.fasterxml.jackson.core.JsonGenerator;
-import com.fasterxml.jackson.databind.JsonSerializer;
-import com.fasterxml.jackson.databind.SerializerProvider;
-import java.io.IOException;
-
-@SuppressWarnings("rawtypes")
-public class EnumSerializer extends JsonSerializer<Enum> {
-
-    @Override
-    public void serialize(Enum value, JsonGenerator gen, SerializerProvider serializers) throws IOException {
-        gen.writeString(value.name());
-    }
-}
diff --git a/sdnr/wt/data-provider/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/dataprovider/yangtools/serialize/IdentifierDeserializer.java b/sdnr/wt/data-provider/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/dataprovider/yangtools/serialize/IdentifierDeserializer.java
deleted file mode 100644
index 0837b8a19..000000000
--- a/sdnr/wt/data-provider/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/dataprovider/yangtools/serialize/IdentifierDeserializer.java
+++ /dev/null
@@ -1,71 +0,0 @@
-/*
- * ============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.dataprovider.yangtools.serialize;
-
-import com.fasterxml.jackson.databind.DeserializationContext;
-import com.fasterxml.jackson.databind.KeyDeserializer;
-import java.io.IOException;
-import java.lang.reflect.InvocationTargetException;
-import java.util.List;
-import org.onap.ccsdk.features.sdnr.wt.dataprovider.yangtools.YangToolsMapperHelper;
-import org.opendaylight.yangtools.yang.common.Uint16;
-import org.opendaylight.yangtools.yang.common.Uint32;
-import org.opendaylight.yangtools.yang.common.Uint64;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-public class IdentifierDeserializer extends KeyDeserializer {
-
-    private static final Logger LOG = LoggerFactory.getLogger(IdentifierDeserializer.class);
-
-    public IdentifierDeserializer() {}
-
-    @Override
-    public Object deserializeKey(String key, DeserializationContext ctxt) throws IOException {
-        Class<?> clazz = ctxt.getClass();
-        final String arg = key;
-        LOG.debug("Deserialization for key:{}",key);
-        // find constructor argument types
-        List<Class<?>> ctypes = YangToolsMapperHelper.getConstructorParameterTypes(clazz, String.class);
-        for (Class<?> ctype : ctypes) {
-            try {
-                if (ctype.equals(String.class)) {
-                    return clazz.getConstructor(ctype).newInstance(arg);
-                } else if (ctype.equals(Uint16.class)) {
-                    return clazz.getConstructor(ctype).newInstance(Uint16.valueOf(arg));
-
-                } else if (ctype.equals(Uint32.class)) {
-                    return clazz.getConstructor(ctype).newInstance(Uint32.valueOf(arg));
-                } else if (ctype.equals(Uint64.class)) {
-                    return clazz.getConstructor(ctype).newInstance(Uint64.valueOf(arg));
-                }
-            } catch (InstantiationException | IllegalAccessException | IllegalArgumentException
-                    | InvocationTargetException | NoSuchMethodException | SecurityException e) {
-                LOG.warn("unable to instantiate class {} with arg {}: ", clazz, arg, e);
-                throw new IllegalArgumentException(
-                        "unable to instantiate class " + clazz.getName() + " with arg '" + arg + "' ", e);
-            }
-        }
-        return null;
-    }
-
-}
diff --git a/sdnr/wt/data-provider/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/dataprovider/yangtools/serialize/MapSerializer.java b/sdnr/wt/data-provider/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/dataprovider/yangtools/serialize/MapSerializer.java
deleted file mode 100644
index e5c966a74..000000000
--- a/sdnr/wt/data-provider/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/dataprovider/yangtools/serialize/MapSerializer.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * ============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.dataprovider.yangtools.serialize;
-
-import com.fasterxml.jackson.core.JsonGenerator;
-import com.fasterxml.jackson.databind.JsonSerializer;
-import com.fasterxml.jackson.databind.SerializerProvider;
-import java.io.IOException;
-import java.util.Map;
-
-@SuppressWarnings("rawtypes")
-public class MapSerializer extends JsonSerializer<Map> {
-
-        @Override
-        public void serialize(Map value, JsonGenerator gen, SerializerProvider serializers) throws IOException {
-            gen.writeObject(value.values());
-        }
-}
diff --git a/sdnr/wt/data-provider/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/dataprovider/yangtools/serialize/TypeObjectDeserializer.java b/sdnr/wt/data-provider/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/dataprovider/yangtools/serialize/TypeObjectDeserializer.java
deleted file mode 100644
index 5beca0d47..000000000
--- a/sdnr/wt/data-provider/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/dataprovider/yangtools/serialize/TypeObjectDeserializer.java
+++ /dev/null
@@ -1,87 +0,0 @@
-/*
- * ============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.dataprovider.yangtools.serialize;
-
-import com.fasterxml.jackson.core.JsonParser;
-import com.fasterxml.jackson.core.JsonProcessingException;
-import com.fasterxml.jackson.databind.DeserializationContext;
-import com.fasterxml.jackson.databind.JavaType;
-import com.fasterxml.jackson.databind.JsonDeserializer;
-import java.io.IOException;
-import java.lang.reflect.InvocationTargetException;
-import java.util.NoSuchElementException;
-import java.util.Optional;
-import org.onap.ccsdk.features.sdnr.wt.dataprovider.yangtools.YangToolsMapperHelper;
-import org.opendaylight.yangtools.concepts.Builder;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-public class TypeObjectDeserializer<T> extends JsonDeserializer<T> {
-
-    private static final Logger LOG = LoggerFactory.getLogger(TypeObjectDeserializer.class);
-    private final JavaType type;
-    private final JsonDeserializer<?> deser;
-
-
-    public TypeObjectDeserializer(final JavaType type, final JsonDeserializer<?> deser) {
-        this.type = type;
-        this.deser = deser;
-    }
-
-    @SuppressWarnings("unchecked")
-    @Override
-    public T deserialize(JsonParser parser, DeserializationContext ctxt) throws IOException, JsonProcessingException {
-
-        Class<T> clazz = (Class<T>) type.getRawClass();
-        final String arg = parser.getValueAsString();
-        LOG.debug("Try to build arg:'{}' with class {}",arg, clazz);
-        Optional<T> oRes = Optional.empty();
-        try {
-            //try get method for default instance
-            if ((oRes = YangToolsMapperHelper.getDefaultInstance(clazz, arg)).isEmpty()) {
-                //try to find builder with getDefaultInstance method
-                Optional<Class<Builder<?>>> oBuilderClazz = YangToolsMapperHelper.findBuilderClassOptional(ctxt, clazz);
-                LOG.debug("Try builder class present:{}",oBuilderClazz.isPresent());
-                if (oBuilderClazz.isEmpty()
-                        || ((oRes = YangToolsMapperHelper.getDefaultInstance(oBuilderClazz.get(), arg)).isEmpty())) {
-                    //try to find constructor with string
-                    LOG.debug("Try constructor");
-                    if ((oRes = YangToolsMapperHelper.getInstanceByConstructor(clazz, arg)).isEmpty()) {
-                        //forward to standard deserializer or throw if not available
-                        LOG.debug("Try default deserializer");
-                        oRes = Optional.of((T) deser.deserialize(parser, ctxt));
-                    }
-                }
-            }
-            LOG.debug("Deserialize string value:{} for class:{} success:{}", arg, clazz, oRes.isPresent());
-        } catch (IllegalAccessException | IllegalArgumentException | InvocationTargetException | NoSuchMethodException
-                | NoSuchElementException | SecurityException | InstantiationException e) {
-            LOG.warn("problem deserializing {} with value {}: {}", clazz.getName(), arg, e);
-        }
-        if (oRes.isPresent()) {
-            return oRes.get();
-        } else {
-            throw new IllegalArgumentException("Could not find constructor for arg:'" + arg + "' and class: " + clazz);
-        }
-    }
-
-}
diff --git a/sdnr/wt/data-provider/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/dataprovider/yangtools/serialize/TypeObjectSerializer.java b/sdnr/wt/data-provider/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/dataprovider/yangtools/serialize/TypeObjectSerializer.java
deleted file mode 100644
index 1269d0746..000000000
--- a/sdnr/wt/data-provider/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/dataprovider/yangtools/serialize/TypeObjectSerializer.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * ============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.dataprovider.yangtools.serialize;
-
-import com.fasterxml.jackson.core.JsonGenerator;
-import com.fasterxml.jackson.databind.JsonSerializer;
-import com.fasterxml.jackson.databind.SerializerProvider;
-import java.io.IOException;
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-import org.opendaylight.yangtools.yang.binding.TypeObject;
-
-public class TypeObjectSerializer extends JsonSerializer<TypeObject> {
-
-    @Override
-    public void serialize(TypeObject value, JsonGenerator gen, SerializerProvider serializers) throws IOException {
-        //stringValue
-        Method[] methods = value.getClass().getDeclaredMethods();
-        String name;
-        for (Method method : methods) {
-            name = method.getName();
-            if (name.equals("stringValue") || name.equals("getValue")) {
-                try {
-                    gen.writeString((String)method.invoke(value));
-                } catch (IllegalAccessException | IllegalArgumentException | InvocationTargetException
-                        | IOException e) {
-                    throw new IOException("No String getter method supported TypeObject for "+value.getClass(),e);
-                }
-            }
-        }
-    }
-}
diff --git a/sdnr/wt/data-provider/provider/src/test/java/org/onap/ccsdk/features/sdnr/wt/dataprovider/test/TestAbout.java b/sdnr/wt/data-provider/provider/src/test/java/org/onap/ccsdk/features/sdnr/wt/dataprovider/test/TestAbout.java
index 624451ca7..92ac04702 100644
--- a/sdnr/wt/data-provider/provider/src/test/java/org/onap/ccsdk/features/sdnr/wt/dataprovider/test/TestAbout.java
+++ b/sdnr/wt/data-provider/provider/src/test/java/org/onap/ccsdk/features/sdnr/wt/dataprovider/test/TestAbout.java
@@ -21,7 +21,6 @@
  */
 package org.onap.ccsdk.features.sdnr.wt.dataprovider.test;
 
-import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.verify;
@@ -32,8 +31,6 @@ import java.nio.file.Files;
 import javax.servlet.ServletException;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
-
-import org.jline.utils.Log;
 import org.junit.AfterClass;
 import org.junit.BeforeClass;
 import org.junit.Test;
@@ -106,12 +103,7 @@ public class TestAbout {
         assertTrue(printOut.getByteArrayOutputStream().size() > 0);
     }
 
-    @Test
-    public void testGetGroupId() {
-    	AboutHelperServlet sv = new AboutHelperServlet();
-    	assertNotNull(sv.getGroupIdOrDefault(null));
-    }
-    
+
 
     private class AboutHelperServlet extends AboutHttpServlet {
 
@@ -124,16 +116,6 @@ public class TestAbout {
         public void doGet(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException {
             super.doGet(req, resp);
         }
-        @Override
-        public String getGroupIdOrDefault(String def) {
-    		return super.getGroupIdOrDefault(def);
-    	}
-        @Override
-        protected String getManifestValue(String key) {
-        	if(key == "Bundle-SymbolicName") {
-        		return "org.onap.ccsdk.features.sdnr.wt.sdnr-wt-data-provider-provider";
-        	}
-        	return super.getManifestValue(key);
-        }
+
     }
 }
diff --git a/sdnr/wt/data-provider/provider/src/test/java/org/onap/ccsdk/features/sdnr/wt/dataprovider/test/TestCRUDforDatabase.java b/sdnr/wt/data-provider/provider/src/test/java/org/onap/ccsdk/features/sdnr/wt/dataprovider/test/TestCRUDforDatabase.java
index b7a4db51b..5f78999d0 100644
--- a/sdnr/wt/data-provider/provider/src/test/java/org/onap/ccsdk/features/sdnr/wt/dataprovider/test/TestCRUDforDatabase.java
+++ b/sdnr/wt/data-provider/provider/src/test/java/org/onap/ccsdk/features/sdnr/wt/dataprovider/test/TestCRUDforDatabase.java
@@ -42,7 +42,7 @@ import org.onap.ccsdk.features.sdnr.wt.common.database.requests.BaseRequest;
 import org.onap.ccsdk.features.sdnr.wt.dataprovider.data.ElasticSearchDataProvider;
 import org.onap.ccsdk.features.sdnr.wt.dataprovider.model.types.YangHelper2;
 import org.onap.ccsdk.features.sdnr.wt.dataprovider.test.util.HostInfoForTest;
-import org.onap.ccsdk.features.sdnr.wt.dataprovider.yangtools.YangToolsMapper;
+import org.onap.ccsdk.features.sdnr.wt.dataprovider.yangtools.YangToolsMapper2;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.yang.types.rev130715.DateAndTime;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev201110.CreateMaintenanceInput;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev201110.CreateMaintenanceInputBuilder;
@@ -61,7 +61,7 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.pro
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev201110.DeleteNetworkElementConnectionInputBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev201110.Entity;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev201110.Faultlog;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev201110.FaultlogBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev201110.FaultlogEntity;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev201110.GranularityPeriodType;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev201110.ReadConnectionlogListInput;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev201110.ReadConnectionlogListInputBuilder;
@@ -306,7 +306,7 @@ public class TestCRUDforDatabase {
 
         CreateNetworkElementConnectionOutputBuilder create = null;
         CreateNetworkElementConnectionInput input = new CreateNetworkElementConnectionInputBuilder().setNodeId(name)
-                .setIsRequired(true).setHost(url).setPort(YangHelper2.getLongOrUint32(port)).build();
+                .setIsRequired(true).setHost(url).setPort(port).build();
         String dbId = null;
 
         try {
@@ -342,7 +342,7 @@ public class TestCRUDforDatabase {
         final long port2 = 5960;
 
         UpdateNetworkElementConnectionInput updateInput = new UpdateNetworkElementConnectionInputBuilder().setId(dbId)
-                .setHost(url2).setPort(YangHelper2.getLongOrUint32(port2)).setIsRequired(false).build();
+                .setHost(url2).setPort(port2).setIsRequired(false).build();
         UpdateNetworkElementConnectionOutputBuilder updateOutput = null;
         try {
             updateOutput = dbProvider.updateNetworkElementConnection(updateInput);
@@ -1363,20 +1363,18 @@ public class TestCRUDforDatabase {
                     + "\"implemented-interface\": \"org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev201110.Faultlog\",\n"
                     + "\"source-type\": \"Netconf\",\n" + "\"node-id\": \"sim4\",\n" + "\"problem\": \"signalIsLost\"\n"
                     + "}";
-            YangToolsMapper yangtoolsMapper = new YangToolsMapper();
-            Faultlog log = yangtoolsMapper.readValue(jsonString, Faultlog.class);
-            System.out.println(yangtoolsMapper.writeValueAsString((new FaultlogBuilder(log).build())));
-            System.out.println("Check3");
+            YangToolsMapper2<Faultlog> yangtoolsMapper = new YangToolsMapper2<>(Faultlog.class,null);
+            FaultlogEntity log = yangtoolsMapper.readValue(jsonString, Faultlog.class);
+            System.out.println(log);
+            System.out.println(yangtoolsMapper.writeValueAsString(log));
         } catch (IOException e) {
-            e.printStackTrace();
-            fail("Fail");
+            fail(e.getMessage());
         }
 
     }
 
     private Pagination getPagination(long pageSize, int page) {
-        return new PaginationBuilder().setPage(YangHelper2.getBigIntegerOrUint64(BigInteger.valueOf(page)))
-                .setSize(YangHelper2.getLongOrUint32(pageSize)).build();
+        return new PaginationBuilder().setPage(BigInteger.valueOf(page)).setSize(pageSize).build();
     }
 
 
diff --git a/sdnr/wt/data-provider/provider/src/test/java/org/onap/ccsdk/features/sdnr/wt/dataprovider/test/TestDataMappings.java b/sdnr/wt/data-provider/provider/src/test/java/org/onap/ccsdk/features/sdnr/wt/dataprovider/test/TestDataMappings.java
index eaaa31107..6584d0503 100644
--- a/sdnr/wt/data-provider/provider/src/test/java/org/onap/ccsdk/features/sdnr/wt/dataprovider/test/TestDataMappings.java
+++ b/sdnr/wt/data-provider/provider/src/test/java/org/onap/ccsdk/features/sdnr/wt/dataprovider/test/TestDataMappings.java
@@ -21,10 +21,9 @@
  */
 package org.onap.ccsdk.features.sdnr.wt.dataprovider.test;
 
-import static org.junit.Assert.fail;
 import java.io.IOException;
 import org.junit.Test;
-import org.onap.ccsdk.features.sdnr.wt.dataprovider.yangtools.YangToolsMapper2;
+import org.onap.ccsdk.features.sdnr.wt.dataprovider.yangtools.YangToolsMapper;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev201110.read.pmdata._15m.list.output.Data;
 
 public class TestDataMappings {
@@ -36,7 +35,7 @@ public class TestDataMappings {
             + "\"layer-protocol-name\": \"MWPS\",\n"
             + "\"radio-signal-id\": \"Test11\",\n"
             + "\"time-stamp\": \"2017-07-04T14:00:00.0Z\",\n"
-            + "\"granularity-period\": \"Period15Min\",\n"
+            + "\"granularity-period\": \"PERIOD_15MIN\",\n"
             + "\"scanner-id\": \"PM_RADIO_15M_9\",\n"
             + "\"performance-data\": {\n"
             + "\"es\": 0,\n"
@@ -85,15 +84,14 @@ public class TestDataMappings {
             + "}";
  // @formatter:on
     @Test
-    public void testPmData15m() throws ClassNotFoundException {
+    public void testPmData15m() {
 
-        YangToolsMapper2<Data> mapper = new YangToolsMapper2<Data>(Data.class, null);
+        YangToolsMapper mapper = new YangToolsMapper();
         try {
             Data data = mapper.readValue(PMDATA15M_SERVERDB_JSON.getBytes(), Data.class);
             System.out.println(data);
         } catch (IOException e) {
             e.printStackTrace();
-            fail("Can not parse data");
         }
     }
 
diff --git a/sdnr/wt/data-provider/provider/src/test/java/org/onap/ccsdk/features/sdnr/wt/dataprovider/test/TestEventService.java b/sdnr/wt/data-provider/provider/src/test/java/org/onap/ccsdk/features/sdnr/wt/dataprovider/test/TestEventService.java
index 7e63c183c..95abfdd58 100644
--- a/sdnr/wt/data-provider/provider/src/test/java/org/onap/ccsdk/features/sdnr/wt/dataprovider/test/TestEventService.java
+++ b/sdnr/wt/data-provider/provider/src/test/java/org/onap/ccsdk/features/sdnr/wt/dataprovider/test/TestEventService.java
@@ -40,7 +40,6 @@ import org.onap.ccsdk.features.sdnr.wt.common.database.requests.DeleteByQueryReq
 import org.onap.ccsdk.features.sdnr.wt.dataprovider.data.ElasticSearchDataProvider;
 import org.onap.ccsdk.features.sdnr.wt.dataprovider.data.entity.HtDatabaseEventsService;
 import org.onap.ccsdk.features.sdnr.wt.dataprovider.model.types.NetconfTimeStampImpl;
-import org.onap.ccsdk.features.sdnr.wt.dataprovider.model.types.YangHelper2;
 import org.onap.ccsdk.features.sdnr.wt.dataprovider.test.util.HostInfoForTest;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.yang.types.rev130715.DateAndTime;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev201110.ConnectionLogStatus;
@@ -282,7 +281,7 @@ public class TestEventService {
      * @return
      */
     private static NetworkElementConnectionEntity createNeConnection(String nodeId, NetworkElementDeviceType devType) {
-        return new NetworkElementConnectionBuilder().setNodeId(nodeId).setHost("host").setPort(YangHelper2.getLongOrUint32(1234L))
+        return new NetworkElementConnectionBuilder().setNodeId(nodeId).setHost("host").setPort(1234L)
                 .setCoreModelCapability("123").setStatus(ConnectionLogStatus.Connected).setDeviceType(devType)
                 .setIsRequired(true).build();
     }
diff --git a/sdnr/wt/data-provider/provider/src/test/java/org/onap/ccsdk/features/sdnr/wt/dataprovider/test/TestTree.java b/sdnr/wt/data-provider/provider/src/test/java/org/onap/ccsdk/features/sdnr/wt/dataprovider/test/TestTree.java
index 53c72115d..294dd436f 100644
--- a/sdnr/wt/data-provider/provider/src/test/java/org/onap/ccsdk/features/sdnr/wt/dataprovider/test/TestTree.java
+++ b/sdnr/wt/data-provider/provider/src/test/java/org/onap/ccsdk/features/sdnr/wt/dataprovider/test/TestTree.java
@@ -22,6 +22,7 @@
 package org.onap.ccsdk.features.sdnr.wt.dataprovider.test;
 
 import java.io.IOException;
+import java.net.URISyntaxException;
 import java.util.Arrays;
 import java.util.concurrent.TimeUnit;
 import org.apache.sshd.common.util.io.IoUtils;
@@ -42,9 +43,12 @@ import org.onap.ccsdk.features.sdnr.wt.dataprovider.impl.DataTreeProviderImpl;
 import org.onap.ccsdk.features.sdnr.wt.dataprovider.test.util.HostInfoForTest;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev201110.Entity;
 
+/**
+ * @author Michael Dürre
+ *
+ */
 public class TestTree {
 
-    private static String resourceDirectoryPath="/"+TestTree.class.getSimpleName()+"/";
     private static ElasticSearchDataProvider dbProvider;
     private static HtDatabaseClient dbRawProvider;
 
@@ -61,29 +65,38 @@ public class TestTree {
     }
 
     private static void fillTestData() throws IOException {
-        dbRawProvider.doWriteRaw(Entity.Inventoryequipment.getName(), "sim1/a2.module-1.1.5.5", getFileContent("1.json"));
-        dbRawProvider.doWriteRaw(Entity.Inventoryequipment.getName(), "sim1/CARD-1.1.7.0", getFileContent("2.json"));
-        dbRawProvider.doWriteRaw(Entity.Inventoryequipment.getName(), "sim1/a2.module-1.55.1.2", getFileContent("3.json"));
-        dbRawProvider.doWriteRaw(Entity.Inventoryequipment.getName(), "sim1/a2.module-1.65.1.2", getFileContent("4.json"));
-        dbRawProvider.doWriteRaw(Entity.Inventoryequipment.getName(), "sim1/SHELF-1.1.0.0", getFileContent("5.json"));
-        dbRawProvider.doWriteRaw(Entity.Inventoryequipment.getName(), "sim1/a2.module-1.1.1.5", getFileContent("6.json"));
-        dbRawProvider.doWriteRaw(Entity.Inventoryequipment.getName(), "sim1/a2.module-1.1.1.8", getFileContent("7.json"));
-        dbRawProvider.doWriteRaw(Entity.Inventoryequipment.getName(), "sim1/a2.module-1.1.6.5", getFileContent("8.json"));
-        dbRawProvider.doWriteRaw(Entity.Inventoryequipment.getName(), "sim1/ODU-1.56.0.0", getFileContent("9.json"));
-        dbRawProvider.doWriteRaw(Entity.Inventoryequipment.getName(), "sim1/a2.module-1.56.1.2", getFileContent("10.json"));
-        dbRawProvider.doWriteRaw(Entity.Inventoryequipment.getName(), "sim1/IDU-1.65.0.0", getFileContent("11.json"));
-        dbRawProvider.doWriteRaw(Entity.Inventoryequipment.getName(), "sim1/CARD-1.65.1.4", getFileContent("12.json"));
-        dbRawProvider.doWriteRaw(Entity.Inventoryequipment.getName(), "sim1/CARD-1.1.6.0", getFileContent("13.json"));
-        dbRawProvider.doWriteRaw(Entity.Inventoryequipment.getName(), "sim1/CARD-1.1.8.0", getFileContent("14.json"));
-        dbRawProvider.doWriteRaw(Entity.Inventoryequipment.getName(), "sim1/CARD-1.1.9.0", getFileContent("15.json"));
-        dbRawProvider.doWriteRaw(Entity.Inventoryequipment.getName(), "sim1/CARD-1.55.1.4", getFileContent("16.json"));
-        dbRawProvider.doWriteRaw(Entity.Inventoryequipment.getName(), "sim1/a2.module-1.1.1.7", getFileContent("17.json"));
-        dbRawProvider.doWriteRaw(Entity.Inventoryequipment.getName(), "sim1/IDU-1.55.0.0", getFileContent("18.json"));
-        dbRawProvider.doWriteRaw(Entity.Inventoryequipment.getName(), "sim1/CARD-1.1.1.0", getFileContent("19.json"));
-        dbRawProvider.doWriteRaw(Entity.Inventoryequipment.getName(), "sim1/CARD-1.1.5.0", getFileContent("20.json"));
-        dbRawProvider.doWriteRaw(Entity.Inventoryequipment.getName(), "sim1/a2.module-1.1.5.6", getFileContent("21.json"));
+        dbRawProvider.doWriteRaw(Entity.Inventoryequipment.getName(), "sim1/a2.module-1.1.5.5", getFileContent("/testequipment/1.json"));
+        dbRawProvider.doWriteRaw(Entity.Inventoryequipment.getName(), "sim1/CARD-1.1.7.0", getFileContent("/testequipment/2.json"));
+        dbRawProvider.doWriteRaw(Entity.Inventoryequipment.getName(), "sim1/a2.module-1.55.1.2", getFileContent("/testequipment/3.json"));
+        dbRawProvider.doWriteRaw(Entity.Inventoryequipment.getName(), "sim1/a2.module-1.65.1.2", getFileContent("/testequipment/4.json"));
+        dbRawProvider.doWriteRaw(Entity.Inventoryequipment.getName(), "sim1/SHELF-1.1.0.0", getFileContent("/testequipment/5.json"));
+        dbRawProvider.doWriteRaw(Entity.Inventoryequipment.getName(), "sim1/a2.module-1.1.1.5", getFileContent("/testequipment/6.json"));
+        dbRawProvider.doWriteRaw(Entity.Inventoryequipment.getName(), "sim1/a2.module-1.1.1.8", getFileContent("/testequipment/7.json"));
+        dbRawProvider.doWriteRaw(Entity.Inventoryequipment.getName(), "sim1/a2.module-1.1.6.5", getFileContent("/testequipment/8.json"));
+        dbRawProvider.doWriteRaw(Entity.Inventoryequipment.getName(), "sim1/ODU-1.56.0.0", getFileContent("/testequipment/9.json"));
+        dbRawProvider.doWriteRaw(Entity.Inventoryequipment.getName(), "sim1/a2.module-1.56.1.2", getFileContent("/testequipment/10.json"));
+        dbRawProvider.doWriteRaw(Entity.Inventoryequipment.getName(), "sim1/IDU-1.65.0.0", getFileContent("/testequipment/11.json"));
+        dbRawProvider.doWriteRaw(Entity.Inventoryequipment.getName(), "sim1/CARD-1.65.1.4", getFileContent("/testequipment/12.json"));
+        dbRawProvider.doWriteRaw(Entity.Inventoryequipment.getName(), "sim1/CARD-1.1.6.0", getFileContent("/testequipment/13.json"));
+        dbRawProvider.doWriteRaw(Entity.Inventoryequipment.getName(), "sim1/CARD-1.1.8.0", getFileContent("/testequipment/14.json"));
+        dbRawProvider.doWriteRaw(Entity.Inventoryequipment.getName(), "sim1/CARD-1.1.9.0", getFileContent("/testequipment/15.json"));
+        dbRawProvider.doWriteRaw(Entity.Inventoryequipment.getName(), "sim1/CARD-1.55.1.4", getFileContent("/testequipment/16.json"));
+        dbRawProvider.doWriteRaw(Entity.Inventoryequipment.getName(), "sim1/a2.module-1.1.1.7", getFileContent("/testequipment/17.json"));
+        dbRawProvider.doWriteRaw(Entity.Inventoryequipment.getName(), "sim1/IDU-1.55.0.0", getFileContent("/testequipment/18.json"));
+        dbRawProvider.doWriteRaw(Entity.Inventoryequipment.getName(), "sim1/CARD-1.1.1.0", getFileContent("/testequipment/19.json"));
+        dbRawProvider.doWriteRaw(Entity.Inventoryequipment.getName(), "sim1/CARD-1.1.5.0", getFileContent("/testequipment/20.json"));
+        dbRawProvider.doWriteRaw(Entity.Inventoryequipment.getName(), "sim1/a2.module-1.1.5.6", getFileContent("/testequipment/21.json"));
 
     }
+    /**
+     * @param string
+     * @return
+     * @throws URISyntaxException
+     * @throws IOException
+     */
+    private static String getFileContent(String filename) throws IOException {
+        return String.join("\n",IoUtils.readAllLines(TestTree.class.getResourceAsStream(filename)));
+    }
 
     @Test
     public void testInventoryTree() throws IOException {
@@ -135,8 +148,4 @@ public class TestTree {
         e = DataTreeHttpServlet.getEntity("/tree/read-inventoryequipment-tree/");
         System.out.println(e);
     }
-
-    private static String getFileContent(String filename) throws IOException {
-        return String.join("\n",IoUtils.readAllLines(TestTree.class.getResourceAsStream(resourceDirectoryPath+filename)));
-    }
 }
diff --git a/sdnr/wt/data-provider/provider/src/test/java/org/onap/ccsdk/features/sdnr/wt/dataprovider/test/TestYangGenSalMapping.java b/sdnr/wt/data-provider/provider/src/test/java/org/onap/ccsdk/features/sdnr/wt/dataprovider/test/TestYangGenSalMapping.java
index 3c9d4946b..f7ab7c383 100644
--- a/sdnr/wt/data-provider/provider/src/test/java/org/onap/ccsdk/features/sdnr/wt/dataprovider/test/TestYangGenSalMapping.java
+++ b/sdnr/wt/data-provider/provider/src/test/java/org/onap/ccsdk/features/sdnr/wt/dataprovider/test/TestYangGenSalMapping.java
@@ -28,7 +28,6 @@ import java.util.List;
 import org.eclipse.jdt.annotation.Nullable;
 import org.json.JSONObject;
 import org.junit.Test;
-import org.onap.ccsdk.features.sdnr.wt.common.YangHelper;
 import org.onap.ccsdk.features.sdnr.wt.common.database.HtDatabaseClient;
 import org.onap.ccsdk.features.sdnr.wt.common.database.SearchResult;
 import org.onap.ccsdk.features.sdnr.wt.common.database.config.HostInfo;
@@ -38,9 +37,7 @@ import org.onap.ccsdk.features.sdnr.wt.common.database.queries.QueryBuilders;
 import org.onap.ccsdk.features.sdnr.wt.common.database.requests.CreateIndexRequest;
 import org.onap.ccsdk.features.sdnr.wt.common.database.requests.DeleteIndexRequest;
 import org.onap.ccsdk.features.sdnr.wt.dataprovider.database.EsDataObjectReaderWriter2;
-import org.onap.ccsdk.features.sdnr.wt.dataprovider.model.types.YangHelper2;
 import org.onap.ccsdk.features.sdnr.wt.dataprovider.test.util.HostInfoForTest;
-import org.onap.ccsdk.features.sdnr.wt.dataprovider.yangtools.YangToolsMapperHelper;
 import org.onap.ccsdk.features.sdnr.wt.dataprovider.yangtools.YangToolsMapper;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.Uri;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.yang.types.rev130715.DateAndTime;
@@ -287,8 +284,8 @@ public class TestYangGenSalMapping {
 
         ReadPmdata15mListInputBuilder inputBuilder = new ReadPmdata15mListInputBuilder();
         PaginationBuilder paginationBuilder = new PaginationBuilder();
-        paginationBuilder.setPage(YangHelper2.getBigIntegerOrUint64(new BigInteger("1")));
-        paginationBuilder.setSize(YangHelper2.getLongOrUint32(20L));
+        paginationBuilder.setPage(new BigInteger("1"));
+        paginationBuilder.setSize(20L);
         inputBuilder.setPagination(paginationBuilder.build());
 
         ReadPmdata15mListInput input = inputBuilder.build();
@@ -298,8 +295,8 @@ public class TestYangGenSalMapping {
         long page = getPage(input);
         long pageSize = getPageSize(input);
 
-        QueryBuilder query = fromFilter(YangHelper.getList(input.getFilter())).from((page - 1) * pageSize).size(pageSize);
-        setSortOrder(query, YangHelper.getList(input.getSortorder()));
+        QueryBuilder query = fromFilter(input.getFilter()).from((page - 1) * pageSize).size(pageSize);
+        setSortOrder(query, input.getSortorder());
 
         SearchResult<org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev201110.read.pmdata._15m.list.output.Data> result =
                 pm15mRW.doReadAll(query);
@@ -340,15 +337,15 @@ public class TestYangGenSalMapping {
         out(method());
         String input;
         input = "id-dd-dd";
-        System.out.println("Map " + input + " to " + YangToolsMapperHelper.toCamelCaseAttributeName(input));
+        System.out.println("Map " + input + " to " + YangToolsMapper.toCamelCaseAttributeName(input));
         input = "idDdGg";
-        System.out.println("Map " + input + " to " + YangToolsMapperHelper.toCamelCaseAttributeName(input));
+        System.out.println("Map " + input + " to " + YangToolsMapper.toCamelCaseAttributeName(input));
         input = "_idDdGg";
-        System.out.println("Map " + input + " to " + YangToolsMapperHelper.toCamelCaseAttributeName(input));
+        System.out.println("Map " + input + " to " + YangToolsMapper.toCamelCaseAttributeName(input));
         input = "--ff--gfg";
-        System.out.println("Map " + input + " to " + YangToolsMapperHelper.toCamelCaseAttributeName(input));
+        System.out.println("Map " + input + " to " + YangToolsMapper.toCamelCaseAttributeName(input));
         input = "";
-        System.out.println("Map " + input + " to " + YangToolsMapperHelper.toCamelCaseAttributeName(input));
+        System.out.println("Map " + input + " to " + YangToolsMapper.toCamelCaseAttributeName(input));
     }
 
     /* ---------------------------------
@@ -364,7 +361,7 @@ public class TestYangGenSalMapping {
         org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev201110.read.inventory.list.output.DataBuilder dataBuilder =
                 new org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev201110.read.inventory.list.output.DataBuilder();
         dataBuilder.setDescription(description);
-        dataBuilder.setTreeLevel(YangHelper2.getLongOrUint32(treeLevel));
+        dataBuilder.setTreeLevel(treeLevel);
         return dataBuilder;
     }
 
@@ -432,8 +429,8 @@ public class TestYangGenSalMapping {
             long totalSize) {
         org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev201110.read.pmdata._15m.list.output.Pagination value =
                 new org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev201110.read.pmdata._15m.list.output.PaginationBuilder()
-                .setPage(YangHelper2.getBigIntegerOrUint64(BigInteger.valueOf(page))).setSize(YangHelper2.getLongOrUint32(pageSize))
-                .setTotal(YangHelper2.getBigIntegerOrUint64(BigInteger.valueOf(totalSize))).build();
+                        .setPage(BigInteger.valueOf(page)).setSize(pageSize).setTotal(BigInteger.valueOf(totalSize))
+                        .build();
         outputBuilder.setPagination(value);
     }
 
diff --git a/sdnr/wt/data-provider/provider/src/test/java/org/onap/ccsdk/features/sdnr/wt/dataprovider/test/TestYangGenSalMappingOpenRoadm.java b/sdnr/wt/data-provider/provider/src/test/java/org/onap/ccsdk/features/sdnr/wt/dataprovider/test/TestYangGenSalMappingOpenRoadm.java
index 56df62819..0a195e03b 100644
--- a/sdnr/wt/data-provider/provider/src/test/java/org/onap/ccsdk/features/sdnr/wt/dataprovider/test/TestYangGenSalMappingOpenRoadm.java
+++ b/sdnr/wt/data-provider/provider/src/test/java/org/onap/ccsdk/features/sdnr/wt/dataprovider/test/TestYangGenSalMappingOpenRoadm.java
@@ -21,130 +21,47 @@
  */
 package org.onap.ccsdk.features.sdnr.wt.dataprovider.test;
 
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
 import java.io.IOException;
-import java.util.Arrays;
-import java.util.Map;
-import org.apache.sshd.common.util.io.IoUtils;
-import org.eclipse.jdt.annotation.Nullable;
 import org.jline.utils.Log;
 import org.junit.Test;
-import org.mockito.Mockito;
-import org.onap.ccsdk.features.sdnr.wt.dataprovider.model.types.YangHelper2;
-import org.onap.ccsdk.features.sdnr.wt.dataprovider.yangtools.YangToolsMapper;
 import org.onap.ccsdk.features.sdnr.wt.dataprovider.yangtools.YangToolsMapper2;
 import org.opendaylight.yang.gen.v1.http.org.openroadm.pm.types.rev191129.PmDataType;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.openroadm.pm.types.rev200413.BIPErrorCounter;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.openroadm.pm.types.rev200413.OpticalPowerInputOSCMin;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev201110.GranularityPeriodType;
+import org.opendaylight.yang.gen.v1.http.org.openroadm.pm.types.rev191129.PmDataTypeBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev201110.PmdataEntity;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev201110.PmdataEntityBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev201110.pmdata.entity.PerformanceData;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev201110.pmdata.entity.PerformanceDataBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev201110.pmdata.grp.Measurement;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev201110.pmdata.grp.MeasurementBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev201110.pmdata.grp.MeasurementKey;
-import org.opendaylight.yangtools.yang.common.Uint64;
 
-public class TestYangGenSalMappingOpenRoadm extends Mockito {
-
-    private static String resourceDirectoryPath = "/" + TestYangGenSalMappingOpenRoadm.class.getSimpleName() + "/";
+public class TestYangGenSalMappingOpenRoadm {
 
     @Test
-    public void testOpenroadmPMBuilder() throws IOException, ClassNotFoundException {
-        out("Test: " + method());
-
-        MeasurementBuilder measurementBuilder1 = new MeasurementBuilder();
-        measurementBuilder1.setPmKey(OpticalPowerInputOSCMin.class);
-        measurementBuilder1.setPmValue(new PmDataType(Uint64.valueOf(64L)));
-        Measurement measurement1 = measurementBuilder1.build();
-
-        MeasurementBuilder measurementBuilder2 = new MeasurementBuilder();
-        measurementBuilder2.setPmKey(BIPErrorCounter.class);
-        measurementBuilder2.setPmValue(new PmDataType(Uint64.valueOf(65L)));
-        Measurement measurement2 = measurementBuilder2.build();
-
-        PerformanceDataBuilder performanceDataBuilder = new PerformanceDataBuilder();
-        performanceDataBuilder.setMeasurement(
-                YangHelper2.getListOrMap(MeasurementKey.class, Arrays.asList(measurement1, measurement2)));
-
-        PmdataEntityBuilder pmDataEntitybuilder = new PmdataEntityBuilder();
-        pmDataEntitybuilder.setPerformanceData(performanceDataBuilder.build());
-
-        PmdataEntity pmDataType = pmDataEntitybuilder.build();
-
-        YangToolsMapper mapper2 = new YangToolsMapper();
-        String jsonString = mapper2.writeValueAsString(pmDataType);
-        out("Result json after mapping: " + jsonString);
-
+    public void testOpenroadmPM() throws IOException, ClassNotFoundException {
+        out(method());
+        // @formatter:off
+        String jsonString = "{\n"
+                + "    \"time-stamp\":\"2020-09-24T22:59:48.6Z\", \n"
+                + "    \"node-name\":\"Rdm-1\",\n"
+                + "    \"uuid-interface\":\"physical-link\",\n"
+                + "    \"scanner-id\":\"ryyyyyyyryryr\",\n"
+                + "    \"granularity-period\":\"Period24Hours\",\n"
+                + "    \"performance-data\":{\n"
+                + "         \"measurement\":[{\n"
+                + "            \"pm-value\":{\"uint64\":1464170942461338033},\n"
+                + "            \"pm-key\":\"org.opendaylight"
+                + ".yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.openroadm.pm.types.rev200413.OpticalPowerInputOSCMin\"\n"
+                + "         }]\n"
+                + "        }\n"
+                + "}\n";
+        // @formatter:on
+        // Map to JSON String to Object
+        PmDataTypeBuilder builder = new PmDataTypeBuilder();
+        builder.setInt64("10");
+        PmDataType pmDataType = builder.build();
+        out("Result is: "+pmDataType);
+
+        YangToolsMapper2<PmdataEntity> mapper2 = new YangToolsMapper2<>(PmdataEntity.class, null);
+        out("Created mapper");
         PmdataEntity generatepmdNode = mapper2.readValue(jsonString.getBytes(), PmdataEntity.class);
-        out("Original: " + pmDataType.toString());
-        out("Mapped  : " + generatepmdNode.toString());
-        assertTrue("Can mapping not working", generatepmdNode.equals(pmDataType));
-    }
-
-    @Test
-    public void testOpenroadmPMString1() throws IOException, ClassNotFoundException {
-        out("Test: " + method());
-        String jsonString2 = getFileContent("pmdata1.json");
-        YangToolsMapper mapper2 = new YangToolsMapper();
-        PmdataEntity generatepmdNode = mapper2.readValue(jsonString2.getBytes(), PmdataEntity.class);
-        out("String1:"+generatepmdNode.toString()); // Print it with specified indentation
-        assertTrue("GranularityPeriod", generatepmdNode.getGranularityPeriod().equals(GranularityPeriodType.Period15Min));
-        assertTrue("NodeName", generatepmdNode.getNodeName().equals("NTS_RDM2"));
-        @Nullable PerformanceData performanceData = generatepmdNode.getPerformanceData();
-        assertNotNull("PerformanceData", performanceData);
-        @Nullable Map<MeasurementKey, Measurement> measurement = performanceData.getMeasurement();
-        assertNotNull("Measurement", measurement);
-        Measurement measurement1 = measurement.get(new MeasurementKey(org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.openroadm.pm.types.rev200413.OpticalPowerInputOSCMin.class));
-        assertTrue("Measurement=64", measurement1.getPmValue().stringValue().equals("64"));
-    }
-
-    @Test
-    public void testOpenroadmPMString2() throws IOException, ClassNotFoundException {
-        out("Test: " + method());
-        String jsonString2 = getFileContent("pmdata2.json");
-        YangToolsMapper mapper2 = new YangToolsMapper();
-        PmdataEntity generatepmdNode = mapper2.readValue(jsonString2.getBytes(), PmdataEntity.class);
-        out(generatepmdNode.toString()); // Print it with specified indentation
-    }
-
-    @Test
-    public void testOpenroadmPMString3() throws IOException, ClassNotFoundException {
-        out("Test: " + method());
-        String jsonString2 = getFileContent("pmdata3.json");
-        YangToolsMapper2<org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev201110.read.pmdata._15m.list.output.Data> mapper2 =
-                new YangToolsMapper2<>(
-                        org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev201110.read.pmdata._15m.list.output.Data.class,
-                        null);
-        PmdataEntity generatepmdNode = mapper2.readValue(jsonString2.getBytes(), PmdataEntity.class);
         out(generatepmdNode.toString()); // Print it with specified indentation
     }
 
-
-    @Test
-    public void testOpenroadmPMString4() throws IOException, ClassNotFoundException {
-        out("Test: " + method());
-        String jsonString = getFileContent("pmdata3.json");
-        YangToolsMapper2<org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev201110.read.pmdata._15m.list.output.Data> mapper =
-                new YangToolsMapper2<>(
-                        org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev201110.read.pmdata._15m.list.output.Data.class,
-                        null);
-        org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev201110.read.pmdata._15m.list.output.Data data =
-                mapper.readValue(jsonString.getBytes(),
-                        org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev201110.read.pmdata._15m.list.output.Data.class);
-
-        assertTrue("GranularityPeriod", data.getGranularityPeriod().equals(GranularityPeriodType.Period15Min));
-        assertTrue("NodeName", data.getNodeName().equals("openroadm1"));
-        org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev201110.pmdata15m.entity.@Nullable PerformanceData performanceData =
-                data.getPerformanceData();
-        assertNotNull("PerformanceData", performanceData);
-        @Nullable Map<MeasurementKey, Measurement> measurement = performanceData.getMeasurement();
-        assertNotNull("Measurement", measurement);
-        Measurement measurement1 = measurement.get(new MeasurementKey(org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.openroadm.pm.types.rev200413.DelayTCM2Up.class));
-        assertTrue("Measurement=11298624220985537708", measurement1.getPmValue().stringValue().equals("11298624220985537708"));
-    }
     /*
      * --------------------------------- Private
      */
@@ -155,12 +72,9 @@ public class TestYangGenSalMappingOpenRoadm extends Mockito {
     }
 
     private static void out(String text) {
-        Log.info("Log: " + text);
-    }
-
-    private static String getFileContent(String filename) throws IOException {
-        return String.join("\n",
-                IoUtils.readAllLines(TestTree.class.getResourceAsStream(resourceDirectoryPath + filename)));
+        System.out.println("----------------------");
+        System.out.println(text);
+        Log.info("Log: "+text);
     }
 
 }
diff --git a/sdnr/wt/data-provider/provider/src/test/java/org/onap/ccsdk/features/sdnr/wt/dataprovider/test/issues/TestIssue227.java b/sdnr/wt/data-provider/provider/src/test/java/org/onap/ccsdk/features/sdnr/wt/dataprovider/test/issues/TestIssue227.java
deleted file mode 100644
index 9cfc3ead0..000000000
--- a/sdnr/wt/data-provider/provider/src/test/java/org/onap/ccsdk/features/sdnr/wt/dataprovider/test/issues/TestIssue227.java
+++ /dev/null
@@ -1,126 +0,0 @@
-/*
- * ============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.dataprovider.test.issues;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.fasterxml.jackson.databind.SerializationFeature;
-import java.io.IOException;
-import org.junit.Test;
-import org.mockito.Mockito;
-import org.opendaylight.yangtools.yang.common.Uint32;
-
-public class TestIssue227 extends Mockito {
-
-    static String inputJsonString = "{\"value1\":\"forty-two\", \"value2\":\"forty-three\"}";
-    static String inputJsonNumber = "{\"value1\":42, \"value2\":43}";
-
-    @Test
-    public void testWithException() {
-        String inputJson = inputJsonNumber;
-        System.out.println("Input " + inputJson);
-
-        ObjectMapper mapper = new ObjectMapper();
-        mapper.configure(SerializationFeature.FAIL_ON_EMPTY_BEANS, false);
-
-        doMapping(mapper, inputJson);
-    }
-
-    @Test
-    public void testWithMixin() {
-        String inputJson = inputJsonNumber;
-        System.out.println("Input " + inputJson);
-
-        ObjectMapper mapper = new ObjectMapper();
-        mapper.configure(SerializationFeature.FAIL_ON_EMPTY_BEANS, false);
-        mapper.addMixIn(TestBuilder.class, IgnoreFooSetValueIntMixIn.class);
-
-        doMapping(mapper, inputJson);
-    }
-
-
-    private void doMapping(ObjectMapper mapper, String json) {
-        TestBuilder foo;
-        try {
-            foo = mapper.readValue(json.getBytes(), TestBuilder.class);
-            System.out.println("Foo " + foo);
-            System.out.println(mapper.writeValueAsString(foo));
-        } catch (IOException e) {
-            e.printStackTrace();
-        }
-    }
-
-    static class TestBuilder {
-
-        private String value1;
-        private String value2;
-
-        String getValue1() {
-            return value1;
-        }
-
-        public void setValue1(String value) {
-            this.value1 = value;
-        }
-
-        public void setValue1(int value) {
-            this.value1 = String.valueOf(value);
-        }
-
-        public void setValue1(long value) {
-            this.value1 = String.valueOf(value);
-        }
-
-        public void setValue1(Uint32 value) {
-            this.value1 = String.valueOf(value);
-        }
-
-        public String getValue2() {
-            return value2;
-        }
-
-        public void setValue2(String value) {
-            this.value2 = value;
-        }
-
-        public void setValue2(int value) {
-            this.value2 = String.valueOf(value);
-        }
-
-        @Override
-        public String toString() {
-            return "Foo [value1=" + value1 + ", value2=" + value2 + "]";
-        }
-
-    }
-
-
-    private abstract class IgnoreFooSetValueIntMixIn {
-        @JsonProperty
-        public abstract void setValue1(String value);
-
-        @JsonProperty
-        public abstract void setValue2(String value);
-    }
-}
-
-
diff --git a/sdnr/wt/data-provider/provider/src/test/resources/TestYangGenSalMappingOpenRoadm/pmdata1.json b/sdnr/wt/data-provider/provider/src/test/resources/TestYangGenSalMappingOpenRoadm/pmdata1.json
deleted file mode 100644
index aa3a1ccb4..000000000
--- a/sdnr/wt/data-provider/provider/src/test/resources/TestYangGenSalMappingOpenRoadm/pmdata1.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-	"performance-data": {
-		"measurement": [
-			{
-				"pm-key": "org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.openroadm.pm.types.rev200413.OpticalPowerInputOSCMin",
-				"pm-value": "64"
-			},
-			{
-				"pm-key": "org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.openroadm.pm.types.rev200413.BIPErrorCounter",
-				"pm-value": "65"
-			}
-		]
-	},
-	"uuid-interface": "device",
-	"granularity-period": "Period15Min",
-	"time-stamp": "2020-11-24T14:57:29.6Z",
-	"node-name": "NTS_RDM2"
-}
-\ No newline at end of file
diff --git a/sdnr/wt/data-provider/provider/src/test/resources/TestYangGenSalMappingOpenRoadm/pmdata2.json b/sdnr/wt/data-provider/provider/src/test/resources/TestYangGenSalMappingOpenRoadm/pmdata2.json
deleted file mode 100644
index d784cf056..000000000
--- a/sdnr/wt/data-provider/provider/src/test/resources/TestYangGenSalMappingOpenRoadm/pmdata2.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-	"performance-data": {
-		"measurement": [
-			{
-				"pm-key": "org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.openroadm.pm.types.rev200413.CodeViolations",
-				"pm-value": "11298624220985537708"
-			}
-		]
-	},
-	"uuid-interface": "device",
-	"granularity-period": "Period15Min",
-	"time-stamp": "2020-11-24T14:57:29.6Z",
-	"node-name": "NTS_RDM2"
-}
-\ No newline at end of file
diff --git a/sdnr/wt/data-provider/provider/src/test/resources/TestYangGenSalMappingOpenRoadm/pmdata3.json b/sdnr/wt/data-provider/provider/src/test/resources/TestYangGenSalMappingOpenRoadm/pmdata3.json
deleted file mode 100644
index 0747e3171..000000000
--- a/sdnr/wt/data-provider/provider/src/test/resources/TestYangGenSalMappingOpenRoadm/pmdata3.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-	"performance-data": {
-		"measurement": [
-			{
-				"pm-key": "org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.openroadm.pm.types.rev200413.DelayTCM2Up",
-				"pm-value": "11298624220985537708"
-			}
-		]
-	},
-	"uuid-interface": "shared-risk-group",
-	"granularity-period": "Period15Min",
-	"time-stamp": "2020-10-24T08:17:02.5Z",
-	"node-name": "openroadm1"
-}
-\ No newline at end of file
diff --git a/sdnr/wt/data-provider/provider/src/test/resources/log4j.properties b/sdnr/wt/data-provider/provider/src/test/resources/log4j.properties
deleted file mode 100644
index e4fcb0130..000000000
--- a/sdnr/wt/data-provider/provider/src/test/resources/log4j.properties
+++ /dev/null
@@ -1,9 +0,0 @@
-# Set root logger level to DEBUG and its only appender to A1.
-log4j.rootLogger=DEBUG, A1
-
-# A1 is set to be a ConsoleAppender.
-log4j.appender.A1=org.apache.log4j.ConsoleAppender
-
-# A1 uses PatternLayout.
-log4j.appender.A1.layout=org.apache.log4j.PatternLayout
-log4j.appender.A1.layout.ConversionPattern=%-4r [%t] %-5p %c %x - %m%n
-\ No newline at end of file
diff --git a/sdnr/wt/data-provider/provider/src/test/resources/simplelogger.properties b/sdnr/wt/data-provider/provider/src/test/resources/simplelogger.properties
new file mode 100644
index 000000000..85525bf4b
--- /dev/null
+++ b/sdnr/wt/data-provider/provider/src/test/resources/simplelogger.properties
@@ -0,0 +1,36 @@
+#
+# ============LICENSE_START=======================================================
+# ONAP : ccsdk features
+# ================================================================================
+# Copyright (C) 2020 AT&T 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=======================================================
+#
+#
+# SLF4J's SimpleLogger configuration file
+# Simple implementation of Logger that sends all enabled log messages, for all defined loggers, to System.err.
+
+# Default logging detail level for all instances of SimpleLogger.
+# Must be one of ("trace", "debug", "info", "warn", or "error").
+# If not specified, defaults to "info".
+org.slf4j.simpleLogger.defaultLogLevel=debug
+org.slf4j.simpleLogger.showDateTime=true
+
+org.slf4j.simpleLogger.dateTimeFormat=yyyy-MM-dd HH:mm:ss:SSS Z
+org.slf4j.simpleLogger.showThreadName=true
+org.slf4j.simpleLogger.showLogName=true
+org.slf4j.simpleLogger.showShortLogName=false
+org.slf4j.simpleLogger.org.onap.ccsdk.features.sdnr.wt.dataprovider=DEBUG
+org.slf4j.simpleLogger.org.onap.ccsdk.features.sdnr.wt.common=DEBUG
+
diff --git a/sdnr/wt/data-provider/provider/src/test/resources/TestTree/1.json b/sdnr/wt/data-provider/provider/src/test/resources/testequipment/1.json
index bcf5e1d0a..bcf5e1d0a 100644
--- a/sdnr/wt/data-provider/provider/src/test/resources/TestTree/1.json
+++ b/sdnr/wt/data-provider/provider/src/test/resources/testequipment/1.json
diff --git a/sdnr/wt/data-provider/provider/src/test/resources/TestTree/10.json b/sdnr/wt/data-provider/provider/src/test/resources/testequipment/10.json
index 6eed5d6a8..6eed5d6a8 100644
--- a/sdnr/wt/data-provider/provider/src/test/resources/TestTree/10.json
+++ b/sdnr/wt/data-provider/provider/src/test/resources/testequipment/10.json
diff --git a/sdnr/wt/data-provider/provider/src/test/resources/TestTree/11.json b/sdnr/wt/data-provider/provider/src/test/resources/testequipment/11.json
index 46a4d0650..46a4d0650 100644
--- a/sdnr/wt/data-provider/provider/src/test/resources/TestTree/11.json
+++ b/sdnr/wt/data-provider/provider/src/test/resources/testequipment/11.json
diff --git a/sdnr/wt/data-provider/provider/src/test/resources/TestTree/12.json b/sdnr/wt/data-provider/provider/src/test/resources/testequipment/12.json
index 02d592e56..02d592e56 100644
--- a/sdnr/wt/data-provider/provider/src/test/resources/TestTree/12.json
+++ b/sdnr/wt/data-provider/provider/src/test/resources/testequipment/12.json
diff --git a/sdnr/wt/data-provider/provider/src/test/resources/TestTree/13.json b/sdnr/wt/data-provider/provider/src/test/resources/testequipment/13.json
index 85c3723b7..85c3723b7 100644
--- a/sdnr/wt/data-provider/provider/src/test/resources/TestTree/13.json
+++ b/sdnr/wt/data-provider/provider/src/test/resources/testequipment/13.json
diff --git a/sdnr/wt/data-provider/provider/src/test/resources/TestTree/14.json b/sdnr/wt/data-provider/provider/src/test/resources/testequipment/14.json
index 1fa236e10..1fa236e10 100644
--- a/sdnr/wt/data-provider/provider/src/test/resources/TestTree/14.json
+++ b/sdnr/wt/data-provider/provider/src/test/resources/testequipment/14.json
diff --git a/sdnr/wt/data-provider/provider/src/test/resources/TestTree/15.json b/sdnr/wt/data-provider/provider/src/test/resources/testequipment/15.json
index ff40c4e8b..ff40c4e8b 100644
--- a/sdnr/wt/data-provider/provider/src/test/resources/TestTree/15.json
+++ b/sdnr/wt/data-provider/provider/src/test/resources/testequipment/15.json
diff --git a/sdnr/wt/data-provider/provider/src/test/resources/TestTree/16.json b/sdnr/wt/data-provider/provider/src/test/resources/testequipment/16.json
index fbd62e04d..fbd62e04d 100644
--- a/sdnr/wt/data-provider/provider/src/test/resources/TestTree/16.json
+++ b/sdnr/wt/data-provider/provider/src/test/resources/testequipment/16.json
diff --git a/sdnr/wt/data-provider/provider/src/test/resources/TestTree/17.json b/sdnr/wt/data-provider/provider/src/test/resources/testequipment/17.json
index 1704468f3..1704468f3 100644
--- a/sdnr/wt/data-provider/provider/src/test/resources/TestTree/17.json
+++ b/sdnr/wt/data-provider/provider/src/test/resources/testequipment/17.json
diff --git a/sdnr/wt/data-provider/provider/src/test/resources/TestTree/18.json b/sdnr/wt/data-provider/provider/src/test/resources/testequipment/18.json
index eaec335b4..eaec335b4 100644
--- a/sdnr/wt/data-provider/provider/src/test/resources/TestTree/18.json
+++ b/sdnr/wt/data-provider/provider/src/test/resources/testequipment/18.json
diff --git a/sdnr/wt/data-provider/provider/src/test/resources/TestTree/19.json b/sdnr/wt/data-provider/provider/src/test/resources/testequipment/19.json
index 9a7eb62a7..9a7eb62a7 100644
--- a/sdnr/wt/data-provider/provider/src/test/resources/TestTree/19.json
+++ b/sdnr/wt/data-provider/provider/src/test/resources/testequipment/19.json
diff --git a/sdnr/wt/data-provider/provider/src/test/resources/TestTree/2.json b/sdnr/wt/data-provider/provider/src/test/resources/testequipment/2.json
index ff352653a..ff352653a 100644
--- a/sdnr/wt/data-provider/provider/src/test/resources/TestTree/2.json
+++ b/sdnr/wt/data-provider/provider/src/test/resources/testequipment/2.json
diff --git a/sdnr/wt/data-provider/provider/src/test/resources/TestTree/20.json b/sdnr/wt/data-provider/provider/src/test/resources/testequipment/20.json
index 179794027..179794027 100644
--- a/sdnr/wt/data-provider/provider/src/test/resources/TestTree/20.json
+++ b/sdnr/wt/data-provider/provider/src/test/resources/testequipment/20.json
diff --git a/sdnr/wt/data-provider/provider/src/test/resources/TestTree/21.json b/sdnr/wt/data-provider/provider/src/test/resources/testequipment/21.json
index c76d6715e..c76d6715e 100644
--- a/sdnr/wt/data-provider/provider/src/test/resources/TestTree/21.json
+++ b/sdnr/wt/data-provider/provider/src/test/resources/testequipment/21.json
diff --git a/sdnr/wt/data-provider/provider/src/test/resources/TestTree/3.json b/sdnr/wt/data-provider/provider/src/test/resources/testequipment/3.json
index 1dc6dfce2..1dc6dfce2 100644
--- a/sdnr/wt/data-provider/provider/src/test/resources/TestTree/3.json
+++ b/sdnr/wt/data-provider/provider/src/test/resources/testequipment/3.json
diff --git a/sdnr/wt/data-provider/provider/src/test/resources/TestTree/4.json b/sdnr/wt/data-provider/provider/src/test/resources/testequipment/4.json
index ab1132692..ab1132692 100644
--- a/sdnr/wt/data-provider/provider/src/test/resources/TestTree/4.json
+++ b/sdnr/wt/data-provider/provider/src/test/resources/testequipment/4.json
diff --git a/sdnr/wt/data-provider/provider/src/test/resources/TestTree/5.json b/sdnr/wt/data-provider/provider/src/test/resources/testequipment/5.json
index e54173fe6..e54173fe6 100644
--- a/sdnr/wt/data-provider/provider/src/test/resources/TestTree/5.json
+++ b/sdnr/wt/data-provider/provider/src/test/resources/testequipment/5.json
diff --git a/sdnr/wt/data-provider/provider/src/test/resources/TestTree/6.json b/sdnr/wt/data-provider/provider/src/test/resources/testequipment/6.json
index 8486033b0..8486033b0 100644
--- a/sdnr/wt/data-provider/provider/src/test/resources/TestTree/6.json
+++ b/sdnr/wt/data-provider/provider/src/test/resources/testequipment/6.json
diff --git a/sdnr/wt/data-provider/provider/src/test/resources/TestTree/7.json b/sdnr/wt/data-provider/provider/src/test/resources/testequipment/7.json
index 5c583bec7..5c583bec7 100644
--- a/sdnr/wt/data-provider/provider/src/test/resources/TestTree/7.json
+++ b/sdnr/wt/data-provider/provider/src/test/resources/testequipment/7.json
diff --git a/sdnr/wt/data-provider/provider/src/test/resources/TestTree/8.json b/sdnr/wt/data-provider/provider/src/test/resources/testequipment/8.json
index a86819a7d..a86819a7d 100644
--- a/sdnr/wt/data-provider/provider/src/test/resources/TestTree/8.json
+++ b/sdnr/wt/data-provider/provider/src/test/resources/testequipment/8.json
diff --git a/sdnr/wt/data-provider/provider/src/test/resources/TestTree/9.json b/sdnr/wt/data-provider/provider/src/test/resources/testequipment/9.json
index 914033bb4..914033bb4 100644
--- a/sdnr/wt/data-provider/provider/src/test/resources/TestTree/9.json
+++ b/sdnr/wt/data-provider/provider/src/test/resources/testequipment/9.json
diff --git a/sdnr/wt/data-provider/setup/pom.xml b/sdnr/wt/data-provider/setup/pom.xml
index 81c352d5c..df739806a 100644
--- a/sdnr/wt/data-provider/setup/pom.xml
+++ b/sdnr/wt/data-provider/setup/pom.xml
@@ -29,7 +29,7 @@
     <parent>
         <groupId>org.onap.ccsdk.parent</groupId>
         <artifactId>binding-parent</artifactId>
-        <version>2.1.1-SNAPSHOT</version>
+        <version>2.1.0</version>
         <relativePath/>
     </parent>
 
@@ -80,6 +80,7 @@
             <version>${project.version}</version>
         </dependency>
     </dependencies>
+
     <build>
         <plugins>
             <plugin>
diff --git a/sdnr/wt/featureaggregator/feature-devicemanager-base/pom.xml b/sdnr/wt/featureaggregator/feature-devicemanager-base/pom.xml
index 4dc250898..e94f8045a 100644
--- a/sdnr/wt/featureaggregator/feature-devicemanager-base/pom.xml
+++ b/sdnr/wt/featureaggregator/feature-devicemanager-base/pom.xml
@@ -29,7 +29,7 @@
     <parent>
         <groupId>org.onap.ccsdk.parent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>2.1.1-SNAPSHOT</version>
+        <version>2.1.0</version>
         <relativePath/>
     </parent>
 
@@ -90,12 +90,12 @@
             <type>xml</type>
             <classifier>features</classifier>
         </dependency>
-	<!--        <dependency>
+        <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>sdnr-wt-devicemanager-adapter-manager-feature</artifactId>
             <version>${project.version}</version>
             <type>xml</type>
             <classifier>features</classifier>
-    </dependency>-->
+        </dependency>
     </dependencies>
 </project>
diff --git a/sdnr/wt/featureaggregator/feature-devicemanager/pom.xml b/sdnr/wt/featureaggregator/feature-devicemanager/pom.xml
index 9bb2dcd42..e3af74878 100644
--- a/sdnr/wt/featureaggregator/feature-devicemanager/pom.xml
+++ b/sdnr/wt/featureaggregator/feature-devicemanager/pom.xml
@@ -29,7 +29,7 @@
     <parent>
         <groupId>org.onap.ccsdk.parent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>2.1.1-SNAPSHOT</version>
+        <version>2.1.0</version>
         <relativePath/>
     </parent>
 
diff --git a/sdnr/wt/featureaggregator/feature/pom.xml b/sdnr/wt/featureaggregator/feature/pom.xml
index c2149ad37..232cb6f07 100644
--- a/sdnr/wt/featureaggregator/feature/pom.xml
+++ b/sdnr/wt/featureaggregator/feature/pom.xml
@@ -29,7 +29,7 @@
     <parent>
         <groupId>org.onap.ccsdk.parent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>2.1.1-SNAPSHOT</version>
+        <version>2.1.0</version>
         <relativePath/>
     </parent>
 
@@ -83,7 +83,7 @@
             <type>xml</type>
             <classifier>features</classifier>
         </dependency>
-	<!--        <dependency>
+        <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>sdnr-wt-devicemanager-oran-feature</artifactId>
             <version>${project.version}</version>
@@ -117,7 +117,7 @@
             <version>${project.version}</version>
             <type>xml</type>
             <classifier>features</classifier>
-	</dependency> -->
+        </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>sdnr-wt-mountpoint-registrar-feature</artifactId>
diff --git a/sdnr/wt/featureaggregator/installer/pom.xml b/sdnr/wt/featureaggregator/installer/pom.xml
index 78d5fd581..1e208286d 100755
--- a/sdnr/wt/featureaggregator/installer/pom.xml
+++ b/sdnr/wt/featureaggregator/installer/pom.xml
@@ -29,7 +29,7 @@
     <parent>
         <groupId>org.onap.ccsdk.parent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>2.1.1-SNAPSHOT</version>
+        <version>2.1.0</version>
         <relativePath/>
     </parent>
 
diff --git a/sdnr/wt/featureaggregator/pom.xml b/sdnr/wt/featureaggregator/pom.xml
index 02679fd89..cec22dcdf 100755
--- a/sdnr/wt/featureaggregator/pom.xml
+++ b/sdnr/wt/featureaggregator/pom.xml
@@ -1,19 +1,27 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- ~ ============LICENSE_START======================================================= 
-	~ ONAP : ccsdk features ~ ================================================================================ 
-	~ Copyright (C) 2019 highstreet technologies GmbH Intellectual Property. 
-	~ All rights reserved. ~ ================================================================================ 
-	~ Update Copyright (C) 2020 AT&T 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======================================================= 
-	~ -->
+<!--
+  ~ ============LICENSE_START=======================================================
+  ~ ONAP : ccsdk features
+  ~ ================================================================================
+  ~ Copyright (C) 2019 highstreet technologies GmbH Intellectual Property.
+  ~ All rights reserved.
+  ~ ================================================================================
+  ~ Update Copyright (C) 2020 AT&T 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=======================================================
+  ~
+  -->
 
 <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>
@@ -21,7 +29,7 @@
     <parent>
         <groupId>org.onap.ccsdk.parent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>2.1.1-SNAPSHOT</version>
+        <version>2.1.0</version>
         <relativePath/>
     </parent>
 
@@ -34,7 +42,7 @@
 
     <modules>
         <module>feature</module>
-		<!-- <module>feature-devicemanager</module> -->
+        <module>feature-devicemanager</module>
         <module>feature-devicemanager-base</module>
         <module>installer</module>
     </modules>
diff --git a/sdnr/wt/pom.xml b/sdnr/wt/pom.xml
index dc605745c..1f4d88c43 100644
--- a/sdnr/wt/pom.xml
+++ b/sdnr/wt/pom.xml
@@ -29,7 +29,7 @@
     <parent>
         <groupId>org.onap.ccsdk.parent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>2.1.1-SNAPSHOT</version>
+        <version>2.1.0</version>
         <relativePath/>
     </parent>
 
@@ -43,7 +43,7 @@
 
     <modules>
         <module>common</module>
-	<module>common-yang</module> 
+        <module>common-yang</module>
         <module>apigateway</module>
         <module>websocketmanager2</module>
         <module>helpserver</module>
@@ -51,11 +51,11 @@
         <module>netconfnode-state-service</module>
         <module>mountpoint-state-provider</module>
         <module>devicemanager</module>
-	<!--<module>devicemanager-oran</module>
+        <module>devicemanager-oran</module>
         <module>devicemanager-onf</module>
         <module>devicemanager-onf14</module>
         <module>devicemanager-openroadm</module>
-	<module>devicemanager-adapter-manager</module>-->
+        <module>devicemanager-adapter-manager</module>
         <module>mountpoint-registrar</module>
         <module>odlux</module>
         <module>featureaggregator</module>
author	Dan Timoney <dtimoney@att.com>	2021-01-29 12:46:06 -0500
committer	Dan Timoney <dtimoney@att.com>	2021-01-29 12:47:35 -0500
commit	4e69f3358d31173a222b275e2a82da692846aa1a (patch)
tree	7355744a66614a0811113ee6a43a423e68257fe3 /sdnr/wt
parent	123b423cddbe01bdaba0bea50d986ff1b18a25bc (diff)