From 55ec3c71441abda7c6058f4c2cc569c129f635ba Mon Sep 17 00:00:00 2001
From: Sebastien Premont-Tendland <sebastien.premont@bell.ca>
Date: Mon, 9 Mar 2020 18:34:18 -0400
Subject: [PATCH] Added proper logging to sdc-listener MS

 - Logging was not configured properly to use logback file.
 - Updated the sdc-distribution-client version to 1.4.0
 - Changed the default username for SDC to cds from vid

Issue-ID: CCSDK-2160
Signed-off-by: Sebastien Premont-Tendland <sebastien.premont@bell.ca>
Change-Id: Iea89ccf10ac61f44c0ce1765db9dad13ea666510
---
 ms/sdclistener/application/pom.xml                                  | 6 +++++-
 ms/sdclistener/application/src/main/resources/application.yaml      | 2 +-
 .../onap/ccsdk/cds/sdclistener/SdcListenerConfigurationTest.java    | 2 +-
 ms/sdclistener/parent/pom.xml                                       | 2 +-
 4 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/ms/sdclistener/application/pom.xml b/ms/sdclistener/application/pom.xml
index 88d8d1b2f..72f552cdd 100644
--- a/ms/sdclistener/application/pom.xml
+++ b/ms/sdclistener/application/pom.xml
@@ -63,7 +63,6 @@
         <dependency>
             <groupId>org.onap.sdc.sdc-distribution-client</groupId>
             <artifactId>sdc-distribution-client</artifactId>
-            <version>1.3.0</version>
         </dependency>
 
         <dependency>
@@ -111,6 +110,11 @@
             <artifactId>blueprint-proto</artifactId>
         </dependency>
 
+        <dependency>
+            <groupId>ch.qos.logback</groupId>
+            <artifactId>logback-classic</artifactId>
+        </dependency>
+
         <dependency>
             <groupId>io.projectreactor</groupId>
             <artifactId>reactor-core</artifactId>
diff --git a/ms/sdclistener/application/src/main/resources/application.yaml b/ms/sdclistener/application/src/main/resources/application.yaml
index 424f0a5c0..d07d8ae61 100644
--- a/ms/sdclistener/application/src/main/resources/application.yaml
+++ b/ms/sdclistener/application/src/main/resources/application.yaml
@@ -2,7 +2,7 @@ listenerservice:
   config:
     asdcAddress: ${asdcAddress:localhost:8443}
     messageBusAddress: ${messageBusAddress:localhost}
-    user: ${sdcusername:vid}
+    user: ${sdcusername:cds}
     password: ${password:Kp8bJ4SXszM0WXlhak3eHlcse2gAw84vaoGGmJvUy2U}
     pollingInterval: ${pollingInterval:15}
     pollingTimeout: ${pollingTimeout:60}
diff --git a/ms/sdclistener/application/src/test/java/org/onap/ccsdk/cds/sdclistener/SdcListenerConfigurationTest.java b/ms/sdclistener/application/src/test/java/org/onap/ccsdk/cds/sdclistener/SdcListenerConfigurationTest.java
index 26757a657..8275bc084 100644
--- a/ms/sdclistener/application/src/test/java/org/onap/ccsdk/cds/sdclistener/SdcListenerConfigurationTest.java
+++ b/ms/sdclistener/application/src/test/java/org/onap/ccsdk/cds/sdclistener/SdcListenerConfigurationTest.java
@@ -37,7 +37,7 @@ public class SdcListenerConfigurationTest {
     public void testCdsSdcListenerConfiguration() {
         assertEquals(listenerConfiguration.getAsdcAddress(), "localhost:8443");
         assertEquals(listenerConfiguration.getMsgBusAddress().stream().findFirst().get(), "localhost");
-        assertEquals(listenerConfiguration.getUser(), "vid");
+        assertEquals(listenerConfiguration.getUser(), "cds");
         assertEquals(listenerConfiguration.getPassword(), "Kp8bJ4SXszM0WXlhak3eHlcse2gAw84vaoGGmJvUy2U");
         assertEquals(listenerConfiguration.getPollingInterval(), 15);
         assertEquals(listenerConfiguration.getPollingTimeout(), 60);
diff --git a/ms/sdclistener/parent/pom.xml b/ms/sdclistener/parent/pom.xml
index eaa1d60f4..2cbc79dcc 100755
--- a/ms/sdclistener/parent/pom.xml
+++ b/ms/sdclistener/parent/pom.xml
@@ -40,7 +40,7 @@
         <mockk.version>1.9</mockk.version>
         <dmaap.client.version>1.1.5</dmaap.client.version>
         <mockkserver.version>5.5.1</mockkserver.version>
-        <sdc-distribution-client.version>1.3.0</sdc-distribution-client.version>
+        <sdc-distribution-client.version>1.4.0</sdc-distribution-client.version>
         <jmockit.version>1.19</jmockit.version>
         <reactorcore.version>3.2.6.RELEASE</reactorcore.version>
     </properties>
-- 
2.16.6