Migrate files from sli-plugins

Migrate sli-plugins repo into new
directory "plugins".

Signed-off-by: Jessica Wagantall <jwagantall@linuxfoundation.org>

35 files changed, 0 insertions, 2546 deletions

diff --git a/grToolkit/provider/src/test/java/org/onap/ccsdk/sli/plugins/grtoolkit/GrToolkitProviderTest.java b/grToolkit/provider/src/test/java/org/onap/ccsdk/sli/plugins/grtoolkit/GrToolkitProviderTest.java
deleted file mode 100644
index edd6d1b8d..000000000
--- a/grToolkit/provider/src/test/java/org/onap/ccsdk/sli/plugins/grtoolkit/GrToolkitProviderTest.java
+++ /dev/null
@@ -1,352 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * openECOMP : SDN-C
- * ================================================================================
- * Copyright (C) 2018 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 org.onap.ccsdk.sli.plugins.grtoolkit;
-import com.github.tomakehurst.wiremock.junit.WireMockRule;
-
-import com.google.common.util.concurrent.ListenableFuture;
-
-import org.junit.Before;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.contrib.java.lang.system.EnvironmentVariables;
-
-import org.onap.ccsdk.sli.core.dblib.DBLibConnection;
-import org.onap.ccsdk.sli.core.dblib.DbLibService;
-import org.onap.ccsdk.sli.plugins.grtoolkit.data.ClusterActor;
-
-import org.opendaylight.controller.cluster.access.concepts.MemberName;
-import org.opendaylight.controller.cluster.datastore.DistributedDataStoreInterface;
-import org.opendaylight.controller.cluster.datastore.utils.ActorUtils;
-import org.opendaylight.controller.md.sal.binding.api.DataBroker;
-import org.opendaylight.controller.md.sal.binding.api.NotificationPublishService;
-import org.opendaylight.controller.sal.binding.api.RpcProviderRegistry;
-import org.opendaylight.yang.gen.v1.org.onap.ccsdk.sli.plugins.gr.toolkit.rev180926.AdminHealthOutput;
-import org.opendaylight.yang.gen.v1.org.onap.ccsdk.sli.plugins.gr.toolkit.rev180926.ClusterHealthOutput;
-import org.opendaylight.yang.gen.v1.org.onap.ccsdk.sli.plugins.gr.toolkit.rev180926.DatabaseHealthOutput;
-import org.opendaylight.yang.gen.v1.org.onap.ccsdk.sli.plugins.gr.toolkit.rev180926.FailoverOutput;
-import org.opendaylight.yang.gen.v1.org.onap.ccsdk.sli.plugins.gr.toolkit.rev180926.HaltAkkaTrafficInputBuilder;
-import org.opendaylight.yang.gen.v1.org.onap.ccsdk.sli.plugins.gr.toolkit.rev180926.HaltAkkaTrafficOutput;
-import org.opendaylight.yang.gen.v1.org.onap.ccsdk.sli.plugins.gr.toolkit.rev180926.ResumeAkkaTrafficInputBuilder;
-import org.opendaylight.yang.gen.v1.org.onap.ccsdk.sli.plugins.gr.toolkit.rev180926.ResumeAkkaTrafficOutput;
-import org.opendaylight.yang.gen.v1.org.onap.ccsdk.sli.plugins.gr.toolkit.rev180926.SiteHealthOutput;
-import org.opendaylight.yang.gen.v1.org.onap.ccsdk.sli.plugins.gr.toolkit.rev180926.SiteIdentifierOutput;
-import org.opendaylight.yangtools.yang.common.RpcResult;
-
-import java.io.IOException;
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-import java.nio.file.Files;
-import java.nio.file.Paths;
-import java.sql.SQLException;
-import java.util.ArrayList;
-import java.util.Properties;
-import java.util.concurrent.ExecutionException;
-import java.util.stream.Collectors;
-import java.util.stream.Stream;
-
-import static com.github.tomakehurst.wiremock.client.WireMock.aResponse;
-import static com.github.tomakehurst.wiremock.client.WireMock.get;
-import static com.github.tomakehurst.wiremock.client.WireMock.stubFor;
-import static com.github.tomakehurst.wiremock.client.WireMock.urlEqualTo;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.fail;
-
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.spy;
-import static org.mockito.Mockito.when;
-
-public class GrToolkitProviderTest {
-    GrToolkitProvider provider;
-    GrToolkitProvider providerSpy;
-    DataBroker dataBroker;
-    NotificationPublishService notificationProviderService;
-    RpcProviderRegistry rpcProviderRegistry;
-    DistributedDataStoreInterface configDatastore;
-    DbLibService dbLibService;
-    DBLibConnection connection;
-    Properties properties;
-
-    @Rule
-    public final EnvironmentVariables environmentVariables = new EnvironmentVariables();
-    @Rule
-    public WireMockRule wireMockRule = new WireMockRule(9999);
-
-    @Before
-    public void setup() {
-        environmentVariables.set("SDNC_CONFIG_DIR","src/test/resources");
-        dataBroker = mock(DataBroker.class);
-        notificationProviderService = mock(NotificationPublishService.class);
-        rpcProviderRegistry = mock(RpcProviderRegistry.class);
-        configDatastore = mock(DistributedDataStoreInterface.class);
-        dbLibService = mock(DbLibService.class);
-        connection = mock(DBLibConnection.class);
-
-        ActorUtils actorContext = mock(ActorUtils.class);
-        MemberName memberName = MemberName.forName("Test");
-
-        when(actorContext.getCurrentMemberName()).thenReturn(memberName);
-        when(configDatastore.getActorUtils()).thenReturn(actorContext);
-
-        try {
-            when(connection.isReadOnly()).thenReturn(false);
-            when(connection.isClosed()).thenReturn(false);
-            when(dbLibService.isActive()).thenReturn(true);
-            when(dbLibService.getConnection()).thenReturn(connection);
-        } catch(SQLException e) {
-            fail();
-        }
-
-        provider = new GrToolkitProvider(dataBroker, notificationProviderService,
-                rpcProviderRegistry, configDatastore, dbLibService);
-        providerSpy = spy(provider);
-        stubController();
-    }
-
-    @Test
-    public void closeTest() {
-        try {
-            provider.close();
-        } catch(Exception e) {
-            // Exception expected
-        }
-    }
-
-    @Test
-    public void onDataTreeChangedTest() {
-        provider.onDataTreeChanged(new ArrayList());
-        // onDataTreeChanged is an empty stub
-    }
-
-    private void stubController() {
-        String clusterBody = null;
-        String shardManagerBody = null;
-        String shardDefaultBody = null;
-        String shardOperationalBody = null;
-        try(Stream<String> stream = Files.lines(Paths.get("src/test/resources/three/cluster.json"))) {
-            clusterBody = stream.collect(Collectors.joining());
-        } catch(IOException e) {
-            fail();
-        }
-        try(Stream<String> stream = Files.lines(Paths.get("src/test/resources/three/shard-manager.json"))) {
-            shardManagerBody = stream.collect(Collectors.joining());
-        } catch(IOException e) {
-            fail();
-        }
-        try(Stream<String> stream = Files.lines(Paths.get("src/test/resources/three/default-config.json"))) {
-            shardDefaultBody = stream.collect(Collectors.joining());
-        } catch(IOException e) {
-            fail();
-        }
-        try(Stream<String> stream = Files.lines(Paths.get("src/test/resources/three/default-operational.json"))) {
-            shardOperationalBody = stream.collect(Collectors.joining());
-        } catch(IOException e) {
-            fail();
-        }
-
-        if(clusterBody == null || shardManagerBody == null || shardDefaultBody == null || shardOperationalBody == null) {
-            fail();
-        }
-        stubFor(get(urlEqualTo("/adm/healthcheck")).willReturn(aResponse().withStatus(200)));
-        stubFor(get(urlEqualTo("/jolokia/read/akka:type=Cluster")).willReturn(aResponse().withStatus(200).withBody(clusterBody)));
-        stubFor(get(urlEqualTo("/jolokia/read/org.opendaylight.controller:Category=ShardManager,name=shard-manager-config,type=DistributedConfigDatastore")).inScenario("testing").willReturn(aResponse().withStatus(200).withBody(shardManagerBody)).willSetStateTo("next"));
-        stubFor(get(urlEqualTo("/jolokia/read/org.opendaylight.controller:Category=Shards,name=member-1-shard-default-config,type=DistributedConfigDatastore")).inScenario("testing").willReturn(aResponse().withStatus(200).withBody(shardDefaultBody)).willSetStateTo("next"));
-        stubFor(get(urlEqualTo("/jolokia/read/org.opendaylight.controller:Category=Shards,name=member-1-shard-default-operational,type=DistributedOperationalDatastore")).willReturn(aResponse().withStatus(200).withBody(shardOperationalBody)));
-    }
-
-    @Test
-    public void clusterHealthTest() {
-        ListenableFuture<RpcResult<ClusterHealthOutput>> result = provider.clusterHealth(null);
-        try {
-            assertEquals("0", result.get().getResult().getStatus());
-        } catch(InterruptedException | ExecutionException e) {
-            fail();
-        }
-    }
-
-    @Test
-    public void siteHealthTest() {
-        ListenableFuture<RpcResult<SiteHealthOutput>> result = provider.siteHealth(null);
-        try {
-            assertEquals("200", result.get().getResult().getStatus());
-        } catch(InterruptedException | ExecutionException e) {
-            fail();
-        }
-    }
-
-    @Test
-    public void databaseHealthTest() {
-        ListenableFuture<RpcResult<DatabaseHealthOutput>> result = provider.databaseHealth(null);
-        try {
-            assertEquals("200", result.get().getResult().getStatus());
-        } catch(InterruptedException | ExecutionException e) {
-            fail();
-        }
-    }
-
-    @Test
-    public void databaseHealthWhenROTest() {
-        try {
-            when(connection.isReadOnly()).thenReturn(true);
-        } catch(SQLException e) {
-            fail();
-        }
-        ListenableFuture<RpcResult<DatabaseHealthOutput>> result = provider.databaseHealth(null);
-        try {
-            assertEquals("500", result.get().getResult().getStatus());
-        } catch(InterruptedException | ExecutionException e) {
-            fail();
-        }
-    }
-
-    @Test
-    public void databaseHealthWhenExceptionTest() {
-        try {
-            when(connection.isReadOnly()).thenThrow(new SQLException());
-        } catch(SQLException e) {
-            //expected
-        }
-        ListenableFuture<RpcResult<DatabaseHealthOutput>> result = provider.databaseHealth(null);
-        try {
-            assertEquals("500", result.get().getResult().getStatus());
-        } catch(InterruptedException | ExecutionException e) {
-            fail();
-        }
-    }
-
-    @Test
-    public void adminHealthTest() {
-        ListenableFuture<RpcResult<AdminHealthOutput>> result = provider.adminHealth(null);
-        try {
-            assertEquals("200", result.get().getResult().getStatus());
-        } catch(InterruptedException | ExecutionException e) {
-            fail();
-        }
-    }
-
-    @Test
-    public void siteIdentifierTest() {
-        ListenableFuture<RpcResult<SiteIdentifierOutput>> result = provider.siteIdentifier(null);
-        try {
-            assertEquals("200", result.get().getResult().getStatus());
-        } catch(InterruptedException | ExecutionException e) {
-            fail();
-        }
-    }
-
-    @Test
-    public void failoverTest() {
-        ListenableFuture<RpcResult<FailoverOutput>> result = provider.failover(null);
-        try {
-            assertEquals("400", result.get().getResult().getStatus());
-        } catch(InterruptedException | ExecutionException e) {
-            fail();
-        }
-    }
-
-    @Test
-    public void haltTrafficTest() {
-        HaltAkkaTrafficInputBuilder builder = new HaltAkkaTrafficInputBuilder();
-        builder.setNodeInfo(new ArrayList<>());
-        ListenableFuture<RpcResult<HaltAkkaTrafficOutput>> result = provider.haltAkkaTraffic(builder.build());
-        try {
-            assertEquals("200", result.get().getResult().getStatus());
-        } catch(InterruptedException | ExecutionException e) {
-            fail();
-        }
-    }
-
-    @Test
-    public void resumeTrafficTest() {
-        ResumeAkkaTrafficInputBuilder builder = new ResumeAkkaTrafficInputBuilder();
-        builder.setNodeInfo(new ArrayList<>());
-        ListenableFuture<RpcResult<ResumeAkkaTrafficOutput>> result = provider.resumeAkkaTraffic(builder.build());
-        try {
-            assertEquals("200", result.get().getResult().getStatus());
-        } catch(InterruptedException | ExecutionException e) {
-            fail();
-        }
-    }
-
-    @Test
-    public void executeCommandTest() {
-        try {
-            Method method = provider.getClass().getDeclaredMethod("executeCommand", String.class);
-            method.setAccessible(true);
-            method.invoke(provider, "ls");
-        } catch(NoSuchMethodException | IllegalAccessException | InvocationTargetException e) {
-            fail();
-        }
-    }
-
-    @Test
-    public void isolateSiteFromClusterTest() {
-        try {
-            ClusterActor actor = new ClusterActor();
-            actor.setNode("some-node");
-            actor.setAkkaPort("2550");
-            ArrayList<ClusterActor> activeList = new ArrayList<>();
-            activeList.add(actor);
-            ArrayList<ClusterActor> standbyList = new ArrayList<>();
-            standbyList.add(actor);
-            Method method = provider.getClass().getDeclaredMethod("isolateSiteFromCluster", ArrayList.class, ArrayList.class, String.class);
-            method.setAccessible(true);
-            method.invoke(provider, activeList, standbyList, "80");
-        } catch(NoSuchMethodException | IllegalAccessException | InvocationTargetException e) {
-            fail();
-        }
-    }
-
-    @Test
-    public void downUnreachableNodesTest() {
-        try {
-            ClusterActor actor = new ClusterActor();
-            actor.setNode("some-node");
-            actor.setAkkaPort("2550");
-            ArrayList<ClusterActor> activeList = new ArrayList<>();
-            activeList.add(actor);
-            ArrayList<ClusterActor> standbyList = new ArrayList<>();
-            standbyList.add(actor);
-            Method method = provider.getClass().getDeclaredMethod("downUnreachableNodes", ArrayList.class, ArrayList.class, String.class);
-            method.setAccessible(true);
-            method.invoke(provider, activeList, standbyList, "80");
-        } catch(NoSuchMethodException | IllegalAccessException | InvocationTargetException e) {
-            fail();
-        }
-    }
-
-    @Test
-    public void backupMdSalTest() {
-        try {
-            ClusterActor actor = new ClusterActor();
-            actor.setNode("some-Node");
-            actor.setAkkaPort("2550");
-            ArrayList<ClusterActor> activeList = new ArrayList<>();
-            activeList.add(actor);
-            Method method = provider.getClass().getDeclaredMethod("backupMdSal", ArrayList.class, String.class);
-            method.setAccessible(true);
-            method.invoke(provider, activeList, "80");
-        } catch(NoSuchMethodException | IllegalAccessException | InvocationTargetException e) {
-            fail();
-        }
-    }
-}
diff --git a/grToolkit/provider/src/test/java/org/onap/ccsdk/sli/plugins/grtoolkit/connection/ConnectionManagerTest.java b/grToolkit/provider/src/test/java/org/onap/ccsdk/sli/plugins/grtoolkit/connection/ConnectionManagerTest.java
deleted file mode 100644
index f749688d9..000000000
--- a/grToolkit/provider/src/test/java/org/onap/ccsdk/sli/plugins/grtoolkit/connection/ConnectionManagerTest.java
+++ /dev/null
@@ -1,65 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * openECOMP : SDN-C
- * ================================================================================
- * Copyright (C) 2019 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 org.onap.ccsdk.sli.plugins.grtoolkit.connection;
-
-import com.github.tomakehurst.wiremock.junit.WireMockRule;
-
-import org.junit.Rule;
-import org.junit.Test;
-
-import static org.junit.Assert.*;
-
-import static com.github.tomakehurst.wiremock.client.WireMock.*;
-
-public class ConnectionManagerTest {
-    @Rule
-    public WireMockRule wireMockRule = new WireMockRule(9999);
-
-    @Test
-    public void getConnectionResponseWithInput() throws Exception {
-        stubFor(post(urlEqualTo("/post"))
-                        .willReturn(aResponse().withStatus(200)));
-        ConnectionResponse response = ConnectionManager.getConnectionResponse("http://localhost:9999/post", ConnectionManager.HttpMethod.POST, "", "creds:creds");
-        assertNotNull(response);
-        assertEquals(200, response.statusCode);
-    }
-
-    @Test
-    public void getConnectionResponseWithCredentials() throws Exception {
-        stubFor(post(urlEqualTo("/post"))
-                        .willReturn(aResponse().withStatus(200)));
-        ConnectionResponse response = ConnectionManager.getConnectionResponse("http://localhost:9999/post", ConnectionManager.HttpMethod.POST, "", "creds:creds");
-        assertNotNull(response);
-        assertEquals(200, response.statusCode);
-    }
-
-    @Test
-    public void getConnectionResponse() throws Exception {
-        stubFor(get(urlEqualTo("/get"))
-                        .willReturn(aResponse().withStatus(200)
-                        .withBody("Multi\nLine\nResponse")));
-        ConnectionResponse response = ConnectionManager.getConnectionResponse("http://localhost:9999/get", ConnectionManager.HttpMethod.GET, null, null);
-        assertNotNull(response);
-        assertEquals(200, response.statusCode);
-        assertEquals("MultiLineResponse", response.content);
-    }
-}
\ No newline at end of file
diff --git a/grToolkit/provider/src/test/java/org/onap/ccsdk/sli/plugins/grtoolkit/connection/ConnectionResponseTest.java b/grToolkit/provider/src/test/java/org/onap/ccsdk/sli/plugins/grtoolkit/connection/ConnectionResponseTest.java
deleted file mode 100644
index a9f0edc30..000000000
--- a/grToolkit/provider/src/test/java/org/onap/ccsdk/sli/plugins/grtoolkit/connection/ConnectionResponseTest.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * openECOMP : SDN-C
- * ================================================================================
- * Copyright (C) 2019 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 org.onap.ccsdk.sli.plugins.grtoolkit.connection;
-
-import org.junit.Test;
-
-import static org.junit.Assert.*;
-
-public class ConnectionResponseTest {
-    @Test
-    public void constructorTest() {
-        ConnectionResponse response = new ConnectionResponse();
-        assertNotNull(response);
-        assertEquals(0, response.statusCode);
-        assertNull(response.content);
-        assertTrue(response.toString().length() > 0);
-    }
-    @Test
-    public void withStatusCode() {
-        ConnectionResponse response = new ConnectionResponse().withStatusCode(123);
-        assertEquals(123, response.statusCode);
-    }
-}
\ No newline at end of file
diff --git a/grToolkit/provider/src/test/java/org/onap/ccsdk/sli/plugins/grtoolkit/data/AdminHealthTest.java b/grToolkit/provider/src/test/java/org/onap/ccsdk/sli/plugins/grtoolkit/data/AdminHealthTest.java
deleted file mode 100644
index fa56a4d49..000000000
--- a/grToolkit/provider/src/test/java/org/onap/ccsdk/sli/plugins/grtoolkit/data/AdminHealthTest.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * openECOMP : SDN-C
- * ================================================================================
- * Copyright (C) 2019 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 org.onap.ccsdk.sli.plugins.grtoolkit.data;
-
-import org.junit.Test;
-
-import static org.junit.Assert.*;
-
-public class AdminHealthTest {
-    @Test
-    public void constructorTest() {
-        AdminHealth health = new AdminHealth(Health.HEALTHY);
-        assertEquals(Health.HEALTHY, health.getHealth());
-    }
-
-    @Test
-    public void constructor2Test() {
-        AdminHealth health = new AdminHealth(Health.FAULTY, 500);
-        assertEquals(Health.FAULTY, health.getHealth());
-        assertEquals(500, health.getStatusCode());
-    }
-
-    @Test
-    public void setHealth() {
-        AdminHealth health = new AdminHealth(Health.HEALTHY, 201);
-        assertEquals(Health.HEALTHY, health.getHealth());
-        assertEquals(201, health.getStatusCode());
-        health.setHealth(Health.FAULTY);
-        assertEquals(Health.FAULTY, health.getHealth());
-    }
-
-    @Test
-    public void setStatusCode() {
-        AdminHealth health = new AdminHealth(Health.HEALTHY, 200);
-        assertEquals(Health.HEALTHY, health.getHealth());
-        assertEquals(200, health.getStatusCode());
-        health.setStatusCode(409);
-        assertEquals(409, health.getStatusCode());
-    }
-}
\ No newline at end of file
diff --git a/grToolkit/provider/src/test/java/org/onap/ccsdk/sli/plugins/grtoolkit/data/ClusterHealthTest.java b/grToolkit/provider/src/test/java/org/onap/ccsdk/sli/plugins/grtoolkit/data/ClusterHealthTest.java
deleted file mode 100644
index 2e2ab3fd7..000000000
--- a/grToolkit/provider/src/test/java/org/onap/ccsdk/sli/plugins/grtoolkit/data/ClusterHealthTest.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * openECOMP : SDN-C
- * ================================================================================
- * Copyright (C) 2019 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 org.onap.ccsdk.sli.plugins.grtoolkit.data;
-
-import org.junit.Test;
-
-import static org.junit.Assert.*;
-
-public class ClusterHealthTest {
-    @Test
-    public void constructorTest() {
-        ClusterHealth health = new ClusterHealth();
-        assertEquals(Health.FAULTY, health.getHealth());
-    }
-
-    @Test
-    public void withHealth() {
-        ClusterHealth health = new ClusterHealth().withHealth(Health.HEALTHY);
-        assertEquals(Health.HEALTHY, health.getHealth());
-    }
-
-    @Test
-    public void setHealth() {
-        ClusterHealth health = new ClusterHealth();
-        health.setHealth(Health.HEALTHY);
-        assertEquals(Health.HEALTHY, health.getHealth());
-    }
-}
\ No newline at end of file
diff --git a/grToolkit/provider/src/test/java/org/onap/ccsdk/sli/plugins/grtoolkit/data/DatabaseHealthTest.java b/grToolkit/provider/src/test/java/org/onap/ccsdk/sli/plugins/grtoolkit/data/DatabaseHealthTest.java
deleted file mode 100644
index 05621a503..000000000
--- a/grToolkit/provider/src/test/java/org/onap/ccsdk/sli/plugins/grtoolkit/data/DatabaseHealthTest.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * openECOMP : SDN-C
- * ================================================================================
- * Copyright (C) 2019 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 org.onap.ccsdk.sli.plugins.grtoolkit.data;
-
-import org.junit.Test;
-
-import static org.junit.Assert.*;
-
-public class DatabaseHealthTest {
-    @Test
-    public void constructorTest() {
-        DatabaseHealth health = new DatabaseHealth(Health.FAULTY);
-        assertEquals(Health.FAULTY, health.getHealth());
-    }
-
-    @Test
-    public void setHealth() {
-        DatabaseHealth health = new DatabaseHealth(Health.FAULTY);
-        assertEquals(Health.FAULTY, health.getHealth());
-        health.setHealth(Health.HEALTHY);
-        assertEquals(Health.HEALTHY, health.getHealth());
-    }
-}
\ No newline at end of file
diff --git a/grToolkit/provider/src/test/java/org/onap/ccsdk/sli/plugins/grtoolkit/data/FailoverStatusTest.java b/grToolkit/provider/src/test/java/org/onap/ccsdk/sli/plugins/grtoolkit/data/FailoverStatusTest.java
deleted file mode 100644
index b5b3d00d2..000000000
--- a/grToolkit/provider/src/test/java/org/onap/ccsdk/sli/plugins/grtoolkit/data/FailoverStatusTest.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * openECOMP : SDN-C
- * ================================================================================
- * Copyright (C) 2019 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 org.onap.ccsdk.sli.plugins.grtoolkit.data;
-
-import org.junit.Test;
-
-import static org.junit.Assert.*;
-
-public class FailoverStatusTest {
-    @Test
-    public void constructorTest() {
-        FailoverStatus status = new FailoverStatus();
-        assertEquals(200, status.getStatusCode());
-        assertEquals("Failover complete.", status.getMessage());
-    }
-    @Test
-    public void withStatusCode() {
-        FailoverStatus status = new FailoverStatus().withStatusCode(500);
-        assertEquals(500, status.getStatusCode());
-    }
-
-    @Test
-    public void withMessage() {
-        FailoverStatus status = new FailoverStatus().withMessage("Test");
-        assertEquals("Test", status.getMessage());
-    }
-
-    @Test
-    public void setStatusCode() {
-        FailoverStatus status = new FailoverStatus();
-        status.setStatusCode(500);
-        assertEquals(500, status.getStatusCode());
-    }
-
-    @Test
-    public void setMessage() {
-        FailoverStatus status = new FailoverStatus();
-        status.setMessage("Test");
-        assertEquals("Test", status.getMessage());
-    }
-}
\ No newline at end of file
diff --git a/grToolkit/provider/src/test/java/org/onap/ccsdk/sli/plugins/grtoolkit/data/HealthTest.java b/grToolkit/provider/src/test/java/org/onap/ccsdk/sli/plugins/grtoolkit/data/HealthTest.java
deleted file mode 100644
index 1115d2084..000000000
--- a/grToolkit/provider/src/test/java/org/onap/ccsdk/sli/plugins/grtoolkit/data/HealthTest.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * openECOMP : SDN-C
- * ================================================================================
- * Copyright (C) 2019 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 org.onap.ccsdk.sli.plugins.grtoolkit.data;
-
-import org.junit.Test;
-
-import static org.junit.Assert.*;
-
-public class HealthTest {
-    @Test
-    public void getHealth() {
-        assertEquals("HEALTHY", Health.HEALTHY.getHealth());
-        assertEquals("FAULTY", Health.FAULTY.getHealth());
-    }
-}
\ No newline at end of file
diff --git a/grToolkit/provider/src/test/java/org/onap/ccsdk/sli/plugins/grtoolkit/data/MemberBuilderTest.java b/grToolkit/provider/src/test/java/org/onap/ccsdk/sli/plugins/grtoolkit/data/MemberBuilderTest.java
deleted file mode 100644
index 7ed0135a6..000000000
--- a/grToolkit/provider/src/test/java/org/onap/ccsdk/sli/plugins/grtoolkit/data/MemberBuilderTest.java
+++ /dev/null
@@ -1,62 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * openECOMP : SDN-C
- * ================================================================================
- * Copyright (C) 2018 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 org.onap.ccsdk.sli.plugins.grtoolkit.data;
-
-import org.junit.Before;
-import org.junit.Test;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-
-import static org.junit.Assert.*;
-
-public class MemberBuilderTest {
-    MemberBuilder builder;
-    ClusterActor actor;
-
-    @Before
-    public void setUp() {
-        actor = new ClusterActor();
-        actor.setUp(true);
-        actor.setVoting(true);
-    }
-
-    @Test
-    public void constructorTest() {
-        ArrayList<String> actorList = new ArrayList<>();
-        ArrayList<String> shardList = new ArrayList<>();
-        HashMap<String, Integer> commitMap = new HashMap<>();
-        actorList.add("Some-Actor");
-        shardList.add("Some-shard");
-        commitMap.put("Some-shard", 4);
-        commitMap.put("Some-other-shard", -4);
-        actor.setShardLeader(actorList);
-        actor.setReplicaShards(shardList);
-        actor.setNonReplicaShards(shardList);
-        actor.setCommits(commitMap);
-        assertNotNull(actor.toString());
-        assertEquals("", actor.getSite());
-        assertEquals(1, actor.getNonReplicaShards().size());
-        builder = new MemberBuilder(actor);
-        assertNotNull(builder.build());
-    }
-}
\ No newline at end of file
diff --git a/grToolkit/provider/src/test/java/org/onap/ccsdk/sli/plugins/grtoolkit/data/SiteHealthTest.java b/grToolkit/provider/src/test/java/org/onap/ccsdk/sli/plugins/grtoolkit/data/SiteHealthTest.java
deleted file mode 100644
index 7b74991e7..000000000
--- a/grToolkit/provider/src/test/java/org/onap/ccsdk/sli/plugins/grtoolkit/data/SiteHealthTest.java
+++ /dev/null
@@ -1,108 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * openECOMP : SDN-C
- * ================================================================================
- * Copyright (C) 2019 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 org.onap.ccsdk.sli.plugins.grtoolkit.data;
-
-import org.junit.Test;
-
-import static org.junit.Assert.*;
-
-public class SiteHealthTest {
-    @Test
-    public void constructorTest() {
-        SiteHealth health = new SiteHealth();
-        assertNotNull(health.getAdminHealth());
-        assertNotNull(health.getDatabaseHealth());
-        assertNotNull(health.getClusterHealth());
-        assertEquals(Health.FAULTY, health.getHealth());
-    }
-    @Test
-    public void withAdminHealth() {
-        SiteHealth health = new SiteHealth().withAdminHealth(new AdminHealth(Health.HEALTHY));
-        assertEquals(Health.HEALTHY, health.getAdminHealth().get(0).getHealth());
-    }
-
-    @Test
-    public void withDatabaseHealth() {
-        SiteHealth health = new SiteHealth().withDatabaseHealth(new DatabaseHealth(Health.HEALTHY));
-        assertEquals(Health.HEALTHY, health.getDatabaseHealth().get(0).getHealth());
-    }
-
-    @Test
-    public void withClusterHealth() {
-        SiteHealth health = new SiteHealth().withClusterHealth(new ClusterHealth());
-        assertEquals(Health.FAULTY, health.getClusterHealth().get(0).getHealth());
-    }
-
-    @Test
-    public void withId() {
-        SiteHealth health = new SiteHealth().withId("My_ID");
-        assertEquals("My_ID", health.getId());
-    }
-
-    @Test
-    public void withRole() {
-        SiteHealth health = new SiteHealth().withRole("My_role");
-        assertEquals("My_role", health.getRole());
-    }
-
-    @Test
-    public void setHealth() {
-        SiteHealth health = new SiteHealth();
-        health.setHealth(Health.HEALTHY);
-        assertEquals(Health.HEALTHY, health.getHealth());
-    }
-
-    @Test
-    public void setAdminHealth() {
-        SiteHealth health = new SiteHealth().withAdminHealth(new AdminHealth(Health.HEALTHY));
-        health.setAdminHealth(null);
-        assertNull(health.getAdminHealth());
-    }
-
-    @Test
-    public void setDatabaseHealth() {
-        SiteHealth health = new SiteHealth().withDatabaseHealth(new DatabaseHealth(Health.HEALTHY));
-        health.setDatabaseHealth(null);
-        assertNull(health.getDatabaseHealth());
-    }
-
-    @Test
-    public void setClusterHealth() {
-        SiteHealth health = new SiteHealth().withClusterHealth(new ClusterHealth());
-        health.setClusterHealth(null);
-        assertNull(health.getClusterHealth());
-    }
-
-    @Test
-    public void setId() {
-        SiteHealth health = new SiteHealth().withId("My_ID");
-        health.setId("My_new_ID");
-        assertEquals("My_new_ID", health.getId());
-    }
-
-    @Test
-    public void setRole() {
-        SiteHealth health = new SiteHealth().withRole("My_role");
-        health.setRole("My_new_role");
-        assertEquals("My_new_role", health.getRole());
-    }
-}
\ No newline at end of file
diff --git a/grToolkit/provider/src/test/java/org/onap/ccsdk/sli/plugins/grtoolkit/resolver/SingleNodeHealthResolverTest.java b/grToolkit/provider/src/test/java/org/onap/ccsdk/sli/plugins/grtoolkit/resolver/SingleNodeHealthResolverTest.java
deleted file mode 100644
index 2827b4055..000000000
--- a/grToolkit/provider/src/test/java/org/onap/ccsdk/sli/plugins/grtoolkit/resolver/SingleNodeHealthResolverTest.java
+++ /dev/null
@@ -1,235 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * openECOMP : SDN-C
- * ================================================================================
- * Copyright (C) 2019 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 org.onap.ccsdk.sli.plugins.grtoolkit.resolver;
-
-import com.github.tomakehurst.wiremock.junit.WireMockRule;
-
-import org.junit.Before;
-import org.junit.Rule;
-import org.junit.Test;
-
-import org.onap.ccsdk.sli.core.dblib.DBLibConnection;
-import org.onap.ccsdk.sli.core.dblib.DbLibService;
-import org.onap.ccsdk.sli.plugins.grtoolkit.data.AdminHealth;
-import org.onap.ccsdk.sli.plugins.grtoolkit.data.ClusterActor;
-import org.onap.ccsdk.sli.plugins.grtoolkit.data.ClusterHealth;
-import org.onap.ccsdk.sli.plugins.grtoolkit.data.DatabaseHealth;
-import org.onap.ccsdk.sli.plugins.grtoolkit.data.FailoverStatus;
-import org.onap.ccsdk.sli.plugins.grtoolkit.data.Health;
-import org.onap.ccsdk.sli.plugins.grtoolkit.data.SiteHealth;
-
-import java.io.FileInputStream;
-import java.io.IOException;
-import java.nio.file.Files;
-import java.nio.file.Paths;
-import java.sql.SQLException;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Properties;
-import java.util.stream.Collectors;
-import java.util.stream.Stream;
-
-import static com.github.tomakehurst.wiremock.client.WireMock.aResponse;
-import static com.github.tomakehurst.wiremock.client.WireMock.get;
-import static com.github.tomakehurst.wiremock.client.WireMock.stubFor;
-import static com.github.tomakehurst.wiremock.client.WireMock.urlEqualTo;
-
-import static org.junit.Assert.*;
-
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
-
-public class SingleNodeHealthResolverTest {
-    private Map<String, ClusterActor> memberMap;
-    private DbLibService dbLibService;
-    private DBLibConnection connection;
-    private SingleNodeHealthResolver resolver;
-
-    @Rule
-    public WireMockRule wireMockRule = new WireMockRule(9999);
-
-    @Before
-    public void setUp() {
-        memberMap = generateMemberMap(1);
-        Properties properties = new Properties();
-        try(FileInputStream fileInputStream = new FileInputStream("src/test/resources/single/gr-toolkit.properties")) {
-            properties.load(fileInputStream);
-        } catch(IOException e) {
-            fail();
-        }
-
-        dbLibService = mock(DbLibService.class);
-        connection = mock(DBLibConnection.class);
-        resolver = new SingleNodeHealthResolver(memberMap, properties, dbLibService);
-    }
-
-    private Map<String, ClusterActor> generateMemberMap(int memberCount) {
-        Map<String, ClusterActor> map = new HashMap<>();
-        ClusterActor actor;
-        for(int ndx = 0; ndx < memberCount; ndx++) {
-            actor = new ClusterActor();
-            actor.setNode("localhost");
-            actor.setAkkaPort("2550");
-            actor.setMember("member-" + (ndx + 1));
-            actor.setUp(true);
-            actor.setUnreachable(false);
-
-            map.put(actor.getNode(),  actor);
-        }
-        return map;
-    }
-
-    @Test
-    public void getAdminHealthFaulty() {
-        stubFor(get(urlEqualTo("/adm/healthcheck")).willReturn(aResponse().withStatus(500)));
-        AdminHealth health = resolver.getAdminHealth();
-        assertNotNull(health);
-        assertEquals(500, health.getStatusCode());
-        assertEquals(Health.FAULTY, health.getHealth());
-    }
-
-    @Test
-    public void getAdminHealthHealthy() {
-        stubFor(get(urlEqualTo("/adm/healthcheck")).willReturn(aResponse().withStatus(200)));
-        AdminHealth health = resolver.getAdminHealth();
-        assertNotNull(health);
-        assertEquals(200, health.getStatusCode());
-        assertEquals(Health.HEALTHY, health.getHealth());
-    }
-
-    @Test
-    public void getDatabaseHealth() {
-        try {
-            when(connection.isReadOnly()).thenReturn(false);
-            when(connection.isClosed()).thenReturn(false);
-            when(dbLibService.isActive()).thenReturn(true);
-            when(dbLibService.getConnection()).thenReturn(connection);
-        } catch(SQLException e) {
-            fail();
-        }
-        DatabaseHealth health = resolver.getDatabaseHealth();
-        assertEquals(Health.HEALTHY, health.getHealth());
-    }
-
-    @Test
-    public void getDatabaseHealthFaulty() {
-        try {
-            when(connection.isReadOnly()).thenReturn(true);
-            when(connection.isClosed()).thenReturn(true);
-            when(dbLibService.isActive()).thenReturn(false);
-            when(dbLibService.getConnection()).thenReturn(connection);
-        } catch(SQLException e) {
-            fail();
-        }
-        DatabaseHealth health = resolver.getDatabaseHealth();
-        assertEquals(Health.FAULTY, health.getHealth());
-    }
-
-    @Test
-    public void getDatabaseHealthException() {
-        try {
-            when(connection.isReadOnly()).thenThrow(new SQLException());
-            when(connection.isClosed()).thenReturn(true);
-            when(dbLibService.isActive()).thenReturn(false);
-            when(dbLibService.getConnection()).thenReturn(connection);
-        } catch(SQLException e) {
-            fail();
-        }
-        DatabaseHealth health = resolver.getDatabaseHealth();
-        assertEquals(Health.FAULTY, health.getHealth());
-    }
-
-    @Test
-    public void siteIdentifier() {
-        assertEquals("TestODL", resolver.getSiteIdentifier());
-        resolver.setSiteIdentifier("NewTestODL");
-        assertEquals("NewTestODL", resolver.getSiteIdentifier());
-    }
-
-    @Test
-    public void getClusterHealth() {
-        stubController();
-        ClusterHealth health = resolver.getClusterHealth();
-        assertEquals(Health.HEALTHY, health.getHealth());
-    }
-
-    private void stubController() {
-        String clusterBody = null;
-        String shardManagerBody = null;
-        String shardDefaultBody = null;
-        String shardOperationalBody = null;
-        try(Stream<String> stream = Files.lines(Paths.get("src/test/resources/single/cluster.json"))) {
-            clusterBody = stream.collect(Collectors.joining());
-        } catch(IOException e) {
-            fail();
-        }
-        try(Stream<String> stream = Files.lines(Paths.get("src/test/resources/single/shard-manager.json"))) {
-            shardManagerBody = stream.collect(Collectors.joining());
-        } catch(IOException e) {
-            fail();
-        }
-        try(Stream<String> stream = Files.lines(Paths.get("src/test/resources/single/default-config.json"))) {
-            shardDefaultBody = stream.collect(Collectors.joining());
-        } catch(IOException e) {
-            fail();
-        }
-        try(Stream<String> stream = Files.lines(Paths.get("src/test/resources/single/default-operational.json"))) {
-            shardOperationalBody = stream.collect(Collectors.joining());
-        } catch(IOException e) {
-            fail();
-        }
-
-        if(clusterBody == null || shardManagerBody == null || shardDefaultBody == null || shardOperationalBody == null) {
-            fail();
-        }
-        stubFor(get(urlEqualTo("/jolokia/read/akka:type=Cluster")).willReturn(aResponse().withStatus(200).withBody(clusterBody)));
-        stubFor(get(urlEqualTo("/jolokia/read/org.opendaylight.controller:Category=ShardManager,name=shard-manager-config,type=DistributedConfigDatastore")).willReturn(aResponse().withStatus(200).withBody(shardManagerBody)));
-        stubFor(get(urlEqualTo("/jolokia/read/org.opendaylight.controller:Category=Shards,name=member-1-shard-default-config,type=DistributedConfigDatastore")).willReturn(aResponse().withStatus(200).withBody(shardDefaultBody)));
-        stubFor(get(urlEqualTo("/jolokia/read/org.opendaylight.controller:Category=Shards,name=member-1-shard-default-operational,type=DistributedOperationalDatastore")).willReturn(aResponse().withStatus(200).withBody(shardOperationalBody)));
-    }
-
-    @Test
-    public void getSiteHealth() {
-        stubController();
-        stubFor(get(urlEqualTo("/adm/healthcheck")).willReturn(aResponse().withStatus(200)));
-        try {
-            when(connection.isReadOnly()).thenReturn(false);
-            when(connection.isClosed()).thenReturn(false);
-            when(dbLibService.isActive()).thenReturn(true);
-            when(dbLibService.getConnection()).thenReturn(connection);
-        } catch(SQLException e) {
-            fail();
-        }
-        List<SiteHealth> health = resolver.getSiteHealth();
-        assertNotNull(health);
-        assertNotEquals(0, health.size());
-        assertEquals(1, health.size());
-        assertEquals(Health.HEALTHY, health.get(0).getHealth());
-    }
-
-    @Test
-    public void tryFailover() {
-        FailoverStatus status = resolver.tryFailover(null);
-        assertEquals(400, status.getStatusCode());
-    }
-}
\ No newline at end of file
diff --git a/grToolkit/provider/src/test/java/org/onap/ccsdk/sli/plugins/grtoolkit/resolver/SixNodeHealthResolverTest.java b/grToolkit/provider/src/test/java/org/onap/ccsdk/sli/plugins/grtoolkit/resolver/SixNodeHealthResolverTest.java
deleted file mode 100644
index cbab450e1..000000000
--- a/grToolkit/provider/src/test/java/org/onap/ccsdk/sli/plugins/grtoolkit/resolver/SixNodeHealthResolverTest.java
+++ /dev/null
@@ -1,335 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * openECOMP : SDN-C
- * ================================================================================
- * Copyright (C) 2019 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 org.onap.ccsdk.sli.plugins.grtoolkit.resolver;
-
-import com.github.tomakehurst.wiremock.junit.WireMockRule;
-
-import org.junit.Before;
-import org.junit.Rule;
-import org.junit.Test;
-
-import org.onap.ccsdk.sli.core.dblib.DBLibConnection;
-import org.onap.ccsdk.sli.core.dblib.DbLibService;
-import org.onap.ccsdk.sli.plugins.grtoolkit.data.AdminHealth;
-import org.onap.ccsdk.sli.plugins.grtoolkit.data.ClusterActor;
-import org.onap.ccsdk.sli.plugins.grtoolkit.data.ClusterHealth;
-import org.onap.ccsdk.sli.plugins.grtoolkit.data.DatabaseHealth;
-import org.onap.ccsdk.sli.plugins.grtoolkit.data.FailoverStatus;
-import org.onap.ccsdk.sli.plugins.grtoolkit.data.Health;
-import org.onap.ccsdk.sli.plugins.grtoolkit.data.SiteHealth;
-
-import java.io.FileInputStream;
-import java.io.IOException;
-import java.nio.file.Files;
-import java.nio.file.Paths;
-import java.sql.SQLException;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Properties;
-import java.util.stream.Collectors;
-import java.util.stream.Stream;
-
-import static com.github.tomakehurst.wiremock.client.WireMock.aResponse;
-import static com.github.tomakehurst.wiremock.client.WireMock.get;
-import static com.github.tomakehurst.wiremock.client.WireMock.post;
-import static com.github.tomakehurst.wiremock.client.WireMock.stubFor;
-import static com.github.tomakehurst.wiremock.client.WireMock.urlEqualTo;
-
-import static org.junit.Assert.*;
-
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
-
-public class SixNodeHealthResolverTest {
-    private Map<String, ClusterActor> memberMap;
-    private DbLibService dbLibService;
-    private DBLibConnection connection;
-    private SixNodeHealthResolver resolver;
-
-    @Rule
-    public WireMockRule wireMockRule = new WireMockRule(9999);
-
-    @Before
-    public void setUp() {
-        memberMap = generateMemberMap(6);
-        Properties properties = new Properties();
-        try(FileInputStream fileInputStream = new FileInputStream("src/test/resources/six/gr-toolkit.properties")) {
-            properties.load(fileInputStream);
-        } catch(IOException e) {
-            fail();
-        }
-
-        dbLibService = mock(DbLibService.class);
-        connection = mock(DBLibConnection.class);
-        resolver = new SixNodeHealthResolver(memberMap, properties, dbLibService);
-    }
-
-    private Map<String, ClusterActor> generateMemberMap(int memberCount) {
-        Map<String, ClusterActor> map = new HashMap<>();
-        ClusterActor actor;
-        for(int ndx = 0; ndx < memberCount; ndx++) {
-            actor = new ClusterActor();
-            actor.setNode("127.0.1." + (ndx + 1));
-            actor.setAkkaPort("2550");
-            actor.setMember("member-" + (ndx + 1));
-            actor.setUp(true);
-            actor.setUnreachable(false);
-
-            map.put(actor.getNode(),  actor);
-        }
-        return map;
-    }
-
-    @Test
-    public void getAdminHealthFaulty() {
-        stubFor(get(urlEqualTo("/adm/healthcheck")).willReturn(aResponse().withStatus(500)));
-        AdminHealth health = resolver.getAdminHealth();
-        assertNotNull(health);
-        assertEquals(500, health.getStatusCode());
-        assertEquals(Health.FAULTY, health.getHealth());
-    }
-
-    @Test
-    public void getAdminHealthHealthy() {
-        stubFor(get(urlEqualTo("/adm/healthcheck")).willReturn(aResponse().withStatus(200)));
-        AdminHealth health = resolver.getAdminHealth();
-        assertNotNull(health);
-        assertEquals(200, health.getStatusCode());
-        assertEquals(Health.HEALTHY, health.getHealth());
-    }
-
-    @Test
-    public void getDatabaseHealth() {
-        try {
-            when(connection.isReadOnly()).thenReturn(false);
-            when(connection.isClosed()).thenReturn(false);
-            when(dbLibService.isActive()).thenReturn(true);
-            when(dbLibService.getConnection()).thenReturn(connection);
-        } catch(SQLException e) {
-            fail();
-        }
-        DatabaseHealth health = resolver.getDatabaseHealth();
-        assertEquals(Health.HEALTHY, health.getHealth());
-    }
-
-    @Test
-    public void getDatabaseHealthFaulty() {
-        try {
-            when(connection.isReadOnly()).thenReturn(true);
-            when(connection.isClosed()).thenReturn(true);
-            when(dbLibService.isActive()).thenReturn(false);
-            when(dbLibService.getConnection()).thenReturn(connection);
-        } catch(SQLException e) {
-            fail();
-        }
-        DatabaseHealth health = resolver.getDatabaseHealth();
-        assertEquals(Health.FAULTY, health.getHealth());
-    }
-
-    @Test
-    public void getDatabaseHealthException() {
-        try {
-            when(connection.isReadOnly()).thenThrow(new SQLException());
-            when(connection.isClosed()).thenReturn(true);
-            when(dbLibService.isActive()).thenReturn(false);
-            when(dbLibService.getConnection()).thenReturn(connection);
-        } catch(SQLException e) {
-            fail();
-        }
-        DatabaseHealth health = resolver.getDatabaseHealth();
-        assertEquals(Health.FAULTY, health.getHealth());
-    }
-
-    @Test
-    public void siteIdentifier() {
-        assertEquals("TestODL", resolver.getSiteIdentifier());
-        resolver.setSiteIdentifier("NewTestODL");
-        assertEquals("NewTestODL", resolver.getSiteIdentifier());
-    }
-
-    @Test
-    public void getClusterHealth() {
-        stubController();
-        ClusterHealth health = resolver.getClusterHealth();
-        assertEquals(Health.HEALTHY, health.getHealth());
-    }
-
-    private void stubController() {
-        String clusterBody = null;
-        String shardManagerBody = null;
-        String shardDefaultBody = null;
-        String shardOperationalBody = null;
-        String componentBody = null;
-        String identifierBody = null;
-        try(Stream<String> stream = Files.lines(Paths.get("src/test/resources/six/cluster.json"))) {
-            clusterBody = stream.collect(Collectors.joining());
-        } catch(IOException e) {
-            fail();
-        }
-        try(Stream<String> stream = Files.lines(Paths.get("src/test/resources/six/shard-manager.json"))) {
-            shardManagerBody = stream.collect(Collectors.joining());
-        } catch(IOException e) {
-            fail();
-        }
-        try(Stream<String> stream = Files.lines(Paths.get("src/test/resources/six/default-config.json"))) {
-            shardDefaultBody = stream.collect(Collectors.joining());
-        } catch(IOException e) {
-            fail();
-        }
-        try(Stream<String> stream = Files.lines(Paths.get("src/test/resources/six/default-operational.json"))) {
-            shardOperationalBody = stream.collect(Collectors.joining());
-        } catch(IOException e) {
-            fail();
-        }
-        try(Stream<String> stream = Files.lines(Paths.get("src/test/resources/six/component-health.json"))) {
-            componentBody = stream.collect(Collectors.joining());
-        } catch(IOException e) {
-            fail();
-        }
-        try(Stream<String> stream = Files.lines(Paths.get("src/test/resources/six/site-identifier.json"))) {
-            identifierBody = stream.collect(Collectors.joining());
-        } catch(IOException e) {
-            fail();
-        }
-
-        if(clusterBody == null || shardManagerBody == null || shardDefaultBody == null || shardOperationalBody == null
-            || componentBody == null || identifierBody == null) {
-            fail();
-        }
-        stubFor(get(urlEqualTo("/jolokia/read/akka:type=Cluster")).willReturn(aResponse().withStatus(200).withBody(clusterBody)));
-        stubFor(get(urlEqualTo("/jolokia/read/org.opendaylight.controller:Category=ShardManager,name=shard-manager-config,type=DistributedConfigDatastore")).inScenario("testing").willReturn(aResponse().withStatus(200).withBody(shardManagerBody)).willSetStateTo("next"));
-        stubFor(get(urlEqualTo("/jolokia/read/org.opendaylight.controller:Category=Shards,name=member-1-shard-default-config,type=DistributedConfigDatastore")).inScenario("testing").willReturn(aResponse().withStatus(200).withBody(shardDefaultBody)).willSetStateTo("next"));
-        stubFor(get(urlEqualTo("/jolokia/read/org.opendaylight.controller:Category=Shards,name=member-1-shard-default-operational,type=DistributedOperationalDatastore")).willReturn(aResponse().withStatus(200).withBody(shardOperationalBody)));
-        stubFor(post(urlEqualTo("/restconf/operations/gr-toolkit:site-identifier")).willReturn(aResponse().withStatus(200).withBody(identifierBody)));
-        stubFor(post(urlEqualTo("/restconf/operations/gr-toolkit:admin-health")).inScenario("testing").willReturn(aResponse().withStatus(200).withBody(componentBody)).willSetStateTo("next"));
-        stubFor(post(urlEqualTo("/restconf/operations/gr-toolkit:database-health")).willReturn(aResponse().withStatus(200).withBody(componentBody)));
-    }
-
-    @Test
-    public void getSiteHealth() {
-        stubController();
-        stubFor(get(urlEqualTo("/adm/healthcheck")).willReturn(aResponse().withStatus(200)));
-        try {
-            when(connection.isReadOnly()).thenReturn(false);
-            when(connection.isClosed()).thenReturn(false);
-            when(dbLibService.isActive()).thenReturn(true);
-            when(dbLibService.getConnection()).thenReturn(connection);
-        } catch(SQLException e) {
-            fail();
-        }
-        List<SiteHealth> health = resolver.getSiteHealth();
-        assertNotNull(health);
-        assertNotEquals(0, health.size());
-        assertEquals(2, health.size());
-        assertEquals(Health.HEALTHY, health.get(0).getHealth());
-    }
-
-    @Test
-    public void getSiteHealthFaulty() {
-        stubController();
-        stubFor(get(urlEqualTo("/adm/healthcheck")).willReturn(aResponse().withStatus(200)));
-        try {
-            when(connection.isReadOnly()).thenReturn(false);
-            when(connection.isClosed()).thenReturn(false);
-            when(dbLibService.isActive()).thenReturn(true);
-            when(dbLibService.getConnection()).thenReturn(connection);
-        } catch(SQLException e) {
-            fail();
-        }
-        stubFor(get(urlEqualTo("/jolokia/read/org.opendaylight.controller:Category=ShardManager,name=shard-manager-config,type=DistributedConfigDatastore")).inScenario("testing").whenScenarioStateIs("next").willReturn(aResponse().withBodyFile("nonexistent")));
-        List<SiteHealth> health = resolver.getSiteHealth();
-        assertNotNull(health);
-        assertNotEquals(0, health.size());
-        assertEquals(2, health.size());
-        assertEquals(Health.FAULTY, health.get(0).getHealth());
-    }
-
-    @Test
-    public void getSiteHealthFaultyShard() {
-        stubController();
-        stubFor(get(urlEqualTo("/adm/healthcheck")).willReturn(aResponse().withStatus(200)));
-        try {
-            when(connection.isReadOnly()).thenReturn(false);
-            when(connection.isClosed()).thenReturn(false);
-            when(dbLibService.isActive()).thenReturn(true);
-            when(dbLibService.getConnection()).thenReturn(connection);
-        } catch(SQLException e) {
-            fail();
-        }
-        stubFor(get(urlEqualTo("/jolokia/read/org.opendaylight.controller:Category=Shards,name=member-1-shard-default-config,type=DistributedConfigDatastore")).inScenario("testing").willReturn(aResponse().withBodyFile("nonexistent")).willSetStateTo("next"));
-        List<SiteHealth> health = resolver.getSiteHealth();
-        assertNotNull(health);
-        assertNotEquals(0, health.size());
-        assertEquals(2, health.size());
-        assertEquals(Health.FAULTY, health.get(0).getHealth());
-    }
-
-    @Test
-    public void getSiteHealthFaultyCluster() {
-        stubController();
-        stubFor(get(urlEqualTo("/adm/healthcheck")).willReturn(aResponse().withStatus(200)));
-        try {
-            when(connection.isReadOnly()).thenReturn(false);
-            when(connection.isClosed()).thenReturn(false);
-            when(dbLibService.isActive()).thenReturn(true);
-            when(dbLibService.getConnection()).thenReturn(connection);
-        } catch(SQLException e) {
-            fail();
-        }
-        stubFor(get(urlEqualTo("/jolokia/read/akka:type=Cluster")).willReturn(aResponse().withStatus(200).withBodyFile("nonexistent")));
-        List<SiteHealth> health = resolver.getSiteHealth();
-        assertNotNull(health);
-        assertNotEquals(0, health.size());
-        assertEquals(2, health.size());
-        assertEquals(Health.FAULTY, health.get(0).getHealth());
-    }
-
-    @Test
-    public void getSiteHealthFaultyAdmin() {
-        stubController();
-        stubFor(post(urlEqualTo("/restconf/operations/gr-toolkit:admin-health")).inScenario("testing").willReturn(aResponse().withBodyFile("nonexistent")).willSetStateTo("next"));
-        stubFor(get(urlEqualTo("/restconf/operations/gr-toolkit:admin-health")).inScenario("testing").whenScenarioStateIs("next").willReturn(aResponse().withBodyFile("nonexistent")));
-        try {
-            when(connection.isReadOnly()).thenReturn(false);
-            when(connection.isClosed()).thenReturn(false);
-            when(dbLibService.isActive()).thenReturn(true);
-            when(dbLibService.getConnection()).thenReturn(connection);
-        } catch(SQLException e) {
-            fail();
-        }
-        List<SiteHealth> health = resolver.getSiteHealth();
-        assertNotNull(health);
-        assertNotEquals(0, health.size());
-        assertEquals(2, health.size());
-        assertEquals(Health.FAULTY, health.get(0).getHealth());
-        assertEquals(Health.FAULTY, health.get(1).getHealth());
-    }
-
-    @Test
-    public void tryFailover() {
-        stubController();
-        stubFor(get(urlEqualTo("/restconf/operations/cluster-admin:change-member-voting-states-for-all-shards")).willReturn(aResponse().withStatus(200)));
-        FailoverStatus status = resolver.tryFailover(null);
-        assertEquals(500, status.getStatusCode());
-    }
-}
\ No newline at end of file
diff --git a/grToolkit/provider/src/test/java/org/onap/ccsdk/sli/plugins/grtoolkit/resolver/ThreeNodeHealthResolverTest.java b/grToolkit/provider/src/test/java/org/onap/ccsdk/sli/plugins/grtoolkit/resolver/ThreeNodeHealthResolverTest.java
deleted file mode 100644
index 4ea07be43..000000000
--- a/grToolkit/provider/src/test/java/org/onap/ccsdk/sli/plugins/grtoolkit/resolver/ThreeNodeHealthResolverTest.java
+++ /dev/null
@@ -1,314 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * openECOMP : SDN-C
- * ================================================================================
- * Copyright (C) 2019 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 org.onap.ccsdk.sli.plugins.grtoolkit.resolver;
-
-import com.github.tomakehurst.wiremock.junit.WireMockRule;
-
-import org.junit.Before;
-import org.junit.Rule;
-import org.junit.Test;
-
-import org.onap.ccsdk.sli.core.dblib.DBLibConnection;
-import org.onap.ccsdk.sli.core.dblib.DbLibService;
-import org.onap.ccsdk.sli.plugins.grtoolkit.data.AdminHealth;
-import org.onap.ccsdk.sli.plugins.grtoolkit.data.ClusterActor;
-import org.onap.ccsdk.sli.plugins.grtoolkit.data.ClusterHealth;
-import org.onap.ccsdk.sli.plugins.grtoolkit.data.DatabaseHealth;
-import org.onap.ccsdk.sli.plugins.grtoolkit.data.FailoverStatus;
-import org.onap.ccsdk.sli.plugins.grtoolkit.data.Health;
-import org.onap.ccsdk.sli.plugins.grtoolkit.data.SiteHealth;
-
-import java.io.FileInputStream;
-import java.io.IOException;
-import java.nio.file.Files;
-import java.nio.file.Paths;
-import java.sql.SQLException;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Properties;
-import java.util.stream.Collectors;
-import java.util.stream.Stream;
-
-import static com.github.tomakehurst.wiremock.client.WireMock.aResponse;
-import static com.github.tomakehurst.wiremock.client.WireMock.get;
-import static com.github.tomakehurst.wiremock.client.WireMock.stubFor;
-import static com.github.tomakehurst.wiremock.client.WireMock.urlEqualTo;
-
-import static org.junit.Assert.*;
-
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
-
-public class ThreeNodeHealthResolverTest {
-    private Map<String, ClusterActor> memberMap;
-    private DbLibService dbLibService;
-    private DBLibConnection connection;
-    private ThreeNodeHealthResolver resolver;
-
-    @Rule
-    public WireMockRule wireMockRule = new WireMockRule(9999);
-
-    @Before
-    public void setUp() {
-        memberMap = generateMemberMap(3);
-        Properties properties = new Properties();
-        try(FileInputStream fileInputStream = new FileInputStream("src/test/resources/three/gr-toolkit.properties")) {
-            properties.load(fileInputStream);
-        } catch(IOException e) {
-            fail();
-        }
-
-        dbLibService = mock(DbLibService.class);
-        connection = mock(DBLibConnection.class);
-        resolver = new ThreeNodeHealthResolver(memberMap, properties, dbLibService);
-    }
-
-    private Map<String, ClusterActor> generateMemberMap(int memberCount) {
-        Map<String, ClusterActor> map = new HashMap<>();
-        ClusterActor actor;
-        for(int ndx = 0; ndx < memberCount; ndx++) {
-            actor = new ClusterActor();
-            actor.setNode("127.0.1." + (ndx + 1));
-            actor.setAkkaPort("2550");
-            actor.setMember("member-" + (ndx + 1));
-            actor.setUp(true);
-            actor.setUnreachable(false);
-
-            map.put(actor.getNode(),  actor);
-        }
-        return map;
-    }
-
-    @Test
-    public void getAdminHealthFaulty() {
-        stubFor(get(urlEqualTo("/adm/healthcheck")).willReturn(aResponse().withStatus(500)));
-        AdminHealth health = resolver.getAdminHealth();
-        assertNotNull(health);
-        assertEquals(500, health.getStatusCode());
-        assertEquals(Health.FAULTY, health.getHealth());
-    }
-
-    @Test
-    public void getAdminHealthHealthy() {
-        stubFor(get(urlEqualTo("/adm/healthcheck")).willReturn(aResponse().withStatus(200)));
-        AdminHealth health = resolver.getAdminHealth();
-        assertNotNull(health);
-        assertEquals(200, health.getStatusCode());
-        assertEquals(Health.HEALTHY, health.getHealth());
-    }
-
-    @Test
-    public void getDatabaseHealth() {
-        try {
-            when(connection.isReadOnly()).thenReturn(false);
-            when(connection.isClosed()).thenReturn(false);
-            when(dbLibService.isActive()).thenReturn(true);
-            when(dbLibService.getConnection()).thenReturn(connection);
-        } catch(SQLException e) {
-            fail();
-        }
-        DatabaseHealth health = resolver.getDatabaseHealth();
-        assertEquals(Health.HEALTHY, health.getHealth());
-    }
-
-    @Test
-    public void getDatabaseHealthFaulty() {
-        try {
-            when(connection.isReadOnly()).thenReturn(true);
-            when(connection.isClosed()).thenReturn(true);
-            when(dbLibService.isActive()).thenReturn(false);
-            when(dbLibService.getConnection()).thenReturn(connection);
-        } catch(SQLException e) {
-            fail();
-        }
-        DatabaseHealth health = resolver.getDatabaseHealth();
-        assertEquals(Health.FAULTY, health.getHealth());
-    }
-
-    @Test
-    public void getDatabaseHealthException() {
-        try {
-            when(connection.isReadOnly()).thenThrow(new SQLException());
-            when(connection.isClosed()).thenReturn(true);
-            when(dbLibService.isActive()).thenReturn(false);
-            when(dbLibService.getConnection()).thenReturn(connection);
-        } catch(SQLException e) {
-            fail();
-        }
-        DatabaseHealth health = resolver.getDatabaseHealth();
-        assertEquals(Health.FAULTY, health.getHealth());
-    }
-
-    @Test
-    public void siteIdentifier() {
-        assertEquals("TestODL", resolver.getSiteIdentifier());
-        resolver.setSiteIdentifier("NewTestODL");
-        assertEquals("NewTestODL", resolver.getSiteIdentifier());
-    }
-
-    @Test
-    public void getClusterHealth() {
-        stubController();
-        ClusterHealth health = resolver.getClusterHealth();
-        assertEquals(Health.HEALTHY, health.getHealth());
-    }
-
-    private void stubController() {
-        String clusterBody = null;
-        String shardManagerBody = null;
-        String shardDefaultBody = null;
-        String shardOperationalBody = null;
-        try(Stream<String> stream = Files.lines(Paths.get("src/test/resources/three/cluster.json"))) {
-            clusterBody = stream.collect(Collectors.joining());
-        } catch(IOException e) {
-            fail();
-        }
-        try(Stream<String> stream = Files.lines(Paths.get("src/test/resources/three/shard-manager.json"))) {
-            shardManagerBody = stream.collect(Collectors.joining());
-        } catch(IOException e) {
-            fail();
-        }
-        try(Stream<String> stream = Files.lines(Paths.get("src/test/resources/three/default-config.json"))) {
-            shardDefaultBody = stream.collect(Collectors.joining());
-        } catch(IOException e) {
-            fail();
-        }
-        try(Stream<String> stream = Files.lines(Paths.get("src/test/resources/three/default-operational.json"))) {
-            shardOperationalBody = stream.collect(Collectors.joining());
-        } catch(IOException e) {
-            fail();
-        }
-
-        if(clusterBody == null || shardManagerBody == null || shardDefaultBody == null || shardOperationalBody == null) {
-            fail();
-        }
-        stubFor(get(urlEqualTo("/jolokia/read/akka:type=Cluster")).willReturn(aResponse().withStatus(200).withBody(clusterBody)));
-        stubFor(get(urlEqualTo("/jolokia/read/org.opendaylight.controller:Category=ShardManager,name=shard-manager-config,type=DistributedConfigDatastore")).inScenario("testing").willReturn(aResponse().withStatus(200).withBody(shardManagerBody)).willSetStateTo("next"));
-        stubFor(get(urlEqualTo("/jolokia/read/org.opendaylight.controller:Category=Shards,name=member-1-shard-default-config,type=DistributedConfigDatastore")).inScenario("testing").willReturn(aResponse().withStatus(200).withBody(shardDefaultBody)).willSetStateTo("next"));
-        stubFor(get(urlEqualTo("/jolokia/read/org.opendaylight.controller:Category=Shards,name=member-1-shard-default-operational,type=DistributedOperationalDatastore")).willReturn(aResponse().withStatus(200).withBody(shardOperationalBody)));
-    }
-
-    @Test
-    public void getSiteHealth() {
-        stubController();
-        stubFor(get(urlEqualTo("/adm/healthcheck")).willReturn(aResponse().withStatus(200)));
-        try {
-            when(connection.isReadOnly()).thenReturn(false);
-            when(connection.isClosed()).thenReturn(false);
-            when(dbLibService.isActive()).thenReturn(true);
-            when(dbLibService.getConnection()).thenReturn(connection);
-        } catch(SQLException e) {
-            fail();
-        }
-        List<SiteHealth> health = resolver.getSiteHealth();
-        assertNotNull(health);
-        assertNotEquals(0, health.size());
-        assertEquals(1, health.size());
-        assertEquals(Health.HEALTHY, health.get(0).getHealth());
-    }
-
-    @Test
-    public void getSiteHealthFaulty() {
-        stubController();
-        stubFor(get(urlEqualTo("/adm/healthcheck")).willReturn(aResponse().withStatus(200)));
-        try {
-            when(connection.isReadOnly()).thenReturn(false);
-            when(connection.isClosed()).thenReturn(false);
-            when(dbLibService.isActive()).thenReturn(true);
-            when(dbLibService.getConnection()).thenReturn(connection);
-        } catch(SQLException e) {
-            fail();
-        }
-        stubFor(get(urlEqualTo("/jolokia/read/org.opendaylight.controller:Category=ShardManager,name=shard-manager-config,type=DistributedConfigDatastore")).inScenario("testing").whenScenarioStateIs("next").willReturn(aResponse().withBodyFile("nonexistent")));
-        List<SiteHealth> health = resolver.getSiteHealth();
-        assertNotNull(health);
-        assertNotEquals(0, health.size());
-        assertEquals(1, health.size());
-        assertEquals(Health.FAULTY, health.get(0).getHealth());
-    }
-
-    @Test
-    public void getSiteHealthFaultyShard() {
-        stubController();
-        stubFor(get(urlEqualTo("/adm/healthcheck")).willReturn(aResponse().withStatus(200)));
-        try {
-            when(connection.isReadOnly()).thenReturn(false);
-            when(connection.isClosed()).thenReturn(false);
-            when(dbLibService.isActive()).thenReturn(true);
-            when(dbLibService.getConnection()).thenReturn(connection);
-        } catch(SQLException e) {
-            fail();
-        }
-        stubFor(get(urlEqualTo("/jolokia/read/org.opendaylight.controller:Category=Shards,name=member-1-shard-default-config,type=DistributedConfigDatastore")).inScenario("testing").willReturn(aResponse().withBodyFile("nonexistent")).willSetStateTo("next"));
-        List<SiteHealth> health = resolver.getSiteHealth();
-        assertNotNull(health);
-        assertNotEquals(0, health.size());
-        assertEquals(1, health.size());
-        assertEquals(Health.HEALTHY, health.get(0).getHealth());
-    }
-
-    @Test
-    public void getSiteHealthFaultyCluster() {
-        stubController();
-        stubFor(get(urlEqualTo("/adm/healthcheck")).willReturn(aResponse().withStatus(200)));
-        try {
-            when(connection.isReadOnly()).thenReturn(false);
-            when(connection.isClosed()).thenReturn(false);
-            when(dbLibService.isActive()).thenReturn(true);
-            when(dbLibService.getConnection()).thenReturn(connection);
-        } catch(SQLException e) {
-            fail();
-        }
-        stubFor(get(urlEqualTo("/jolokia/read/akka:type=Cluster")).willReturn(aResponse().withStatus(200).withBodyFile("nonexistent")));
-        List<SiteHealth> health = resolver.getSiteHealth();
-        assertNotNull(health);
-        assertNotEquals(0, health.size());
-        assertEquals(1, health.size());
-        assertEquals(Health.FAULTY, health.get(0).getHealth());
-    }
-
-    @Test
-    public void getSiteHealthFaultyAdmin() {
-        stubController();
-        stubFor(get(urlEqualTo("/adm/healthcheck")).willReturn(aResponse().withStatus(400)));
-        try {
-            when(connection.isReadOnly()).thenReturn(false);
-            when(connection.isClosed()).thenReturn(false);
-            when(dbLibService.isActive()).thenReturn(true);
-            when(dbLibService.getConnection()).thenReturn(connection);
-        } catch(SQLException e) {
-            fail();
-        }
-        List<SiteHealth> health = resolver.getSiteHealth();
-        assertNotNull(health);
-        assertNotEquals(0, health.size());
-        assertEquals(1, health.size());
-        assertEquals(Health.FAULTY, health.get(0).getHealth());
-    }
-
-    @Test
-    public void tryFailover() {
-        FailoverStatus status = resolver.tryFailover(null);
-        assertEquals(400, status.getStatusCode());
-    }
-}
\ No newline at end of file
diff --git a/grToolkit/provider/src/test/resources/akka.conf b/grToolkit/provider/src/test/resources/akka.conf
deleted file mode 100644
index ce46748ec..000000000
--- a/grToolkit/provider/src/test/resources/akka.conf
+++ /dev/null
@@ -1,67 +0,0 @@
-# ============LICENSE_START=======================================================
-# openECOMP : SDN-C
-# ================================================================================
-# Copyright (C) 2019 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=========================================================
-
-odl-cluster-data {
-  akka {
-    remote {
-      artery {
-        enabled = off
-        canonical.hostname = "127.0.0.1"
-        canonical.port = 2550
-      }
-      netty.tcp {
-        hostname = "127.0.0.1"
-        port = 2550
-      }
-      # when under load we might trip a false positive on the failure detector
-      # transport-failure-detector {
-        # heartbeat-interval = 4 s
-        # acceptable-heartbeat-pause = 16s
-      # }
-    }
-
-    cluster {
-      # Remove ".tcp" when using artery.
-      seed-nodes = ["akka.tcp://opendaylight-cluster-data@127.0.1.1:2550"]
-
-      roles = [
-        "member-1"
-      ]
-
-    }
-
-    persistence {
-      # By default the snapshots/journal directories live in KARAF_HOME. You can choose to put it somewhere else by
-      # modifying the following two properties. The directory location specified may be a relative or absolute path.
-      # The relative path is always relative to KARAF_HOME.
-
-      # snapshot-store.local.dir = "target/snapshots"
-      # journal.leveldb.dir = "target/journal"
-
-      journal {
-        leveldb {
-          # Set native = off to use a Java-only implementation of leveldb.
-          # Note that the Java-only version is not currently considered by Akka to be production quality.
-
-          # native = off
-        }
-      }
-    }
-  }
-}
diff --git a/grToolkit/provider/src/test/resources/gr-toolkit.properties b/grToolkit/provider/src/test/resources/gr-toolkit.properties
deleted file mode 100755
index 52b19bf51..000000000
--- a/grToolkit/provider/src/test/resources/gr-toolkit.properties
+++ /dev/null
@@ -1,35 +0,0 @@
-# ============LICENSE_START=======================================================
-# openECOMP : SDN-C
-# ================================================================================
-# Copyright (C) 2019 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=========================================================
-
-resolver=org.onap.ccsdk.sli.plugins.grtoolkit.resolver.SingleNodeHealthResolver
-akka.conf.location=src/test/resources/akka.conf
-adm.useSsl=false
-adm.fqdn=localhost
-adm.healthcheck=/adm/healthcheck
-adm.port.http=9999
-adm.port.ssl=19999
-controller.credentials=admin:admin
-controller.useSsl=false
-controller.port.http=9999
-controller.port.ssl=19999
-controller.port.akka=2550
-mbean.cluster=/jolokia/read/akka:type=Cluster
-mbean.shardManager=/jolokia/read/org.opendaylight.controller:Category=ShardManager,name=shard-manager-config,type=DistributedConfigDatastore
-mbean.shard.config=/jolokia/read/org.opendaylight.controller:Category=Shards,name=%s,type=DistributedConfigDatastore
-#site.identifier=TestODL
diff --git a/grToolkit/provider/src/test/resources/single/akka.conf b/grToolkit/provider/src/test/resources/single/akka.conf
deleted file mode 100644
index ce46748ec..000000000
--- a/grToolkit/provider/src/test/resources/single/akka.conf
+++ /dev/null
@@ -1,67 +0,0 @@
-# ============LICENSE_START=======================================================
-# openECOMP : SDN-C
-# ================================================================================
-# Copyright (C) 2019 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=========================================================
-
-odl-cluster-data {
-  akka {
-    remote {
-      artery {
-        enabled = off
-        canonical.hostname = "127.0.0.1"
-        canonical.port = 2550
-      }
-      netty.tcp {
-        hostname = "127.0.0.1"
-        port = 2550
-      }
-      # when under load we might trip a false positive on the failure detector
-      # transport-failure-detector {
-        # heartbeat-interval = 4 s
-        # acceptable-heartbeat-pause = 16s
-      # }
-    }
-
-    cluster {
-      # Remove ".tcp" when using artery.
-      seed-nodes = ["akka.tcp://opendaylight-cluster-data@127.0.1.1:2550"]
-
-      roles = [
-        "member-1"
-      ]
-
-    }
-
-    persistence {
-      # By default the snapshots/journal directories live in KARAF_HOME. You can choose to put it somewhere else by
-      # modifying the following two properties. The directory location specified may be a relative or absolute path.
-      # The relative path is always relative to KARAF_HOME.
-
-      # snapshot-store.local.dir = "target/snapshots"
-      # journal.leveldb.dir = "target/journal"
-
-      journal {
-        leveldb {
-          # Set native = off to use a Java-only implementation of leveldb.
-          # Note that the Java-only version is not currently considered by Akka to be production quality.
-
-          # native = off
-        }
-      }
-    }
-  }
-}
diff --git a/grToolkit/provider/src/test/resources/single/cluster.json b/grToolkit/provider/src/test/resources/single/cluster.json
deleted file mode 100644
index 93360845f..000000000
--- a/grToolkit/provider/src/test/resources/single/cluster.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-  "request": {
-    "mbean": "akka:type=Cluster",
-    "type": "read"
-  },
-  "value": {
-    "Leader": "akka.tcp://opendaylight-cluster-data@localhost:2550",
-    "Unreachable": "",
-    "Singleton": true,
-    "Available": true,
-    "MemberStatus": "Up",
-    "ClusterStatus": "{\n  \"members\": [\n    {\n      \"address\": \"akka.tcp://opendaylight-cluster-data@localhost:2550\",\n      \"roles\": [\n        \"dc-default\",\n        \"member-1\"\n      ],\n      \"status\": \"Up\"\n    }\n  ],\n  \"self-address\": \"akka.tcp://opendaylight-cluster-data@localhost:2550\",\n  \"unreachable\": []\n}\n",
-    "Members": "akka.tcp://opendaylight-cluster-data@localhost:2550"
-  },
-  "timestamp": 1575393881,
-  "status": 200
-}
diff --git a/grToolkit/provider/src/test/resources/single/default-config.json b/grToolkit/provider/src/test/resources/single/default-config.json
deleted file mode 100644
index d75998e5d..000000000
--- a/grToolkit/provider/src/test/resources/single/default-config.json
+++ /dev/null
@@ -1,46 +0,0 @@
-{
-  "request": {
-    "mbean": "org.opendaylight.controller:Category=Shards,name=member-1-shard-default-config,type=DistributedConfigDatastore",
-    "type": "read"
-  },
-  "value": {
-    "ReadWriteTransactionCount": 0,
-    "SnapshotIndex": 22,
-    "InMemoryJournalLogSize": 1,
-    "ReplicatedToAllIndex": -1,
-    "Leader": "member-1-shard-default-config",
-    "LastIndex": 23,
-    "RaftState": "Leader",
-    "LastCommittedTransactionTime": "2019-12-03 16:36:39.413",
-    "LastApplied": 23,
-    "PeerAddresses": "",
-    "LastLogIndex": 23,
-    "LastLeadershipChangeTime": "2019-12-03 16:36:33.460",
-    "WriteOnlyTransactionCount": 0,
-    "FollowerInitialSyncStatus": false,
-    "FollowerInfo": [],
-    "FailedReadTransactionsCount": 0,
-    "Voting": true,
-    "StatRetrievalTime": "454.8 μs",
-    "CurrentTerm": 4,
-    "LastTerm": 4,
-    "FailedTransactionsCount": 0,
-    "PendingTxCommitQueueSize": 0,
-    "VotedFor": "member-1-shard-default-config",
-    "SnapshotCaptureInitiated": false,
-    "CommittedTransactionsCount": 5,
-    "TxCohortCacheSize": 0,
-    "PeerVotingStates": "",
-    "LastLogTerm": 4,
-    "StatRetrievalError": null,
-    "CommitIndex": 23,
-    "SnapshotTerm": 4,
-    "AbortTransactionsCount": 0,
-    "ReadOnlyTransactionCount": 0,
-    "ShardName": "member-1-shard-default-config",
-    "LeadershipChangeCount": 1,
-    "InMemoryJournalDataSize": 37
-  },
-  "timestamp": 1575393787,
-  "status": 200
-}
\ No newline at end of file
diff --git a/grToolkit/provider/src/test/resources/single/default-operational.json b/grToolkit/provider/src/test/resources/single/default-operational.json
deleted file mode 100644
index 88a5d2c96..000000000
--- a/grToolkit/provider/src/test/resources/single/default-operational.json
+++ /dev/null
@@ -1,46 +0,0 @@
-{
-  "request": {
-    "mbean": "org.opendaylight.controller:Category=Shards,name=member-1-shard-default-operational,type=DistributedOperationalDatastore",
-    "type": "read"
-  },
-  "value": {
-    "ReadWriteTransactionCount": 0,
-    "SnapshotIndex": 22,
-    "InMemoryJournalLogSize": 1,
-    "ReplicatedToAllIndex": -1,
-    "Leader": "member-1-shard-default-operational",
-    "LastIndex": 23,
-    "RaftState": "Leader",
-    "LastCommittedTransactionTime": "2019-12-03 16:36:39.413",
-    "LastApplied": 23,
-    "PeerAddresses": "",
-    "LastLogIndex": 23,
-    "LastLeadershipChangeTime": "2019-12-03 16:36:33.460",
-    "WriteOnlyTransactionCount": 0,
-    "FollowerInitialSyncStatus": false,
-    "FollowerInfo": [],
-    "FailedReadTransactionsCount": 0,
-    "Voting": true,
-    "StatRetrievalTime": "454.8 μs",
-    "CurrentTerm": 4,
-    "LastTerm": 4,
-    "FailedTransactionsCount": 0,
-    "PendingTxCommitQueueSize": 0,
-    "VotedFor": "member-1-shard-default-operational",
-    "SnapshotCaptureInitiated": false,
-    "CommittedTransactionsCount": 5,
-    "TxCohortCacheSize": 0,
-    "PeerVotingStates": "",
-    "LastLogTerm": 4,
-    "StatRetrievalError": null,
-    "CommitIndex": 23,
-    "SnapshotTerm": 4,
-    "AbortTransactionsCount": 0,
-    "ReadOnlyTransactionCount": 0,
-    "ShardName": "member-1-shard-default-operational",
-    "LeadershipChangeCount": 1,
-    "InMemoryJournalDataSize": 37
-  },
-  "timestamp": 1575393787,
-  "status": 200
-}
\ No newline at end of file
diff --git a/grToolkit/provider/src/test/resources/single/gr-toolkit.properties b/grToolkit/provider/src/test/resources/single/gr-toolkit.properties
deleted file mode 100755
index cc7820e90..000000000
--- a/grToolkit/provider/src/test/resources/single/gr-toolkit.properties
+++ /dev/null
@@ -1,34 +0,0 @@
-# ============LICENSE_START=======================================================
-# openECOMP : SDN-C
-# ================================================================================
-# Copyright (C) 2019 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=========================================================
-
-akka.conf.location=src/test/resources/single/akka.conf
-adm.useSsl=false
-adm.fqdn=localhost
-adm.healthcheck=/adm/healthcheck
-adm.port.http=9999
-adm.port.ssl=19999
-controller.credentials=admin:admin
-controller.useSsl=false
-controller.port.http=9999
-controller.port.ssl=19999
-controller.port.akka=2550
-mbean.cluster=/jolokia/read/akka:type=Cluster
-mbean.shardManager=/jolokia/read/org.opendaylight.controller:Category=ShardManager,name=shard-manager-config,type=DistributedConfigDatastore
-mbean.shard.config=/jolokia/read/org.opendaylight.controller:Category=Shards,name=%s,type=DistributedConfigDatastore
-site.identifier=TestODL
diff --git a/grToolkit/provider/src/test/resources/single/shard-manager.json b/grToolkit/provider/src/test/resources/single/shard-manager.json
deleted file mode 100644
index 301184ef8..000000000
--- a/grToolkit/provider/src/test/resources/single/shard-manager.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "request": {
-    "mbean": "org.opendaylight.controller:Category=ShardManager,name=shard-manager-config,type=DistributedConfigDatastore",
-    "type": "read"
-  },
-  "value": {
-    "LocalShards": [
-      "member-1-shard-default-config"
-    ],
-    "SyncStatus": true,
-    "MemberName": "member-1"
-  },
-  "timestamp": 1575393918,
-  "status": 200
-}
\ No newline at end of file
diff --git a/grToolkit/provider/src/test/resources/six/akka.conf b/grToolkit/provider/src/test/resources/six/akka.conf
deleted file mode 100644
index 9bda35d68..000000000
--- a/grToolkit/provider/src/test/resources/six/akka.conf
+++ /dev/null
@@ -1,67 +0,0 @@
-# ============LICENSE_START=======================================================
-# openECOMP : SDN-C
-# ================================================================================
-# Copyright (C) 2019 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=========================================================
-
-odl-cluster-data {
-  akka {
-    remote {
-      artery {
-        enabled = off
-        canonical.hostname = "127.0.0.1"
-        canonical.port = 2550
-      }
-      netty.tcp {
-        hostname = "127.0.0.1"
-        port = 2550
-      }
-      # when under load we might trip a false positive on the failure detector
-      # transport-failure-detector {
-        # heartbeat-interval = 4 s
-        # acceptable-heartbeat-pause = 16s
-      # }
-    }
-
-    cluster {
-      # Remove ".tcp" when using artery.
-      seed-nodes = ["akka.tcp://opendaylight-cluster-data@127.0.0.1:2550", "akka.tcp://opendaylight-cluster-data@127.0.0.2:2550", "akka.tcp://opendaylight-cluster-data@127.0.0.3:2550", "akka.tcp://opendaylight-cluster-data@127.0.0.4:2550", "akka.tcp://opendaylight-cluster-data@127.0.0.5:2550", "akka.tcp://opendaylight-cluster-data@127.0.0.6:2550"]
-
-      roles = [
-        "member-1"
-      ]
-
-    }
-
-    persistence {
-      # By default the snapshots/journal directories live in KARAF_HOME. You can choose to put it somewhere else by
-      # modifying the following two properties. The directory location specified may be a relative or absolute path.
-      # The relative path is always relative to KARAF_HOME.
-
-      # snapshot-store.local.dir = "target/snapshots"
-      # journal.leveldb.dir = "target/journal"
-
-      journal {
-        leveldb {
-          # Set native = off to use a Java-only implementation of leveldb.
-          # Note that the Java-only version is not currently considered by Akka to be production quality.
-
-          # native = off
-        }
-      }
-    }
-  }
-}
diff --git a/grToolkit/provider/src/test/resources/six/cluster.json b/grToolkit/provider/src/test/resources/six/cluster.json
deleted file mode 100644
index d6a54c8c8..000000000
--- a/grToolkit/provider/src/test/resources/six/cluster.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-  "request": {
-    "mbean": "akka:type=Cluster",
-    "type": "read"
-  },
-  "value": {
-    "Leader": "akka.tcp://opendaylight-cluster-data@localhost:2550",
-    "Unreachable": "",
-    "Singleton": true,
-    "Available": true,
-    "MemberStatus": "Up",
-    "ClusterStatus": "{\n  \"members\": [\n    {\n      \"address\": \"akka.tcp://opendaylight-cluster-data@localhost:2550\",\n      \"roles\": [\n        \"dc-default\",\n        \"member-1\"\n      ],\n      \"status\": \"Up\"\n    },\n    {\n      \"address\": \"akka.tcp://opendaylight-cluster-data@localhost:2550\",\n      \"roles\": [\n        \"dc-default\",\n        \"member-2\"\n      ],\n      \"status\": \"Up\"\n    },\n    {\n      \"address\": \"akka.tcp://opendaylight-cluster-data@localhost:2550\",\n      \"roles\": [\n        \"dc-default\",\n        \"member-3\"\n      ],\n      \"status\": \"Up\"\n    }\n  ],\n  \"self-address\": \"akka.tcp://opendaylight-cluster-data@localhost:2550\",\n  \"unreachable\": []\n}\n",
-    "Members": "akka.tcp://opendaylight-cluster-data@localhost:2550"
-  },
-  "timestamp": 1575393881,
-  "status": 200
-}
\ No newline at end of file
diff --git a/grToolkit/provider/src/test/resources/six/component-health.json b/grToolkit/provider/src/test/resources/six/component-health.json
deleted file mode 100644
index 1ca01da42..000000000
--- a/grToolkit/provider/src/test/resources/six/component-health.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "output": {
-    "status": "200",
-    "served-by": "member-2",
-    "health": "HEALTHY"
-  }
-}
diff --git a/grToolkit/provider/src/test/resources/six/default-config.json b/grToolkit/provider/src/test/resources/six/default-config.json
deleted file mode 100644
index d75998e5d..000000000
--- a/grToolkit/provider/src/test/resources/six/default-config.json
+++ /dev/null
@@ -1,46 +0,0 @@
-{
-  "request": {
-    "mbean": "org.opendaylight.controller:Category=Shards,name=member-1-shard-default-config,type=DistributedConfigDatastore",
-    "type": "read"
-  },
-  "value": {
-    "ReadWriteTransactionCount": 0,
-    "SnapshotIndex": 22,
-    "InMemoryJournalLogSize": 1,
-    "ReplicatedToAllIndex": -1,
-    "Leader": "member-1-shard-default-config",
-    "LastIndex": 23,
-    "RaftState": "Leader",
-    "LastCommittedTransactionTime": "2019-12-03 16:36:39.413",
-    "LastApplied": 23,
-    "PeerAddresses": "",
-    "LastLogIndex": 23,
-    "LastLeadershipChangeTime": "2019-12-03 16:36:33.460",
-    "WriteOnlyTransactionCount": 0,
-    "FollowerInitialSyncStatus": false,
-    "FollowerInfo": [],
-    "FailedReadTransactionsCount": 0,
-    "Voting": true,
-    "StatRetrievalTime": "454.8 μs",
-    "CurrentTerm": 4,
-    "LastTerm": 4,
-    "FailedTransactionsCount": 0,
-    "PendingTxCommitQueueSize": 0,
-    "VotedFor": "member-1-shard-default-config",
-    "SnapshotCaptureInitiated": false,
-    "CommittedTransactionsCount": 5,
-    "TxCohortCacheSize": 0,
-    "PeerVotingStates": "",
-    "LastLogTerm": 4,
-    "StatRetrievalError": null,
-    "CommitIndex": 23,
-    "SnapshotTerm": 4,
-    "AbortTransactionsCount": 0,
-    "ReadOnlyTransactionCount": 0,
-    "ShardName": "member-1-shard-default-config",
-    "LeadershipChangeCount": 1,
-    "InMemoryJournalDataSize": 37
-  },
-  "timestamp": 1575393787,
-  "status": 200
-}
\ No newline at end of file
diff --git a/grToolkit/provider/src/test/resources/six/default-operational.json b/grToolkit/provider/src/test/resources/six/default-operational.json
deleted file mode 100644
index 88a5d2c96..000000000
--- a/grToolkit/provider/src/test/resources/six/default-operational.json
+++ /dev/null
@@ -1,46 +0,0 @@
-{
-  "request": {
-    "mbean": "org.opendaylight.controller:Category=Shards,name=member-1-shard-default-operational,type=DistributedOperationalDatastore",
-    "type": "read"
-  },
-  "value": {
-    "ReadWriteTransactionCount": 0,
-    "SnapshotIndex": 22,
-    "InMemoryJournalLogSize": 1,
-    "ReplicatedToAllIndex": -1,
-    "Leader": "member-1-shard-default-operational",
-    "LastIndex": 23,
-    "RaftState": "Leader",
-    "LastCommittedTransactionTime": "2019-12-03 16:36:39.413",
-    "LastApplied": 23,
-    "PeerAddresses": "",
-    "LastLogIndex": 23,
-    "LastLeadershipChangeTime": "2019-12-03 16:36:33.460",
-    "WriteOnlyTransactionCount": 0,
-    "FollowerInitialSyncStatus": false,
-    "FollowerInfo": [],
-    "FailedReadTransactionsCount": 0,
-    "Voting": true,
-    "StatRetrievalTime": "454.8 μs",
-    "CurrentTerm": 4,
-    "LastTerm": 4,
-    "FailedTransactionsCount": 0,
-    "PendingTxCommitQueueSize": 0,
-    "VotedFor": "member-1-shard-default-operational",
-    "SnapshotCaptureInitiated": false,
-    "CommittedTransactionsCount": 5,
-    "TxCohortCacheSize": 0,
-    "PeerVotingStates": "",
-    "LastLogTerm": 4,
-    "StatRetrievalError": null,
-    "CommitIndex": 23,
-    "SnapshotTerm": 4,
-    "AbortTransactionsCount": 0,
-    "ReadOnlyTransactionCount": 0,
-    "ShardName": "member-1-shard-default-operational",
-    "LeadershipChangeCount": 1,
-    "InMemoryJournalDataSize": 37
-  },
-  "timestamp": 1575393787,
-  "status": 200
-}
\ No newline at end of file
diff --git a/grToolkit/provider/src/test/resources/six/gr-toolkit.properties b/grToolkit/provider/src/test/resources/six/gr-toolkit.properties
deleted file mode 100755
index 54c9af742..000000000
--- a/grToolkit/provider/src/test/resources/six/gr-toolkit.properties
+++ /dev/null
@@ -1,34 +0,0 @@
-# ============LICENSE_START=======================================================
-# openECOMP : SDN-C
-# ================================================================================
-# Copyright (C) 2019 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=========================================================
-
-akka.conf.location=src/test/resources/six/akka.conf
-adm.useSsl=false
-adm.fqdn=localhost
-adm.healthcheck=/adm/healthcheck
-adm.port.http=9999
-adm.port.ssl=19999
-controller.credentials=admin:admin
-controller.useSsl=false
-controller.port.http=9999
-controller.port.ssl=19999
-controller.port.akka=2550
-mbean.cluster=/jolokia/read/akka:type=Cluster
-mbean.shardManager=/jolokia/read/org.opendaylight.controller:Category=ShardManager,name=shard-manager-config,type=DistributedConfigDatastore
-mbean.shard.config=/jolokia/read/org.opendaylight.controller:Category=Shards,name=%s,type=DistributedConfigDatastore
-site.identifier=TestODL
diff --git a/grToolkit/provider/src/test/resources/six/shard-manager.json b/grToolkit/provider/src/test/resources/six/shard-manager.json
deleted file mode 100644
index 301184ef8..000000000
--- a/grToolkit/provider/src/test/resources/six/shard-manager.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "request": {
-    "mbean": "org.opendaylight.controller:Category=ShardManager,name=shard-manager-config,type=DistributedConfigDatastore",
-    "type": "read"
-  },
-  "value": {
-    "LocalShards": [
-      "member-1-shard-default-config"
-    ],
-    "SyncStatus": true,
-    "MemberName": "member-1"
-  },
-  "timestamp": 1575393918,
-  "status": 200
-}
\ No newline at end of file
diff --git a/grToolkit/provider/src/test/resources/six/site-identifier.json b/grToolkit/provider/src/test/resources/six/site-identifier.json
deleted file mode 100644
index 7599ceb15..000000000
--- a/grToolkit/provider/src/test/resources/six/site-identifier.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "output": {
-    "status": "200",
-    "id": "test-site",
-    "served-by": "member-1"
-  }
-}
diff --git a/grToolkit/provider/src/test/resources/three/akka.conf b/grToolkit/provider/src/test/resources/three/akka.conf
deleted file mode 100644
index a6c151dd1..000000000
--- a/grToolkit/provider/src/test/resources/three/akka.conf
+++ /dev/null
@@ -1,67 +0,0 @@
-# ============LICENSE_START=======================================================
-# openECOMP : SDN-C
-# ================================================================================
-# Copyright (C) 2019 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=========================================================
-
-odl-cluster-data {
-  akka {
-    remote {
-      artery {
-        enabled = off
-        canonical.hostname = "127.0.0.1"
-        canonical.port = 2550
-      }
-      netty.tcp {
-        hostname = "127.0.0.1"
-        port = 2550
-      }
-      # when under load we might trip a false positive on the failure detector
-      # transport-failure-detector {
-        # heartbeat-interval = 4 s
-        # acceptable-heartbeat-pause = 16s
-      # }
-    }
-
-    cluster {
-      # Remove ".tcp" when using artery.
-      seed-nodes = ["akka.tcp://opendaylight-cluster-data@127.0.0.1:2550", "akka.tcp://opendaylight-cluster-data@127.0.0.2:2550", "akka.tcp://opendaylight-cluster-data@127.0.0.3:2550"]
-
-      roles = [
-        "member-1"
-      ]
-
-    }
-
-    persistence {
-      # By default the snapshots/journal directories live in KARAF_HOME. You can choose to put it somewhere else by
-      # modifying the following two properties. The directory location specified may be a relative or absolute path.
-      # The relative path is always relative to KARAF_HOME.
-
-      # snapshot-store.local.dir = "target/snapshots"
-      # journal.leveldb.dir = "target/journal"
-
-      journal {
-        leveldb {
-          # Set native = off to use a Java-only implementation of leveldb.
-          # Note that the Java-only version is not currently considered by Akka to be production quality.
-
-          # native = off
-        }
-      }
-    }
-  }
-}
diff --git a/grToolkit/provider/src/test/resources/three/cluster.json b/grToolkit/provider/src/test/resources/three/cluster.json
deleted file mode 100644
index d6a54c8c8..000000000
--- a/grToolkit/provider/src/test/resources/three/cluster.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-  "request": {
-    "mbean": "akka:type=Cluster",
-    "type": "read"
-  },
-  "value": {
-    "Leader": "akka.tcp://opendaylight-cluster-data@localhost:2550",
-    "Unreachable": "",
-    "Singleton": true,
-    "Available": true,
-    "MemberStatus": "Up",
-    "ClusterStatus": "{\n  \"members\": [\n    {\n      \"address\": \"akka.tcp://opendaylight-cluster-data@localhost:2550\",\n      \"roles\": [\n        \"dc-default\",\n        \"member-1\"\n      ],\n      \"status\": \"Up\"\n    },\n    {\n      \"address\": \"akka.tcp://opendaylight-cluster-data@localhost:2550\",\n      \"roles\": [\n        \"dc-default\",\n        \"member-2\"\n      ],\n      \"status\": \"Up\"\n    },\n    {\n      \"address\": \"akka.tcp://opendaylight-cluster-data@localhost:2550\",\n      \"roles\": [\n        \"dc-default\",\n        \"member-3\"\n      ],\n      \"status\": \"Up\"\n    }\n  ],\n  \"self-address\": \"akka.tcp://opendaylight-cluster-data@localhost:2550\",\n  \"unreachable\": []\n}\n",
-    "Members": "akka.tcp://opendaylight-cluster-data@localhost:2550"
-  },
-  "timestamp": 1575393881,
-  "status": 200
-}
\ No newline at end of file
diff --git a/grToolkit/provider/src/test/resources/three/default-config.json b/grToolkit/provider/src/test/resources/three/default-config.json
deleted file mode 100644
index d75998e5d..000000000
--- a/grToolkit/provider/src/test/resources/three/default-config.json
+++ /dev/null
@@ -1,46 +0,0 @@
-{
-  "request": {
-    "mbean": "org.opendaylight.controller:Category=Shards,name=member-1-shard-default-config,type=DistributedConfigDatastore",
-    "type": "read"
-  },
-  "value": {
-    "ReadWriteTransactionCount": 0,
-    "SnapshotIndex": 22,
-    "InMemoryJournalLogSize": 1,
-    "ReplicatedToAllIndex": -1,
-    "Leader": "member-1-shard-default-config",
-    "LastIndex": 23,
-    "RaftState": "Leader",
-    "LastCommittedTransactionTime": "2019-12-03 16:36:39.413",
-    "LastApplied": 23,
-    "PeerAddresses": "",
-    "LastLogIndex": 23,
-    "LastLeadershipChangeTime": "2019-12-03 16:36:33.460",
-    "WriteOnlyTransactionCount": 0,
-    "FollowerInitialSyncStatus": false,
-    "FollowerInfo": [],
-    "FailedReadTransactionsCount": 0,
-    "Voting": true,
-    "StatRetrievalTime": "454.8 μs",
-    "CurrentTerm": 4,
-    "LastTerm": 4,
-    "FailedTransactionsCount": 0,
-    "PendingTxCommitQueueSize": 0,
-    "VotedFor": "member-1-shard-default-config",
-    "SnapshotCaptureInitiated": false,
-    "CommittedTransactionsCount": 5,
-    "TxCohortCacheSize": 0,
-    "PeerVotingStates": "",
-    "LastLogTerm": 4,
-    "StatRetrievalError": null,
-    "CommitIndex": 23,
-    "SnapshotTerm": 4,
-    "AbortTransactionsCount": 0,
-    "ReadOnlyTransactionCount": 0,
-    "ShardName": "member-1-shard-default-config",
-    "LeadershipChangeCount": 1,
-    "InMemoryJournalDataSize": 37
-  },
-  "timestamp": 1575393787,
-  "status": 200
-}
\ No newline at end of file
diff --git a/grToolkit/provider/src/test/resources/three/default-operational.json b/grToolkit/provider/src/test/resources/three/default-operational.json
deleted file mode 100644
index 88a5d2c96..000000000
--- a/grToolkit/provider/src/test/resources/three/default-operational.json
+++ /dev/null
@@ -1,46 +0,0 @@
-{
-  "request": {
-    "mbean": "org.opendaylight.controller:Category=Shards,name=member-1-shard-default-operational,type=DistributedOperationalDatastore",
-    "type": "read"
-  },
-  "value": {
-    "ReadWriteTransactionCount": 0,
-    "SnapshotIndex": 22,
-    "InMemoryJournalLogSize": 1,
-    "ReplicatedToAllIndex": -1,
-    "Leader": "member-1-shard-default-operational",
-    "LastIndex": 23,
-    "RaftState": "Leader",
-    "LastCommittedTransactionTime": "2019-12-03 16:36:39.413",
-    "LastApplied": 23,
-    "PeerAddresses": "",
-    "LastLogIndex": 23,
-    "LastLeadershipChangeTime": "2019-12-03 16:36:33.460",
-    "WriteOnlyTransactionCount": 0,
-    "FollowerInitialSyncStatus": false,
-    "FollowerInfo": [],
-    "FailedReadTransactionsCount": 0,
-    "Voting": true,
-    "StatRetrievalTime": "454.8 μs",
-    "CurrentTerm": 4,
-    "LastTerm": 4,
-    "FailedTransactionsCount": 0,
-    "PendingTxCommitQueueSize": 0,
-    "VotedFor": "member-1-shard-default-operational",
-    "SnapshotCaptureInitiated": false,
-    "CommittedTransactionsCount": 5,
-    "TxCohortCacheSize": 0,
-    "PeerVotingStates": "",
-    "LastLogTerm": 4,
-    "StatRetrievalError": null,
-    "CommitIndex": 23,
-    "SnapshotTerm": 4,
-    "AbortTransactionsCount": 0,
-    "ReadOnlyTransactionCount": 0,
-    "ShardName": "member-1-shard-default-operational",
-    "LeadershipChangeCount": 1,
-    "InMemoryJournalDataSize": 37
-  },
-  "timestamp": 1575393787,
-  "status": 200
-}
\ No newline at end of file
diff --git a/grToolkit/provider/src/test/resources/three/gr-toolkit.properties b/grToolkit/provider/src/test/resources/three/gr-toolkit.properties
deleted file mode 100755
index cc7820e90..000000000
--- a/grToolkit/provider/src/test/resources/three/gr-toolkit.properties
+++ /dev/null
@@ -1,34 +0,0 @@
-# ============LICENSE_START=======================================================
-# openECOMP : SDN-C
-# ================================================================================
-# Copyright (C) 2019 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=========================================================
-
-akka.conf.location=src/test/resources/single/akka.conf
-adm.useSsl=false
-adm.fqdn=localhost
-adm.healthcheck=/adm/healthcheck
-adm.port.http=9999
-adm.port.ssl=19999
-controller.credentials=admin:admin
-controller.useSsl=false
-controller.port.http=9999
-controller.port.ssl=19999
-controller.port.akka=2550
-mbean.cluster=/jolokia/read/akka:type=Cluster
-mbean.shardManager=/jolokia/read/org.opendaylight.controller:Category=ShardManager,name=shard-manager-config,type=DistributedConfigDatastore
-mbean.shard.config=/jolokia/read/org.opendaylight.controller:Category=Shards,name=%s,type=DistributedConfigDatastore
-site.identifier=TestODL
diff --git a/grToolkit/provider/src/test/resources/three/shard-manager.json b/grToolkit/provider/src/test/resources/three/shard-manager.json
deleted file mode 100644
index 301184ef8..000000000
--- a/grToolkit/provider/src/test/resources/three/shard-manager.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "request": {
-    "mbean": "org.opendaylight.controller:Category=ShardManager,name=shard-manager-config,type=DistributedConfigDatastore",
-    "type": "read"
-  },
-  "value": {
-    "LocalShards": [
-      "member-1-shard-default-config"
-    ],
-    "SyncStatus": true,
-    "MemberName": "member-1"
-  },
-  "timestamp": 1575393918,
-  "status": 200
-}
\ No newline at end of file