Refactoring Metrics test

Change-Id: I99290a3dec61b3ce0f4d5fd33d6b429d091b48ca
Issue-ID: POLICY-954
Signed-off-by: waqas.ikram <waqas.ikram@ericsson.com>

8 files changed, 269 insertions, 1522 deletions

diff --git a/testsuites/performance/performance-context-metrics/src/main/java/org/onap/policy/apex/plugins/context/metrics/ConcurrentContextMetrics.java b/testsuites/performance/performance-context-metrics/src/main/java/org/onap/policy/apex/plugins/context/metrics/ConcurrentContextMetrics.java
index cbe06ed57..3d257f89a 100644
--- a/testsuites/performance/performance-context-metrics/src/main/java/org/onap/policy/apex/plugins/context/metrics/ConcurrentContextMetrics.java
+++ b/testsuites/performance/performance-context-metrics/src/main/java/org/onap/policy/apex/plugins/context/metrics/ConcurrentContextMetrics.java
@@ -20,27 +20,30 @@
 
 package org.onap.policy.apex.plugins.context.metrics;
 
+import static org.onap.policy.apex.context.parameters.DistributorParameters.DEFAULT_DISTRIBUTOR_PLUGIN_CLASS;
+import static org.onap.policy.apex.context.parameters.LockManagerParameters.DEFAULT_LOCK_MANAGER_PLUGIN_CLASS;
+
+import java.io.File;
 import java.io.IOException;
-import java.text.DateFormat;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-
-import org.onap.policy.apex.context.ContextAlbum;
-import org.onap.policy.apex.context.ContextException;
-import org.onap.policy.apex.context.Distributor;
-import org.onap.policy.apex.context.impl.distribution.DistributorFactory;
+import java.util.Arrays;
+import java.util.Map;
+import java.util.Map.Entry;
+
 import org.onap.policy.apex.context.parameters.ContextParameters;
 import org.onap.policy.apex.context.parameters.DistributorParameters;
-import org.onap.policy.apex.context.parameters.LockManagerParameters;
 import org.onap.policy.apex.context.test.concepts.TestContextLongItem;
-import org.onap.policy.apex.context.test.factory.TestContextAlbumFactory;
-import org.onap.policy.apex.core.infrastructure.threading.ThreadUtilities;
+import org.onap.policy.apex.context.test.locking.ConcurrentContext;
+import org.onap.policy.apex.context.test.utils.ConfigrationProvider;
+import org.onap.policy.apex.context.test.utils.ConfigrationProviderImpl;
+import org.onap.policy.apex.context.test.utils.ZooKeeperServerServiceProvider;
 import org.onap.policy.apex.model.basicmodel.concepts.ApexException;
-import org.onap.policy.apex.model.basicmodel.concepts.AxArtifactKey;
 import org.onap.policy.apex.model.basicmodel.handling.ApexModelException;
-import org.onap.policy.apex.model.contextmodel.concepts.AxContextModel;
+import org.onap.policy.apex.plugins.context.distribution.hazelcast.HazelcastContextDistributor;
+import org.onap.policy.apex.plugins.context.distribution.infinispan.InfinispanContextDistributor;
 import org.onap.policy.apex.plugins.context.distribution.infinispan.InfinispanDistributorParameters;
+import org.onap.policy.apex.plugins.context.locking.curator.CuratorLockManager;
 import org.onap.policy.apex.plugins.context.locking.curator.CuratorLockManagerParameters;
+import org.onap.policy.apex.plugins.context.locking.hazelcast.HazelcastLockManager;
 import org.slf4j.ext.XLogger;
 import org.slf4j.ext.XLoggerFactory;
 
@@ -50,7 +53,7 @@ import org.slf4j.ext.XLoggerFactory;
  * @author Liam Fallon (liam.fallon@ericsson.com)
  */
 public class ConcurrentContextMetrics {
-    private static final int NUM_ARGS = 8;
+    private static final int NUM_ARGS = 9;
     private static final int ARG_LABEL = 0;
     private static final int ARG_JVM_COUNT = 1;
     private static final int ARG_THREAD_COUNT = 2;
@@ -58,55 +61,38 @@ public class ConcurrentContextMetrics {
     private static final int ARG_ARRAY_SIZE = 4;
     private static final int ARG_LOCK_TYPE = 5;
     private static final int ARG_ZOOKEEPER_ADDRESS = 6;
-    private static final int ARG_INTERACTIVE = 7;
-
-    private static final int TIME_10_MS = 10;
+    private static final int ARG_ZOOKEEPER_PORT = 7;
+    private static final int ARG_ZOOKEEPER_DIRECTORY = 8;
 
     // Logger for this class
     private static final XLogger LOGGER = XLoggerFactory.getXLogger(ConcurrentContextMetrics.class);
 
-    // Test parameters
-    private String testLabel = null;
-    private int jvmCount = -1;
-    private int threadCount = -1;
-    private int threadLoops = -1;
-    private int longArraySize = -1;
-    private int lockType = -1;
     private String zookeeperAddress = null;
-    private long total = -1;
-    private boolean interactive = false;
-
-    // The context distributor and map used by each test
-    private Distributor contextDistributor = null;
-    private ContextAlbum lTypeAlbum = null;
-
-    private final DateFormat dateFormat = new SimpleDateFormat("yyyy,MM,dd,HH,mm,ss,S");
+    private final ConfigrationProvider configrationProvider;
+    private final File zookeeperDirectory;
+    private final int zookeeperPort;
 
     /**
      * The main method.
      *
      * @param args the args
-     * @throws ApexModelException the apex model exception
-     * @throws IOException the IO exception
-     * @throws ApexException the apex exception
+     * @throws Exception the exception
      */
-    public static void main(final String[] args) throws ApexModelException, IOException, ApexException {
+    public static void main(final String[] args) throws Exception {
         if (args.length != NUM_ARGS) {
+            System.err.println("Args: " + Arrays.toString(args));
             System.err.println(
-                    "usage: ConcurrentContextMetrics testLabel jvmCount threadCount threadLoops longArraySize lockType zookeeperAddress interactive");
+                    "usage: testLabel jvmCount threadCount threadLoops longArraySize lockType zookeeperAddress zookeeperPort zookeeperDirectory");
             return;
         }
-        // @formatter:off
-        final ConcurrentContextMetrics concurrentContextMetrics = new ConcurrentContextMetrics(
-                args[ARG_LABEL],
-                Integer.valueOf(args[ARG_JVM_COUNT]),
-                Integer.valueOf(args[ARG_THREAD_COUNT]),
-                Integer.valueOf(args[ARG_ITERATIONS]),
-                Integer.valueOf(args[ARG_ARRAY_SIZE]),
-                Integer.valueOf(args[ARG_LOCK_TYPE]),
-                args[ARG_ZOOKEEPER_ADDRESS],
-                Boolean.valueOf(args[ARG_INTERACTIVE]));
-        // @formatter:on
+
+        final ConfigrationProvider configrationProvider =
+                new ConfigrationProviderImpl(args[ARG_LABEL], Integer.valueOf(args[ARG_JVM_COUNT]),
+                        Integer.valueOf(args[ARG_THREAD_COUNT]), Integer.valueOf(args[ARG_ITERATIONS]),
+                        Integer.valueOf(args[ARG_ARRAY_SIZE]), Integer.valueOf(args[ARG_LOCK_TYPE]));
+
+        final ConcurrentContextMetrics concurrentContextMetrics = new ConcurrentContextMetrics(configrationProvider,
+                args[ARG_ZOOKEEPER_ADDRESS], Integer.valueOf(args[ARG_ZOOKEEPER_PORT]), args[ARG_ZOOKEEPER_DIRECTORY]);
 
         concurrentContextMetrics.concurrentContextMetricsJVMLocal();
         concurrentContextMetrics.concurrentContextMetricsCurator();
@@ -119,30 +105,18 @@ public class ConcurrentContextMetrics {
 
     /**
      * The Constructor.
-     *
-     * @param testLabel the test label
-     * @param jvmCount the jvm count
-     * @param threadCount the thread count
-     * @param threadLoops the thread loops
-     * @param longArraySize the long array size
-     * @param lockType the lock type
-     * @param zookeeperAddress the zookeeper address
-     * @param interactive the interactive
+     * 
+     * @param configrationProvider
+     * @param zookeeperAddress
+     * @param zookeeperPort
+     * @param zookeeperDirectory
      */
-    // CHECKSTYLE:OFF: checkstyle:parameterNumber
-    public ConcurrentContextMetrics(final String testLabel, final int jvmCount, final int threadCount,
-            final int threadLoops, final int longArraySize, final int lockType, final String zookeeperAddress,
-            final boolean interactive) {
-        // CHECKSTYLE:ON: checkstyle:parameterNumber
-        super();
-        this.testLabel = testLabel;
-        this.jvmCount = jvmCount;
-        this.threadCount = threadCount;
-        this.threadLoops = threadLoops;
-        this.longArraySize = longArraySize;
-        this.lockType = lockType;
+    public ConcurrentContextMetrics(final ConfigrationProvider configrationProvider, final String zookeeperAddress,
+            final int zookeeperPort, final String zookeeperDirectory) {
+        this.configrationProvider = configrationProvider;
         this.zookeeperAddress = zookeeperAddress;
-        this.interactive = interactive;
+        this.zookeeperPort = zookeeperPort;
+        this.zookeeperDirectory = new File(zookeeperDirectory);
     }
 
     /**
@@ -153,17 +127,15 @@ public class ConcurrentContextMetrics {
      * @throws ApexException the apex exception
      */
     private void concurrentContextMetricsJVMLocal() throws ApexModelException, IOException, ApexException {
-        if (jvmCount != 1) {
+        if (configrationProvider.getJvmCount() != 1) {
             return;
         }
 
         LOGGER.debug("Running concurrentContextMetricsJVMLocalVarSet metrics . . .");
 
         final ContextParameters contextParameters = new ContextParameters();
-        contextParameters.getDistributorParameters()
-                .setPluginClass(DistributorParameters.DEFAULT_DISTRIBUTOR_PLUGIN_CLASS);
-        contextParameters.getLockManagerParameters()
-                .setPluginClass(LockManagerParameters.DEFAULT_LOCK_MANAGER_PLUGIN_CLASS);
+        contextParameters.getDistributorParameters().setPluginClass(DEFAULT_DISTRIBUTOR_PLUGIN_CLASS);
+        contextParameters.getLockManagerParameters().setPluginClass(DEFAULT_LOCK_MANAGER_PLUGIN_CLASS);
         runConcurrentContextMetrics("JVMLocal");
 
         LOGGER.debug("Ran concurrentContextMetricsJVMLocalVarSet metrics");
@@ -172,22 +144,19 @@ public class ConcurrentContextMetrics {
     /**
      * Concurrent context metrics hazelcast.
      *
-     * @throws ApexModelException the apex model exception
      * @throws IOException the IO exception
      * @throws ApexException the apex exception
      */
-    private void concurrentContextMetricsHazelcast() throws ApexModelException, IOException, ApexException {
-        if (jvmCount != 1) {
+    private void concurrentContextMetricsHazelcast() throws IOException, ApexException {
+        if (configrationProvider.getJvmCount() != 1) {
             return;
         }
 
         LOGGER.debug("Running concurrentContextMetricsHazelcast metrics . . .");
 
         final ContextParameters contextParameters = new ContextParameters();
-        contextParameters.getDistributorParameters()
-                .setPluginClass(DistributorParameters.DEFAULT_DISTRIBUTOR_PLUGIN_CLASS);
-        contextParameters.getLockManagerParameters()
-                .setPluginClass("org.onap.policy.apex.plugins.context.locking.hazelcast.HazelcastLockManager");
+        contextParameters.getDistributorParameters().setPluginClass(DEFAULT_DISTRIBUTOR_PLUGIN_CLASS);
+        contextParameters.getLockManagerParameters().setPluginClass(HazelcastLockManager.class.getCanonicalName());
         runConcurrentContextMetrics("Hazelcast");
 
         LOGGER.debug("Ran concurrentContextMetricsHazelcast metrics");
@@ -196,23 +165,21 @@ public class ConcurrentContextMetrics {
     /**
      * Concurrent context metrics curator.
      *
-     * @throws ApexModelException the apex model exception
      * @throws IOException the IO exception
      * @throws ApexException the apex exception
      */
-    private void concurrentContextMetricsCurator() throws ApexModelException, IOException, ApexException {
-        if (jvmCount != 1) {
+    private void concurrentContextMetricsCurator() throws IOException, ApexException {
+        if (configrationProvider.getJvmCount() != 1) {
             return;
         }
 
         LOGGER.debug("Running concurrentContextMetricsCurator metrics . . .");
 
         final ContextParameters contextParameters = new ContextParameters();
-        contextParameters.getDistributorParameters()
-                .setPluginClass(DistributorParameters.DEFAULT_DISTRIBUTOR_PLUGIN_CLASS);
+        contextParameters.getDistributorParameters().setPluginClass(DEFAULT_DISTRIBUTOR_PLUGIN_CLASS);
 
         final CuratorLockManagerParameters curatorParameters = new CuratorLockManagerParameters();
-        curatorParameters.setPluginClass("org.onap.policy.apex.plugins.context.locking.curator.CuratorLockManager");
+        curatorParameters.setPluginClass(CuratorLockManager.class.getCanonicalName());
         contextParameters.setLockManagerParameters(curatorParameters);
         curatorParameters.setZookeeperAddress(zookeeperAddress);
 
@@ -224,19 +191,16 @@ public class ConcurrentContextMetrics {
     /**
      * Concurrent context metrics hazelcast multi JVM hazelcast lock.
      *
-     * @throws ApexModelException the apex model exception
      * @throws IOException the IO exception
      * @throws ApexException the apex exception
      */
-    private void concurrentContextMetricsHazelcastMultiJVMHazelcastLock()
-            throws ApexModelException, IOException, ApexException {
+    private void concurrentContextMetricsHazelcastMultiJVMHazelcastLock() throws IOException, ApexException {
         LOGGER.debug("Running concurrentContextMetricsHazelcastMultiJVMHazelcastLock metrics . . .");
 
         final ContextParameters contextParameters = new ContextParameters();
-        contextParameters.getDistributorParameters().setPluginClass(
-                "org.onap.policy.apex.plugins.context.distribution.hazelcast.HazelcastContextDistributor");
-        contextParameters.getLockManagerParameters()
-                .setPluginClass("org.onap.policy.apex.plugins.context.locking.hazelcast.HazelcastLockManager");
+        final DistributorParameters distributorParameters = contextParameters.getDistributorParameters();
+        distributorParameters.setPluginClass(HazelcastContextDistributor.class.getCanonicalName());
+        contextParameters.getLockManagerParameters().setPluginClass(HazelcastLockManager.class.getCanonicalName());
         runConcurrentContextMetrics("HazelcastMultiJVMHazelcastLock");
 
         LOGGER.debug("Ran concurrentContextMetricsHazelcastMultiJVMHazelcastLock metrics");
@@ -245,19 +209,16 @@ public class ConcurrentContextMetrics {
     /**
      * Concurrent context metrics infinispan multi JVM hazelcastlock.
      *
-     * @throws ApexModelException the apex model exception
      * @throws IOException the IO exception
      * @throws ApexException the apex exception
      */
-    private void concurrentContextMetricsInfinispanMultiJVMHazelcastlock()
-            throws ApexModelException, IOException, ApexException {
+    private void concurrentContextMetricsInfinispanMultiJVMHazelcastlock() throws IOException, ApexException {
         LOGGER.debug("Running concurrentContextMetricsInfinispanMultiJVMHazelcastlock metrics . . .");
 
         final ContextParameters contextParameters = new ContextParameters();
-        contextParameters.getDistributorParameters().setPluginClass(
-                "org.onap.policy.apex.plugins.context.distribution.infinispan.InfinispanContextDistributor");
-        contextParameters.getLockManagerParameters()
-                .setPluginClass("org.onap.policy.apex.plugins.context.locking.hazelcast.HazelcastLockManager");
+        final DistributorParameters distributorParameters = contextParameters.getDistributorParameters();
+        distributorParameters.setPluginClass(InfinispanContextDistributor.class.getCanonicalName());
+        contextParameters.getLockManagerParameters().setPluginClass(HazelcastLockManager.class.getCanonicalName());
 
         final InfinispanDistributorParameters infinispanParameters = new InfinispanDistributorParameters();
         contextParameters.setDistributorParameters(infinispanParameters);
@@ -270,53 +231,67 @@ public class ConcurrentContextMetrics {
     /**
      * Concurrent context metrics infinispan multi JVM curator lock.
      *
-     * @throws ApexModelException the apex model exception
      * @throws IOException the IO exception
      * @throws ApexException the apex exception
+     * @throws InterruptedException
      */
     private void concurrentContextMetricsInfinispanMultiJVMCuratorLock()
-            throws ApexModelException, IOException, ApexException {
-        LOGGER.debug("Running concurrentContextMetricsInfinispanMultiJVMCuratorLock metrics . . .");
-
-        final ContextParameters contextParameters = new ContextParameters();
-        contextParameters.getDistributorParameters().setPluginClass(
-                "org.onap.policy.apex.plugins.context.distribution.infinispan.InfinispanContextDistributor");
+            throws IOException, ApexException, InterruptedException {
 
-        final CuratorLockManagerParameters curatorParameters = new CuratorLockManagerParameters();
-        curatorParameters.setPluginClass("org.onap.policy.apex.plugins.context.locking.curator.CuratorLockManager");
-        contextParameters.setLockManagerParameters(curatorParameters);
-        curatorParameters.setZookeeperAddress(zookeeperAddress);
-
-        final InfinispanDistributorParameters infinispanParameters = new InfinispanDistributorParameters();
-        contextParameters.setDistributorParameters(infinispanParameters);
-
-        runConcurrentContextMetrics("InfinispanMultiJVMCuratorLock");
+        LOGGER.debug("Running concurrentContextMetricsInfinispanMultiJVMCuratorLock metrics . . .");
 
+        final ZooKeeperServerServiceProvider zooKeeperServerServiceProvider =
+                new ZooKeeperServerServiceProvider(zookeeperDirectory, zookeeperAddress, zookeeperPort);
+        try {
+            zooKeeperServerServiceProvider.startZookeeperServer();
+            final ContextParameters contextParameters = new ContextParameters();
+            final DistributorParameters distributorParameters = contextParameters.getDistributorParameters();
+            distributorParameters.setPluginClass(InfinispanContextDistributor.class.getCanonicalName());
+
+            final CuratorLockManagerParameters curatorParameters = new CuratorLockManagerParameters();
+            curatorParameters.setPluginClass(CuratorLockManager.class.getCanonicalName());
+            contextParameters.setLockManagerParameters(curatorParameters);
+            curatorParameters.setZookeeperAddress(zookeeperAddress);
+
+            final InfinispanDistributorParameters infinispanParameters = new InfinispanDistributorParameters();
+            contextParameters.setDistributorParameters(infinispanParameters);
+
+            runConcurrentContextMetrics("InfinispanMultiJVMCuratorLock");
+        } finally {
+            zooKeeperServerServiceProvider.stopZookeeperServer();
+        }
         LOGGER.debug("Ran concurrentContextMetricsInfinispanMultiJVMCuratorLock metrics");
     }
 
     /**
      * Concurrent context metrics hazelcast multi JVM curator lock.
      *
-     * @throws ApexModelException the apex model exception
      * @throws IOException the IO exception
      * @throws ApexException the apex exception
+     * @throws InterruptedException
      */
     private void concurrentContextMetricsHazelcastMultiJVMCuratorLock()
-            throws ApexModelException, IOException, ApexException {
+            throws IOException, ApexException, InterruptedException {
         LOGGER.debug("Running concurrentContextMetricsHazelcastMultiJVMCuratorLock metrics . . .");
 
-        final ContextParameters contextParameters = new ContextParameters();
-        contextParameters.getDistributorParameters().setPluginClass(
-                "org.onap.policy.apex.plugins.context.distribution.hazelcast.HazelcastContextDistributor");
-
-        final CuratorLockManagerParameters curatorParameters = new CuratorLockManagerParameters();
-        curatorParameters.setPluginClass("org.onap.policy.apex.plugins.context.locking.curator.CuratorLockManager");
-        contextParameters.setLockManagerParameters(curatorParameters);
-        curatorParameters.setZookeeperAddress(zookeeperAddress);
-
-        runConcurrentContextMetrics("HazelcastMultiJVMCuratorLock");
+        final ZooKeeperServerServiceProvider zooKeeperServerServiceProvider =
+                new ZooKeeperServerServiceProvider(zookeeperDirectory, zookeeperAddress, zookeeperPort);
 
+        try {
+            zooKeeperServerServiceProvider.startZookeeperServer();
+            final ContextParameters contextParameters = new ContextParameters();
+            final DistributorParameters distributorParameters = contextParameters.getDistributorParameters();
+            distributorParameters.setPluginClass(HazelcastContextDistributor.class.getCanonicalName());
+
+            final CuratorLockManagerParameters curatorParameters = new CuratorLockManagerParameters();
+            curatorParameters.setPluginClass(CuratorLockManager.class.getCanonicalName());
+            contextParameters.setLockManagerParameters(curatorParameters);
+            curatorParameters.setZookeeperAddress(zookeeperAddress);
+
+            runConcurrentContextMetrics("HazelcastMultiJVMCuratorLock");
+        } finally {
+            zooKeeperServerServiceProvider.stopZookeeperServer();
+        }
         LOGGER.debug("Ran concurrentContextMetricsHazelcastMultiJVMCuratorLock metrics");
     }
 
@@ -324,202 +299,24 @@ public class ConcurrentContextMetrics {
      * Run concurrent context metrics.
      *
      * @param testName the test name
-     * @throws ApexModelException the apex model exception
      * @throws IOException the IO exception
      * @throws ApexException the apex exception
      */
-    private void runConcurrentContextMetrics(final String testName)
-            throws ApexModelException, IOException, ApexException {
-        total = -1;
-        outMetricLine(testName, "Init");
-
-        try {
-            setupContext();
-        } catch (final Exception e) {
-            e.printStackTrace();
-            throw e;
-        }
-
-        outMetricLine(testName, "Start");
-
-        Thread[] threadArray;
-
-        // Check if we have a single JVM or multiple JVMs
-        int runningThreadCount = -1;
-        if (jvmCount == 1) {
-            threadArray = new Thread[threadCount];
-
-            // Run everything in this JVM
-            for (int t = 0; t < threadCount; t++) {
-                threadArray[t] =
-                        new Thread(new ConcurrentContextMetricsThread(0, t, threadLoops, longArraySize, lockType));
-                threadArray[t].setName(testLabel + "_" + testName + ":concurrentContextMetricsThread_0_" + t);
-                threadArray[t].start();
-            }
-
-            outMetricLine(testName, "Running");
-            runningThreadCount = threadCount;
-        } else {
-            threadArray = new Thread[jvmCount];
-
-            final ConcurrentContextMetricsJVMThread[] jvmArray = new ConcurrentContextMetricsJVMThread[jvmCount];
-            // Spawn JVMs to run the tests
-            for (int j = 0; j < jvmCount; j++) {
-                jvmArray[j] = new ConcurrentContextMetricsJVMThread(testLabel + "_" + testName, j, threadCount,
-                        threadLoops, longArraySize, lockType);
-                threadArray[j] = new Thread(jvmArray[j]);
-                threadArray[j].setName(testLabel + "_" + testName + ":concurrentContextMetricsJVMThread_" + j);
-                threadArray[j].start();
-            }
-
-            boolean allReadyToGo;
-            do {
-                ThreadUtilities.sleep(TIME_10_MS);
-                allReadyToGo = true;
-                for (int j = 0; j < jvmCount; j++) {
-                    if (!jvmArray[j].isReadyToGo()) {
-                        allReadyToGo = false;
-                        break;
-                    }
-                }
-            } while (!allReadyToGo);
-
-            outMetricLine(testName, "Ready");
-            if (interactive) {
-                System.in.read();
-            }
-            outMetricLine(testName, "Running");
-
-            for (int j = 0; j < jvmCount; j++) {
-                jvmArray[j].offYouGo();
-            }
-
-            boolean allFinished;
-            do {
-                ThreadUtilities.sleep(TIME_10_MS);
-                allFinished = true;
-                for (int j = 0; j < jvmCount; j++) {
-                    if (!jvmArray[j].isAllFinished()) {
-                        allFinished = false;
-                        break;
-                    }
-                }
-            } while (!allFinished);
-
-            outMetricLine(testName, "Completed");
-
-            verifyContext(testName);
-
-            for (int j = 0; j < jvmCount; j++) {
-                jvmArray[j].finishItOut();
-            }
-
-            runningThreadCount = jvmCount;
-        }
-
-        boolean allFinished;
-        do {
-            ThreadUtilities.sleep(TIME_10_MS);
-            allFinished = true;
-            for (int i = 0; i < runningThreadCount; i++) {
-                if (threadArray[i].isAlive()) {
-                    allFinished = false;
-                    break;
-                }
-            }
-        } while (!allFinished);
-
-        if (jvmCount == 1) {
-            outMetricLine(testName, "Completed");
-            verifyContext(testName);
-        }
-
-        clearContext(testName);
-    }
-
-    /**
-     * Setup context.
-     *
-     * @throws ContextException the context exception
-     */
-    private void setupContext() throws ContextException {
-        final AxArtifactKey distributorKey = new AxArtifactKey("ApexDistributor", "0.0.1");
-        contextDistributor = new DistributorFactory().getDistributor(distributorKey);
-
-        final AxArtifactKey[] usedArtifactStackArray = {new AxArtifactKey("testC-top", "0.0.1"),
-                new AxArtifactKey("testC-next", "0.0.1"), new AxArtifactKey("testC-bot", "0.0.1")};
-
-        final AxContextModel albumsModel = TestContextAlbumFactory.createMultiAlbumsContextModel();
-        contextDistributor.registerModel(albumsModel);
-
-        lTypeAlbum = contextDistributor.createContextAlbum(new AxArtifactKey("LTypeContextAlbum", "0.0.1"));
-        assert (lTypeAlbum != null);
-        lTypeAlbum.setUserArtifactStack(usedArtifactStackArray);
-
-        for (int i = 0; i < longArraySize; i++) {
-            final String longKey = Integer.toString(i);
-            final TestContextLongItem longItem = new TestContextLongItem();
-            longItem.setLongValue(0);
-            lTypeAlbum.put(longKey, longItem);
-        }
-    }
-
-    /**
-     * Verify context.
-     *
-     * @param testName the test name
-     * @throws ContextException the context exception
-     */
-    private void verifyContext(final String testName) throws ContextException {
-        total = 0;
+    private void runConcurrentContextMetrics(final String testName) throws IOException, ApexException {
+        final ConcurrentContext concurrentContext = new ConcurrentContext(configrationProvider);
 
-        try {
-            for (int i = 0; i < longArraySize; i++) {
-                total += ((TestContextLongItem) lTypeAlbum.get(Integer.toString(i))).getLongValue();
-            }
+        LOGGER.info("Running {} ...", testName);
+        final Map<String, TestContextLongItem> result = concurrentContext.testConcurrentContext();
 
-            outMetricLine(testName, "Totaled");
-        } catch (final Exception e) {
-            e.printStackTrace();
+        long total = 0;
+        for (final Entry<String, TestContextLongItem> entry : result.entrySet()) {
+            LOGGER.trace("Album key: {}, value: {}", entry.getKey(), entry.getValue());
+            total += entry.getValue().getLongValue();
         }
+        LOGGER.info("Album total value after execution: {}", total);
 
-        if (lockType == 2) {
-            if (total == jvmCount * threadCount * threadLoops) {
-                outMetricLine(testName, "VerifiedOK");
-            } else {
-                outMetricLine(testName, "VerifiedFail");
-            }
-        } else {
-            if (total == 0) {
-                outMetricLine(testName, "VerifiedOK");
-            } else {
-                outMetricLine(testName, "VerifiedFail");
-            }
-        }
+        LOGGER.info("Completed {} ...", testName);
     }
 
-    /**
-     * Clear context.
-     *
-     * @param testName the test name
-     * @throws ContextException the context exception
-     */
-    private void clearContext(final String testName) throws ContextException {
-        contextDistributor.clear();
-        contextDistributor = null;
 
-        outMetricLine(testName, "Cleared");
-    }
-
-    /**
-     * Out metric line.
-     *
-     * @param testName the test name
-     * @param testPhase the test phase
-     */
-    public void outMetricLine(final String testName, final String testPhase) {
-        System.out.println("ContextMetrics," + dateFormat.format(new Date()) + "," + System.currentTimeMillis() + ","
-                + testLabel + "," + testName + "," + testPhase + "," + jvmCount + "," + threadCount + "," + threadLoops
-                + "," + longArraySize + "," + lockType + "," + total);
-    }
 }
diff --git a/testsuites/performance/performance-context-metrics/src/main/java/org/onap/policy/apex/plugins/context/metrics/ConcurrentContextMetricsJVM.java b/testsuites/performance/performance-context-metrics/src/main/java/org/onap/policy/apex/plugins/context/metrics/ConcurrentContextMetricsJVM.java
deleted file mode 100644
index ed81e39a1..000000000
--- a/testsuites/performance/performance-context-metrics/src/main/java/org/onap/policy/apex/plugins/context/metrics/ConcurrentContextMetricsJVM.java
+++ /dev/null
@@ -1,212 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- *  Copyright (C) 2016-2018 Ericsson. 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.
- * 
- * SPDX-License-Identifier: Apache-2.0
- * ============LICENSE_END=========================================================
- */
-
-package org.onap.policy.apex.plugins.context.metrics;
-
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.io.InputStreamReader;
-import java.util.Arrays;
-
-import org.onap.policy.apex.context.ContextAlbum;
-import org.onap.policy.apex.context.Distributor;
-import org.onap.policy.apex.context.impl.distribution.DistributorFactory;
-import org.onap.policy.apex.context.test.factory.TestContextAlbumFactory;
-import org.onap.policy.apex.core.infrastructure.threading.ThreadUtilities;
-import org.onap.policy.apex.model.basicmodel.concepts.ApexException;
-import org.onap.policy.apex.model.basicmodel.concepts.AxArtifactKey;
-import org.onap.policy.apex.model.basicmodel.service.AbstractParameters;
-import org.onap.policy.apex.model.basicmodel.service.ParameterService;
-import org.onap.policy.apex.model.contextmodel.concepts.AxContextModel;
-import org.onap.policy.apex.model.utilities.Assertions;
-import org.slf4j.ext.XLogger;
-import org.slf4j.ext.XLoggerFactory;
-
-import com.google.gson.Gson;
-import com.google.gson.JsonSyntaxException;
-
-/**
- * The Class ConcurrentContextMetricsJVM rins in its own JVM to test concurrent context updates and
- * lockings across JVMs.
- *
- * @author Liam Fallon (liam.fallon@ericsson.com)
- */
-public final class ConcurrentContextMetricsJVM {
-    // Logger for this class
-    private static final XLogger LOGGER = XLoggerFactory.getXLogger(ConcurrentContextMetricsJVM.class);
-
-    private static final int NUM_ARGS = 6;
-    private static final int ARG_JVM_NO = 1;
-    private static final int ARG_THREAD_COUNT = 2;
-    private static final int ARG_ITERATIONS = 3;
-    private static final int ARG_ARRAY_SIZE = 4;
-    private static final int ARG_LOCK_TYPE = 5;
-
-    private static final int WAIT_10_MS = 10;
-
-    /**
-     * The Constructor for this class.
-     *
-     * @param testType the test type
-     * @param jvmNo the jvm no
-     * @param threadCount the thread count
-     * @param threadLoops the thread loops
-     * @param longArraySize the long array size
-     * @param lockType the lock type
-     * @throws ApexException the apex exception
-     * @throws IOException the IO exception
-     */
-    private ConcurrentContextMetricsJVM(final String testType, final int jvmNo, final int threadCount,
-            final int threadLoops, final int longArraySize, final int lockType) throws ApexException, IOException {
-        LOGGER.debug("starting JVMs and threads . . .");
-
-        final BufferedReader bufferedReader = new BufferedReader(new InputStreamReader(System.in));
-
-        // Set up the distributor for this JVM
-        final AxArtifactKey distributorKey = new AxArtifactKey("ApexDistributor", "0.0.1");
-        final Distributor contextDistributor = new DistributorFactory().getDistributor(distributorKey);
-
-        final AxArtifactKey[] usedArtifactStackArray = {new AxArtifactKey("testC-top_" + jvmNo, "0.0.1"),
-                new AxArtifactKey("testC-next_" + jvmNo, "0.0.1"), new AxArtifactKey("testC-bot_" + jvmNo, "0.0.1")};
-
-        final AxContextModel testAxContextModel = TestContextAlbumFactory.createLongContextModel();
-        contextDistributor.registerModel(testAxContextModel);
-        final ContextAlbum testContextAlbum =
-                contextDistributor.createContextAlbum(new AxArtifactKey("LongSameTypeContextAlbum", "0.0.1"));
-        Assertions.argumentNotNull(testContextAlbum, "testContextAlbum may not be null");
-        testContextAlbum.setUserArtifactStack(usedArtifactStackArray);
-
-        final Thread[] threadArray = new Thread[threadCount];
-
-        for (int t = 0; t < threadCount; t++) {
-            threadArray[t] =
-                    new Thread(new ConcurrentContextMetricsThread(jvmNo, t, threadLoops, longArraySize, lockType));
-            threadArray[t].setName(testType + ":ConcurrentContextMetricsThread_" + jvmNo + "_" + t);
-            threadArray[t].start();
-            LOGGER.debug("started thread " + threadArray[t].getName());
-        }
-
-        System.out.println("ReadyToGo");
-        while (true) {
-            final String goLine = bufferedReader.readLine();
-            if (!goLine.trim().equals("OffYouGo")) {
-                throw new IOException("Expected OffYouGo");
-            }
-            break;
-        }
-
-        boolean allFinished;
-        do {
-            allFinished = true;
-            for (int t = 0; t < threadCount; t++) {
-                if (threadArray[t].isAlive()) {
-                    allFinished = false;
-                    ThreadUtilities.sleep(WAIT_10_MS);
-                    break;
-                }
-            }
-        } while (!allFinished);
-
-        System.out.println("AllFinished");
-        while (true) {
-            final String goLine = bufferedReader.readLine();
-            if (!goLine.trim().equals("FinishItOut")) {
-                throw new IOException("Expected FinishItOut");
-            }
-            break;
-        }
-
-        LOGGER.debug("threads finished");
-        contextDistributor.clear();
-    }
-
-    /**
-     * The main method.
-     *
-     * @param args the args
-     * @throws JsonSyntaxException the json syntax exception
-     * @throws ClassNotFoundException the class not found exception
-     */
-    @SuppressWarnings("unchecked")
-    public static void main(final String[] args) throws JsonSyntaxException, ClassNotFoundException {
-        if (args.length < NUM_ARGS || (args.length % 2 != 0)) {
-            LOGGER.error("invalid arguments: " + Arrays.toString(args));
-            LOGGER.error(
-                    "usage: ConcurrentContextMetricsJVM testLabel jvmNo threadCount threadLoops longArraySize lockType [parameterKey parameterJson].... ");
-            return;
-        }
-
-        int jvmNo = -1;
-        int threadCount = -1;
-        int threadLoops = -1;
-        int longArraySize = -1;
-        int lockType = -1;
-
-        try {
-            jvmNo = Integer.parseInt(args[ARG_JVM_NO]);
-        } catch (final Exception e) {
-            LOGGER.error("invalid argument jvmNo", e);
-            return;
-        }
-
-        try {
-            threadCount = Integer.parseInt(args[ARG_THREAD_COUNT]);
-        } catch (final Exception e) {
-            LOGGER.error("invalid argument threadCount", e);
-            return;
-        }
-
-        try {
-            threadLoops = Integer.parseInt(args[ARG_ITERATIONS]);
-        } catch (final Exception e) {
-            LOGGER.error("invalid argument threadLoops", e);
-            return;
-        }
-
-        try {
-            longArraySize = Integer.parseInt(args[ARG_ARRAY_SIZE]);
-        } catch (final Exception e) {
-            LOGGER.error("invalid argument longArraySize", e);
-            return;
-        }
-
-        try {
-            lockType = Integer.parseInt(args[ARG_LOCK_TYPE]);
-        } catch (final Exception e) {
-            LOGGER.error("invalid argument lockType", e);
-            return;
-        }
-
-        for (int p = NUM_ARGS; p < args.length - 1; p += 2) {
-            @SuppressWarnings("rawtypes")
-            final Class parametersClass = Class.forName(args[p]);
-            final AbstractParameters parameters =
-                    (AbstractParameters) new Gson().fromJson(args[p + 1], parametersClass);
-            ParameterService.registerParameters(parametersClass, parameters);
-        }
-
-        try {
-            new ConcurrentContextMetricsJVM(args[0], jvmNo, threadCount, threadLoops, longArraySize, lockType);
-        } catch (final Exception e) {
-            LOGGER.error("error running test in JVM", e);
-            return;
-        }
-    }
-}
diff --git a/testsuites/performance/performance-context-metrics/src/main/java/org/onap/policy/apex/plugins/context/metrics/ConcurrentContextMetricsJVMThread.java b/testsuites/performance/performance-context-metrics/src/main/java/org/onap/policy/apex/plugins/context/metrics/ConcurrentContextMetricsJVMThread.java
deleted file mode 100644
index 64bc0cab6..000000000
--- a/testsuites/performance/performance-context-metrics/src/main/java/org/onap/policy/apex/plugins/context/metrics/ConcurrentContextMetricsJVMThread.java
+++ /dev/null
@@ -1,187 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- *  Copyright (C) 2016-2018 Ericsson. 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.
- * 
- * SPDX-License-Identifier: Apache-2.0
- * ============LICENSE_END=========================================================
- */
-
-package org.onap.policy.apex.plugins.context.metrics;
-
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.io.PrintWriter;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map.Entry;
-
-import org.onap.policy.apex.model.basicmodel.concepts.ApexException;
-import org.onap.policy.apex.model.basicmodel.service.AbstractParameters;
-import org.onap.policy.apex.model.basicmodel.service.ParameterService;
-import org.slf4j.ext.XLogger;
-import org.slf4j.ext.XLoggerFactory;
-
-import com.google.gson.Gson;
-
-/**
- * The Class ConcurrentContextMetricsJVMThread gets metrics for concurrent use of context.
- *
- * @author Liam Fallon (liam.fallon@ericsson.com)
- */
-public class ConcurrentContextMetricsJVMThread implements Runnable {
-    // Logger for this class
-    private static final XLogger LOGGER = XLoggerFactory.getXLogger(ConcurrentContextMetricsJVMThread.class);
-
-    private final String testType;
-    private final int jvm;
-    private final int threadCount;
-    private final int threadLoops;
-    private final int longArraySize;
-    private final int lockType;
-
-    private boolean readyToGo = false;
-    private boolean allFinished = false;
-
-    private PrintWriter processWriter;
-
-    /**
-     * The Constructor.
-     *
-     * @param testType the test type
-     * @param jvm the jvm
-     * @param threadCount the thread count
-     * @param threadLoops the thread loops
-     * @param longArraySize the long array size
-     * @param lockType the lock type
-     * @throws ApexException the apex exception
-     */
-    public ConcurrentContextMetricsJVMThread(final String testType, final int jvm, final int threadCount,
-            final int threadLoops, final int longArraySize, final int lockType) throws ApexException {
-        this.testType = testType;
-        this.jvm = jvm;
-        this.threadCount = threadCount;
-        this.threadLoops = threadLoops;
-        this.longArraySize = longArraySize;
-        this.lockType = lockType;
-    }
-
-    /*
-     * (non-Javadoc)
-     *
-     * @see java.lang.Runnable#run()
-     */
-    @Override
-    public void run() {
-        final List<String> commandList = new ArrayList<>();
-        commandList.add(System.getProperty("java.home") + System.getProperty("file.separator") + "bin"
-                + System.getProperty("file.separator") + "java");
-        commandList.add("-cp");
-        commandList.add(System.getProperty("java.class.path"));
-        for (final Entry<Object, Object> property : System.getProperties().entrySet()) {
-            if (property.getKey().toString().startsWith("APEX")
-                    || property.getKey().toString().equals("java.net.preferIPv4Stack")
-                    || property.getKey().toString().equals("jgroups.bind_addr")) {
-                commandList.add("-D" + property.getKey().toString() + "=" + property.getValue().toString());
-            }
-        }
-        commandList.add("org.onap.policy.apex.plugins.context.metrics.ConcurrentContextMetricsJVM");
-        commandList.add(testType);
-        commandList.add(new Integer(jvm).toString());
-        commandList.add(new Integer(threadCount).toString());
-        commandList.add(new Integer(threadLoops).toString());
-        commandList.add(new Integer(longArraySize).toString());
-        commandList.add(new Integer(lockType).toString());
-
-        for (final Entry<Class<?>, AbstractParameters> parameterServiceEntry : ParameterService.getAll()) {
-            commandList.add(parameterServiceEntry.getKey().getCanonicalName());
-            commandList.add(new Gson().toJson(parameterServiceEntry.getValue()));
-        }
-
-        LOGGER.info("starting JVM " + jvm);
-
-        // Run the JVM
-        final ProcessBuilder processBuilder = new ProcessBuilder(commandList);
-        processBuilder.redirectErrorStream(true);
-        Process process;
-
-        try {
-            process = processBuilder.start();
-
-            final InputStream is = process.getInputStream();
-            processWriter = new PrintWriter(process.getOutputStream());
-            final InputStreamReader isr = new InputStreamReader(is);
-            final BufferedReader br = new BufferedReader(isr);
-
-            String line;
-
-            LOGGER.info("JVM Output for command " + commandList + "\n");
-            while ((line = br.readLine()) != null) {
-                LOGGER.info(line);
-
-                if (line.trim().equals("ReadyToGo")) {
-                    readyToGo = true;
-                } else if (line.trim().equals("AllFinished")) {
-                    allFinished = true;
-                }
-            }
-
-            // Wait to get exit value
-            try {
-                final int exitValue = process.waitFor();
-                LOGGER.info("\n\nJVM " + jvm + " finished, exit value is " + exitValue);
-            } catch (final InterruptedException e) {
-                e.printStackTrace();
-            }
-        } catch (final IOException e1) {
-            e1.printStackTrace();
-        }
-    }
-
-    /**
-     * Checks if is ready to go.
-     *
-     * @return true, if checks if is ready to go
-     */
-    public boolean isReadyToGo() {
-        return readyToGo;
-    }
-
-    /**
-     * Checks if is all finished.
-     *
-     * @return true, if checks if is all finished
-     */
-    public boolean isAllFinished() {
-        return allFinished;
-    }
-
-    /**
-     * Off you go.
-     */
-    public void offYouGo() {
-        processWriter.println("OffYouGo");
-        processWriter.flush();
-    }
-
-    /**
-     * Finish it out.
-     */
-    public void finishItOut() {
-        processWriter.println("FinishItOut");
-        processWriter.flush();
-    }
-}
diff --git a/testsuites/performance/performance-context-metrics/src/main/java/org/onap/policy/apex/plugins/context/metrics/ConcurrentContextMetricsThread.java b/testsuites/performance/performance-context-metrics/src/main/java/org/onap/policy/apex/plugins/context/metrics/ConcurrentContextMetricsThread.java
deleted file mode 100644
index e207832c1..000000000
--- a/testsuites/performance/performance-context-metrics/src/main/java/org/onap/policy/apex/plugins/context/metrics/ConcurrentContextMetricsThread.java
+++ /dev/null
@@ -1,170 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- *  Copyright (C) 2016-2018 Ericsson. 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.
- * 
- * SPDX-License-Identifier: Apache-2.0
- * ============LICENSE_END=========================================================
- */
-
-package org.onap.policy.apex.plugins.context.metrics;
-
-import java.util.Random;
-
-import org.onap.policy.apex.context.ContextAlbum;
-import org.onap.policy.apex.context.ContextException;
-import org.onap.policy.apex.context.Distributor;
-import org.onap.policy.apex.context.impl.distribution.DistributorFactory;
-import org.onap.policy.apex.context.test.concepts.TestContextLongItem;
-import org.onap.policy.apex.context.test.factory.TestContextAlbumFactory;
-import org.onap.policy.apex.model.basicmodel.concepts.ApexException;
-import org.onap.policy.apex.model.basicmodel.concepts.AxArtifactKey;
-import org.onap.policy.apex.model.contextmodel.concepts.AxContextModel;
-import org.slf4j.ext.XLogger;
-import org.slf4j.ext.XLoggerFactory;
-
-/**
- * The Class ConcurrentContextMetricsThread gets metrics for concurrent use of context.
- *
- * @author Liam Fallon (liam.fallon@ericsson.com)
- */
-public class ConcurrentContextMetricsThread implements Runnable {
-    // Logger for this class
-    private static final XLogger LOGGER = XLoggerFactory.getXLogger(ConcurrentContextMetricsThread.class);
-    private final Distributor contextDistributor;
-    private final int jvm;
-    private final int instance;
-    private final int threadLoops;
-    private final int longArraySize;
-    private final int lockType;
-
-    /**
-     * The Constructor.
-     *
-     * @param jvm the jvm
-     * @param instance the instance
-     * @param threadLoops the thread loops
-     * @param longArraySize the long array size
-     * @param lockType the lock type
-     * @throws ApexException the apex exception
-     */
-    public ConcurrentContextMetricsThread(final int jvm, final int instance, final int threadLoops,
-            final int longArraySize, final int lockType) throws ApexException {
-        this.jvm = jvm;
-        this.instance = instance;
-        this.threadLoops = threadLoops;
-        this.longArraySize = longArraySize;
-        this.lockType = lockType;
-
-        final AxArtifactKey distributorKey = new AxArtifactKey("ApexDistributor_" + jvm + "_" + instance, "0.0.1");
-        contextDistributor = new DistributorFactory().getDistributor(distributorKey);
-    }
-
-    /*
-     * (non-Javadoc)
-     *
-     * @see java.lang.Runnable#run()
-     */
-    @Override
-    public void run() {
-        LOGGER.info("running ConcurrentContextMetricsThread_" + jvm + "_" + instance + " . . .");
-
-        ContextAlbum lTypeAlbum = null;
-        try {
-            final AxContextModel axTestContextModel = TestContextAlbumFactory.createMultiAlbumsContextModel();
-            contextDistributor.registerModel(axTestContextModel);
-            lTypeAlbum = contextDistributor.createContextAlbum(new AxArtifactKey("LTypeContextAlbum", "0.0.1"));
-        } catch (final Exception e) {
-            LOGGER.error("could not get the test context album", e);
-            LOGGER.error("failed ConcurrentContextMetricsThread_" + jvm + "_" + instance);
-            return;
-        }
-
-        if (lTypeAlbum == null) {
-            LOGGER.error("could not find the test context album");
-            LOGGER.error("failed ConcurrentContextMetricsThread_" + jvm + "_" + instance);
-            return;
-        }
-
-        final AxArtifactKey[] usedArtifactStackArray =
-                {new AxArtifactKey("testCC-top", "0.0.1"), new AxArtifactKey("testCC-" + instance, "0.0.1")};
-
-        lTypeAlbum.setUserArtifactStack(usedArtifactStackArray);
-
-        final Random rand = new Random();
-
-        for (int i = 0; i < threadLoops; i++) {
-            // Get the next random entry to use
-            final String nextLongKey = Integer.toString(rand.nextInt(longArraySize));
-
-            if (lockType == 0) {
-                final TestContextLongItem item = (TestContextLongItem) lTypeAlbum.get(nextLongKey);
-                final long value = item.getLongValue();
-                if (LOGGER.isTraceEnabled()) {
-                    LOGGER.trace("lock type=" + lockType + ", value=" + value);
-                }
-                continue;
-            }
-
-            if (lockType == 1) {
-                try {
-                    lTypeAlbum.lockForReading(nextLongKey);
-                } catch (final ContextException e) {
-                    LOGGER.error("could not acquire read lock on context album, key=" + nextLongKey, e);
-                    continue;
-                }
-
-                final TestContextLongItem item = (TestContextLongItem) lTypeAlbum.get(nextLongKey);
-                final long value = item.getLongValue();
-                if (LOGGER.isTraceEnabled()) {
-                    LOGGER.trace("lock type=" + lockType + ", value=" + value);
-                }
-
-                try {
-                    lTypeAlbum.unlockForReading(nextLongKey);
-                } catch (final ContextException e) {
-                    LOGGER.error("could not release read lock on context album, key=" + nextLongKey, e);
-                }
-
-                continue;
-            }
-
-            if (lockType == 2) {
-                try {
-                    lTypeAlbum.lockForWriting(nextLongKey);
-                } catch (final ContextException e) {
-                    LOGGER.error("could not acquire write lock on context album, key=" + nextLongKey, e);
-                    continue;
-                }
-
-                final TestContextLongItem item = (TestContextLongItem) lTypeAlbum.get(nextLongKey);
-                long value = item.getLongValue();
-                if (LOGGER.isTraceEnabled()) {
-                    LOGGER.trace("lock type=" + lockType + ", value=" + value);
-                }
-                item.setLongValue(++value);
-                lTypeAlbum.put(nextLongKey, item);
-
-                try {
-                    lTypeAlbum.unlockForWriting(nextLongKey);
-                } catch (final ContextException e) {
-                    LOGGER.error("could not release write lock on context album, key=" + nextLongKey, e);
-                }
-                continue;
-            }
-        }
-
-        LOGGER.info("completed ConcurrentContextMetricsThread_" + jvm + "_" + instance);
-    }
-}
diff --git a/testsuites/performance/performance-context-metrics/src/test/java/org/onap/policy/apex/plugins/context/metrics/TestMetrics.java b/testsuites/performance/performance-context-metrics/src/test/java/org/onap/policy/apex/plugins/context/metrics/TestMetrics.java
index 5607f8711..9f051eb82 100644
--- a/testsuites/performance/performance-context-metrics/src/test/java/org/onap/policy/apex/plugins/context/metrics/TestMetrics.java
+++ b/testsuites/performance/performance-context-metrics/src/test/java/org/onap/policy/apex/plugins/context/metrics/TestMetrics.java
@@ -22,36 +22,59 @@ package org.onap.policy.apex.plugins.context.metrics;
 
 import static org.junit.Assert.fail;
 
+import java.io.File;
 import java.io.IOException;
+import java.util.Arrays;
+import java.util.TreeSet;
 
-import org.apache.curator.test.TestingServer;
-import org.junit.After;
-import org.junit.Before;
+import org.junit.BeforeClass;
+import org.junit.Rule;
 import org.junit.Test;
+import org.junit.rules.TemporaryFolder;
+import org.onap.policy.apex.context.test.utils.NetworkUtils;
+import org.onap.policy.apex.model.utilities.ResourceUtils;
+import org.slf4j.ext.XLogger;
+import org.slf4j.ext.XLoggerFactory;
 
 public class TestMetrics {
-    // Zookeeper test server
-    TestingServer zkTestServer;
+    // Logger for this class
+    private static final XLogger LOGGER = XLoggerFactory.getXLogger(TestMetrics.class);
+    private static final String HAZELCAST_CONFIG = "hazelcast.config";
 
-    @Before
-    public void beforeTest() throws Exception {
-        zkTestServer = new TestingServer(62181);
-    }
+    private static final String JAVA_NET_PREFER_IPV4_STACK = "java.net.preferIPv4Stack";
+    private static final String HAZELCAST_XML_FILE = "src/test/resources/hazelcast/hazelcast.xml";
+
+    @Rule
+    public final TemporaryFolder folder = new TemporaryFolder();
+
+    @BeforeClass
+    public static void configure() throws Exception {
+        System.setProperty(JAVA_NET_PREFER_IPV4_STACK, "true");
+        final String hazelCastfileLocation = ResourceUtils.getFilePath4Resource(HAZELCAST_XML_FILE);
+        System.setProperty(HAZELCAST_CONFIG, hazelCastfileLocation);
+
+        final TreeSet<String> ipAddressSet = NetworkUtils.getIPv4NonLoopAddresses();
+
+        if (ipAddressSet.size() == 0) {
+            throw new Exception("cound not find real IP address for test");
+        }
+        LOGGER.info("For Infinispan, setting jgroups.tcp.address to: {}", ipAddressSet.first());
+        System.setProperty("jgroups.tcp.address", ipAddressSet.first());
 
-    @After
-    public void afterTest() throws IOException {
-        zkTestServer.stop();
     }
 
     @Test
-    public void getSingleJVMMetrics() {
-        final String[] args = {"singleJVMTestNL", "1", "32", "1000", "65536", "0", "localhost:62181", "false"};
+    public void getSingleJVMMetrics() throws IOException {
+        final File zookeeperDirectory = folder.newFolder("zookeeperDirectory");
+        final String[] args = {"singleJVMTestNL", "1", "32", "1000", "65536", "0", "localhost", "62181",
+                zookeeperDirectory.getAbsolutePath()};
 
+        LOGGER.info("Starting with args: {}", Arrays.toString(args));
         try {
             ConcurrentContextMetrics.main(args);
-        } catch (final Exception e) {
+        } catch (final Exception exception) {
+            LOGGER.error("Unexpected error", exception);
             fail("Metrics test failed");
-            e.printStackTrace();
         }
     }
 }
diff --git a/testsuites/performance/performance-context-metrics/src/test/resources/hazelcast/hazelcast.xml b/testsuites/performance/performance-context-metrics/src/test/resources/hazelcast/hazelcast.xml
index 84da4951e..b70bdc36e 100644
--- a/testsuites/performance/performance-context-metrics/src/test/resources/hazelcast/hazelcast.xml
+++ b/testsuites/performance/performance-context-metrics/src/test/resources/hazelcast/hazelcast.xml
@@ -19,625 +19,45 @@
   ============LICENSE_END=========================================================
 -->
 
-<hazelcast xmlns="http://www.hazelcast.com/schema/config"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-	<group>
-		<name>HazelcastGroup3.0EVAL</name>
-		<password>password3.0EVAL</password>
-	</group>
-	<network>
-		<port auto-increment="true">5706</port>
-		<join>
-			<multicast enabled="false">
-				<multicast-group>224.2.2.10</multicast-group>
-				<multicast-port>54327</multicast-port>
-			</multicast>
-			<tcp-ip enabled="true">
-				<members>10.0.0.0</members>
-				<!-- members>192.168.219.141</members-->
-			</tcp-ip>
-		</join>
-		<interfaces enabled="false">
+<hazelcast xmlns="http://www.hazelcast.com/schema/config" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+    <group>
+        <name>HazelcastGroup3.0EVAL</name>
+        <password>password3.0EVAL</password>
+    </group>
+    <network>
+        <port auto-increment="true">5706</port>
+        <join>
+            <multicast enabled="false">
+                <multicast-group>224.2.2.10</multicast-group>
+                <multicast-port>54327</multicast-port>
+            </multicast>
+            <tcp-ip enabled="true">
+                <members>127.0.0.1</members>
+            </tcp-ip>
+        </join>
+        <interfaces enabled="false">
 			<!-- This value will allow hazelcast to run locally from the IDE -->
-			<interface>127.0.0.*</interface>
-		</interfaces>
-	</network>
-	<properties>
-		<property name="hazelcast.icmp.enabled">true</property>
-		<property name="hazelcast.logging.type">slf4j</property>
+            <interface>127.0.0.*</interface>
+        </interfaces>
+    </network>
+    <properties>
+        <property name="hazelcast.icmp.enabled">false</property>
+        <property name="hazelcast.logging.type">slf4j</property>
 		<!-- disable the hazelcast shutdown hook - prefer to control the shutdown 
 			in code -->
-		<property name="hazelcast.shutdownhook.enabled">false</property>
-		<property name="hazelcast.graceful.shutdown.max.wait">60</property>
-	</properties>
-	<executor-service>
-		<pool-size>16</pool-size>
-	</executor-service>
-	<queue name="default">
-		<!-- Maximum size of the queue. Any integer between 0 and Integer.MAX_VALUE. 
-			0 means Integer.MAX_VALUE. Default is 0. -->
-		<max-size>100000</max-size>
-		<!-- Maximum number of seconds for each item to stay in the queue. Items 
-			that are not consumed in <time-to-live-seconds> will automatically get evicted 
-			from the queue. Any integer between 0 and Integer.MAX_VALUE. 0 means infinite. 
-			Default is 0. -->
-	</queue>
-	<map name="default">
-		<!-- Number of backups. If 1 is set as the backup-count for example, then 
-			all entries of the map will be copied to another JVM for fail-safety. Valid 
-			numbers are 0 (no backup), 1, 2, 3. -->
-		<backup-count>1</backup-count>
-		<!-- Valid values are: NONE (no eviction), LRU (Least Recently Used), LFU 
-			(Least Frequiently Used). NONE is the default. -->
-		<eviction-policy>NONE</eviction-policy>
-		<!-- Maximum size of the map. When max size is reached, map is evicted 
-			based on the policy defined. Any integer between 0 and Integer.MAX_VALUE. 
-			0 means Integer.MAX_VALUE. Default is 0. -->
-		<max-size>0</max-size>
-		<!-- When max. size is reached, specified percentage of the map will be 
-			evicted. Any integer between 0 and 100. If 25 is set for example, 25% of 
-			the entries will get evicted. -->
-		<eviction-percentage>25</eviction-percentage>
-	</map>
-	<map name="L_ATTACH-Map">
-		<!-- Number of backups. If 1 is set as the backup-count for example, then 
-			all entries of the map will be copied to another JVM for fail-safety. Valid 
-			numbers are 0 (no backup), 1, 2, 3. -->
-		<backup-count>1</backup-count>
-		<!-- Valid values are: NONE (no eviction), LRU (Least Recently Used), LFU 
-			(Least Frequiently Used). NONE is the default. -->
-		<eviction-policy>LRU</eviction-policy>
-		<!-- Maximum size of the map. When max size is reached, map is evicted 
-			based on the policy defined. Any integer between 0 and Integer.MAX_VALUE. 
-			0 means Integer.MAX_VALUE. Default is 0. -->
-		<max-size>1000000</max-size>
-		<!-- When max. size is reached, specified percentage of the map will be 
-			evicted. Any integer between 0 and 100. If 25 is set for example, 25% of 
-			the entries will get evicted. -->
-		<eviction-percentage>5</eviction-percentage>
-
-		<!-- Maximum number of seconds for each entry to stay in the map. Entries 
-			that are older than <time-to-live-seconds> and not updated for <time-to-live-seconds> 
-			will get automatically evicted from the map. Any integer between 0 and Integer.MAX_VALUE. 
-			0 means infinite. Default is 0. -->
-		<time-to-live-seconds>0</time-to-live-seconds>
-
-		<!-- <map-store enabled="true"> Name of the class implementing MapLoader 
-			and/or MapStore. The class should implement at least of these interfaces 
-			and contain no-argument constructor. Note that the inner classes are not 
-			supported. <class-name>com.ericsson.xstream.loading.service.buffer.L_ATTACHLoader</class-name> 
-			Number of seconds to delay to call the MapStore.store(key, value). If the 
-			value is zero then it is write-through so MapStore.store(key, value) will 
-			be called as soon as the entry is updated. Otherwise it is write-behind so 
-			updates will be stored after write-delay-seconds value by calling Hazelcast.storeAll(map). 
-			Default value is 0. <write-delay-seconds>60000</write-delay-seconds> </map-store> -->
-
-
-	</map>
-	<map name="CTUM-Map">
-		<!-- Number of backups. If 1 is set as the backup-count for example, then 
-			all entries of the map will be copied to another JVM for fail-safety. Valid 
-			numbers are 0 (no backup), 1, 2, 3. -->
-		<backup-count>1</backup-count>
-		<!-- Valid values are: NONE (no eviction), LRU (Least Recently Used), LFU 
-			(Least Frequiently Used). NONE is the default. -->
-		<eviction-policy>LRU</eviction-policy>
-		<!-- Maximum size of the map. When max size is reached, map is evicted 
-			based on the policy defined. Any integer between 0 and Integer.MAX_VALUE. 
-			0 means Integer.MAX_VALUE. Default is 0. -->
-		<max-size>1000000</max-size>
-		<!-- When max. size is reached, specified percentage of the map will be 
-			evicted. Any integer between 0 and 100. If 25 is set for example, 25% of 
-			the entries will get evicted. -->
-		<eviction-percentage>5</eviction-percentage>
-
-		<!-- Maximum number of seconds for each entry to stay in the map. Entries 
-			that are older than <time-to-live-seconds> and not updated for <time-to-live-seconds> 
-			will get automatically evicted from the map. Any integer between 0 and Integer.MAX_VALUE. 
-			0 means infinite. Default is 0. -->
-		<time-to-live-seconds>7200</time-to-live-seconds>
-
-		<!-- <map-store enabled="true"> Name of the class implementing MapLoader 
-			and/or MapStore. The class should implement at least of these interfaces 
-			and contain no-argument constructor. Note that the inner classes are not 
-			supported. <class-name>com.ericsson.xstream.loading.service.buffer.CTUMLoader</class-name> 
-			Number of seconds to delay to call the MapStore.store(key, value). If the 
-			value is zero then it is write-through so MapStore.store(key, value) will 
-			be called as soon as the entry is updated. Otherwise it is write-behind so 
-			updates will be stored after write-delay-seconds value by calling Hazelcast.storeAll(map). 
-			Default value is 0. <write-delay-seconds>3600</write-delay-seconds> </map-store> -->
-
-	</map>
-	<map name="L_HANDOVER-Map">
-		<!-- Number of backups. If 1 is set as the backup-count for example, then 
-			all entries of the map will be copied to another JVM for fail-safety. Valid 
-			numbers are 0 (no backup), 1, 2, 3. -->
-		<backup-count>1</backup-count>
-		<!-- Valid values are: NONE (no eviction), LRU (Least Recently Used), LFU 
-			(Least Frequiently Used). NONE is the default. -->
-		<eviction-policy>LRU</eviction-policy>
-		<!-- Maximum size of the map. When max size is reached, map is evicted 
-			based on the policy defined. Any integer between 0 and Integer.MAX_VALUE. 
-			0 means Integer.MAX_VALUE. Default is 0. -->
-		<max-size>1000000</max-size>
-		<!-- When max. size is reached, specified percentage of the map will be 
-			evicted. Any integer between 0 and 100. If 25 is set for example, 25% of 
-			the entries will get evicted. -->
-		<eviction-percentage>5</eviction-percentage>
-
-		<!-- Maximum number of seconds for each entry to stay in the map. Entries 
-			that are older than <time-to-live-seconds> and not updated for <time-to-live-seconds> 
-			will get automatically evicted from the map. Any integer between 0 and Integer.MAX_VALUE. 
-			0 means infinite. Default is 0. -->
-		<time-to-live-seconds>3600</time-to-live-seconds>
-
-		<!-- <map-store enabled="true"> Name of the class implementing MapLoader 
-			and/or MapStore. The class should implement at least of these interfaces 
-			and contain no-argument constructor. Note that the inner classes are not 
-			supported. <class-name>com.ericsson.xstream.base.publishing.hazelcast.L_ATTACHStore</class-name> 
-			Number of seconds to delay to call the MapStore.store(key, value). If the 
-			value is zero then it is write-through so MapStore.store(key, value) will 
-			be called as soon as the entry is updated. Otherwise it is write-behind so 
-			updates will be stored after write-delay-seconds value by calling Hazelcast.storeAll(map). 
-			Default value is 0. <write-delay-seconds>5</write-delay-seconds> </map-store> -->
-
-
-	</map>
-
-	<map name="L_SERVICE_REQUEST-Map">
-		<!-- Number of backups. If 1 is set as the backup-count for example, then 
-			all entries of the map will be copied to another JVM for fail-safety. Valid 
-			numbers are 0 (no backup), 1, 2, 3. -->
-		<backup-count>1</backup-count>
-		<!-- Valid values are: NONE (no eviction), LRU (Least Recently Used), LFU 
-			(Least Frequiently Used). NONE is the default. -->
-		<eviction-policy>LRU</eviction-policy>
-		<!-- Maximum size of the map. When max size is reached, map is evicted 
-			based on the policy defined. Any integer between 0 and Integer.MAX_VALUE. 
-			0 means Integer.MAX_VALUE. Default is 0. -->
-		<max-size>1000000</max-size>
-		<!-- When max. size is reached, specified percentage of the map will be 
-			evicted. Any integer between 0 and 100. If 25 is set for example, 25% of 
-			the entries will get evicted. -->
-		<eviction-percentage>5</eviction-percentage>
-
-		<!-- Maximum number of seconds for each entry to stay in the map. Entries 
-			that are older than <time-to-live-seconds> and not updated for <time-to-live-seconds> 
-			will get automatically evicted from the map. Any integer between 0 and Integer.MAX_VALUE. 
-			0 means infinite. Default is 0. -->
-		<time-to-live-seconds>7200</time-to-live-seconds>
-
-		<!-- <map-store enabled="true"> Name of the class implementing MapLoader 
-			and/or MapStore. The class should implement at least of these interfaces 
-			and contain no-argument constructor. Note that the inner classes are not 
-			supported. <class-name>com.ericsson.xstream.base.publishing.hazelcast.L_HandoverStore</class-name> 
-			Number of seconds to delay to call the MapStore.store(key, value). If the 
-			value is zero then it is write-through so MapStore.store(key, value) will 
-			be called as soon as the entry is updated. Otherwise it is write-behind so 
-			updates will be stored after write-delay-seconds value by calling Hazelcast.storeAll(map). 
-			Default value is 0. <write-delay-seconds>5</write-delay-seconds> </map-store> -->
-
-
-	</map>
-	<map name="CommonCache">
-
-
-		<!-- Number of async-backups. If 1 is set as the backup-count for example, 
-			then all entries of the map will be copied to another JVM for fail-safety. 
-			Valid numbers are 0 (no backup), 1, 2, 3. -->
-		<async-backup-count>1</async-backup-count>
-
-		<!-- Can we read the local backup entries? Default value is false for strong 
-			consistency. Being able to read backup data will give you greater performance. -->
-		<read-backup-data>true</read-backup-data>
-		<!-- Valid values are: NONE (no eviction), LRU (Least Recently Used), LFU 
-			(Least Frequiently Used). NONE is the default. -->
-		<eviction-policy>LRU</eviction-policy>
-		<!-- Maximum size of the map. When max size is reached, map is evicted 
-			based on the policy defined. Any integer between 0 and Integer.MAX_VALUE. 
-			0 means Integer.MAX_VALUE. Default is 0. -->
-		<max-size>3000000</max-size>
-		<!-- When max. size is reached, specified percentage of the map will be 
-			evicted. Any integer between 0 and 100. If 25 is set for example, 25% of 
-			the entries will get evicted. -->
-		<eviction-percentage>5</eviction-percentage>
-
-		<!-- Maximum number of seconds for each entry to stay in the map. Entries 
-			that are older than <time-to-live-seconds> and not updated for <time-to-live-seconds> 
-			will get automatically evicted from the map. Any integer between 0 and Integer.MAX_VALUE. 
-			0 means infinite. Default is 0. -->
-		<time-to-live-seconds>7200</time-to-live-seconds>
-
-		<!-- <map-store enabled="true"> Name of the class implementing MapLoader 
-			and/or MapStore. The class should implement at least of these interfaces 
-			and contain no-argument constructor. Note that the inner classes are not 
-			supported. <class-name>com.ericsson.xstream.base.publishing.hazelcast.L_HandoverStore</class-name> 
-			Number of seconds to delay to call the MapStore.store(key, value). If the 
-			value is zero then it is write-through so MapStore.store(key, value) will 
-			be called as soon as the entry is updated. Otherwise it is write-behind so 
-			updates will be stored after write-delay-seconds value by calling Hazelcast.storeAll(map). 
-			Default value is 0. <write-delay-seconds>5</write-delay-seconds> </map-store> -->
-
-
-	</map>
-
-
-	<map name="Topology-Map">
-
-		<!-- Number of backups. If 1 is set as the backup-count for example, then 
-			all entries of the map will be copied to another JVM for fail-safety. Valid 
-			numbers are 0 (no backup), 1, 2, 3. -->
-		<backup-count>2</backup-count>
-		<!-- Valid values are: NONE (no eviction), LRU (Least Recently Used), LFU 
-			(Least Frequiently Used). NONE is the default. -->
-		<eviction-policy>NONE</eviction-policy>
-		<!-- Maximum size of the map. When max size is reached, map is evicted 
-			based on the policy defined. Any integer between 0 and Integer.MAX_VALUE. 
-			0 means Integer.MAX_VALUE. Default is 0. -->
-		<max-size>10000000</max-size>
-		<!-- When max. size is reached, specified percentage of the map will be 
-			evicted. Any integer between 0 and 100. If 25 is set for example, 25% of 
-			the entries will get evicted. -->
-		<eviction-percentage>0</eviction-percentage>
-
-
-		<!-- Maximum number of seconds for each entry to stay in the map. Entries 
-			that are older than <time-to-live-seconds> and not updated for <time-to-live-seconds> 
-			will get automatically evicted from the map. Any integer between 0 and Integer.MAX_VALUE. 
-			0 means infinite. Default is 0. -->
-		<time-to-live-seconds>0</time-to-live-seconds>
-
-		<!-- <map-store enabled="true"> Name of the class implementing MapLoader 
-			and/or MapStore. The class should implement at least of these interfaces 
-			and contain no-argument constructor. Note that the inner classes are not 
-			supported. <class-name>com.ericsson.xstream.loading.service.buffer.TopologyCacheLoader</class-name> 
-			Number of seconds to delay to call the MapStore.store(key, value). If the 
-			value is zero then it is write-through so MapStore.store(key, value) will 
-			be called as soon as the entry is updated. Otherwise it is write-behind so 
-			updates will be stored after write-delay-seconds value by calling Hazelcast.storeAll(map). 
-			Default value is 0. <write-delay-seconds>5</write-delay-seconds> </map-store> -->
-
-
-
-	</map>
-	<map name="Protocol-cause-code-Map">
-		<near-cache>
-			<!-- Maximum number of seconds for each entry to stay in the near cache. 
-				Entries that are older than <time-to-live-seconds> will get automatically 
-				evicted from the near cache. Any integer between 0 and Integer.MAX_VALUE. 
-				0 means infinite. Default is 0. -->
-			<time-to-live-seconds>0</time-to-live-seconds>
-
-			<!-- Maximum number of seconds each entry can stay in the near cache as 
-				untouched (not-read). Entries that are not read (touched) more than <max-idle-seconds> 
-				value will get removed from the near cache. Any integer between 0 and Integer.MAX_VALUE. 
-				0 means Integer.MAX_VALUE. Default is 0. -->
-			<max-idle-seconds>0</max-idle-seconds>
-
-			<!-- Valid values are: NONE (no extra eviction, <time-to-live-seconds> 
-				may still apply), LRU (Least Recently Used), LFU (Least Frequently Used). 
-				NONE is the default. Regardless of the eviction policy used, <time-to-live-seconds> 
-				will still apply. -->
-			<eviction-policy>NONE</eviction-policy>
-
-			<!-- Maximum size of the near cache. When max size is reached, cache is 
-				evicted based on the policy defined. Any integer between 0 and Integer.MAX_VALUE. 
-				0 means Integer.MAX_VALUE. Default is 0. -->
-			<max-size>2000</max-size>
-
-			<!-- Should the cached entries get evicted if the entries are changed 
-				(updated or removed). true of false. Default is true. -->
-			<invalidate-on-change>true</invalidate-on-change>
-
-		</near-cache>
-
-
-
-	</map>
-	<map name="SessionId_Map">
-
-		<!-- Number of backups. If 1 is set as the backup-count for example, then 
-			all entries of the map will be copied to another JVM for fail-safety. Valid 
-			numbers are 0 (no backup), 1, 2, 3. -->
-		<backup-count>1</backup-count>
-		<!-- Valid values are: NONE (no eviction), LRU (Least Recently Used), LFU 
-			(Least Frequiently Used). NONE is the default. -->
-		<eviction-policy>NONE</eviction-policy>
-		<!-- Maximum size of the map. When max size is reached, map is evicted 
-			based on the policy defined. Any integer between 0 and Integer.MAX_VALUE. 
-			0 means Integer.MAX_VALUE. Default is 0. -->
-		<max-size>10000000</max-size>
-		<!-- When max. size is reached, specified percentage of the map will be 
-			evicted. Any integer between 0 and 100. If 25 is set for example, 25% of 
-			the entries will get evicted. -->
-		<eviction-percentage>0</eviction-percentage>
-
-
-		<!-- Maximum number of seconds for each entry to stay in the map. Entries 
-			that are older than <time-to-live-seconds> and not updated for <time-to-live-seconds> 
-			will get automatically evicted from the map. Any integer between 0 and Integer.MAX_VALUE. 
-			0 means infinite. Default is 0. -->
-		<time-to-live-seconds>60</time-to-live-seconds>
-		<!-- <map-store enabled="true"> Name of the class implementing MapLoader 
-			and/or MapStore. The class should implement at least of these interfaces 
-			and contain no-argument constructor. Note that the inner classes are not 
-			supported. <class-name>com.ericsson.xstream.loading.service.buffer.TopologyCacheLoader</class-name> 
-			Number of seconds to delay to call the MapStore.store(key, value). If the 
-			value is zero then it is write-through so MapStore.store(key, value) will 
-			be called as soon as the entry is updated. Otherwise it is write-behind so 
-			updates will be stored after write-delay-seconds value by calling Hazelcast.storeAll(map). 
-			Default value is 0. <write-delay-seconds>5</write-delay-seconds> </map-store> -->
-
-
-	</map>
-	<map name="gpeh-reasons-Map">
-		<!-- Number of backups. If 1 is set as the backup-count for example, then 
-			all entries of the map will be copied to another JVM for fail-safety. Valid 
-			numbers are 0 (no backup), 1, 2, 3. -->
-		<backup-count>2</backup-count>
-		<!-- When max. size is reached, specified percentage of the map will be 
-			evicted. Any integer between 0 and 100. If 25 is set for example, 25% of 
-			the entries will get evicted. -->
-		<eviction-percentage>0</eviction-percentage>
-		<near-cache>
-			<!-- Number of backups. If 1 is set as the backup-count for example, then 
-				all entries of the map will be copied to another JVM for fail-safety. Valid 
-				numbers are 0 (no backup), 1, 2, 3. -->
-			<!-- Valid values are: NONE (no eviction), LRU (Least Recently Used), 
-				LFU (Least Frequently Used). NONE is the default. -->
-			<eviction-policy>NONE</eviction-policy>
-			<!-- Maximum size of the map. When max size is reached, map is evicted 
-				based on the policy defined. Any integer between 0 and Integer.MAX_VALUE. 
-				0 means Integer.MAX_VALUE. Default is 0. -->
-			<max-size>1000</max-size>
-
-
-			<!-- Maximum number of seconds for each entry to stay in the map. Entries 
-				that are older than <time-to-live-seconds> and not updated for <time-to-live-seconds> 
-				will get automatically evicted from the map. Any integer between 0 and Integer.MAX_VALUE. 
-				0 means infinite. Default is 0. -->
-			<time-to-live-seconds>0</time-to-live-seconds>
-		</near-cache>
-	</map>
-	<map name="tac-imei-Map">
-		<!-- Number of backups. If 1 is set as the backup-count for example, then 
-			all entries of the map will be copied to another JVM for fail-safety. Valid 
-			numbers are 0 (no backup), 1, 2, 3. -->
-		<backup-count>2</backup-count>
-		<!-- When max. size is reached, specified percentage of the map will be 
-			evicted. Any integer between 0 and 100. If 25 is set for example, 25% of 
-			the entries will get evicted. -->
-		<eviction-percentage>0</eviction-percentage>
-
-		<near-cache>
-			<!-- Valid values are: NONE (no eviction), LRU (Least Recently Used), 
-				LFU (Least Frequently Used). NONE is the default. -->
-			<eviction-policy>NONE</eviction-policy>
-			<!-- Maximum size of the map. When max size is reached, map is evicted 
-				based on the policy defined. Any integer between 0 and Integer.MAX_VALUE. 
-				0 means Integer.MAX_VALUE. Default is 0. -->
-			<max-size>10000</max-size>
-
-			<!-- Maximum number of seconds for each entry to stay in the map. Entries 
-				that are older than <time-to-live-seconds> and not updated for <time-to-live-seconds> 
-				will get automatically evicted from the map. Any integer between 0 and Integer.MAX_VALUE. 
-				0 means infinite. Default is 0. -->
-			<time-to-live-seconds>0</time-to-live-seconds>
-		</near-cache>
-	</map>
-
-	<map name="CORE-DATA-Map">
-
-		<!-- Number of backups. If 1 is set as the backup-count for example, then 
-			all entries of the map will be copied to another JVM for fail-safety. Valid 
-			numbers are 0 (no backup), 1, 2, 3. -->
-		<backup-count>2</backup-count>
-		<!-- Valid values are: NONE (no eviction), LRU (Least Recently Used), LFU 
-			(Least Frequiently Used). NONE is the default. -->
-		<eviction-policy>NONE</eviction-policy>
-		<!-- Maximum size of the map. When max size is reached, map is evicted 
-			based on the policy defined. Any integer between 0 and Integer.MAX_VALUE. 
-			0 means Integer.MAX_VALUE. Default is 0. -->
-		<max-size>10000000</max-size>
-		<!-- When max. size is reached, specified percentage of the map will be 
-			evicted. Any integer between 0 and 100. If 25 is set for example, 25% of 
-			the entries will get evicted. -->
-		<eviction-percentage>0</eviction-percentage>
-
-
-		<!-- Maximum number of seconds for each entry to stay in the map. Entries 
-			that are older than <time-to-live-seconds> and not updated for <time-to-live-seconds> 
-			will get automatically evicted from the map. Any integer between 0 and Integer.MAX_VALUE. 
-			0 means infinite. Default is 0. -->
-		<time-to-live-seconds>0</time-to-live-seconds>
-
-		<!-- <map-store enabled="true"> Name of the class implementing MapLoader 
-			and/or MapStore. The class should implement at least of these interfaces 
-			and contain no-argument constructor. Note that the inner classes are not 
-			supported. <class-name>com.ericsson.xstream.loading.service.buffer.TopologyCacheLoader</class-name> 
-			Number of seconds to delay to call the MapStore.store(key, value). If the 
-			value is zero then it is write-through so MapStore.store(key, value) will 
-			be called as soon as the entry is updated. Otherwise it is write-behind so 
-			updates will be stored after write-delay-seconds value by calling Hazelcast.storeAll(map). 
-			Default value is 0. <write-delay-seconds>5</write-delay-seconds> </map-store> -->
-
-
-
-	</map>
-	<map name="IMSI-APN-Map">
-
-		<!-- Number of backups. If 1 is set as the backup-count for example, then 
-			all entries of the map will be copied to another JVM for fail-safety. Valid 
-			numbers are 0 (no backup), 1, 2, 3. -->
-		<backup-count>2</backup-count>
-		<!-- Valid values are: NONE (no eviction), LRU (Least Recently Used), LFU 
-			(Least Frequiently Used). NONE is the default. -->
-		<eviction-policy>NONE</eviction-policy>
-		<!-- Maximum size of the map. When max size is reached, map is evicted 
-			based on the policy defined. Any integer between 0 and Integer.MAX_VALUE. 
-			0 means Integer.MAX_VALUE. Default is 0. -->
-		<max-size>10000000</max-size>
-		<!-- When max. size is reached, specified percentage of the map will be 
-			evicted. Any integer between 0 and 100. If 25 is set for example, 25% of 
-			the entries will get evicted. -->
-		<eviction-percentage>0</eviction-percentage>
-
-
-		<!-- Maximum number of seconds for each entry to stay in the map. Entries 
-			that are older than <time-to-live-seconds> and not updated for <time-to-live-seconds> 
-			will get automatically evicted from the map. Any integer between 0 and Integer.MAX_VALUE. 
-			0 means infinite. Default is 0. -->
-		<time-to-live-seconds>0</time-to-live-seconds>
-
-		<!-- <map-store enabled="true"> Name of the class implementing MapLoader 
-			and/or MapStore. The class should implement at least of these interfaces 
-			and contain no-argument constructor. Note that the inner classes are not 
-			supported. <class-name>com.ericsson.xstream.loading.service.buffer.TopologyCacheLoader</class-name> 
-			Number of seconds to delay to call the MapStore.store(key, value). If the 
-			value is zero then it is write-through so MapStore.store(key, value) will 
-			be called as soon as the entry is updated. Otherwise it is write-behind so 
-			updates will be stored after write-delay-seconds value by calling Hazelcast.storeAll(map). 
-			Default value is 0. <write-delay-seconds>5</write-delay-seconds> </map-store> -->
-
-
-
-	</map>
-	<map name="CommonDataCache">
-
-
-		<!-- Number of async-backups. If 1 is set as the backup-count for example, 
-			then all entries of the map will be copied to another JVM for fail-safety. 
-			Valid numbers are 0 (no backup), 1, 2, 3. -->
-		<async-backup-count>1</async-backup-count>
-
-		<!-- Can we read the local backup entries? Default value is false for strong 
-			consistency. Being able to read backup data will give you greater performance. -->
-		<read-backup-data>true</read-backup-data>
-		<!-- Valid values are: NONE (no eviction), LRU (Least Recently Used), LFU 
-			(Least Frequiently Used). NONE is the default. -->
-		<eviction-policy>LRU</eviction-policy>
-		<!-- Maximum size of the map. When max size is reached, map is evicted 
-			based on the policy defined. Any integer between 0 and Integer.MAX_VALUE. 
-			0 means Integer.MAX_VALUE. Default is 0. -->
-		<max-size>3000000</max-size>
-		<!-- When max. size is reached, specified percentage of the map will be 
-			evicted. Any integer between 0 and 100. If 25 is set for example, 25% of 
-			the entries will get evicted. -->
-		<eviction-percentage>5</eviction-percentage>
-
-		<!-- Maximum number of seconds for each entry to stay in the map. Entries 
-			that are older than <time-to-live-seconds> and not updated for <time-to-live-seconds> 
-			will get automatically evicted from the map. Any integer between 0 and Integer.MAX_VALUE. 
-			0 means infinite. Default is 0. -->
-		<time-to-live-seconds>7200</time-to-live-seconds>
-
-		<!-- <map-store enabled="true"> Name of the class implementing MapLoader 
-			and/or MapStore. The class should implement at least of these interfaces 
-			and contain no-argument constructor. Note that the inner classes are not 
-			supported. <class-name>com.ericsson.xstream.base.publishing.hazelcast.L_HandoverStore</class-name> 
-			Number of seconds to delay to call the MapStore.store(key, value). If the 
-			value is zero then it is write-through so MapStore.store(key, value) will 
-			be called as soon as the entry is updated. Otherwise it is write-behind so 
-			updates will be stored after write-delay-seconds value by calling Hazelcast.storeAll(map). 
-			Default value is 0. <write-delay-seconds>5</write-delay-seconds> </map-store> -->
-
-
-	</map>
-
-
-	<queue name="raw-distributer-queue">
-		<!-- Maximum size of the queue. Any integer between 0 and Integer.MAX_VALUE. 
-			0 means Integer.MAX_VALUE. Default is 0. -->
-		<max-size>100000</max-size>
-	</queue>
-	<map name="queue-map">
-
-		<!-- Number of backups. If 1 is set as the backup-count for example, then 
-			all entries of the map will be copied to another JVM for fail-safety. Valid 
-			numbers are 0 (no backup), 1, 2, 3. -->
-		<backup-count>0</backup-count>
-
-	</map>
-
-	<map name="radio-correlation-config-Map">
-		<backup-count>2</backup-count>
-		<eviction-policy>NONE</eviction-policy>
-		<max-size>50</max-size>
-		<eviction-percentage>0</eviction-percentage>
-		<time-to-live-seconds>0</time-to-live-seconds>
-	</map>
-
-	<map name="xstream-configuration-map">
-		<!-- Number of backups. If 1 is set as the backup-count for example, then 
-			all entries of the map will be copied to another JVM for fail-safety. Valid 
-			numbers are 0 (no backup), 1, 2, 3. -->
-		<backup-count>0</backup-count>
-		<time-to-live-seconds>100000</time-to-live-seconds>
-	</map>
-
-	<map name="TOPIC-TASK-MAP">
-
-		<async-backup-count>3</async-backup-count>
-
-		<read-backup-data>true</read-backup-data>
-		<!-- Valid values are: NONE (no eviction), LRU (Least Recently Used), LFU 
-			(Least Frequiently Used). NONE is the default. -->
-		<eviction-policy>NONE</eviction-policy>
-		<!-- Maximum size of the map. When max size is reached, map is evicted 
-			based on the policy defined. Any integer between 0 and Integer.MAX_VALUE. 
-			0 means Integer.MAX_VALUE. Default is 0. -->
-		<max-size>1000</max-size>
-		<!-- When max. size is reached, specified percentage of the map will be 
-			evicted. Any integer between 0 and 100. If 25 is set for example, 25% of 
-			the entries will get evicted. -->
-		<eviction-percentage>0</eviction-percentage>
-
-
-
-		<!-- Maximum number of seconds for each entry to stay in the map. Entries 
-			that are older than <time-to-live-seconds> and not updated for <time-to-live-seconds> 
-			will get automatically evicted from the map. Any integer between 0 and Integer.MAX_VALUE. 
-			0 means infinite. Default is 0. -->
-		<time-to-live-seconds>0</time-to-live-seconds>
-	</map>
-	<map name="TOPIC-REGISTRY">
-
-		<async-backup-count>3</async-backup-count>
-
-		<read-backup-data>true</read-backup-data>
-		<!-- Valid values are: NONE (no eviction), LRU (Least Recently Used), LFU 
-			(Least Frequiently Used). NONE is the default. -->
-		<eviction-policy>NONE</eviction-policy>
-		<!-- Maximum size of the map. When max size is reached, map is evicted 
-			based on the policy defined. Any integer between 0 and Integer.MAX_VALUE. 
-			0 means Integer.MAX_VALUE. Default is 0. -->
-		<max-size>1000</max-size>
-		<!-- When max. size is reached, specified percentage of the map will be 
-			evicted. Any integer between 0 and 100. If 25 is set for example, 25% of 
-			the entries will get evicted. -->
-		<eviction-percentage>0</eviction-percentage>
-
-
-
-		<!-- Maximum number of seconds for each entry to stay in the map. Entries 
-			that are older than <time-to-live-seconds> and not updated for <time-to-live-seconds> 
-			will get automatically evicted from the map. Any integer between 0 and Integer.MAX_VALUE. 
-			0 means infinite. Default is 0. -->
-		<time-to-live-seconds>0</time-to-live-seconds>
-	</map>
-	<queue name="Pooled-Topic-Request-Queue">
-		<!-- Maximum size of the queue.Any integer between 0 and Integer.MAX_VALUE. 
-			0 means Integer.MAX_VALUE. Default is 0. -->
-		<max-size>100000</max-size>
-	</queue>
-	<map name="Pooled-Topic-Request-Queue-Backup-map">
-
-		<!-- Number of backups. If 1 is set as the backup-count for example, then 
-			all entries of the map will be copied to another JVM for fail-safety. Valid 
-			numbers are 0 (no backup), 1, 2, 3. -->
-		<backup-count>1</backup-count>
-		<eviction-policy>NONE</eviction-policy>
-		<time-to-live-seconds>0</time-to-live-seconds>
-	</map>
-
+        <property name="hazelcast.shutdownhook.enabled">false</property>
+        <property name="hazelcast.graceful.shutdown.max.wait">60</property>
+        <property name="hazelcast.operation.generic.thread.count">1</property>
+        <property name="hazelcast.operation.thread.count">1</property>
+        <property name="hazelcast.clientengine.thread.count">1</property>
+        <property name="hazelcast.client.event.thread.count">1</property>
+        <property name="hazelcast.event.thread.count">1</property>
+        <property name="hazelcast.io.output.thread.count">1</property>
+        <property name="hazelcast.io.thread.count">1</property>
+        <property name="hazelcast.executor.client.thread.count">1</property>
+        <property name="hazelcast.clientengine.thread.count">1</property>
+    </properties>
+    <executor-service>
+        <pool-size>2</pool-size>
+    </executor-service>
 </hazelcast>
diff --git a/testsuites/performance/performance-context-metrics/src/test/resources/infinispan/default-jgroups-tcp.xml b/testsuites/performance/performance-context-metrics/src/test/resources/infinispan/default-jgroups-tcp.xml
new file mode 100644
index 000000000..028cf1df6
--- /dev/null
+++ b/testsuites/performance/performance-context-metrics/src/test/resources/infinispan/default-jgroups-tcp.xml
@@ -0,0 +1,76 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ============LICENSE_START=======================================================
+   Copyright (C) 2016-2018 Ericsson. 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.
+  
+  SPDX-License-Identifier: Apache-2.0
+  ============LICENSE_END=========================================================
+-->
+
+<config xmlns="urn:org:jgroups"
+        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:schemaLocation="urn:org:jgroups http://www.jgroups.org/schema/jgroups-4.0.xsd">
+   <TCP bind_addr="${jgroups.tcp.address:127.0.0.1}"
+        bind_port="${jgroups.tcp.port:7800}"
+        enable_diagnostics="false"
+        thread_naming_pattern="pl"
+        send_buf_size="640k"
+        sock_conn_timeout="300"
+        bundler_type="no-bundler"
+
+        thread_pool.min_threads="${jgroups.thread_pool.min_threads:0}"
+        thread_pool.max_threads="${jgroups.thread_pool.max_threads:200}"
+        thread_pool.keep_alive_time="60000"
+   />
+   <MPING bind_addr="${jgroups.tcp.address:127.0.0.1}"
+          mcast_addr="${jgroups.mping.mcast_addr:228.2.4.6}"
+          mcast_port="${jgroups.mping.mcast_port:43366}"
+          ip_ttl="${jgroups.udp.ip_ttl:2}" 
+   />
+   <MERGE3 min_interval="10000" 
+           max_interval="30000" 
+   />
+   <FD_SOCK />
+   <FD_ALL timeout="60000" 
+           interval="15000" 
+           timeout_check_interval="5000" 
+   />
+   <VERIFY_SUSPECT timeout="5000" />
+   <pbcast.NAKACK2 use_mcast_xmit="false"
+                   xmit_interval="100"
+                   xmit_table_num_rows="50"
+                   xmit_table_msgs_per_row="1024"
+                   xmit_table_max_compaction_time="30000"
+                   resend_last_seqno="true"
+   />
+   <UNICAST3 xmit_interval="100"
+             xmit_table_num_rows="50"
+             xmit_table_msgs_per_row="1024"
+             xmit_table_max_compaction_time="30000"
+             conn_expiry_timeout="0"
+   />
+   <pbcast.STABLE stability_delay="500"
+                  desired_avg_gossip="5000"
+                  max_bytes="1M"
+   />
+   <pbcast.GMS print_local_addr="false"
+               install_view_locally_first="true"
+               join_timeout="${jgroups.join_timeout:5000}"
+   />
+   <MFC max_credits="2m" 
+        min_threshold="0.40"
+   />
+   <FRAG3/>
+</config>
diff --git a/testsuites/performance/performance-context-metrics/src/test/resources/infinispan/infinispan.xml b/testsuites/performance/performance-context-metrics/src/test/resources/infinispan/infinispan.xml
index a8541333e..46722477a 100644
--- a/testsuites/performance/performance-context-metrics/src/test/resources/infinispan/infinispan.xml
+++ b/testsuites/performance/performance-context-metrics/src/test/resources/infinispan/infinispan.xml
@@ -23,7 +23,7 @@
 
 <infinispan xmlns="urn:infinispan:config:8.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="urn:infinispan:config:8.0 http://infinispan.org/schemas/infinispan-config-8.0.xsd">
 	<jgroups>
-		<stack-file name="external-file" path="default-configs/default-jgroups-tcp.xml" />
+		<stack-file name="external-file" path="infinispan/default-jgroups-tcp.xml" />
 	</jgroups>
 
 	<cache-container name="ApexCacheContainer" default-cache="TestContext_0.0.1">