From f32508381ce0b555fc14978cbaa458aa4e2d91c5 Mon Sep 17 00:00:00 2001
From: liamfallon <liam.fallon@ericsson.com>
Date: Thu, 30 Aug 2018 09:37:29 +0100
Subject: Use parameter service in apex

Switch parameter handling in apex to use
the ONAP PF common parameter service

Change-Id: Id318d19c726b18b1a69c630fa81ca7d695355e9c
Issue-ID: POLICY-954
Signed-off-by: liamfallon <liam.fallon@ericsson.com>
---
 .../resources/infinispan/default-jgroups-tcp.xml   | 76 +++++++++++++++++
 .../src/main/resources/infinispan/infinispan.xml   |  9 ++-
 .../src/main/resources/infinispan/jgroups-apex.xml | 94 ----------------------
 3 files changed, 82 insertions(+), 97 deletions(-)
 create mode 100644 packages/apex-pdp-package-full/src/main/resources/infinispan/default-jgroups-tcp.xml
 delete mode 100644 packages/apex-pdp-package-full/src/main/resources/infinispan/jgroups-apex.xml

(limited to 'packages/apex-pdp-package-full/src/main')

diff --git a/packages/apex-pdp-package-full/src/main/resources/infinispan/default-jgroups-tcp.xml b/packages/apex-pdp-package-full/src/main/resources/infinispan/default-jgroups-tcp.xml
new file mode 100644
index 000000000..028cf1df6
--- /dev/null
+++ b/packages/apex-pdp-package-full/src/main/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/packages/apex-pdp-package-full/src/main/resources/infinispan/infinispan.xml b/packages/apex-pdp-package-full/src/main/resources/infinispan/infinispan.xml
index fcb57ae8a..5b416f50d 100644
--- a/packages/apex-pdp-package-full/src/main/resources/infinispan/infinispan.xml
+++ b/packages/apex-pdp-package-full/src/main/resources/infinispan/infinispan.xml
@@ -22,15 +22,18 @@
 <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="apex" path="infinispan/jgroups-apex.xml" />
+        <stack-file name="external-file" path="infinispan/default-jgroups-tcp.xml" />
     </jgroups>
 
-    <cache-container name="ApexCacheContainer" default-cache="default">
-        <transport cluster="apexCluster" stack="apex" />
+    <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>
diff --git a/packages/apex-pdp-package-full/src/main/resources/infinispan/jgroups-apex.xml b/packages/apex-pdp-package-full/src/main/resources/infinispan/jgroups-apex.xml
deleted file mode 100644
index c97406abe..000000000
--- a/packages/apex-pdp-package-full/src/main/resources/infinispan/jgroups-apex.xml
+++ /dev/null
@@ -1,94 +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=========================================================
--->
-
-<!--
-  Fast configuration for local mode, ie. all members reside on the same host. Setting ip_ttl to 0 means that
-  no multicast packet will make it outside the local host.
-  Therefore, this configuration will NOT work to cluster members residing on different hosts !
-
-  Author: Bela Ban
-  Version: $Id: fast-local.xml,v 1.9 2009/12/18 14:50:00 belaban Exp $
--->
-
-<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-3.4.xsd">
-    <UDP mcast_addr="239.1.1.1"
-         mcast_port="${jgroups.udp.mcast_port:45111}"
-         tos="8"
-         ucast_recv_buf_size="20000000"
-         ucast_send_buf_size="640000"
-         mcast_recv_buf_size="25000000"
-         mcast_send_buf_size="640000"
-         loopback="true"
-         max_bundle_size="64k"
-         bundler_type="sender-sends-with-timer"
-         ip_ttl="${jgroups.udp.ip_ttl:0}"
-         enable_diagnostics="true"
-         thread_naming_pattern="cl"
-
-         timer_type="new"
-         timer.min_threads="2"
-         timer.max_threads="4"
-         timer.keep_alive_time="3000"
-         timer.queue_max_size="1000"
-         timer.wheel_size="200"
-         timer.tick_time="50"
-
-         thread_pool.enabled="true"
-         thread_pool.min_threads="2"
-         thread_pool.max_threads="8"
-         thread_pool.keep_alive_time="5000"
-         thread_pool.queue_enabled="true"
-         thread_pool.queue_max_size="100000"
-         thread_pool.rejection_policy="discard"
-
-         oob_thread_pool.enabled="true"
-         oob_thread_pool.min_threads="1"
-         oob_thread_pool.max_threads="8"
-         oob_thread_pool.keep_alive_time="5000"
-         oob_thread_pool.queue_enabled="false"
-         oob_thread_pool.queue_max_size="100"
-         oob_thread_pool.rejection_policy="discard"/>
-
-    <PING timeout="2000"
-            num_initial_members="3"/>
-    <MERGE3/>
-    <FD_SOCK />
-    <FD_ALL />
-    <VERIFY_SUSPECT timeout="1500"  />
-    <BARRIER />
-    <pbcast.NAKACK use_mcast_xmit="true"
-                   retransmit_timeout="100,300,600,1200"
-                   discard_delivered_msgs="true"/>
-    <UNICAST3 conn_expiry_timeout="0"/>
-    <pbcast.STABLE stability_delay="1000" desired_avg_gossip="50000"
-                   max_bytes="1000000"/>
-    <pbcast.GMS print_local_addr="true" join_timeout="5000"
-                max_bundling_time="200"
-                view_bundling="true"/>
-    <FC max_credits="2M"
-        min_threshold="0.40"/>
-    <FRAG2 frag_size="60000"  />
-    <pbcast.FLUSH />
-    <RELAY site="apex" bridge_props="xml/jgroups-tcp.xml" />
-
-</config>
-- 
cgit 1.2.3-korg