Remove password in properties

Remove password in properties and use environment variables instead

Issue-ID: CCSDK-2569
Signed-off-by: Ravi Pendurty <ravi.pendurty@highstreet-technologies.com>
Change-Id: I3c4b1af04cdb570620d90e0c8e65d0dd70083fae

diff --git a/sdnr/wt/mountpoint-registrar/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/mountpointregistrar/impl/FaultConfig.java b/sdnr/wt/mountpoint-registrar/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/mountpointregistrar/impl/FaultConfig.java
index a6323f2..6477ebb 100644 (file)
--- a/sdnr/wt/mountpoint-registrar/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/mountpointregistrar/impl/FaultConfig.java
+++ b/sdnr/wt/mountpoint-registrar/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/mountpointregistrar/impl/FaultConfig.java
@@ -34,10 +34,10 @@ public class FaultConfig implements Configuration {
     private static final String DEFAULT_VALUE_CONSUMER_PROTOCOL = "http";
 
     public static final String PROPERTY_KEY_CONSUMER_USERNAME = "username";
-    private static final String DEFAULT_VALUE_CONSUMER_USERNAME = "username";
+    private static final String DEFAULT_VALUE_CONSUMER_USERNAME = "${DMAAP_FAULT_TOPIC_USERNAME}";
 
     public static final String PROPERTY_KEY_CONSUMER_PASSWORD = "password";
-    private static final String DEFAULT_VALUE_CONSUMER_PASSWORD = "password";
+    private static final String DEFAULT_VALUE_CONSUMER_PASSWORD = "${DMAAP_FAULT_TOPIC_PASSWORD}";
 
     public static final String PROPERTY_KEY_CONSUMER_HOST_PORT = "host";
     private static final String DEFAULT_VALUE_CONSUMER_HOST_PORT = "onap-dmaap:3904";

diff --git a/sdnr/wt/mountpoint-registrar/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/mountpointregistrar/impl/GeneralConfig.java b/sdnr/wt/mountpoint-registrar/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/mountpointregistrar/impl/GeneralConfig.java
index f0d4323..2ad5431 100644 (file)
--- a/sdnr/wt/mountpoint-registrar/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/mountpointregistrar/impl/GeneralConfig.java
+++ b/sdnr/wt/mountpoint-registrar/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/mountpointregistrar/impl/GeneralConfig.java
@@ -35,10 +35,10 @@ public class GeneralConfig implements Configuration {
     private static final String PROPERTY_KEY_ENABLED = "dmaapEnabled"; //"enabled";
 
     private static final String PROPERTY_KEY_USER = "sdnrUser";
-    private static final String DEFAULT_VALUE_USER = "admin";
+    private static final String DEFAULT_VALUE_USER = "${SDNRUSERNAME}";
 
     private static final String PROPERTY_KEY_USERPASSWD = "sdnrPasswd";
-    private static final String DEFAULT_VALUE_USERPASSWD = "admin";
+    private static final String DEFAULT_VALUE_USERPASSWD = "${SDNRPASSWORD}";
 
     private static final String PROPERTY_KEY_BASEURL = "baseUrl";
     private static final String DEFAULT_VALUE_BASEURL = "http://localhost:8181";

diff --git a/sdnr/wt/mountpoint-registrar/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/mountpointregistrar/impl/PNFRegistrationConfig.java b/sdnr/wt/mountpoint-registrar/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/mountpointregistrar/impl/PNFRegistrationConfig.java
index a8e1276..dd4d286 100644 (file)
--- a/sdnr/wt/mountpoint-registrar/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/mountpointregistrar/impl/PNFRegistrationConfig.java
+++ b/sdnr/wt/mountpoint-registrar/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/mountpointregistrar/impl/PNFRegistrationConfig.java
@@ -35,10 +35,10 @@ public class PNFRegistrationConfig implements Configuration {
     private static final String DEFAULT_VALUE_CONSUMER_PROTOCOL = "http";
 
     public static final String PROPERTY_KEY_CONSUMER_USERNAME = "username";
-    private static final String DEFAULT_VALUE_CONSUMER_USERNAME = "username";
+    private static final String DEFAULT_VALUE_CONSUMER_USERNAME = "${DMAAP_PNFREG_TOPIC_USERNAME}";
 
     public static final String PROPERTY_KEY_CONSUMER_PASSWORD = "password";
-    private static final String DEFAULT_VALUE_CONSUMER_PASSWORD = "password";
+    private static final String DEFAULT_VALUE_CONSUMER_PASSWORD = "${DMAAP_PNFREG_TOPIC_PASSWORD}";
 
     public static final String PROPERTY_KEY_CONSUMER_HOST_PORT = "host";
     private static final String DEFAULT_VALUE_CONSUMER_HOST_PORT = "onap-dmaap:3904";