configuration alignment

Change-Id: I24193515352973a8f5244c1089448ed5e9bac173
Issue-ID: SDC-2724
Signed-off-by: Ofir Sonsino <os0695@intl.att.com>

2 files changed, 17 insertions, 32 deletions

diff --git a/catalog-be/src/test/resources/config/catalog-be/configuration.yaml b/catalog-be/src/test/resources/config/catalog-be/configuration.yaml
index 9bd8849ce4..6b961b56bd 100644
--- a/catalog-be/src/test/resources/config/catalog-be/configuration.yaml
+++ b/catalog-be/src/test/resources/config/catalog-be/configuration.yaml
@@ -658,8 +658,8 @@ dmaapConsumerConfiguration:
     dme2preferredRouterFilePath: DME2preferredRouter.txt
     timeLimitForNotificationHandleMs: 0
     credential:
-        username: m09875@sdc.com
-        password: hmXYcznAljMSisdy8zgcag==
+        username: sdc@sdc.com
+        password: changeme
     aftDme2SslEnable: true
     aftDme2ClientIgnoreSslConfig: false
     aftDme2ClientKeystore: /opt/app/jetty/base/be/config/.truststore
@@ -668,7 +668,7 @@ dmaapConsumerConfiguration:
 
 dmaapProducerConfiguration:
     active: true
-    hosts: olsd004.wnsnet.attws.com:3904
+    hosts: dmaap.onap.com:3904
     consumerGroup: asdc
     consumerId: mama #mama - in Order To Consume Remove This String And Replace It With -> mama
     timeoutMs: 15000
@@ -692,24 +692,9 @@ dmaapProducerConfiguration:
     dme2preferredRouterFilePath: DME2preferredRouter.txt
     timeLimitForNotificationHandleMs: 120000
     credential:
-        username: m09875@sdc.att.com
-        password: hmXYcznAljMSisdy8zgcag==
-#    isActive: false
-#    transportType: HTTPAAF
-#    hosts: olsd004.wnsnet.attws.com:3904
-#    consumerGroup: asdc
-#    consumerId: mama #mama - in Order To Consume Remove This String And Replace It With -> mama
-#    limit: 1000
-#    timeout: 15000
-#    topic: com.att.sdc.23911-msfacadesdc-v1
-#    protocol: http
-#    contenttype: application/json
-#    authKey: d8fWpPuZ3JJEs8Gf:XyQeXFoxIJZGAUaJUfx+oV6JO
-#    authDate: 2018-05-18T13:57:37-0800
-#    dme2preferredRouterFilePath: DME2preferredRouter.txt #stub , used only cause exception is thrown without it
-#    credential:
-#        username: m09875@sdc.att.com
-#        password: hmXYcznAljMSisdy8zgcag==
+        username: sdc@sdc.com
+        password: changeme
+
 dmeConfiguration:
     lookupUriFormat: "http://DME2RESOLVE/service=%s/version=1.0.0/envContext=%s/routeOffer=DEFAULT"
 
@@ -747,7 +732,7 @@ cadiFilterParams:
     AFT_LATITUDE:  "32.780140"
     AFT_LONGITUDE: "-96.800451"
     hostname:                 192.168.33.10
-    aaf_id:                   m09875@sdc.att.com
+    aaf_id:                   aaf@sdc.onap.org
     aaf_env:                  TEST
     aaf_url:                  https://aaftest.test.att.com/locate/com.att.aaf.service:2.0
     csp_domain:               PROD
diff --git a/docs/configuration.rst b/docs/configuration.rst
index 1fe26655b7..6d8d52490d 100644
--- a/docs/configuration.rst
+++ b/docs/configuration.rst
@@ -113,8 +113,8 @@ environment.json
                 "num_tokens": "256",
                 "data_dir": "/var/lib/cassandra/data",
                 "hinted_handoff_enabled": "true",
-                "cassandra_user": "asdc_user",
-                "cassandra_password": "Aa1234%^!",
+                "cassandra_user": "sdc_user",
+                "cassandra_password": "changeme",
                 "concurrent_writes": "32",
                 "cluster_name": "SDC-CS-",
                 "datacenter_name": "SDC-CS-",
@@ -263,7 +263,7 @@ BE-configuration.yaml
         truststorePath : /config/.truststore
 
         # The .truststore file password
-        truststorePassword : Aa123456
+        truststorePassword : changeme
 
         # Keyspaces configuration for Cassandra
         keySpaces:
@@ -857,8 +857,8 @@ BE-configuration.yaml
         feResolveAttempts: 3
         enabled: false
         interval: 60
-        changePriorityUser: ecompasdc
-        changePriorityPassword: ecompasdc123
+        changePriorityUser: onapsdc
+        changePriorityPassword: changeme
         publishNetworkUrl:
         publishNetworkBody: '{"note":"comment"}'
         groups:
@@ -1083,7 +1083,7 @@ BE-distribution-engine-configuration.yaml
     # aai configuration for tenant isolation
     aaiConfig:
        httpRequestConfig:
-          serverRootUrl: https://aai-uint3.test.att.com:8443
+          serverRootUrl: https://aai.onap.org:8443
           resourceNamespaces:
              operationalEnvironments: /aai/v12/cloud-infrastructure/operational-environments
 
@@ -1093,7 +1093,7 @@ BE-distribution-engine-configuration.yaml
              connectTimeoutMs: 1000
           clientCertificate:
              keyStore: /opt/app/jetty/base/be/etc/non-prod.jks
-             keyStorePassword: hmXYcznAljMSisdy8zgcag==
+             keyStorePassword: changeme
           headers:
              X-FromAppId: asdc
           numOfRetries: 3
@@ -1109,8 +1109,8 @@ BE-distribution-engine-configuration.yaml
               readTimeoutMs: 2000
               connectTimeoutMs: 500
            basicAuthorization:
-              userName: asdc
-              password: OTLEp5lfVhYdyw5EAtTUBQ==
+              userName: sdc
+              password: changeme
            numOfRetries: 3
 
     currentArtifactInstallationTimeout: 120
@@ -1148,7 +1148,7 @@ BE-janusgraph.properties
     storage.cassandra.ssl.truststore.location=/var/lib/jetty/config/.truststore
 
     # JanusGraph cassandra ssl truststore file password
-    storage.cassandra.ssl.truststore.password=Aa123456
+    storage.cassandra.ssl.truststore.password=changeme
 
     # Should JanusGraph use cache
     cache.db-cache = false