Change pooling property namev1.2.1

Removed "AMSTERDAM_" prefix from pooling topic property name.
Added feature-specific conf file with pooling topic property.
Enabled distributed locking DB properties.
Change distributed locking DB name to "pooling" to match the
code.
Add default value to feature-specific conf file.
Change "_" in default topic name to "-".

Change-Id: I53de51787694e5920dc9ced07b5a9ac60bb63e45
Issue-ID: POLICY-782
Signed-off-by: Jim Hahn <jrh3@att.com>

3 files changed, 42 insertions, 13 deletions

diff --git a/feature-distributed-locking/src/main/feature/config/feature-distributed-locking.properties b/feature-distributed-locking/src/main/feature/config/feature-distributed-locking.properties
index ee4aa474..665f8227 100644
--- a/feature-distributed-locking/src/main/feature/config/feature-distributed-locking.properties
+++ b/feature-distributed-locking/src/main/feature/config/feature-distributed-locking.properties
@@ -19,10 +19,10 @@
 ###
 
 #Database properties
-#javax.persistence.jdbc.driver= org.mariadb.jdbc.Driver
-#javax.persistence.jdbc.url=jdbc:mariadb://${{SQL_HOST}}:3306/locks
-#javax.persistence.jdbc.user=${{SQL_USER}}
-#javax.persistence.jdbc.password=${{SQL_PASSWORD}}
+javax.persistence.jdbc.driver= org.mariadb.jdbc.Driver
+javax.persistence.jdbc.url=jdbc:mariadb://${{SQL_HOST}}:3306/pooling
+javax.persistence.jdbc.user=${{SQL_USER}}
+javax.persistence.jdbc.password=${{SQL_PASSWORD}}
 
 #This value is added to System.currentTimeMs to
 #set expirationTime when a lock is obtained. 
diff --git a/feature-pooling-dmaap/src/main/feature/config/feature-pooling-dmaap.properties b/feature-pooling-dmaap/src/main/feature/config/feature-pooling-dmaap.properties
index 3e582370..9f8c804b 100644
--- a/feature-pooling-dmaap/src/main/feature/config/feature-pooling-dmaap.properties
+++ b/feature-pooling-dmaap/src/main/feature/config/feature-pooling-dmaap.properties
@@ -71,17 +71,26 @@
 extractor.requestId.org.onap.policy.controlloop.VirtualControlLoopEvent=${requestId}
 
 
+# Each controller that is enabled should have its own topic and the
+# corresponding ueb.xxx properties.  However, for now, just assume that
+# the amsterdam-cl and beijing-cl features will not both be enabled
+# at the same time.
+
 pooling.amsterdam.enabled=true
-pooling.amsterdam.topic=${{AMSTERDAM_POOLING_TOPIC}}
+pooling.amsterdam.topic=${{POOLING_TOPIC}}
+
+pooling.beijing.enabled=true
+pooling.beijing.topic=${{POOLING_TOPIC}}
+
 
 # the list of sources and sinks should be identical
-ueb.source.topics=${{AMSTERDAM_POOLING_TOPIC}}
-ueb.sink.topics=${{AMSTERDAM_POOLING_TOPIC}}
+ueb.source.topics=${{POOLING_TOPIC}}
+ueb.sink.topics=${{POOLING_TOPIC}}
 
-ueb.source.topics.${{AMSTERDAM_POOLING_TOPIC}}.servers=${{DMAAP_SERVERS}}
-ueb.source.topics.${{AMSTERDAM_POOLING_TOPIC}}.apiKey=
-ueb.source.topics.${{AMSTERDAM_POOLING_TOPIC}}.apiSecret=
+ueb.source.topics.${{POOLING_TOPIC}}.servers=${{DMAAP_SERVERS}}
+ueb.source.topics.${{POOLING_TOPIC}}.apiKey=
+ueb.source.topics.${{POOLING_TOPIC}}.apiSecret=
 
-ueb.sink.topics.${{AMSTERDAM_POOLING_TOPIC}}.servers=${{DMAAP_SERVERS}}
-ueb.sink.topics.${{AMSTERDAM_POOLING_TOPIC}}.apiKey=
-ueb.sink.topics.${{AMSTERDAM_POOLING_TOPIC}}.apiSecret=
+ueb.sink.topics.${{POOLING_TOPIC}}.servers=${{DMAAP_SERVERS}}
+ueb.sink.topics.${{POOLING_TOPIC}}.apiKey=
+ueb.sink.topics.${{POOLING_TOPIC}}.apiSecret=
diff --git a/packages/install/src/files/feature-pooling-dmaap.conf b/packages/install/src/files/feature-pooling-dmaap.conf
new file mode 100644
index 00000000..0ef81951
--- /dev/null
+++ b/packages/install/src/files/feature-pooling-dmaap.conf
@@ -0,0 +1,20 @@
+###
+# ============LICENSE_START=======================================================
+# ONAP POLICY
+# ================================================================================
+# Copyright (C) 2018 AT&T Intellectual Property. All rights reserved.
+# ================================================================================
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+# 
+#      http://www.apache.org/licenses/LICENSE-2.0
+# 
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+# ============LICENSE_END=========================================================
+###
+POOLING_TOPIC=POLICY-PDP-POOLING