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>

3 files changed, 45 insertions, 37 deletions

diff --git a/src/test/java/org/onap/clamp/clds/it/PolicyClientItCase.java b/src/test/java/org/onap/clamp/clds/it/PolicyClientItCase.java
index 71cd9f6b8..c7f0f2871 100644
--- a/src/test/java/org/onap/clamp/clds/it/PolicyClientItCase.java
+++ b/src/test/java/org/onap/clamp/clds/it/PolicyClientItCase.java
@@ -23,6 +23,8 @@
 
 package org.onap.clamp.clds.it;
 
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;
 
 import java.io.IOException;
@@ -37,6 +39,7 @@ import org.onap.clamp.clds.client.req.policy.OperationalPolicyReq;
 import org.onap.clamp.clds.client.req.policy.PolicyClient;
 import org.onap.clamp.clds.client.req.tca.TcaRequestFormatter;
 import org.onap.clamp.clds.config.ClampProperties;
+import org.onap.clamp.clds.config.PolicyConfiguration;
 import org.onap.clamp.clds.model.CldsEvent;
 import org.onap.clamp.clds.model.properties.ModelProperties;
 import org.onap.clamp.clds.model.properties.Policy;
@@ -57,6 +60,8 @@ import org.springframework.test.context.junit4.SpringRunner;
 public class PolicyClientItCase {
 
     @Autowired
+    private PolicyConfiguration policyConfiguration;
+    @Autowired
     private ClampProperties refProp;
     @Autowired
     protected PolicyClient policyClient;
@@ -144,4 +149,30 @@ public class PolicyClientItCase {
         TimeUnit.SECONDS.sleep(20);
         deleteTcaPolicy(CldsEvent.ACTION_DELETE);
     }
+
+    @Test
+    public void testPolicyConfiguration() {
+        assertNotNull(policyConfiguration.getPdpUrl1());
+        assertNotNull(policyConfiguration.getPdpUrl2());
+        assertNotNull(policyConfiguration.getPapUrl());
+        assertNotNull(policyConfiguration.getPolicyEnvironment());
+        assertNotNull(policyConfiguration.getClientId());
+        assertNotNull(policyConfiguration.getClientKey());
+        assertNotNull(policyConfiguration.getNotificationType());
+        assertNotNull(policyConfiguration.getNotificationUebServers());
+        assertEquals(8, policyConfiguration.getProperties().size());
+        assertTrue(((String) policyConfiguration.getProperties().get(PolicyConfiguration.PDP_URL1))
+                .contains("/pdp/ , testpdp, alpha123"));
+        assertTrue(((String) policyConfiguration.getProperties().get(PolicyConfiguration.PDP_URL2))
+                .contains("/pdp/ , testpdp, alpha123"));
+        assertTrue(((String) policyConfiguration.getProperties().get(PolicyConfiguration.PAP_URL))
+                .contains("/pap/ , testpap, alpha123"));
+        assertEquals("websocket", policyConfiguration.getProperties().get(PolicyConfiguration.NOTIFICATION_TYPE));
+        assertEquals("localhost",
+                policyConfiguration.getProperties().get(PolicyConfiguration.NOTIFICATION_UEB_SERVERS));
+        assertEquals("myclientid", policyConfiguration.getProperties().get(PolicyConfiguration.CLIENT_ID));
+        assertEquals("5CE79532B3A2CB4D132FC0C04BF916A7",
+                policyConfiguration.getProperties().get(PolicyConfiguration.CLIENT_KEY));
+        assertEquals("DEVL", policyConfiguration.getProperties().get(PolicyConfiguration.ENVIRONMENT));
+    }
 }
diff --git a/src/test/resources/application.properties b/src/test/resources/application.properties
index 37f9bd7eb..676c5b9ac 100644
--- a/src/test/resources/application.properties
+++ b/src/test/resources/application.properties
@@ -124,6 +124,20 @@ 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://localhost:${docker.http-cache.port.host}/pdp/ , testpdp, alpha123

+clamp.config.policy.pdpUrl2=http://localhost:${docker.http-cache.port.host}/pdp/ , testpdp, alpha123

+clamp.config.policy.papUrl=http://localhost:${docker.http-cache.port.host}/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=DEVL

 # General Policy request properties

 #

 clamp.config.policy.onap.name=DCAE

diff --git a/src/test/resources/clds/clds-policy-config.properties b/src/test/resources/clds/clds-policy-config.properties
deleted file mode 100644
index 892cdda07..000000000
--- a/src/test/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=https://localhost:8081/pdp/ , testpdp, alpha123
-PDP_URL2=https://localhost:8081/pdp/ , testpdp, alpha456
-PAP_URL=https://localhost:8081/pap/ , testpap, alpha123
-NOTIFICATION_TYPE=websocket
-NOTIFICATION_UEB_SERVERS=localhost
-
-CLIENT_ID=myclientid
-# base64 encoding
-CLIENT_KEY=ChlakDuk
-#DEVL for development
-#TEST for Test environments
-#PROD for prod environments
-ENVIRONMENT=DEVL