rest api call node unit tests

rest api call node unit test added for the case in which a template mixes simple and complex json objects.

Change-Id: I6921d6e328b3593464d82b7a45b1844cd88c3476
Issue-ID: CCSDK-1355
Signed-off-by: Smokowski, Kevin (ks6305) <kevin.smokowski@att.com>

6 files changed, 0 insertions, 1264 deletions

diff --git a/restapi-call-node/provider/src/test/java/jtest/org/onap/ccsdk/sli/plugins/restapicall/MockCookieAuthServer.java b/restapi-call-node/provider/src/test/java/jtest/org/onap/ccsdk/sli/plugins/restapicall/MockCookieAuthServer.java
deleted file mode 100644
index b4a30d3a..00000000
--- a/restapi-call-node/provider/src/test/java/jtest/org/onap/ccsdk/sli/plugins/restapicall/MockCookieAuthServer.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP - CCSDK
- * ================================================================================
- * Copyright (C) 2019 Huawei Technologies Co., Ltd. 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 jtest.org.onap.ccsdk.sli.plugins.restapicall;
-
-import javax.ws.rs.Consumes;
-import javax.ws.rs.Produces;
-
-import javax.ws.rs.GET;
-import javax.ws.rs.Path;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.NewCookie;
-import javax.ws.rs.core.Response;
-
-@Path("get-cookie")
-public class MockCookieAuthServer {
-    @GET
-    @Path("cookie")
-    @Produces(MediaType.APPLICATION_JSON)
-    @Consumes(MediaType.APPLICATION_JSON)
-    public Response getCookie() {
-        return Response.status(200).entity("success").cookie(new NewCookie("cookieResponse", "cookieValueInReturn")).build();
-    }
-}
diff --git a/restapi-call-node/provider/src/test/java/jtest/org/onap/ccsdk/sli/plugins/restapicall/MultipartServerMock.java b/restapi-call-node/provider/src/test/java/jtest/org/onap/ccsdk/sli/plugins/restapicall/MultipartServerMock.java
deleted file mode 100644
index 9646272b..00000000
--- a/restapi-call-node/provider/src/test/java/jtest/org/onap/ccsdk/sli/plugins/restapicall/MultipartServerMock.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP - CCSDK
- * ================================================================================
- * Copyright (C) 2019 Huawei Technologies Co., Ltd. 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 jtest.org.onap.ccsdk.sli.plugins.restapicall;
-
-import org.glassfish.jersey.media.multipart.FormDataContentDisposition;
-import org.glassfish.jersey.media.multipart.FormDataParam;
-
-import javax.ws.rs.Consumes;
-
-import javax.ws.rs.POST;
-import javax.ws.rs.Path;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.Response;
-import java.io.InputStream;
-
-@Path("file-upload")
-public class MultipartServerMock {
-
-    @POST
-    @Path("upload")
-    @Consumes(MediaType.MULTIPART_FORM_DATA)
-    public Response uploadFile(
-            @FormDataParam("file") InputStream inputStream,
-            @FormDataParam("file") FormDataContentDisposition fileDetail) {
-        return Response.status(200).entity(fileDetail.getFileName()).build();
-    }
-}
diff --git a/restapi-call-node/provider/src/test/java/jtest/org/onap/ccsdk/sli/plugins/restapicall/TestJsonParser.java b/restapi-call-node/provider/src/test/java/jtest/org/onap/ccsdk/sli/plugins/restapicall/TestJsonParser.java
deleted file mode 100644
index 5526be81..00000000
--- a/restapi-call-node/provider/src/test/java/jtest/org/onap/ccsdk/sli/plugins/restapicall/TestJsonParser.java
+++ /dev/null
@@ -1,73 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * openECOMP : SDN-C
- * ================================================================================
- * Copyright (C) 2017 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=========================================================
- */
-
-package jtest.org.onap.ccsdk.sli.plugins.restapicall;
-
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.io.InputStreamReader;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-import java.util.Map;
-
-import org.junit.Test;
-import org.onap.ccsdk.sli.core.sli.SvcLogicException;
-import org.onap.ccsdk.sli.plugins.restapicall.JsonParser;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-public class TestJsonParser {
-
-    private static final Logger log = LoggerFactory.getLogger(TestJsonParser.class);
-
-    @Test
-    public void test() throws SvcLogicException, IOException {
-        BufferedReader in = new BufferedReader(
-                new InputStreamReader(ClassLoader.getSystemResourceAsStream("test.json"))
-        );
-        StringBuilder b = new StringBuilder();
-        String line;
-        while ((line = in.readLine()) != null)
-            b.append(line).append('\n');
-
-        Map<String, String> mm = JsonParser.convertToProperties(b.toString());
-
-        logProperties(mm);
-
-        in.close();
-    }
-
-    @Test(expected = NullPointerException.class)
-    public void testNullString() throws SvcLogicException {
-        JsonParser.convertToProperties(null);
-    }
-
-    private void logProperties(Map<String, String> mm) {
-        List<String> ll = new ArrayList<>();
-        for (Object o : mm.keySet())
-            ll.add((String) o);
-        Collections.sort(ll);
-        log.info("Properties:");
-        for (String name : ll)
-            log.info("--- {}: {}", name, mm.get(name));
-    }
-}
diff --git a/restapi-call-node/provider/src/test/java/jtest/org/onap/ccsdk/sli/plugins/restapicall/TestRestapiCallNode.java b/restapi-call-node/provider/src/test/java/jtest/org/onap/ccsdk/sli/plugins/restapicall/TestRestapiCallNode.java
deleted file mode 100644
index 3752a9c3..00000000
--- a/restapi-call-node/provider/src/test/java/jtest/org/onap/ccsdk/sli/plugins/restapicall/TestRestapiCallNode.java
+++ /dev/null
@@ -1,724 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * openECOMP : SDN-C
- * ================================================================================
- * Copyright (C) 2017 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=========================================================
- */
-
-package jtest.org.onap.ccsdk.sli.plugins.restapicall;
-
-import static org.hamcrest.MatcherAssert.assertThat;
-import static org.hamcrest.core.Is.is;
-import java.net.URI;
-import java.util.HashMap;
-import java.util.Map;
-import org.glassfish.grizzly.http.server.HttpServer;
-import org.glassfish.jersey.grizzly2.httpserver.GrizzlyHttpServerFactory;
-import org.glassfish.jersey.media.multipart.MultiPartFeature;
-import org.glassfish.jersey.server.ResourceConfig;
-import org.junit.Test;
-import org.onap.ccsdk.sli.core.sli.SvcLogicContext;
-import org.onap.ccsdk.sli.core.sli.SvcLogicException;
-import org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-public class TestRestapiCallNode {
-
-    private static final Logger log = LoggerFactory.getLogger(TestRestapiCallNode.class);
-
-
-    @Test
-    public void testDelete() throws SvcLogicException {
-        SvcLogicContext ctx = new SvcLogicContext();
-
-        Map<String, String> p = new HashMap<>();
-        p.put("restapiUrl", "https://echo.getpostman.com/delete");
-        p.put("restapiUser", "user1");
-        p.put("restapiPassword", "pwd1");
-        p.put("httpMethod", "delete");
-        p.put("skipSending", "true");
-
-        RestapiCallNode rcn = new RestapiCallNode();
-        rcn.sendRequest(p, ctx);
-    }
-
-    @Test
-    public void testDeleteWithPayload() throws SvcLogicException {
-        SvcLogicContext ctx = new SvcLogicContext();
-
-        ctx.setAttribute("prop.name", "site1");
-
-
-        Map<String, String> p = new HashMap<>();
-        p.put("templateFileName", "src/test/resources/sdwan-site.json");
-        p.put("restapiUrl", "https://echo.getpostman.com/delete");
-        p.put("restapiUser", "user1");
-        p.put("restapiPassword", "pwd1");
-        p.put("httpMethod", "delete");
-        p.put("skipSending", "true");
-
-        RestapiCallNode rcn = new RestapiCallNode();
-        rcn.sendRequest(p, ctx);
-    }
-
-    @Test
-    public void testJsonSdwanVpnTopologyTemplate() throws SvcLogicException {
-        SvcLogicContext ctx = new SvcLogicContext();
-
-        ctx.setAttribute("prop.topology", "topoType");
-
-        ctx.setAttribute("prop.roles_length", "1");
-        ctx.setAttribute("prop.roles[0]", "role1");
-
-        ctx.setAttribute("prop.siteAttachement_length", "2");
-
-        ctx.setAttribute("prop.siteAttachement[0].siteId", "site1");
-        ctx.setAttribute("prop.siteAttachement[0].roles_length", "0");
-        ctx.setAttribute("prop.siteAttachement[0].roles[0]", "role1");
-        ctx.setAttribute("prop.siteAttachement[0].roles[1]", "role3");
-
-        ctx.setAttribute("prop.siteAttachement[1].siteId", "site2");
-        ctx.setAttribute("prop.siteAttachement[1].roles_length", "1");
-        ctx.setAttribute("prop.siteAttachement[1].roles[0]", "role2");
-
-        Map<String, String> p = new HashMap<>();
-        p.put("templateFileName", "src/test/resources/sdwan-vpn-topology.json");
-        p.put("restapiUrl", "http://echo.getpostman.com");
-        p.put("restapiUser", "user1");
-        p.put("restapiPassword", "abc123");
-        p.put("format", "json");
-        p.put("httpMethod", "post");
-        p.put("responsePrefix", "response");
-        p.put("skipSending", "true");
-
-        RestapiCallNode rcn = new RestapiCallNode();
-        rcn.sendRequest(p, ctx);
-    }
-
-    @Test
-    public void testJsonSdwanSiteTemplate() throws SvcLogicException {
-        SvcLogicContext ctx = new SvcLogicContext();
-
-        ctx.setAttribute("prop.name", "site1");
-
-
-        Map<String, String> p = new HashMap<>();
-        p.put("templateFileName", "src/test/resources/sdwan-site.json");
-        p.put("restapiUrl", "http://echo.getpostman.com");
-        p.put("restapiUser", "user1");
-        p.put("restapiPassword", "abc123");
-        p.put("format", "json");
-        p.put("httpMethod", "post");
-        p.put("responsePrefix", "response");
-        p.put("skipSending", "true");
-
-        RestapiCallNode rcn = new RestapiCallNode();
-        rcn.sendRequest(p, ctx);
-    }
-
-    @Test
-    public void testJsonTemplate() throws SvcLogicException {
-        SvcLogicContext ctx = new SvcLogicContext();
-        ctx.setAttribute("tmp.sdn-circuit-req-row_length", "3");
-        ctx.setAttribute("tmp.sdn-circuit-req-row[0].source-uid", "APIDOC-123");
-        ctx.setAttribute("tmp.sdn-circuit-req-row[0].action", "delete");
-        ctx.setAttribute("tmp.sdn-circuit-req-row[0].request-timestamp", "2016-09-09 16:30:35.0");
-        ctx.setAttribute("tmp.sdn-circuit-req-row[0].request-status", "New");
-        ctx.setAttribute("tmp.sdn-circuit-req-row[0].processing-status", "New");
-        ctx.setAttribute("tmp.sdn-circuit-req-row[0].service-clfi", "testClfi1");
-        ctx.setAttribute("tmp.sdn-circuit-req-row[0].clci", "clci");
-        ctx.setAttribute("tmp.sdn-circuit-req-row[1].source-uid", "APIDOC-123");
-        ctx.setAttribute("tmp.sdn-circuit-req-row[1].action", "delete");
-        ctx.setAttribute("tmp.sdn-circuit-req-row[1].request-timestamp", "2016-09-09 16:30:35.0");
-        ctx.setAttribute("tmp.sdn-circuit-req-row[1].request-status", "New");
-        ctx.setAttribute("tmp.sdn-circuit-req-row[1].processing-status", "New");
-        ctx.setAttribute("tmp.sdn-circuit-req-row[1].service-clfi", "testClfi1");
-        ctx.setAttribute("tmp.sdn-circuit-req-row[1].clci", "clci");
-        ctx.setAttribute("tmp.sdn-circuit-req-row[2].source-uid", "APIDOC-123");
-        ctx.setAttribute("tmp.sdn-circuit-req-row[2].action", "delete");
-        ctx.setAttribute("tmp.sdn-circuit-req-row[2].request-timestamp", "2016-09-09 16:30:35.0");
-        ctx.setAttribute("tmp.sdn-circuit-req-row[2].request-status", "New");
-        ctx.setAttribute("tmp.sdn-circuit-req-row[2].processing-status", "New");
-        ctx.setAttribute("tmp.sdn-circuit-req-row[2].service-clfi", "testClfi1");
-        ctx.setAttribute("tmp.sdn-circuit-req-row[2].clci", "clci");
-
-        Map<String, String> p = new HashMap<>();
-        p.put("templateFileName", "src/test/resources/test-template.json");
-        p.put("restapiUrl", "http://echo.getpostman.com");
-        p.put("restapiUser", "user1");
-        p.put("restapiPassword", "abc123");
-        p.put("format", "json");
-        p.put("httpMethod", "post");
-        p.put("responsePrefix", "response");
-        p.put("skipSending", "true");
-
-        RestapiCallNode rcn = new RestapiCallNode();
-        rcn.sendRequest(p, ctx);
-    }
-
-    @Test
-    public void testInvalidRepeatTimes() throws SvcLogicException {
-        SvcLogicContext ctx = new SvcLogicContext();
-        ctx.setAttribute("tmp.sdn-circuit-req-row_length", "a");
-        ctx.setAttribute("tmp.sdn-circuit-req-row[0].source-uid", "APIDOC-123");
-        ctx.setAttribute("tmp.sdn-circuit-req-row[0].action", "delete");
-        ctx.setAttribute("tmp.sdn-circuit-req-row[0].request-timestamp", "2016-09-09 16:30:35.0");
-        ctx.setAttribute("tmp.sdn-circuit-req-row[0].request-status", "New");
-        ctx.setAttribute("tmp.sdn-circuit-req-row[0].processing-status", "New");
-        ctx.setAttribute("tmp.sdn-circuit-req-row[0].service-clfi", "testClfi1");
-        ctx.setAttribute("tmp.sdn-circuit-req-row[0].clci", "clci");
-
-        Map<String, String> p = new HashMap<>();
-        p.put("templateFileName", "src/test/resources/test-template.json");
-        p.put("restapiUrl", "http://echo.getpostman.com");
-        p.put("restapiUser", "user1");
-        p.put("restapiPassword", "abc123");
-        p.put("format", "json");
-        p.put("httpMethod", "post");
-        p.put("responsePrefix", "response");
-        p.put("skipSending", "true");
-
-        RestapiCallNode rcn = new RestapiCallNode();
-        rcn.sendRequest(p, ctx);
-    }
-
-    @Test(expected = SvcLogicException.class)
-    public void testInvalidTemplatePath() throws SvcLogicException {
-        SvcLogicContext ctx = new SvcLogicContext();
-        ctx.setAttribute("tmp.sdn-circuit-req-row_length", "1");
-        ctx.setAttribute("tmp.sdn-circuit-req-row[0].source-uid", "APIDOC-123");
-        ctx.setAttribute("tmp.sdn-circuit-req-row[0].action", "delete");
-        ctx.setAttribute("tmp.sdn-circuit-req-row[0].request-timestamp", "2016-09-09 16:30:35.0");
-        ctx.setAttribute("tmp.sdn-circuit-req-row[0].request-status", "New");
-        ctx.setAttribute("tmp.sdn-circuit-req-row[0].processing-status", "New");
-        ctx.setAttribute("tmp.sdn-circuit-req-row[0].service-clfi", "testClfi1");
-        ctx.setAttribute("tmp.sdn-circuit-req-row[0].clci", "clci");
-
-        Map<String, String> p = new HashMap<>();
-        p.put("templateFileName", "src/test/resourcess/test-template.json");
-        p.put("restapiUrl", "http://echo.getpostman.com");
-        p.put("restapiUser", "user1");
-        p.put("restapiPassword", "abc123");
-        p.put("format", "json");
-        p.put("httpMethod", "post");
-        p.put("responsePrefix", "response");
-        p.put("skipSending", "true");
-
-        RestapiCallNode rcn = new RestapiCallNode();
-        rcn.sendRequest(p, ctx);
-    }
-
-    @Test(expected = SvcLogicException.class)
-    public void testWithoutSkipSending() throws SvcLogicException {
-        SvcLogicContext ctx = new SvcLogicContext();
-        ctx.setAttribute("tmp.sdn-circuit-req-row_length", "1");
-        ctx.setAttribute("tmp.sdn-circuit-req-row[0].source-uid", "APIDOC-123");
-        ctx.setAttribute("tmp.sdn-circuit-req-row[0].action", "delete");
-        ctx.setAttribute("tmp.sdn-circuit-req-row[0].request-timestamp", "2016-09-09 16:30:35.0");
-        ctx.setAttribute("tmp.sdn-circuit-req-row[0].request-status", "New");
-        ctx.setAttribute("tmp.sdn-circuit-req-row[0].processing-status", "New");
-        ctx.setAttribute("tmp.sdn-circuit-req-row[0].service-clfi", "testClfi1");
-        ctx.setAttribute("tmp.sdn-circuit-req-row[0].clci", "clci");
-
-        Map<String, String> p = new HashMap<>();
-        p.put("templateFileName", "src/test/resources/test-template.json");
-        p.put("restapiUrl", "http://echo.getpostman.com");
-        p.put("restapiUser", "user1");
-        p.put("restapiPassword", "abc123");
-        p.put("format", "json");
-        p.put("httpMethod", "post");
-        p.put("responsePrefix", "response");
-        p.put("skipSending", "false");
-
-        RestapiCallNode rcn = new RestapiCallNode();
-        rcn.sendRequest(p, ctx);
-    }
-
-    @Test(expected = SvcLogicException.class)
-    public void testFormData() throws SvcLogicException {
-        SvcLogicContext ctx = new SvcLogicContext();
-        ctx.setAttribute("tmp.sdn-circuit-req-row_length", "1");
-        ctx.setAttribute("tmp.sdn-circuit-req-row[0].source-uid", "APIDOC-123");
-        ctx.setAttribute("tmp.sdn-circuit-req-row[0].action", "delete");
-        ctx.setAttribute("tmp.sdn-circuit-req-row[0].request-timestamp", "2016-09-09 16:30:35.0");
-        ctx.setAttribute("tmp.sdn-circuit-req-row[0].request-status", "New");
-        ctx.setAttribute("tmp.sdn-circuit-req-row[0].processing-status", "New");
-        ctx.setAttribute("tmp.sdn-circuit-req-row[0].service-clfi", "testClfi1");
-        ctx.setAttribute("tmp.sdn-circuit-req-row[0].clci", "clci");
-
-        Map<String, String> p = new HashMap<>();
-        p.put("templateFileName", "src/test/resources/test-template.json");
-        p.put("restapiUrl", "http://echo.getpostman.com");
-        p.put("restapiUser", "user1");
-        p.put("restapiPassword", "abc123");
-        p.put("format", "json");
-        p.put("httpMethod", "post");
-        p.put("responsePrefix", "response");
-        p.put("skipSending", "false");
-        p.put("multipartFormData", "true");
-        p.put("multipartFile", "src/test/resources/test-template.json");
-
-        RestapiCallNode rcn = new RestapiCallNode();
-        rcn.sendRequest(p, ctx);
-    }
-
-    @Test(expected = SvcLogicException.class)
-    public void testWithInvalidURI() throws SvcLogicException {
-        SvcLogicContext ctx = new SvcLogicContext();
-        ctx.setAttribute("tmp.sdn-circuit-req-row_length", "1");
-        ctx.setAttribute("tmp.sdn-circuit-req-row[0].source-uid", "APIDOC-123");
-        ctx.setAttribute("tmp.sdn-circuit-req-row[0].action", "delete");
-        ctx.setAttribute("tmp.sdn-circuit-req-row[0].request-timestamp", "2016-09-09 16:30:35.0");
-        ctx.setAttribute("tmp.sdn-circuit-req-row[0].request-status", "New");
-        ctx.setAttribute("tmp.sdn-circuit-req-row[0].processing-status", "New");
-        ctx.setAttribute("tmp.sdn-circuit-req-row[0].service-clfi", "testClfi1");
-        ctx.setAttribute("tmp.sdn-circuit-req-row[0].clci", "clci");
-
-        Map<String, String> p = new HashMap<>();
-        p.put("templateFileName", "src/test/resources/test-template.json");
-        p.put("restapiUrl", "http://echo.  getpostman.com");
-        p.put("restapiUser", "user1");
-        p.put("restapiPassword", "abc123");
-        p.put("format", "json");
-        p.put("httpMethod", "post");
-        p.put("responsePrefix", "response");
-        p.put("skipSending", "false");
-
-        RestapiCallNode rcn = new RestapiCallNode();
-        rcn.sendRequest(p, ctx);
-    }
-
-    @Test
-    public void testVpnJsonTemplate() throws SvcLogicException {
-        SvcLogicContext ctx = new SvcLogicContext();
-        ctx.setAttribute("prop.l3vpn.name", "10000000-0000-0000-0000-000000000001");
-        ctx.setAttribute("prop.l3vpn.topology", "point_to_point");
-
-        Map<String, String> p = new HashMap<>();
-        p.put("templateFileName", "src/test/resources/l3smvpntemplate.json");
-        p.put("restapiUrl", "http://ipwan:18002/restconf/data/huawei-ac-net-l3vpn-svc:l3vpn-svc-cfg/vpn-services");
-        p.put("restapiUser", "admin");
-        p.put("restapiPassword", "admin123");
-        p.put("format", "json");
-        p.put("httpMethod", "post");
-        p.put("responsePrefix", "restapi-result");
-        p.put("skipSending", "true");
-
-        RestapiCallNode rcn = new RestapiCallNode();
-        rcn.sendRequest(p, ctx);
-    }
-
-    @Test
-    public void testSiteJsonTemplate() throws SvcLogicException {
-        SvcLogicContext ctx = new SvcLogicContext();
-        ctx.setAttribute("prop.l3vpn.name", "10000000-0000-0000-0000-000000000001");
-        ctx.setAttribute("prop.l3vpn.topology", "point_to_point");
-
-        ctx.setAttribute("prop.l3vpn.site1_name", "10000000-0000-0000-0000-000000000002");
-        ctx.setAttribute("prop.l3vpn.vpn-policy1-id", "10000000-0000-0000-0000-000000000003");
-        ctx.setAttribute("prop.l3vpn.entry1-id", "1");
-        ctx.setAttribute("prop.l3vpn.sna1_name", "10000000-0000-0000-0000-000000000004");
-        ctx.setAttribute("prop.l3vpn.pe1_id", "a8098c1a-f86e-11da-bd1a-00112444be1e");
-        ctx.setAttribute("prop.l3vpn.ac1_id", "a8098c1a-f86e-11da-bd1a-00112444be1b");
-        ctx.setAttribute("prop.l3vpn.ac1-peer-ip", "192.168.1.1");
-        ctx.setAttribute("prop.l3vpn.ac1-ip", "192.168.1.2");
-        ctx.setAttribute("prop.l3vpn.sna1_svlan", "100");
-        ctx.setAttribute("prop.l3vpn.ac1_protocol", "static");
-        ctx.setAttribute("prop.l3vpn.sna1-route.ip-prefix", "192.168.1.1/24");
-        ctx.setAttribute("prop.l3vpn.sna1-route.next-hop", "192.168.1.4");
-
-        ctx.setAttribute("prop.l3vpn.site2_name", "10000000-0000-0000-0000-000000000005");
-        ctx.setAttribute("prop.l3vpn.vpn-policy2-id", "10000000-0000-0000-0000-000000000006");
-        ctx.setAttribute("prop.l3vpn.entry2-id", "1");
-        ctx.setAttribute("prop.l3vpn.sna2_name", "10000000-0000-0000-0000-000000000007");
-        ctx.setAttribute("prop.l3vpn.pe2_id", "a8098c1a-f86e-11da-bd1a-00112444be1a");
-        ctx.setAttribute("prop.l3vpn.ac2_id", "a8098c1a-f86e-11da-bd1a-00112444be1c");
-        ctx.setAttribute("prop.l3vpn.ac2-peer-ip", "192.168.1.6");
-        ctx.setAttribute("prop.l3vpn.ac2-ip", "192.168.1.5");
-        ctx.setAttribute("prop.l3vpn.sna2_svlan", "200");
-        ctx.setAttribute("prop.l3vpn.ac2_protocol", "bgp");
-        ctx.setAttribute("prop.l3vpn.peer2-ip", "192.168.1.7");
-        ctx.setAttribute("prop.l3vpn.ac2_protocol_bgp_as", "200");
-
-        Map<String, String> p = new HashMap<>();
-        p.put("templateFileName", "src/test/resources/l3smsitetemplate.json");
-        p.put("restapiUrl", "http://ipwan:18002/restconf/data/huawei-ac-net-l3vpn-svc:l3vpn-svc-cfg/sites");
-        p.put("restapiUser", "admin");
-        p.put("restapiPassword", "admin123");
-        p.put("format", "json");
-        p.put("httpMethod", "post");
-        p.put("responsePrefix", "restapi-result");
-        p.put("skipSending", "true");
-
-        RestapiCallNode rcn = new RestapiCallNode();
-        rcn.sendRequest(p, ctx);
-    }
-
-    @Test
-    public void testVrfJsonTemplate() throws SvcLogicException {
-        SvcLogicContext ctx = new SvcLogicContext();
-        ctx.setAttribute("prop.l3vpn.vrf1-id", "10000000-0000-0000-0000-000000000007");
-        ctx.setAttribute("prop.l3vpn.vpn-policy1-id", "10000000-0000-0000-0000-000000000003");
-        ctx.setAttribute("prop.l3vpn.pe1_id", "a8098c1a-f86e-11da-bd1a-00112444be1e");
-        ctx.setAttribute("prop.l3vpn.vrf2-id", "10000000-0000-0000-0000-000000000009");
-        ctx.setAttribute("prop.l3vpn.vpn-policy2-id", "10000000-0000-0000-0000-000000000006");
-        ctx.setAttribute("prop.l3vpn.pe2_id", "a8098c1a-f86e-11da-bd1a-00112444be1a");
-
-        Map<String, String> p = new HashMap<>();
-        p.put("templateFileName", "src/test/resources/l3smvrftemplate.json");
-        p.put("restapiUrl", "http://ipwan:18002/restconf/data/huawei-ac-net-l3vpn-svc:l3vpn-svc-cfg/vrf-attributes");
-        p.put("restapiUser", "admin");
-        p.put("restapiPassword", "admin123");
-        p.put("format", "json");
-        p.put("httpMethod", "post");
-        p.put("responsePrefix", "restapi-result");
-        p.put("skipSending", "true");
-
-        RestapiCallNode rcn = new RestapiCallNode();
-        rcn.sendRequest(p, ctx);
-    }
-
-    @Test
-    public void testDeleteVpnJsonTemplate() throws SvcLogicException {
-        SvcLogicContext ctx = new SvcLogicContext();
-        ctx.setAttribute("prop.l3vpn.name", "10000000-0000-0000-0000-000000000001");
-        ctx.setAttribute("prop.l3vpn.topology", "point_to_point");
-
-        Map<String, String> p = new HashMap<>();
-        //p.put("templateFileName", "src/test/resources/l3smvpntemplate.json");
-        p.put("restapiUrl", "http://ipwan:18002/restconf/data/huawei-ac-net-l3vpn-svc:l3vpn-svc-cfg/vpn-services"
-            + "/vpnservice=10000000-0000-0000-0000-000000000001");
-        p.put("restapiUser", "admin");
-        p.put("restapiPassword", "admin123");
-        p.put("format", "json");
-        p.put("httpMethod", "delete");
-        p.put("responsePrefix", "restapi-result");
-        p.put("skipSending", "true");
-
-        RestapiCallNode rcn = new RestapiCallNode();
-        rcn.sendRequest(p, ctx);
-    }
-
-    @Test
-    public void testL2DciTemplate() throws SvcLogicException {
-        SvcLogicContext ctx = new SvcLogicContext();
-        ctx.setAttribute("prop.dci-connects.id", "Id1");
-        ctx.setAttribute("prop.dci-connects.name", "Name1");
-        ctx.setAttribute("prop.dci-connects.local_networks[0]", "NetId1");
-        ctx.setAttribute("prop.dci-connects.local_networks[1]", "NetId2");
-        ctx.setAttribute("prop.dci-connects.evpn_irts[0]", "100:1");
-        ctx.setAttribute("prop.dci-connects.evpn_erts[0]", "100:2");
-        ctx.setAttribute("prop.dci-connects.evpn_irts[1]", "200:1");
-        ctx.setAttribute("prop.dci-connects.evpn_erts[1]", "200:2");
-        ctx.setAttribute("prop.dci-connects.vni", "1");
-
-        Map<String, String> p = new HashMap<>();
-        p.put("templateFileName", "src/test/resources/l2-dci-connects-template.json");
-        p.put("restapiUrl", "http://echo.getpostman.com");
-        p.put("restapiUser", "user1");
-        p.put("restapiPassword", "abc123");
-        p.put("format", "json");
-        p.put("httpMethod", "post");
-        p.put("responsePrefix", "response");
-        p.put("skipSending", "true");
-
-        RestapiCallNode rcn = new RestapiCallNode();
-        rcn.sendRequest(p, ctx);
-    }
-
-    @Test
-    public void testL3DciTemplate() throws SvcLogicException {
-        SvcLogicContext ctx = new SvcLogicContext();
-        ctx.setAttribute("prop.dci-connects.id", "Id1");
-        ctx.setAttribute("prop.dci-connects.name", "Name1");
-        ctx.setAttribute("prop.dci-connects.local_networks_length", "2");
-        ctx.setAttribute("prop.dci-connects.local_networks[0]", "NetId1");
-        ctx.setAttribute("prop.dci-connects.local_networks[1]", "NetId2");
-        ctx.setAttribute("prop.dci-connects.evpn_irts[0]", "100:1");
-        ctx.setAttribute("prop.dci-connects.evpn_erts[0]", "100:2");
-        ctx.setAttribute("prop.dci-connects.evpn_irts[1]", "200:1");
-        ctx.setAttribute("prop.dci-connects.evpn_erts[1]", "200:2");
-        ctx.setAttribute("prop.dci-connects.vni", "1");
-
-        Map<String, String> p = new HashMap<>();
-        p.put("templateFileName", "src/test/resources/l3-dci-connects-template.json");
-        p.put("restapiUrl", "http://echo.getpostman.com");
-        p.put("restapiUser", "user1");
-        p.put("restapiPassword", "abc123");
-        p.put("format", "json");
-        p.put("httpMethod", "post");
-        p.put("responsePrefix", "response");
-        p.put("skipSending", "true");
-
-        RestapiCallNode rcn = new RestapiCallNode();
-        rcn.sendRequest(p, ctx);
-
-    }
-
-    @Test
-    public void testControllerTokenTemplate() throws SvcLogicException {
-        SvcLogicContext ctx = new SvcLogicContext();
-        ctx.setAttribute("prop.sdncRestApi.thirdpartySdnc.user", "admin");
-        ctx.setAttribute("prop.sdncRestApi.thirdpartySdnc.password", "admin123");
-
-        Map<String, String> p = new HashMap<>();
-        p.put("templateFileName", "src/test/resources/actokentemplate.json");
-        p.put("restapiUrl", "https://ipwan:18002/controller/v2/tokens");
-        p.put("format", "json");
-        p.put("httpMethod", "post");
-        p.put("responsePrefix", "restapi-result");
-        p.put("skipSending", "true");
-
-        RestapiCallNode rcn = new RestapiCallNode();
-        rcn.sendRequest(p, ctx);
-    }
-
-
-    @Test
-    public void testDeleteNoneAsContentType() throws SvcLogicException {
-        SvcLogicContext ctx = new SvcLogicContext();
-
-        Map<String, String> p = new HashMap<>();
-        p.put("restapiUrl", "https://echo.getpostman.com/delete");
-        p.put("restapiUser", "user1");
-        p.put("restapiPassword", "pwd1");
-        p.put("httpMethod", "delete");
-        p.put("format", "none");
-        p.put("skipSending", "true");
-
-        RestapiCallNode rcn = new RestapiCallNode();
-        rcn.sendRequest(p, ctx);
-    }
-
-    @Test
-    public void testPostNoneAsContentType() throws SvcLogicException {
-        SvcLogicContext ctx = new SvcLogicContext();
-        ctx.setAttribute("prop.l3vpn.name", "10000000-0000-0000-0000-000000000001");
-        ctx.setAttribute("prop.l3vpn.topology", "point_to_point");
-
-        Map<String, String> p = new HashMap<>();
-        p.put("templateFileName", "src/test/resources/l3smvpntemplate.json");
-        p.put("restapiUrl", "http://ipwan:18002/restconf/data/huawei-ac-net-l3vpn-svc:l3vpn-svc-cfg/vpn-services");
-        p.put("restapiUser", "admin");
-        p.put("restapiPassword", "admin123");
-        p.put("format", "none");
-        p.put("httpMethod", "post");
-        p.put("responsePrefix", "restapi-result");
-        p.put("skipSending", "true");
-
-        RestapiCallNode rcn = new RestapiCallNode();
-        rcn.sendRequest(p, ctx);
-    }
-
-    @Test
-    public void testDeleteOAuthType() throws SvcLogicException {
-        SvcLogicContext ctx = new SvcLogicContext();
-
-        Map<String, String> p = new HashMap<>();
-        p.put("restapiUrl", "https://echo.getpostman.com/delete");
-        p.put("oAuthConsumerKey", "f2a1ed52710d4533bde25be6da03b6e3");
-        p.put("oAuthConsumerSecret", "secret");
-        p.put("oAuthSignatureMethod", "plainTEXT");
-        p.put("oAuthVersion", "1.0");
-        p.put("httpMethod", "delete");
-        p.put("format", "none");
-        p.put("skipSending", "true");
-
-        RestapiCallNode rcn = new RestapiCallNode();
-        rcn.sendRequest(p, ctx);
-    }
-
-    @Test
-    public void testDeleteAuthTypeBasic() throws SvcLogicException {
-        SvcLogicContext ctx = new SvcLogicContext();
-
-        Map<String, String> p = new HashMap<>();
-        p.put("restapiUrl", "https://echo.getpostman.com/delete");
-        p.put("authType", "basic");
-        p.put("restapiUser", "admin");
-        p.put("restapiPassword", "admin123");
-        p.put("httpMethod", "delete");
-        p.put("format", "none");
-        p.put("skipSending", "true");
-
-        RestapiCallNode rcn = new RestapiCallNode();
-        rcn.sendRequest(p, ctx);
-    }
-
-    @Test
-    public void testDeleteAuthTypeDigest() throws SvcLogicException {
-        SvcLogicContext ctx = new SvcLogicContext();
-
-        Map<String, String> p = new HashMap<>();
-        p.put("restapiUrl", "https://echo.getpostman.com/delete");
-        p.put("authType", "digest");
-        p.put("restapiUser", "admin");
-        p.put("restapiPassword", "admin123");
-        p.put("httpMethod", "delete");
-        p.put("format", "none");
-        p.put("skipSending", "true");
-
-        RestapiCallNode rcn = new RestapiCallNode();
-        rcn.sendRequest(p, ctx);
-    }
-
-    @Test
-    public void testDeleteAuthTypeOAuth() throws SvcLogicException {
-        SvcLogicContext ctx = new SvcLogicContext();
-
-        Map<String, String> p = new HashMap<>();
-        p.put("restapiUrl", "https://echo.getpostman.com/delete");
-        p.put("authType", "oauth");
-        p.put("oAuthConsumerKey", "f2a1ed52710d4533bde25be6da03b6e3");
-        p.put("oAuthConsumerSecret", "secret");
-        p.put("oAuthSignatureMethod", "plainTEXT");
-        p.put("oAuthVersion", "1.0");
-        p.put("httpMethod", "delete");
-        p.put("format", "none");
-        p.put("skipSending", "true");
-
-        RestapiCallNode rcn = new RestapiCallNode();
-        rcn.sendRequest(p, ctx);
-    }
-
-    @Test
-    public void testDeleteAuthTypeNoneOAuth() throws SvcLogicException {
-        SvcLogicContext ctx = new SvcLogicContext();
-
-        Map<String, String> p = new HashMap<>();
-        p.put("restapiUrl", "https://echo.getpostman.com/delete");
-        p.put("oAuthConsumerKey", "f2a1ed52710d4533bde25be6da03b6e3");
-        p.put("oAuthConsumerSecret", "secret");
-        p.put("oAuthSignatureMethod", "plainTEXT");
-        p.put("oAuthVersion", "1.0");
-        p.put("httpMethod", "delete");
-        p.put("format", "none");
-        p.put("skipSending", "true");
-
-        RestapiCallNode rcn = new RestapiCallNode();
-        rcn.sendRequest(p, ctx);
-    }
-    @Test
-    public void testDeleteAuthTypeNoneBasic() throws SvcLogicException {
-        SvcLogicContext ctx = new SvcLogicContext();
-
-        Map<String, String> p = new HashMap<>();
-        p.put("restapiUrl", "https://echo.getpostman.com/delete");
-        p.put("restapiUser", "admin");
-        p.put("restapiPassword", "admin123");
-        p.put("httpMethod", "delete");
-        p.put("format", "none");
-        p.put("skipSending", "true");
-
-        RestapiCallNode rcn = new RestapiCallNode();
-        rcn.sendRequest(p, ctx);
-    }
-
-    @Test(expected = SvcLogicException.class)
-    public void testInvalidDeleteAuthTypeOAuth() throws SvcLogicException {
-        SvcLogicContext ctx = new SvcLogicContext();
-
-        Map<String, String> p = new HashMap<>();
-        p.put("restapiUrl", "https://echo.getpostman.com/delete");
-        p.put("authType", "oauth");
-        p.put("oAuthConsumerKey", "f2a1ed52710d4533bde25be6da03b6e3");
-        p.put("oAuthConsumerSecret", "secret");
-        p.put("httpMethod", "delete");
-        p.put("format", "none");
-        p.put("skipSending", "true");
-
-        RestapiCallNode rcn = new RestapiCallNode();
-        rcn.sendRequest(p, ctx);
-    }
-
-    @Test(expected = SvcLogicException.class)
-    public void testInvalidDeleteAuthTypeBasic() throws SvcLogicException {
-        SvcLogicContext ctx = new SvcLogicContext();
-
-        Map<String, String> p = new HashMap<>();
-        p.put("restapiUrl", "https://echo.getpostman.com/delete");
-        p.put("authType", "basic");
-        p.put("oAuthConsumerKey", "f2a1ed52710d4533bde25be6da03b6e3");
-        p.put("oAuthConsumerSecret", "secret");
-        p.put("httpMethod", "delete");
-        p.put("format", "none");
-        p.put("skipSending", "true");
-
-        RestapiCallNode rcn = new RestapiCallNode();
-        rcn.sendRequest(p, ctx);
-    }
-
-    @Test(expected = SvcLogicException.class)
-    public void testInvalidDeleteAuthTypeDigest() throws SvcLogicException {
-        SvcLogicContext ctx = new SvcLogicContext();
-
-        Map<String, String> p = new HashMap<>();
-        p.put("restapiUrl", "https://echo.getpostman.com/delete");
-        p.put("authType", "digest");
-        p.put("oAuthConsumerKey", "f2a1ed52710d4533bde25be6da03b6e3");
-        p.put("oAuthConsumerSecret", "secret");
-        p.put("httpMethod", "delete");
-        p.put("format", "none");
-        p.put("skipSending", "true");
-
-        RestapiCallNode rcn = new RestapiCallNode();
-        rcn.sendRequest(p, ctx);
-    }
-
-    @Test
-    public void testMultipartFormData() throws SvcLogicException {
-        final ResourceConfig resourceConfig = new ResourceConfig(
-                MultipartServerMock.class, MultiPartFeature.class);
-        HttpServer server = GrizzlyHttpServerFactory.createHttpServer(
-                URI.create("http://localhost:8080/"),resourceConfig);
-
-        Map<String, String> p = new HashMap<>();
-        p.put("multipartFormData", "true");
-        p.put("format", "none");
-        p.put("multipartFile", "src/test/resources/test-template.json");
-        p.put("restapiUrl", "http://localhost:8080/file-upload/upload");
-
-        SvcLogicContext ctx = new SvcLogicContext();
-        RestapiCallNode rcn = new RestapiCallNode();
-        rcn.sendRequest(p, ctx);
-        assertThat(ctx.getAttribute("response-code"), is("200"));
-        assertThat(ctx.getAttribute("httpResponse"), is( "test-template.json"));
-        server.shutdownNow();
-    }
-
-    @Test
-    public void testCookieResponse() throws SvcLogicException {
-        final ResourceConfig resourceConfig = new ResourceConfig(
-                MockCookieAuthServer.class);
-        HttpServer server = GrizzlyHttpServerFactory.createHttpServer(
-                URI.create("http://localhost:8080/"),resourceConfig);
-
-        Map<String, String> p = new HashMap<>();
-        p.put("format", "none");
-        p.put("httpMethod", "get");
-        p.put("restapiUrl", "http://localhost:8080/get-cookie/cookie");
-        p.put("dumpHeaders", "true");
-
-        SvcLogicContext ctx = new SvcLogicContext();
-        RestapiCallNode rcn = new RestapiCallNode();
-        rcn.sendRequest(p, ctx);
-        assertThat(ctx.getAttribute("response-code"), is("200"));
-        assertThat(ctx.getAttribute("header.Set-Cookie"), is("cookieResponse=cookieValueInReturn;Version=1"));
-        server.shutdownNow();
-    }
-}
diff --git a/restapi-call-node/provider/src/test/java/jtest/org/onap/ccsdk/sli/plugins/restapicall/TestXmlJsonUtil.java b/restapi-call-node/provider/src/test/java/jtest/org/onap/ccsdk/sli/plugins/restapicall/TestXmlJsonUtil.java
deleted file mode 100644
index 11eeba7f..00000000
--- a/restapi-call-node/provider/src/test/java/jtest/org/onap/ccsdk/sli/plugins/restapicall/TestXmlJsonUtil.java
+++ /dev/null
@@ -1,262 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * openECOMP : SDN-C
- * ================================================================================
- * Copyright (C) 2017 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=========================================================
- */
-
-package jtest.org.onap.ccsdk.sli.plugins.restapicall;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import org.junit.Assert;
-import org.junit.Test;
-import org.onap.ccsdk.sli.plugins.restapicall.XmlJsonUtil;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-
-public class TestXmlJsonUtil {
-
-    private static final Logger log = LoggerFactory.getLogger(TestXmlJsonUtil.class);
-
-    @Test
-    public void test() {
-        Map<String, String> mm = new HashMap<>();
-        mm.put("service-data.vnf-config-parameters-list.vnf-config-parameters[0].vnf-type", "N-SBG");
-        mm.put("service-data.service-information.service-instance-id", "someinstance001");
-        mm.put("service-data.vnf-config-parameters-list." +
-                "vnf-config-parameters[0].dns-server-ip-address", "10.11.12.13");
-        mm.put("service-data.vnf-config-parameters-list." +
-                "vnf-config-parameters[0].escf-domain-name", "hclab.atttest.com");
-        mm.put("service-data.vnf-config-parameters-list." +
-                "vnf-config-parameters[0].snmp-target-v3_length", "2");
-        mm.put("service-data.vnf-config-parameters-list." +
-                "vnf-config-parameters[0].snmp-target-v3[0].snmp-target-v3-id", "1");
-        mm.put("service-data.vnf-config-parameters-list." +
-                "vnf-config-parameters[0].snmp-target-v3[0].snmp-target-ip-address", "127.0.0.1");
-        mm.put("service-data.vnf-config-parameters-list." +
-                "vnf-config-parameters[0].snmp-target-v3[0].snmp-security-level", "NO_AUTH_NO_PRIV");
-        mm.put("service-data.vnf-config-parameters-list." +
-                "vnf-config-parameters[0].snmp-target-v3[1].snmp-target-v3-id", "2");
-        mm.put("service-data.vnf-config-parameters-list." +
-                "vnf-config-parameters[0].snmp-target-v3[1].snmp-target-ip-address", "192.168.1.8");
-        mm.put("service-data.vnf-config-parameters-list." +
-                "vnf-config-parameters[0].snmp-target-v3[1].snmp-security-level", "NO_AUTH_NO_PRIV");
-        mm.put("service-data.vnf-config-parameters-list." +
-                "vnf-config-parameters[0].dns-ip-address-1", "2001:1890:1001:2224::1");
-        mm.put("service-data.vnf-config-parameters-list." +
-                "vnf-config-parameters[0].dns-ip-address-2", "2001:1890:1001:2424::1");
-        mm.put("service-data.vnf-config-parameters-list." +
-                "vnf-config-parameters[0].diameter-rf-realm-name", "uvp.els-an.att.net");
-        mm.put("service-data.vnf-config-parameters-list." +
-                "vnf-config-parameters[0].diameter-rf-peer-ip-address", "192.168.1.66");
-        mm.put("service-data.vnf-config-parameters-list." +
-                "vnf-config-parameters[0].bgf-controller-ip-address", "192.168.1.186");
-        mm.put("service-data.vnf-config-parameters-list." +
-                "vnf-config-parameters[0].bgf-control-link-name", "mg3/69@192.168.1.226");
-        mm.put("service-data.vnf-config-parameters-list." +
-                "vnf-config-parameters[0].rf-interface-nexthop-ip-address", "10.111.108.150");
-        mm.put("service-data.vnf-config-parameters-list." +
-                "vnf-config-parameters[0].rf-mated-pair-ip-address", "10.111.108.146");
-
-        mm.put("service-data.vnf-config-parameters-list.vnf-config-parameters[0].access-net-pcscf_length", "4");
-
-        mm.put("service-data.vnf-config-parameters-list." +
-                "vnf-config-parameters[0].access-net-pcscf[0].network-name", "UvpbUgnAccess1");
-        mm.put("service-data.vnf-config-parameters-list." +
-                "vnf-config-parameters[0].access-net-pcscf[0].sip-pa-termination-ip-address", "10.111.108.146");
-
-        mm.put("service-data.vnf-config-parameters-list." +
-                "vnf-config-parameters[0].access-net-pcscf[1].network-name", "MIS");
-        mm.put("service-data.vnf-config-parameters-list." +
-                "vnf-config-parameters[0].access-net-pcscf[1].proactive-transcoding-profile",
-                "trinity-transcodingProfile");
-        mm.put("service-data.vnf-config-parameters-list." +
-                "vnf-config-parameters[0].access-net-pcscf[1].next-hop-ip-address", "10.111.108.158");
-        mm.put("service-data.vnf-config-parameters-list." +
-                "vnf-config-parameters[0].access-net-pcscf[1].subnet-mask-length", "10.111.108.154");
-
-        mm.put("service-data.vnf-config-parameters-list." +
-                "vnf-config-parameters[0].access-net-pcscf[2].network-name", "AVPN1");
-        mm.put("service-data.vnf-config-parameters-list." +
-                "vnf-config-parameters[0].access-net-pcscf[2].proactive-transcoding-profile",
-                "trinity-transcodingProfile");
-        mm.put("service-data.vnf-config-parameters-list." +
-                "vnf-config-parameters[0].access-net-pcscf[2].next-hop-ip-address", "10.111.108.166");
-        mm.put("service-data.vnf-config-parameters-list." +
-                "vnf-config-parameters[0].access-net-pcscf[2].subnet-mask-length", "10.111.108.162");
-
-        mm.put("service-data.vnf-config-parameters-list." +
-                "vnf-config-parameters[0].access-net-pcscf[3].network-name", "AVPN1");
-        mm.put("service-data.vnf-config-parameters-list." +
-                "vnf-config-parameters[0].access-net-pcscf[3].proactive-transcoding-profile",
-                "trinity-transcodingProfile");
-        mm.put("service-data.vnf-config-parameters-list." +
-                "vnf-config-parameters[0].access-net-pcscf[3].next-hop-ip-address", "10.129.108.166");
-        mm.put("service-data.vnf-config-parameters-list." +
-                "vnf-config-parameters[0].access-net-pcscf[3].subnet-mask-length", "10.129.108.162");
-
-        mm.put("service-data.vnf-config-parameters-list." +
-                "vnf-config-parameters[0].core-net-pcscf_length", "1");
-
-        mm.put("service-data.vnf-config-parameters-list." +
-                "vnf-config-parameters[0].core-net-pcscf[0].network-name", "Core");
-        mm.put("service-data.vnf-config-parameters-list." +
-                "vnf-config-parameters[0].core-net-pcscf[0].next-hop-ip-address", "10.111.108.142");
-        mm.put("service-data.vnf-config-parameters-list." +
-                "vnf-config-parameters[0].core-net-pcscf[0].sip-pa-termination-ip-address", "10.111.108.138");
-
-        mm.put("service-data.vnf-config-parameters-list." +
-                "vnf-config-parameters[0].mated-pair-fully-qualified-domain-name",
-                "mt1nj01sbg01pyl-mt1nj01sbg02pyl.ar1ga.uvp.els-an.att.net");
-
-        mm.put("service-data.appc-request-header.svc-request-id", "SOMESERVICEREQUEST123451000");
-        mm.put("service-data.vnf-config-information.vnf-host-ip-address", "192.168.13.151");
-        mm.put("service-data.vnf-config-information.vendor", "Netconf");
-
-        mm.put("service-data.vnf-config-information.escape-test",
-                "blah blah \"xxx&nnn<>\\'\"there>blah<&''\"\"123\\\\\\'''blah blah &");
-
-        String ss = XmlJsonUtil.getXml(mm, "service-data.vnf-config-parameters-list");
-        log.info(ss);
-
-        ss = XmlJsonUtil.getXml(mm, "service-data.vnf-config-information");
-        log.info(ss);
-
-        ss = XmlJsonUtil.getJson(mm, "service-data.vnf-config-parameters-list.vnf-config-parameters");
-        log.info(ss);
-
-        ss = XmlJsonUtil.getJson(mm, "service-data.vnf-config-information");
-        log.info(ss);
-
-        ss = XmlJsonUtil.getJson(mm, "service-data.vnf-config-information.vnf-host-ip-address");
-        log.info(ss);
-
-        ss = XmlJsonUtil.getJson(mm, "\"service-data.vnf-config-information.vnf-host-ip-address");
-        log.info(ss);
-    }
-
-    @Test
-    public void testRemoveEmptyStructXml() {
-        String xmlin = "" +
-                "<T1>\n" +
-                "    <T2>\n" +
-                "        <T3>\n" +
-                "            <T4></T4>\n" +
-                "            <T5>     </T5>\n" +
-                "            <T6>\n" +
-                "            </T6>\n" +
-                "        </T3>\n" +
-                "        <T7>blah</T7>\n" +
-                "    </T2>\n" +
-                "    <T8>\n" +
-                "        <T9>\n" +
-                "            <T10></T10>\n" +
-                "            <T11>      </T11>\n" +
-                "            <T12>\n" +
-                "            </T12>\n" +
-                "        </T9>\n" +
-                "        <T13>\n" +
-                "            <T14></T14>\n" +
-                "            <T15>     </T15>\n" +
-                "            <T16>\n" +
-                "                <T17></T17>\n" +
-                "            </T16>\n" +
-                "        </T13>\n" +
-                "        <T17>\n" +
-                "        </T17>\n" +
-                "    </T8>\n" +
-                "    <T18>blah blah</T18>\n" +
-                "</T1>\n";
-
-        String xmloutexpected = "" +
-                "<T1>\n" +
-                "    <T2>\n" +
-                "        <T7>blah</T7>\n" +
-                "    </T2>\n" +
-                "    <T18>blah blah</T18>\n" +
-                "</T1>\n";
-
-        String xmlout = XmlJsonUtil.removeEmptyStructXml(xmlin);
-        log.info(xmlout);
-
-        Assert.assertEquals(xmloutexpected, xmlout);
-    }
-
-    @Test
-    public void testRemoveEmptyStructJson() {
-        String xmlin = "{\r\n" +
-                "    \"T1\":{\r\n" +
-                "        \"T2\":{\r\n" +
-                "            \"T3\":[\r\n" +
-                "                                \r\n" +
-                "            ],\r\n" +
-                "            \"T4\":{\r\n" +
-                "                \"T12\":[\r\n" +
-                "                    \r\n" +
-                "                ],\r\n" +
-                "                \"T13\":[   ],\r\n" +
-                "                \"T14\":{\r\n" +
-                "                    \"T15\":{\r\n" +
-                "                        \r\n" +
-                "                    },\r\n" +
-                "                    \"T16\":{\r\n" +
-                "                        \r\n" +
-                "                    }\r\n" +
-                "                }\r\n" +
-                "            },\r\n" +
-                "            \"T5\":{\r\n" +
-                "                \"T6\":[\r\n" +
-                "                    \r\n" +
-                "                ],\r\n" +
-                "                \"T7\":[\r\n" +
-                "                    \"T8\":{\r\n" +
-                "                        \r\n" +
-                "                    },\r\n" +
-                "                    \"T9\":{    },\r\n" +
-                "                    \"T10\":\"blah\",\r\n" +
-                "                    \"T11\":[\r\n" +
-                "                        \r\n" +
-                "                    ]\r\n" +
-                "                ]\r\n" +
-                "            }\r\n" +
-                "        }\r\n" +
-                "    }\r\n" +
-                "}\r\n" +
-                "";
-
-        String xmloutexpected = "{\r\n" +
-                "    \"T1\":{\r\n" +
-                "        \"T2\":{\r\n" +
-                "            \"T5\":{\r\n" +
-                "                \"T7\":[\r\n" +
-                "                    \"T10\":\"blah\",\r\n" +
-                "                ]\r\n" +
-                "            }\r\n" +
-                "        }\r\n" +
-                "    }\r\n" +
-                "}\r\n" +
-                "";
-
-        String xmlout = XmlJsonUtil.removeEmptyStructJson(null, xmlin);
-        log.info(xmlout);
-
-        Assert.assertEquals(xmloutexpected, xmlout);
-    }
-}
diff --git a/restapi-call-node/provider/src/test/java/jtest/org/onap/ccsdk/sli/plugins/restapicall/TestXmlParser.java b/restapi-call-node/provider/src/test/java/jtest/org/onap/ccsdk/sli/plugins/restapicall/TestXmlParser.java
deleted file mode 100644
index c6bf4a8b..00000000
--- a/restapi-call-node/provider/src/test/java/jtest/org/onap/ccsdk/sli/plugins/restapicall/TestXmlParser.java
+++ /dev/null
@@ -1,121 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * openECOMP : SDN-C
- * ================================================================================
- * Copyright (C) 2017 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=========================================================
- */
-
-package jtest.org.onap.ccsdk.sli.plugins.restapicall;
-
-import static org.hamcrest.MatcherAssert.assertThat;
-import static org.hamcrest.core.Is.is;
-
-import java.io.BufferedReader;
-import java.io.InputStreamReader;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-import org.junit.Test;
-import org.onap.ccsdk.sli.core.sli.SvcLogicException;
-import org.onap.ccsdk.sli.plugins.restapicall.XmlParser;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-public class TestXmlParser {
-
-    private static final Logger log = LoggerFactory.getLogger(TestXmlParser.class);
-
-    @Test
-    public void test() throws Exception {
-        BufferedReader in = new BufferedReader(
-                new InputStreamReader(ClassLoader.getSystemResourceAsStream("test3.xml"))
-        );
-        StringBuilder b = new StringBuilder();
-        String line;
-        while ((line = in.readLine()) != null)
-            b.append(line).append('\n');
-
-        Set<String> listNameList = new HashSet<String>();
-        listNameList.add("project.dependencies.dependency");
-        listNameList.add("project.build.plugins.plugin");
-        listNameList.add("project.build.plugins.plugin.executions.execution");
-        listNameList.add("project.build.pluginManagement.plugins.plugin");
-        listNameList.add("project.build.pluginManagement." +
-                        "plugins.plugin.configuration.lifecycleMappingMetadata.pluginExecutions.pluginExecution");
-
-        Map<String, String> mm = XmlParser.convertToProperties(b.toString(), listNameList);
-        logProperties(mm);
-        in.close();
-    }
-
-    @Test
-    public void testValidLength() throws Exception {
-        BufferedReader in = new BufferedReader(
-            new InputStreamReader(ClassLoader.getSystemResourceAsStream("test3.xml"))
-        );
-        StringBuilder b = new StringBuilder();
-        String line;
-        while ((line = in.readLine()) != null)
-            b.append(line).append('\n');
-
-        Set<String> listNameList = new HashSet<String>();
-        listNameList.add("ApplyGroupResponse.ApplyGroupResponseData.VrfDetails.VrfImport");
-        listNameList.add("ApplyGroupResponse.ApplyGroupResponseData.VrfDetails.VrfExport");
-
-        Map<String, String> mm = XmlParser.convertToProperties(b.toString(), listNameList);
-
-        assertThat(mm.get("ApplyGroupResponse.ApplyGroupResponseData.VrfDetails.VrfExport[5]"), is("SET_RESET_LP"));
-        assertThat(mm.get("ApplyGroupResponse.ApplyGroupResponseData.VrfDetails.VrfImport[0]"), is("SET_BVOIP_IN"));
-
-        logProperties(mm);
-        in.close();
-    }
-
-    @Test(expected = SvcLogicException.class)
-    public void testInvalidLength() throws Exception {
-        BufferedReader in = new BufferedReader(
-            new InputStreamReader(ClassLoader.getSystemResourceAsStream("invalidlength.xml"))
-        );
-        StringBuilder b = new StringBuilder();
-        String line;
-        while ((line = in.readLine()) != null)
-            b.append(line).append('\n');
-
-        Set<String> listNameList = new HashSet<String>();
-        listNameList.add("ApplyGroupResponse.ApplyGroupResponseData.VrfDetails.VrfImport");
-        listNameList.add("ApplyGroupResponse.ApplyGroupResponseData.VrfDetails.VrfExport");
-
-        Map<String, String> mm = XmlParser.convertToProperties(b.toString(), listNameList);
-        logProperties(mm);
-        in.close();
-    }
-
-    private void logProperties(Map<String, String> mm) {
-        List<String> ll = new ArrayList<>();
-        for (Object o : mm.keySet())
-            ll.add((String) o);
-        Collections.sort(ll);
-
-        log.info("Properties:");
-        for (String name : ll)
-            log.info("--- " + name + ": " + mm.get(name));
-    }
-}