configuration alignment

[sdc.git] / catalog-be / src / test / resources / config / catalog-be / configuration.yaml

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 b982c38..64b730b 100644 (file)
--- a/catalog-be/src/test/resources/config/catalog-be/configuration.yaml
+++ b/catalog-be/src/test/resources/config/catalog-be/configuration.yaml
@@ -516,8 +516,6 @@ resourceInformationalArtifacts:
         validForResourceTypes:
             - PNF
 
-resourceInformationalDeployedArtifacts:
-
 unLoggedUrls:
    - /sdc2/rest/healthCheck
 
@@ -560,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:
@@ -637,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
@@ -646,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
@@ -660,17 +658,17 @@ dmaapConsumerConfiguration:
     dme2preferredRouterFilePath: DME2preferredRouter.txt
     timeLimitForNotificationHandleMs: 0
     credential:
-        username: m09875@sdc.com
-        password: hmXYcznAljMSisdy8zgcag==
+        username: sdc@sdc.com
+        password: XyCUPhFx9u70aklYGo6OiA==
     aftDme2SslEnable: true
     aftDme2ClientIgnoreSslConfig: false
     aftDme2ClientKeystore: /opt/app/jetty/base/be/config/.truststore
-    aftDme2ClientKeystorePassword: hmXYcznAljMSisdy8zgcag==
+    aftDme2ClientKeystorePassword: XyCUPhFx9u70aklYGo6OiA==
     aftDme2ClientSslCertAlias: certman
 
 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
@@ -680,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
@@ -694,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: XyCUPhFx9u70aklYGo6OiA==
+
 dmeConfiguration:
     lookupUriFormat: "http://DME2RESOLVE/service=%s/version=1.0.0/envContext=%s/routeOffer=DEFAULT"
 
@@ -749,9 +732,9 @@ 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
+    aaf_url:                  https://aaftest.onap.org/locate/
     csp_domain:               PROD
     cadi_keyfile:             /opt/app/jetty/base/be/etc/keyfile
     aaf_password:             enc:uI_J4jBL4YUcIZZa5uZKj3QMUC63hbS8TmDn5PSp5nO
@@ -761,4 +744,6 @@ cadiFilterParams:
     cadi_truststore:          /opt/app/jetty/base/be/etc/cadi_truststore.jks
     cadi_truststore_password: changeit
 
-
+# This configuration entry lists all node type names prefix that shall be allowed on SDC.
+definedResourceNamespace:
+  - org.openecomp.resource.
\ No newline at end of file