Improve policy Config

Improve the policy configuration file and merge it to
application.properties so that all configurations are located at the
same place

Issue-ID: CLAMP-136
Change-Id: I5654bbe61d483a4061540959ed0b7dbb1242b022
Signed-off-by: Determe, Sebastien (sd378r) <sd378r@intl.att.com>

2 files changed, 16 insertions, 38 deletions

diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties
index 5f6a0d659..1411b8b2b 100644
--- a/src/main/resources/application.properties
+++ b/src/main/resources/application.properties
@@ -124,6 +124,21 @@ clamp.config.sdc.template=classpath:/clds/templates/sdc-template.json
 clamp.config.sdc.decode.service_ids=classpath:/clds/templates/sdc-decode-service_ids.json

 #

 #

+# Configuration Settings for Policy Engine Components

+clamp.config.policy.pdpUrl1=http://vm1.policy.simpledemo.onap.org:8081/pdp/ , testpdp, alpha123

+clamp.config.policy.pdpUrl2=http://vm1.policy.simpledemo.onap.org:8081/pdp/ , testpdp, alpha123

+clamp.config.policy.papUrl=http://vm1.policy.simpledemo.onap.org:8081/pap/ , testpap, alpha123

+clamp.config.policy.notificationType=websocket

+clamp.config.policy.notificationUebServers=localhost

+clamp.config.policy.notificationTopic=

+clamp.config.policy.clientId=myclientid

+# base64 encoding

+

+clamp.config.policy.clientKey=5CE79532B3A2CB4D132FC0C04BF916A7

+#DEVL for development

+#TEST for Test environments

+#PROD for prod environments

+clamp.config.policy.policyEnvironment=TEST

 # General Policy request properties

 #

 clamp.config.policy.onap.name=DCAE

@@ -203,4 +218,4 @@ clamp.config.security.permission.type.cl.event=permission-type-cl-event
 clamp.config.security.permission.type.filter.vf=permission-type-filter-vf

 clamp.config.security.permission.type.template=permission-type-template

 #This one indicates the type of instances (dev|prod|perf...), this must be set accordingly in clds-users.properties

-clamp.config.security.permission.instance=dev
\ No newline at end of file
+clamp.config.security.permission.instance=dev

diff --git a/src/main/resources/clds/clds-policy-config.properties b/src/main/resources/clds/clds-policy-config.properties
deleted file mode 100644
index 54b927727..000000000
--- a/src/main/resources/clds/clds-policy-config.properties
+++ /dev/null
@@ -1,37 +0,0 @@
-###
-# ============LICENSE_START=======================================================
-# ONAP CLAMP
-# ================================================================================
-# Copyright (C) 2017 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============================================
-# ===================================================================
-# ECOMP is a trademark and service mark of AT&T Intellectual Property.
-###
-
-# Configuration Settings for Policy Engine Components
-PDP_URL1=http://vm1.policy.simpledemo.onap.org:8081/pdp/ , testpdp, alpha123
-PDP_URL2=http://vm1.policy.simpledemo.onap.org:8081/pdp/ , testpdp, alpha123
-NOTIFICATION_TYPE=websocket
-NOTIFICATION_UEB_SERVERS=localhost
-NOTIFICATION_TOPIC=
-CLIENT_ID=myclientid
-# base64 encoding
-#CLIENT_KEY=ChlakDuk
-CLIENT_KEY=5CE79532B3A2CB4D132FC0C04BF916A7
-#DEVL for development
-#TEST for Test environments
-#PROD for prod environments
-ENVIRONMENT=TEST
\ No newline at end of file