From 1ba6a3268b220cc99e9ed993553fa6f34f111a39 Mon Sep 17 00:00:00 2001
From: liamfallon <liam.fallon@est.tech>
Date: Fri, 22 Feb 2019 17:30:59 +0000
Subject: Change versions of Zookeeper and C3P0

This review changes the versions of Zookeeper and C3P0 to
resolve security issues.

It also merges the context test utils module into the context test because that
module was misplaced and put an incompatible Zookeeper dependency in the
APEX context module.

Issue-ID: POLICY-1540
Change-Id: I86048ae1fc8b818611f423d6fd1f4a9fcc3f76f9
Signed-off-by: liamfallon <liam.fallon@est.tech>
---
 .../performance/context/metrics/MetricsTest.java   | 94 ----------------------
 .../src/test/resources/hazelcast/hazelcast.xml     | 63 ---------------
 .../resources/infinispan/default-jgroups-tcp.xml   | 76 -----------------
 .../src/test/resources/infinispan/infinispan.xml   | 41 ----------
 4 files changed, 274 deletions(-)
 delete mode 100644 testsuites/performance/performance-context-metrics/src/test/java/org/onap/policy/apex/testsuites/performance/context/metrics/MetricsTest.java
 delete mode 100644 testsuites/performance/performance-context-metrics/src/test/resources/hazelcast/hazelcast.xml
 delete mode 100644 testsuites/performance/performance-context-metrics/src/test/resources/infinispan/default-jgroups-tcp.xml
 delete mode 100644 testsuites/performance/performance-context-metrics/src/test/resources/infinispan/infinispan.xml

(limited to 'testsuites/performance/performance-context-metrics/src/test')

diff --git a/testsuites/performance/performance-context-metrics/src/test/java/org/onap/policy/apex/testsuites/performance/context/metrics/MetricsTest.java b/testsuites/performance/performance-context-metrics/src/test/java/org/onap/policy/apex/testsuites/performance/context/metrics/MetricsTest.java
deleted file mode 100644
index af6b46918..000000000
--- a/testsuites/performance/performance-context-metrics/src/test/java/org/onap/policy/apex/testsuites/performance/context/metrics/MetricsTest.java
+++ /dev/null
@@ -1,94 +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.testsuites.performance.context.metrics;
-
-import static org.junit.Assert.fail;
-
-import java.io.File;
-import java.io.IOException;
-import java.util.Arrays;
-import java.util.SortedSet;
-
-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.testsuites.performance.context.metrics.ConcurrentContextMetrics;
-import org.onap.policy.common.utils.resources.ResourceUtils;
-import org.slf4j.ext.XLogger;
-import org.slf4j.ext.XLoggerFactory;
-
-/**
- * The Class TestMetrics.
- */
-public class MetricsTest {
-    // Logger for this class
-    private static final XLogger LOGGER = XLoggerFactory.getXLogger(MetricsTest.class);
-    private static final String HAZELCAST_CONFIG = "hazelcast.config";
-
-    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();
-
-    /**
-     * Configure.
-     *
-     * @throws Exception the exception
-     */
-    @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 SortedSet<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());
-
-    }
-
-    /**
-     * Gets the single jvm metrics.
-     *
-     * @throws IOException Signals that an I/O exception has occurred.
-     */
-    @Test
-    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 exception) {
-            LOGGER.error("Unexpected error", exception);
-            fail("Metrics test failed");
-        }
-    }
-}
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
deleted file mode 100644
index 932b33cc9..000000000
--- a/testsuites/performance/performance-context-metrics/src/test/resources/hazelcast/hazelcast.xml
+++ /dev/null
@@ -1,63 +0,0 @@
-<?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=========================================================
--->
-
-<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">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>
-        <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
deleted file mode 100644
index 028cf1df6..000000000
--- a/testsuites/performance/performance-context-metrics/src/test/resources/infinispan/default-jgroups-tcp.xml
+++ /dev/null
@@ -1,76 +0,0 @@
-<?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
deleted file mode 100644
index 5b416f50d..000000000
--- a/testsuites/performance/performance-context-metrics/src/test/resources/infinispan/infinispan.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-<?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=========================================================
--->
-
-<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="infinispan/default-jgroups-tcp.xml" />
-    </jgroups>
-
-    <cache-container name="ApexCacheContainer" default-cache="TestContext_0.0.1">
-        <transport cluster="apexCluster" stack="external-file" />
-        <jmx />
-        <replicated-cache name="LargeContextMap_0.0.1" mode="SYNC" statistics="true">
-            <state-transfer enabled="true" />
-        </replicated-cache>
-        <replicated-cache name="LongSameTypeContextMap_0.0.1" mode="SYNC" statistics="true">
-            <state-transfer enabled="true" />
-        </replicated-cache>
-        <replicated-cache name="TestContext_0.0.1" mode="SYNC">
-            <state-transfer enabled="true" />
-        </replicated-cache>
-    </cache-container>
-</infinispan>
-- 
cgit 1.2.3-korg