Merge "use encrypted auth for dmaap"

diff --combined bpmn/MSOCommonBPMN/src/test/java/org/onap/so/client/dmaapproperties/GlobalDmaapPublisherTest.java
index 4d7c85e,d380536..fc69f81
--- 1/bpmn/MSOCommonBPMN/src/test/java/org/onap/so/client/dmaapproperties/GlobalDmaapPublisherTest.java
--- 2/bpmn/MSOCommonBPMN/src/test/java/org/onap/so/client/dmaapproperties/GlobalDmaapPublisherTest.java
+++ b/bpmn/MSOCommonBPMN/src/test/java/org/onap/so/client/dmaapproperties/GlobalDmaapPublisherTest.java
@@@ -21,7 -21,6 +21,7 @@@
  package org.onap.so.client.dmaapproperties;
  
  import static org.junit.Assert.assertEquals;
 +import static org.junit.Assert.assertTrue;
  
  import org.junit.Test;
  import org.onap.so.BaseTest;
@@@ -31,12 -30,11 +31,12 @@@ public class GlobalDmaapPublisherTest e
  
        @Autowired
        private GlobalDmaapPublisher globalDmaapPublisher;
 -      
 +
 +
        @Test
        public void testGetters() {
-               assertEquals("dmaapUsername", globalDmaapPublisher.getUserName());
-               assertEquals("ZG1hYXBQYXNzd29yZA==", globalDmaapPublisher.getPassword());
+               assertEquals("81B7E3533B91A6706830611FB9A8ECE529BBCCE754B1F1520FA7C8698B42F97235BEFA993A387E664D6352C63A6185D68DA7F0B1D360637CBA102CB166E3E62C11EB1F75386D3506BCECE51E54", globalDmaapPublisher.getAuth());
+               assertEquals("07a7159d3bf51a0e53be7a8f89699be7", globalDmaapPublisher.getKey());
                assertEquals("com.att.mso.asyncStatusUpdate", globalDmaapPublisher.getTopic());
                assertEquals("http://localhost:" + wireMockPort, globalDmaapPublisher.getHost().get());
        }

diff --combined bpmn/MSOCommonBPMN/src/test/resources/application-test.yaml
index 945972c,b229fbd..afdb800
--- 1/bpmn/MSOCommonBPMN/src/test/resources/application-test.yaml
--- 2/bpmn/MSOCommonBPMN/src/test/resources/application-test.yaml
+++ b/bpmn/MSOCommonBPMN/src/test/resources/application-test.yaml
@@@ -84,7 -84,7 +84,7 @@@ mso
    callbackRetryAttempts: '5'
    catalog:
      db:
 -      endpoint: http://localhost:${wiremock.server.port}/
 +      endpoint: http://localhost:${wiremock.server.port}/ecomp/mso/catalog
        spring:
          endpoint: http://localhost:${wiremock.server.port} 
    correlation:
@@@ -146,6 -146,7 +146,7 @@@
        host: http://localhost:${wiremock.server.port}
        publisher:
          topic: com.att.mso.asyncStatusUpdate
+       auth: 81B7E3533B91A6706830611FB9A8ECE529BBCCE754B1F1520FA7C8698B42F97235BEFA993A387E664D6352C63A6185D68DA7F0B1D360637CBA102CB166E3E62C11EB1F75386D3506BCECE51E54
    oof:
      auth: test
      timeout: PT10S
@@@ -163,6 -164,16 +164,16 @@@ sdnc
    auth: Basic YWRtaW46YWRtaW4=
    host: http://localhost:8446
    path: /restconf/operations/GENERIC-RESOURCE-API
+ sdno:
+   health-check:
+     dmaap:
+       password: alRyMzJ3NUNeakxl
+       publisher:
+         topic: com.att.sdno.test-health-diagnostic-v02
+         host: https://olsd004.wnsnet.attws.com:3905
+       subscriber:
+         topic: com.att.sdno.test-health-diagnostic-v02
+       auth: 81B7E3533B91A6706830611FB9A8ECE529BBCCE754B1F1520FA7C8698B42F97235BEFA993A387E664D6352C63A6185D68DA7F0B1D360637CBA102CB166E3E62C11EB1F75386D3506BCECE51E54
  sniro:
    conductor:
      enabled: true
@@@ -178,7 -189,15 +189,15 @@@
      headers.patchVersion: 1
      headers.minorVersion: 1
      headers.latestVersion: 2
- 
+ ruby:
+   create-ticket-request:
+     dmaap:
+       username: m04768@mso.ecomp.att.com
+       password: alRyMzJ3NUNeakxl
+     publisher:
+       topic: com.att.pdas.exp.msoCMFallout-v1
+       host: https://olsd004.wnsnet.attws.com:3905
+       auth: 81B7E3533B91A6706830611FB9A8ECE529BBCCE754B1F1520FA7C8698B42F97235BEFA993A387E664D6352C63A6185D68DA7F0B1D360637CBA102CB166E3E62C11EB1F75386D3506BCECE51E54
  spring:
    datasource:
      jdbc-url: jdbc:mariadb://localhost:3307/camundabpmn