diff options
| author |   KAPIL SINGAL <ks220y@att.com> | 2020-07-17 12:03:57 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2020-07-17 12:03:57 +0000 |
| commit | a72da1dc488527fd4c8c318188d62a1c5b5d908c (patch) | |
| tree | 90be39be65f854cc7dcfc327eca9a3d621758e9a | |
| parent | 240073b8341f4141ee7bd01e4f0fd691a932579f (diff) | |
| parent | 5c5e3ef17ea8149424562b348ff87c6860bba82d (diff) | |
Merge "Remove password in properties"
3 files changed, 6 insertions, 6 deletions
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 a6323f270..6477ebbec 100644 --- 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 f0d4323c4..2ad5431be 100644 --- 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 a8e12767f..dd4d2864a 100644 --- 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"; |