configuration alignment

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

1 files changed, 7 insertions, 22 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