summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOfir Sonsino <os0695@intl.att.com>2020-02-25 16:06:03 +0200
committerOfir Sonsino <os0695@intl.att.com>2020-02-25 16:06:03 +0200
commit99f16df848dd16806e948327b73ef0dbaaaa0cce (patch)
tree6a5cc7e8325e5e37a50b61c1fa36055da592dcc1
parentb4aaa6d004c4643e593fc789bbe9776a6226315d (diff)
configuration alignment
Change-Id: Ieff9791620f9e7bbebdd7410bc0ab128434228cd Issue-ID: SDC-2724 Signed-off-by: Ofir Sonsino <os0695@intl.att.com>
-rw-r--r--catalog-be/src/main/resources/config/configuration.yaml20
-rw-r--r--catalog-be/src/test/resources/config/catalog-be/configuration.yaml14
2 files changed, 17 insertions, 17 deletions
diff --git a/catalog-be/src/main/resources/config/configuration.yaml b/catalog-be/src/main/resources/config/configuration.yaml
index 678b3998fe..482bea1906 100644
--- a/catalog-be/src/main/resources/config/configuration.yaml
+++ b/catalog-be/src/main/resources/config/configuration.yaml
@@ -812,12 +812,12 @@ dmaapConsumerConfiguration:
dme2preferredRouterFilePath: DME2preferredRouter.txt
timeLimitForNotificationHandleMs: 120000
credential:
- username: m09875@sdc.com
- password: mockhmXYcznAljMSisdy8zgcag==
+ username: sdc@sdc.com
+ password: XyCUPhFx9u70aklYGo6OiA==
aftDme2SslEnable: true
aftDme2ClientIgnoreSslConfig: false
aftDme2ClientKeystore: /opt/app/jetty/base/be/config/.truststore
- aftDme2ClientKeystorePassword: hmXYcznAljMSisdy8zgcag==
+ aftDme2ClientKeystorePassword: XyCUPhFx9u70aklYGo6OiA==
aftDme2ClientSslCertAlias: certman
#Performence microservice dmaap producer
@@ -846,12 +846,12 @@ dmaapProducerConfiguration:
dme2preferredRouterFilePath: DME2preferredRouter.txt
timeLimitForNotificationHandleMs: 120000
credential:
- username: m09875@sdc.com
- password: mockhmXYcznAljMSisdy8zgcag==
+ username: sdc@sdc.com
+ password: XyCUPhFx9u70aklYGo6OiA==
aftDme2SslEnable: true
aftDme2ClientIgnoreSslConfig: false
aftDme2ClientKeystore: /opt/app/jetty/base/be/config/.truststore
- aftDme2ClientKeystorePassword: hmXYcznAljMSisdy8zgcag==
+ aftDme2ClientKeystorePassword: XyCUPhFx9u70aklYGo6OiA==
aftDme2ClientSslCertAlias: certman
@@ -904,10 +904,10 @@ cadiFilterParams:
cadi_keyfile: /opt/app/jetty/base/be/config/catalog-be/keyfile
cadi_loglevel: DEBUG
cadi_truststore: /opt/app/jetty/base/be/config/.truststore
- cadi_truststore_password: enc:HdzGwQGAK5Rc29vzn3Kqoy9BCTbJNGgNxd72zpCUtjg
- #aaf_url: https://DME2RESOLVE/service=com.att.authz.AuthorizationService/version=2.0/envContext=TEST/routeOffer=BAU_SE
- aaf_id: m09875@sdc.att.com
- aaf_password: enc:HdzGwQGAK5Rc29vzn3Kqoy9BCTbJNGgNxd72zpCUtjg
+ cadi_truststore_password: enc:XyCUPhFx9u70aklYGo6OiA==
+ #aaf_url: https://aaf.onap.org/service=?
+ aaf_id: aaf@sdc.onap.org
+ aaf_password: enc:XyCUPhFx9u70aklYGo6OiA==
aaf_env: DEV
aafLocateUrl: https://aaf.api.simpledemo.onap.org:8095
aaf_url: https://AAF_LOCATE_URL/AAF_NS.service:2.0
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 e759748808..64b730b046 100644
--- a/catalog-be/src/test/resources/config/catalog-be/configuration.yaml
+++ b/catalog-be/src/test/resources/config/catalog-be/configuration.yaml
@@ -558,8 +558,8 @@ switchoverDetector:
feResolveAttempts: 3
enabled: false
interval: 60
- changePriorityUser: ecompasdc
- changePriorityPassword: ecompasdc123
+ changePriorityUser: sdc
+ changePriorityPassword: changeme
publishNetworkUrl: "http://xxx.com/crt/CipDomain.ECOMP-ASDC-DEVST/config/update_network?user=root"
publishNetworkBody: '{"note":"publish network"}'
groups:
@@ -635,7 +635,7 @@ environmentContext:
dmaapConsumerConfiguration:
active: true
hosts: olsd004.wnsnet.com:3905
- consumerGroup: asdc
+ consumerGroup: sdc
consumerId: invalidMamaUser #mama - in Order To Consume Remove This String And Replace It With -> mama
timeoutMs: 15000
limit: 1
@@ -644,7 +644,7 @@ dmaapConsumerConfiguration:
latitude: 32.109333
longitude: 34.855499
version: 1.0
- serviceName: dmaap-v1.dev.dmaap.dt.saat.acsi.com/events
+ serviceName: dmaap.onap.org/events
environment: TEST
partner: BOT_R
routeOffer: MR1
@@ -663,7 +663,7 @@ dmaapConsumerConfiguration:
aftDme2SslEnable: true
aftDme2ClientIgnoreSslConfig: false
aftDme2ClientKeystore: /opt/app/jetty/base/be/config/.truststore
- aftDme2ClientKeystorePassword: hmXYcznAljMSisdy8zgcag==
+ aftDme2ClientKeystorePassword: XyCUPhFx9u70aklYGo6OiA==
aftDme2ClientSslCertAlias: certman
dmaapProducerConfiguration:
@@ -678,7 +678,7 @@ dmaapProducerConfiguration:
latitude: 32.109333
longitude: 34.855499
version: 1.0
- serviceName: dmaap-v1.dev.dmaap.dt.saat.acsi.att.com/events
+ serviceName: dmaap-v1.onap.org/events
environment: TEST
partner: BOT_R
routeOffer: MR1
@@ -734,7 +734,7 @@ cadiFilterParams:
hostname: 192.168.33.10
aaf_id: aaf@sdc.onap.org
aaf_env: TEST
- aaf_url: https://aaftest.test.att.com/locate/com.att.aaf.service:2.0
+ aaf_url: https://aaftest.onap.org/locate/
csp_domain: PROD
cadi_keyfile: /opt/app/jetty/base/be/etc/keyfile
aaf_password: enc:uI_J4jBL4YUcIZZa5uZKj3QMUC63hbS8TmDn5PSp5nO