Remove useless configuration

Remove configuration for policy that was not required anymore

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

diff --git a/pom.xml b/pom.xml
index e6cb23a..a195168 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -48,8 +48,6 @@
            "mvn clean install -Dspring.config.location=classpath:application-test.properties"
 
            The application.properties contains the location of the CLAMP parameters files:
-                               - org.onap.clamp.config.files.cldsReference=classpath:/clds/clds-reference.properties
-                               - org.onap.clamp.config.files.cldsPolicyConfig=classpath:/clds/clds-policy-config.properties
                                - org.onap.clamp.config.files.cldsUsers=classpath:/clds/clds-users.json
                                - org.onap.clamp.config.files.globalClds=classpath:/clds/globalClds.properties
 

diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties
index aa92820..b59d0ee 100644 (file)
--- a/src/main/resources/application.properties
+++ b/src/main/resources/application.properties
@@ -106,7 +106,6 @@ async.core.pool.size=10
 async.max.pool.size=20\r
 async.queue.capacity=500\r
 \r
-clamp.config.files.cldsPolicyConfig=classpath:/clds/clds-policy-config.properties\r
 clamp.config.files.cldsUsers=classpath:/clds/clds-users.json\r
 clamp.config.files.globalProperties=classpath:/clds/templates/globalProperties.json\r
 clamp.config.files.sdcController=classpath:/clds/sdc-controllers-config.json\r
@@ -130,11 +129,11 @@ clamp.config.policy.pdpUrl2=http://policy.api.simpledemo.onap.org:8081/pdp/ , te
 clamp.config.policy.papUrl=http://policy.api.simpledemo.onap.org:8081/pap/ , testpap, alpha123\r
 clamp.config.policy.notificationType=websocket\r
 clamp.config.policy.notificationUebServers=localhost\r
-clamp.config.policy.notificationTopic=\r
-clamp.config.policy.clientId=myclientid\r
+clamp.config.policy.notificationTopic=PDPD-CONFIGURATION\r
+clamp.config.policy.clientId=python\r
 # base64 encoding\r
 \r
-clamp.config.policy.clientKey=5CE79532B3A2CB4D132FC0C04BF916A7\r
+clamp.config.policy.clientKey=dGVzdA==\r
 #DEVL for development\r
 #TEST for Test environments\r
 #PROD for prod environments\r

diff --git a/src/test/resources/application.properties b/src/test/resources/application.properties
index fb11595..91008bb 100644 (file)
--- a/src/test/resources/application.properties
+++ b/src/test/resources/application.properties
@@ -106,7 +106,6 @@ async.core.pool.size=10
 async.max.pool.size=20\r
 async.queue.capacity=500\r
 \r
-clamp.config.files.cldsPolicyConfig=classpath:/clds/clds-policy-config.properties\r
 clamp.config.files.cldsUsers=classpath:/clds/clds-users.json\r
 clamp.config.files.globalProperties=classpath:/clds/templates/globalProperties.json\r
 clamp.config.files.sdcController=classpath:/clds/sdc-controllers-config.json\r
@@ -131,9 +130,9 @@ clamp.config.policy.papUrl=http://localhost:${docker.http-cache.port.host}/pap/
 clamp.config.policy.notificationType=websocket\r
 clamp.config.policy.notificationUebServers=localhost\r
 clamp.config.policy.notificationTopic=\r
-clamp.config.policy.clientId=myclientid\r
+clamp.config.policy.clientId=python\r
 # base64 encoding\r
-clamp.config.policy.clientKey=5CE79532B3A2CB4D132FC0C04BF916A7\r
+clamp.config.policy.clientKey=dGVzdA==\r
 #DEVL for development\r
 #TEST for Test environments\r
 #PROD for prod environments\r