From 741faeb6a1dc0de875d19e11897449c8ce50b076 Mon Sep 17 00:00:00 2001 From: "Determe, Sebastien (sd378r)" Date: Wed, 25 Apr 2018 15:05:04 +0200 Subject: [PATCH] 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) --- pom.xml | 2 -- src/main/resources/application.properties | 7 +++---- src/test/resources/application.properties | 5 ++--- 3 files changed, 5 insertions(+), 9 deletions(-) diff --git a/pom.xml b/pom.xml index e6cb23a3..a195168e 100644 --- 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 aa928207..b59d0ee9 100644 --- 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 async.queue.capacity=500 -clamp.config.files.cldsPolicyConfig=classpath:/clds/clds-policy-config.properties clamp.config.files.cldsUsers=classpath:/clds/clds-users.json clamp.config.files.globalProperties=classpath:/clds/templates/globalProperties.json clamp.config.files.sdcController=classpath:/clds/sdc-controllers-config.json @@ -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 clamp.config.policy.notificationType=websocket clamp.config.policy.notificationUebServers=localhost -clamp.config.policy.notificationTopic= -clamp.config.policy.clientId=myclientid +clamp.config.policy.notificationTopic=PDPD-CONFIGURATION +clamp.config.policy.clientId=python # base64 encoding -clamp.config.policy.clientKey=5CE79532B3A2CB4D132FC0C04BF916A7 +clamp.config.policy.clientKey=dGVzdA== #DEVL for development #TEST for Test environments #PROD for prod environments diff --git a/src/test/resources/application.properties b/src/test/resources/application.properties index fb11595a..91008bbb 100644 --- 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 async.queue.capacity=500 -clamp.config.files.cldsPolicyConfig=classpath:/clds/clds-policy-config.properties clamp.config.files.cldsUsers=classpath:/clds/clds-users.json clamp.config.files.globalProperties=classpath:/clds/templates/globalProperties.json clamp.config.files.sdcController=classpath:/clds/sdc-controllers-config.json @@ -131,9 +130,9 @@ clamp.config.policy.papUrl=http://localhost:${docker.http-cache.port.host}/pap/ clamp.config.policy.notificationType=websocket clamp.config.policy.notificationUebServers=localhost clamp.config.policy.notificationTopic= -clamp.config.policy.clientId=myclientid +clamp.config.policy.clientId=python # base64 encoding -clamp.config.policy.clientKey=5CE79532B3A2CB4D132FC0C04BF916A7 +clamp.config.policy.clientKey=dGVzdA== #DEVL for development #TEST for Test environments #PROD for prod environments -- 2.16.6